Merge pull request #873 from DIYgod/master

[pull] master from diygod:master
auto-bot-ty · Mar 15, 2023 · e59e924 · e59e924 · vercel · Mar 15, 2023
2 parents 435c1ae + b1400b9
commit e59e924
Show file tree

Hide file tree

Showing 49 changed files with 1,144 additions and 310 deletions.
diff --git a/docs/blog.md b/docs/blog.md
@@ -4,6 +4,18 @@ pageClass: routes
 
 # 博客
 
+## Amazon
+
+### AWS 博客
+
+<Route author="HankChow" example="/amazon/awsblogs" path="/awsblogs/:locale?" :paramsDesc="['指定语言的博客文章，仅支持以下选项，默认为 `zh_CN`']">
+
+| zh_CN | en_US | fr_FR | de_DE | ja_JP | ko_KR | pt_BR | es_ES | ru_RU | id_ID | tr_TR |
+| ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
+| 汉语    | 英语    | 法语    | 德语    | 日语    | 韩语    | 葡萄牙语  | 西班牙语  | 俄语    | 印尼语   | 土耳其语  |
+
+</Route>
+
 ## archdaily
 
 ### 首页

diff --git a/docs/en/blog.md b/docs/en/blog.md
@@ -4,6 +4,18 @@ pageClass: routes
 
 # Blog
 
+## Amazon
+
+### AWS Blogs
+
+<RouteEn author="HankChow" example="/amazon/awsblogs" path="/awsblogs/:locale?" :paramsDesc="['Blog postes in a specified language, only the following options are supported. Default `zh_CN`']">
+
+| zh_CN | en_US | fr_FR | de_DE | ja_JP | ko_KR | pt_BR | es_ES | ru_RU | id_ID | tr_TR |
+| ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
+| Chinese    | English    | French    | German    | Japanese    | Korean    | Portuguese  | Spainish  | Russian    | Indonesian   | Turkish  |
+
+</RouteEn>
+
 ## archdaily
 
 ### Home

diff --git a/docs/en/other.md b/docs/en/other.md
@@ -214,6 +214,12 @@ For example:
 
 </RouteEn>
 
+## oshwhub
+
+### OpenSource Square
+
+<RouteEn author="tylinux" example="/oshwhub" path="/oshwhub/:sortType?" :paramsDesc="['sortType']" radar="1" rssbud="1"/>
+
 ## Panda
 
 ### Feeds

diff --git a/docs/en/social-media.md b/docs/en/social-media.md
@@ -437,7 +437,8 @@ Specify options (in the format of query string) in parameter `routeParams` to co
 | `showAuthorInDesc`             | Show author name in description (RSS body)                                                                                           | `0`/`1`/`true`/`false` | `false` (`true` in `/twitter/followings`) |
 | `showQuotedAuthorAvatarInDesc` | Show avatar of quoted Tweet's author in description (RSS body) (Not recommended if your RSS reader extracts images from description) | `0`/`1`/`true`/`false` | `false`                                   |
 | `showAuthorAvatarInDesc`       | Show avatar of author in description (RSS body) (Not recommended if your RSS reader extracts images from description)                | `0`/`1`/`true`/`false` | `false`                                   |
-| `showEmojiForRetweetAndReply`  | Use "🔁" instead of "Rt", "↩️" & "💬" instead of "Re"                                                                                | `0`/`1`/`true`/`false` | `false`                                   |
+| `showEmojiForRetweetAndReply`  | Use "🔁" instead of "RT", "↩️" & "💬" instead of "Re"                                                                               | `0`/`1`/`true`/`false` | `false`                                   |
+| `showSymbolForRetweetAndReply` | Use " RT " instead of "", " Re " instead of ""                                                                                       | `0`/`1`/`true`/`false` | `true`                                    |
 | `showRetweetTextInTitle`       | Show quote comments in title (if `false`, only the retweeted tweet will be shown in the title)                                       | `0`/`1`/`true`/`false` | `true`                                    |
 | `addLinkForPics`               | Add clickable links for Tweet pictures                                                                                               | `0`/`1`/`true`/`false` | `false`                                   |
 | `showTimestampInDescription`   | Show timestamp in description                                                                                                        | `0`/`1`/`true`/`false` | `false`                                   |

