rsshub 1.0.0-master.e47c9c1 → 1.0.0-master.e48187f

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (295) hide show
  1. package/lib/config.js +12 -3
  2. package/lib/middleware/parameter.js +7 -7
  3. package/lib/radar-rules.js +53 -174
  4. package/lib/router.js +43 -42
  5. package/lib/routes/v2ex/topics.js +4 -8
  6. package/lib/utils/parse-date.js +4 -4
  7. package/lib/utils/puppeteer.js +11 -0
  8. package/lib/utils/request-wrapper.js +8 -2
  9. package/lib/v2/35photo/genre.js +2 -1
  10. package/lib/v2/35photo/utils.js +19 -4
  11. package/lib/v2/aliyundrive/files.js +63 -0
  12. package/lib/v2/aliyundrive/maintainer.js +3 -0
  13. package/lib/v2/aliyundrive/radar.js +13 -0
  14. package/lib/v2/aliyundrive/router.js +3 -0
  15. package/lib/{routes/aqk → v2/anquanke}/category.js +6 -3
  16. package/lib/v2/anquanke/maintainer.js +4 -0
  17. package/lib/v2/anquanke/radar.js +13 -0
  18. package/lib/v2/anquanke/router.js +4 -0
  19. package/lib/{routes/aqk → v2/anquanke}/vul.js +3 -2
  20. package/lib/v2/apnews/topics.js +20 -18
  21. package/lib/v2/asus/bios.js +1 -0
  22. package/lib/v2/baidu/gushitong/index.js +28 -0
  23. package/lib/v2/baidu/maintainer.js +1 -0
  24. package/lib/v2/baidu/radar.js +9 -1
  25. package/lib/v2/baidu/router.js +1 -0
  26. package/lib/v2/baidu/templates/gushitong.art +9 -0
  27. package/lib/v2/bangumi/maintainer.js +14 -2
  28. package/lib/v2/bangumi/{index.js → moe/index.js} +2 -2
  29. package/lib/v2/bangumi/{online.js → online/online.js} +1 -1
  30. package/lib/v2/bangumi/radar.js +64 -2
  31. package/lib/v2/bangumi/router.js +12 -2
  32. package/lib/v2/bangumi/templates/{image.art → online/image.art} +0 -0
  33. package/lib/v2/bangumi/templates/tv/ep.art +2 -0
  34. package/lib/v2/bangumi/templates/tv/today.art +12 -0
  35. package/lib/v2/bangumi/tv/calendar/_base.js +37 -0
  36. package/lib/{routes/bangumi → v2/bangumi/tv}/calendar/today.js +15 -27
  37. package/lib/{routes/bangumi → v2/bangumi/tv}/group/reply.js +24 -13
  38. package/lib/v2/bangumi/tv/group/topic.js +26 -0
  39. package/lib/{routes/bangumi → v2/bangumi/tv}/person/index.js +14 -10
  40. package/lib/{routes/bangumi → v2/bangumi/tv}/subject/comments.js +12 -14
  41. package/lib/v2/bangumi/tv/subject/ep.js +31 -0
  42. package/lib/{routes/bangumi → v2/bangumi/tv}/subject/index.js +1 -2
  43. package/lib/{routes/bangumi → v2/bangumi/tv}/subject/offcial-subject-api.js +7 -5
  44. package/lib/{routes/bangumi → v2/bangumi/tv}/user/blog.js +7 -6
  45. package/lib/v2/bilibili/cache.js +39 -67
  46. package/lib/v2/bilibili/dynamic.js +5 -2
  47. package/lib/v2/bilibili/maintainer.js +2 -2
  48. package/lib/v2/bilibili/radar.js +18 -9
  49. package/lib/v2/bilibili/router.js +2 -2
  50. package/lib/v2/bilibili/userChannel.js +31 -35
  51. package/lib/v2/bilibili/userCollection.js +52 -0
  52. package/lib/v2/bilibili/vsearch.js +24 -16
  53. package/lib/v2/bluestacks/maintainer.js +3 -0
  54. package/lib/v2/bluestacks/radar.js +13 -0
  55. package/lib/v2/bluestacks/release.js +63 -0
  56. package/lib/v2/bluestacks/router.js +3 -0
  57. package/lib/v2/cqwu/index.js +1 -1
  58. package/lib/v2/cuc/maintainer.js +3 -0
  59. package/lib/v2/cuc/radar.js +13 -0
  60. package/lib/v2/cuc/router.js +3 -0
  61. package/lib/{routes/universities → v2}/cuc/yz.js +2 -4
  62. package/lib/v2/cw/maintainer.js +5 -0
  63. package/lib/v2/cw/master.js +28 -0
  64. package/lib/v2/cw/radar.js +25 -0
  65. package/lib/v2/cw/router.js +5 -0
  66. package/lib/v2/cw/sub.js +28 -0
  67. package/lib/v2/cw/today.js +24 -0
  68. package/lib/v2/cw/utils.js +63 -0
  69. package/lib/v2/dcard/maintainer.js +4 -0
  70. package/lib/v2/dcard/radar.js +31 -0
  71. package/lib/v2/dcard/router.js +3 -0
  72. package/lib/v2/dcard/section.js +66 -0
  73. package/lib/v2/dcard/utils.js +50 -0
  74. package/lib/v2/deepmind/blog.js +32 -0
  75. package/lib/v2/deepmind/maintainer.js +3 -0
  76. package/lib/v2/deepmind/radar.js +13 -0
  77. package/lib/v2/deepmind/router.js +3 -0
  78. package/lib/v2/domp4/detail.js +7 -3
  79. package/lib/v2/domp4/utils.js +14 -0
  80. package/lib/v2/dongqiudi/player_news.js +2 -3
  81. package/lib/v2/dongqiudi/result.js +1 -1
  82. package/lib/v2/dongqiudi/router.js +1 -1
  83. package/lib/v2/dongqiudi/special.js +21 -27
  84. package/lib/v2/dongqiudi/team_news.js +2 -3
  85. package/lib/v2/dongqiudi/top_news.js +18 -24
  86. package/lib/v2/dongqiudi/utils.js +36 -36
  87. package/lib/v2/economist/full.js +1 -1
  88. package/lib/v2/fastbull/express-news.js +33 -0
  89. package/lib/v2/fastbull/maintainer.js +5 -0
  90. package/lib/v2/fastbull/news.js +57 -0
  91. package/lib/v2/fastbull/radar.js +19 -0
  92. package/lib/v2/fastbull/router.js +5 -0
  93. package/lib/v2/fastbull/templates/description.art +7 -0
  94. package/lib/v2/gamme/category.js +46 -0
  95. package/lib/v2/gamme/maintainer.js +6 -0
  96. package/lib/v2/gamme/radar.js +33 -0
  97. package/lib/v2/gamme/router.js +4 -0
  98. package/lib/v2/gamme/tag.js +57 -0
  99. package/lib/v2/gelonghui/home.js +31 -0
  100. package/lib/v2/gelonghui/keyword.js +34 -0
  101. package/lib/v2/gelonghui/maintainer.js +6 -0
  102. package/lib/v2/gelonghui/radar.js +31 -0
  103. package/lib/v2/gelonghui/router.js +6 -0
  104. package/lib/v2/gelonghui/subject.js +36 -0
  105. package/lib/v2/gelonghui/user.js +33 -0
  106. package/lib/v2/gelonghui/utils.js +21 -0
  107. package/lib/v2/gihyo/group.js +48 -0
  108. package/lib/v2/gihyo/maintainer.js +3 -0
  109. package/lib/v2/gihyo/radar.js +13 -0
  110. package/lib/v2/gihyo/router.js +3 -0
  111. package/lib/v2/github/topic.js +1 -1
  112. package/lib/v2/gov/maintainer.js +2 -0
  113. package/lib/v2/gov/nopss/index.js +57 -0
  114. package/lib/v2/gov/radar.js +22 -0
  115. package/lib/v2/gov/router.js +2 -0
  116. package/lib/v2/gov/stats/index.js +19 -0
  117. package/lib/v2/gov/stats/templates/attachments.art +5 -0
  118. package/lib/v2/gov/stats/utils.js +73 -0
  119. package/lib/v2/hit/hitgs.js +46 -0
  120. package/lib/v2/hit/jwc.js +60 -0
  121. package/lib/v2/hit/maintainer.js +5 -0
  122. package/lib/v2/hit/radar.js +29 -0
  123. package/lib/v2/hit/router.js +6 -0
  124. package/lib/v2/hit/today.js +59 -0
  125. package/lib/v2/hitwh/maintainer.js +3 -0
  126. package/lib/v2/hitwh/radar.js +13 -0
  127. package/lib/v2/hitwh/router.js +3 -0
  128. package/lib/v2/hitwh/today.js +52 -0
  129. package/lib/v2/hjedd/utils.js +2 -2
  130. package/lib/v2/huanqiu/index.js +5 -3
  131. package/lib/v2/hupu/bbs.js +22 -1
  132. package/lib/v2/hupu/templates/description.art +22 -0
  133. package/lib/v2/indiansinkuwait/latest.js +43 -0
  134. package/lib/v2/indiansinkuwait/maintainer.js +3 -0
  135. package/lib/v2/indiansinkuwait/radar.js +13 -0
  136. package/lib/v2/indiansinkuwait/router.js +3 -0
  137. package/lib/v2/ithome/maintainer.js +1 -0
  138. package/lib/v2/ithome/radar.js +11 -0
  139. package/lib/v2/ithome/router.js +1 -0
  140. package/lib/v2/ithome/tw/feeds.js +38 -0
  141. package/lib/v2/iwara/subscriptions.js +1 -1
  142. package/lib/v2/jiemian/list.js +2 -2
  143. package/lib/v2/linovelib/maintainer.js +3 -0
  144. package/lib/v2/linovelib/novel.js +33 -0
  145. package/lib/v2/linovelib/radar.js +13 -0
  146. package/lib/v2/linovelib/router.js +3 -0
  147. package/lib/v2/lxixsxa/discography.js +54 -0
  148. package/lib/v2/lxixsxa/information.js +48 -0
  149. package/lib/v2/lxixsxa/jsonpHelper.js +19 -0
  150. package/lib/v2/lxixsxa/maintainer.js +4 -0
  151. package/lib/v2/lxixsxa/radar.js +36 -0
  152. package/lib/v2/lxixsxa/router.js +4 -0
  153. package/lib/v2/lxixsxa/templates/disco.art +5 -0
  154. package/lib/v2/lxixsxa/templates/info.art +4 -0
  155. package/lib/{routes → v2}/manhuagui/comic.js +27 -12
  156. package/lib/v2/manhuagui/maintainer.js +6 -0
  157. package/lib/v2/manhuagui/radar.js +33 -0
  158. package/lib/v2/manhuagui/router.js +5 -0
  159. package/lib/v2/manhuagui/subscribe.js +54 -0
  160. package/lib/v2/manhuagui/templates/manga.art +2 -0
  161. package/lib/v2/meituclub/latest.js +41 -0
  162. package/lib/v2/meituclub/maintainer.js +3 -0
  163. package/lib/v2/meituclub/radar.js +13 -0
  164. package/lib/v2/meituclub/router.js +3 -0
  165. package/lib/v2/meituclub/templates/description.art +1 -0
  166. package/lib/v2/nikkei-asia/index.js +1 -1
  167. package/lib/v2/nju/exchangesys.js +46 -0
  168. package/lib/v2/nju/jw.js +43 -29
  169. package/lib/v2/nju/maintainer.js +2 -1
  170. package/lib/v2/nju/radar.js +32 -9
  171. package/lib/v2/nju/router.js +1 -0
  172. package/lib/v2/qianzhan/column.js +50 -0
  173. package/lib/v2/qianzhan/maintainer.js +4 -0
  174. package/lib/v2/qianzhan/radar.js +26 -0
  175. package/lib/v2/qianzhan/rank.js +40 -0
  176. package/lib/v2/qianzhan/router.js +4 -0
  177. package/lib/v2/qweather/now.js +1 -2
  178. package/lib/v2/rarehistoricalphotos/index.js +28 -0
  179. package/lib/v2/rarehistoricalphotos/maintainer.js +3 -0
  180. package/lib/v2/rarehistoricalphotos/radar.js +13 -0
  181. package/lib/v2/rarehistoricalphotos/router.js +3 -0
  182. package/lib/v2/science/cover.js +69 -0
  183. package/lib/v2/science/current.js +41 -0
  184. package/lib/v2/science/early.js +33 -0
  185. package/lib/v2/science/maintainer.js +5 -0
  186. package/lib/v2/science/radar.js +25 -0
  187. package/lib/v2/science/router.js +5 -0
  188. package/lib/v2/science/templates/article.art +2 -0
  189. package/lib/v2/science/templates/cover.art +2 -0
  190. package/lib/v2/science/utils.js +64 -0
  191. package/lib/{routes → v2}/secrss/author.js +4 -2
  192. package/lib/{routes → v2}/secrss/category.js +8 -7
  193. package/lib/v2/secrss/maintainer.js +4 -0
  194. package/lib/v2/secrss/radar.js +19 -0
  195. package/lib/v2/secrss/router.js +4 -0
  196. package/lib/v2/sputniknews/index.js +2 -1
  197. package/lib/v2/sse/convert.js +39 -0
  198. package/lib/v2/sse/disclosure.js +46 -0
  199. package/lib/v2/sse/inquire.js +45 -0
  200. package/lib/v2/sse/lawandrules.js +43 -0
  201. package/lib/v2/sse/maintainer.js +7 -0
  202. package/lib/v2/sse/radar.js +41 -0
  203. package/lib/v2/sse/renewal.js +57 -0
  204. package/lib/v2/sse/router.js +7 -0
  205. package/lib/v2/sse/templates/inquire.art +7 -0
  206. package/lib/v2/sse/templates/renewal.art +13 -0
  207. package/lib/v2/techflowpost/express.js +33 -0
  208. package/lib/v2/techflowpost/index.js +30 -0
  209. package/lib/v2/techflowpost/maintainer.js +4 -0
  210. package/lib/v2/{techflow520 → techflowpost}/radar.js +6 -6
  211. package/lib/v2/techflowpost/router.js +5 -0
  212. package/lib/v2/thepaper/channel.js +11 -6
  213. package/lib/v2/thepaper/featured.js +9 -5
  214. package/lib/v2/thepaper/list.js +12 -6
  215. package/lib/v2/thepaper/maintainer.js +3 -3
  216. package/lib/v2/thepaper/radar.js +2 -2
  217. package/lib/v2/thepaper/templates/image_detail.art +6 -0
  218. package/lib/v2/thepaper/templates/video_detail.art +6 -0
  219. package/lib/v2/thepaper/utils.js +74 -43
  220. package/lib/v2/thwiki/index.js +32 -0
  221. package/lib/v2/thwiki/maintainer.js +3 -0
  222. package/lib/v2/thwiki/radar.js +13 -0
  223. package/lib/v2/thwiki/router.js +3 -0
  224. package/lib/v2/tiktok/user.js +1 -1
  225. package/lib/v2/twitter/web-api/twitter-got.js +2 -2
  226. package/lib/v2/web3caff/index.js +63 -0
  227. package/lib/v2/web3caff/maintainer.js +3 -0
  228. package/lib/v2/web3caff/radar.js +13 -0
  229. package/lib/v2/web3caff/router.js +3 -0
  230. package/lib/v2/worldjournal/index.js +60 -0
  231. package/lib/v2/worldjournal/maintainer.js +3 -0
  232. package/lib/v2/worldjournal/radar.js +13 -0
  233. package/lib/v2/worldjournal/router.js +3 -0
  234. package/lib/v2/xwlb/index.js +40 -0
  235. package/lib/v2/xwlb/maintainer.js +4 -0
  236. package/lib/v2/xwlb/radar.js +13 -0
  237. package/lib/v2/xwlb/router.js +4 -0
  238. package/lib/v2/yxdown/maintainer.js +4 -0
  239. package/lib/{routes → v2}/yxdown/news.js +11 -8
  240. package/lib/v2/yxdown/radar.js +19 -0
  241. package/lib/{routes → v2}/yxdown/recommend.js +11 -8
  242. package/lib/v2/yxdown/router.js +4 -0
  243. package/lib/v2/yxdown/utils.js +17 -0
  244. package/lib/{routes → v2}/zcool/discover.js +29 -17
  245. package/lib/{routes → v2}/zcool/locations.js +0 -0
  246. package/lib/v2/zcool/maintainer.js +7 -0
  247. package/lib/v2/zcool/radar.js +55 -0
  248. package/lib/v2/zcool/router.js +5 -0
  249. package/lib/v2/zcool/templates/description.art +8 -0
  250. package/lib/v2/zcool/templates/work.art +11 -0
  251. package/lib/v2/zcool/top.js +51 -0
  252. package/lib/v2/zcool/user.js +48 -0
  253. package/lib/v2/zcool/utils.js +14 -0
  254. package/lib/v2/zhihu/activities.js +2 -2
  255. package/lib/v2/zhihu/utils.js +10 -1
  256. package/lib/v2/zju/grs/index.js +11 -10
  257. package/lib/v2/zju/radar.js +5 -5
  258. package/lib/v2/zodgame/forum.js +54 -0
  259. package/lib/v2/zodgame/maintainer.js +3 -0
  260. package/lib/v2/zodgame/radar.js +18 -0
  261. package/lib/v2/zodgame/router.js +3 -0
  262. package/lib/v2/zodgame/templates/forum.art +1 -0
  263. package/package.json +14 -12
  264. package/lib/routes/bangumi/calendar/_base.js +0 -43
  265. package/lib/routes/bangumi/group/topic.js +0 -26
  266. package/lib/routes/bangumi/subject/ep.js +0 -26
  267. package/lib/routes/dcard/section.js +0 -47
  268. package/lib/routes/dcard/utils.js +0 -54
  269. package/lib/routes/deepmind/blog.js +0 -43
  270. package/lib/routes/gelonghui/keyword.js +0 -36
  271. package/lib/routes/gelonghui/subject.js +0 -42
  272. package/lib/routes/gelonghui/user.js +0 -46
  273. package/lib/routes/kuaibao/index.js +0 -33
  274. package/lib/routes/mhgui/comic.js +0 -99
  275. package/lib/routes/sciencemag/cover.js +0 -56
  276. package/lib/routes/sciencemag/current.js +0 -123
  277. package/lib/routes/sciencemag/early.js +0 -97
  278. package/lib/routes/sse/convert.js +0 -32
  279. package/lib/routes/sse/disclosure.js +0 -34
  280. package/lib/routes/sse/inquire.js +0 -31
  281. package/lib/routes/sse/renewal.js +0 -61
  282. package/lib/routes/sse/sserules.js +0 -49
  283. package/lib/routes/twmanhuagui/comic.js +0 -99
  284. package/lib/routes/universities/hit/jwc.js +0 -53
  285. package/lib/routes/universities/hit/today.js +0 -85
  286. package/lib/routes/universities/hitwh/today.js +0 -46
  287. package/lib/routes/xwlb/index.js +0 -40
  288. package/lib/routes/zcool/top.js +0 -75
  289. package/lib/routes/zcool/user.js +0 -58
  290. package/lib/v2/bilibili/collection.js +0 -34
  291. package/lib/v2/dongqiudi/daily.js +0 -47
  292. package/lib/v2/techflow520/index.js +0 -34
  293. package/lib/v2/techflow520/maintainer.js +0 -4
  294. package/lib/v2/techflow520/newsflash.js +0 -32
  295. package/lib/v2/techflow520/router.js +0 -4
