rsshub 1.0.0-master.fd3a269 → 1.0.0-master.fd40700

package/lib/routes/gov/guangdong/edu.js

@@ -65,7 +65,11 @@ module.exports = async (ctx) => {
                 const detailResponse = await got({ method: 'get', url: item.link });
                 const content = cheerio.load(detailResponse.data);
                 item.description = content('div.concent_center').html();
-                item.pubDate = new Date(content('td[align="right"]').text().replace(/发布日期：/, '') + ' GMT+8').toUTCString();
+                item.pubDate = new Date(
+                    content('td[align="right"]')
+                        .text()
+                        .replace(/发布日期：/, '') + ' GMT+8'
+                ).toUTCString();
                 return item;
             })
         )

package/lib/routes/gov/shenzhen/xxgk/zfxxgj.js

@@ -48,7 +48,11 @@ module.exports = async (ctx) => {
                 const detailResponse = await got({ method: 'get', url: item.link });
                 const content = cheerio.load(detailResponse.data);
                 item.description = content('div.concent_center').html();
-                item.pubDate = new Date(content('td[align="right"]').text().replace(/发布日期：/, '') + ' GMT+8').toUTCString();
+                item.pubDate = new Date(
+                    content('td[align="right"]')
+                        .text()
+                        .replace(/发布日期：/, '') + ' GMT+8'
+                ).toUTCString();
                 return item;
             })
         )

package/lib/routes/hackerone/hacktivity.js

@@ -20,27 +20,28 @@ module.exports = async (ctx) => {
                 count: 25,
                 maxShownVoters: 0,
             },