diff --git a/docs/en/traditional-media.md b/docs/en/traditional-media.md
@@ -574,6 +574,20 @@ Language
 
 <RouteEn author="TonyRL" example="/taiwannews/hot" path="/taiwannews/hot/:lang?" :paramsDesc="['Language, `en` or `zh`, `en` by default']" radar="1" rssbud="1"/>
 
+## The Atlantic
+
+### News
+
+<RouteEn author="NavePnow" example="/theatlantic/latest" path="/theatlantic/:category" :paramsDesc="['category, see below']">
+
+| Popular      | Latest | Politics | Technology | Business |
+| ------------ | ------ | -------- | ---------- | -------- |
+| most-popular | latest | politics | technology | business |
+
+More categories (except photo) can be found within the navigation bar at <https://www.theatlantic.com/>
+
+</RouteEn>
+
 ## The Economist
 
 ### Category
@@ -678,7 +692,17 @@ Provides all of the articles by the specified New York Times author.
 
 ### News
 
-<RouteEn author="oppilate" example="/wsj/en-us/opinion" path="/wsj/:lang/:category?" :paramsDesc="['Language, `en-us`, `zh-cn`, `zh-tw` are supported', 'Category, only supported in `en-us`. Supports `opinion`, `world_news`, `us_bussiness`, `market_news`, `technology`, `lifestyle`.']">
+<RouteEn author="oppilate NavePnow" example="/wsj/en-us/opinion" path="/wsj/:lang/:category?" :paramsDesc="['Language, `en-us`, `zh-cn`, `zh-tw`', 'Category. See below']">
+
+en_us
+| World | U.S. | Politics | Economy | Business | Tech | Markets | Opinion | Books & Arts | Real Estate | Life & Work | Sytle | Sports |
+| ------ | ------- | -------- | -------- | ----- | --------- | --------- | --------- | --------- | --------- |--------- | --------- | --------- |
+| world | us | politics | economy | business | technology | markets | opinion | books-arts | realestate | life-work | style-entertainment | sports |
+
+zh-cn / zh-tw
+| 国际 | 中国 | 金融市场 | 经济 | 商业 | 科技 | 派 | 专栏与观点 |
+| ------ | ------- | -------- | -------- | ----- | --------- | --------- | --------- |
+| world | china | markets | economy | business | technology | life-arts | opinion |
 
 Provide full article RSS for WSJ topics.
 

diff --git a/docs/game.md b/docs/game.md
@@ -236,9 +236,9 @@ pageClass: routes
 ### 游戏折扣
 
 <Route author="zytomorrow" path="/jump/discount/:platform/:filter?/:countries?" example="/jump/discount/ps5/all" :paramsDesc="['平台:switch,ps4,ps5,xbox,steam,epic', '过滤参数,all-全部，jx-精选，sd-史低，dl-独立，vip-会员', '地区，具体支持较多，可自信查看地区简写']">
-| switch | ps4 | ps5 | xbox | steam | epic |
-| ------ | --- | ---- | ---- | ---- | ---- |
-| 可用   | 可用 | 可用   | 不可用   | 可用   | 不可用 |
+| switch | ps4  | ps5  | xbox   | steam | epic   |
+| ------ | ---- | ---- | ------ | ----- | ------ |
+| 可用   | 可用 | 可用 | 不可用 | 可用  | 不可用 |
 
 | filter | switch | ps4 | ps5 | steam |
 | ------ | ------ | --- | --- | ----- |
@@ -311,8 +311,8 @@ pageClass: routes
 ### Feed The Beast (FTB) 模组包更新
 
 <Route author="gucheen" example="/feed-the-beast/modpack/ftb_presents_direwolf20_1_16" path="/feed-the-beast/modpack/:modpackEntry" :paramsDesc="['模组包的短名.']">
-| 参数 | 说明 |
-| ------| ------------ |
+| 参数         | 说明                                                                                                                                                        |
+| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | modpackEntry | 模组包的短名从模组包的页面链接中找到，例如 `https://www.feed-the-beast.com/modpack/ftb_presents_direwolf20_1_16`，短名就是 `ftb_presents_direwolf20_1_16`。 |
 </Route>
 
@@ -913,6 +913,19 @@ Example：`https://www.iyingdi.com/tz/people/55547` ，id 是 `55547`
 
 <Route author="HaitianLiu" example="/yystv/docs" path="/yystv/docs" />
 