package/lib/config.js CHANGED
@@ -2,6 +2,8 @@ require('dotenv').config();
2
2
  const randUserAgent = require('./utils/rand-user-agent');
3
3
  let envs = process.env;
4
4
  let value;
5
+ const TRUE_UA = 'RSSHub/1.0 (+http://github.com/DIYgod/RSSHub; like FeedFetcher-Google)';
6
+
5
7
  const calculateValue = () => {
6
8
  const bilibili_cookies = {};
7
9
  const twitter_tokens = {};
@@ -40,7 +42,8 @@ const calculateValue = () => {
40
42
  listenInaddrAny: envs.LISTEN_INADDR_ANY || 1, // 是否允许公网连接,取值 0 1
41
43
  requestRetry: parseInt(envs.REQUEST_RETRY) || 2, // 请求失败重试次数
42
44
  requestTimeout: parseInt(envs.REQUEST_TIMEOUT) || 30000, // Milliseconds to wait for the server to end the response before aborting the request
43
- ua: envs.UA || randUserAgent({ browser: 'chrome', os: 'mac os', device: 'desktop' }),
45
+ ua: envs.UA ? envs.UA : envs.NO_RANDOM_UA === 'true' || envs.NO_RANDOM_UA === '1' ? TRUE_UA : randUserAgent({ browser: 'chrome', os: 'mac os', device: 'desktop' }),
46
+ trueUA: TRUE_UA,
44
47
  // cors request
45
48
  allowOrigin: envs.ALLOW_ORIGIN,
46
49
  // cache
@@ -185,6 +188,9 @@ const calculateValue = () => {
185
188
  lastfm: {
186
189
  api_key: envs.LASTFM_API_KEY,
187
190
  },
191
+ manhuagui: {
192
+ cookie: envs.MHGUI_COOKIE,
193
+ },
188
194
  mastodon: {
189
195
  apiHost: envs.MASTODON_API_HOST,
190
196
  accessToken: envs.MASTODON_API_ACCESS_TOKEN,
@@ -239,8 +245,8 @@ const calculateValue = () => {
239
245
  consumer_key: envs.TWITTER_CONSUMER_KEY,
240
246
  consumer_secret: envs.TWITTER_CONSUMER_SECRET,
241
247
  tokens: twitter_tokens,
242
- authorization: envs.TWITTER_WEBAPI_AUTHORIZAION || 'Bearer AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA',
243
- // 此处硬编码参考自https://github.com/mikf/gallery-dl/blob/master/gallery_dl/extractor/twitter.py#L550
248
+ authorization: envs.TWITTER_WEBAPI_AUTHORIZAION || 'Bearer AAAAAAAAAAAAAAAAAAAAAPYXBAAAAAAACLXUNDekMxqa8h%2F40K4moUkGsoc%3DTYfbDKbT3jJPCEVnMYqilB28NHfOPqkca3qaAxGfsyKCs0wRbw',
249
+ // reference: https://github.com/dangeredwolf/FixTweet/blob/f3082bbb0d69798687481a605f6760b2eb7558e0/src/constants.ts#L23-L25
244
250
  },
245
251
  weibo: {
246
252
  app_key: envs.WEIBO_APP_KEY,
@@ -272,6 +278,9 @@ const calculateValue = () => {
272
278
  zhihu: {
273
279
  cookies: envs.ZHIHU_COOKIES,
274
280
  },
281
+ zodgame: {
282
+ cookie: envs.ZODGAME_COOKIE,
283
+ },
275
284
  };
276
285
  };
277
286
  calculateValue();
@@ -54,7 +54,9 @@ module.exports = async (ctx, next) => {
54
54
  ctx.state.data.description && (ctx.state.data.description = entities.decodeXML(ctx.state.data.description + ''));
55
55
 
56
56
  // sort items
57
- ctx.state.data.item = ctx.state.data.item.sort((a, b) => +new Date(b.pubDate || 0) - +new Date(a.pubDate || 0));
57
+ if (ctx.query.sorted !== 'false') {
58
+ ctx.state.data.item = ctx.state.data.item.sort((a, b) => +new Date(b.pubDate || 0) - +new Date(a.pubDate || 0));
59
+ }
58
60
 
59
61
  const handleItem = (item) => {
60
62
  item.title && (item.title = entities.decodeXML(item.title + ''));
@@ -250,12 +252,10 @@ module.exports = async (ctx, next) => {
250
252
  const parsed_result = await ctx.cache.tryGet(`mercury-cache-${link}`, async () => {
251
253
  // if parser failed, return default description and not report error
252
254
  try {
253
- mercury_parser = mercury_parser || require('@postlight/mercury-parser');
255
+ mercury_parser = mercury_parser || require('@postlight/parser');
254
256
 
255
- const res = await got(link);
256
- const $ = cheerio.load(res.data, {
257
- xmlMode: true,
258
- });
257
+ const { data: res } = await got(link);
258
+ const $ = cheerio.load(res);
259
259
  const result = await mercury_parser.parse(link, {
260
260
  html: $.html(),
261
261
  });
@@ -266,7 +266,7 @@ module.exports = async (ctx, next) => {
266
266
  });
267
267
 
268
268
  item.author = author || (parsed_result ? parsed_result.author : '');
269
- item.description = parsed_result ? parsed_result.content : description;
269
+ item.description = parsed_result ? entities.decodeXML(parsed_result.content) : description;
270
270
  });
271
271
  await Promise.all(tasks);
272
272
  }
@@ -167,39 +167,6 @@ module.exports = {
167
167
  },
168
168
  ],
169
169
  },
170
- 'manhuagui.com': {
171
- _name: '漫画柜',
172
- www: [
173
- {
174
- title: '漫画更新',
175
- docs: 'https://docs.rsshub.app/anime.html#kan-man-hua',
176
- source: '/comic/:id/',
177
- target: '/manhuagui/comic/:id',
178
- },
179
- ],
180
- },
181
- 'mhgui.com': {
182
- _name: '漫画柜镜像站',
183
- www: [
184
- {
185
- title: '漫画更新',
186
- docs: 'https://docs.rsshub.app/anime.html#kan-man-hua-jing-xiang-zhan',
187
- source: '/comic/:id/',
188
- target: '/mhgui/comic/:id',
189
- },
190
- ],
191
- },
192
- 'tw.manhuagui.com': {
193
- _name: '漫画柜台湾',
194
- www: [
195
- {
196
- title: '漫画更新',
197
- docs: 'https://docs.rsshub.app/anime.html#kan-man-hua-tai-wan',
198
- source: '/comic/:id/',
199
- target: '/twmanhuagui/comic/:id',
200
- },
201
- ],
202
- },
203
170
  'pgyer.com': {
204
171
  _name: '蒲公英应用分发',
205
172
  www: [
@@ -311,35 +278,6 @@ module.exports = {
311
278
  },
312
279
  ],
313
280
  },
314
- 'dcard.tw': {
315
- _name: 'Dcard',
316
- www: [
317
- {
318
- title: '首頁帖子-最新',
319
- docs: 'https://docs.rsshub.app/bbs.html#dcard',
320
- source: '/f',
321
- target: '/dcard/posts/latest',
322
- },
323
- {
324
- title: '首頁帖子-熱門',
325
- docs: 'https://docs.rsshub.app/bbs.html#dcard',
326
- source: '/f',
327
- target: '/dcard/posts/popular',
328
- },
329
- {
330
- title: '板塊帖子-最新',
331
- docs: 'https://docs.rsshub.app/bbs.html#dcard',
332
- source: '/f/:section',
333
- target: '/dcard/:section/latest',
334
- },
335
- {
336
- title: '板塊帖子-熱門',
337
- docs: 'https://docs.rsshub.app/bbs.html#dcard',
338
- source: '/f/:section',
339
- target: '/dcard/:section/popular',
340
- },
341
- ],
342
- },
343
281
  'wegene.com': {
344
282
  _name: 'WeGene',
345
283
  www: [
@@ -1083,59 +1021,59 @@ module.exports = {
1083
1021
  },
1084
1022
  ],
1085
1023
  },
1086
- 'zcool.com.cn': {
1087
- _name: '站酷',
1088
- www: [
1089
- {
1090
- title: '发现',
1091
- docs: 'https://docs.rsshub.app/design.html#zhan-ku',
1092
- source: '',
1093
- target: '/zcool/discover',
1094
- },
1095
- {
1096
- title: '发现 - 精选 - 全部推荐',
1097
- docs: 'https://docs.rsshub.app/design.html#zhan-ku',
1098
- source: '',
1099
- target: '/zcool/discover/all',
1100
- },
1101
- {
1102
- title: '发现 - 精选 - 首页推荐',
1103
- docs: 'https://docs.rsshub.app/design.html#zhan-ku',
1104
- source: '',
1105
- target: '/zcool/discover/home',
1106
- },
1107
- {
1108
- title: '发现 - 精选 - 编辑精选',
1109
- docs: 'https://docs.rsshub.app/design.html#zhan-ku',
1110
- source: '',
1111
- target: '/zcool/discover/home',
1112
- },
1113
- {
1114
- title: '发现 - 精选 - 文章 - 编辑精选',
1115
- docs: 'https://docs.rsshub.app/design.html#zhan-ku',
1116
- source: '',
1117
- target: '/zcool/discover/article',
1118
- },
1119
- {
1120
- title: '作品榜单',
1121
- docs: 'https://docs.rsshub.app/design.html#zhan-ku',
1122
- source: '',
1123
- target: '/zcool/top/design',
1124
- },
1125
- {
1126
- title: '文章榜单',
1127
- docs: 'https://docs.rsshub.app/design.html#zhan-ku',
1128
- source: '',
1129
- target: '/zcool/top/article',
1130
- },
1131
- {
1132
- title: '用户作品',
1133
- docs: 'https://docs.rsshub.app/design.html#zhan-ku',
1134
- source: ['/u/:id'],
1135
- target: `/zcool/user/:id`,
1136
- },
1137
- ],
1138
- },
1024
+ // 'zcool.com.cn': {
1025
+ // _name: '站酷',
1026
+ // www: [
1027
+ // {
1028
+ // title: '发现',
1029
+ // docs: 'https://docs.rsshub.app/design.html#zhan-ku',
1030
+ // source: '',
1031
+ // target: '/zcool/discover',
1032
+ // },
1033
+ // {
1034
+ // title: '发现 - 精选 - 全部推荐',
1035
+ // docs: 'https://docs.rsshub.app/design.html#zhan-ku',
1036
+ // source: '',
1037
+ // target: '/zcool/discover/all',
1038
+ // },
1039
+ // {
1040
+ // title: '发现 - 精选 - 首页推荐',
1041
+ // docs: 'https://docs.rsshub.app/design.html#zhan-ku',
1042
+ // source: '',
1043
+ // target: '/zcool/discover/home',
1044
+ // },
1045
+ // {
1046
+ // title: '发现 - 精选 - 编辑精选',
1047
+ // docs: 'https://docs.rsshub.app/design.html#zhan-ku',
1048
+ // source: '',
1049
+ // target: '/zcool/discover/home',
1050
+ // },
1051
+ // {
1052
+ // title: '发现 - 精选 - 文章 - 编辑精选',
1053
+ // docs: 'https://docs.rsshub.app/design.html#zhan-ku',
1054
+ // source: '',
1055
+ // target: '/zcool/discover/article',
1056
+ // },
1057
+ // {
1058
+ // title: '作品榜单',
1059
+ // docs: 'https://docs.rsshub.app/design.html#zhan-ku',
1060
+ // source: '',
1061
+ // target: '/zcool/top/design',
1062
+ // },
1063
+ // {
1064
+ // title: '文章榜单',
1065
+ // docs: 'https://docs.rsshub.app/design.html#zhan-ku',
1066
+ // source: '',
1067
+ // target: '/zcool/top/article',
1068
+ // },
1069
+ // {
1070
+ // title: '用户作品',
1071
+ // docs: 'https://docs.rsshub.app/design.html#zhan-ku',
1072
+ // source: ['/u/:id'],
1073
+ // target: `/zcool/user/:id`,
1074
+ // },
1075
+ // ],
1076
+ // },
1139
1077
  'zhuixinfan.com': {
1140
1078
  _name: '追新番日剧站',
1141
1079
  '.': [
@@ -1734,65 +1672,6 @@ module.exports = {
1734
1672
  },
1735
1673
  ],
1736
1674
  },
1737
- 'bgm.tv': {
1738
- _name: 'Bangumi',
1739
- '.': [
1740
- {
1741
- title: '小组话题',
1742
- docs: 'https://docs.rsshub.app/anime.html#bangumi',
1743
- source: '/group/:id',
1744
- target: '/bangumi/group/:id',
1745
- },
1746
- {
1747
- title: '小组话题的新回复',
1748
- docs: 'https://docs.rsshub.app/anime.html#bangumi',
1749
- source: '/group/topic/:id',
1750
- target: '/bangumi/topic/:id',
1751
- },
1752
- {
1753
- title: '现实人物的新作品',
1754
- docs: 'https://docs.rsshub.app/anime.html#bangumi',
1755
- source: '/person/:id',
1756
- target: '/bangumi/person/:id',
1757
- },
1758
- {
1759
- title: '用户日志',
1760
- docs: 'https://docs.rsshub.app/anime.html#bangumi',
1761
- source: '/user/:id',
1762
- target: '/bangumi/user/blog/:id',
1763
- },
1764
- {
1765
- title: '条目的讨论',
1766
- docs: 'https://docs.rsshub.app/anime.html#bangumi',
1767
- source: '/subject/:id',
1768
- target: '/bangumi/subject/:id/topics',
1769
- },
1770
- {
1771
- title: '条目的评论',
1772
- docs: 'https://docs.rsshub.app/anime.html#bangumi',
1773
- source: '/subject/:id',
1774
- target: '/bangumi/subject/:id/blogs',
1775
- },
1776
- {
1777
- title: '条目的章节',
1778
- docs: 'https://docs.rsshub.app/anime.html#bangumi',
1779
- source: '/subject/:id',
1780
- target: '/bangumi/subject/:id',
1781
- },
1782
- {
1783
- title: '条目的吐槽箱',
1784
- docs: 'https://docs.rsshub.app/anime.html#bangumi',
1785
- source: '/subject/:id',
1786
- target: '/bangumi/subject/:id/comments',
1787
- },
1788
- {
1789
- title: '放送列表',
1790
- docs: 'https://docs.rsshub.app/anime.html#bangumi',
1791
- source: '/calendar',
1792
- target: '/bangumi/calendar/today',
1793
- },
1794
- ],
1795
- },
1796
1675
  'e-hentai.org/': {
1797
1676
  _name: 'E-Hentai',
1798
1677
  '.': [
package/lib/router.js CHANGED
@@ -34,13 +34,13 @@ router.get('/1draw', lazyloadRouteHandler('./routes/1draw/index'));
34
34
  router.get('/benedictevans', lazyloadRouteHandler('./routes/benedictevans/recent.js'));
35
35
 
36
36
  // bangumi
37
- router.get('/bangumi/calendar/today', lazyloadRouteHandler('./routes/bangumi/calendar/today'));
38
- router.get('/bangumi/subject/:id/:type', lazyloadRouteHandler('./routes/bangumi/subject'));
39
- router.get('/bangumi/person/:id', lazyloadRouteHandler('./routes/bangumi/person'));
40
- router.get('/bangumi/topic/:id', lazyloadRouteHandler('./routes/bangumi/group/reply'));
41
- router.get('/bangumi/group/:id', lazyloadRouteHandler('./routes/bangumi/group/topic'));
42
- router.get('/bangumi/subject/:id', lazyloadRouteHandler('./routes/bangumi/subject'));
43
- router.get('/bangumi/user/blog/:id', lazyloadRouteHandler('./routes/bangumi/user/blog'));
37
+ // router.get('/bangumi/calendar/today', lazyloadRouteHandler('./routes/bangumi/calendar/today'));
38
+ // router.get('/bangumi/subject/:id/:type', lazyloadRouteHandler('./routes/bangumi/subject'));
39
+ // router.get('/bangumi/person/:id', lazyloadRouteHandler('./routes/bangumi/person'));
40
+ // router.get('/bangumi/topic/:id', lazyloadRouteHandler('./routes/bangumi/group/reply'));
41
+ // router.get('/bangumi/group/:id', lazyloadRouteHandler('./routes/bangumi/group/topic'));
42
+ // router.get('/bangumi/subject/:id', lazyloadRouteHandler('./routes/bangumi/subject'));
43
+ // router.get('/bangumi/user/blog/:id', lazyloadRouteHandler('./routes/bangumi/user/blog'));
44
44
 
45
45
  // 報導者 migrated to v2
46
46
  // router.get('/twreporter/newest', lazyloadRouteHandler('./routes/twreporter/newest'));
@@ -407,8 +407,8 @@ router.get('/technologyreview', lazyloadRouteHandler('./routes/technologyreview/
407
407
  router.get('/technologyreview/:category_name', lazyloadRouteHandler('./routes/technologyreview/topic'));
408
408
 
409
409
  // 安全客
410
- router.get('/aqk/vul', lazyloadRouteHandler('./routes/aqk/vul'));
411
- router.get('/aqk/:category', lazyloadRouteHandler('./routes/aqk/category'));
410
+ // router.get('/aqk/vul', lazyloadRouteHandler('./routes/aqk/vul'));
411
+ // router.get('/aqk/:category', lazyloadRouteHandler('./routes/aqk/category'));
412
412
 
413
413
  // 腾讯游戏开发者社区
414
414
  router.get('/gameinstitute/community/:tag?', lazyloadRouteHandler('./routes/tencent/gameinstitute/community'));
@@ -527,15 +527,15 @@ router.get('/hhu/libNews', lazyloadRouteHandler('./routes/universities/hhu/libNe
527
527
  // 河海大学常州校区
528
528
  router.get('/hhu/libNewsc', lazyloadRouteHandler('./routes/universities/hhu/libNewsc'));
529
529
 
530
- // 哈尔滨工业大学
531
- router.get('/hit/jwc', lazyloadRouteHandler('./routes/universities/hit/jwc'));
532
- router.get('/hit/today/:category', lazyloadRouteHandler('./routes/universities/hit/today'));
530
+ // 哈尔滨工业大学 migrated to v2
531
+ // router.get('/hit/jwc', lazyloadRouteHandler('./routes/universities/hit/jwc'));
532
+ // router.get('/hit/today/:category', lazyloadRouteHandler('./routes/universities/hit/today'));
533
533
 
534
534
  // 哈尔滨工业大学(深圳)
535
535
  router.get('/hitsz/article/:category?', lazyloadRouteHandler('./routes/universities/hitsz/article'));
536
536
 
537
537
  // 哈尔滨工业大学(威海)
538
- router.get('/hitwh/today', lazyloadRouteHandler('./routes/universities/hitwh/today'));
538
+ // router.get('/hitwh/today', lazyloadRouteHandler('./routes/universities/hitwh/today'));
539
539
 
540
540
  // 上海科技大学
541
541
  router.get('/shanghaitech/activity', lazyloadRouteHandler('./routes/universities/shanghaitech/activity'));
@@ -597,7 +597,7 @@ router.get('/cas/iee/kydt', lazyloadRouteHandler('./routes/universities/cas/iee/
597
597
  router.get('/cas/cg/:caty?', lazyloadRouteHandler('./routes/universities/cas/cg/index'));
598
598
 
599
599
  // 中国传媒大学
600
- router.get('/cuc/yz', lazyloadRouteHandler('./routes/universities/cuc/yz'));
600
+ // router.get('/cuc/yz', lazyloadRouteHandler('./v2/cuc/yz'));
601
601
 
602
602
  // UTdallas ISSO
603
603
  router.get('/utdallas/isso', lazyloadRouteHandler('./routes/universities/utdallas/isso'));
@@ -996,10 +996,11 @@ router.get('/eeo/:column?/:category?', lazyloadRouteHandler('./routes/eeo/index'
996
996
  // 腾讯视频
997
997
  router.get('/tencentvideo/playlist/:id', lazyloadRouteHandler('./routes/tencent/video/playlist'));
998
998
 
999
- // 看漫画
1000
- router.get('/manhuagui/comic/:id/:chapterCnt?', lazyloadRouteHandler('./routes/manhuagui/comic'));
1001
- router.get('/mhgui/comic/:id/:chapterCnt?', lazyloadRouteHandler('./routes/mhgui/comic'));
1002
- router.get('/twmanhuagui/comic/:id/:chapterCnt?', lazyloadRouteHandler('./routes/twmanhuagui/comic'));
999
+ // 看漫画 migrated to v2
1000
+ // router.get('/manhuagui/comic/:id/:chapterCnt?', lazyloadRouteHandler('./routes/manhuagui/comic'));
1001
+ // router.get('/mhgui/comic/:id/:chapterCnt?', lazyloadRouteHandler('./routes/mhgui/comic'));
1002
+ // router.get('/twmanhuagui/comic/:id/:chapterCnt?', lazyloadRouteHandler('./routes/twmanhuagui/comic'));
1003
+
1003
1004
  // 拷贝漫画
1004
1005
  router.get('/copymanga/comic/:id/:chapterCnt?', lazyloadRouteHandler('./routes/copymanga/comic'));
1005
1006
 
@@ -1349,7 +1350,7 @@ router.get('/ui-cn/article', lazyloadRouteHandler('./routes/ui-cn/article'));
1349
1350
  router.get('/ui-cn/user/:id', lazyloadRouteHandler('./routes/ui-cn/user'));
1350
1351
 
1351
1352
  // Dcard
1352
- router.get('/dcard/:section/:type?', lazyloadRouteHandler('./routes/dcard/section'));
1353
+ // router.get('/dcard/:section/:type?', lazyloadRouteHandler('./routes/dcard/section'));
1353
1354
 
1354
1355
  // 北京天文馆每日一图
1355
1356
  router.get('/bjp/apod', lazyloadRouteHandler('./routes/bjp/apod'));
@@ -1865,11 +1866,11 @@ router.get('/getitfree/search/:keyword?', lazyloadRouteHandler('./routes/getitfr
1865
1866
  router.get('/10000link/news/:category?', lazyloadRouteHandler('./routes/10000link/news'));
1866
1867
 
1867
1868
  // 站酷
1868
- router.get('/zcool/discover/:query?/:subCate?/:hasVideo?/:city?/:collage?/:recommendLevel?/:sort?', lazyloadRouteHandler('./routes/zcool/discover'));
1869
- router.get('/zcool/recommend/:query?/:subCate?/:hasVideo?/:city?/:collage?/:recommendLevel?/:sort?', lazyloadRouteHandler('./routes/zcool/discover')); // 兼容老版本
1870
- router.get('/zcool/top/:type', lazyloadRouteHandler('./routes/zcool/top'));
1871
- router.get('/zcool/top', lazyloadRouteHandler('./routes/zcool/top')); // 兼容老版本
1872
- router.get('/zcool/user/:uid', lazyloadRouteHandler('./routes/zcool/user'));
1869
+ // router.get('/zcool/discover/:query?/:subCate?/:hasVideo?/:city?/:collage?/:recommendLevel?/:sort?', lazyloadRouteHandler('./routes/zcool/discover'));
1870
+ // router.get('/zcool/recommend/:query?/:subCate?/:hasVideo?/:city?/:collage?/:recommendLevel?/:sort?', lazyloadRouteHandler('./routes/zcool/discover')); // 兼容老版本
1871
+ // router.get('/zcool/top/:type', lazyloadRouteHandler('./routes/zcool/top'));
1872
+ // router.get('/zcool/top', lazyloadRouteHandler('./routes/zcool/top')); // 兼容老版本
1873
+ // router.get('/zcool/user/:uid', lazyloadRouteHandler('./routes/zcool/user'));
1873
1874
 
1874
1875
  // 第一财经
1875
1876
  // router.get('/yicai/brief', lazyloadRouteHandler('./routes/yicai/brief.js'));
@@ -2007,12 +2008,12 @@ router.get('/sans/summit_archive', lazyloadRouteHandler('./routes/sans/summit_ar
2007
2008
  router.get('/latexstudio/home', lazyloadRouteHandler('./routes/latexstudio/home'));
2008
2009
 
2009
2010
  // 上证债券信息网 - 可转换公司债券公告
2010
- router.get('/sse/convert/:query?', lazyloadRouteHandler('./routes/sse/convert'));
2011
- router.get('/sse/renewal', lazyloadRouteHandler('./routes/sse/renewal'));
2012
- router.get('/sse/inquire', lazyloadRouteHandler('./routes/sse/inquire'));
2011
+ // router.get('/sse/convert/:query?', lazyloadRouteHandler('./routes/sse/convert'));
2012
+ // router.get('/sse/renewal', lazyloadRouteHandler('./routes/sse/renewal'));
2013
+ // router.get('/sse/inquire', lazyloadRouteHandler('./routes/sse/inquire'));
2013
2014
 
2014
2015
  // 上海证券交易所
2015
- router.get('/sse/disclosure/:query?', lazyloadRouteHandler('./routes/sse/disclosure'));
2016
+ // router.get('/sse/disclosure/:query?', lazyloadRouteHandler('./routes/sse/disclosure'));
2016
2017
 
2017
2018
  // 深圳证券交易所
2018
2019
  // router.get('/szse/notice', lazyloadRouteHandler('./routes/szse/notice'));
@@ -2185,9 +2186,9 @@ router.get('/cell/cover', lazyloadRouteHandler('./routes/cell/cover'));
2185
2186
  // router.get('/nature/highlight/:year?', lazyloadRouteHandler('./routes/nature/highlight'));
2186
2187
 
2187
2188
  // science [Sci Journal]
2188
- router.get('/sciencemag/current/:journal?', lazyloadRouteHandler('./routes/sciencemag/current'));
2189
- router.get('/sciencemag/cover', lazyloadRouteHandler('./routes/sciencemag/cover'));
2190
- router.get('/sciencemag/early/science', lazyloadRouteHandler('./routes/sciencemag/early'));
2189
+ // router.get('/sciencemag/current/:journal?', lazyloadRouteHandler('./routes/sciencemag/current'));
2190
+ // router.get('/sciencemag/cover', lazyloadRouteHandler('./routes/sciencemag/cover'));
2191
+ // router.get('/sciencemag/early/science', lazyloadRouteHandler('./routes/sciencemag/early'));
2191
2192
 
2192
2193
  // dlsite
2193
2194
  router.get('/dlsite/new/:type', lazyloadRouteHandler('./routes/dlsite/new'));
@@ -2793,7 +2794,7 @@ router.get('/jijitang/article/:id', lazyloadRouteHandler('./routes/jijitang/arti
2793
2794
  router.get('/jijitang/publication', lazyloadRouteHandler('./routes/jijitang/publication'));
2794
2795
 
2795
2796
  // 新闻联播
2796
- router.get('/xwlb', lazyloadRouteHandler('./routes/xwlb/index'));
2797
+ // router.get('/xwlb', lazyloadRouteHandler('./routes/xwlb/index'));
2797
2798
 
2798
2799
  // 端传媒
2799
2800
  router.get('/initium/:type?/:language?', lazyloadRouteHandler('./routes/initium/full'));
@@ -2967,10 +2968,10 @@ router.get('/dsb/area/:area', lazyloadRouteHandler('./routes/dsb/area'));
2967
2968
  // 靠谱新闻
2968
2969
  router.get('/kaopunews/:language?', lazyloadRouteHandler('./routes/kaopunews'));
2969
2970
 
2970
- // 格隆汇
2971
- router.get('/gelonghui/user/:id', lazyloadRouteHandler('./routes/gelonghui/user'));
2972
- router.get('/gelonghui/subject/:id', lazyloadRouteHandler('./routes/gelonghui/subject'));
2973
- router.get('/gelonghui/keyword/:keyword', lazyloadRouteHandler('./routes/gelonghui/keyword'));
2971
+ // 格隆汇 migrated to v2
2972
+ // router.get('/gelonghui/user/:id', lazyloadRouteHandler('./routes/gelonghui/user'));
2973
+ // router.get('/gelonghui/subject/:id', lazyloadRouteHandler('./routes/gelonghui/subject'));
2974
+ // router.get('/gelonghui/keyword/:keyword', lazyloadRouteHandler('./routes/gelonghui/keyword'));
2974
2975
 
2975
2976
  // 光谷社区
2976
2977
  router.get('/guanggoo/:category?', lazyloadRouteHandler('./routes/guanggoo/index'));
@@ -3420,7 +3421,7 @@ router.get('/totalcommander/whatsnew', lazyloadRouteHandler('./routes/totalcomma
3420
3421
  router.get('/blizzard/news/:language?/:category?', lazyloadRouteHandler('./routes/blizzard/news'));
3421
3422
 
3422
3423
  // DeepMind
3423
- router.get('/deepmind/blog/:category?', lazyloadRouteHandler('./routes/deepmind/blog'));
3424
+ // router.get('/deepmind/blog/:category?', lazyloadRouteHandler('./routes/deepmind/blog'));
3424
3425
 
3425
3426
  // 东西智库
3426
3427
  // router.get('/dx2025/:type?/:category?', lazyloadRouteHandler('./routes/dx2025/index'));
@@ -3655,7 +3656,7 @@ router.get('/6park/:id?/:type?/:keyword?', lazyloadRouteHandler('./routes/6park/
3655
3656
  // router.get('/bde4/:type?/:caty?/:area?/:year?/:order?', lazyloadRouteHandler('./routes/mp4er/index'));
3656
3657
 
3657
3658
  // 上海证券交易所
3658
- router.get('/sse/sserules/:slug?', lazyloadRouteHandler('./routes/sse/sserules'));
3659
+ // router.get('/sse/sserules/:slug?', lazyloadRouteHandler('./routes/sse/sserules'));
3659
3660
 
3660
3661
  // 游戏葡萄
3661
3662
  router.get('/gamegrape/:id?', lazyloadRouteHandler('./routes/gamegrape/index'));
@@ -3755,8 +3756,8 @@ router.get('/kingarthur/:type', lazyloadRouteHandler('./routes/kingarthur/index'
3755
3756
  // router.get('/news/whxw', lazyloadRouteHandler('./routes/news/whxw'));
3756
3757
 
3757
3758
  // 游讯网
3758
- router.get('/yxdown/recommend', lazyloadRouteHandler('./routes/yxdown/recommend'));
3759
- router.get('/yxdown/news/:category?', lazyloadRouteHandler('./routes/yxdown/news'));
3759
+ // router.get('/yxdown/recommend', lazyloadRouteHandler('./routes/yxdown/recommend'));
3760
+ // router.get('/yxdown/news/:category?', lazyloadRouteHandler('./routes/yxdown/news'));
3760
3761
 
3761
3762
  // BabeHub
3762
3763
  router.get('/babehub/search/:keyword?', lazyloadRouteHandler('./routes/babehub/search'));
@@ -4055,8 +4056,8 @@ router.get('/fashionnetwork/news/:sectors?/:categories?/:language?', lazyloadRou
4055
4056
  router.get('/dykszx/news/:type?', lazyloadRouteHandler('./routes/dykszx/news'));
4056
4057
 
4057
4058
  // 安全内参
4058
- router.get('/secrss/category/:category?', lazyloadRouteHandler('./routes/secrss/category'));
4059
- router.get('/secrss/author/:author?', lazyloadRouteHandler('./routes/secrss/author'));
4059
+ // router.get('/secrss/category/:category?', lazyloadRouteHandler('./routes/secrss/category'));
4060
+ // router.get('/secrss/author/:author?', lazyloadRouteHandler('./routes/secrss/author'));
4060
4061
 
4061
4062
  // Fashion Network
4062
4063
  router.get('/fashionnetwork/headline/:country?', lazyloadRouteHandler('./routes/fashionnetwork/headline.js'));
@@ -1,14 +1,10 @@
1
1
  const got = require('@/utils/got');
2
+ const { parseDate } = require('@/utils/parse-date');
2
3
 
3
4
  module.exports = async (ctx) => {
4
5
  const type = ctx.params.type;
5
6
 
6
- const response = await got({
7
- method: 'get',
8
- url: `https://www.v2ex.com/api/topics/${type}.json`,
9
- });
10
-
11
- const data = response.data;
7
+ const { data } = await got(`https://www.v2ex.com/api/topics/${type}.json`);
12
8
 
13
9
  let title;
14
10
  if (type === 'hot') {
@@ -25,10 +21,10 @@ module.exports = async (ctx) => {
25
21
  title: item.title,
26
22
  description: `${item.member.username}: ${item.content_rendered}`,
27
23
  content: { text: item.content, html: item.content_rendered },
28
- pubDate: new Date(item.created * 1000).toUTCString(),
29
- guid: item.id,
24
+ pubDate: parseDate(item.created, 'X'),
30
25
  link: item.url,
31
26
  author: item.member.username,
27
+ comments: item.replies,
32
28
  })),
33
29
  };
34
30
  };
@@ -70,19 +70,19 @@ const patterns = [
70
70
  },
71
71
  {
72
72
  unit: 'days',
73
- regExp: /(\d+)(?:天|日|day(?:s)?)/,
73
+ regExp: /(\d+)(?:天|日|d(?:ay)?(?:s)?)/,
74
74
  },
75
75
  {
76
76
  unit: 'hours',
77
- regExp: /(\d+)(?:(?:个|個)?(?:(?:小)?时|時|点|點)|h(?:ou)?r(?:s)?)/,
77
+ regExp: /(\d+)(?:(?:个|個)?(?:(?:小)?时|時|点|點)|h(?:(?:ou)?r)?(?:s)?)/,
78
78
  },
79
79
  {
80
80
  unit: 'minutes',
81
- regExp: /(\d+)(?:分(?:钟|鐘)?|min(?:ute)?(?:s)?)/,
81
+ regExp: /(\d+)(?:分(?:钟|鐘)?|m(?:in(?:ute)?)?(?:s)?)/,
82
82
  },
83
83
  {
84
84
  unit: 'seconds',
85
- regExp: /(\d+)(?:秒(?:钟|鐘)?|sec(?:ond)?(?:s)?)/,
85
+ regExp: /(\d+)(?:秒(?:钟|鐘)?|s(?:ec(?:ond)?)?(?:s)?)/,
86
86
  },
87
87
  ];
88
88
 
@@ -1,5 +1,6 @@
1
1
  const config = require('@/config').value;
2
2
  let puppeteer = require('puppeteer');
3
+ const proxyChain = require('proxy-chain');
3
4
 
4
5
  const options = {
5
6
  args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-infobars', '--window-position=0,0', '--ignore-certificate-errors', '--ignore-certificate-errors-spki-list', `--user-agent=${config.ua}`],
@@ -7,6 +8,13 @@ const options = {
7
8
  ignoreHTTPSErrors: true,
8
9
  };
9
10
 
11
+ let proxyUri;
12
+ if (config.proxyUri && typeof config.proxyUri === 'string') {
13
+ proxyUri = config.proxyUri;
14
+ } else if (config.proxy && config.proxy.protocol && config.proxy.host && config.proxy.port) {
15
+ proxyUri = `${config.proxy.protocol}://${config.proxy.host}:${config.proxy.port}`;
16
+ }
17
+
10
18
  /**
11
19
  * @param {Object} extraOptions
12
20
  * @param {boolean} extraOptions.stealth - Use puppeteer-extra-plugin-stealth
@@ -41,6 +49,9 @@ module.exports = async (extraOptions = {}) => {
41
49
  puppeteer.use(require('puppeteer-extra-plugin-stealth')());
42
50
  }
43
51
  let browser;
52
+ if (proxyUri) {
53
+ options.args.push(`--proxy-server=${await proxyChain.anonymizeProxy(proxyUri)}`);
54
+ }
44
55
  if (config.puppeteerWSEndpoint) {
45
56
  browser = await puppeteer.connect({
46
57
  browserWSEndpoint: config.puppeteerWSEndpoint,
@@ -73,11 +73,17 @@ const requestWrapper = (url, options) => {
73
73
  if (agent && new RegExp(config.proxy.url_regex).test(url)) {
74
74
  let agentResult;
75
75
  try {
76
- agentResult = agent[(options.protocol || url.match(/(https?:)/)[1]).slice(0, -1)];
76
+ agentResult = agent[(options.protocol || url.match(/(^https?:)/)[1]).slice(0, -1)];
77
77
  } catch (error) {
78
78
  agentResult = null;
79
79
  }
80
- options.agent = agentResult;
80
+ try {
81
+ if (new URL(url).host !== new URL(config.proxyUri).host) {
82
+ options.agent = agentResult;
83
+ }
84
+ } catch (error) {
85
+ options.agent = agentResult;
86
+ }
81
87
 
82
88
  if (config.proxy.auth) {
83
89
  if (!options.headers) {