-            query:
-                'query HacktivityPageQuery($querystring: String, $orderBy: HacktivityItemOrderInput, $secureOrderBy: FiltersHacktivityItemFilterOrder, $where: FiltersHacktivityItemFilterInput, $count: Int, $cursor: String, $maxShownVoters: Int) {\n  me {\n    id\n    __typename\n  }\n  hacktivity_items(first: $count, after: $cursor, query: $querystring, order_by: $orderBy, secure_order_by: $secureOrderBy, where: $where) {\n    total_count\n    ...HacktivityList\n    __typename\n  }\n}\n\nfragment HacktivityList on HacktivityItemConnection {\n  total_count\n  pageInfo {\n    endCursor\n    hasNextPage\n    __typename\n  }\n  edges {\n    node {\n      ... on HacktivityItemInterface {\n        id\n        databaseId: _id\n        ...HacktivityItem\n        __typename\n      }\n      __typename\n    }\n    __typename\n  }\n  __typename\n}\n\nfragment HacktivityItem on HacktivityItemUnion {\n  type: __typename\n  ... on HacktivityItemInterface {\n    id\n    votes {\n      total_count\n      __typename\n    }\n    voters: votes(last: $maxShownVoters) {\n      edges {\n        node {\n          id\n          user {\n            id\n            username\n            __typename\n          }\n          __typename\n        }\n        __typename\n      }\n      __typename\n    }\n    upvoted: upvoted_by_current_user\n    __typename\n  }\n  ... on Undisclosed {\n    id\n    ...HacktivityItemUndisclosed\n    __typename\n  }\n  ... on Disclosed {\n    id\n    ...HacktivityItemDisclosed\n    __typename\n  }\n  ... on HackerPublished {\n    id\n    ...HacktivityItemHackerPublished\n    __typename\n  }\n}\n\nfragment HacktivityItemUndisclosed on Undisclosed {\n  id\n  reporter {\n    id\n    username\n    ...UserLinkWithMiniProfile\n    __typename\n  }\n  team {\n    handle\n    name\n    medium_profile_picture: profile_picture(size: medium)\n    url\n    id\n    ...TeamLinkWithMiniProfile\n    __typename\n  }\n  latest_disclosable_action\n  latest_disclosable_activity_at\n  requires_view_privilege\n  total_awarded_amount\n  currency\n  __typename\n}\n\nfragment TeamLinkWithMiniProfile on Team {\n  id\n  handle\n  name\n  __typename\n}\n\nfragment UserLinkWithMiniProfile on User {\n  id\n  username\n  __typename\n}\n\nfragment HacktivityItemDisclosed on Disclosed {\n  id\n  reporter {\n    id\n    username\n    ...UserLinkWithMiniProfile\n    __typename\n  }\n  team {\n    handle\n    name\n    medium_profile_picture: profile_picture(size: medium)\n    url\n    id\n    ...TeamLinkWithMiniProfile\n    __typename\n  }\n  report {\n    id\n    title\n    substate\n    url\n    __typename\n  }\n  latest_disclosable_action\n  latest_disclosable_activity_at\n  total_awarded_amount\n  severity_rating\n  currency\n  __typename\n}\n\nfragment HacktivityItemHackerPublished on HackerPublished {\n  id\n  reporter {\n    id\n    username\n    ...UserLinkWithMiniProfile\n    __typename\n  }\n  team {\n    id\n    handle\n    name\n    medium_profile_picture: profile_picture(size: medium)\n    url\n    ...TeamLinkWithMiniProfile\n    __typename\n  }\n  report {\n    id\n    url\n    title\n    substate\n    __typename\n  }\n  latest_disclosable_activity_at\n  severity_rating\n  __typename\n}',
+            query: 'query HacktivityPageQuery($querystring: String, $orderBy: HacktivityItemOrderInput, $secureOrderBy: FiltersHacktivityItemFilterOrder, $where: FiltersHacktivityItemFilterInput, $count: Int, $cursor: String, $maxShownVoters: Int) {\n  me {\n    id\n    __typename\n  }\n  hacktivity_items(first: $count, after: $cursor, query: $querystring, order_by: $orderBy, secure_order_by: $secureOrderBy, where: $where) {\n    total_count\n    ...HacktivityList\n    __typename\n  }\n}\n\nfragment HacktivityList on HacktivityItemConnection {\n  total_count\n  pageInfo {\n    endCursor\n    hasNextPage\n    __typename\n  }\n  edges {\n    node {\n      ... on HacktivityItemInterface {\n        id\n        databaseId: _id\n        ...HacktivityItem\n        __typename\n      }\n      __typename\n    }\n    __typename\n  }\n  __typename\n}\n\nfragment HacktivityItem on HacktivityItemUnion {\n  type: __typename\n  ... on HacktivityItemInterface {\n    id\n    votes {\n      total_count\n      __typename\n    }\n    voters: votes(last: $maxShownVoters) {\n      edges {\n        node {\n          id\n          user {\n            id\n            username\n            __typename\n          }\n          __typename\n        }\n        __typename\n      }\n      __typename\n    }\n    upvoted: upvoted_by_current_user\n    __typename\n  }\n  ... on Undisclosed {\n    id\n    ...HacktivityItemUndisclosed\n    __typename\n  }\n  ... on Disclosed {\n    id\n    ...HacktivityItemDisclosed\n    __typename\n  }\n  ... on HackerPublished {\n    id\n    ...HacktivityItemHackerPublished\n    __typename\n  }\n}\n\nfragment HacktivityItemUndisclosed on Undisclosed {\n  id\n  reporter {\n    id\n    username\n    ...UserLinkWithMiniProfile\n    __typename\n  }\n  team {\n    handle\n    name\n    medium_profile_picture: profile_picture(size: medium)\n    url\n    id\n    ...TeamLinkWithMiniProfile\n    __typename\n  }\n  latest_disclosable_action\n  latest_disclosable_activity_at\n  requires_view_privilege\n  total_awarded_amount\n  currency\n  __typename\n}\n\nfragment TeamLinkWithMiniProfile on Team {\n  id\n  handle\n  name\n  __typename\n}\n\nfragment UserLinkWithMiniProfile on User {\n  id\n  username\n  __typename\n}\n\nfragment HacktivityItemDisclosed on Disclosed {\n  id\n  reporter {\n    id\n    username\n    ...UserLinkWithMiniProfile\n    __typename\n  }\n  team {\n    handle\n    name\n    medium_profile_picture: profile_picture(size: medium)\n    url\n    id\n    ...TeamLinkWithMiniProfile\n    __typename\n  }\n  report {\n    id\n    title\n    substate\n    url\n    __typename\n  }\n  latest_disclosable_action\n  latest_disclosable_activity_at\n  total_awarded_amount\n  severity_rating\n  currency\n  __typename\n}\n\nfragment HacktivityItemHackerPublished on HackerPublished {\n  id\n  reporter {\n    id\n    username\n    ...UserLinkWithMiniProfile\n    __typename\n  }\n  team {\n    id\n    handle\n    name\n    medium_profile_picture: profile_picture(size: medium)\n    url\n    ...TeamLinkWithMiniProfile\n    __typename\n  }\n  report {\n    id\n    url\n    title\n    substate\n    __typename\n  }\n  latest_disclosable_activity_at\n  severity_rating\n  __typename\n}',
         },
         responseType: 'json',
     });
     ctx.state.data = {
         title: 'HackerOne Hacker Activity',
         link: 'https://hackerone.com/hacktivity',
-        item: response.data.data.hacktivity_items.edges.map((item) => {
-            const author = item.node.reporter ? item.node.reporter.username : 'Someone';
-            const vendor = item.node.team.name;
-            const state = item.node.report.substate.replace(/^[a-z]/g, (L) => L.toUpperCase());
-            const severity = item.node.severity_rating ? item.node.severity_rating.replace(/^[a-z]/g, (L) => L.toUpperCase()) : 'No Rating';
-            const awarded = item.node.total_awarded_amount ? item.node.total_awarded_amount : 0;
-            return {
-                title: item.node.report.title,
-                description: `By ${author} to ${vendor} | ${state} | ${severity} | $${awarded}`,
-                author,
-                pubDate: new Date(item.node.latest_disclosable_activity_at).toUTCString(),
-                link: `https://hackerone.com/reports/${item.node.databaseId}`,
-            };
-        }),
+        item: response.data.data.hacktivity_items.edges
+            .filter((item) => item.node.type === 'Disclosed')
+            .map((item) => {
+                const author = item.node.reporter ? item.node.reporter.username : 'Someone';
+                const vendor = item.node.team.name;
+                const state = item.node.report.substate.replace(/^[a-z]/g, (L) => L.toUpperCase());
+                const severity = item.node.severity_rating ? item.node.severity_rating.replace(/^[a-z]/g, (L) => L.toUpperCase()) : 'No Rating';
+                const awarded = item.node.total_awarded_amount ? item.node.total_awarded_amount : 0;
+                return {
+                    title: item.node.report.title,
+                    description: `By ${author} to ${vendor} | ${state} | ${severity} | $${awarded}`,
+                    author,
+                    pubDate: new Date(item.node.latest_disclosable_activity_at).toUTCString(),
+                    link: `https://hackerone.com/reports/${item.node.databaseId}`,
+                };
+            }),
     };
 };