+## 遊戲基地 Gamebase
+
+### 新聞
+
+<Route author="nczitzk" example="/gamebase/news" path="/gamebase/news/:type?/:category?" :paramsDesc="['类型，见下表，默认为 newslist', '分类，可在对应分类页 URL 中找到，默认为 `all` 即全部']">
+
+类型
+
+| newslist | r18list |
+| -------- | ------- |
+
+</Route>
+
 ## 掌上英雄联盟
 
 ### 推荐

diff --git a/docs/other.md b/docs/other.md
@@ -629,6 +629,12 @@ type 为 all 时，category 参数不支持 cost 和 free
 
 <Route author="SettingDust Halcao" example="/uraaka-joshi/_rrwq" path="/uraaka-joshi/:id" :paramsDesc="['用户名']" radar="1" rssbud="1" puppeteer="1"/>
 
+## 立创开源硬件平台
+
+### 开源广场
+
+<Route author="tylinux" example="/oshwhub" path="/oshwhub/:sortType?" :paramsDesc="['排序类型']" radar="1" rssbud="1"/>
+
 ## 律师事务所文章
 
 ### 君合

diff --git a/docs/social-media.md b/docs/social-media.md
@@ -500,7 +500,7 @@ Tiny Tiny RSS 会给所有 iframe 元素添加 `sandbox="allow-scripts"` 属性
 
 ### 用户 / 标签 - Private API
 
-<Route author="oppilate DIYgod" example="/instagram/user/stefaniejoosten" path="/instagram/:category/:key" :paramsDesc="['类别，见下表', '用户名／标签名']" radar="1" anticrawler="1" radar="1">
+<Route author="oppilate DIYgod" example="/instagram/user/stefaniejoosten" path="/instagram/:category/:key" :paramsDesc="['类别，见下表', '用户名／标签名']" radar="1" anticrawler="1" selfhost="1">
 
 | 用户时间线 | 标签   |
 | ----- | ---- |
@@ -798,6 +798,7 @@ Instagram Stories 没有可靠的 guid，你的 RSS 阅读器可能将同一条
 | `showQuotedAuthorAvatarInDesc` | 是否在正文处显示被转推的推文的作者头像（若阅读器会提取正文图片，不建议开启）                                        | `0`/`1`/`true`/`false` | `false`                                   |
 | `showAuthorAvatarInDesc`       | 是否在正文处显示作者头像（若阅读器会提取正文图片，不建议开启）                                               | `0`/`1`/`true`/`false` | `false`                                   |
 | `showEmojiForRetweetAndReply`  | 显示 “🔁” 取代 “Rt”、“↩️” 取代 “Re”                                                  | `0`/`1`/`true`/`false` | `false`                                   |
+| `showSymbolForRetweetAndReply` | 显示 “RT” 取代 “”、“ Re ” 取代 “”                                                    | `0`/`1`/`true`/`false` | `true`                                    |
 | `showRetweetTextInTitle`       | 在标题处显示转推评论（置为 `false` 则在标题只显示被转推推文）                                           | `0`/`1`/`true`/`false` | `true`                                    |
 | `addLinkForPics`               | 为图片添加可点击的链接                                                                   | `0`/`1`/`true`/`false` | `false`                                   |
 | `showTimestampInDescription`   | 在正文处显示推特的时间戳                                                                  | `0`/`1`/`true`/`false` | `false`                                   |
@@ -946,7 +947,8 @@ YouTube 官方亦有提供频道 RSS，形如 <https://www.youtube.com/feeds/vid
 | 热门音乐人      | 热门歌曲     | 热门音乐视频    | 时下流行           |
 | ---------- | -------- | --------- | -------------- |
 | TopArtists | TopSongs | TopVideos | TrendingVideos |
-| :::        |          |           |                |
+
+:::
 
 ::: details 国家代码
 
@@ -985,7 +987,8 @@ YouTube 官方亦有提供频道 RSS，形如 <https://www.youtube.com/feeds/vid
 | Uruguay | Zimbabwe |
 | ------- | -------- |
 | uy      | zw       |
-| :::     |          |
+
+:::
 
 </Route>
 
@@ -1257,6 +1260,35 @@ YouTube 官方亦有提供频道 RSS，形如 <https://www.youtube.com/feeds/vid
 
 </Route>
 
