From 25bb7dd9746097423095fb4a12f7b11c11fb5548 Mon Sep 17 00:00:00 2001 From: Toby Tso Date: Mon, 28 Dec 2020 16:34:40 +0800 Subject: [PATCH 01/75] WIP: add Media Digest --- lib/router.js | 3 ++ lib/routes/mediadigest/category.js | 69 ++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 lib/routes/mediadigest/category.js diff --git a/lib/router.js b/lib/router.js index 2da2ee3d3c..dcb959fb8a 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3766,4 +3766,7 @@ router.get('/sciencenet/blog/:type?/:time?/:sort?', require('./routes/sciencenet // DailyArt router.get('/dailyart/:language?', require('./routes/dailyart/index')); +// Media Digest +router.get('/mediadigest/:category?', require('./routes/mediadigest/category')); + module.exports = router; diff --git a/lib/routes/mediadigest/category.js b/lib/routes/mediadigest/category.js new file mode 100644 index 0000000000..2225d6691b --- /dev/null +++ b/lib/routes/mediadigest/category.js @@ -0,0 +1,69 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +function getArticle(line) { + const article = ctx.cache.tryGet(line, async () => { + const a_r = await got.get(`https://app3.rthk.hk/mediadigest/${line}`); + const $ = cheerio.load(a_r.data); + // title + const h1 = $('h1.story-title').text(); + // author + const author_list = $('div.story-author'); + const authors = author_list.map((_index, author) => $(author).text()); + const author = authors.map((_index, author) => `${author}
`); + const s_author = author.toArray().join(""); + const author_block = `

${s_author}

`; + // date + const date = $('div.story-calendar').text(); + // desc + const desc = `${$(author_block)}${$('div.story-content').html()}`; + + return { + title: h1, + description: desc, + pubDate: new Date(`${date}T09:00:00+0800`).toUTCString(), + link: line, + } + }); + tasks.push(article); +} + +module.exports = async (ctx) => { + const category = ctx.params.category || 'all'; + const tasks = []; + + if (category !== 'all') { + const response = await got.get(`https://app3.rthk.hk/mediadigest/category.php?cid=${category}`); + const $ = cheerio.load(response.data); + const list = $('div.category-line'); + + list.map((_index, line) => $(line).find('a').first().attr('href')) + .each((_index, line) => { + getArticle(line); + }); + } else { + let cids = [1, 2]; for (let i = 4; i < 28; ++i) {cids.push(i);}; + let urls = cids.map((cid) => `https://app3.rthk.hk/mediadigest/category.php?cid=${cid}`); + const list_allt = await Promise.all( + urls.map(async (url) => { + const response = await got.get(url); + const $ = cheerio.load(response.data); + const list = $('div.category-line').map((_index, line) => $(line).find('a').first().attr('href')); + return Promise.resolve(list.toArray()); + }) + ); + const list_all = [...new Set(list_allt.flat())]; + + list_all.forEach((line) => { + getArticle(line); + }); + }; + + const rss = await Promise.all(tasks); + + ctx.state.data = { + title: '傳媒透視', + link: 'https://app3.rthk.hk/mediadigest/index.php', + item: rss, + }; +}; From 4c2b46207173147c47cbb4dad47881c471b2ebbc Mon Sep 17 00:00:00 2001 From: Toby Tso Date: Mon, 28 Dec 2020 16:36:00 +0800 Subject: [PATCH 02/75] WIP: fix --- lib/routes/mediadigest/category.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/routes/mediadigest/category.js b/lib/routes/mediadigest/category.js index 2225d6691b..d52214530b 100644 --- a/lib/routes/mediadigest/category.js +++ b/lib/routes/mediadigest/category.js @@ -23,7 +23,7 @@ function getArticle(line) { description: desc, pubDate: new Date(`${date}T09:00:00+0800`).toUTCString(), link: line, - } + }; }); tasks.push(article); } From bd6effd2e2e8c0986b331083f443b0d5fe50c9be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AE=E3=83=A3=E3=83=A9?= Date: Mon, 28 Dec 2020 09:08:57 +0000 Subject: [PATCH 03/75] fix --- lib/routes/mediadigest/category.js | 34 +++++++++++++++++++----------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/lib/routes/mediadigest/category.js b/lib/routes/mediadigest/category.js index d52214530b..b42a27f649 100644 --- a/lib/routes/mediadigest/category.js +++ b/lib/routes/mediadigest/category.js @@ -1,7 +1,7 @@ const got = require('@/utils/got'); const cheerio = require('cheerio'); -function getArticle(line) { +function getArticle(ctx, line, tasks) { const article = ctx.cache.tryGet(line, async () => { const a_r = await got.get(`https://app3.rthk.hk/mediadigest/${line}`); const $ = cheerio.load(a_r.data); @@ -11,7 +11,7 @@ function getArticle(line) { const author_list = $('div.story-author'); const authors = author_list.map((_index, author) => $(author).text()); const author = authors.map((_index, author) => `${author}
`); - const s_author = author.toArray().join(""); + const s_author = author.toArray().join(''); const author_block = `

${s_author}

`; // date const date = $('div.story-calendar').text(); @@ -37,27 +37,37 @@ module.exports = async (ctx) => { const $ = cheerio.load(response.data); const list = $('div.category-line'); - list.map((_index, line) => $(line).find('a').first().attr('href')) - .each((_index, line) => { - getArticle(line); - }); + list.map((_index, line) => $(line).find('a').first().attr('href')).each((_index, line) => { + getArticle(ctx, line, tasks); + }); } else { - let cids = [1, 2]; for (let i = 4; i < 28; ++i) {cids.push(i);}; - let urls = cids.map((cid) => `https://app3.rthk.hk/mediadigest/category.php?cid=${cid}`); + const cids = [1, 2]; + for (let i = 4; i < 28; ++i) { + cids.push(i); + } + const urls = cids.map((cid) => `https://app3.rthk.hk/mediadigest/category.php?cid=${cid}`); const list_allt = await Promise.all( urls.map(async (url) => { const response = await got.get(url); const $ = cheerio.load(response.data); - const list = $('div.category-line').map((_index, line) => $(line).find('a').first().attr('href')); + const list = $('div.category-line').map((_index, line) => $(line).find('a').first().attr('href')); return Promise.resolve(list.toArray()); }) ); const list_all = [...new Set(list_allt.flat())]; - list_all.forEach((line) => { - getArticle(line); + const list_recent_20 = list_all + .sort((a, b) => { + const aid_a = a.match(/aid=(\d+)/)[1]; + const aid_b = b.match(/aid=(\d+)/)[1]; + // reverse + return aid_b - aid_a; + }) + .slice(0, 20); + list_recent_20.forEach((line) => { + getArticle(ctx, line, tasks); }); - }; + } const rss = await Promise.all(tasks); From 4113b6892919734e80f706c92896d83da9b57680 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 28 Dec 2020 16:55:39 +0000 Subject: [PATCH 04/75] chore: update rebase CI token --- .github/workflows/rebase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index 947359ad24..917f6c0c41 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -18,4 +18,4 @@ jobs: name: Automatic Rebase uses: cirrus-actions/rebase@1.4 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.TOKEN_SUPER }} \ No newline at end of file From c10b43bf78ccd54929e372ecf82173c1ff2b3eae Mon Sep 17 00:00:00 2001 From: Toby Tso <7851076+tpnonthealps@users.noreply.github.com> Date: Tue, 29 Dec 2020 01:00:42 +0800 Subject: [PATCH 05/75] feat: Caixin latest (#6539) --- docs/traditional-media.md | 8 +++++ lib/router.js | 3 ++ lib/routes/caixin/latest.js | 71 +++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 lib/routes/caixin/latest.js diff --git a/docs/traditional-media.md b/docs/traditional-media.md index c9347c4f19..94db156aeb 100644 --- a/docs/traditional-media.md +++ b/docs/traditional-media.md @@ -311,6 +311,14 @@ Category 列表： +### 最新文章 + + + +说明：此 RSS feed 会自动抓取财新网的最新文章，但不包含 FM 及视频内容。 + + + ## 第一财经 ### 直播区 diff --git a/lib/router.js b/lib/router.js index 2da2ee3d3c..e797e1e7f9 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3766,4 +3766,7 @@ router.get('/sciencenet/blog/:type?/:time?/:sort?', require('./routes/sciencenet // DailyArt router.get('/dailyart/:language?', require('./routes/dailyart/index')); +// Caixin Latest +router.get('/caixin/latest', require('./routes/caixin/latest')); + module.exports = router; diff --git a/lib/routes/caixin/latest.js b/lib/routes/caixin/latest.js new file mode 100644 index 0000000000..8b5f9f0426 --- /dev/null +++ b/lib/routes/caixin/latest.js @@ -0,0 +1,71 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + const li_r = await got({ + method: 'get', + url: 'http://finance.caixin.com/2020-11-03/101622309.html', + }); + + const $ = cheerio.load(li_r.data); + const list = $('div.columnBox a[name="new_artical"]~ul.list li'); + + const tasks = []; + + list.map((_index, li) => $(li).find('a').first().attr('href')) + .filter((_index, link) => link.indexOf('fm.caixin.com') === -1 && link.indexOf('video.caixin.com') === -1) // content filter + .each((_index, link) => { + const entry = ctx.cache.tryGet(link, async () => { + const entry_r = await got.get(link); + const $ = cheerio.load(entry_r.data); + // title + const h1 = $('div#conTit h1').text(); + // desc items + const subhead = $('div#subhead.subhead').text(); + let pic_url = $('img.cx-img-loader').attr('src'); + if (pic_url === undefined) { + pic_url = $('img.cx-img-loader').attr('data-src'); + } + const pic_alt = $('dl.media_pic dd').text(); + const content = $('div#Main_Content_Val.text').html(); + + /* + const [, count] = + $('a.box_titlecontent.cost-uibtn') + .text() + .match(/本文共计(\d+)字/) || []; + if (count !== 0 && count !== undefined) { + content = `${content}

此乃财新通收费文章，全文共计${count}字。

`; + } + */ + // desc + let desc; + if (pic_url === undefined) { + desc = `

${subhead}

${content}`; + } else { + desc = `

${subhead}

${pic_alt}${content}`; + } + // time + const [, year, month, day, hour, minute] = $('div#artInfo.artInfo') + .text() + .match(/(\d+)年(\d+)月(\d+)日 *(\d+):(\d+)/); + const time = new Date(`${year}-${month}-${day}T${hour}:${minute}:00+0800`).toUTCString(); + + return { + title: h1, + description: desc, + pubDate: time, + link: link, + }; + }); + tasks.push(entry); + }); + + const rss = await Promise.all(tasks); + + ctx.state.data = { + title: '财新网 - 最新文章', + link: 'http://www.caixin.com/', + item: rss, + }; +}; From 342e9cf09011840dc5a08bf39f4bc5c7882909c2 Mon Sep 17 00:00:00 2001 From: LJason Date: Tue, 29 Dec 2020 01:01:14 +0800 Subject: [PATCH 06/75] feat: add juejin radar rule (#6540) --- assets/radar-rules.js | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/assets/radar-rules.js b/assets/radar-rules.js index 137e4cc56f..47b97b2901 100644 --- a/assets/radar-rules.js +++ b/assets/radar-rules.js @@ -463,12 +463,42 @@ 'juejin.cn': { _name: '掘金', '.': [ + { + title: '标签', + docs: 'https://docs.rsshub.app/programming.html#jue-jin-biao-qian', + source: '/tag/:tag', + target: '/juejin/tag/:tag', + }, + { + title: '小册', + docs: 'https://docs.rsshub.app/programming.html#jue-jin-xiao-ce', + source: '/books', + target: '/juejin/books', + }, + { + title: '沸点', + docs: 'https://docs.rsshub.app/programming.html#jue-jin-fei-dian', + source: ['/pins/:type', '/pins/topic/:type'], + target: (params) => (params.type !== 'recommended' ? '/juejin/pins/:type' : '/juejin/pins'), + }, { title: '专栏', - docs: 'https://docs.rsshub.app/programming.html#jue-jin', - source: '/user/:id/posts', + docs: 'https://docs.rsshub.app/programming.html#jue-jin-zhuan-lan', + source: ['/user/:id', '/user/:id/posts'], target: '/juejin/posts/:id', }, + { + title: '收藏集', + docs: 'https://docs.rsshub.app/programming.html#jue-jin-shou-cang-ji', + source: ['/user/:id', '/user/:id/collections'], + target: '/juejin/collections/:id', + }, + { + title: '单个收藏夹', + docs: 'https://docs.rsshub.app/programming.html#jue-jin-dan-ge-shou-cang-jia', + source: '/collection/:collectionId', + target: '/juejin/collection/:collectionId', + }, ], }, 'anime1.me': { From cac6f754729ddcbb8d651c5baea78f1883a290bd Mon Sep 17 00:00:00 2001 From: zphw <49032034+zphw@users.noreply.github.com> Date: Tue, 29 Dec 2020 01:02:51 +0800 Subject: [PATCH 07/75] fix: disable default debug info (#6544) --- docs/en/install/README.md | 2 +- docs/install/README.md | 2 +- lib/config.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en/install/README.md b/docs/en/install/README.md index fab3c570df..460be758ea 100644 --- a/docs/en/install/README.md +++ b/docs/en/install/README.md @@ -394,7 +394,7 @@ See the relation between access key/code and white/blacklisting. `REQUEST_RETRY`: retries allowed for failed requests, default to `2` -`DEBUG_INFO`: display route information on homepage for debugging purpose, default to `true` +`DEBUG_INFO`: display route information on homepage for debugging purpose, default to `false` `NODE_ENV`: display error message on pages for authentication failing, default to `production` (i.e. no display) diff --git a/docs/install/README.md b/docs/install/README.md index cfb12f1eba..a98da79d61 100644 --- a/docs/install/README.md +++ b/docs/install/README.md @@ -422,7 +422,7 @@ RSSHub 支持使用访问密钥 / 码，白名单和黑名单三种方式进行 `REQUEST_RETRY`: 请求失败重试次数，默认 `2` -`DEBUG_INFO`: 是否在首页显示路由信息，默认 `true` +`DEBUG_INFO`: 是否在首页显示路由信息，默认 `false` `NODE_ENV`: 是否显示错误输出，默认 `production` （即关闭输出） diff --git a/lib/config.js b/lib/config.js index bda7dc67ce..83112c8e74 100644 --- a/lib/config.js +++ b/lib/config.js @@ -40,7 +40,7 @@ const calculateValue = () => { listenInaddrAny: envs.LISTEN_INADDR_ANY || 1, // 是否允许公网连接，取值 0 1 requestRetry: parseInt(envs.REQUEST_RETRY) || 2, // 请求失败重试次数 // 是否显示 Debug 信息，取值 boolean 'false' 'key' ，取值为 'false' false 时永远不显示，取值为 'key' 时带上 ?debug=key 显示 - debugInfo: envs.DEBUG_INFO || true, + debugInfo: envs.DEBUG_INFO || false, disallowRobot: envs.DISALLOW_ROBOT !== '0' && envs.DISALLOW_ROBOT !== 'false', titleLengthLimit: parseInt(envs.TITLE_LENGTH_LIMIT) || 150, redis: { From 9b2d2c97bb7d17ba0e560b2e00b6d0119dfbc69d Mon Sep 17 00:00:00 2001 From: Ethan Shen Date: Tue, 29 Dec 2020 01:06:22 +0800 Subject: [PATCH 08/75] feat: add national association of colleges and employers blog (#6542) --- docs/en/new-media.md | 12 ++++++++++ docs/new-media.md | 12 ++++++++++ lib/router.js | 3 +++ lib/routes/nace/blog.js | 53 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+) create mode 100644 lib/routes/nace/blog.js diff --git a/docs/en/new-media.md b/docs/en/new-media.md index 4c88a78f70..070815cbe9 100644 --- a/docs/en/new-media.md +++ b/docs/en/new-media.md @@ -215,6 +215,18 @@ Provides a better reading experience (full text articles) over the official one. +## National Association of Colleges and Employers + +### Blog + + + +| Most Recent | Top Rated | Most Read | +| - | - | - | +| | top-blogs | mostreadblogs | + + + ## Nautilus ### Topics diff --git a/docs/new-media.md b/docs/new-media.md index 52a9128e2e..36c5e89aa2 100644 --- a/docs/new-media.md +++ b/docs/new-media.md @@ -1404,6 +1404,18 @@ column 为 third 时可选的 category: +## 美国大学和雇主协会 + +### 博客 + + + +| Most Recent | Top Rated | Most Read | +| ----------- | --------- | ------------- | +| | top-blogs | mostreadblogs | + + + ## 梅斯医学 MedSci ### 推荐 diff --git a/lib/router.js b/lib/router.js index e797e1e7f9..41e4c6eaed 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3766,6 +3766,9 @@ router.get('/sciencenet/blog/:type?/:time?/:sort?', require('./routes/sciencenet // DailyArt router.get('/dailyart/:language?', require('./routes/dailyart/index')); +// National Association of Colleges and Employers +router.get('/nace/blog/:sort?', require('./routes/nace/blog')); + // Caixin Latest router.get('/caixin/latest', require('./routes/caixin/latest')); diff --git a/lib/routes/nace/blog.js b/lib/routes/nace/blog.js new file mode 100644 index 0000000000..6e428b8bc5 --- /dev/null +++ b/lib/routes/nace/blog.js @@ -0,0 +1,53 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + const sort = ctx.params.sort || ''; + + const rootUrl = 'https://community.naceweb.org'; + const currentUrl = `${rootUrl}/browse/blogs/${sort}`; + const response = await got({ + method: 'get', + url: currentUrl, + }); + + const $ = cheerio.load(response.data); + + const list = $('.BlogTitle') + .slice(0, 10) + .map((_, item) => { + item = $(item); + const link = item.attr('href'); + const split = link.split('/'); + + return { + link, + title: item.text(), + pubDate: new Date(`${split[5]}-${split[6]}-${split[7]}`).toUTCString(), + }; + }) + .get(); + + const items = await Promise.all( + list.map( + async (item) => + await ctx.cache.tryGet(item.link, async () => { + const detailResponse = await got({ + method: 'get', + url: item.link, + }); + const content = cheerio.load(detailResponse.data); + + item.description = content('.blogs-block .col-md-12').html(); + + return item; + }) + ) + ); + + ctx.state.data = { + title: $('title').text(), + link: currentUrl, + item: items, + }; +}; From 097430af6246448adb0b65d9b7eab42b80fee02d Mon Sep 17 00:00:00 2001 From: mjysci Date: Tue, 29 Dec 2020 01:07:06 +0800 Subject: [PATCH 09/75] =?UTF-8?q?feat:=20add=2095598=20=E5=81=9C=E7=94=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BD=91=20(#6548)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/forecast.md | 6 ++++- lib/router.js | 1 + lib/routes/tingdiantz/95598.js | 46 ++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 lib/routes/tingdiantz/95598.js diff --git a/docs/forecast.md b/docs/forecast.md index 684fb280a9..647cb38c24 100644 --- a/docs/forecast.md +++ b/docs/forecast.md @@ -56,9 +56,13 @@ pageClass: routes ## 停电通知 +### 95598 停电查询网 + + + ### 南京市 - + ## 停水通知 diff --git a/lib/router.js b/lib/router.js index 41e4c6eaed..771d6d2860 100644 --- a/lib/router.js +++ b/lib/router.js @@ -1233,6 +1233,7 @@ router.get('/bihu/activaties/:id', require('./routes/bihu/activaties')); // 停电通知 router.get('/tingdiantz/nanjing', require('./routes/tingdiantz/nanjing')); +router.get('/tingdiantz/95598/:province/:city/:district?', require('./routes/tingdiantz/95598')); // 36kr router.get('/36kr/search/article/:keyword', require('./routes/36kr/search/article')); diff --git a/lib/routes/tingdiantz/95598.js b/lib/routes/tingdiantz/95598.js new file mode 100644 index 0000000000..9cc3161bab --- /dev/null +++ b/lib/routes/tingdiantz/95598.js @@ -0,0 +1,46 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +const HOME_PAGE = 'http://www.sttcq.com'; + +module.exports = async (ctx) => { + const province = ctx.params.province; + const city = ctx.params.city; + const district = ctx.params.district; + + let url; + if (district) { + url = `${HOME_PAGE}/td/${province}/${city}/${district}`; + } else { + url = `${HOME_PAGE}/td/${province}/${city}`; + } + + const response = await got.get(url); + + const data = response.data; + const $ = cheerio.load(data); + const list = $('.news-blocks ul li'); + + ctx.state.data = { + title: $('.main-nav2.clearfix').text(), + link: url, + item: list + .map((index, item) => { + const $item = $(item); + const $aTag = $item.find('a'); + const link = $aTag.attr('href'); + const title = $aTag.text(); + + let pubDate = $item.find('span').text(); + pubDate = new Date(pubDate).toUTCString(); + + return { + title, + description: '停电通知', + link: `${HOME_PAGE}${link}`, + pubDate, + }; + }) + .get(), + }; +}; From 3fb58e7ea894743caeeaa237307be4d1b67fcca7 Mon Sep 17 00:00:00 2001 From: Ethan Shen Date: Tue, 29 Dec 2020 01:08:35 +0800 Subject: [PATCH 10/75] feat: add tieba users' post contents (#6553) --- docs/bbs.md | 2 +- lib/routes/tieba/user.js | 45 ++++++++++++++++++---------------------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/docs/bbs.md b/docs/bbs.md index 392e28a726..0a557cbee5 100644 --- a/docs/bbs.md +++ b/docs/bbs.md @@ -463,7 +463,7 @@ pageClass: routes ### 用户帖子 - + 用户 ID 可以通过打开用户的主页后查看地址栏的 `un` 字段来获取。 diff --git a/lib/routes/tieba/user.js b/lib/routes/tieba/user.js index 452e96aaf5..95f7d32294 100644 --- a/lib/routes/tieba/user.js +++ b/lib/routes/tieba/user.js @@ -1,36 +1,31 @@ const got = require('@/utils/got'); -const cheerio = require('cheerio'); module.exports = async (ctx) => { const uid = ctx.params.uid; + + const rootUrl = 'https://tieba.baidu.com'; + const userUrl = `${rootUrl}/home/get/getthread?un=${uid}&pn=1&ie=utf8`; const response = await got({ method: 'get', - url: `https://tieba.baidu.com/home/main?un=${uid}`, + url: userUrl, }); - const data = response.data; - - const $ = cheerio.load(data); - const name = $('span.userinfo_username').text(); - const list = $('div.n_right.clearfix'); - let imgurl; - ctx.state.data = { - title: `${name} 的贴吧`, - link: `https://tieba.baidu.com/home/main?un=${uid}`, - item: - list && - list - .map((index, item) => { - item = $(item).find('.n_contain'); - imgurl = item.find('ul.n_media.clearfix img').attr('original'); - return { - title: item.find('div.thread_name a').attr('title'), - pubDate: item.parent().find('div .n_post_time').text(), - description: `${item.find('div.n_txt').text()}
`, - link: item.find('div.thread_name a').attr('href'), - }; - }) - .get(), + title: `${uid}的贴子 - 百度贴吧`, + link: `${rootUrl}/home/main?un=${uid}`, + item: response.data.data.thread_list.map((item) => { + let media = ''; + if (item.media) { + for (const m of item.media) { + media += ``; + } + } + return { + title: item.title, + description: `

${item.content}

${media}`, + pubDate: new Date(item.create_time * 1000).toUTCString(), + link: `https://tieba.baidu.com/p/${item.post_id}?pid=${item.thread_id}&cid=#${item.thread_id}`, + }; + }), }; }; From 6a2a996a5601b9e737e2c5eebed9314bd382356a Mon Sep 17 00:00:00 2001 From: Ethan Shen Date: Tue, 29 Dec 2020 01:09:48 +0800 Subject: [PATCH 11/75] =?UTF-8?q?feat:=20add=20=E4=B8=AD=E5=9B=BD=E6=94=BF?= =?UTF-8?q?=E5=8D=8F=E7=BD=91=20(#6555)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/government.md | 12 +++++++++ lib/router.js | 3 +++ lib/routes/gov/cppcc/index.js | 49 +++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 lib/routes/gov/cppcc/index.js diff --git a/docs/government.md b/docs/government.md index 059809a443..4f5276acd3 100644 --- a/docs/government.md +++ b/docs/government.md @@ -280,6 +280,18 @@ pageClass: routes +## 中国政协网 + +### 栏目 + + + +将目标栏目的网址拆解为 `http://www.cppcc.gov.cn/` 和后面的字段，去掉 `.shtml` 后，把后面的字段中的 `/` 替换为 `-`，即为该路由的 slug + +如：(委员建言)[http://www.cppcc.gov.cn/zxww/newcppcc/wyjy/index.shtml] 的网址在 `http://www.cppcc.gov.cn/` 后的字段是 `zxww/newcppcc/wyjy/index.shtml`，则对应的 slug 为 `zxww-newcppcc-wyjy-index`，对应的路由即为 `/cppcc/zxww-newcppcc-wyjy-index` + + + ### 北京市人民政府 #### 北京教育考试院 diff --git a/lib/router.js b/lib/router.js index 771d6d2860..1612e4b4b3 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3767,6 +3767,9 @@ router.get('/sciencenet/blog/:type?/:time?/:sort?', require('./routes/sciencenet // DailyArt router.get('/dailyart/:language?', require('./routes/dailyart/index')); +// 中国政协网 +router.get('/cppcc/:slug?', require('./routes/gov/cppcc/index')); + // National Association of Colleges and Employers router.get('/nace/blog/:sort?', require('./routes/nace/blog')); diff --git a/lib/routes/gov/cppcc/index.js b/lib/routes/gov/cppcc/index.js new file mode 100644 index 0000000000..e0d71a856d --- /dev/null +++ b/lib/routes/gov/cppcc/index.js @@ -0,0 +1,49 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + const slug = ctx.params.slug || 'zxww-newcppcc-zxyw-index'; + + const rootUrl = 'http://www.cppcc.gov.cn'; + const currentUrl = `${rootUrl}/${slug.replace(/-/g, '/')}.shtml`; + const response = await got({ + method: 'get', + url: currentUrl, + }); + + const list = response.data + .match(/new title_array\('(.*)','(.*)','\d{4}-\d{2}-\d{2}'\);/g) + .slice(0, 15) + .map((item) => { + const array = item.replace(/new title_array\(|\);|'/g, '').split(','); + return { + link: array[0], + title: array[1], + pubDate: new Date(array[2]).toUTCString(), + }; + }); + + const items = await Promise.all( + list.map( + async (item) => + await ctx.cache.tryGet(item.link, async () => { + const detailResponse = await got({ + method: 'get', + url: item.link, + }); + const content = cheerio.load(detailResponse.data); + + item.description = content('.cnt_box .con').html(); + item.author = content('.info em').text().split('：')[1]; + + return item; + }) + ) + ); + + ctx.state.data = { + title: `${response.data.match(/><\/span>(.*)<\/p>/)[1]} - 中国政协网`, + link: currentUrl, + item: items, + }; +}; From b86ba62fec40717fecdb345ce93944648ad31416 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 28 Dec 2020 17:12:46 +0000 Subject: [PATCH 12/75] style: auto format --- docs/government.md | 28 ++++++++++++++-------------- docs/new-media.md | 24 ++++++++++++------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/government.md b/docs/government.md index 4f5276acd3..7787edca28 100644 --- a/docs/government.md +++ b/docs/government.md @@ -280,6 +280,20 @@ pageClass: routes +## 中国证券监督管理委员会 + +### 发审委公告 + + + +### 证监会消息 + + + +### 申请事项进度 + + + ## 中国政协网 ### 栏目 @@ -371,20 +385,6 @@ pageClass: routes -## 中国证券监督管理委员会 - -### 发审委公告 - - - -### 证监会消息 - - - -### 申请事项进度 - - - ## 中国驻外使领馆 ### 大使馆重要通知 diff --git a/docs/new-media.md b/docs/new-media.md index 36c5e89aa2..dea896d573 100644 --- a/docs/new-media.md +++ b/docs/new-media.md @@ -1370,6 +1370,18 @@ column 为 third 时可选的 category: +## 美国大学和雇主协会 + +### 博客 + + + +| Most Recent | Top Rated | Most Read | +| ----------- | --------- | ------------- | +| | top-blogs | mostreadblogs | + + + ## 梅花网 ### 作品 @@ -1404,18 +1416,6 @@ column 为 third 时可选的 category: -## 美国大学和雇主协会 - -### 博客 - - - -| Most Recent | Top Rated | Most Read | -| ----------- | --------- | ------------- | -| | top-blogs | mostreadblogs | - - - ## 梅斯医学 MedSci ### 推荐 From 741d0351210334a04ea43b0c0e1d4eb0fad6dc7f Mon Sep 17 00:00:00 2001 From: Ethan Shen Date: Tue, 29 Dec 2020 01:23:56 +0800 Subject: [PATCH 13/75] =?UTF-8?q?feat:=20add=20=E7=8C=BF=E6=96=99=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=20(#6557)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/program-update.md | 20 +++++++++++++++++ lib/router.js | 3 +++ lib/routes/yuanliao/index.js | 43 ++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 lib/routes/yuanliao/index.js diff --git a/docs/program-update.md b/docs/program-update.md index 1d9a236cde..5cddf1086a 100644 --- a/docs/program-update.md +++ b/docs/program-update.md @@ -413,3 +413,23 @@ pageClass: routes ### 金米奖 + +## 猿料 + +### 标签 + + + +标签 + +| uTools | 插件发布 | +| ------ | -------- | +| utools | plugins | + +排序 + +| 最新回复 | 热门回复 | 新鲜出炉 | 陈年旧贴 | +| -------- | ------------- | ---------- | --------- | +| | -commentCount | -createdAt | createdAt | + + diff --git a/lib/router.js b/lib/router.js index 1612e4b4b3..66d6984b4a 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3767,6 +3767,9 @@ router.get('/sciencenet/blog/:type?/:time?/:sort?', require('./routes/sciencenet // DailyArt router.get('/dailyart/:language?', require('./routes/dailyart/index')); +// 猿料 +router.get('/yuanliao/:tag?/:sort?', require('./routes/yuanliao/index')); + // 中国政协网 router.get('/cppcc/:slug?', require('./routes/gov/cppcc/index')); diff --git a/lib/routes/yuanliao/index.js b/lib/routes/yuanliao/index.js new file mode 100644 index 0000000000..d9333428fa --- /dev/null +++ b/lib/routes/yuanliao/index.js @@ -0,0 +1,43 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + const tag = ctx.params.tag || 'utools'; + const sort = ctx.params.sort || ''; + + const rootUrl = 'https://yuanliao.info'; + const currentUrl = `${rootUrl}/api/discussions?tags=${tag}&sort=${sort}`; + const response = await got({ + method: 'get', + url: currentUrl, + }); + + const list = response.data.data.map((item) => ({ + title: item.attributes.title, + link: `${rootUrl}/d/${item.id}-${item.attributes.slug}`, + pubDate: new Date(item.attributes.lastPostedAt).toUTCString(), + })); + + const items = await Promise.all( + list.map( + async (item) => + await ctx.cache.tryGet(item.link, async () => { + const detailResponse = await got({ + method: 'get', + url: item.link, + }); + const content = cheerio.load(detailResponse.data); + + item.description = content('#flarum-content').html(); + + return item; + }) + ) + ); + + ctx.state.data = { + title: `${tag} - 猿料`, + link: currentUrl, + item: items, + }; +}; From 169f9231799fb522c94fa6f281a5628ed296956f Mon Sep 17 00:00:00 2001 From: Jinkin Date: Tue, 29 Dec 2020 01:25:20 +0800 Subject: [PATCH 14/75] feat: add Uestc sice notice (#6558) --- docs/university.md | 4 ++++ lib/router.js | 2 ++ lib/routes/universities/uestc/sice.js | 29 +++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 lib/routes/universities/uestc/sice.js diff --git a/docs/university.md b/docs/university.md index ed3eb8acd7..a30c3b731d 100644 --- a/docs/university.md +++ b/docs/university.md @@ -396,6 +396,10 @@ xskb1 对应 +### 信息与通信工程学院 + + + ## 东北大学 ### 东北大学新闻网 diff --git a/lib/router.js b/lib/router.js index 66d6984b4a..f81bf87e0a 100644 --- a/lib/router.js +++ b/lib/router.js @@ -772,6 +772,8 @@ router.get('/uestc/auto/:type?', require('./routes/universities/uestc/auto')); router.get('/uestc/cs/:type?', require('./routes/universities/uestc/cs')); router.get('/uestc/cqe/:type?', require('./routes/universities/uestc/cqe')); router.get('/uestc/gr', require('./routes/universities/uestc/gr')); +router.get('/uestc/sice', require('./routes/universities/uestc/sice')); + // 云南大学 router.get('/ynu/grs/zytz', require('./routes/universities/ynu/grs/zytz')); diff --git a/lib/routes/universities/uestc/sice.js b/lib/routes/universities/uestc/sice.js new file mode 100644 index 0000000000..53a08006f9 --- /dev/null +++ b/lib/routes/universities/uestc/sice.js @@ -0,0 +1,29 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + const baseIndexUrl = 'https://www.sice.uestc.edu.cn/'; + const response = await got.get(baseIndexUrl); + const $ = cheerio.load(response.data); + const out = $('.notice p').map((index, item) => { + item = $(item); + let date = new Date(new Date().getFullYear() + '-' + item.find('a.date').text()); + if (new Date() < date) { + date = new Date((new Date().getFullYear() - 1) + '-' + item.find('a.date').text()); + } + return { + title: item.find('a[href]').text(), + link: baseIndexUrl + item.find('a[href]').attr('href'), + pubDate: date + }; + } + ).get(); + // console.log(out); + + ctx.state.data = { + title: '信通通知公告', + link: 'https://www.sice.uestc.edu.cn/tzgg/yb.htm', + description: '电子科技大学信息与通信工程学院通知公告', + item: out + }; +}; From b1ae777b87b6239e318c7f92e1d8f92fd0043556 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 28 Dec 2020 17:27:16 +0000 Subject: [PATCH 15/75] style: auto format --- lib/router.js | 1 - lib/routes/universities/uestc/sice.js | 29 ++++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/router.js b/lib/router.js index f81bf87e0a..5bb0f656c3 100644 --- a/lib/router.js +++ b/lib/router.js @@ -774,7 +774,6 @@ router.get('/uestc/cqe/:type?', require('./routes/universities/uestc/cqe')); router.get('/uestc/gr', require('./routes/universities/uestc/gr')); router.get('/uestc/sice', require('./routes/universities/uestc/sice')); - // 云南大学 router.get('/ynu/grs/zytz', require('./routes/universities/ynu/grs/zytz')); router.get('/ynu/grs/qttz/:category', require('./routes/universities/ynu/grs/qttz')); diff --git a/lib/routes/universities/uestc/sice.js b/lib/routes/universities/uestc/sice.js index 53a08006f9..ef5f34c16f 100644 --- a/lib/routes/universities/uestc/sice.js +++ b/lib/routes/universities/uestc/sice.js @@ -5,25 +5,26 @@ module.exports = async (ctx) => { const baseIndexUrl = 'https://www.sice.uestc.edu.cn/'; const response = await got.get(baseIndexUrl); const $ = cheerio.load(response.data); - const out = $('.notice p').map((index, item) => { - item = $(item); - let date = new Date(new Date().getFullYear() + '-' + item.find('a.date').text()); - if (new Date() < date) { - date = new Date((new Date().getFullYear() - 1) + '-' + item.find('a.date').text()); - } - return { - title: item.find('a[href]').text(), - link: baseIndexUrl + item.find('a[href]').attr('href'), - pubDate: date - }; - } - ).get(); + const out = $('.notice p') + .map((index, item) => { + item = $(item); + let date = new Date(new Date().getFullYear() + '-' + item.find('a.date').text()); + if (new Date() < date) { + date = new Date(new Date().getFullYear() - 1 + '-' + item.find('a.date').text()); + } + return { + title: item.find('a[href]').text(), + link: baseIndexUrl + item.find('a[href]').attr('href'), + pubDate: date, + }; + }) + .get(); // console.log(out); ctx.state.data = { title: '信通通知公告', link: 'https://www.sice.uestc.edu.cn/tzgg/yb.htm', description: '电子科技大学信息与通信工程学院通知公告', - item: out + item: out, }; }; From e23d6e7c90eafbf6f16975386830c652b76e1117 Mon Sep 17 00:00:00 2001 From: Toby Tso Date: Tue, 29 Dec 2020 15:44:21 +0800 Subject: [PATCH 16/75] WIP: add `:range` to route --- lib/router.js | 2 +- lib/routes/mediadigest/category.js | 285 ++++++++++++++++++++++------- 2 files changed, 223 insertions(+), 64 deletions(-) diff --git a/lib/router.js b/lib/router.js index dcb959fb8a..488de8eb2f 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3767,6 +3767,6 @@ router.get('/sciencenet/blog/:type?/:time?/:sort?', require('./routes/sciencenet router.get('/dailyart/:language?', require('./routes/dailyart/index')); // Media Digest -router.get('/mediadigest/:category?', require('./routes/mediadigest/category')); +router.get('/mediadigest/:range/:category?', require('./routes/mediadigest/category')); module.exports = router; diff --git a/lib/routes/mediadigest/category.js b/lib/routes/mediadigest/category.js index b42a27f649..757541d4b9 100644 --- a/lib/routes/mediadigest/category.js +++ b/lib/routes/mediadigest/category.js @@ -1,79 +1,238 @@ const got = require('@/utils/got'); const cheerio = require('cheerio'); -function getArticle(ctx, line, tasks) { - const article = ctx.cache.tryGet(line, async () => { - const a_r = await got.get(`https://app3.rthk.hk/mediadigest/${line}`); - const $ = cheerio.load(a_r.data); - // title - const h1 = $('h1.story-title').text(); - // author - const author_list = $('div.story-author'); - const authors = author_list.map((_index, author) => $(author).text()); - const author = authors.map((_index, author) => `${author}
`); - const s_author = author.toArray().join(''); - const author_block = `

${s_author}

`; - // date - const date = $('div.story-calendar').text(); - // desc - const desc = `${$(author_block)}${$('div.story-content').html()}`; +function getArticle(ctx, list) { + // for 每次可爲 rss 値推入 20 篇文章內容 + for (let start = 0; start < list.length; start += 20) { + // 建立一個切片 (20 個文章 URL) 異步獲取文章內容的任務 + let now = list.slice(start, start+20).forEach((line) => { + ctx.cache.tryGet(line, async() => { + const a_r = await got.get(`https://app3.rthk.hk/mediadigest/${line}`); + const $ = cheerio.load(a_r.data); + // title + const h1 = $('h1.story-title').text(); + // author + const author_list = $('div.story-author'); + const authors = author_list.map((_index, author) => $(author).text()); + const author = authors.map((_index, author) => `${author}
`); + const s_author = author.toArray().join(''); + const author_block = `

${s_author}

`; + // date + const date = $('div.story-calendar').text(); + // desc + const desc = `${$(author_block)}${$('div.story-content').html()}`; - return { - title: h1, - description: desc, - pubDate: new Date(`${date}T09:00:00+0800`).toUTCString(), - link: line, - }; - }); - tasks.push(article); + return { + title: h1, + description: desc, + pubDate: new Date(`${date}T09:00:00+0800`).toUTCString(), + link: line, + }; + }); + }) + // 執行一個切片 (20 個文章 URL) 的任務並將結果資料推至 rss 値 + rss.push(...(await Promise.all(now))); + } } -module.exports = async (ctx) => { +module.exports = async(ctx) => { + const range = ctx.params.range || 'latest'; const category = ctx.params.category || 'all'; - const tasks = []; - if (category !== 'all') { - const response = await got.get(`https://app3.rthk.hk/mediadigest/category.php?cid=${category}`); - const $ = cheerio.load(response.data); - const list = $('div.category-line'); - - list.map((_index, line) => $(line).find('a').first().attr('href')).each((_index, line) => { - getArticle(ctx, line, tasks); - }); - } else { - const cids = [1, 2]; - for (let i = 4; i < 28; ++i) { - cids.push(i); - } - const urls = cids.map((cid) => `https://app3.rthk.hk/mediadigest/category.php?cid=${cid}`); - const list_allt = await Promise.all( - urls.map(async (url) => { - const response = await got.get(url); - const $ = cheerio.load(response.data); - const list = $('div.category-line').map((_index, line) => $(line).find('a').first().attr('href')); - return Promise.resolve(list.toArray()); - }) - ); - const list_all = [...new Set(list_allt.flat())]; - - const list_recent_20 = list_all - .sort((a, b) => { - const aid_a = a.match(/aid=(\d+)/)[1]; - const aid_b = b.match(/aid=(\d+)/)[1]; - // reverse - return aid_b - aid_a; - }) - .slice(0, 20); - list_recent_20.forEach((line) => { - getArticle(ctx, line, tasks); - }); + // for range validation + var num = /^[0-9]+$/; + var current_year = new Date().getFullYear(); + // placeholder for rss + let rss = []; + // cid + const cids = [1, 2]; + for (let i = 4; i < 28; ++i) { + cids.push(i); } - const rss = await Promise.all(tasks); + // latest (50 articles): + // if 'all' (latest 50 articles of the site); + // else if 'cid' (all articles of a specific category); + // else 'error'. + if (range === 'latest') { + if (category === 'all') { + // 獲取全站文章 URL + const urls = cids.map((cid) => `https://app3.rthk.hk/mediadigest/category.php?cid=${cid}`); + const list_allt = await Promise.all( + urls.map(async(url) => { + const response = await got.get(url); + const $ = cheerio.load(response.data); + const list = $('div.category-line').map((_index, line) => $(line).find('a').first().attr('href')); + return Promise.resolve(list.toArray()); + }) + ); + const list_all = [...new Set(list_allt.flat())]; // removed duplicates and flatten + // 時序排列並抽取最新 50 項 + const list = list_all + .sort((a, b) => { + const aid_a = a.match(/aid=(\d+)/)[1]; + const aid_b = b.match(/aid=(\d+)/)[1]; + // reverse + return aid_b - aid_a; + }) + .slice(0, 50); + // getArticle(ctx, list); + // for 每次會可爲 rss 値段推入 20 篇文章內容 + for (let start = 0; start < list.length; start += 20) { + // 建立一個切片 (20 個文章 URL) 異步獲取文章內容的任務 + let now = list.slice(start, start+20).forEach((line) => { + ctx.cache.tryGet(line, async() => { + const a_r = await got.get(`https://app3.rthk.hk/mediadigest/${line}`); + const $ = cheerio.load(a_r.data); + // title + const h1 = $('h1.story-title').text(); + // author + const author_list = $('div.story-author'); + const authors = author_list.map((_index, author) => $(author).text()); + const author = authors.map((_index, author) => `${author}
`); + const s_author = author.toArray().join(''); + const author_block = `

${s_author}

`; + // date + const date = $('div.story-calendar').text(); + // desc + const desc = `${$(author_block)}${$('div.story-content').html()}`; + + return { + title: h1, + description: desc, + pubDate: new Date(`${date}T09:00:00+0800`).toUTCString(), + link: line, + }; + }); + }) + // 執行一個切片 (20 個文章 URL) 的任務並將結果資料推至 rss 値 + rss.push(...(await Promise.all(now))); + } + } else if (cids.includes(category)) { + // 獲取特定 category 文章目錄 + const response = await got.get(`https://app3.rthk.hk/mediadigest/category.php?cid=${category}`); + const $ = cheerio.load(response.data); + + const list = $('div.category-line').map((_index, line) => $(line).find('a').first().attr('href')).toArray(); + // getArticle(ctx, list); + // for 每次會可爲 rss 値推入 20 篇文章內容 + for (let start = 0; start < list.length; start += 20) { + // 建立一個切片 (20 個文章 URL) 異步獲取文章內容的任務 + let now = list.slice(start, start+20).forEach((line) => { + ctx.cache.tryGet(line, async() => { + const a_r = await got.get(`https://app3.rthk.hk/mediadigest/${line}`); + const $ = cheerio.load(a_r.data); + // title + const h1 = $('h1.story-title').text(); + // author + const author_list = $('div.story-author'); + const authors = author_list.map((_index, author) => $(author).text()); + const author = authors.map((_index, author) => `${author}
`); + const s_author = author.toArray().join(''); + const author_block = `

${s_author}

`; + // date + const date = $('div.story-calendar').text(); + // desc + const desc = `${$(author_block)}${$('div.story-content').html()}`; + + return { + title: h1, + description: desc, + pubDate: new Date(`${date}T09:00:00+0800`).toUTCString(), + link: line, + }; + }); + }) + // 執行一個切片 (20 個文章 URL) 的任務並將結果資料推至 rss 値 + rss.push(...(await Promise.all(now))); + } + } else { + rss = ['

Invalid :category? input.

所輸入:category?參數有誤。

所输入:category?参数有误。

']; + } + } + // year (specific year range): + // if 'all' (all articles in a specific year range); + // else 'error'. + else if (range.length === 4 && range !== 0 && num.test(range) && !((range < 1970) || (range > current_year))) { + if (category === 'all') { + // 獲取全站文章 URL + const urls = cids.map((cid) => `https://app3.rthk.hk/mediadigest/category.php?cid=${cid}`); + const list_all = await Promise.all( + // 每個任務是篩選出一個文章目錄裏需要抓取的文章 URL，以供後續「獲取全文」 + urls.map(async(url) => { + const response = await got.get(url); + const $ = cheerio.load(response.data); + // 對應文章 URL 與年份 + // Ref: https://cythilya.github.io/2016/03/13/jquery-map-grep/ + const list_t = $('div.category-line').map((_index, line) => $(line).find('a').first().attr('href')).toArray(); + const year = $('div.category-line div.pull-right').map((_index, date) => new Date($(date).text()).getFullYear()).toArray(); + // 將 list_t 與 year 一一對應，組成 JSON + // Ref: https://stackoverflow.com/questions/30124979/merge-two-arrays-into-one-javascript-object + function article(year, url) { + this.year = year; + this.url = url; + } + var dlist = []; + for (var i = 0; i < list_t.length; i++) { + dlist.push(new article(year[i], list_t[i])); + } + // 篩出 list (需要抓取的文章 URL 並組成數列) + list = dlist.filter((w) => w.year === range).map((article) => (article.url)); + return Promise.resolve(list); + }) + ); + const list = [...new Set(list_all.flat())]; // removed duplicates and flatten + // getArticle(ctx, list); + // for 每次會可爲 rss 値段推入 20 篇文章內容 + for (let start = 0; start < list.length; start += 20) { + // 建立一個切片 (20 個文章 URL) 異步獲取文章內容的任務 + let now = list.slice(start, start+20).forEach((line) => { + ctx.cache.tryGet(line, async() => { + const a_r = await got.get(`https://app3.rthk.hk/mediadigest/${line}`); + const $ = cheerio.load(a_r.data); + // title + const h1 = $('h1.story-title').text(); + // author + const author_list = $('div.story-author'); + const authors = author_list.map((_index, author) => $(author).text()); + const author = authors.map((_index, author) => `${author}
`); + const s_author = author.toArray().join(''); + const author_block = `

${s_author}

`; + // date + const date = $('div.story-calendar').text(); + // desc + const desc = `${$(author_block)}${$('div.story-content').html()}`; + + return { + title: h1, + description: desc, + pubDate: new Date(`${date}T09:00:00+0800`).toUTCString(), + link: line, + }; + }); + }) + // 執行一個切片 (20 個文章 URL) 的任務並將結果資料推至 rss 値 + rss.push(...(await Promise.all(now))); + } + } else { + rss = ['

Please do not filter with both year and category.

請不要同時限定年份及分類。

请不要同时限定年份及分类。

']; + } + } else { + rss = ['

Invalid :range input.

所輸入:range參數有誤。

所输入:range参数有误。

']; + } + +/* // 分批次处理 tasks，每次拉取 20 个 + if (rss.length === 0) { + for (let start = 0; start < tasks.length; start += 20) { + let now = task.slice(start, start+20); + rss.push(...(await Promise.all(now))); + } + } + */ ctx.state.data = { title: '傳媒透視', link: 'https://app3.rthk.hk/mediadigest/index.php', item: rss, }; -}; +}; \ No newline at end of file From d0130d9dcdff19d94ec5726351d290c40c73090f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AE=E3=83=A3=E3=83=A9?= Date: Tue, 29 Dec 2020 09:31:53 +0000 Subject: [PATCH 17/75] fix --- lib/routes/mediadigest/category.js | 156 ++++------------------------- 1 file changed, 21 insertions(+), 135 deletions(-) diff --git a/lib/routes/mediadigest/category.js b/lib/routes/mediadigest/category.js index 757541d4b9..aab44b5b81 100644 --- a/lib/routes/mediadigest/category.js +++ b/lib/routes/mediadigest/category.js @@ -1,12 +1,12 @@ const got = require('@/utils/got'); const cheerio = require('cheerio'); -function getArticle(ctx, list) { +async function getArticle(ctx, list) { // for 每次可爲 rss 値推入 20 篇文章內容 + const res = []; for (let start = 0; start < list.length; start += 20) { // 建立一個切片 (20 個文章 URL) 異步獲取文章內容的任務 - let now = list.slice(start, start+20).forEach((line) => { - ctx.cache.tryGet(line, async() => { + const now = list.slice(start, start + 20).map(async(line) => await ctx.cache.tryGet(line, async() => { const a_r = await got.get(`https://app3.rthk.hk/mediadigest/${line}`); const $ = cheerio.load(a_r.data); // title @@ -28,11 +28,11 @@ function getArticle(ctx, list) { pubDate: new Date(`${date}T09:00:00+0800`).toUTCString(), link: line, }; - }); - }) + })); // 執行一個切片 (20 個文章 URL) 的任務並將結果資料推至 rss 値 - rss.push(...(await Promise.all(now))); + res.push(...await Promise.all(now)); } + return res; } module.exports = async(ctx) => { @@ -40,10 +40,12 @@ module.exports = async(ctx) => { const category = ctx.params.category || 'all'; // for range validation - var num = /^[0-9]+$/; - var current_year = new Date().getFullYear(); + const num = /^[1-9][0-9]{3}$/; + const current_year = new Date().getFullYear(); // placeholder for rss - let rss = []; + let rss = [{ + description: '

Invalid :category? input.

所輸入:category?參數有誤。

所输入:category?参数有误。

' + }]; // cid const cids = [1, 2]; for (let i = 4; i < 28; ++i) { @@ -66,7 +68,7 @@ module.exports = async(ctx) => { return Promise.resolve(list.toArray()); }) ); - const list_all = [...new Set(list_allt.flat())]; // removed duplicates and flatten + const list_all = [...new Set(list_allt.flat())]; // removed duplicates and flatten // 時序排列並抽取最新 50 項 const list = list_all .sort((a, b) => { @@ -77,84 +79,22 @@ module.exports = async(ctx) => { }) .slice(0, 50); // getArticle(ctx, list); - // for 每次會可爲 rss 値段推入 20 篇文章內容 - for (let start = 0; start < list.length; start += 20) { - // 建立一個切片 (20 個文章 URL) 異步獲取文章內容的任務 - let now = list.slice(start, start+20).forEach((line) => { - ctx.cache.tryGet(line, async() => { - const a_r = await got.get(`https://app3.rthk.hk/mediadigest/${line}`); - const $ = cheerio.load(a_r.data); - // title - const h1 = $('h1.story-title').text(); - // author - const author_list = $('div.story-author'); - const authors = author_list.map((_index, author) => $(author).text()); - const author = authors.map((_index, author) => `${author}
`); - const s_author = author.toArray().join(''); - const author_block = `

${s_author}

`; - // date - const date = $('div.story-calendar').text(); - // desc - const desc = `${$(author_block)}${$('div.story-content').html()}`; - - return { - title: h1, - description: desc, - pubDate: new Date(`${date}T09:00:00+0800`).toUTCString(), - link: line, - }; - }); - }) - // 執行一個切片 (20 個文章 URL) 的任務並將結果資料推至 rss 値 - rss.push(...(await Promise.all(now))); - } - } else if (cids.includes(category)) { + rss = await getArticle(ctx, list); + } else if (cids.includes(parseInt(category))) { // 獲取特定 category 文章目錄 const response = await got.get(`https://app3.rthk.hk/mediadigest/category.php?cid=${category}`); const $ = cheerio.load(response.data); const list = $('div.category-line').map((_index, line) => $(line).find('a').first().attr('href')).toArray(); - // getArticle(ctx, list); - // for 每次會可爲 rss 値推入 20 篇文章內容 - for (let start = 0; start < list.length; start += 20) { - // 建立一個切片 (20 個文章 URL) 異步獲取文章內容的任務 - let now = list.slice(start, start+20).forEach((line) => { - ctx.cache.tryGet(line, async() => { - const a_r = await got.get(`https://app3.rthk.hk/mediadigest/${line}`); - const $ = cheerio.load(a_r.data); - // title - const h1 = $('h1.story-title').text(); - // author - const author_list = $('div.story-author'); - const authors = author_list.map((_index, author) => $(author).text()); - const author = authors.map((_index, author) => `${author}
`); - const s_author = author.toArray().join(''); - const author_block = `

${s_author}

`; - // date - const date = $('div.story-calendar').text(); - // desc - const desc = `${$(author_block)}${$('div.story-content').html()}`; - - return { - title: h1, - description: desc, - pubDate: new Date(`${date}T09:00:00+0800`).toUTCString(), - link: line, - }; - }); - }) - // 執行一個切片 (20 個文章 URL) 的任務並將結果資料推至 rss 値 - rss.push(...(await Promise.all(now))); - } - } else { - rss = ['

Invalid :category? input.

所輸入:category?參數有誤。

所输入:category?参数有误。

']; + rss = await getArticle(ctx, list.slice(0, 50)); } } // year (specific year range): // if 'all' (all articles in a specific year range); // else 'error'. - else if (range.length === 4 && range !== 0 && num.test(range) && !((range < 1970) || (range > current_year))) { - if (category === 'all') { + else if (num.test(range)) { + const range_num = parseInt(range); + if (category === 'all' && range_num >= 1970 && range_num <= current_year) { // 獲取全站文章 URL const urls = cids.map((cid) => `https://app3.rthk.hk/mediadigest/category.php?cid=${cid}`); const list_all = await Promise.all( @@ -164,71 +104,17 @@ module.exports = async(ctx) => { const $ = cheerio.load(response.data); // 對應文章 URL 與年份 // Ref: https://cythilya.github.io/2016/03/13/jquery-map-grep/ - const list_t = $('div.category-line').map((_index, line) => $(line).find('a').first().attr('href')).toArray(); + let list = $('div.category-line').map((_index, line) => $(line).find('a').first().attr('href')).toArray(); const year = $('div.category-line div.pull-right').map((_index, date) => new Date($(date).text()).getFullYear()).toArray(); - // 將 list_t 與 year 一一對應，組成 JSON - // Ref: https://stackoverflow.com/questions/30124979/merge-two-arrays-into-one-javascript-object - function article(year, url) { - this.year = year; - this.url = url; - } - var dlist = []; - for (var i = 0; i < list_t.length; i++) { - dlist.push(new article(year[i], list_t[i])); - } + list = list.filter((_url, i) => year[i] === range_num); // 篩出 list (需要抓取的文章 URL 並組成數列) - list = dlist.filter((w) => w.year === range).map((article) => (article.url)); return Promise.resolve(list); }) ); const list = [...new Set(list_all.flat())]; // removed duplicates and flatten - // getArticle(ctx, list); - // for 每次會可爲 rss 値段推入 20 篇文章內容 - for (let start = 0; start < list.length; start += 20) { - // 建立一個切片 (20 個文章 URL) 異步獲取文章內容的任務 - let now = list.slice(start, start+20).forEach((line) => { - ctx.cache.tryGet(line, async() => { - const a_r = await got.get(`https://app3.rthk.hk/mediadigest/${line}`); - const $ = cheerio.load(a_r.data); - // title - const h1 = $('h1.story-title').text(); - // author - const author_list = $('div.story-author'); - const authors = author_list.map((_index, author) => $(author).text()); - const author = authors.map((_index, author) => `${author}
`); - const s_author = author.toArray().join(''); - const author_block = `

${s_author}

`; - // date - const date = $('div.story-calendar').text(); - // desc - const desc = `${$(author_block)}${$('div.story-content').html()}`; - - return { - title: h1, - description: desc, - pubDate: new Date(`${date}T09:00:00+0800`).toUTCString(), - link: line, - }; - }); - }) - // 執行一個切片 (20 個文章 URL) 的任務並將結果資料推至 rss 値 - rss.push(...(await Promise.all(now))); - } - } else { - rss = ['

Please do not filter with both year and category.

請不要同時限定年份及分類。

请不要同时限定年份及分类。

']; - } - } else { - rss = ['

Invalid :range input.

所輸入:range參數有誤。

所输入:range参数有误。

']; - } - -/* // 分批次处理 tasks，每次拉取 20 个 - if (rss.length === 0) { - for (let start = 0; start < tasks.length; start += 20) { - let now = task.slice(start, start+20); - rss.push(...(await Promise.all(now))); + rss = await getArticle(ctx, list); } } - */ ctx.state.data = { title: '傳媒透視', From 473cc49d020b3b1611dd8600351935ba00a1514b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AE=E3=83=A3=E3=83=A9?= Date: Tue, 29 Dec 2020 09:34:39 +0000 Subject: [PATCH 18/75] just async --- lib/routes/mediadigest/category.js | 47 +++++++++++++++++------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/lib/routes/mediadigest/category.js b/lib/routes/mediadigest/category.js index aab44b5b81..3fae548b7f 100644 --- a/lib/routes/mediadigest/category.js +++ b/lib/routes/mediadigest/category.js @@ -2,11 +2,9 @@ const got = require('@/utils/got'); const cheerio = require('cheerio'); async function getArticle(ctx, list) { - // for 每次可爲 rss 値推入 20 篇文章內容 - const res = []; - for (let start = 0; start < list.length; start += 20) { - // 建立一個切片 (20 個文章 URL) 異步獲取文章內容的任務 - const now = list.slice(start, start + 20).map(async(line) => await ctx.cache.tryGet(line, async() => { + const now = list.map( + async (line) => + await ctx.cache.tryGet(line, async () => { const a_r = await got.get(`https://app3.rthk.hk/mediadigest/${line}`); const $ = cheerio.load(a_r.data); // title @@ -28,14 +26,13 @@ async function getArticle(ctx, list) { pubDate: new Date(`${date}T09:00:00+0800`).toUTCString(), link: line, }; - })); - // 執行一個切片 (20 個文章 URL) 的任務並將結果資料推至 rss 値 - res.push(...await Promise.all(now)); - } - return res; + }) + ); + // 執行一個切片 (20 個文章 URL) 的任務並將結果資料推至 rss 値 + return await Promise.all(now); } -module.exports = async(ctx) => { +module.exports = async (ctx) => { const range = ctx.params.range || 'latest'; const category = ctx.params.category || 'all'; @@ -43,9 +40,11 @@ module.exports = async(ctx) => { const num = /^[1-9][0-9]{3}$/; const current_year = new Date().getFullYear(); // placeholder for rss - let rss = [{ - description: '

Invalid :category? input.

所輸入:category?參數有誤。

所输入:category?参数有误。

' - }]; + let rss = [ + { + description: '

Invalid :category? input.

所輸入:category?參數有誤。

所输入:category?参数有误。

', + }, + ]; // cid const cids = [1, 2]; for (let i = 4; i < 28; ++i) { @@ -61,7 +60,7 @@ module.exports = async(ctx) => { // 獲取全站文章 URL const urls = cids.map((cid) => `https://app3.rthk.hk/mediadigest/category.php?cid=${cid}`); const list_allt = await Promise.all( - urls.map(async(url) => { + urls.map(async (url) => { const response = await got.get(url); const $ = cheerio.load(response.data); const list = $('div.category-line').map((_index, line) => $(line).find('a').first().attr('href')); @@ -85,7 +84,9 @@ module.exports = async(ctx) => { const response = await got.get(`https://app3.rthk.hk/mediadigest/category.php?cid=${category}`); const $ = cheerio.load(response.data); - const list = $('div.category-line').map((_index, line) => $(line).find('a').first().attr('href')).toArray(); + const list = $('div.category-line') + .map((_index, line) => $(line).find('a').first().attr('href')) + .toArray(); rss = await getArticle(ctx, list.slice(0, 50)); } } @@ -99,20 +100,24 @@ module.exports = async(ctx) => { const urls = cids.map((cid) => `https://app3.rthk.hk/mediadigest/category.php?cid=${cid}`); const list_all = await Promise.all( // 每個任務是篩選出一個文章目錄裏需要抓取的文章 URL，以供後續「獲取全文」 - urls.map(async(url) => { + urls.map(async (url) => { const response = await got.get(url); const $ = cheerio.load(response.data); // 對應文章 URL 與年份 // Ref: https://cythilya.github.io/2016/03/13/jquery-map-grep/ - let list = $('div.category-line').map((_index, line) => $(line).find('a').first().attr('href')).toArray(); - const year = $('div.category-line div.pull-right').map((_index, date) => new Date($(date).text()).getFullYear()).toArray(); + let list = $('div.category-line') + .map((_index, line) => $(line).find('a').first().attr('href')) + .toArray(); + const year = $('div.category-line div.pull-right') + .map((_index, date) => new Date($(date).text()).getFullYear()) + .toArray(); list = list.filter((_url, i) => year[i] === range_num); // 篩出 list (需要抓取的文章 URL 並組成數列) return Promise.resolve(list); }) ); const list = [...new Set(list_all.flat())]; // removed duplicates and flatten - rss = await getArticle(ctx, list); + rss = await getArticle(ctx, list.slice(0, 50)); } } @@ -121,4 +126,4 @@ module.exports = async(ctx) => { link: 'https://app3.rthk.hk/mediadigest/index.php', item: rss, }; -}; \ No newline at end of file +}; From 7deee8ea6fded632116e55c16c30e2dfd99f6c20 Mon Sep 17 00:00:00 2001 From: zph Date: Tue, 29 Dec 2020 17:43:46 +0800 Subject: [PATCH 19/75] Added Radio Free Asia --- docs/en/traditional-media.md | 12 +++++++++ docs/traditional-media.md | 12 +++++++++ lib/router.js | 3 +++ lib/routes/rfa/index.js | 47 ++++++++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+) create mode 100644 lib/routes/rfa/index.js diff --git a/docs/en/traditional-media.md b/docs/en/traditional-media.md index 983211fe80..4f942f500e 100644 --- a/docs/en/traditional-media.md +++ b/docs/en/traditional-media.md @@ -149,6 +149,18 @@ Generates full-text feeds that the official feed doesn't provide. +## Radio Free Asia (RFA) + + + +Delivers a better experience by supporting parameter specification. + +Parameters can be obtained from the official website, for instance: + +`https://www.rfa.org/cantonese/news` corresponds to `/rfa/cantonese/news` + +`https://www.rfa.org/cantonese/news/htm` corresponds to `/rfa/cantonese/news/htm` + ## Reuters ### Channel diff --git a/docs/traditional-media.md b/docs/traditional-media.md index 94db156aeb..6281d1bee8 100644 --- a/docs/traditional-media.md +++ b/docs/traditional-media.md @@ -965,3 +965,15 @@ category 对应的关键词有 ### 九江新闻 + +## 自由亚洲电台 + + + +通过指定频道参数，提供比官方源更佳的阅读体验。 + +参数均可在官网获取，如： + +`https://www.rfa.org/cantonese/news` 对应 `/rfa/cantonese/news` + +`https://www.rfa.org/cantonese/news/htm` 对应 `/rfa/cantonese/news/htm` diff --git a/lib/router.js b/lib/router.js index 5bb0f656c3..7ca17dea0b 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3780,4 +3780,7 @@ router.get('/nace/blog/:sort?', require('./routes/nace/blog')); // Caixin Latest router.get('/caixin/latest', require('./routes/caixin/latest')); +// Radio Free Asia +router.get('/rfa/:language?/:channel?/:subChannel?', require('./routes/rfa/index')); + module.exports = router; diff --git a/lib/routes/rfa/index.js b/lib/routes/rfa/index.js new file mode 100644 index 0000000000..90791eb2fc --- /dev/null +++ b/lib/routes/rfa/index.js @@ -0,0 +1,47 @@ +const cheerio = require('cheerio'); +const got = require('@/utils/got'); + +module.exports = async (ctx) => { + let url = 'https://www.rfa.org/' + (ctx.params.language || 'english'); + + if (ctx.params.channel) { + url += '/' + ctx.params.channel; + } + if (ctx.params.subChannel) { + url += '/' + ctx.params.subChannel; + } + + const response = await got.get(url); + const $ = cheerio.load(response.data); + + const selectors = ['div[id=topstorywidefulltease]', 'div.two_featured', 'div.three_featured', 'div.single_column_teaser', 'div.sectionteaser', 'div.specialwrap']; + const list = []; + selectors.forEach(function (selector) { + $(selector).each(function (_, e) { + const item = {}; + item.title = $(e).find('h2 a span').first().text(); + item.link = $(e).find('h2 a').first().attr('href'); + list.push(item); + }); + }); + + const result = await Promise.all( + list.map( + async (item) => + await ctx.cache.tryGet(item.link, async () => { + const content = await got.get(item.link); + + const description = cheerio.load(content.data); + item.description = description('div[id=storytext]').html(); + item.pubDate = new Date(description('span[id=story_date]').text()).toUTCString(); + return item; + }) + ) + ); + + ctx.state.data = { + title: 'RFA', + link: 'https://www.rfa.org/', + item: result, + }; +}; From 43476500df54426a887a1f31058204806342f2f0 Mon Sep 17 00:00:00 2001 From: TheresaQWQ Date: Tue, 29 Dec 2020 10:35:10 +0000 Subject: [PATCH 20/75] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E9=B1=BC=E5=A1=98?= =?UTF-8?q?=E7=83=AD=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/new-media.md | 4 ++++ lib/router.js | 3 +++ lib/routes/mofish/index.js | 29 +++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 lib/routes/mofish/index.js diff --git a/docs/new-media.md b/docs/new-media.md index dea896d573..bf7fcddde1 100644 --- a/docs/new-media.md +++ b/docs/new-media.md @@ -2109,3 +2109,7 @@ QueryString: ### 全文 + +## 鱼塘热榜 + + \ No newline at end of file diff --git a/lib/router.js b/lib/router.js index 5bb0f656c3..dfc51508a3 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3780,4 +3780,7 @@ router.get('/nace/blog/:sort?', require('./routes/nace/blog')); // Caixin Latest router.get('/caixin/latest', require('./routes/caixin/latest')); +// 鱼塘热榜 +router.get('/mofish/:id', require('./routes/mofish/index')); + module.exports = router; diff --git a/lib/routes/mofish/index.js b/lib/routes/mofish/index.js new file mode 100644 index 0000000000..f99bf3087d --- /dev/null +++ b/lib/routes/mofish/index.js @@ -0,0 +1,29 @@ +const got = require('@/utils/got'); + +module.exports = async (ctx) => { + const id = ctx.params.id; + const page = ctx.query.page || 0; + + const url = `https://api.tophub.fun/v2/GetAllInfoGzip?id=${id}&page=${page}`; + + const response = await got({ + method: 'get', + url: url, + }); + + const data = response.data.Data.data; + + const title = `鱼塘热榜`; + + ctx.state.data = { + title: title, + link: `https://mo.fish/`, + description: title, + item: data.map((item) => ({ + title: item.Title, + pubDate: new Date(item.releaseTime).toUTCString(), + link: item.Url, + guid: item.id, + })), + }; +}; \ No newline at end of file From 961636aebdcfe3965521821f67eff9dad4e9ffe7 Mon Sep 17 00:00:00 2001 From: Toby Tso Date: Tue, 29 Dec 2020 19:59:57 +0800 Subject: [PATCH 21/75] WIP: add Media Digest --- docs/traditional-media.md | 17 +++++++++++++++++ lib/routes/mediadigest/category.js | 14 ++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/docs/traditional-media.md b/docs/traditional-media.md index c9347c4f19..ec3c01e659 100644 --- a/docs/traditional-media.md +++ b/docs/traditional-media.md @@ -957,3 +957,20 @@ category 对应的关键词有 ### 九江新闻 + +### RTHK 傳媒透視 + + + +细则: + +- `:range` 时间范围参数 + (可为 `latest` 或 `四位数字的年份`) + + - `latest`: 最新的 50 篇文章 + - `2020`: 2020 年的所有文章 + +- 全文输出转换为简体字: `?opencc=t2s` + (`opencc` 是 RSSHub 的通用参数，详情请参阅 [「中文简繁体转换」](https://docs.rsshub.app/parameter.html#zhong-wen-jian-fan-ti-zhuan-huan)) + + diff --git a/lib/routes/mediadigest/category.js b/lib/routes/mediadigest/category.js index 3fae548b7f..9c41c61b77 100644 --- a/lib/routes/mediadigest/category.js +++ b/lib/routes/mediadigest/category.js @@ -39,10 +39,11 @@ module.exports = async (ctx) => { // for range validation const num = /^[1-9][0-9]{3}$/; const current_year = new Date().getFullYear(); - // placeholder for rss + // placeholders + let title = '傳媒透視'; let rss = [ { - description: '

Invalid :category? input.

所輸入:category?參數有誤。

所输入:category?参数有误。

', + description: '

Invalid :range input.

所輸入:range參數有誤。

所输入:range参数有误。

', }, ]; // cid @@ -53,7 +54,7 @@ module.exports = async (ctx) => { // latest (50 articles): // if 'all' (latest 50 articles of the site); - // else if 'cid' (all articles of a specific category); + // else if 'cid' (deprecated) (latest 50 articles of a specific category); // else 'error'. if (range === 'latest') { if (category === 'all') { @@ -91,7 +92,7 @@ module.exports = async (ctx) => { } } // year (specific year range): - // if 'all' (all articles in a specific year range); + // if 'all' (latest 200 articles in a specific year range); // else 'error'. else if (num.test(range)) { const range_num = parseInt(range); @@ -117,12 +118,13 @@ module.exports = async (ctx) => { }) ); const list = [...new Set(list_all.flat())]; // removed duplicates and flatten - rss = await getArticle(ctx, list.slice(0, 50)); + rss = await getArticle(ctx, list.slice(0, 200)); + title = `傳媒透視 - ${range}`; } } ctx.state.data = { - title: '傳媒透視', + title: title, link: 'https://app3.rthk.hk/mediadigest/index.php', item: rss, }; From c4e820decc996c4b4219ba04d35d0e04403f5854 Mon Sep 17 00:00:00 2001 From: Toby Tso Date: Tue, 29 Dec 2020 20:02:22 +0800 Subject: [PATCH 22/75] WIP: fix doc --- docs/traditional-media.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/traditional-media.md b/docs/traditional-media.md index ec3c01e659..771130a6c7 100644 --- a/docs/traditional-media.md +++ b/docs/traditional-media.md @@ -181,6 +181,23 @@ pageClass: routes +## RTHK 傳媒透視 + + + +细则: + +- `:range` 时间范围参数 + (可为 `latest` 或 `四位数字的年份`) + + - `latest`: 最新的 50 篇文章 + - `2020`: 2020 年的所有文章 + +- 全文输出转换为简体字: `?opencc=t2s` + (`opencc` 是 RSSHub 的通用参数，详情请参阅 [「中文简繁体转换」](https://docs.rsshub.app/parameter.html#zhong-wen-jian-fan-ti-zhuan-huan)) + + + ## Solidot ### 最新消息 @@ -957,20 +974,3 @@ category 对应的关键词有 ### 九江新闻 - -### RTHK 傳媒透視 - - - -细则: - -- `:range` 时间范围参数 - (可为 `latest` 或 `四位数字的年份`) - - - `latest`: 最新的 50 篇文章 - - `2020`: 2020 年的所有文章 - -- 全文输出转换为简体字: `?opencc=t2s` - (`opencc` 是 RSSHub 的通用参数，详情请参阅 [「中文简繁体转换」](https://docs.rsshub.app/parameter.html#zhong-wen-jian-fan-ti-zhuan-huan)) - - From 823b2fc236f7788b96e338960fe11ba51988f0fb Mon Sep 17 00:00:00 2001 From: "St. John Johnson" Date: Tue, 29 Dec 2020 21:00:13 -0800 Subject: [PATCH 23/75] Adding GoComics.com and ComicsKingdom.com --- docs/en/picture.md | 8 ++++ lib/router.js | 6 +++ lib/routes/comicskingdom/index.js | 62 ++++++++++++++++++++++++++++++ lib/routes/gocomics/index.js | 64 +++++++++++++++++++++++++++++++ 4 files changed, 140 insertions(+) create mode 100644 lib/routes/comicskingdom/index.js create mode 100644 lib/routes/gocomics/index.js diff --git a/docs/en/picture.md b/docs/en/picture.md index cd3cb4f024..f41db20042 100644 --- a/docs/en/picture.md +++ b/docs/en/picture.md @@ -42,6 +42,10 @@ pageClass: routes +## ComicsKingdom Comic Strips + + + ## DailyArt @@ -50,6 +54,10 @@ pageClass: routes +## GoComics Comic Strips + + + ## Google Doodles ### Update diff --git a/lib/router.js b/lib/router.js index 5bb0f656c3..4fed5ed9f9 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3780,4 +3780,10 @@ router.get('/nace/blog/:sort?', require('./routes/nace/blog')); // Caixin Latest router.get('/caixin/latest', require('./routes/caixin/latest')); +// GoComics +router.get('/gocomics/:name', require('./routes/gocomics/index')); + +// Comics Kingdom +router.get('/comicskingdom/:name', require('./routes/comicskingdom/index')); + module.exports = router; diff --git a/lib/routes/comicskingdom/index.js b/lib/routes/comicskingdom/index.js new file mode 100644 index 0000000000..3a81c7b47b --- /dev/null +++ b/lib/routes/comicskingdom/index.js @@ -0,0 +1,62 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + const baseURL = 'https://www.comicskingdom.com'; + const name = ctx.params.name; + const url = `${baseURL}/${name}/archive`; + const response = await got({ + method: 'get', + url: url, + }); + + const data = response.data; + const $ = cheerio.load(data); + + // Determine Comic and Author from main page + const comic = $('title').text().replace('Comics Kingdom - ', '').trim(); + const author = $('div.author p').text(); + + // Find the links for all non-archived items + const links = $('div.archive-tile[data-is-blocked=false]') + .map((i, el) => $(el).find('a[data-prem="Comic Tile"]').first().attr('href')) + .get() + .map((url) => `${baseURL}${url}`); + + if (links.length === 0) { + throw `Comic Not Found - ${name}`; + } + const items = await Promise.all( + links.map( + async (link) => + await ctx.cache.tryGet(link, async () => { + const detailResponse = await got({ + method: 'get', + url: link, + }); + const content = cheerio.load(detailResponse.data); + + const title = content('title').text(); + const image = content('meta[property="og:image"]').attr('content'); + const description = ``; + // Pull the date out of the URL + const pubDate = new Date(link.split('/').slice(-3).join('/')).toUTCString(); + + return { + title: title, + author: author, + category: 'comic', + description: description, + pubDate: pubDate, + link: link, + }; + }) + ) + ); + + ctx.state.data = { + title: `${comic} - Comics Kingdom`, + link: url, + item: items, + }; +}; diff --git a/lib/routes/gocomics/index.js b/lib/routes/gocomics/index.js new file mode 100644 index 0000000000..b743418358 --- /dev/null +++ b/lib/routes/gocomics/index.js @@ -0,0 +1,64 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + const baseURL = 'https://www.gocomics.com'; + const name = ctx.params.name; + const limit = ctx.query.limit || 5; + const url = `${baseURL}/${name}/`; + const response = await got({ + method: 'get', + url: url, + }); + + const data = response.data; + const $ = cheerio.load(data); + + // Determine Comic and Author from main page + const comic = $('.media-heading').eq(0).text(); + const author = $('.media-subheading').eq(0).text().replace('By ', ''); + + // Load previous comic URL + const items = []; + let previous = $('.gc-deck--cta-0 a').attr('href'); + + if (!previous) { + throw `Comic Not Found - ${name}`; + } + + while (items.length < limit) { + const link = `${baseURL}${previous}`; + /* eslint-disable no-await-in-loop */ + const item = await ctx.cache.tryGet(link, async () => { + const detailResponse = await got({ + method: 'get', + url: link, + }); + const content = cheerio.load(detailResponse.data); + + const title = content('h1.m-0').eq(0).text(); + const image = content('.comic.container').eq(0).attr('data-image'); + const description = ``; + // Pull the date out of the URL + const pubDate = new Date(link.split('/').slice(-3).join('/')).toUTCString(); + const previous = content('.js-previous-comic').eq(0).attr('href'); + + return { + title: title, + author: author, + category: 'comic', + description: description, + pubDate: pubDate, + link: link, + previous: previous, + }; + }); + items.push(item); + previous = item.previous; + } + ctx.state.data = { + title: `${comic} - GoComics`, + link: url, + item: items, + }; +}; From b823e5f9e84b75c7538412d12d12032f5d8e96be Mon Sep 17 00:00:00 2001 From: zph Date: Wed, 30 Dec 2020 16:04:10 +0800 Subject: [PATCH 24/75] Added top stories route for AP --- docs/en/traditional-media.md | 4 +++ docs/traditional-media.md | 4 +++ lib/router.js | 1 + lib/routes/apnews/index.js | 54 ++++++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+) create mode 100644 lib/routes/apnews/index.js diff --git a/docs/en/traditional-media.md b/docs/en/traditional-media.md index 983211fe80..d28621dfd2 100644 --- a/docs/en/traditional-media.md +++ b/docs/en/traditional-media.md @@ -20,6 +20,10 @@ Site ## AP News +### Top Stories + + + ### Topics diff --git a/docs/traditional-media.md b/docs/traditional-media.md index 94db156aeb..a574998f57 100644 --- a/docs/traditional-media.md +++ b/docs/traditional-media.md @@ -26,6 +26,10 @@ pageClass: routes ## AP News +### 首页头条 + + + ### 话题 diff --git a/lib/router.js b/lib/router.js index 5bb0f656c3..7e1e6838ad 100644 --- a/lib/router.js +++ b/lib/router.js @@ -2490,6 +2490,7 @@ router.get('/gbcc/trust', require('./routes/gbcc/trust')); // Associated Press router.get('/apnews/topics/:topic', require('./routes/apnews/topics')); +router.get('/apnews', require('./routes/apnews/index')); // CBC router.get('/cbc/topics/:topic?', require('./routes/cbc/topics')); diff --git a/lib/routes/apnews/index.js b/lib/routes/apnews/index.js new file mode 100644 index 0000000000..a59c24f1de --- /dev/null +++ b/lib/routes/apnews/index.js @@ -0,0 +1,54 @@ +const cheerio = require('cheerio'); +const got = require('@/utils/got'); + +module.exports = async (ctx) => { + const response = await got.get('https://apnews.com/'); + const $ = cheerio.load(response.data); + const list = []; + + // main story component + const main = $('div[data-key=main-story]').first(); + + // headline news + const headline = {}; + headline.title = $(main).find('a[data-key=card-headline] h1').first().text(); + headline.link = 'https://apnews.com' + $(main).find('a[data-key=card-headline]').first().attr('href'); + list.push(headline); + + // related stories + $(main) + .find('a[data-key=related-story-link]') + .each(function (_, e) { + const item = {}; + item.title = $(e).find('div[data-key=related-story-headline]').first().text(); + item.link = 'https://apnews.com' + $(e).attr('href'); + list.push(item); + }); + + const result = await Promise.all( + list.map( + async (item) => + await ctx.cache.tryGet(item.link, async () => { + const content = await got.get(item.link); + + const description = cheerio.load(content.data); + const metadata = JSON.parse(description('script[type="application/ld+json"]').html()); + const featureImageURL = metadata.image; + + item.description = ``; + item.description += description('div[class=Article]') + .html() + .replace(/ADVERTISEMENT/g, ''); + item.pubDate = new Date(metadata.datePublished).toISOString(); + item.author = metadata.author[0]; + return item; + }) + ) + ); + + ctx.state.data = { + title: 'Associated Press News', + link: 'https://apnews.com/', + item: result, + }; +}; From 8f7f5918c081e34aece243c0337fa69ccc58f487 Mon Sep 17 00:00:00 2001 From: nczitzk Date: Wed, 30 Dec 2020 19:00:59 +0800 Subject: [PATCH 25/75] =?UTF-8?q?feat:=20add=20=E4=B8=AD=E5=9B=BD=E5=86=9C?= =?UTF-8?q?=E5=B7=A5=E6=B0=91=E4=B8=BB=E5=85=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/government.md | 12 +++++++++ lib/router.js | 3 +++ lib/routes/gov/ngd/index.js | 52 +++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 lib/routes/gov/ngd/index.js diff --git a/docs/government.md b/docs/government.md index 7787edca28..eb76ada010 100644 --- a/docs/government.md +++ b/docs/government.md @@ -185,6 +185,18 @@ pageClass: routes +## 中国农工民主党 + +### 新闻中心 + + + +将目标栏目的网址拆解为 `http://www.ngd.org.cn/` 和后面的字段，去掉 `.htm` 后，把后面的字段中的 `/` 替换为 `-`，即为该路由的 slug + +如：(要闻动态)[http://www.ngd.org.cn/xwzx/ywdt/index.htm] 的网址在 `http://www.ngd.org.cn/` 后的字段是 `xwzx/ywdt/index.htm`，则对应的 slug 为 `xwzx-ywdt-index`，对应的路由即为 `/ngd/xwzx-ywdt-index` + + + ## 中国人大网 diff --git a/lib/router.js b/lib/router.js index 5bb0f656c3..7bb0603bec 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3780,4 +3780,7 @@ router.get('/nace/blog/:sort?', require('./routes/nace/blog')); // Caixin Latest router.get('/caixin/latest', require('./routes/caixin/latest')); +// 中国农工民主党 +router.get('/ngd/:slug?', require('./routes/gov/ngd/index')); + module.exports = router; diff --git a/lib/routes/gov/ngd/index.js b/lib/routes/gov/ngd/index.js new file mode 100644 index 0000000000..5dfd996fe9 --- /dev/null +++ b/lib/routes/gov/ngd/index.js @@ -0,0 +1,52 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + const slug = ctx.params.slug || 'xwzx-ywdt-index'; + + const rootUrl = 'http://www.ngd.org.cn'; + const currentUrl = `${rootUrl}/${slug.replace(/-/g, '/')}.htm`; + const response = await got({ + method: 'get', + url: currentUrl, + }); + + const $ = cheerio.load(response.data); + + const list = $('.gp-ellipsis a') + .slice(0, 15) + .map((_, item) => { + item = $(item); + return { + title: item.text(), + link: `${currentUrl.replace('/index.htm', '')}/${item.attr('href')}`, + }; + }) + .get(); + + const items = await Promise.all( + list.map( + async (item) => + await ctx.cache.tryGet(item.link, async () => { + const detailResponse = await got({ + method: 'get', + url: item.link, + }); + const content = cheerio.load(detailResponse.data); + const info = content('.articleAuthor').text().split('|'); + + item.author = info[0].replace('来源：', ''); + item.description = content('.gp-article').html(); + item.pubDate = new Date(info[info.length - 1].replace('发布时间：', '')).toUTCString(); + + return item; + }) + ) + ); + + ctx.state.data = { + title: $('title').text(), + link: currentUrl, + item: items, + }; +}; From 27477a37e03cc5e6b976ea0dd2e14894882423b8 Mon Sep 17 00:00:00 2001 From: zph Date: Wed, 30 Dec 2020 21:17:29 +0800 Subject: [PATCH 26/75] Added Pincong --- docs/bbs.md | 18 +++++++++++++++++ lib/router.js | 5 +++++ lib/routes/pincong/hot.js | 33 ++++++++++++++++++++++++++++++ lib/routes/pincong/index.js | 40 +++++++++++++++++++++++++++++++++++++ lib/routes/pincong/topic.js | 32 +++++++++++++++++++++++++++++ 5 files changed, 128 insertions(+) create mode 100644 lib/routes/pincong/hot.js create mode 100644 lib/routes/pincong/index.js create mode 100644 lib/routes/pincong/topic.js diff --git a/docs/bbs.md b/docs/bbs.md index 0a557cbee5..989d4c97b3 100644 --- a/docs/bbs.md +++ b/docs/bbs.md @@ -395,6 +395,24 @@ pageClass: routes +## 品葱 + +### 发现 + + + +| 最新 | 推荐 | 热门 | +| ---- | --------- | ---- | +| new | recommend | hot | + +### 精选 + + + +### 话题 + + + ## 三星盖乐世社区 ### 最新帖子 diff --git a/lib/router.js b/lib/router.js index 5bb0f656c3..150c32d695 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3780,4 +3780,9 @@ router.get('/nace/blog/:sort?', require('./routes/nace/blog')); // Caixin Latest router.get('/caixin/latest', require('./routes/caixin/latest')); +// Pincong 品葱 +router.get('/pincong/category/:category?/:sort?', require('./routes/pincong/index')); +router.get('/pincong/hot/:category?', require('./routes/pincong/hot')); +router.get('/pincong/topic/:topic', require('./routes/pincong/topic')); + module.exports = router; diff --git a/lib/routes/pincong/hot.js b/lib/routes/pincong/hot.js new file mode 100644 index 0000000000..0f65af2ab5 --- /dev/null +++ b/lib/routes/pincong/hot.js @@ -0,0 +1,33 @@ +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + let url = 'https://pincong.rocks/hot/list/'; + + url += ctx.params.category ? 'category-' + ctx.params.category : 'category-0'; + + // use Puppeteer due to the obstacle by cloudflare challenge + const browser = await require('@/utils/puppeteer')(); + const page = await browser.newPage(); + await page.goto(url); + const html = await page.evaluate( + // eslint-disable-next-line no-undef + () => document.documentElement.innerHTML + ); + + browser.close(); + + const $ = cheerio.load(html); + const list = $('div.aw-item'); + + ctx.state.data = { + title: '品葱 - 精选', + link: 'https://pincong.rocks/hot/', + item: list + .map((_, item) => ({ + title: $(item).find('h2 a').text().trim(), + description: $(item).find('div.markitup-box').html(), + link: 'https://pincong.rocks' + $(item).find('div.mod-head h2 a').attr('href'), + })) + .get(), + }; +}; diff --git a/lib/routes/pincong/index.js b/lib/routes/pincong/index.js new file mode 100644 index 0000000000..f1553de5f2 --- /dev/null +++ b/lib/routes/pincong/index.js @@ -0,0 +1,40 @@ +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + let url = 'https://pincong.rocks/'; + + const sortMap = { + new: 'sort_type-new', + recommend: 'recommend-1', + hot: 'sort_type-hot__day2', + }; + + url += (ctx.params.sort && sortMap[ctx.params.sort]) || 'recommend-1'; + url += ctx.params.category ? '__category-' + ctx.params.category : ''; + + // use Puppeteer due to the obstacle by cloudflare challenge + const browser = await require('@/utils/puppeteer')(); + const page = await browser.newPage(); + await page.goto(url); + const html = await page.evaluate( + // eslint-disable-next-line no-undef + () => document.querySelector('div.aw-common-list').innerHTML + ); + + browser.close(); + + const $ = cheerio.load(html); + const list = $('div.aw-item'); + + ctx.state.data = { + title: '品葱 - 发现', + link: url, + item: list + .map((_, item) => ({ + title: $(item).find('h4 a').text().trim(), + link: 'https://pincong.rocks' + $(item).find('h4 a').attr('href'), + pubDate: new Date($(item).attr('data-timestamp') * 1000).toISOString(), + })) + .get(), + }; +}; diff --git a/lib/routes/pincong/topic.js b/lib/routes/pincong/topic.js new file mode 100644 index 0000000000..2659515f80 --- /dev/null +++ b/lib/routes/pincong/topic.js @@ -0,0 +1,32 @@ +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + const url = 'https://pincong.rocks/topic/' + ctx.params.topic; + + // use Puppeteer due to the obstacle by cloudflare challenge + const browser = await require('@/utils/puppeteer')(); + const page = await browser.newPage(); + await page.goto(url); + const html = await page.evaluate( + () => + // eslint-disable-next-line no-undef + (document.querySelector('div.aw-common-list') && document.querySelector('div.aw-common-list').innerHTML) || '' + ); + + browser.close(); + + const $ = cheerio.load(html); + const list = $('div.aw-item'); + + ctx.state.data = { + title: `品葱 - ${ctx.params.topic}`, + link: url, + item: list + .map((_, item) => ({ + title: $(item).find('h4 a').text().trim(), + link: 'https://pincong.rocks' + $(item).find('h4 a').attr('href'), + pubDate: new Date($(item).attr('data-timestamp') * 1000).toISOString(), + })) + .get(), + }; +}; From 0f4c9e00fd72760477713e5d9ff50fc857729570 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 30 Dec 2020 20:59:18 +0000 Subject: [PATCH 27/75] chore(deps): bump query-string from 6.13.7 to 6.13.8 Bumps [query-string](https://github.com/sindresorhus/query-string) from 6.13.7 to 6.13.8. - [Release notes](https://github.com/sindresorhus/query-string/releases) - [Commits](https://github.com/sindresorhus/query-string/compare/v6.13.7...v6.13.8) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ff684507dc..a733513d76 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "pidusage": "2.0.21", "plist": "3.0.1", "puppeteer": "5.5.0", - "query-string": "6.13.7", + "query-string": "6.13.8", "redis": "3.0.2", "require-all": "3.0.0", "rss-parser": "3.9.0", diff --git a/yarn.lock b/yarn.lock index c2b27d07d3..1fe15db066 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10626,10 +10626,10 @@ qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== -query-string@6.13.7, query-string@^6.2.0: - version "6.13.7" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.13.7.tgz#af53802ff6ed56f3345f92d40a056f93681026ee" - integrity sha512-CsGs8ZYb39zu0WLkeOhe0NMePqgYdAuCqxOYKDR5LVCytDZYMGx3Bb+xypvQvPHVPijRXB0HZNFllCzHRe4gEA== +query-string@6.13.8, query-string@^6.2.0: + version "6.13.8" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.13.8.tgz#8cf231759c85484da3cf05a851810d8e825c1159" + integrity sha512-jxJzQI2edQPE/NPUOusNjO/ZOGqr1o2OBa/3M00fU76FsLXDVbJDv/p7ng5OdQyorKrkRz1oqfwmbe5MAMePQg== dependencies: decode-uri-component "^0.2.0" split-on-first "^1.0.0" From 925b2ee523df83ca389ae2d0aa6bdcf78617aa5b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 30 Dec 2020 21:06:52 +0000 Subject: [PATCH 28/75] chore(deps): bump rss-parser from 3.9.0 to 3.10.0 Bumps [rss-parser](https://github.com/bobby-brennan/rss-parser) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/bobby-brennan/rss-parser/releases) - [Commits](https://github.com/bobby-brennan/rss-parser/compare/v3.9.0...v3.10.0) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a733513d76..e3912b7d9b 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "query-string": "6.13.8", "redis": "3.0.2", "require-all": "3.0.0", - "rss-parser": "3.9.0", + "rss-parser": "3.10.0", "showdown": "1.9.1", "socks-proxy-agent": "5.0.0", "string-similarity": "^4.0.3", diff --git a/yarn.lock b/yarn.lock index 1fe15db066..2285e4518c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11260,10 +11260,10 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rss-parser@3.9.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/rss-parser/-/rss-parser-3.9.0.tgz#469a1201619d155e902b073c4f495c589943085a" - integrity sha512-wlRSfGrotOXuWo19Dtl2KmQt7o9i5zzCExUrxpechE0O54BAx7JD+xhWyGumPPqiJj771ndflV3sE3bTHen0HQ== +rss-parser@3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/rss-parser/-/rss-parser-3.10.0.tgz#19a8bcc569981832180a87fe58a17f1838ca3a45" + integrity sha512-TC6FNvEmdFeaW6r/60MSJT7cp4d95X4M9As+mvNtxRx7YXHxpV95syMnWZthZSeD1BRN7SEKdq6c3nxMLQRopw== dependencies: entities "^2.0.3" xml2js "^0.4.19" From 3d7eadb502ba5c5eadfabf1170e03ccfdd683e2d Mon Sep 17 00:00:00 2001 From: zph Date: Fri, 1 Jan 2021 02:05:30 +0800 Subject: [PATCH 29/75] Fixed iDaily error --- lib/routes/idaily/index.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/routes/idaily/index.js b/lib/routes/idaily/index.js index 3205f932a2..9c3567c3bd 100644 --- a/lib/routes/idaily/index.js +++ b/lib/routes/idaily/index.js @@ -6,19 +6,12 @@ module.exports = async (ctx) => { url: 'http://idaily-cdn.idailycdn.com/api/list/v3/iphone/zh-hans?page=1&ver=iphone', }); - const data = response.data; - - let dataToday = data.filter((item) => item.pubdate_timestamp * 1000 >= new Date().getTime() - 86400000); - - // leverage yesterday's items if today's not published yet - if (dataToday.length === 0) { - dataToday = data.filter((item) => item.pubdate_timestamp * 1000 >= new Date().getTime() - 86400000 * 2); - } + const data = response.data.filter((item) => item.ui_sets && item.ui_sets.caption_subtitle).slice(0, 15); ctx.state.data = { title: `iDaily 每日环球视野`, description: 'iDaily 每日环球视野', - item: dataToday.map((item) => ({ + item: data.map((item) => ({ title: item.ui_sets.caption_subtitle, description: `
${item.content}`, pubDate: new Date(item.pubdate_timestamp * 1000).toUTCString(), From 3a563b623869b25773616867340468f1be04d295 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 2 Jan 2021 03:11:26 +0000 Subject: [PATCH 30/75] chore(deps-dev): bump eslint from 7.16.0 to 7.17.0 Bumps [eslint](https://github.com/eslint/eslint) from 7.16.0 to 7.17.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v7.16.0...v7.17.0) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e3912b7d9b..071ddae51c 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "@vuepress/plugin-google-analytics": "1.7.1", "@vuepress/plugin-pwa": "1.7.1", "cross-env": "7.0.3", - "eslint": "7.16.0", + "eslint": "7.17.0", "eslint-config-prettier": "7.1.0", "eslint-plugin-prettier": "3.3.0", "jest": "26.6.3", diff --git a/yarn.lock b/yarn.lock index 2285e4518c..d34acfc0b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5099,10 +5099,10 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== -eslint@7.16.0: - version "7.16.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.16.0.tgz#a761605bf9a7b32d24bb7cde59aeb0fd76f06092" - integrity sha512-iVWPS785RuDA4dWuhhgXTNrGxHHK3a8HLSMBgbbU59ruJDubUraXN8N5rn7kb8tG6sjg74eE0RA3YWT51eusEw== +eslint@7.17.0: + version "7.17.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.17.0.tgz#4ccda5bf12572ad3bf760e6f195886f50569adb0" + integrity sha512-zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ== dependencies: "@babel/code-frame" "^7.0.0" "@eslint/eslintrc" "^0.2.2" From ccf3f042924f290feecbf502a5574f6fc53540ce Mon Sep 17 00:00:00 2001 From: Laam Pui Date: Sat, 2 Jan 2021 11:34:41 +0800 Subject: [PATCH 31/75] fix: /douban/movie/later --- lib/routes/douban/later.js | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/lib/routes/douban/later.js b/lib/routes/douban/later.js index bf6a69ee0e..8d9b784ddd 100644 --- a/lib/routes/douban/later.js +++ b/lib/routes/douban/later.js @@ -1,19 +1,32 @@ const got = require('@/utils/got'); +const cheerio = require('cheerio'); module.exports = async (ctx) => { const response = await got({ method: 'get', - url: 'https://api.douban.com/v2/movie/coming_soon?apikey=0df993c66c0c636e29ecbb5344252a4a', + url: 'https://movie.douban.com/cinema/later/beijing/', }); - const movieList = response.data.subjects; + const $ = cheerio.load(response.data); + + const item = $('#showing-soon .item') + .map((index, ele) => { + const description = $(ele).html(); + const name = $('h3', ele).text().trim(); + const date = $('ul li', ele).eq(0).text().trim(); + const type = $('ul li', ele).eq(1).text().trim(); + const link = $('a.thumb', ele).attr('href'); + + return { + title: `${date} - 《${name}》 - ${type}`, + link, + description, + }; + }) + .get(); ctx.state.data = { title: '即将上映的电影', link: 'https://movie.douban.com/cinema/later/', - item: movieList.map((item) => ({ - title: item.title, - description: `标题：${item.title}
影片类型：${item.genres.join(' | ')}
评分：${item.rating.stars === '00' ? '无' : item.rating.average}
`, - link: item.alt, - })), + item, }; }; From c4dd02cae7d458486d140b175da9cc0336205e01 Mon Sep 17 00:00:00 2001 From: duhd1993 Date: Sat, 2 Jan 2021 19:25:25 -0500 Subject: [PATCH 32/75] caixin: add fulltext to the article route --- lib/routes/caixin/article.js | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/lib/routes/caixin/article.js b/lib/routes/caixin/article.js index 29fd6d70a0..fe8d617c01 100644 --- a/lib/routes/caixin/article.js +++ b/lib/routes/caixin/article.js @@ -1,4 +1,5 @@ const got = require('@/utils/got'); +const cheerio = require('cheerio'); module.exports = async (ctx) => { const response = await got({ @@ -12,15 +13,33 @@ module.exports = async (ctx) => { const data = response.data.data.list; + const items = await Promise.all( + data.map(async (item) => { + const link = item.web_url; + const summary = `

摘要:${item.summary}

`; + + const fullText = await ctx.cache.tryGet(link, async () => { + const result = await got.get(link); + + const $ = cheerio.load(result.data); + + return $('#Main_Content_Val').html(); + }); + + return { + title: item.title, + description: summary + fullText, + link: link, + pubDate: new Date(item.time * 1000), + author: item.author_name, + }; + }) + ); + ctx.state.data = { title: `财新网 - 首页`, link: `http://www.caixin.com/`, description: '财新网 - 首页', - item: data.map((item) => ({ - title: item.title, - description: `

${item.summary}

`, - link: item.web_url, - pubDate: new Date(item.time * 1000), - })), + item: items, }; }; From df5e015dd79663fece927c25c28515f1c6727a47 Mon Sep 17 00:00:00 2001 From: duhd1993 Date: Sat, 2 Jan 2021 19:52:43 -0500 Subject: [PATCH 33/75] caixin: do not display fullText when it's not article --- lib/routes/caixin/article.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/routes/caixin/article.js b/lib/routes/caixin/article.js index fe8d617c01..bef43439cd 100644 --- a/lib/routes/caixin/article.js +++ b/lib/routes/caixin/article.js @@ -28,7 +28,7 @@ module.exports = async (ctx) => { return { title: item.title, - description: summary + fullText, + description: fullText ? summary + fullText : summary, link: link, pubDate: new Date(item.time * 1000), author: item.author_name, From e1a3f8c8698e6df2cf16db82a12d5f662f30382d Mon Sep 17 00:00:00 2001 From: duhd1993 Date: Sat, 2 Jan 2021 20:36:18 -0500 Subject: [PATCH 34/75] caixin: style of article route --- lib/routes/caixin/article.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/routes/caixin/article.js b/lib/routes/caixin/article.js index bef43439cd..6874fe8aad 100644 --- a/lib/routes/caixin/article.js +++ b/lib/routes/caixin/article.js @@ -16,7 +16,7 @@ module.exports = async (ctx) => { const items = await Promise.all( data.map(async (item) => { const link = item.web_url; - const summary = `

摘要:${item.summary}

`; + const summary = `

${item.summary}

`; const fullText = await ctx.cache.tryGet(link, async () => { const result = await got.get(link); From 3694d4f5253f82ffc67c65947a97b1fe239730ed Mon Sep 17 00:00:00 2001 From: Laam Pui Date: Sun, 3 Jan 2021 13:25:14 +0800 Subject: [PATCH 35/75] =?UTF-8?q?fix:=20=E5=8C=97=E4=BA=AC=E7=90=86?= =?UTF-8?q?=E5=B7=A5=E5=A4=A7=E5=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/routes/universities/bit/cs/cs.js | 3 +++ lib/routes/universities/bit/cs/utils.js | 6 +++++- lib/routes/universities/bit/jwc/jwc.js | 3 +++ lib/routes/universities/bit/jwc/utils.js | 6 +++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/routes/universities/bit/cs/cs.js b/lib/routes/universities/bit/cs/cs.js index 605491fa6c..ab923eb31e 100644 --- a/lib/routes/universities/bit/cs/cs.js +++ b/lib/routes/universities/bit/cs/cs.js @@ -6,6 +6,9 @@ module.exports = async (ctx) => { const response = await got({ method: 'get', url: 'http://cs.bit.edu.cn/tzgg', + https: { + rejectUnauthorized: false, + }, }); const $ = cheerio.load(response.data); diff --git a/lib/routes/universities/bit/cs/utils.js b/lib/routes/universities/bit/cs/utils.js index d3d07dd1b6..2efa8cc240 100644 --- a/lib/routes/universities/bit/cs/utils.js +++ b/lib/routes/universities/bit/cs/utils.js @@ -5,7 +5,11 @@ const url = require('url'); // 专门定义一个function用于加载文章内容 async function load(link) { // 异步请求文章 - const response = await got.get(link); + const response = await got.get(link, { + https: { + rejectUnauthorized: false, + }, + }); // 加载文章内容 const $ = cheerio.load(response.data); diff --git a/lib/routes/universities/bit/jwc/jwc.js b/lib/routes/universities/bit/jwc/jwc.js index 175d6cdde3..52859cfe6f 100644 --- a/lib/routes/universities/bit/jwc/jwc.js +++ b/lib/routes/universities/bit/jwc/jwc.js @@ -6,6 +6,9 @@ module.exports = async (ctx) => { const response = await got({ method: 'get', url: 'http://jwc.bit.edu.cn/tzgg', + https: { + rejectUnauthorized: false, + }, }); const $ = cheerio.load(response.data); diff --git a/lib/routes/universities/bit/jwc/utils.js b/lib/routes/universities/bit/jwc/utils.js index 1c32dcfb67..d2891db294 100644 --- a/lib/routes/universities/bit/jwc/utils.js +++ b/lib/routes/universities/bit/jwc/utils.js @@ -5,7 +5,11 @@ const url = require('url'); // 专门定义一个function用于加载文章内容 async function load(link) { // 异步请求文章 - const response = await got.get(link); + const response = await got.get(link, { + https: { + rejectUnauthorized: false, + }, + }); // 加载文章内容 const $ = cheerio.load(response.data); From b7bfe1cc00c0613be2dd7d300ff5c3975a82a78a Mon Sep 17 00:00:00 2001 From: Laam Pui Date: Sun, 3 Jan 2021 13:46:33 +0800 Subject: [PATCH 36/75] =?UTF-8?q?fix:=20=E4=B8=AD=E5=9B=BD=E8=8D=AF?= =?UTF-8?q?=E7=A7=91=E5=A4=A7=E5=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/routes/universities/cpu/home.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/routes/universities/cpu/home.js b/lib/routes/universities/cpu/home.js index e7f1306d89..f87507ffc5 100644 --- a/lib/routes/universities/cpu/home.js +++ b/lib/routes/universities/cpu/home.js @@ -15,13 +15,13 @@ module.exports = async (ctx) => { const data = response.data; const $ = cheerio.load(data); - const $list = $('div#wp_news_w3 a').slice(0, 10).get(); + const $list = $('div#wp_news_w3 a').get(); const resultItem = await Promise.all( $list.map(async (item) => { const title = $(item).attr('title'); const href = $(item).attr('href'); - const detail_url = 'http://www.cpu.edu.cn' + href; + const detail_url = href.startsWith('/') ? `http://www.cpu.edu.cn${href}` : href; const single = { title: title, link: detail_url, @@ -37,7 +37,7 @@ module.exports = async (ctx) => { { const detail_data = detail.data; const $ = cheerio.load(detail_data); - single.description = $('table[bgcolor="#FFFFFF"]').html(); + single.description = $('table[bgcolor="#FFFFFF"]').html() || $('table.nyxx').html() || $('div.inner div.article').html(); } return Promise.resolve(single); }) From 70696a36d1571c8960a2f65009fbe3854ec93778 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 3 Jan 2021 08:32:06 +0000 Subject: [PATCH 37/75] chore(deps): bump dayjs from 1.9.8 to 1.10.0 Bumps [dayjs](https://github.com/iamkun/dayjs) from 1.9.8 to 1.10.0. - [Release notes](https://github.com/iamkun/dayjs/releases) - [Changelog](https://github.com/iamkun/dayjs/blob/v1.10.0/CHANGELOG.md) - [Commits](https://github.com/iamkun/dayjs/compare/v1.9.8...v1.10.0) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 071ddae51c..74c273e1a7 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "co-redis": "2.1.1", "crypto-js": "4.0.0", "currency-symbol-map": "4.0.4", - "dayjs": "1.9.8", + "dayjs": "1.10.0", "dotenv": "8.2.0", "emailjs-imap-client": "3.1.0", "entities": "2.1.0", diff --git a/yarn.lock b/yarn.lock index d34acfc0b5..b1a64d5938 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4304,10 +4304,10 @@ date-now@^0.1.4: resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= -dayjs@1.9.8, dayjs@^1.8.29: - version "1.9.8" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.9.8.tgz#9a65fbdca037e3d5835f98672da6e796f757cd58" - integrity sha512-F42qBtJRa30FKF7XDnOQyNUTsaxDkuaZRj/i7BejSHC34LlLfPoIU4aeopvWfM+m1dJ6/DHKAWLg2ur+pLgq1w== +dayjs@1.10.0, dayjs@^1.8.29: + version "1.10.0" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.0.tgz#41ae4c1a5116c446738c4ec7e9f4f10e937e698b" + integrity sha512-U/yusl5TQPvU1Tlhsu3A82Ebn4BNKHJMIk9AePYHCmGtTXcuPkODiEhkzqA8mnQ0bbgoR6+oha2ioZEewOiP2A== de-indent@^1.0.2: version "1.0.2" From 199b4d3f46ea22dd739fff5edc19f37bb90153bb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 3 Jan 2021 13:09:24 +0000 Subject: [PATCH 38/75] chore(deps): bump dayjs from 1.10.0 to 1.10.1 Bumps [dayjs](https://github.com/iamkun/dayjs) from 1.10.0 to 1.10.1. - [Release notes](https://github.com/iamkun/dayjs/releases) - [Changelog](https://github.com/iamkun/dayjs/blob/v1.10.1/CHANGELOG.md) - [Commits](https://github.com/iamkun/dayjs/compare/v1.10.0...v1.10.1) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 74c273e1a7..bd4f75e892 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "co-redis": "2.1.1", "crypto-js": "4.0.0", "currency-symbol-map": "4.0.4", - "dayjs": "1.10.0", + "dayjs": "1.10.1", "dotenv": "8.2.0", "emailjs-imap-client": "3.1.0", "entities": "2.1.0", diff --git a/yarn.lock b/yarn.lock index b1a64d5938..19610af417 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4304,10 +4304,10 @@ date-now@^0.1.4: resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= -dayjs@1.10.0, dayjs@^1.8.29: - version "1.10.0" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.0.tgz#41ae4c1a5116c446738c4ec7e9f4f10e937e698b" - integrity sha512-U/yusl5TQPvU1Tlhsu3A82Ebn4BNKHJMIk9AePYHCmGtTXcuPkODiEhkzqA8mnQ0bbgoR6+oha2ioZEewOiP2A== +dayjs@1.10.1, dayjs@^1.8.29: + version "1.10.1" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.1.tgz#114f678624842035396667a24eb1436814bc16fd" + integrity sha512-2xg7JrHQeLBQFkvTumLoy62x1siyeocc98QwjtURgvRqOPYmAkMUdmSjrOA+MlmL6QMQn5MUhDf6rNZNuPc1LQ== de-indent@^1.0.2: version "1.0.2" From 28bbaf02ce360b34c147a28b5781cdd5e656696e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 4 Jan 2021 15:18:40 +0000 Subject: [PATCH 39/75] chore(deps): bump koa from 2.13.0 to 2.13.1 Bumps [koa](https://github.com/koajs/koa) from 2.13.0 to 2.13.1. - [Release notes](https://github.com/koajs/koa/releases) - [Changelog](https://github.com/koajs/koa/blob/master/History.md) - [Commits](https://github.com/koajs/koa/compare/2.13.0...2.13.1) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index bd4f75e892..962c3d3c8d 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "jsdom": "16.4.0", "json-bigint": "1.0.0", "json5": "2.1.3", - "koa": "2.13.0", + "koa": "2.13.1", "koa-basic-auth": "4.0.0", "koa-favicon": "2.1.0", "koa-mount": "4.0.0", diff --git a/yarn.lock b/yarn.lock index 19610af417..d60425b666 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4497,16 +4497,16 @@ denque@^1.4.1: resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf" integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ== -depd@^1.1.2, depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= - -depd@~2.0.0: +depd@^2.0.0, depd@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + des.js@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" @@ -8038,10 +8038,10 @@ koa-mount@4.0.0: debug "^4.0.1" koa-compose "^4.1.0" -koa@2.13.0: - version "2.13.0" - resolved "https://registry.yarnpkg.com/koa/-/koa-2.13.0.tgz#25217e05efd3358a7e5ddec00f0a380c9b71b501" - integrity sha512-i/XJVOfPw7npbMv67+bOeXr3gPqOAw6uh5wFyNs3QvJ47tUx3M3V9rIE0//WytY42MKz4l/MXKyGkQ2LQTfLUQ== +koa@2.13.1: + version "2.13.1" + resolved "https://registry.yarnpkg.com/koa/-/koa-2.13.1.tgz#6275172875b27bcfe1d454356a5b6b9f5a9b1051" + integrity sha512-Lb2Dloc72auj5vK4X4qqL7B5jyDPQaZucc9sR/71byg7ryoD1NCaCm63CShk9ID9quQvDEi1bGR/iGjCG7As3w== dependencies: accepts "^1.3.5" cache-content-type "^1.0.0" @@ -8050,7 +8050,7 @@ koa@2.13.0: cookies "~0.8.0" debug "~3.1.0" delegates "^1.0.0" - depd "^1.1.2" + depd "^2.0.0" destroy "^1.0.4" encodeurl "^1.0.2" escape-html "^1.0.3" From 80af5678c7f2cb65aef489d6089577d6778aee15 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 4 Jan 2021 20:18:44 +0000 Subject: [PATCH 40/75] chore(deps-dev): bump eslint-plugin-prettier from 3.3.0 to 3.3.1 Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases) - [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md) - [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v3.3.0...v3.3.1) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 962c3d3c8d..3c0c06c529 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "cross-env": "7.0.3", "eslint": "7.17.0", "eslint-config-prettier": "7.1.0", - "eslint-plugin-prettier": "3.3.0", + "eslint-plugin-prettier": "3.3.1", "jest": "26.6.3", "mockdate": "3.0.2", "nock": "13.0.5", diff --git a/yarn.lock b/yarn.lock index d60425b666..d1673c8d3f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5059,10 +5059,10 @@ eslint-config-prettier@7.1.0: resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.1.0.tgz#5402eb559aa94b894effd6bddfa0b1ca051c858f" integrity sha512-9sm5/PxaFG7qNJvJzTROMM1Bk1ozXVTKI0buKOyb0Bsr1hrwi0H/TzxF/COtf1uxikIK8SwhX7K6zg78jAzbeA== -eslint-plugin-prettier@3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.0.tgz#61e295349a65688ffac0b7808ef0a8244bdd8d40" - integrity sha512-tMTwO8iUWlSRZIwS9k7/E4vrTsfvsrcM5p1eftyuqWH25nKsz/o6/54I7jwQ/3zobISyC7wMy9ZsFwgTxOcOpQ== +eslint-plugin-prettier@3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7" + integrity sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ== dependencies: prettier-linter-helpers "^1.0.0" From 2e07b9a23fb5eb68d64029092aec2f060fcef018 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 Jan 2021 02:35:55 +0000 Subject: [PATCH 41/75] chore(deps-dev): bump vuepress from 1.7.1 to 1.8.0 Bumps [vuepress](https://github.com/vuejs/vuepress/tree/HEAD/packages/vuepress) from 1.7.1 to 1.8.0. - [Release notes](https://github.com/vuejs/vuepress/releases) - [Changelog](https://github.com/vuejs/vuepress/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vuepress/commits/v1.8.0/packages/vuepress) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 121 +++++++++++++++++++++++++++++---------------------- 2 files changed, 69 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index 3c0c06c529..3a8214b5ee 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "staged-git-files": "1.2.0", "string-width": "4.2.0", "supertest": "6.0.1", - "vuepress": "1.7.1", + "vuepress": "1.8.0", "yorkie": "2.0.0" }, "dependencies": { diff --git a/yarn.lock b/yarn.lock index d1673c8d3f..9321e1631d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1906,18 +1906,18 @@ source-map "~0.6.1" vue-template-es2015-compiler "^1.9.0" -"@vuepress/core@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@vuepress/core/-/core-1.7.1.tgz#e92faad0e9445fdd775f8e0d65e927bc35e80571" - integrity sha512-M5sxZq30Ke1vXa4ZZjk6185fwtpiJOqzXNnzcIe0GxtvtaF8Yij6b+KqQKlUJnnUXm+CKxiLCr8PTzDY26N7yw== +"@vuepress/core@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@vuepress/core/-/core-1.8.0.tgz#b5450cdd33d7fc1e1d21a1590806d429c92d0dc9" + integrity sha512-DrHx3gXa5rUDdvjcUHhmZg1DccMwc3kiYpgtbKCuJpHksz9eAVuOxbcy/b6TGRbbY4Q5EA2Fs3kI9hvPjYdCrQ== dependencies: "@babel/core" "^7.8.4" "@vue/babel-preset-app" "^4.1.2" - "@vuepress/markdown" "1.7.1" - "@vuepress/markdown-loader" "1.7.1" - "@vuepress/plugin-last-updated" "1.7.1" - "@vuepress/plugin-register-components" "1.7.1" - "@vuepress/shared-utils" "1.7.1" + "@vuepress/markdown" "1.8.0" + "@vuepress/markdown-loader" "1.8.0" + "@vuepress/plugin-last-updated" "1.8.0" + "@vuepress/plugin-register-components" "1.8.0" + "@vuepress/shared-utils" "1.8.0" autoprefixer "^9.5.1" babel-loader "^8.0.4" cache-loader "^3.0.0" @@ -1950,21 +1950,21 @@ webpack-merge "^4.1.2" webpackbar "3.2.0" -"@vuepress/markdown-loader@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@vuepress/markdown-loader/-/markdown-loader-1.7.1.tgz#f3ab20965d5dec6e2fc2d11c78ef1a9f08d62f72" - integrity sha512-GM1F/tRhP9qZydTC89FXJPlLH+BmZijMKom5BYLAMEXsU20A9kABTRoatPjOUbZuKT+gn03JgG97qVd8xa/ETw== +"@vuepress/markdown-loader@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@vuepress/markdown-loader/-/markdown-loader-1.8.0.tgz#0d7493995869f974953b1aa47c7a791943d1d835" + integrity sha512-ykYTNe4mC/0CxyEfyM9+oYJqFvOMZWw5qiNZVfg2t+Ip8nVR2pFhQ6fJe07Pbtc59eT4awKSEd8/kcjhTpfeZA== dependencies: - "@vuepress/markdown" "1.7.1" + "@vuepress/markdown" "1.8.0" loader-utils "^1.1.0" lru-cache "^5.1.1" -"@vuepress/markdown@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@vuepress/markdown/-/markdown-1.7.1.tgz#56f60c2362fd82b8f2702eefa366c0d5b02fdcbd" - integrity sha512-Ava9vJECHG1+RC53ut1dXSze35IH5tc3qesC06Ny37WS93iDSQy09j8y+a0Lugy12j1369+QQeRFWa40tdHczA== +"@vuepress/markdown@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@vuepress/markdown/-/markdown-1.8.0.tgz#2fb0a9f6011d2543a4dc7d6a2ae976b9f49873ef" + integrity sha512-f2yhoIHTD6gaPeLLidkxuytKGQCT6Gopm0fpyKZwfFZaWWz5+RPPGevq5UTmTb+5vvO2Li44HJc1EV7QONOw9Q== dependencies: - "@vuepress/shared-utils" "1.7.1" + "@vuepress/shared-utils" "1.8.0" markdown-it "^8.4.1" markdown-it-anchor "^5.0.2" markdown-it-chain "^1.3.0" @@ -1972,10 +1972,10 @@ markdown-it-table-of-contents "^0.4.0" prismjs "^1.13.0" -"@vuepress/plugin-active-header-links@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@vuepress/plugin-active-header-links/-/plugin-active-header-links-1.7.1.tgz#5a16281bebb977fc1c2b93d992b1a3b7ff840641" - integrity sha512-Wgf/oB9oPZLnYoLjQ/xbQc4Qa3RU5tXAo2dB4Xl/7bUL6SqBxO866kX3wPxKdSOIL58tq8iH9XbUe3Sxi8/ISQ== +"@vuepress/plugin-active-header-links@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@vuepress/plugin-active-header-links/-/plugin-active-header-links-1.8.0.tgz#1e3f9c1057a58f3bc849d0eebbcd492975f63a88" + integrity sha512-0SqdkJLJSQqhPTgGccu/ev5zRCfeKKMkyPnUMJYsQe4zGhSosmwLcfB7LDo/VLqLhRipipzBnONESr12OgI4SQ== dependencies: lodash.debounce "^4.0.8" @@ -1991,17 +1991,17 @@ resolved "https://registry.yarnpkg.com/@vuepress/plugin-google-analytics/-/plugin-google-analytics-1.7.1.tgz#c337e13c8a27f6fea911a04db22a3f3596a571fb" integrity sha512-27fQzRMsqGYpMf+ruyhsdfLv/n6z6b6LutFLE/pH66Itlh6ox9ew31x0pqYBbWIC/a4lBfXYUwFvi+DEvlb1EQ== -"@vuepress/plugin-last-updated@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@vuepress/plugin-last-updated/-/plugin-last-updated-1.7.1.tgz#668c55daa6b8bc1d8ee42cdb4169cf67c01b6e97" - integrity sha512-VW5jhBuO0WRHDsBmFsKC6QtEyBLCgyhuH9nQ65aairCn3tdoJPz0uQ4g3lr/boVbgsPexO677Sn3dRPgYqnMug== +"@vuepress/plugin-last-updated@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@vuepress/plugin-last-updated/-/plugin-last-updated-1.8.0.tgz#a0fcd2906a4dcae107634013f7c49ddd05e0de87" + integrity sha512-fBwtlffAabpTTalUMPSaJy/5fp3WpIA1FdWOfFcQ12X6179tupZB8fnueNsVJGBvGcdw8fbyzh5C9yKAq9lR/w== dependencies: cross-spawn "^6.0.5" -"@vuepress/plugin-nprogress@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@vuepress/plugin-nprogress/-/plugin-nprogress-1.7.1.tgz#101ebf720eaa635a473e16ca16e7b4a7850331fa" - integrity sha512-KtqfI3RitbsEbm22EhbooTvhjfMf6zttKlbND7LcyJwP3MEPVYyzQJuET03hk9z4SgCfNV2r/W3sYyejzzTMog== +"@vuepress/plugin-nprogress@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@vuepress/plugin-nprogress/-/plugin-nprogress-1.8.0.tgz#8fd3d5415d4c8326ca569118e935b875e5fd7bb5" + integrity sha512-JmjeJKKWhbF/8z+EnY8BCWHoHKhUWfqXjXOfV+xifITl6BJlf53I/jLFpX7Sij8Whe+SKjH7kNvc+hioUdwJQw== dependencies: nprogress "^0.2.0" @@ -2014,17 +2014,17 @@ register-service-worker "^1.7.0" workbox-build "^4.3.1" -"@vuepress/plugin-register-components@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@vuepress/plugin-register-components/-/plugin-register-components-1.7.1.tgz#1ff58e931e8c27d64f9b86f2df879ddaceccdebe" - integrity sha512-MlFdH6l3rTCJlGMvyssXVG998cq5LSMzxCuQLYcRdtHQT4HbikIcV4HSPGarWInD1mP12+qX/PvKUawGwp1eVg== +"@vuepress/plugin-register-components@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@vuepress/plugin-register-components/-/plugin-register-components-1.8.0.tgz#cb23c8b54865926f16e81fdf5fa6ccf0dec17c0e" + integrity sha512-ztafaAxn7XFS4F8z51d+QQB6DNAUG54wBSdfKydfnHbAYgtxoALzPlJW7FKQdxvZKxqGrJa9e4rkoZsat13KRQ== dependencies: - "@vuepress/shared-utils" "1.7.1" + "@vuepress/shared-utils" "1.8.0" -"@vuepress/plugin-search@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@vuepress/plugin-search/-/plugin-search-1.7.1.tgz#f52b6e77af30f452213bc677741cefe8a8309be2" - integrity sha512-OmiGM5eYg9c+uC50b6/cSxAhqxfD7AIui6JEztFGeECrlP33RLHmteXK9YBBZjp5wTNmoYs+NXI/cWggYUPW8Q== +"@vuepress/plugin-search@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@vuepress/plugin-search/-/plugin-search-1.8.0.tgz#d10cc04cff7467829b2e2e896b7e72a5ebc27ce1" + integrity sha512-LlOCPg7JJ3I9WEpiBU8vCEFp6I5sa3OBu6SFHk+uK9iyKHwJYdRs4VK9x+igG40Rt/OIDRDo3c9SbLX/E/kqeA== "@vuepress/shared-utils@1.7.1": version "1.7.1" @@ -2041,14 +2041,29 @@ toml "^3.0.0" upath "^1.1.0" -"@vuepress/theme-default@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@vuepress/theme-default/-/theme-default-1.7.1.tgz#36fee5bb5165798c0082c512cbf4d94352260d97" - integrity sha512-a9HeTrlcWQj3ONHiABmlN2z9TyIxKfQtLsA8AL+WgjN3PikhFuZFIJGzfr+NLt67Y9oiI+S9ZfiaVyvWM+7bWQ== +"@vuepress/shared-utils@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@vuepress/shared-utils/-/shared-utils-1.8.0.tgz#b1187c764f4c2dee018b83f3560a14067d931240" + integrity sha512-CVNMiYBntQyb4CuyS4KzmglDqsuBpj8V4QMzL9gCSoMv0VmwKx05fZedu+r0G5OcxYN4qjnu99yl9G6zWhOU9w== dependencies: - "@vuepress/plugin-active-header-links" "1.7.1" - "@vuepress/plugin-nprogress" "1.7.1" - "@vuepress/plugin-search" "1.7.1" + chalk "^2.3.2" + escape-html "^1.0.3" + fs-extra "^7.0.1" + globby "^9.2.0" + gray-matter "^4.0.1" + hash-sum "^1.0.2" + semver "^6.0.0" + toml "^3.0.0" + upath "^1.1.0" + +"@vuepress/theme-default@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@vuepress/theme-default/-/theme-default-1.8.0.tgz#5bcca542bc61099498f5d99a9928f0ff66e6e382" + integrity sha512-CueCaANfICFbLnEL78YxSjgCHXL7mkgQI/cfyEHBgxlr247cYJQ+9IFDQIS0fJNuzHdLRy9UFUvVrCu6go8PUg== + dependencies: + "@vuepress/plugin-active-header-links" "1.8.0" + "@vuepress/plugin-nprogress" "1.8.0" + "@vuepress/plugin-search" "1.8.0" docsearch.js "^2.5.2" lodash "^4.17.15" stylus "^0.54.8" @@ -13268,13 +13283,13 @@ vuepress-plugin-smooth-scroll@^0.0.3: dependencies: smoothscroll-polyfill "^0.4.3" -vuepress@1.7.1: - version "1.7.1" - resolved "https://registry.yarnpkg.com/vuepress/-/vuepress-1.7.1.tgz#bb0e139d8c407a0b5aa962cf9577832a5808937e" - integrity sha512-AdA3do1L4DNzeF8sMTE+cSUJ5hR/6f3YujU8DVowi/vFOg/SX2lJF8urvDkZUSXzaAT6aSgkI9L+B6D+i7SJjA== +vuepress@1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/vuepress/-/vuepress-1.8.0.tgz#0139d466b33fbfdb628abb76d555368b85cf9772" + integrity sha512-YvNitvoEc+JSJRv1W+IoRnvOTFyTWyUMuGuF2kTIbiSwIHb1hNinc3lqNSeBQJy7IBqyEzK5fnTq1mlynh4gwA== dependencies: - "@vuepress/core" "1.7.1" - "@vuepress/theme-default" "1.7.1" + "@vuepress/core" "1.8.0" + "@vuepress/theme-default" "1.8.0" cac "^6.5.6" envinfo "^7.2.0" opencollective-postinstall "^2.0.2" From 249a465857edba38c505ab2009143b66e94881c2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 Jan 2021 02:37:43 +0000 Subject: [PATCH 42/75] chore(deps-dev): bump @vuepress/plugin-back-to-top from 1.7.1 to 1.8.0 Bumps [@vuepress/plugin-back-to-top](https://github.com/vuejs/vuepress/tree/HEAD/packages/@vuepress/plugin-back-to-top) from 1.7.1 to 1.8.0. - [Release notes](https://github.com/vuejs/vuepress/releases) - [Changelog](https://github.com/vuejs/vuepress/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vuepress/commits/v1.8.0/packages/@vuepress/plugin-back-to-top) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3c0c06c529..3a3136f7c8 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@types/cheerio": "0.22.23", "@types/got": "9.6.11", "@types/koa": "2.11.6", - "@vuepress/plugin-back-to-top": "1.7.1", + "@vuepress/plugin-back-to-top": "1.8.0", "@vuepress/plugin-google-analytics": "1.7.1", "@vuepress/plugin-pwa": "1.7.1", "cross-env": "7.0.3", diff --git a/yarn.lock b/yarn.lock index d1673c8d3f..dcca043038 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1979,10 +1979,10 @@ dependencies: lodash.debounce "^4.0.8" -"@vuepress/plugin-back-to-top@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@vuepress/plugin-back-to-top/-/plugin-back-to-top-1.7.1.tgz#8bdc4a2de95f8244f167b3b3066c2610b88aabeb" - integrity sha512-Hw/5kQjqtkHEstifcq4gpdVwS38C3ecruLCUibq3YEES6DJUYZ8tN1oo3FTugYgpXsyn3HxWftyalozcZ2IutA== +"@vuepress/plugin-back-to-top@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@vuepress/plugin-back-to-top/-/plugin-back-to-top-1.8.0.tgz#eb7062e33cd65f4582e012702f7f69ccf0f55ae7" + integrity sha512-myyC4ZLT887IAaKcBBles8OHYeAfYMFSvC0CqjCBOyoBExNt6E+Xg3ksYksxrew/mNCTiwxXJvu+0o2a/8WIYA== dependencies: lodash.debounce "^4.0.8" From c30fe03a760e67817ff45df335fc15adafd68fbc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 Jan 2021 02:45:58 +0000 Subject: [PATCH 43/75] chore(deps-dev): bump @vuepress/plugin-google-analytics Bumps [@vuepress/plugin-google-analytics](https://github.com/vuejs/vuepress/tree/HEAD/packages/@vuepress/plugin-google-analytics) from 1.7.1 to 1.8.0. - [Release notes](https://github.com/vuejs/vuepress/releases) - [Changelog](https://github.com/vuejs/vuepress/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vuepress/commits/v1.8.0/packages/@vuepress/plugin-google-analytics) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 812356f2d5..caac8f09fc 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@types/got": "9.6.11", "@types/koa": "2.11.6", "@vuepress/plugin-back-to-top": "1.8.0", - "@vuepress/plugin-google-analytics": "1.7.1", + "@vuepress/plugin-google-analytics": "1.8.0", "@vuepress/plugin-pwa": "1.7.1", "cross-env": "7.0.3", "eslint": "7.17.0", diff --git a/yarn.lock b/yarn.lock index 8ae1843ddb..60769594e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1986,10 +1986,10 @@ dependencies: lodash.debounce "^4.0.8" -"@vuepress/plugin-google-analytics@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@vuepress/plugin-google-analytics/-/plugin-google-analytics-1.7.1.tgz#c337e13c8a27f6fea911a04db22a3f3596a571fb" - integrity sha512-27fQzRMsqGYpMf+ruyhsdfLv/n6z6b6LutFLE/pH66Itlh6ox9ew31x0pqYBbWIC/a4lBfXYUwFvi+DEvlb1EQ== +"@vuepress/plugin-google-analytics@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@vuepress/plugin-google-analytics/-/plugin-google-analytics-1.8.0.tgz#99752be07867730df27e830a15c95b3f25b04741" + integrity sha512-1aILIrGjyGOtNROZhNRezrnAsTq3RA4Q9/euTkpdNDyRs4etmW6hWm5yx43Sp+upREMycpbXZ/QoOWmahGwMNA== "@vuepress/plugin-last-updated@1.8.0": version "1.8.0" From 91afd76422588b09211a6e68e5f14e449826000e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 Jan 2021 02:58:18 +0000 Subject: [PATCH 44/75] chore(deps-dev): bump @vuepress/plugin-pwa from 1.7.1 to 1.8.0 Bumps [@vuepress/plugin-pwa](https://github.com/vuejs/vuepress/tree/HEAD/packages/@vuepress/plugin-pwa) from 1.7.1 to 1.8.0. - [Release notes](https://github.com/vuejs/vuepress/releases) - [Changelog](https://github.com/vuejs/vuepress/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vuepress/commits/v1.8.0/packages/@vuepress/plugin-pwa) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index caac8f09fc..ff9b5790a1 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@types/koa": "2.11.6", "@vuepress/plugin-back-to-top": "1.8.0", "@vuepress/plugin-google-analytics": "1.8.0", - "@vuepress/plugin-pwa": "1.7.1", + "@vuepress/plugin-pwa": "1.8.0", "cross-env": "7.0.3", "eslint": "7.17.0", "eslint-config-prettier": "7.1.0", diff --git a/yarn.lock b/yarn.lock index 60769594e9..3887035a02 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2005,12 +2005,12 @@ dependencies: nprogress "^0.2.0" -"@vuepress/plugin-pwa@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@vuepress/plugin-pwa/-/plugin-pwa-1.7.1.tgz#22fb176b48a4f9cba3d69a0a8c6d1971efb7e49d" - integrity sha512-c3oozxPPGpraU+UnY3gp3sWnKYO3mOLcexQWXaYABWnUC3yFbHx4e8wIF8LGqp7Z75bjQuUoI+LcHqpQXyYNag== +"@vuepress/plugin-pwa@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@vuepress/plugin-pwa/-/plugin-pwa-1.8.0.tgz#e3baa9a83828cd3d538825a5b52db3c217b2f220" + integrity sha512-wdXSi5ZNMFqIJ6uAazP6xYObrjHk4Mfez84ImZQ68zzeLw9eI8f8WfWvRW7PCRxBa3V95WIGDRcz0MZJ0JzHCg== dependencies: - "@vuepress/shared-utils" "1.7.1" + "@vuepress/shared-utils" "1.8.0" register-service-worker "^1.7.0" workbox-build "^4.3.1" @@ -2026,21 +2026,6 @@ resolved "https://registry.yarnpkg.com/@vuepress/plugin-search/-/plugin-search-1.8.0.tgz#d10cc04cff7467829b2e2e896b7e72a5ebc27ce1" integrity sha512-LlOCPg7JJ3I9WEpiBU8vCEFp6I5sa3OBu6SFHk+uK9iyKHwJYdRs4VK9x+igG40Rt/OIDRDo3c9SbLX/E/kqeA== -"@vuepress/shared-utils@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@vuepress/shared-utils/-/shared-utils-1.7.1.tgz#028bc6003247bb4c60cdc96f231eecfb55e7b85d" - integrity sha512-ydB2ZKsFZE6hFRb9FWqzZksxAPIMJjtBawk50RP6F+YX5HbID/HlyYYZM9aDSbk6RTkjgB5UzJjggA2xM8POlw== - dependencies: - chalk "^2.3.2" - escape-html "^1.0.3" - fs-extra "^7.0.1" - globby "^9.2.0" - gray-matter "^4.0.1" - hash-sum "^1.0.2" - semver "^6.0.0" - toml "^3.0.0" - upath "^1.1.0" - "@vuepress/shared-utils@1.8.0": version "1.8.0" resolved "https://registry.yarnpkg.com/@vuepress/shared-utils/-/shared-utils-1.8.0.tgz#b1187c764f4c2dee018b83f3560a14067d931240" From 94214a9d5e1c1cf93dc52643c5e49a021485c8bc Mon Sep 17 00:00:00 2001 From: jinkin Date: Tue, 5 Jan 2021 11:22:31 +0800 Subject: [PATCH 45/75] add mcdonalds news --- docs/shopping.md | 11 ++++++++ lib/router.js | 3 +++ lib/routes/mcdonalds/news.js | 51 ++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 lib/routes/mcdonalds/news.js diff --git a/docs/shopping.md b/docs/shopping.md index eae0a16575..caba5c7a34 100644 --- a/docs/shopping.md +++ b/docs/shopping.md @@ -347,3 +347,14 @@ For instance, in + +## 麦当劳 + +### 麦当劳活动资讯 + + +| 全部分类 | 社会责任 | 人员品牌 | 产品故事 | 优惠 | 品牌文化 | 活动速报 | +| -------- | ------- | --- | ------- | ------ | ------- | -------- | +| news_list | responsibility | brand | product | sales | culture | event | + + diff --git a/lib/router.js b/lib/router.js index 5bb0f656c3..2f05b7b278 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3780,4 +3780,7 @@ router.get('/nace/blog/:sort?', require('./routes/nace/blog')); // Caixin Latest router.get('/caixin/latest', require('./routes/caixin/latest')); +// Mcdonalds +router.get('/mcdonalds/:category', require('./routes/mcdonalds/news')); + module.exports = router; diff --git a/lib/routes/mcdonalds/news.js b/lib/routes/mcdonalds/news.js new file mode 100644 index 0000000000..93949dcc7b --- /dev/null +++ b/lib/routes/mcdonalds/news.js @@ -0,0 +1,51 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + const category_param = ctx.params.category || 'news_list'; + const categories = category_param.split('+'); + const baseUrl = "https://www.mcdonalds.com.cn/news/"; + + const get_news_list = async (cates) => await Promise.all( + cates.map(async (cate) => { + const response = await got.get(baseUrl + cate); + const $ = cheerio.load(response.data); + // console.log($('title').text()); + const news = $('.news_list .box-container > div').slice(0, 10).map((idx, item) => { + item = $(item); + return item.find('a[target]').attr('href'); + }) + .get(); + // console.log(news); + return Promise.resolve(news); + }) + ); + const all_news = [].concat.apply([], await get_news_list(categories)); + + const out = await Promise.all( + all_news.map(async (news_url) => { + const news_detail = await ctx.cache.tryGet(news_url, async () => { + const result = await got.get(news_url); + const $ = cheerio.load(result.data); + + console.log($('h3 ~ time').text(), news_url); + + return { + title: $('h3').text(), + link: news_url, + // author: author, + pubDate: new Date($('h3 ~ time').text()).toUTCString(), + description: $('.cmsPage').html(), + }; + }); + return Promise.resolve(news_detail); + }) + ); + + ctx.state.data = { + title: '麦当劳资讯', + link: baseUrl, + item: out, + }; + +}; \ No newline at end of file From ae1ceb6c6057de36150a571d752d7ffd3300c26d Mon Sep 17 00:00:00 2001 From: Jinkin Date: Tue, 5 Jan 2021 18:21:35 +0800 Subject: [PATCH 46/75] Update news.js --- lib/routes/mcdonalds/news.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/routes/mcdonalds/news.js b/lib/routes/mcdonalds/news.js index 93949dcc7b..f62e83a77b 100644 --- a/lib/routes/mcdonalds/news.js +++ b/lib/routes/mcdonalds/news.js @@ -28,7 +28,7 @@ module.exports = async (ctx) => { const result = await got.get(news_url); const $ = cheerio.load(result.data); - console.log($('h3 ~ time').text(), news_url); +// console.log($('h3 ~ time').text(), news_url); return { title: $('h3').text(), @@ -48,4 +48,4 @@ module.exports = async (ctx) => { item: out, }; -}; \ No newline at end of file +}; From 78d6f76fe5355aa4df04f9c1bd3f56b3f396af73 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 Jan 2021 23:59:30 +0000 Subject: [PATCH 47/75] chore(deps): bump dayjs from 1.10.1 to 1.10.2 Bumps [dayjs](https://github.com/iamkun/dayjs) from 1.10.1 to 1.10.2. - [Release notes](https://github.com/iamkun/dayjs/releases) - [Changelog](https://github.com/iamkun/dayjs/blob/v1.10.2/CHANGELOG.md) - [Commits](https://github.com/iamkun/dayjs/compare/v1.10.1...v1.10.2) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ff9b5790a1..0ac56cc3e5 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "co-redis": "2.1.1", "crypto-js": "4.0.0", "currency-symbol-map": "4.0.4", - "dayjs": "1.10.1", + "dayjs": "1.10.2", "dotenv": "8.2.0", "emailjs-imap-client": "3.1.0", "entities": "2.1.0", diff --git a/yarn.lock b/yarn.lock index 3887035a02..512f418890 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4304,10 +4304,10 @@ date-now@^0.1.4: resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= -dayjs@1.10.1, dayjs@^1.8.29: - version "1.10.1" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.1.tgz#114f678624842035396667a24eb1436814bc16fd" - integrity sha512-2xg7JrHQeLBQFkvTumLoy62x1siyeocc98QwjtURgvRqOPYmAkMUdmSjrOA+MlmL6QMQn5MUhDf6rNZNuPc1LQ== +dayjs@1.10.2, dayjs@^1.8.29: + version "1.10.2" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.2.tgz#8f3a424ceb944a8193506804b0045a773d2d0672" + integrity sha512-h/YtykNNTR8Qgtd1Fxl5J1/SFP1b7SOk/M1P+Re+bCdFMV0IMkuKNgHPN7rlvvuhfw24w0LX78iYKt4YmePJNQ== de-indent@^1.0.2: version "1.0.2" From 8cc0dfa231fc4ec02c3d9930d3bfaa6ed27d806b Mon Sep 17 00:00:00 2001 From: zytomorrow Date: Wed, 6 Jan 2021 15:49:58 +0800 Subject: [PATCH 48/75] =?UTF-8?q?feat:=20=E7=AE=80=E9=98=85(simpread)=20no?= =?UTF-8?q?tice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/program-update.md | 6 ++++++ lib/router.js | 3 +++ lib/routes/simpread/notice.js | 20 ++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 lib/routes/simpread/notice.js diff --git a/docs/program-update.md b/docs/program-update.md index 5cddf1086a..a2dafca86a 100644 --- a/docs/program-update.md +++ b/docs/program-update.md @@ -433,3 +433,9 @@ pageClass: routes | | -commentCount | -createdAt | createdAt | + +## simpread + +### 消息通知 + + diff --git a/lib/router.js b/lib/router.js index 5bb0f656c3..e9f57e3871 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3780,4 +3780,7 @@ router.get('/nace/blog/:sort?', require('./routes/nace/blog')); // Caixin Latest router.get('/caixin/latest', require('./routes/caixin/latest')); +// SimpRead +router.get('/simpread/notice', require('./routes/simpread/notice')); + module.exports = router; diff --git a/lib/routes/simpread/notice.js b/lib/routes/simpread/notice.js new file mode 100644 index 0000000000..a6ef1a11dd --- /dev/null +++ b/lib/routes/simpread/notice.js @@ -0,0 +1,20 @@ +const got = require('@/utils/got'); +const md = require('markdown-it')(); + +module.exports = async (ctx) => { + const url = 'https://static.simp.red/notice'; + const response = await got.get(url); + const data = response.data.notice; + ctx.state.data = { + title: 'SimpRead 消息通知', + link: url, + description: 'SimpRead 消息通知', + item: data.map((item) => ({ + description: md.render(item.content), + link: url, + pubDate: item.date, + title: `${item.category.name}-${item.title}`, + author: 'SimpRead', + })), + }; +}; From 763542c6f0f42e79b86daa94ec2e975abe4c9a7b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 6 Jan 2021 11:11:20 +0000 Subject: [PATCH 49/75] chore(deps): bump string-similarity from 4.0.3 to 4.0.4 Bumps [string-similarity](https://github.com/aceakash/string-similarity) from 4.0.3 to 4.0.4. - [Release notes](https://github.com/aceakash/string-similarity/releases) - [Commits](https://github.com/aceakash/string-similarity/commits/4.0.4) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 512f418890..37c9e5c301 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11977,9 +11977,9 @@ string-length@^4.0.1: strip-ansi "^6.0.0" string-similarity@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-4.0.3.tgz#ef52d6fc59c8a0fc93b6307fbbc08cc6e18cde21" - integrity sha512-QEwJzNFCqq+5AGImk5z4vbsEPTN/+gtyKfXBVLBcbPBRPNganZGfQnIuf9yJ+GiwSnD65sT8xrw/uwU1Q1WmfQ== + version "4.0.4" + resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-4.0.4.tgz#42d01ab0b34660ea8a018da8f56a3309bb8b2a5b" + integrity sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ== string-width@4.2.0, string-width@^4.0.0, string-width@^4.2.0: version "4.2.0" From 061cb7025d1da311df703b4e12c1c9bb9b72bf3f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 6 Jan 2021 15:09:30 +0000 Subject: [PATCH 50/75] chore(deps-dev): bump nodemon from 2.0.6 to 2.0.7 Bumps [nodemon](https://github.com/remy/nodemon) from 2.0.6 to 2.0.7. - [Release notes](https://github.com/remy/nodemon/releases) - [Commits](https://github.com/remy/nodemon/compare/v2.0.6...v2.0.7) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0ac56cc3e5..dba1b0d349 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "jest": "26.6.3", "mockdate": "3.0.2", "nock": "13.0.5", - "nodemon": "2.0.6", + "nodemon": "2.0.7", "pinyin": "2.9.1", "prettier": "2.2.1", "prettier-check": "2.0.0", diff --git a/yarn.lock b/yarn.lock index 37c9e5c301..011b36eb82 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9197,10 +9197,10 @@ nodemailer@6.4.16: resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.4.16.tgz#5cb6391b1d79ab7eff32d6f9f48366b5a7117293" integrity sha512-68K0LgZ6hmZ7PVmwL78gzNdjpj5viqBdFqKrTtr9bZbJYj6BRj5W6WGkxXrEnUl3Co3CBXi3CZBUlpV/foGnOQ== -nodemon@2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.6.tgz#1abe1937b463aaf62f0d52e2b7eaadf28cc2240d" - integrity sha512-4I3YDSKXg6ltYpcnZeHompqac4E6JeAMpGm8tJnB9Y3T0ehasLa4139dJOcCrB93HHrUMsCrKtoAlXTqT5n4AQ== +nodemon@2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.7.tgz#6f030a0a0ebe3ea1ba2a38f71bf9bab4841ced32" + integrity sha512-XHzK69Awgnec9UzHr1kc8EomQh4sjTQ8oRf8TsGrSmHDx9/UmiGG9E/mM3BuTfNeFwdNBvrqQq/RHL0xIeyFOA== dependencies: chokidar "^3.2.2" debug "^3.2.6" From 170a6428d17610c6daf2e8ac4dccf227f58221b4 Mon Sep 17 00:00:00 2001 From: Sean Chao Date: Thu, 7 Jan 2021 06:53:08 +0800 Subject: [PATCH 51/75] feat: add zhihu follow timeline (#6560) --- docs/install/README.md | 5 +++++ docs/social-media.md | 9 +++++++++ lib/config.js | 3 +++ lib/router.js | 1 + lib/routes/zhihu/timeline.js | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 51 insertions(+) create mode 100644 lib/routes/zhihu/timeline.js diff --git a/docs/install/README.md b/docs/install/README.md index a98da79d61..82c18370ac 100644 --- a/docs/install/README.md +++ b/docs/install/README.md @@ -619,3 +619,8 @@ RSSHub 支持使用访问密钥 / 码，白名单和黑名单三种方式进行 - `DIDA365_USERNAME`: 滴答清单用户名 - `DIDA365_PASSWORD`: 滴答清单密码 + +- 知乎用户关注时间线 + + - `ZHIHU_COOKIES`: 知乎登录后的 cookie 值. + 1. 可以在知乎网页版的一些请求的请求头中找到，如 `GET /moments` 请求头中的 `cookie` 值. diff --git a/docs/social-media.md b/docs/social-media.md index e18c2d30de..d4ff76d2d9 100644 --- a/docs/social-media.md +++ b/docs/social-media.md @@ -1141,3 +1141,12 @@ rule ### 知乎书店 - 知乎周刊 + +### 用户关注时间线 + + +::: warning 注意 + +用户关注动态需要登录后的 Cookie 值，所以只能自建，详情见部署页面的配置模块。 + +::: diff --git a/lib/config.js b/lib/config.js index 83112c8e74..5e81e3e9e7 100644 --- a/lib/config.js +++ b/lib/config.js @@ -89,6 +89,9 @@ const calculateValue = () => { yuque: { token: envs.YUQUE_TOKEN, }, + zhihu: { + cookies: envs.ZHIHU_COOKIES, + }, puppeteerWSEndpoint: envs.PUPPETEER_WS_ENDPOINT, loggerLevel: envs.LOGGER_LEVEL || 'info', proxyUri: envs.PROXY_URI, diff --git a/lib/router.js b/lib/router.js index 5bb0f656c3..71be05cda9 100644 --- a/lib/router.js +++ b/lib/router.js @@ -158,6 +158,7 @@ router.get('/zhihu/people/pins/:id', require('./routes/zhihu/pin/people')); router.get('/zhihu/bookstore/newest', require('./routes/zhihu/bookstore/newest')); router.get('/zhihu/pin/daily', require('./routes/zhihu/pin/daily')); router.get('/zhihu/weekly', require('./routes/zhihu/weekly')); +router.get('/zhihu/timeline', require('./routes/zhihu/timeline')); // 妹子图 router.get('/mzitu/home/:type?', require('./routes/mzitu/home')); diff --git a/lib/routes/zhihu/timeline.js b/lib/routes/zhihu/timeline.js new file mode 100644 index 0000000000..568c30a0ed --- /dev/null +++ b/lib/routes/zhihu/timeline.js @@ -0,0 +1,33 @@ +const got = require('@/utils/got'); +const config = require('@/config').value; + +module.exports = async (ctx) => { + const cookie = config.zhihu.cookies; + if (cookie === undefined) { + throw Error('缺少知乎用户登录后的 Cookie 值'); + } + + const response = await got({ + method: 'get', + url: `https://www.zhihu.com/api/v3/moments?limit=10`, + headers: { + Cookie: cookie, + }, + }); + const feeds = response.data.data; + + const out = feeds.map((e) => ({ + title: `${e.action_text}: ${e.target.title ? e.target.title : e.target.question.title}`, + description: `${e.target.excerpt}`, + pubDate: new Date(e.updated_time * 1000), + link: e.target.url.replace('api.zhihu.com', 'zhihu.com'), + author: e.target.author.name, + guid: e.id, + })); + + ctx.state.data = { + title: `知乎关注动态`, + link: `https://www.zhihu.com/follow`, + item: out, + }; +}; From 5b1c4cf80269f4bdd7bf71db82dd2a1674301fa5 Mon Sep 17 00:00:00 2001 From: hellodword <46193371+hellodword@users.noreply.github.com> Date: Thu, 7 Jan 2021 11:22:29 +0800 Subject: [PATCH 52/75] feat: add microsoft store updates --- docs/en/program-update.md | 6 +++++ docs/program-update.md | 6 +++++ lib/router.js | 3 +++ lib/routes/microsoft-store/updates.js | 32 +++++++++++++++++++++++++++ 4 files changed, 47 insertions(+) create mode 100644 lib/routes/microsoft-store/updates.js diff --git a/docs/en/program-update.md b/docs/en/program-update.md index 9325fd5e2b..13b7028215 100644 --- a/docs/en/program-update.md +++ b/docs/en/program-update.md @@ -164,6 +164,12 @@ The owner of the official image fills in the library, for example: https://rsshu +## Microsoft Store + +### Updates + + + ## Minecraft Refer to [#minecraft](/en/game.html#minecraft) diff --git a/docs/program-update.md b/docs/program-update.md index 5cddf1086a..ed7354551d 100644 --- a/docs/program-update.md +++ b/docs/program-update.md @@ -212,6 +212,12 @@ pageClass: routes +## Microsoft Store + +### Updates + + + ## Minecraft 见 [#minecraft](/game.html#minecraft) diff --git a/lib/router.js b/lib/router.js index 71be05cda9..e50f2c3a04 100644 --- a/lib/router.js +++ b/lib/router.js @@ -2853,6 +2853,9 @@ router.get('/xposed/module/:mod', require('./routes/xposed/module')); // Microsoft Edge router.get('/edge/addon/:crxid', require('./routes/edge/addon')); +// Microsoft Store +router.get('/microsoft-store/updates/:productid/:market?', require('./routes/microsoft-store/updates')); + // 上海立信会计金融学院 router.get('/slu/tzgg/:id', require('./routes/universities/slu/tzgg')); router.get('/slu/jwc/:id', require('./routes/universities/slu/jwc')); diff --git a/lib/routes/microsoft-store/updates.js b/lib/routes/microsoft-store/updates.js new file mode 100644 index 0000000000..4c5f63f625 --- /dev/null +++ b/lib/routes/microsoft-store/updates.js @@ -0,0 +1,32 @@ +const got = require('@/utils/got'); + +module.exports = async (ctx) => { + const { market = 'CN', productid } = ctx.params; + + const { data } = await got({ + method: 'get', + url: `https://displaycatalog.mp.microsoft.com/v7.0/products/${productid}/?fieldsTemplate=&market=${market}&languages=en`, + headers: { + 'Content-Type': 'application/json', + 'MS-CV': `${Array(16) + .join() + .split(',') + .map(function () { + return 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'.charAt(Math.floor(Math.random() * 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'.length)); + }) + .join('')}.1`, + }, + }); + + ctx.state.data = { + title: `${data.Product.LocalizedProperties[0].ProductTitle} - Microsoft Store Updates`, + link: `https://www.microsoft.com/store/productId/${productid}`, + item: [ + { + title: data.Product.DisplaySkuAvailabilities[0].Sku.Properties.Packages[0].PackageFullName, + pubDate: new Date(data.Product.DisplaySkuAvailabilities[0].Sku.LastModifiedDate), + link: `https://www.microsoft.com/store/productId/${productid}`, + }, + ], + }; +}; From 333f99215aafb356e5d6773fa50ab38fea4b9d3b Mon Sep 17 00:00:00 2001 From: KTachibanaM Date: Wed, 6 Jan 2021 21:55:49 -0800 Subject: [PATCH 53/75] add instruction for ansible deployment --- docs/en/install/README.md | 30 ++++++++++++++++++++++++++++++ docs/install/README.md | 30 ++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/docs/en/install/README.md b/docs/en/install/README.md index 460be758ea..3623834bbe 100644 --- a/docs/en/install/README.md +++ b/docs/en/install/README.md @@ -104,6 +104,36 @@ $ docker run -d --name rsshub -p 1200:1200 -e CACHE_EXPIRE=3600 -e GITHUB_ACCESS To configure more options please refer to [Configuration](#configuration). +# Ansible Deployment + +[This Ansible playbook](https://github.com/k-t-corp/RSSHub-ansible) includes RSSHub, Redis, browserless and Caddy + +This Ansible playbook currently only support Ubuntu 20.04 + +### Install + +```bash +sudo apt update +sudo apt install ansible +cd ~ +git clone https://github.com/k-t-corp/RSSHub-ansible.git +cd RSSHub-ansible +ansible-playbook rsshub.yaml +# When prompt to enter a domain name, enter the domain name that this machine/VM will use +# For example, if your users use https://rsshub.exmaple.com to access your RSSHub instance, enter rsshub.exmaple.com (remove the https://) +``` + +### Update + +```bash +cd ~ +git clone https://github.com/k-t-corp/RSSHub-ansible.git +cd RSSHub-ansible +ansible-playbook rsshub.yaml +# When prompt to enter a domain name, enter the domain name that this machine/VM will use +# For example, if your users use https://rsshub.exmaple.com to access your RSSHub instance, enter rsshub.exmaple.com (remove the https://) +``` + ## Manual Deployment The most direct way to deploy `RSSHub`, you can follow the steps below to deploy`RSSHub` on your computer, server or anywhere. diff --git a/docs/install/README.md b/docs/install/README.md index 82c18370ac..dfa6a09489 100644 --- a/docs/install/README.md +++ b/docs/install/README.md @@ -106,6 +106,36 @@ $ docker run -d --name rsshub -p 1200:1200 -e CACHE_EXPIRE=3600 -e GITHUB_ACCESS 更多配置项请看 [#配置](#pei-zhi) +## Ansible 部署 + +[该 Ansible playbook](https://github.com/k-t-corp/RSSHub-ansible) 包括了 RSSHub, Redis, browserless 以及 Caddy 的安装 + +该 Ansible playbook 目前只支持 Ubuntu 20.04 + +### 安装 + +```bash +sudo apt update +sudo apt install ansible +cd ~ +git clone https://github.com/k-t-corp/RSSHub-ansible.git +cd RSSHub-ansible +ansible-playbook rsshub.yaml +# 当提示输入 domain name 的时候，输入该主机所使用的域名 +# 举例：如果您的 RSSHub 用户使用 https://rsshub.exmaple.com 访问您的 RSSHub 实例，输入 rsshub.exmaple.com（去掉 https://） +``` + +### 更新 + +```bash +cd ~ +git clone https://github.com/k-t-corp/RSSHub-ansible.git +cd RSSHub-ansible +ansible-playbook rsshub.yaml +# 当提示输入 domain name 的时候，输入该主机所使用的域名 +# 举例：如果您的 RSSHub 用户使用 https://rsshub.exmaple.com 访问您的 RSSHub 实例，输入 rsshub.exmaple.com（去掉 https://） +``` + ## 手动部署 部署 `RSSHub` 最直接的方式，您可以按照以下步骤将 `RSSHub` 部署在您的电脑、服务器或者其他任何地方 From 866baa903a0b6c87bfa3fb31d6da96a3d1f42253 Mon Sep 17 00:00:00 2001 From: KTachibanaM Date: Wed, 6 Jan 2021 21:58:36 -0800 Subject: [PATCH 54/75] specify caddy 2 for ansible deployment --- docs/en/install/README.md | 2 +- docs/install/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/install/README.md b/docs/en/install/README.md index 3623834bbe..6217303343 100644 --- a/docs/en/install/README.md +++ b/docs/en/install/README.md @@ -106,7 +106,7 @@ To configure more options please refer to [Configuration](#configuration). # Ansible Deployment -[This Ansible playbook](https://github.com/k-t-corp/RSSHub-ansible) includes RSSHub, Redis, browserless and Caddy +[This Ansible playbook](https://github.com/k-t-corp/RSSHub-ansible) includes RSSHub, Redis, browserless and Caddy 2 This Ansible playbook currently only support Ubuntu 20.04 diff --git a/docs/install/README.md b/docs/install/README.md index dfa6a09489..793fd15b85 100644 --- a/docs/install/README.md +++ b/docs/install/README.md @@ -108,7 +108,7 @@ $ docker run -d --name rsshub -p 1200:1200 -e CACHE_EXPIRE=3600 -e GITHUB_ACCESS ## Ansible 部署 -[该 Ansible playbook](https://github.com/k-t-corp/RSSHub-ansible) 包括了 RSSHub, Redis, browserless 以及 Caddy 的安装 +[该 Ansible playbook](https://github.com/k-t-corp/RSSHub-ansible) 包括了 RSSHub, Redis, browserless 以及 Caddy 2 该 Ansible playbook 目前只支持 Ubuntu 20.04 From da9be824ee48c647499cc8d12bdddacc3e948e85 Mon Sep 17 00:00:00 2001 From: zytomorrow Date: Thu, 7 Jan 2021 17:57:33 +0800 Subject: [PATCH 55/75] =?UTF-8?q?feat:=20=E7=AE=80=E9=98=85(simpread)=20ch?= =?UTF-8?q?angelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/program-update.md | 3 ++ lib/router.js | 5 ++- lib/routes/simpread/changelog.js | 77 ++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 lib/routes/simpread/changelog.js diff --git a/docs/program-update.md b/docs/program-update.md index a2dafca86a..706791de63 100644 --- a/docs/program-update.md +++ b/docs/program-update.md @@ -439,3 +439,6 @@ pageClass: routes ### 消息通知 + +### 更新日志 + diff --git a/lib/router.js b/lib/router.js index e9f57e3871..2da4052374 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3780,7 +3780,10 @@ router.get('/nace/blog/:sort?', require('./routes/nace/blog')); // Caixin Latest router.get('/caixin/latest', require('./routes/caixin/latest')); -// SimpRead +// SimpRead-消息通知 router.get('/simpread/notice', require('./routes/simpread/notice')); +// SimpRead-更新日志 +router.get('/simpread/changelog', require('./routes/simpread/changelog')); + module.exports = router; diff --git a/lib/routes/simpread/changelog.js b/lib/routes/simpread/changelog.js new file mode 100644 index 0000000000..d7ad05d766 --- /dev/null +++ b/lib/routes/simpread/changelog.js @@ -0,0 +1,77 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + const url = 'https://simpread.pro/changelog.html'; + const response = await got.get(url); + const data = response.data; + const $ = cheerio.load(data); + ctx.state.data = { + title: 'SimpRead 更新日志', + link: url, + description: $('body > div.container.changelog > div.desc').html(), + item: $('.version') + .map((index, item) => { + const year = $(item).find('.year').html(); + const month_day = $(item).find('.day').html(); + let version = ''; + let detail = ''; + + // 结构异化-收个version与后续version不同级 + if (index === 0) { + // 版本名称处理 + version = $($(item).find('.num > a')[0]).clone().children().remove().end().text(); + // detail处理 + detail = $($(item).find('.details')[0]); + } else { + // 版本名称处理 + version = $(item).find('.num > a').clone().children().remove().end().text(); + // detail处理 + detail = $(item).find('.details'); + } + if (version === '') { + version = $(item).find('.num').clone().children().remove().end().text(); + } + let version_type = $(item).find('.num > a > i').attr('class'); + // 部分结构不一致处理 + if (version_type === undefined) { + version_type = $(item).find('.num > i').attr('class'); + } + if (version_type.indexOf('chrome') !== -1) { + version_type = 'Chrome'; + } + if (version_type.indexOf('apple') !== -1) { + version_type = 'Safari'; + } + if (version_type.indexOf('code') !== -1) { + version_type = 'UserScript'; + } + if (version_type.indexOf('firefox') !== -1) { + version_type = 'Firefox'; + } + + $(detail) + .find('li') + .map((index, item) => { + const level = $(item).find('span').attr('class'); + if (level !== undefined) { + if (level.indexOf('empty') !== -1) { + $(item).wrap('
    '); + } else { + $(item).find('span').append('
    '); + } + } + return {}; + }); + + return { + description: $(detail).html(), + link: url, + pubDate: `${year}-${month_day.replace('.', '-')} 00:00:00 GMT`, + title: `${version_type}${version}`, + author: 'SimpRead', + }; + }) + .get(), + }; +}; From 002f41f55918a884ff588945868239ec22334bff Mon Sep 17 00:00:00 2001 From: Ethan Shen Date: Thu, 7 Jan 2021 21:31:14 +0800 Subject: [PATCH 56/75] =?UTF-8?q?fix:=20=E5=B0=8F=E9=BB=91=E7=9B=92?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E6=96=B0=E9=97=BB=E5=8E=9F=E6=96=87=E9=93=BE?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/routes/xiaoheihe/news.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/routes/xiaoheihe/news.js b/lib/routes/xiaoheihe/news.js index 1eb2d2f827..a00a6730bf 100644 --- a/lib/routes/xiaoheihe/news.js +++ b/lib/routes/xiaoheihe/news.js @@ -38,6 +38,7 @@ module.exports = async (ctx) => { // 存放到缓存区 ctx.cache.set(cacheKey, content); news.description = content; + news.link = `https://api.xiaoheihe.cn/maxnews/app/share/detail/${newsId}`; } return Promise.resolve(news); From 34fb795c8c27467d2d184ce73ff8b17f7463573a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 7 Jan 2021 19:59:33 +0000 Subject: [PATCH 57/75] chore(deps): bump googleapis from 66.0.0 to 67.0.0 Bumps [googleapis](https://github.com/googleapis/google-api-nodejs-client) from 66.0.0 to 67.0.0. - [Release notes](https://github.com/googleapis/google-api-nodejs-client/releases) - [Changelog](https://github.com/googleapis/google-api-nodejs-client/blob/master/CHANGELOG.md) - [Commits](https://github.com/googleapis/google-api-nodejs-client/compare/v66.0.0...v67.0.0) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index dba1b0d349..10393dbed4 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "etag": "1.8.1", "fanfou-sdk": "4.2.0", "git-rev-sync": "3.0.1", - "googleapis": "66.0.0", + "googleapis": "67.0.0", "got": "11.8.1", "https-proxy-agent": "5.0.0", "iconv-lite": "0.6.2", diff --git a/yarn.lock b/yarn.lock index 011b36eb82..229a4b3959 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6077,10 +6077,10 @@ googleapis-common@^4.4.1: url-template "^2.0.8" uuid "^8.0.0" -googleapis@66.0.0: - version "66.0.0" - resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-66.0.0.tgz#008062d06b13954bd3a0425c17e8f8396e884957" - integrity sha512-jdEleRoyo/AeJZjKGC7Z2mHgochn2vR2JKqey6kydRkIBmCZxoQKLisRR4H8CRYZeEd6+c8Ns/LzS1S7qUjoFw== +googleapis@67.0.0: + version "67.0.0" + resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-67.0.0.tgz#ce0b92dcf5e4bc0fd1b82666a1625eb37fd3dc36" + integrity sha512-luhulHrk42DruR+c12W2sY2rrEVoKVdjaZDuHWSxcp1qz+VxvWQpuiK2QDLCXmo36/VFPMaa+Y7rRUR+Qqzd7w== dependencies: google-auth-library "^6.0.0" googleapis-common "^4.4.1" From 2aca91a25e71b508cf74a9fb48bf57acc0bbd54c Mon Sep 17 00:00:00 2001 From: zytomorrow Date: Fri, 8 Jan 2021 08:57:25 +0800 Subject: [PATCH 58/75] =?UTF-8?q?fix:=20=E7=AE=80=E9=98=85(simpread)=20doc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/program-update.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/program-update.md b/docs/program-update.md index 706791de63..b120035886 100644 --- a/docs/program-update.md +++ b/docs/program-update.md @@ -438,7 +438,7 @@ pageClass: routes ### 消息通知 - + ### 更新日志 - + From 97b89d68ef50e1cd300b73d77956a8963cab3b47 Mon Sep 17 00:00:00 2001 From: KTachibanaM Date: Thu, 7 Jan 2021 19:59:44 -0800 Subject: [PATCH 59/75] move ansible scripts inside --- docs/en/install/README.md | 19 +++-- docs/install/README.md | 19 +++-- scripts/ansible/.gitignore | 90 +++++++++++++++++++++ scripts/ansible/README.md | 20 +++++ scripts/ansible/Vagrantfile | 5 ++ scripts/ansible/rsshub.Caddyfile | 3 + scripts/ansible/rsshub.env | 3 + scripts/ansible/rsshub.service | 11 +++ scripts/ansible/rsshub.yaml | 130 +++++++++++++++++++++++++++++++ scripts/ansible/try.sh | 5 ++ 10 files changed, 285 insertions(+), 20 deletions(-) create mode 100644 scripts/ansible/.gitignore create mode 100644 scripts/ansible/README.md create mode 100644 scripts/ansible/Vagrantfile create mode 100644 scripts/ansible/rsshub.Caddyfile create mode 100644 scripts/ansible/rsshub.env create mode 100644 scripts/ansible/rsshub.service create mode 100644 scripts/ansible/rsshub.yaml create mode 100755 scripts/ansible/try.sh diff --git a/docs/en/install/README.md b/docs/en/install/README.md index 6217303343..7dc0b7d954 100644 --- a/docs/en/install/README.md +++ b/docs/en/install/README.md @@ -106,19 +106,20 @@ To configure more options please refer to [Configuration](#configuration). # Ansible Deployment -[This Ansible playbook](https://github.com/k-t-corp/RSSHub-ansible) includes RSSHub, Redis, browserless and Caddy 2 +This Ansible playbook includes RSSHub, Redis, browserless and Caddy 2 -This Ansible playbook currently only support Ubuntu 20.04 +Currently only support Ubuntu 20.04 + +Requires sudo privilege ### Install ```bash sudo apt update sudo apt install ansible -cd ~ -git clone https://github.com/k-t-corp/RSSHub-ansible.git -cd RSSHub-ansible -ansible-playbook rsshub.yaml +git clone https://github.com/DIYgod/RSSHub.git ~/RSSHub +cd ~/RSSHub/scripts/ansible +sudo ansible-playbook rsshub.yaml # When prompt to enter a domain name, enter the domain name that this machine/VM will use # For example, if your users use https://rsshub.exmaple.com to access your RSSHub instance, enter rsshub.exmaple.com (remove the https://) ``` @@ -126,10 +127,8 @@ ansible-playbook rsshub.yaml ### Update ```bash -cd ~ -git clone https://github.com/k-t-corp/RSSHub-ansible.git -cd RSSHub-ansible -ansible-playbook rsshub.yaml +cd ~/RSSHub/scripts/ansible +sudo ansible-playbook rsshub.yaml # When prompt to enter a domain name, enter the domain name that this machine/VM will use # For example, if your users use https://rsshub.exmaple.com to access your RSSHub instance, enter rsshub.exmaple.com (remove the https://) ``` diff --git a/docs/install/README.md b/docs/install/README.md index 793fd15b85..ed84552889 100644 --- a/docs/install/README.md +++ b/docs/install/README.md @@ -108,19 +108,20 @@ $ docker run -d --name rsshub -p 1200:1200 -e CACHE_EXPIRE=3600 -e GITHUB_ACCESS ## Ansible 部署 -[该 Ansible playbook](https://github.com/k-t-corp/RSSHub-ansible) 包括了 RSSHub, Redis, browserless 以及 Caddy 2 +这个 Ansible playbook 包括了 RSSHub, Redis, browserless 以及 Caddy 2 -该 Ansible playbook 目前只支持 Ubuntu 20.04 +目前只支持 Ubuntu 20.04 + +需要 sudo 权限 ### 安装 ```bash sudo apt update sudo apt install ansible -cd ~ -git clone https://github.com/k-t-corp/RSSHub-ansible.git -cd RSSHub-ansible -ansible-playbook rsshub.yaml +git clone https://github.com/DIYgod/RSSHub.git ~/RSSHub +cd ~/RSSHub/scripts/ansible +sudo ansible-playbook rsshub.yaml # 当提示输入 domain name 的时候，输入该主机所使用的域名 # 举例：如果您的 RSSHub 用户使用 https://rsshub.exmaple.com 访问您的 RSSHub 实例，输入 rsshub.exmaple.com（去掉 https://） ``` @@ -128,10 +129,8 @@ ansible-playbook rsshub.yaml ### 更新 ```bash -cd ~ -git clone https://github.com/k-t-corp/RSSHub-ansible.git -cd RSSHub-ansible -ansible-playbook rsshub.yaml +cd ~/RSSHub/scripts/ansible +sudo ansible-playbook rsshub.yaml # 当提示输入 domain name 的时候，输入该主机所使用的域名 # 举例：如果您的 RSSHub 用户使用 https://rsshub.exmaple.com 访问您的 RSSHub 实例，输入 rsshub.exmaple.com（去掉 https://） ``` diff --git a/scripts/ansible/.gitignore b/scripts/ansible/.gitignore new file mode 100644 index 0000000000..6117c52186 --- /dev/null +++ b/scripts/ansible/.gitignore @@ -0,0 +1,90 @@ +# Created by https://www.toptal.com/developers/gitignore/api/windows,linux,macos,ansible,vagrant +# Edit at https://www.toptal.com/developers/gitignore?templates=windows,linux,macos,ansible,vagrant + +### Ansible ### +*.retry + +### Linux ### +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### macOS ### +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### Vagrant ### +# General +.vagrant/ + +# Log files (if you are creating logs in debug mode, uncomment this) +# *.log + +### Vagrant Patch ### +*.box + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# End of https://www.toptal.com/developers/gitignore/api/windows,linux,macos,ansible,vagrant + +# vagrant logs +*.log \ No newline at end of file diff --git a/scripts/ansible/README.md b/scripts/ansible/README.md new file mode 100644 index 0000000000..50cae9b717 --- /dev/null +++ b/scripts/ansible/README.md @@ -0,0 +1,20 @@ +# Readme + +Ansible playbook to deploy [RSSHub](https://github.com/DIYgod/RSSHub) on bare-metal with Redis, browserless and Caddy 2 + +Requires sudo permission + +## Usage +On `Ubuntu 20.04`, [install ansible](https://www.digitalocean.com/community/tutorials/how-to-install-and-configure-ansible-on-ubuntu-20-04), then + +```bash +sudo ansible-playbook rsshub.yaml +``` + +## Development +Install `vagrant`, then + +```bash +./try.sh +ansible-playbook rsshub.yaml +``` diff --git a/scripts/ansible/Vagrantfile b/scripts/ansible/Vagrantfile new file mode 100644 index 0000000000..604af7f5ad --- /dev/null +++ b/scripts/ansible/Vagrantfile @@ -0,0 +1,5 @@ +Vagrant.configure("2") do |config| + config.vm.box = "generic/ubuntu2004" + config.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__exclude: ".git/" + config.ssh.extra_args = ["-t", "cd /vagrant; bash --login"] +end diff --git a/scripts/ansible/rsshub.Caddyfile b/scripts/ansible/rsshub.Caddyfile new file mode 100644 index 0000000000..7781eb24fd --- /dev/null +++ b/scripts/ansible/rsshub.Caddyfile @@ -0,0 +1,3 @@ +{{ domain_name }} + +reverse_proxy localhost:1200 diff --git a/scripts/ansible/rsshub.env b/scripts/ansible/rsshub.env new file mode 100644 index 0000000000..d4a283725c --- /dev/null +++ b/scripts/ansible/rsshub.env @@ -0,0 +1,3 @@ +NODE_ENV=production +CACHE_TYPE=redis +PUPPETEER_WS_ENDPOINT=ws://localhost:3000 diff --git a/scripts/ansible/rsshub.service b/scripts/ansible/rsshub.service new file mode 100644 index 0000000000..0c8352a44e --- /dev/null +++ b/scripts/ansible/rsshub.service @@ -0,0 +1,11 @@ +[Unit] +Description=RSSHub is an open source, easy to use, and extensible RSS feed aggregator + +[Service] +User=rsshub +WorkingDirectory=/home/rsshub/app +ExecStart=yarn start +EnvironmentFile=/home/rsshub/app/.env + +[Install] +WantedBy=multi-user.target diff --git a/scripts/ansible/rsshub.yaml b/scripts/ansible/rsshub.yaml new file mode 100644 index 0000000000..33671a51ce --- /dev/null +++ b/scripts/ansible/rsshub.yaml @@ -0,0 +1,130 @@ +- + name: Install RSSHub + hosts: localhost + become: true + vars_prompt: + - + name: domain_name + prompt: What is the domain name (without www, e.g. rsshub.example.com)? Use "http://localhost" for development in Vagrant VM. + private: no + tasks: + - + name: Check OS + fail: + msg: This playbook can only be run on Ubuntu 20.04 at this moment + when: ansible_distribution != 'Ubuntu' or ansible_distribution_version !='20.04' + - + name: Install GPG keys for repos + apt_key: + url: '{{ item }}' + state: present + with_items: + - https://deb.nodesource.com/gpgkey/nodesource.gpg.key + - https://dl.yarnpkg.com/debian/pubkey.gpg + - https://download.docker.com/linux/ubuntu/gpg + - https://dl.cloudsmith.io/public/caddy/stable/cfg/gpg/gpg.155B6D79CA56EA34.key + - + name: Install repos + apt_repository: + repo: '{{ item }}' + state: present + update_cache: yes + with_items: + - deb https://deb.nodesource.com/node_12.x focal main + - deb https://dl.yarnpkg.com/debian/ stable main + - deb https://download.docker.com/linux/ubuntu focal stable + - deb https://dl.cloudsmith.io/public/caddy/stable/deb/debian any-version main + - + name: Install prerequisites + apt: + name: + - nodejs + - yarn + - build-essential + - python-is-python2 + - redis-server + - docker-ce + - python3-pip + - virtualenv + - python3-setuptools + - caddy + state: present + update_cache: yes + - + name: Install python module for docker + pip: + name: docker + - + name: Pull docker image for browserless + docker_image: + name: browserless/chrome + source: pull + - + name: Start redis + systemd: + state: restarted + enabled: yes + name: redis + daemon_reload: yes + - + name: Copy caddy configuration + template: + src: rsshub.Caddyfile + dest: /etc/caddy/Caddyfile + - + name: Start caddy + systemd: + state: restarted + enabled: yes + name: caddy + daemon_reload: yes + - + name: Create and start browserless container + docker_container: + name: browserless + image: browserless/chrome + state: started + restart_policy: always + published_ports: + - "3000:3000" + - + name: Create the user + user: + name: rsshub + create_home: true + shell: /bin/bash + - + name: Clone the repo + git: + repo: https://github.com/DIYgod/RSSHub.git + dest: /home/rsshub/app + update: yes + - + name: Install repo dependencies + command: yarn install --production + args: + chdir: /home/rsshub/app + - + name: Copy configuration + copy: + src: rsshub.env + dest: /home/rsshub/app/.env + - + name: Own repo to the user + file: + path: /home/rsshub/app + owner: rsshub + group: rsshub + recurse: yes + - + name: Install the systemd unit + copy: + src: rsshub.service + dest: /etc/systemd/system/rsshub.service + - + name: Start the systemd service + systemd: + state: restarted + enabled: yes + name: rsshub + daemon_reload: yes diff --git a/scripts/ansible/try.sh b/scripts/ansible/try.sh new file mode 100755 index 0000000000..cd8f1df76d --- /dev/null +++ b/scripts/ansible/try.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -e + +vagrant rsync +vagrant ssh From 7aec48e8d0f83c1fd640fef3583a235d07a5b08a Mon Sep 17 00:00:00 2001 From: zytomorrow Date: Fri, 8 Jan 2021 12:41:47 +0800 Subject: [PATCH 60/75] =?UTF-8?q?fix:=20=E7=AE=80=E9=98=85(simpread)=20cha?= =?UTF-8?q?ngelog=E7=BB=93=E6=9E=84bug=E4=BF=AE=E5=A4=8D=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/routes/simpread/changelog.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/lib/routes/simpread/changelog.js b/lib/routes/simpread/changelog.js index d7ad05d766..5be450af73 100644 --- a/lib/routes/simpread/changelog.js +++ b/lib/routes/simpread/changelog.js @@ -16,19 +16,10 @@ module.exports = async (ctx) => { const month_day = $(item).find('.day').html(); let version = ''; let detail = ''; - - // 结构异化-收个version与后续version不同级 - if (index === 0) { - // 版本名称处理 - version = $($(item).find('.num > a')[0]).clone().children().remove().end().text(); - // detail处理 - detail = $($(item).find('.details')[0]); - } else { - // 版本名称处理 - version = $(item).find('.num > a').clone().children().remove().end().text(); - // detail处理 - detail = $(item).find('.details'); - } + // 版本名称处理 + version = $(item).find('.num > a').clone().children().remove().end().text(); + // detail处理 + detail = $(item).find('.details'); if (version === '') { version = $(item).find('.num').clone().children().remove().end().text(); } From 92ddaf6178c193ce799f82df00b4862332168cab Mon Sep 17 00:00:00 2001 From: zytomorrow Date: Fri, 8 Jan 2021 13:20:07 +0800 Subject: [PATCH 61/75] =?UTF-8?q?fix:=20=E7=AE=80=E9=98=85(simpread)=20?= =?UTF-8?q?=E5=8D=A0=E4=BD=8D=E5=AD=97=E7=AC=A6=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/routes/simpread/changelog.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/routes/simpread/changelog.js b/lib/routes/simpread/changelog.js index 5be450af73..dfa3f8a140 100644 --- a/lib/routes/simpread/changelog.js +++ b/lib/routes/simpread/changelog.js @@ -45,11 +45,13 @@ module.exports = async (ctx) => { .find('li') .map((index, item) => { const level = $(item).find('span').attr('class'); + const text = $(item).find('span').html(); + $(item).find('span').remove(); if (level !== undefined) { if (level.indexOf('empty') !== -1) { $(item).wrap('
      '); } else { - $(item).find('span').append('
      '); + $(item).prepend(`${text}: `); } } return {}; From f17c4e92b8d199599b91379493b8970a3cbd5e21 Mon Sep 17 00:00:00 2001 From: zytomorrow Date: Fri, 8 Jan 2021 14:31:28 +0800 Subject: [PATCH 62/75] =?UTF-8?q?fix:=20=E7=AE=80=E9=98=85(simpread)=20?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E7=BE=8E=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/routes/simpread/changelog.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/routes/simpread/changelog.js b/lib/routes/simpread/changelog.js index dfa3f8a140..9665b4cb5d 100644 --- a/lib/routes/simpread/changelog.js +++ b/lib/routes/simpread/changelog.js @@ -2,7 +2,7 @@ const got = require('@/utils/got'); const cheerio = require('cheerio'); module.exports = async (ctx) => { - const url = 'https://simpread.pro/changelog.html'; + const url = 'http://ksria.com/simpread/changelog.html'; const response = await got.get(url); const data = response.data; const $ = cheerio.load(data); @@ -41,17 +41,26 @@ module.exports = async (ctx) => { version_type = 'Firefox'; } + // detail + const text_color = { + important: '#9c27b0', + add: '#4caf50', + change: '#ffc107', + fix: '#f44336', + complete: '#03a9f4', + }; $(detail) .find('li') .map((index, item) => { - const level = $(item).find('span').attr('class'); + let span_class = $(item).find('span').attr('class'); const text = $(item).find('span').html(); $(item).find('span').remove(); - if (level !== undefined) { - if (level.indexOf('empty') !== -1) { + if (span_class !== undefined) { + span_class = span_class.split(' '); + if (span_class[1] === 'empty') { $(item).wrap('
        '); } else { - $(item).prepend(`${text}: `); + $(item).prepend(`${text}: `); } } return {}; From ce132be12e11a3b8565fa74503f8bbc34bdcf61e Mon Sep 17 00:00:00 2001 From: zytomorrow Date: Fri, 8 Jan 2021 15:06:05 +0800 Subject: [PATCH 63/75] =?UTF-8?q?fix:=20=E7=AE=80=E9=98=85(simpread)=20?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E7=BE=8E=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/routes/simpread/notice.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/routes/simpread/notice.js b/lib/routes/simpread/notice.js index a6ef1a11dd..8da1c99bc0 100644 --- a/lib/routes/simpread/notice.js +++ b/lib/routes/simpread/notice.js @@ -7,11 +7,11 @@ module.exports = async (ctx) => { const data = response.data.notice; ctx.state.data = { title: 'SimpRead 消息通知', - link: url, + link: 'http://ksria.com/simpread/changelog.html', description: 'SimpRead 消息通知', item: data.map((item) => ({ description: md.render(item.content), - link: url, + link: 'http://ksria.com/simpread/changelog.html', pubDate: item.date, title: `${item.category.name}-${item.title}`, author: 'SimpRead', From 0747bfb9927475669b7e7f6602714d208509e6f2 Mon Sep 17 00:00:00 2001 From: zytomorrow Date: Fri, 8 Jan 2021 15:13:42 +0800 Subject: [PATCH 64/75] =?UTF-8?q?fix:=20=E7=AE=80=E9=98=85(simpread)=20?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E7=BE=8E=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/routes/simpread/changelog.js | 4 ++-- lib/routes/simpread/notice.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/routes/simpread/changelog.js b/lib/routes/simpread/changelog.js index 9665b4cb5d..59ecaea8f7 100644 --- a/lib/routes/simpread/changelog.js +++ b/lib/routes/simpread/changelog.js @@ -8,7 +8,7 @@ module.exports = async (ctx) => { const $ = cheerio.load(data); ctx.state.data = { title: 'SimpRead 更新日志', - link: url, + link: 'https://simpread.pro/changelog.html', description: $('body > div.container.changelog > div.desc').html(), item: $('.version') .map((index, item) => { @@ -68,7 +68,7 @@ module.exports = async (ctx) => { return { description: $(detail).html(), - link: url, + link: 'https://simpread.pro/changelog.html', pubDate: `${year}-${month_day.replace('.', '-')} 00:00:00 GMT`, title: `${version_type}${version}`, author: 'SimpRead', diff --git a/lib/routes/simpread/notice.js b/lib/routes/simpread/notice.js index 8da1c99bc0..79dd7950ef 100644 --- a/lib/routes/simpread/notice.js +++ b/lib/routes/simpread/notice.js @@ -7,11 +7,11 @@ module.exports = async (ctx) => { const data = response.data.notice; ctx.state.data = { title: 'SimpRead 消息通知', - link: 'http://ksria.com/simpread/changelog.html', + link: 'https://simpread.pro/changelog.html', description: 'SimpRead 消息通知', item: data.map((item) => ({ description: md.render(item.content), - link: 'http://ksria.com/simpread/changelog.html', + link: 'https://simpread.pro/changelog.html', pubDate: item.date, title: `${item.category.name}-${item.title}`, author: 'SimpRead', From 01b8757729ec085d47a96bdeac18f524094c5ed9 Mon Sep 17 00:00:00 2001 From: KTachibanaM Date: Fri, 8 Jan 2021 23:19:11 -0800 Subject: [PATCH 65/75] mention docker for ansible --- docs/en/install/README.md | 2 +- docs/install/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/install/README.md b/docs/en/install/README.md index 7dc0b7d954..d271aa069a 100644 --- a/docs/en/install/README.md +++ b/docs/en/install/README.md @@ -106,7 +106,7 @@ To configure more options please refer to [Configuration](#configuration). # Ansible Deployment -This Ansible playbook includes RSSHub, Redis, browserless and Caddy 2 +This Ansible playbook includes RSSHub, Redis, browserless (uses Docker) and Caddy 2 Currently only support Ubuntu 20.04 diff --git a/docs/install/README.md b/docs/install/README.md index ed84552889..3d69e43013 100644 --- a/docs/install/README.md +++ b/docs/install/README.md @@ -108,7 +108,7 @@ $ docker run -d --name rsshub -p 1200:1200 -e CACHE_EXPIRE=3600 -e GITHUB_ACCESS ## Ansible 部署 -这个 Ansible playbook 包括了 RSSHub, Redis, browserless 以及 Caddy 2 +这个 Ansible playbook 包括了 RSSHub, Redis, browserless (依赖 Docker) 以及 Caddy 2 目前只支持 Ubuntu 20.04 From 2a6e1176aace62dce1a8ba05aabe5900b992c890 Mon Sep 17 00:00:00 2001 From: KTachibanaM Date: Fri, 8 Jan 2021 23:24:37 -0800 Subject: [PATCH 66/75] mentions docker will be automatically installed for ansible deployment --- docs/en/install/README.md | 2 +- docs/install/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/install/README.md b/docs/en/install/README.md index d271aa069a..b612600623 100644 --- a/docs/en/install/README.md +++ b/docs/en/install/README.md @@ -110,7 +110,7 @@ This Ansible playbook includes RSSHub, Redis, browserless (uses Docker) and Cadd Currently only support Ubuntu 20.04 -Requires sudo privilege +Requires sudo privilege and virtualization capability (Docker will be automatically installed) ### Install diff --git a/docs/install/README.md b/docs/install/README.md index 3d69e43013..a8c59fa918 100644 --- a/docs/install/README.md +++ b/docs/install/README.md @@ -112,7 +112,7 @@ $ docker run -d --name rsshub -p 1200:1200 -e CACHE_EXPIRE=3600 -e GITHUB_ACCESS 目前只支持 Ubuntu 20.04 -需要 sudo 权限 +需要 sudo 权限和虚拟化能力（Docker 将会被自动安装） ### 安装 From e7048c56c34e1bc596d5bb52cdbc20eae9bb194c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 9 Jan 2021 08:21:07 +0000 Subject: [PATCH 67/75] chore(deps): bump dayjs from 1.10.2 to 1.10.3 Bumps [dayjs](https://github.com/iamkun/dayjs) from 1.10.2 to 1.10.3. - [Release notes](https://github.com/iamkun/dayjs/releases) - [Changelog](https://github.com/iamkun/dayjs/blob/v1.10.3/CHANGELOG.md) - [Commits](https://github.com/iamkun/dayjs/compare/v1.10.2...v1.10.3) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 10393dbed4..e762c5ede9 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "co-redis": "2.1.1", "crypto-js": "4.0.0", "currency-symbol-map": "4.0.4", - "dayjs": "1.10.2", + "dayjs": "1.10.3", "dotenv": "8.2.0", "emailjs-imap-client": "3.1.0", "entities": "2.1.0", diff --git a/yarn.lock b/yarn.lock index 229a4b3959..b6ed190df1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4304,10 +4304,10 @@ date-now@^0.1.4: resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= -dayjs@1.10.2, dayjs@^1.8.29: - version "1.10.2" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.2.tgz#8f3a424ceb944a8193506804b0045a773d2d0672" - integrity sha512-h/YtykNNTR8Qgtd1Fxl5J1/SFP1b7SOk/M1P+Re+bCdFMV0IMkuKNgHPN7rlvvuhfw24w0LX78iYKt4YmePJNQ== +dayjs@1.10.3, dayjs@^1.8.29: + version "1.10.3" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.3.tgz#cf3357c8e7f508432826371672ebf376cb7d619b" + integrity sha512-/2fdLN987N8Ki7Id8BUN2nhuiRyxTLumQnSQf9CNncFCyqFsSKb9TNhzRYcC8K8eJSJOKvbvkImo/MKKhNi4iw== de-indent@^1.0.2: version "1.0.2" From f8da7ce83547e4e25c02efe522ba433d12e7e825 Mon Sep 17 00:00:00 2001 From: nczitzk Date: Sat, 9 Jan 2021 22:33:00 +0800 Subject: [PATCH 68/75] feat: add cgtn opinions --- docs/en/new-media.md | 4 +++ docs/new-media.md | 4 +++ lib/router.js | 1 + lib/routes/cgtn/opinions.js | 51 +++++++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+) create mode 100644 lib/routes/cgtn/opinions.js diff --git a/docs/en/new-media.md b/docs/en/new-media.md index 070815cbe9..d0b372cc8b 100644 --- a/docs/en/new-media.md +++ b/docs/en/new-media.md @@ -67,6 +67,10 @@ Compared to the official one, the RSS feed generated by RSSHub not only has more ## CGTN +### Opinions + + + ### Most Read & Most Share diff --git a/docs/new-media.md b/docs/new-media.md index dea896d573..ebc5e352c5 100644 --- a/docs/new-media.md +++ b/docs/new-media.md @@ -122,6 +122,10 @@ pageClass: routes ## CGTN +### Opinions + + + ### Most Read & Most Share diff --git a/lib/router.js b/lib/router.js index 5bb0f656c3..8daef9d3dd 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3338,6 +3338,7 @@ router.get('/fulinian/:caty?', require('./routes/fulinian/index')); // CGTN router.get('/cgtn/most/:type?/:time?', require('./routes/cgtn/most')); +router.get('/cgtn/opinions', require('./routes/cgtn/opinions')); // AppSales router.get('/appsales/:caty?/:time?', require('./routes/appsales/index')); diff --git a/lib/routes/cgtn/opinions.js b/lib/routes/cgtn/opinions.js new file mode 100644 index 0000000000..c10c3216c5 --- /dev/null +++ b/lib/routes/cgtn/opinions.js @@ -0,0 +1,51 @@ +const got = require('@/utils/got'); +const cheerio = require('cheerio'); + +module.exports = async (ctx) => { + const rootUrl = `https://www.cgtn.com/opinions`; + const response = await got({ + method: 'get', + url: rootUrl, + }); + + const $ = cheerio.load(response.data); + + $('.cg-pic').parent().remove(); + + const list = $(`.cg-title h4`) + .slice(0, 15) + .map((_, item) => { + item = $(item); + const a = item.find('a'); + return { + title: a.text(), + link: a.attr('href'), + pubDate: new Date(parseInt(a.attr('data-time'))).toUTCString(), + }; + }) + .get(); + + const items = await Promise.all( + list.map( + async (item) => + await ctx.cache.tryGet(item.link, async () => { + const detailResponse = await got({ + method: 'get', + url: item.link, + }); + const content = cheerio.load(detailResponse.data); + + item.author = content('.news-author-name').text(); + item.description = content('#cmsMainContent').html(); + + return item; + }) + ) + ); + + ctx.state.data = { + title: 'CGTN - Opinions', + link: rootUrl, + item: items, + }; +}; From 56655c77e2cdfeeb0b4418d9caa676223a329f42 Mon Sep 17 00:00:00 2001 From: qixingchen <4182240+Qixingchen@users.noreply.github.com> Date: Sat, 9 Jan 2021 23:59:02 +0800 Subject: [PATCH 69/75] Update live.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修正 哔哩哔哩直播分区不存在导致的文档示例api不可用的问题 --- docs/live.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/live.md b/docs/live.md index f41ff9d02d..84f153c57d 100644 --- a/docs/live.md +++ b/docs/live.md @@ -22,7 +22,7 @@ pageClass: routes ### 直播分区 - + ::: warning 注意 From f954c2515903f02fd935e731c2455dee43c3d018 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 10 Jan 2021 05:34:24 +0000 Subject: [PATCH 70/75] style: auto format --- docs/program-update.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/program-update.md b/docs/program-update.md index 5eb9cf3bd5..a78f659c95 100644 --- a/docs/program-update.md +++ b/docs/program-update.md @@ -316,6 +316,16 @@ pageClass: routes +## simpread + +### 消息通知 + + + +### 更新日志 + + + ## sketch.com ### beta 更新 @@ -439,12 +449,3 @@ pageClass: routes | | -commentCount | -createdAt | createdAt | - -## simpread - -### 消息通知 - - - -### 更新日志 - From e8011374ffdf24b9b2b37342c931d7ed9190c485 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 10 Jan 2021 05:48:46 +0000 Subject: [PATCH 71/75] style: auto format --- lib/router.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/router.js b/lib/router.js index 9d824c12e4..7ea0250b69 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3785,7 +3785,6 @@ router.get('/nace/blog/:sort?', require('./routes/nace/blog')); // Caixin Latest router.get('/caixin/latest', require('./routes/caixin/latest')); - // Media Digest router.get('/mediadigest/:range/:category?', require('./routes/mediadigest/category')); From 12d99d804eb179ad8cae0addbe5603276d163885 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 10 Jan 2021 06:47:40 +0000 Subject: [PATCH 72/75] style: auto format --- lib/router.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/router.js b/lib/router.js index 37bb9f50fd..0056df6949 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3806,5 +3806,4 @@ router.get('/simpread/changelog', require('./routes/simpread/changelog')); // Radio Free Asia router.get('/rfa/:language?/:channel?/:subChannel?', require('./routes/rfa/index')); - module.exports = router; From fa3ac74fbb0cd378a44f3ffb48baa87636d42ff0 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 10 Jan 2021 06:55:05 +0000 Subject: [PATCH 73/75] style: auto format --- lib/router.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/router.js b/lib/router.js index 9efa7ca9ab..0db1c19aae 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3786,7 +3786,6 @@ router.get('/nace/blog/:sort?', require('./routes/nace/blog')); // Caixin Latest router.get('/caixin/latest', require('./routes/caixin/latest')); - // Pincong 品葱 router.get('/pincong/category/:category?/:sort?', require('./routes/pincong/index')); router.get('/pincong/hot/:category?', require('./routes/pincong/hot')); From 7974dd54d6e25d3edb1bf41a96290ab6a2fe859f Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 10 Jan 2021 06:58:39 +0000 Subject: [PATCH 74/75] style: auto format --- docs/shopping.md | 23 ++++++++++++----------- lib/router.js | 2 -- lib/routes/mcdonalds/news.js | 20 +++++++++++--------- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/docs/shopping.md b/docs/shopping.md index caba5c7a34..a058a5241b 100644 --- a/docs/shopping.md +++ b/docs/shopping.md @@ -166,6 +166,18 @@ For instance, in +## 麦当劳 + +### 麦当劳活动资讯 + + + +| 全部分类 | 社会责任 | 人员品牌 | 产品故事 | 优惠 | 品牌文化 | 活动速报 | +| --------- | -------------- | -------- | -------- | ----- | -------- | -------- | +| news_list | responsibility | brand | product | sales | culture | event | + + + ## 缺书网 ### 促销 @@ -347,14 +359,3 @@ For instance, in - -## 麦当劳 - -### 麦当劳活动资讯 - - -| 全部分类 | 社会责任 | 人员品牌 | 产品故事 | 优惠 | 品牌文化 | 活动速报 | -| -------- | ------- | --- | ------- | ------ | ------- | -------- | -| news_list | responsibility | brand | product | sales | culture | event | - - diff --git a/lib/router.js b/lib/router.js index f99dcd25dd..3f293e8317 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3786,7 +3786,6 @@ router.get('/nace/blog/:sort?', require('./routes/nace/blog')); // Caixin Latest router.get('/caixin/latest', require('./routes/caixin/latest')); - // Mcdonalds router.get('/mcdonalds/:category', require('./routes/mcdonalds/news')); @@ -3815,5 +3814,4 @@ router.get('/simpread/changelog', require('./routes/simpread/changelog')); // Radio Free Asia router.get('/rfa/:language?/:channel?/:subChannel?', require('./routes/rfa/index')); - module.exports = router; diff --git a/lib/routes/mcdonalds/news.js b/lib/routes/mcdonalds/news.js index f62e83a77b..f8fc8e3717 100644 --- a/lib/routes/mcdonalds/news.js +++ b/lib/routes/mcdonalds/news.js @@ -4,18 +4,21 @@ const cheerio = require('cheerio'); module.exports = async (ctx) => { const category_param = ctx.params.category || 'news_list'; const categories = category_param.split('+'); - const baseUrl = "https://www.mcdonalds.com.cn/news/"; + const baseUrl = 'https://www.mcdonalds.com.cn/news/'; - const get_news_list = async (cates) => await Promise.all( + const get_news_list = async (cates) => + await Promise.all( cates.map(async (cate) => { const response = await got.get(baseUrl + cate); const $ = cheerio.load(response.data); // console.log($('title').text()); - const news = $('.news_list .box-container > div').slice(0, 10).map((idx, item) => { - item = $(item); - return item.find('a[target]').attr('href'); - }) - .get(); + const news = $('.news_list .box-container > div') + .slice(0, 10) + .map((idx, item) => { + item = $(item); + return item.find('a[target]').attr('href'); + }) + .get(); // console.log(news); return Promise.resolve(news); }) @@ -28,7 +31,7 @@ module.exports = async (ctx) => { const result = await got.get(news_url); const $ = cheerio.load(result.data); -// console.log($('h3 ~ time').text(), news_url); + // console.log($('h3 ~ time').text(), news_url); return { title: $('h3').text(), @@ -47,5 +50,4 @@ module.exports = async (ctx) => { link: baseUrl, item: out, }; - }; From de41c4aff2f146d8385f33d5ed9bbb303c45fcba Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 10 Jan 2021 07:41:20 +0000 Subject: [PATCH 75/75] style: auto format --- docs/new-media.md | 7 +++---- lib/router.js | 1 - lib/routes/mofish/index.js | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/new-media.md b/docs/new-media.md index eec38865ff..a9b2f164d2 100644 --- a/docs/new-media.md +++ b/docs/new-media.md @@ -2032,6 +2032,9 @@ column 为 third 时可选的 category: +## 鱼塘热榜 + + ## 遠見 @@ -2113,7 +2116,3 @@ QueryString: ### 全文 - -## 鱼塘热榜 - - \ No newline at end of file diff --git a/lib/router.js b/lib/router.js index 9f95ea46b6..75ec51820e 100644 --- a/lib/router.js +++ b/lib/router.js @@ -3817,5 +3817,4 @@ router.get('/simpread/changelog', require('./routes/simpread/changelog')); // Radio Free Asia router.get('/rfa/:language?/:channel?/:subChannel?', require('./routes/rfa/index')); - module.exports = router; diff --git a/lib/routes/mofish/index.js b/lib/routes/mofish/index.js index f99bf3087d..e8890bf1ca 100644 --- a/lib/routes/mofish/index.js +++ b/lib/routes/mofish/index.js @@ -26,4 +26,4 @@ module.exports = async (ctx) => { guid: item.id, })), }; -}; \ No newline at end of file +};