package/lib/routes/hackerone/search.js

@@ -23,8 +23,7 @@ module.exports = async (ctx) => {
                 count: 25,
                 maxShownVoters: 0,
             },
-            query:
-                'query HacktivityPageQuery($querystring: String, $orderBy: HacktivityItemOrderInput, $secureOrderBy: FiltersHacktivityItemFilterOrder, $where: FiltersHacktivityItemFilterInput, $count: Int, $cursor: String, $maxShownVoters: Int) {\n  me {\n    id\n    __typename\n  }\n  hacktivity_items(first: $count, after: $cursor, query: $querystring, order_by: $orderBy, secure_order_by: $secureOrderBy, where: $where) {\n    total_count\n    ...HacktivityList\n    __typename\n  }\n}\n\nfragment HacktivityList on HacktivityItemConnection {\n  total_count\n  pageInfo {\n    endCursor\n    hasNextPage\n    __typename\n  }\n  edges {\n    node {\n      ... on HacktivityItemInterface {\n        id\n        databaseId: _id\n        ...HacktivityItem\n        __typename\n      }\n      __typename\n    }\n    __typename\n  }\n  __typename\n}\n\nfragment HacktivityItem on HacktivityItemUnion {\n  type: __typename\n  ... on HacktivityItemInterface {\n    id\n    votes {\n      total_count\n      __typename\n    }\n    voters: votes(last: $maxShownVoters) {\n      edges {\n        node {\n          id\n          user {\n            id\n            username\n            __typename\n          }\n          __typename\n        }\n        __typename\n      }\n      __typename\n    }\n    upvoted: upvoted_by_current_user\n    __typename\n  }\n  ... on Undisclosed {\n    id\n    ...HacktivityItemUndisclosed\n    __typename\n  }\n  ... on Disclosed {\n    id\n    ...HacktivityItemDisclosed\n    __typename\n  }\n  ... on HackerPublished {\n    id\n    ...HacktivityItemHackerPublished\n    __typename\n  }\n}\n\nfragment HacktivityItemUndisclosed on Undisclosed {\n  id\n  reporter {\n    id\n    username\n    ...UserLinkWithMiniProfile\n    __typename\n  }\n  team {\n    handle\n    name\n    medium_profile_picture: profile_picture(size: medium)\n    url\n    id\n    ...TeamLinkWithMiniProfile\n    __typename\n  }\n  latest_disclosable_action\n  latest_disclosable_activity_at\n  requires_view_privilege\n  total_awarded_amount\n  currency\n  __typename\n}\n\nfragment TeamLinkWithMiniProfile on Team {\n  id\n  handle\n  name\n  __typename\n}\n\nfragment UserLinkWithMiniProfile on User {\n  id\n  username\n  __typename\n}\n\nfragment HacktivityItemDisclosed on Disclosed {\n  id\n  reporter {\n    id\n    username\n    ...UserLinkWithMiniProfile\n    __typename\n  }\n  team {\n    handle\n    name\n    medium_profile_picture: profile_picture(size: medium)\n    url\n    id\n    ...TeamLinkWithMiniProfile\n    __typename\n  }\n  report {\n    id\n    title\n    substate\n    url\n    __typename\n  }\n  latest_disclosable_action\n  latest_disclosable_activity_at\n  total_awarded_amount\n  severity_rating\n  currency\n  __typename\n}\n\nfragment HacktivityItemHackerPublished on HackerPublished {\n  id\n  reporter {\n    id\n    username\n    ...UserLinkWithMiniProfile\n    __typename\n  }\n  team {\n    id\n    handle\n    name\n    medium_profile_picture: profile_picture(size: medium)\n    url\n    ...TeamLinkWithMiniProfile\n    __typename\n  }\n  report {\n    id\n    url\n    title\n    substate\n    __typename\n  }\n  latest_disclosable_activity_at\n  severity_rating\n  __typename\n}',
+            query: 'query HacktivityPageQuery($querystring: String, $orderBy: HacktivityItemOrderInput, $secureOrderBy: FiltersHacktivityItemFilterOrder, $where: FiltersHacktivityItemFilterInput, $count: Int, $cursor: String, $maxShownVoters: Int) {\n  me {\n    id\n    __typename\n  }\n  hacktivity_items(first: $count, after: $cursor, query: $querystring, order_by: $orderBy, secure_order_by: $secureOrderBy, where: $where) {\n    total_count\n    ...HacktivityList\n    __typename\n  }\n}\n\nfragment HacktivityList on HacktivityItemConnection {\n  total_count\n  pageInfo {\n    endCursor\n    hasNextPage\n    __typename\n  }\n  edges {\n    node {\n      ... on HacktivityItemInterface {\n        id\n        databaseId: _id\n        ...HacktivityItem\n        __typename\n      }\n      __typename\n    }\n    __typename\n  }\n  __typename\n}\n\nfragment HacktivityItem on HacktivityItemUnion {\n  type: __typename\n  ... on HacktivityItemInterface {\n    id\n    votes {\n      total_count\n      __typename\n    }\n    voters: votes(last: $maxShownVoters) {\n      edges {\n        node {\n          id\n          user {\n            id\n            username\n            __typename\n          }\n          __typename\n        }\n        __typename\n      }\n      __typename\n    }\n    upvoted: upvoted_by_current_user\n    __typename\n  }\n  ... on Undisclosed {\n    id\n    ...HacktivityItemUndisclosed\n    __typename\n  }\n  ... on Disclosed {\n    id\n    ...HacktivityItemDisclosed\n    __typename\n  }\n  ... on HackerPublished {\n    id\n    ...HacktivityItemHackerPublished\n    __typename\n  }\n}\n\nfragment HacktivityItemUndisclosed on Undisclosed {\n  id\n  reporter {\n    id\n    username\n    ...UserLinkWithMiniProfile\n    __typename\n  }\n  team {\n    handle\n    name\n    medium_profile_picture: profile_picture(size: medium)\n    url\n    id\n    ...TeamLinkWithMiniProfile\n    __typename\n  }\n  latest_disclosable_action\n  latest_disclosable_activity_at\n  requires_view_privilege\n  total_awarded_amount\n  currency\n  __typename\n}\n\nfragment TeamLinkWithMiniProfile on Team {\n  id\n  handle\n  name\n  __typename\n}\n\nfragment UserLinkWithMiniProfile on User {\n  id\n  username\n  __typename\n}\n\nfragment HacktivityItemDisclosed on Disclosed {\n  id\n  reporter {\n    id\n    username\n    ...UserLinkWithMiniProfile\n    __typename\n  }\n  team {\n    handle\n    name\n    medium_profile_picture: profile_picture(size: medium)\n    url\n    id\n    ...TeamLinkWithMiniProfile\n    __typename\n  }\n  report {\n    id\n    title\n    substate\n    url\n    __typename\n  }\n  latest_disclosable_action\n  latest_disclosable_activity_at\n  total_awarded_amount\n  severity_rating\n  currency\n  __typename\n}\n\nfragment HacktivityItemHackerPublished on HackerPublished {\n  id\n  reporter {\n    id\n    username\n    ...UserLinkWithMiniProfile\n    __typename\n  }\n  team {\n    id\n    handle\n    name\n    medium_profile_picture: profile_picture(size: medium)\n    url\n    ...TeamLinkWithMiniProfile\n    __typename\n  }\n  report {\n    id\n    url\n    title\n    substate\n    __typename\n  }\n  latest_disclosable_activity_at\n  severity_rating\n  __typename\n}',
         },
         responseType: 'json',
     });