+### 榜单与集合
+
+<Route author="5upernova-heng" example="/douban/list/subject_real_time_hotest" path="/douban/list/:type?" :paramsDesc="['榜单类型，见下表。默认为实时热门书影音']">
+
+| 榜单 / 集合   | 路由（type）                   |
+| --------- | -------------------------- |
+| 实时热门书影音   | subject_real_time_hotest   |
+| 影院热映      | movie_showing              |
+| 实时热门电影    | movie_real_time_hotest     |
+| 实时热门电视    | tv_real_time_hotest        |
+| 一周口碑电影榜   | movie_weekly_best          |
+| 华语口碑剧集榜   | tv_chinese_best_weekly     |
+| 全球口碑剧集榜   | tv_global_best_weekly      |
+| 国内口碑综艺榜   | show_chinese_best_weekly   |
+| 国外口碑综艺榜   | show_global_best_weekly    |
+| 虚构类小说热门榜  | book_fiction_hot_weekly    |
+| 非虚构类小说热门榜 | book_nonfiction_hot_weekly |
+| 热门单曲榜     | music_single               |
+| 华语新碟榜     | music_chinese              |
+| ...       | ...                        |
+
+> 上面的榜单 / 集合并没有列举完整。
+>
+> 如何找到榜单对应的路由参数：
+> 在豆瓣手机 APP 中，对应地榜单页面右上角，点击分享链接。链接路径 `subject_collection` 后的路径就是路由参数 `type`。
+> 如：小说热门榜的分享链接为：`https://m.douban.com/subject_collection/ECDIHUN4A`，其对应本 RSS 路由的 `type` 为 `ECDIHUN4A`，对应的订阅链接路由：[`/douban/list/ECDIHUN4A`](https://rsshub.app/douban/list/ECDIHUN4A)
+
+</Route>
+
 ## 饭否
 
 ::: warning 注意

diff --git a/docs/traditional-media.md b/docs/traditional-media.md
@@ -468,6 +468,20 @@ Solidot 提供的 feed:
 
 </Route>
 
+## The Atlantic
+
+### News
+
+<Route author="NavePnow" example="/theatlantic/latest" path="/theatlantic/:category" :paramsDesc="['分类, 见下表']">
+
+| Popular      | Latest | Politics | Technology | Business |
+| ------------ | ------ | -------- | ---------- | -------- |
+| most-popular | latest | politics | technology | business |
+
+More categories (except photo) can be found within the navigation bar at <https://www.theatlantic.com/>
+
+</Route>
+
 ## The Economist
 
 ### 分类
@@ -1182,7 +1196,19 @@ IT・科学 tech_science
 
 ### 新闻
 
-<Route author="oppilate" example="/wsj/en-us/opinion" path="/wsj/:lang/:category?" :paramsDesc="['语言，支持 `en-us`、`zh-cn`、`zh-tw`', '分类，仅 `en-us` 支持分类订阅。支持 `opinion`, `world_news`, `us_bussiness`, `market_news`, `technology`, `lifestyle`。']">
+<Route author="oppilate NavePnow" example="/wsj/en-us/opinion" path="/wsj/:lang/:category?" :paramsDesc="['语言，支持 `en-us`、`zh-cn`、`zh-tw`', '分类，见下表']">
+
+en_us
+
+| World | U.S. | Politics | Economy | Business | Tech       | Markets | Opinion | Books & Arts | Real Estate | Life & Work | Sytle               | Sports |
+| ----- | ---- | -------- | ------- | -------- | ---------- | ------- | ------- | ------------ | ----------- | ----------- | ------------------- | ------ |
+| world | us   | politics | economy | business | technology | markets | opinion | books-arts   | realestate  | life-work   | style-entertainment | sports |
+
+zh-cn / zh-tw
+
+| 国际    | 中国    | 金融市场    | 经济      | 商业       | 科技         | 派         | 专栏与观点   |
+| ----- | ----- | ------- | ------- | -------- | ---------- | --------- | ------- |
+| world | china | markets | economy | business | technology | life-arts | opinion |
 
 通过提取文章全文，以提供比官方源更佳的阅读体验。
 

diff --git a/docs/university.md b/docs/university.md
@@ -3045,6 +3045,22 @@ jsjxy.hbut.edu.cn 证书链不全，自建 RSSHub 可设置环境变量 NODE_TLS
 
 ## 西南交通大学
 
+### 教务网
+
+<Route author="mobyw" example="/swjtu/jwc" path="/swjtu/jwc"/>
+
+### 扬华素质网
+
+<Route author="mobyw" example="/swjtu/xg/tzgg" path="/swjtu/xg/:code?" :paramsDesc="['栏目(默认为tzgg)']">
+
+栏目列表：
+
+| 通知公告 | 扬华新闻 | 多彩学院 | 学工之家 |
+| ---- | ---- | ---- | ---- |
+| tzgg | yhxw | dcxy | xgzj |
+
+</Route>
+
 ### 就业招聘信息
 
 <Route author="qizidog" example="/swjtu/jyzpxx" path="/swjtu/jyzpxx"/>

diff --git a/lib/v2/amazon/awsblogs.js b/lib/v2/amazon/awsblogs.js
@@ -0,0 +1,27 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const locale = ctx.params.locale ?? 'zh_CN';
+
+    const response = await got({
+        url: `https://aws.amazon.com/api/dirs/items/search?item.directoryId=blog-posts&sort_by=item.additionalFields.createdDate&sort_order=desc&size=50&item.locale=${locale}`,
+    });
+
+    const items = response.data.items;
+
+    ctx.state.data = {
+        title: 'AWS Blog',
+        link: 'https://aws.amazon.com/blogs/',
+        description: 'AWS Blog 更新',
+        item:
+            items &&
+            items.map((item) => ({
+                title: item.item.additionalFields.title,
+                description: item.item.additionalFields.postExcerpt,
+                pubDate: parseDate(item.item.dateCreated),
+                link: item.item.additionalFields.link,
+                author: item.item.additionalFields.contributors,
+            })),
+    };
+};
diff --git a/lib/v2/amazon/maintainer.js b/lib/v2/amazon/maintainer.js
@@ -1,3 +1,4 @@
 module.exports = {
+    '/awsblogs/:locale?': ['HankChow'],
     '/kindle/software-updates': ['NavePnow'],
 };
