rsshub 1.0.0-master.f944cc9 → 1.0.0-master.f97cdb2

package/lib/routes/gov/suzhou/doc.js

@@ -2,7 +2,7 @@ const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const util = require('./utils');
 module.exports = async (ctx) => {
-    const link = 'http://www.suzhou.gov.cn/szxxgk/front/xxgk_right.jsp';
+    const link = 'https://www.suzhou.gov.cn/szxxgk/front/xxgk_right.jsp';
     const response = await got.get(link);
     const data = response.data;
     const $ = cheerio.load(data);
@@ -17,7 +17,7 @@ module.exports = async (ctx) => {
                 .map(async (index, item) => {
                     item = $(item);
                     // 获取全文
-                    const contentUrl = 'http://www.suzhou.gov.cn' + item.find('a').attr('href');
+                    const contentUrl = 'https://www.suzhou.gov.cn' + item.find('a').attr('href');
                     const arr = await ctx.cache.tryGet(contentUrl, async () => {
                         const fullText = await got.get(contentUrl);
                         const fullTextData = cheerio.load(fullText.data);

package/lib/routes/gov/suzhou/news.js

@@ -3,7 +3,7 @@ const cheerio = require('cheerio');
 const logger = require('@/utils/logger');
 const liburl = require('url');
 const util = require('./utils');
-const root_url = 'http://www.suzhou.gov.cn/';
+const root_url = 'https://www.suzhou.gov.cn/';
 
 module.exports = async (ctx) => {
     const uid = ctx.params.uid;
@@ -11,57 +11,62 @@ module.exports = async (ctx) => {
     let title = '';
     let urljs = '';
     switch (uid) {
+        case 'szyw':
+        case 'news':
+            urljs = 'https://www.suzhou.gov.cn/szinf/info/getInfoCommon/?pagesize=15&currpage=1&channelid=5057aeffb1a84a7e8aeded87728da48c';
+            url = 'https://www.suzhou.gov.cn/szsrmzf/szyw/nav_list.shtml';
+            title = '苏州市政府 - 苏州要闻';
+            break;
         case 'qxkx':
         case 'district':
-            urljs = 'http://www.suzhou.gov.cn/szinf/info/getInfoCommon/?pagesize=15&currpage=1&channelid=75c636ea0efb487ea7e479e3cc0ff3e5';
-            url = 'http://www.suzhou.gov.cn/szsrmzf/zwggqxkx/nav_list_js.shtml';
+            urljs = 'https://www.suzhou.gov.cn/szinf/info/getInfoCommon/?pagesize=15&currpage=1&channelid=75c636ea0efb487ea7e479e3cc0ff3e5';
+            url = 'https://www.suzhou.gov.cn/szsrmzf/qxkx/nav_list.shtml';
             title = '苏州市政府 - 区县快讯';
             break;
-        case 'szyw':
-        case 'news':
-            urljs = 'http://www.suzhou.gov.cn/szinf/info/getInfoCommon/?pagesize=15&currpage=1&channelid=5057aeffb1a84a7e8aeded87728da48c';
-            url = 'http://www.suzhou.gov.cn/szsrmzf/szyw/nav_list_js.shtml';
-            title = '苏州市政府 - 政务要闻';
-            break;
         case 'bmdt':
-            urljs = 'http://www.suzhou.gov.cn/szinf/info/getInfoCommon/?pagesize=15&currpage=1&channelid=b3d097e3eb79421f88439ea381ce33c3';
-            url = 'http://www.suzhou.gov.cn/szsrmzf/bmdt/nav_list_js.shtml';
+            urljs = 'https://www.suzhou.gov.cn/szinf/info/getInfoCommon/?pagesize=15&currpage=1&channelid=b3d097e3eb79421f88439ea381ce33c3';
+            url = 'https://www.suzhou.gov.cn/szsrmzf/bmdt/nav_list.shtml';
             title = '苏州市政府 - 部门动态';
             break;
         case 'xwsp':
-            urljs = 'http://www.suzhou.gov.cn/szinf/info/getInfoCommon/?pagesize=15&currpage=1&channelid=507980d214c943ebb0a70853ec94b12e';
-            url = 'http://www.suzhou.gov.cn/szsrmzf/xwsp/nav_list_js.shtml';
+            urljs = 'https://www.suzhou.gov.cn/szinf/info/getInfoCommon/?pagesize=15&currpage=1&channelid=507980d214c943ebb0a70853ec94b12e';
+            url = 'https://www.suzhou.gov.cn/szsrmzf/xwsp/nav_list.shtml';
             title = '苏州市政府 - 新闻视频';
             break;
         case 'rdzt':
-            url = 'http://www.suzhou.gov.cn/szsrmzf/rdzt/nav_list.shtml';
+            url = 'https://www.suzhou.gov.cn/szsrmzf/rdzt/nav_list.shtml';
             title = '苏州市政府 - 热点专题';
             break;
         case 'sbjzt':
-            url = 'http://www.suzhou.gov.cn/szsrmzf/sbjzt/nav_list.shtml';
+            url = 'https://www.suzhou.gov.cn/szsrmzf/sbjzt/nav_list.shtml';
             title = '苏州市政府 - 市本级专题';
             break;
         case 'zxrdzt':
-            url = 'http://www.suzhou.gov.cn/szsrmzf/zxrdzt/nav_list.shtml';
+            url = 'https://www.suzhou.gov.cn/szsrmzf/zxrdzt/nav_list.shtml';
             title = '苏州市政府 - 最新热点专题';
             break;
         case 'wqzt':
-            url = 'http://www.suzhou.gov.cn/szsrmzf/wqzt/nav_list.shtml';
+            url = 'https://www.suzhou.gov.cn/szsrmzf/wqzt/nav_list.shtml';
             title = '苏州市政府 - 往期专题';
             break;
         case 'qxzt':
-            url = 'http://www.suzhou.gov.cn/szsrmzf/qxzt/nav_list.shtml';
+            url = 'https://www.suzhou.gov.cn/szsrmzf/qxzt/nav_list.shtml';
             title = '苏州市政府 - 区县专题';
             break;
         case 'zwgg':
-            urljs = 'http://www.suzhou.gov.cn/szinf/info/getInfoCommon/?pagesize=15&currpage=1&channelid=260915178a1f4c4fac44c4bf6378c9b0';
-            url = 'http://www.suzhou.gov.cn/szsrmzf/zwgg/nav_list_js.shtml';
+            urljs = 'https://www.suzhou.gov.cn/szinf/info/getInfoCommon/?pagesize=15&currpage=1&channelid=260915178a1f4c4fac44c4bf6378c9b0';
+            url = 'https://www.suzhou.gov.cn/szsrmzf/zwgg/nav_list.shtml';
             title = '苏州市政府 - 政务公告';
             break;
+        case 'mszx':
+            urljs = 'https://www.suzhou.gov.cn/szinf/info/getInfoCommon/?pagesize=15&currpage=1&channelid=dc60acecb0be46b89d42272dcb8bd32b';
+            url = 'https://www.suzhou.gov.cn/szsrmzf/mszx/nav_list.shtml';
+            title = '苏州市政府 - 便民公告';
+            break;
         case 'bmzx':
-            urljs = 'http://www.suzhou.gov.cn/szinf/info/getInfoCommon/?pagesize=15&currpage=1&channelid=b015bfa5e5514cc9a26cd9f956ef8e69';
-            url = 'http://www.suzhou.gov.cn/szsrmzf/bmdt/nav_list_js.shtml';
-            title = '苏州市政府 - 便民资讯';
+            urljs = 'https://www.suzhou.gov.cn/szinf/info/getInfoCommon/?pagesize=15&currpage=1&channelid=b015bfa5e5514cc9a26cd9f956ef8e69';
+            url = 'https://www.suzhou.gov.cn/szsrmzf/bmzx/bmzx_list.shtml';
+            title = '苏州市政府 - 民生资讯';
             break;
         default:
             logger.error('pattern not matched');

package/lib/routes/gov/suzhou/utils.js

@@ -11,7 +11,7 @@ const content = (response) => {
               .html()
               .replace(/<.?ucaptitle>/g, '')
               .replace(/<.?ucapcontent>/g, '')
-              .replace(/"\/szsrmzf/g, '"http://www.suzhou.gov.cn/szsrmzf')
+              .replace(/"\/szsrmzf/g, '"https://www.suzhou.gov.cn/szsrmzf')
               .replace('publishtime', 'span');
     return content;
 };

package/lib/routes/hackerone/hacktivity.js

@@ -27,19 +27,21 @@ module.exports = async (ctx) => {
     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/hentaimama/videos.js

@@ -21,7 +21,7 @@ module.exports = async (ctx) => {
                 item = $(item);
                 return {
                     title: item.find('img').attr('alt'),
-                    description: '<img src="' + item.find('img').attr('src') + '">',
+                    description: '<img src="' + item.find('img').attr('data-src') + '">',
                     pubDate: item.find('.data span').text(),
                     guid: new Date(item.find('.data span').text()),
                     link: item.find('a').attr('href'),

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/hkej/index.js

@@ -62,7 +62,7 @@ module.exports = async (ctx) => {
     const response = await got({
         method: 'get',
         url: baseUrl + cat.link,
-        header: {
+        headers: {
             Referer: baseUrl,
         },
     });
@@ -86,7 +86,7 @@ module.exports = async (ctx) => {
                     const article = await got({
                         method: 'get',
                         url: item.link,
-                        header: {
+                        headers: {
                             Referer: cat.link,
                         },
                     });

package/lib/routes/instagram/index.js

@@ -2,6 +2,7 @@ const cheerio = require('cheerio');
 const { IgLoginRequiredError } = require('instagram-private-api');
 const { ig, login } = require('./utils');
 const logger = require('@/utils/logger');
+const config = require('@/config').value;
 
 // loadContent pulls the desired user/tag/etc
 async function loadContent(category, nameOrId) {
@@ -66,8 +67,8 @@ module.exports = async (ctx) => {
         throw Error('Such feed is not supported.');
     }
 
-    if (process.env.IG_PROXY) {
-        ig.state.proxyUrl = process.env.IG_PROXY;
+    if (config.instagram && config.instagram.proxy) {
+        ig.state.proxyUrl = config.instagram.proxy;
     }
 
     // Unique key for a feed category

package/lib/routes/instagram/utils.js

@@ -1,26 +1,27 @@
 const { IgApiClient } = require('instagram-private-api');
 const logger = require('@/utils/logger');
+const config = require('@/config').value;
 
 const ig = new IgApiClient();
 () => login(ig); // deepscan-disable-line UNUSED_EXPR
 
 async function login(ig) {
-    if (process.env.IG_USERNAME && process.env.IG_PASSWORD) {
+    if (config.instagram && config.instagram.username && config.instagram.password) {
         try {
-            ig.state.generateDevice(process.env.IG_USERNAME);
+            ig.state.generateDevice(config.instagram.username);
             try {
                 await ig.simulate.preLoginFlow();
             } catch (error) {
                 logger.info('Instagram preLoginFlow fail: ' + error);
             }
-            await ig.account.login(process.env.IG_USERNAME, process.env.IG_PASSWORD);
+            await ig.account.login(config.instagram.username, config.instagram.password);
             process.nextTick(() => ig.simulate.postLoginFlow());
             logger.info('Instagram login success.');
         } catch (error) {
             logger.error('Instagram login fail: ' + error);
         }
     } else {
-        throw Error('Instagram username and password are required to be set in the environment.');
+        throw Error('Instagram RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#pei-zhi-bu-fen-rss-mo-kuai-pei-zhi">relevant config</a>');
     }
 }
 

package/lib/routes/ipsw/index.js

@@ -23,7 +23,7 @@ module.exports = async (ctx) => {
     const response = await got({
         method: 'get',
         url: link,
-        header: {
+        headers: {
             Referer: host,
         },
     });
@@ -77,7 +77,7 @@ module.exports = async (ctx) => {
             const response = await got({
                 method: 'get',
                 url: itemUrl,
-                header: {
+                headers: {
                     Referer: host,
                 },
             });

package/lib/routes/jike/user.js

@@ -49,10 +49,12 @@ module.exports = async (ctx) => {
                 });
 
             let content = item.content || (item.linkInfo && item.linkInfo.title) || (item.question && item.question.title) || item.title || '';
+            content = content.replace(/\r\n|\n|\r/g, '<br>');
 
             let shortenTitle = '一条动态';
             if (content) {
                 shortenTitle = content.length > 75 ? `${content.substr(0, 75)}...` : content;
+                shortenTitle = shortenTitle.replace(/(<br>)+/g, ' ');
                 content = `${content}<br><br>`;
             }
 
@@ -65,8 +67,8 @@ module.exports = async (ctx) => {
                         repostImgTemplate += `<br><img referrerpolicy="no-referrer" src="${item.thumbnailUrl}">`;
                     });
 
-                const repostContent = `转发 ${screenNameTemplate}: ${item.target.content}${repostImgTemplate}`;
-                content = `${content}${repostContent}`.replace(/\n|\r/g, '<br>');
+                const repostContent = `转发 ${screenNameTemplate}: ${item.target.content}${repostImgTemplate}`.replace(/\r\n|\n|\r/g, '<br>');
+                content = `${content}${repostContent}`;
             }
             // 部分功能未知
             /* else if (item.type === 'ANSWER') {
@@ -101,7 +103,7 @@ module.exports = async (ctx) => {
 
             const single = {
                 title: `${typeMap[item.type]}了: ${shortenTitle}`,
-                description: `${content}${linkTemplate}${imgTemplate}`,
+                description: `${content}${linkTemplate}${imgTemplate}`.replace(/(<br>|\s)+$/, ''),
                 pubDate: new Date(item.createdAt).toUTCString(),
                 link: linkMap[item.type],
             };

package/lib/routes/lastfm/loved.js

@@ -3,7 +3,7 @@ const config = require('@/config').value;
 
 module.exports = async (ctx) => {
     if (!config.lastfm || !config.lastfm.api_key) {
-        throw 'Last.fm RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#bu-fen-rss-mo-kuai-pei-zhi">relevant config</a>';
+        throw 'Last.fm RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#pei-zhi-bu-fen-rss-mo-kuai-pei-zhi">relevant config</a>';
     }
 
     const user = ctx.params.user;

package/lib/routes/lastfm/recent.js

@@ -3,7 +3,7 @@ const config = require('@/config').value;
 
 module.exports = async (ctx) => {
     if (!config.lastfm || !config.lastfm.api_key) {
-        throw 'Last.fm RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#bu-fen-rss-mo-kuai-pei-zhi">relevant config</a>';
+        throw 'Last.fm RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#pei-zhi-bu-fen-rss-mo-kuai-pei-zhi">relevant config</a>';
     }
 
     const user = ctx.params.user;

package/lib/routes/lastfm/top.js

@@ -3,7 +3,7 @@ const config = require('@/config').value;
 
 module.exports = async (ctx) => {
     if (!config.lastfm || !config.lastfm.api_key) {
-        throw 'Last.fm RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#bu-fen-rss-mo-kuai-pei-zhi">relevant config</a>';
+        throw 'Last.fm RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#pei-zhi-bu-fen-rss-mo-kuai-pei-zhi">relevant config</a>';
     }
 
     const country = ctx.params.country;

package/lib/routes/lizhi/user.js

@@ -18,7 +18,7 @@ module.exports = async (ctx) => {
     const list = response.data.audios.map((item) => ({
         title: item.name,
         enclosure_url: item.url,
-        enclosure_length: item.duration,
+        itunes_duration: item.duration,
         enclosure_type: 'audio/mpeg',
         link: `https://www.lizhi.fm/${$('div.user_info div.desc span').eq(0).text().replace('FM ', '')}/${item.id}`,
         pubDate: new Date(item.create_time).toUTCString(),

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/manxiaosi/book.js

@@ -8,7 +8,7 @@ module.exports = async (ctx) => {
     const url = host + `/book/${id}`;
     const response = await got.get(url);
     const $ = cheerio.load(response.data);
-    const list = $('#detail-list-select > li > a').reverse().slice(0, 10).get();
+    const list = $('#detail-list-select > li > a').get().reverse().slice(0, 10);
 
     const items = await Promise.all(
         list.map(async (item) => {

package/lib/routes/mhgui/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 = 0;
+    // 用于一次更新多个新章节的排序
+    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.mhgui.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.mhgui.com/', a.attr('href')),
+                        title: a.attr('title'),
+                        pub_date: pDate,
+                        num: a.find('i').text(),
+                        guid: resolve('https://www.mhgui.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.mhgui.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.mhgui.com/comic/${id}/`,
+            description: bookIntro,
+            item: [{ link: `https://www.mhgui.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.mhgui.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.mhgui.com/comic/${id}/`,
+            description: bookIntro,
+            item: items.slice(0, itemsLen),
+        };
+    }
 };