package/lib/routes/hexo/fluid.js

@@ -0,0 +1,45 @@
+const cheerio = require('cheerio');
+const got = require('@/utils/got');
+
+module.exports = async (ctx) => {
+    const url = `http://${ctx.params.url}`;
+    const res = await got.get(`${url}/archives/`);
+    const $ = cheerio.load(res.data);
+
+    const list = $('.list-group-item');
+
+    const count = [];
+    for (let i = 0; i < Math.min(list.length, 5); i++) {
+        count.push(i);
+    }
+    const out = await Promise.all(
+        count.map(async (i) => {
+            const each = $(list[i]);
+            const storyLink = each.attr('href');
+            const item = {
+                title: each.find('.archive-post-title').text(),
+                link: new URL(storyLink, url),
+            };
+            const key = item.link;
+            const value = await ctx.cache.get(key);
+
+            if (value) {
+                item.description = value;
+            } else {
+                const storyDeatil = await got.get(item.link);
+                const data = storyDeatil.data;
+                const $ = cheerio.load(data);
+                item.pubDate = $('time').attr('datetime');
+                item.description = $('.markdown-body').html();
+                ctx.cache.set(key, item.description);
+            }
+            return Promise.resolve(item);
+        })
+    );
+    ctx.state.data = {
+        title: $('.navbar-brand strong').text(),
+        link: url,
+        description: $('[name=description]').attr('content'),
+        item: out,
+    };
+};