diff --git a/lib/v2/amazon/radar.js b/lib/v2/amazon/radar.js
@@ -14,5 +14,11 @@ module.exports = {
                 },
             },
         ],
+        aws: [
+            {
+                title: 'AWS blogs',
+                docs: 'https://docs.rsshub.app/blogs.html#amazon',
+            },
+        ],
     },
 };
diff --git a/lib/v2/amazon/router.js b/lib/v2/amazon/router.js
@@ -1,3 +1,4 @@
 module.exports = function (router) {
+    router.get('/awsblogs/:locale?', require('./awsblogs'));
     router.get('/kindle/software-updates', require('./kindle-software-updates'));
 };
diff --git a/lib/v2/coindesk/index.js b/lib/v2/coindesk/index.js
@@ -5,9 +5,8 @@ const rootUrl = 'https://www.coindesk.com';
 module.exports = async (ctx) => {
     const channel = ctx.params.channel ?? 'consensus-magazine';
 
-    const response = await got.get(`${rootUrl}/${channel}`);
+    const response = await got.get(`${rootUrl}/${channel}/`);
     const $ = cheerio.load(response.data);
-    const title = $('div.title-holder h2').text();
     const content = JSON.parse(
         $('#fusion-metadata')
             .text()
@@ -16,16 +15,15 @@ module.exports = async (ctx) => {
 
     const o1 = content['websked-collections'];
     // Object key names are different every week
-    const feature = o1[Object.keys(o1)[2]];
-    const opinion = o1[Object.keys(o1)[3]];
+    const articles = o1[Object.keys(o1)[2]];
 
-    const list = [...feature.data, ...opinion.data];
+    const list = articles.data;
 
     const items = list.map((item) => ({
         title: item.headlines.basic,
         link: rootUrl + item.canonical_url,
-        description: title + '<br><br>' + item.subheadlines.basic,
-        pubDate: item.publish_date,
+        description: item.subheadlines.basic,
+        pubDate: item.display_date,
     }));
 
     ctx.state.data = {

diff --git a/lib/v2/douban/maintainer.js b/lib/v2/douban/maintainer.js
@@ -11,6 +11,7 @@ module.exports = {
     '/explore': ['clarkzsd'],
     '/explore_column/:id': ['LogicJake'],
     '/group/:groupid/:type?': ['DIYgod'],
+    '/list/:type?': ['5upernova-heng'],
     '/jobs/:type': ['Fatpandac'],
     '/movie/classification/:sort?/:score?/:tags?': ['zzwab'],
     '/movie/later': ['DIYgod'],
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,5 +14,11 @@ module.exports = { @@
                     },
                 },
             ],
+            aws: [
+                {
+                    title: 'AWS blogs',
+                    docs: 'https://docs.rsshub.app/blogs.html#amazon',
+                },
+            ],
         },
     };