package/lib/routes/hkcnews/news.js

@@ -30,7 +30,7 @@ module.exports = async (ctx) => {
 
         return {
             title: news.text(),
-            link: `${rootUrl}/${news.attr('href')}`,
+            link: `${rootUrl}${news.attr('href')}`,
             pubDate: new Date(date.length === 8 ? `${new Date().getFullYear().toString().slice(0, 2)}${date}` : date).toUTCString(),
         };
     });
@@ -45,6 +45,10 @@ module.exports = async (ctx) => {
                 const content = cheerio.load(detailResponse.data);
 
                 item.description = content('.article-content').html();
+                // substring 2 times
+                // from https://hkcnews.com/article/47878/loreal歐萊雅-薇婭-李佳琦-47884/薇婭、李佳琦幫loreal帶貨引價格爭議-loreal道歉
+                // to https://hkcnews.com/article/47878
+                item.guid = item.link.substring(0, item.link.lastIndexOf('/')).substring(0, item.link.substring(0, item.link.lastIndexOf('/')).lastIndexOf('/'));
 
                 return item;
             })

package/lib/routes/hkej/index.js

@@ -109,7 +109,13 @@ module.exports = async (ctx) => {
                     });
                     const articleImg = content('.hkej_detail_thumb_2014 .enlargeImg').html() ?? '';
 
-                    const pubDate = content('p.info span.date').text().trim().replace('日', '').replace('今', today).replace('昨', yesterday).replace(/[年月]/g, '-');
+                    const pubDate = content('p.info span.date')
+                        .text()
+                        .trim()
+                        .replace('日', '')
+                        .replace('今', today)
+                        .replace('昨', yesterday)
+                        .replace(/[年月]/g, '-');
 
                     item.category = content('p.info span.cate a')
                         .toArray()

package/lib/routes/infzm/news.js

@@ -1,3 +1,4 @@
+const config = require('@/config').value;
 const got = require('@/utils/got');
 const timezone = require('@/utils/timezone');
 const cheerio = require('cheerio');
@@ -28,26 +29,17 @@ module.exports = async (ctx) => {
             if (value) {
                 description = value;
             } else {
+                const cookie = config.infzm.cookie;
                 const response = await got({
                     method: 'get',
-                    url: `http://api.infzm.com/mobile/contents/${id}`,
+                    url: `http://www.infzm.com/content/${id}`,
+                    headers: {
+                        Referer: link,
+                        Cookie: cookie || `passport_session=${Math.floor(Math.random() * 100)};`,
+                    },
                 });
-
-                if (response.data.code === 200) {
-                    description = response.data.data.content.fulltext;
-                } else {
-                    // 有时候接口会返回未发布但实际已发布
-                    const response = await got({
-                        method: 'get',
-                        url: `http://www.infzm.com/content/${id}`,
-                        headers: {
-                            Referer: link,
-                            Cookie: `PHPSESSID=${Math.floor(Math.random() * 100)};`,
-                        },
-                    });
-                    const $ = cheerio.load(response.data);
-                    description = $('#content').html();
-                }
+                const $ = cheerio.load(response.data);
+                description = $('div.nfzm-content__content').html();
 
                 ctx.cache.set(key, description);
             }

package/lib/routes/kbs/today.js

@@ -0,0 +1,56 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const timezone = require('@/utils/timezone');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const language = ctx.params.language || 'e';
+
+    const rootUrl = 'http://world.kbs.co.kr';
+    const currentUrl = `${rootUrl}/service/news_today.htm?lang=${language}`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    const list = $('.comp_text_1x article')
+        .map((_, item) => {
+            item = $(item);
+
+            const a = item.find('h2 a');
+
+            return {
+                title: a.text(),
+                category: item.find('.cate').text(),
+                link: `${rootUrl}/service${a.attr('href').replace('./', '/')}`,
+                pubDate: timezone(parseDate(item.find('.date').text()), +9),
+            };
+        })
+        .get();
+
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+
+                const content = cheerio.load(detailResponse.data);
+
+                item.description = content('.body_txt').html();
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: `Latest News | KBS WORLD`,
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/routes/lolapp/article.js

@@ -0,0 +1,53 @@
+const got = require('@/utils/got');
+const { parseRelativeDate } = require('@/utils/parse-date');
+const { parseDate } = require('@/utils/parse-date');
+const dayjs = require('dayjs');
+module.exports = async (ctx) => {
+    const uuid = ctx.params.uuid;
+    const url = 'https://mlol.qt.qq.com/go/mlol_news/author_feeds?author_uuid=' + uuid;
+    const res = await got.get(url).json();
+    const data = res.data.feedsInfo;
+    const name = data[0].feedNews.footer.source;
+    const newData = [];
+    let pubDate = [];
+    for (let i = 0; i < data.length; i++) {
+        newData[i] = data[i].feedNews.body;
+        newData[i].link = 'https://mlol.qt.qq.com/go/mlol_news/varcache_article?is_lqt=true&docid=' + newData[i].commentID;
+        pubDate[i] = getPublishedDate(newData[i].link);
+    }
+    pubDate = await Promise.all(pubDate);
+    for (let i = 0; i < data.length; i++) {
+        newData[i].pubDate = pubDate[i];
+    }
+    ctx.state.data = {
+        title: `${name}的文章`,
+        link: String(url),
+        description: `${name}的文章`,
+        item: newData.map((item) => ({
+            title: item.title,
+            description: `<img src='${item.imgUrl}'>`,
+            link: item.link,
+            pubDate: item.pubDate,
+        })),
+    };
+};
+
+async function getPublishedDate(url) {
+    const res = await got.get(url).text();
+    const start = res.indexOf('createdStr') + 15;
+    const end = res.indexOf('"', start);
+    const date = res.substring(start, end);
+    let publishedDate;
+    if (date === '刚刚') {
+        publishedDate = dayjs();
+    } else if (date.indexOf('前') > 0) {
+        // XX分钟/小时前
+        publishedDate = parseRelativeDate(date);
+    } else if (date.indexOf('年') > 0) {
+        // YYYY年MM月DD日+MM月DD日 hh:mm
+        publishedDate = parseDate(date, ['YYYY年MM月DD日', 'MM月DD日 hh:mm']);
+    } else {
+        publishedDate = dayjs();
+    }
+    return publishedDate;
+}

package/lib/routes/manhuagui/comic.js

@@ -3,23 +3,47 @@ const cheerio = require('cheerio');
 const got = require('@/utils/got');
 const LZString = require('lz-string');
 
-const getChapters = ($) =>
-    $('.chapter-list > ul')
+const getChapters = ($) => {
+    let time_mark = 100;
+    // 用于一次更新多个新章节的排序
+    let new_time_mark = 0;
+    return $('h4')
         .toArray()
-        .reverse()
-        .reduce((acc, curr) => acc.concat($(curr).children('li').toArray()), [])
         .map((ele) => {
-            const a = $(ele).children('a');
-            return {
-                link: resolve('https://www.manhuagui.com/', a.attr('href')),
-                title: a.attr('title'),
-                num: a.find('i').text(),
-            };
-        });
-
+            const categoryName = $(ele).text();
+            while (!$(ele.next).hasClass('chapter-list')) {
+                ele = ele.next;
+            }
+            ele = ele.next;
+            return $(ele)
+                .children('ul')
+                .toArray()
+                .reverse()
+                .reduce((acc, curr) => acc.concat($(curr).children('li').toArray()), [])
+                .map((ele) => {
+                    const a = $(ele).children('a');
+                    // 通过操作发布时间来对章节进行排序,如果是刚刚更新的单行本或者番外,保留最新更新时间
+                    let pDate = new Date(new Date($.pubDate) - time_mark++ * 1000);
+                    if (a.find('em').length > 0) {
+                        // 对更新的章节也进行排序
+                        pDate = new Date(new Date($.pubDate) - new_time_mark++ * 1000);
+                        $.newChapterCnt++;
+                    }
+                    return {
+                        link: resolve('https://www.manhuagui.com/', a.attr('href')),
+                        title: a.attr('title'),
+                        pub_date: pDate,
+                        num: a.find('i').text(),
+                        guid: resolve('https://www.manhuagui.com/', a.attr('href')),
+                        category: categoryName,
+                    };
+                });
+        })
+        .reduce((acc, curr) => acc.concat(curr));
+};
 module.exports = async (ctx) => {
     const { id } = ctx.params;
-
+    const chapterCnt = Number(ctx.params.chapterCnt || 0);
     const { data } = await got.get(`https://www.manhuagui.com/comic/${id}/`);
     const $ = cheerio.load(data);
 
@@ -30,24 +54,46 @@ module.exports = async (ctx) => {
             $('#__VIEWSTATE').remove();
         }
     }
-
     const bookTitle = $('.book-title > h1').text();
     const bookIntro = $('#intro-all').text();
     const coverImgSrc = $('.book-cover img').attr('src');
-    const chapters = getChapters($);
-
-    const genResult = (chapter) => ({
-        link: chapter.link,
-        title: chapter.title,
-        description: `
+    // 对最新更新的章节增加了pubDate
+    const reg = new RegExp('最近于.+更新至');
+    // 处理已下架的漫画
+    if ($('.status > span').text().indexOf('已下架') > 0) {
+        ctx.state.data = {
+            title: `看漫画 - ${bookTitle} 已下架`,
+            link: `https://www.manhuagui.com/comic/${id}/`,
+            description: bookIntro,
+            item: [{ link: `https://www.manhuagui.com/comic/${id}/`, title: bookTitle, description: '已下架' }],
+        };
+    } else {
+        const pub_date_str = $('.status > span').text().match(reg)[0].replace('最近于 [', '').replace('] 更新至', '');
+        // 为了能在闭包内访问到这个日期而不是每次需要处理这个最近更新日期
+        $.pubDate = new Date(pub_date_str).toUTCString();
+        $.newChapterCnt = 0;
+        const chapters = getChapters($);
+        const genResult = (chapter) => ({
+            link: chapter.link,
+            title: chapter.title,
+            pubDate: chapter.pub_date,
+            guid: chapter.guid,
+            category: chapter.category,
+            description: `
             <h1>${chapter.num}</h1>
-            <img src="${coverImgSrc}" />
+            <img src='${coverImgSrc}' />
         `.trim(),
-    });
-    ctx.state.data = {
-        title: `看漫画 - ${bookTitle}`,
-        link: `https://www.manhuagui.com/comic/${id}/`,
-        description: bookIntro,
-        item: chapters.map(genResult),
-    };
+        });
+        const items = chapters.map(genResult);
+        let itemsLen = items.length;
+        if (chapterCnt > 0) {
+            itemsLen = chapterCnt < $.newChapterCnt ? $.newChapterCnt : chapterCnt;
+        }
+        ctx.state.data = {
+            title: `看漫画 - ${bookTitle}`,
+            link: `https://www.manhuagui.com/comic/${id}/`,
+            description: bookIntro,
+            item: items.slice(0, itemsLen),
+        };
+    }
 };

package/lib/routes/maoyan/hotComplete.js

@@ -0,0 +1,87 @@
+const got = require('@/utils/got');
+
+function sleep(time) {
+    return new Promise((resolve) => setTimeout(resolve, time));
+}
+
+module.exports = async (ctx) => {
+    const orderby = ctx.params.orderby;
+    const ascOrDesc = ctx.params.ascOrDesc;
+    const top = ctx.params.top;
+
+    const response = await got({
+        method: 'get',
+        url: 'https://m.maoyan.com/ajax/movieOnInfoList',
+        headers: {
+            Referer: 'https://m.maoyan.com/',
+        },
+    });
+    let data = response.data.movieList;
+    const movieIds = response.data.movieIds;
+
+    const movieIdsArr = [];
+    for (let i = data.length; i < movieIds.length; i += 10) {
+        const movieIdsTemp = movieIds.slice(i, i + 10);
+        movieIdsArr.push(movieIdsTemp);
+    }
+
+    const dataArrs = await Promise.all(
+        movieIdsArr.map(async (idsTemp) => {
+            await sleep(500);
+            const responseTemp = await got({
+                method: 'get',
+                url: 'https://m.maoyan.com/ajax/moreComingList',
+                searchParams: {
+                    movieIds: idsTemp.toString(),
+                    token: '',
+                },
+                headers: {
+                    Referer: 'https://m.maoyan.com/',
+                },
+            });
+            const dataTemp = responseTemp.data.coming;
+            if (dataTemp && dataTemp.length > 0) {
+                return dataTemp;
+            } else {
+                return [];
+            }
+        })
+    );
+
+    for (let i = 0; i < dataArrs.length; i++) {
+        data.push(...dataArrs[i]);
+    }
+
+    if (orderby) {
+        data.sort((a, b) => {
+            if (orderby === 'pubDate') {
+                return ascOrDesc === 'asc' ? new Date(a.rt).getTime() - new Date(b.rt).getTime() : new Date(b.rt).getTime() - new Date(a.rt).getTime();
+            } else {
+                return ascOrDesc === 'asc' ? a.sc - b.sc : b.sc - a.sc;
+            }
+        });
+    }
+    if (top && top > 0 && top < data.length) {
+        data = data.slice(0, top - 1);
+    }
+
+    const items = await Promise.all(
+        data.map((item) => {
+            const rating = item.sc > 0 ? `评分：${item.sc}` : '';
+
+            return {
+                title: `${item.nm} ${rating}`,
+                description: `<img src="${item.img.replace('w.h', '1000.1000')}"> <br> ${rating} <br> 演员：${item.star} <br> 上映信息：${item.showInfo}`,
+                link: `https://maoyan.com/films/${item.id}`,
+                pubDate: new Date(item.rt).toUTCString(),
+            };
+        })
+    );
+
+    ctx.state.data = {
+        title: `猫眼电影 - 正在热映 - 完整版`,
+        link: `https://maoyan.com/films`,
+        description: `猫眼电影 - 正在热映`,
+        item: items,
+    };
+};