rsshub 1.0.0-master.fe69819 → 1.0.0-master.fee75c6

package/lib/routes/ehentai/search.js

@@ -17,9 +17,18 @@ module.exports = async (ctx) => {
     if (match !== null) {
         title = match[1];
     }
-    ctx.state.data = {
-        title: title + ' - E-Hentai Search ',
-        link: `https://e-hentai.org/?${params}`,
-        item: items,
-    };
+
+    if (EhAPI.from_ex) {
+        ctx.state.data = {
+            title: title + ' - ExHentai Search ',
+            link: `https://exhentai.org/?${params}`,
+            item: items,
+        };
+    } else {
+        ctx.state.data = {
+            title: title + ' - E-Hentai Search ',
+            link: `https://e-hentai.org/?${params}`,
+            item: items,
+        };
+    }
 };

package/lib/routes/ehentai/tag.js

@@ -5,9 +5,18 @@ module.exports = async (ctx) => {
     const tag = ctx.params.tag;
     const bittorrent = ctx.params.bittorrent || false;
     const items = await EhAPI.getTagItems(ctx.cache, tag, page, bittorrent);
-    ctx.state.data = {
-        title: tag + ' - E-Hentai Tag',
-        link: `https://e-hentai.org/tag/${tag}`,
-        item: items,
-    };
+
+    if (EhAPI.from_ex) {
+        ctx.state.data = {
+            title: tag + ' - ExHentai Tag',
+            link: `https://exhentai.org/tag/${tag}`,
+            item: items,
+        };
+    } else {
+        ctx.state.data = {
+            title: tag + ' - E-Hentai Tag',
+            link: `https://e-hentai.org/tag/${tag}`,
+            item: items,
+        };
+    }
 };

package/lib/routes/mofish/index.js

@@ -1,4 +1,7 @@
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
 
 module.exports = async (ctx) => {
     const id = ctx.params.id;
@@ -13,17 +16,26 @@ module.exports = async (ctx) => {
 
     const data = response.data.Data.data;
 
-    const title = `鱼塘热榜`;
+    const title = '鱼塘热榜';
 
     ctx.state.data = {
         title,
-        link: `https://mo.fish/`,
-        description: title,
-        item: data.map((item) => ({
-            title: item.Title,
-            pubDate: new Date(item.releaseTime).toUTCString(),
-            link: item.Url,
-            guid: item.id,
-        })),
+        link: 'https://mo.fish/',
+        item: data.map((item) => {
+            const isImage = Number(id) === 136 && item.Url.endsWith('.gif');
+            const description = isImage
+                ? art(path.join(__dirname, 'templates/description.art'), {
+                      imageUrl: item.Url,
+                  })
+                : title;
+
+            return {
+                title: item.Title,
+                description,
+                pubDate: parseDate(item.CreateTime * 1000),
+                link: item.Url,
+                guid: item.id,
+            };
+        }),
     };
 };

package/lib/routes/mofish/templates/description.art

@@ -0,0 +1,4 @@
+<p>
+  <img src="{{ imageUrl }}" referrerpolicy="no-referrer">
+  <br>
+</p>

package/lib/routes/or/index.js

@@ -1,7 +1,7 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const timezone = require('@/utils/timezone');
-const parseDate = require('@/utils/parse-date');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
     const id = ctx.params.id || '';

package/lib/routes/prestige-av/series.js

@@ -1,18 +1,15 @@
 const cheerio = require('cheerio');
-const puppeteer = require('puppeteer');
 
 module.exports = async (ctx) => {
-    const browser = await puppeteer.launch({
-        args: ['--disable-dev-shm-usage'],
-    });
+    const browser = await require('@/utils/puppeteer')();
 
     const id = ctx.params.mid;
-    const sort = ctx.params.sort || 'near';
+    const sort = ctx.params.sort ?? 'near';
 
     const page = await browser.newPage();
     const link = `https://www.prestige-av.com/goods/goods_list.php?mode=series&mid=${id}&sort=${sort}`;
     await page.goto(link);
-    await page.waitForSelector('.button_r18_prestige');
+    await page.waitForSelector('.buttons');
     await page.click('#AC');
     await page.waitForSelector('#body_goods');
     const bodyHandle = await page.$('body');

package/lib/routes/tencent/wechat/tgchannel.js

@@ -4,8 +4,15 @@ const cheerio = require('cheerio');
 module.exports = async (ctx) => {
     const id = ctx.params.id;
     const mpName = ctx.params.mpName ?? '';
+    let searchQueryType = ctx.params.searchQueryType ?? '0';
+    if (searchQueryType !== '0' && searchQueryType !== '1' && searchQueryType !== '2') {
+        searchQueryType = '0';
+    }
+    searchQueryType = +searchQueryType; // 将字符串转换为数字
 
-    const { data } = await got.get(`https://t.me/s/${id}`);
+    const channelUrl = `https://t.me/s/${id}`;
+    const searchQuery = mpName && searchQueryType ? (searchQueryType === 2 ? `?q=%23${mpName}` : `?q=${mpName}`) : '';
+    const { data } = await got.get(`${channelUrl}${searchQuery}`);
     const $ = cheerio.load(data);
     const list = $('.tgme_widget_message_wrap').slice(-20);
 
@@ -14,49 +21,97 @@ module.exports = async (ctx) => {
             .map(async (index, item) => {
                 item = $(item);
 
+                if (searchQuery) {
+                    // 删除关键字高亮 <mark class="highlight">
+                    const highlightMarks = item.find('mark.highlight').get();
+                    highlightMarks.forEach((mark) => {
+                        mark = $(mark);
+                        const markInnerHtml = mark.html();
+                        mark.replaceWith(markInnerHtml);
+                    });
+                    if (highlightMarks) {
+                        item = $(item.html()); // 删除关键字高亮后，相邻的裸文本节点不会被自动合并，重新生成 cheerio 对象以确保后续流程正常运行
+                    }
+                }
+
                 // [ div.tgme_widget_message_text 格式简略说明 ]
                 // 若频道只订阅一个公众号：
-                // 第 1 个元素: <a href="${用于 link priview 的预览图 url}"><i><b>${emoji(链接)}</b></i></a>
+                // 第 1 个元素: <a href="${用于 link priview 的预览图 url}"><i><b>🔗</b></i></a>
                 // 第 2 个元素: <a href="${文章 url}">${文章标题}</a>
                 // (余下是文章简介，一般是裸文本，这里用不到)
                 //
                 // 若频道订阅多于一个公众号：
-                // 第 1 个元素: <i><b>${emoji(标注消息来源于什么 slave，这里是表示微信的对话气泡)}</b></i>
-                // 第 2 个元素: <i><b>${emoji(标注对话类型，这里是表示私聊的半身人像)</b></i>
+                // 第 1 个元素: <i><b>${emoji(标注消息来源于什么 slave，这里是表示微信的💬)}</b></i>
+                // 第 2 个元素: <i><b>${emoji(标注对话类型，这里是表示私聊的👤)</b></i>
                 // 裸文本: (半角空格)${公众号名}(半角冒号)
                 // 第 3 个元素: <br />
-                // 第 4 个元素: <a href="${用于 link priview 的预览图 url}"><i><b>${emoji(链接)}</b></i></a>
+                // 第 4 个元素: <a href="${用于 link priview 的预览图 url}"><i><b>🔗</b></i></a>
                 // 第 5 个元素: <a href="${文章 url}">${文章标题}</a>
                 // (余下是文章简介，一般是裸文本，这里用不到)
+                //
+                // 若启用 efb-patch-middleware 且频道订阅多于一个公众号：
+                // 第 1 个元素: <i><b>${emoji(标注消息来源于什么 slave，这里是表示微信的💬)}</b></i>
+                // 第 2 个元素: <i><b>${emoji(标注对话类型，这里是表示私聊的👤)</b></i>
+                // 第 3 个元素: <a href="${?q=%23url-encoded公众号名}">#${公众号名}</a>
+                // 裸文本: ${公众号名余下部分 (若 hashtag 不合法 (遇到空格、标点) 导致被截断才会有)}(半角冒号)
+                // 第 4 个元素: <br />
+                // 第 5 个元素: <a href="${用于 link priview 的预览图 url}"><i><b>🔗</b></i></a>
+                // 第 6 个元素: <a href="${文章 url}">${文章标题}</a>
+                // (余下是文章简介，一般是裸文本，这里用不到)
+
+                let author = '';
+                let titleElemIs3thA = false;
+
+                const brNode = item.find('.tgme_widget_message_text > br:nth-of-type(1)').get(0); // 获取第一个换行
+                const authorNode = brNode && brNode.prev; // brNode 不为 undefined 时获取它的前一个节点
+                const authorNodePrev = authorNode && authorNode.prev; // authorNode 不为 undefined 时获取它的前一个节点
+                if (authorNode && authorNode.type === 'text') {
+                    // 只有这个节点是一个裸文本时它才可能是公众号名，开始找寻公众号名
+                    if (authorNodePrev && authorNodePrev.type === 'tag' && authorNodePrev.name === 'a' && authorNodePrev.attribs.href && authorNodePrev.attribs.href.startsWith('?q=%23')) {
+                        // authorNode 前一个节点是链接, 且是个 hashtag，表示启用了 efb-patch-middleware，这个节点是公众号名
+                        // 有两种可能：
+                        // 带 # 的完整公众号名 (efb-patch-middleware 启用，且 hashtag 完全合法)
+                        // 被截断的公众号名前半部分 (efb-patch-middleware 启用，但 hashtag 被空格或标点截断)
+                        // (若 efb-patch-middleware 未启用，或 hashtag 完全不合法，不会进入此流程)
+                        titleElemIs3thA = true;
+                        author += $(authorNodePrev).text();
+                    }
 
-                const title_elem = item.find('.tgme_widget_message_text > a:nth-of-type(2)'); // 第二个 a 元素会是文章链接
+                    const spaceIndex = authorNode.data.indexOf(' ');
+                    const colonIndex = authorNode.data.indexOf(':');
+                    if (authorNode.data.length > 1 && colonIndex !== -1 && (spaceIndex !== -1 || titleElemIs3thA)) {
+                        // 有三种可能：
+                        // 不带 # 的完整公众号名 (efb-patch-middleware 未启用)
+                        // 带 # 的完整公众号名 (efb-patch-middleware 启用，但 hashtag 完全不合法)
+                        // 被截断的公众号名后半部分 (efb-patch-middleware 启用，但 hashtag 被空格或标点截断，此时空格有意义)
+                        // (若 efb-patch-middleware 启用，且 hashtag 完全合法，不会进入此流程)
+                        const sliceStart = titleElemIs3thA ? 0 : spaceIndex + 1;
+                        author += authorNode.data.slice(sliceStart, colonIndex); // 提取作者
+                    }
+
+                    if (author.startsWith('#')) {
+                        author = author.slice(1); // 去掉开头的 #
+                    }
+                }
 
-                if (title_elem.length === 0) {
-                    // 获取不到第二个 a 元素，这可能是公众号发的服务消息，丢弃它
+                // 如果启用了 efb-patch-middleware 且 hashtag (部分)合法，第三个 a 元素会是文章链接，否则是第二个
+                const titleElemNth = titleElemIs3thA ? 3 : 2;
+                const titleElem = item.find(`.tgme_widget_message_text > a:nth-of-type(${titleElemNth})`);
+
+                if (titleElem.length === 0) {
+                    // 获取不到标题 a 元素，这可能是公众号发的服务消息，丢弃它
                     return;
                 }
 
-                let author;
-                let title = title_elem.text();
-                const link = title_elem.attr('href');
-
-                const br_node = item.find('.tgme_widget_message_text > br:nth-of-type(1)').get(0); // 获取第一个换行
-                const author_node = br_node && br_node.prev; // br_node 不为 undefined 时获取它的前一个节点
-                if (author_node && author_node.type === 'text') {
-                    // 只有这个节点是一个裸文本时它才可能是公众号名
-                    const spaceIndex = author_node.data.indexOf(' ');
-                    const colonIndex = author_node.data.indexOf(':');
-                    if (spaceIndex !== -1 && colonIndex !== -1) {
-                        // 找到了公众号名，说明这个频道订阅了多个公众号
-                        author = author_node.data.slice(spaceIndex + 1, colonIndex); // 提取作者
-                        if (mpName && author !== mpName) {
-                            // 指定了要筛选的公众号名，且该文章不是该公众号发的
-                            return; // 丢弃
-                        } else if (!mpName) {
-                            // 没有指定要筛选的公众号名
-                            title = author + ': ' + title; // 给标题里加上获取到的作者
-                        }
-                    }
+                let title = titleElem.text();
+                const link = titleElem.attr('href');
+
+                if (mpName && author !== mpName) {
+                    // 指定了要筛选的公众号名，且该文章不是该公众号发的
+                    return; // 丢弃
+                } else if (!mpName && author) {
+                    // 没有指定要筛选的公众号名，且匹配到了作者
+                    title = author + ': ' + title; // 给标题里加上获取到的作者
                 }
 
                 const pubDate = new Date(item.find('.tgme_widget_message_date time').attr('datetime')).toUTCString();

package/lib/routes/weibo/timeline.js

@@ -11,12 +11,14 @@ module.exports = async (ctx) => {
     const routeParams = ctx.params.routeParams || undefined;
     const token = await ctx.cache.get('weibotimelineuid' + uid, false);
     let displayVideo = '1';
+    let displayArticle = '0';
     if (routeParams) {
         if (routeParams === '1' || routeParams === '0') {
             displayVideo = routeParams;
         } else {
             const routeParams = querystring.parse(ctx.params.routeParams);
             displayVideo = fallback(undefined, queryToBoolean(routeParams.displayVideo), true) ? '1' : '0';
+            displayArticle = fallback(undefined, queryToBoolean(routeParams.displayArticle), false) ? '1' : '0';
         }
     }
 
@@ -76,7 +78,22 @@ module.exports = async (ctx) => {
 
                 // 视频的处理
                 if (displayVideo === '1') {
-                    description = weiboUtils.formatVideo(description, item);
+                    // 含被转发微博时需要从被转发微博中获取视频
+                    if (item.retweeted_status) {
+                        description = weiboUtils.formatVideo(description, item.retweeted_status);
+                    } else {
+                        description = weiboUtils.formatVideo(description, item);
+                    }
+                }
+
+                // 文章的处理
+                if (displayArticle === '1') {
+                    // 含被转发微博时需要从被转发微博中获取文章
+                    if (item.retweeted_status) {
+                        description = await weiboUtils.formatArticle(ctx, description, item.retweeted_status);
+                    } else {
+                        description = await weiboUtils.formatArticle(ctx, description, item);
+                    }
                 }
 
                 return {

package/lib/routes/weibo/user.js

@@ -8,12 +8,14 @@ const { fallback, queryToBoolean } = require('@/utils/readable-social');
 module.exports = async (ctx) => {
     const uid = ctx.params.uid;
     let displayVideo = '1';
+    let displayArticle = '0';
     if (ctx.params.routeParams) {
         if (ctx.params.routeParams === '1' || ctx.params.routeParams === '0') {
             displayVideo = ctx.params.routeParams;
         } else {
             const routeParams = querystring.parse(ctx.params.routeParams);
             displayVideo = fallback(undefined, queryToBoolean(routeParams.displayVideo), true) ? '1' : '0';
+            displayArticle = fallback(undefined, queryToBoolean(routeParams.displayArticle), false) ? '1' : '0';
         }
     }
 
@@ -92,13 +94,27 @@ module.exports = async (ctx) => {
                 const link = `https://weibo.com/${uid}/${item.mblog.bid}`;
                 const formatExtended = weiboUtils.formatExtended(ctx, item.mblog);
                 let description = formatExtended.description;
-                const formattedTitle = formatExtended.title;
-                const title = formattedTitle;
+                const title = formatExtended.title;
                 const pubDate = item.mblog.created_at;
 
                 // 视频的处理
                 if (displayVideo === '1') {
-                    description = weiboUtils.formatVideo(description, item.mblog);
+                    // 含被转发微博时需要从被转发微博中获取视频
+                    if (item.mblog.retweeted_status) {
+                        description = weiboUtils.formatVideo(description, item.mblog.retweeted_status);
+                    } else {
+                        description = weiboUtils.formatVideo(description, item.mblog);
+                    }
+                }
+
+                // 文章的处理
+                if (displayArticle === '1') {
+                    // 含被转发微博时需要从被转发微博中获取文章
+                    if (item.mblog.retweeted_status) {
+                        description = await weiboUtils.formatArticle(ctx, description, item.mblog.retweeted_status);
+                    } else {
+                        description = await weiboUtils.formatArticle(ctx, description, item.mblog);
+                    }
                 }
 
                 return {

package/lib/routes/weibo/utils.js

@@ -1,5 +1,6 @@
 const querystring = require('querystring');
 const got = require('@/utils/got');
+const cheerio = require('cheerio');
 const { fallback, queryToBoolean, queryToInteger } = require('@/utils/readable-social');
 
 const weiboUtils = {
@@ -50,12 +51,12 @@ const weiboUtils = {
         let htmlNewLineUnreplaced = (status.longText && status.longText.longTextContent) || status.text || '';
         // 表情图标转换为文字
         if (!showEmojiInDescription) {
-            htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<span class="url-icon"><img.*?alt="?(.*?)"? [\s\S]*?\/><\/span>/g, '$1');
+            htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<span class=["']url-icon["']><img\s[^>]*?alt=["']?([^>]+?)["']?\s[^>]*?\/><\/span>/g, '$1');
         }
-        // 去掉外部链接的图标，保留 a 标签链接
-        htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<span class=["|']url-icon["|']>.*?(<a.*?>).*?<\/span><span class="surl-text">(.*?)<\/span>/g, '$1$2</a>');
-        // 去掉乱七八糟的图标
-        // htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<span class=["|']url-icon["|']>(.*?)<\/span>/g, '');
+        // 去掉外部链接的图标，保留 a 标签链接  // 不能去掉，否则像超话这样的有意义的图标也会被去掉
+        // htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/(<a\s[^>]*>)<span class=["']url-icon["']><img\s[^>]*><\/span>[^<>]*?<span class="surl-text">([^<>]*?)<\/span><\/a>/g, '$1$2</a>');
+        // 去掉乱七八糟的图标  // 不能去掉，否则像超话这样的有意义的图标也会被去掉
+        // htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<span class=["']url-icon["']>(<img\s[^>]*?>)<\/span>/g, '');
         // 去掉全文
         htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/全文<br>/g, '<br>');
         htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<a href="(.*?)">全文<\/a>/g, '');
@@ -83,6 +84,22 @@ const weiboUtils = {
             html = usernameAndAvatar + html;
         }
 
+        // 添加文章头图，此处不需要回落到被转发的微博，后续处理被转发的微博时，还会执行到这里
+        if (status.page_info && status.page_info.type === 'article' && status.page_info.page_pic && status.page_info.page_pic.url) {
+            // 如果以后后续流程会用到其他字段，记得修改这里
+            const pagePic = {
+                large: {
+                    url: status.page_info.page_pic.url,
+                },
+            };
+            // 文章微博一般不会有配图，但也有可能有：https://weibo.com/6882481489/Lh85BkS3m
+            if (status.pics) {
+                status.pics.push(pagePic);
+            } else {
+                status.pics = [pagePic];
+            }
+        }
+
         // 添加微博配图
         if (status.pics) {
             if (readable) {
@@ -174,6 +191,8 @@ const weiboUtils = {
         }
         if (!status.retweeted_status || showRetweetTextInTitle) {
             title += htmlNewLineUnreplaced
+                .replace(/<span class=["']url-icon["']><img\s[^>]*?alt=["']?([^>]+?)["']?\s[^>]*?\/><\/span>/g, '$1') // 表情转换
+                .replace(/<span class=["']url-icon["']>(<img\s[^>]*?>)<\/span>/g, '') // 去掉所有图标
                 .replace(/<img[\s\S]*?>/g, '[图片]')
                 .replace(/<.*?>/g, '')
                 .replace('\n', '');
@@ -181,6 +200,8 @@ const weiboUtils = {
         if (status.retweeted_status) {
             title += showEmojiForRetweet ? '🔁 ' : ' - 转发 ';
             title += retweeted
+                .replace(/<span class=["']url-icon["']><img\s[^>]*?alt=["']?([^>]+?)["']?\s[^>]*?\/><\/span>/g, '$1') // 表情转换
+                .replace(/<span class=["']url-icon["']>(<img\s[^>]*?>)<\/span>/g, '') // 去掉所有图标
                 .replace(/<img[\s\S]*?>/g, '[图片]')
                 .replace(/<.*?>/g, '')
                 .replace('\n', '');
@@ -240,6 +261,93 @@ const weiboUtils = {
         }
         return itemDesc;
     },
+    formatArticle: async (ctx, itemDesc, status) => {
+        const pageInfo = status.page_info;
+        if (pageInfo && pageInfo.type === 'article' && pageInfo.page_url) {
+            const pageUrl = pageInfo.page_url;
+            const articleIdMatch = pageUrl.match(/id=(\d+)/);
+            if (!articleIdMatch) {
+                return itemDesc;
+            }
+            const articleId = articleIdMatch[1];
+            const link = `https://card.weibo.com/article/m/aj/detail?id=${articleId}`;
+            const response = await ctx.cache.tryGet(link, async () => {
+                const _response = await got.get(link, {
+                    headers: {
+                        Referer: `https://card.weibo.com/article/m/show/id/${articleId}`,
+                        'MWeibo-Pwa': 1,
+                        'X-Requested-With': 'XMLHttpRequest',
+                        'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1',
+                    },
+                });
+                return _response.data;
+            }); // cache it!
+            const article = response.data;
+            if (article && article.title && article.content) {
+                const title = article.title;
+                const content = article.content;
+                const summary = article.summary;
+                const createAt = article.create_at;
+                const readCount = article.read_count;
+                const isOriginal = article.is_original;
+                const isArticleNonFree = article.is_article_free; // 微博起错了字段名，它为 1 时才是收费文章
+
+                // 许多微博文章都给文字设置了白色背景，这里也只好使用白色背景了
+                let html = '<br clear="both" /><br clear="both" />';
+                html += '<div style="clear: both"></div><div style="background: #fff;border:5px solid #80808030;margin:0;padding:3% 5%;overflow-wrap: break-word">';
+
+                html += `<h1 style="font-size: 1.5rem;line-height: 1.25;color: #333;">${title}</h1>`; // 加入标题
+
+                // 加入文章信息
+                const iconStyle =
+                    'display: inline-block;margin-inline: 0.25rem;width: 2.25rem; height: 1.125rem; background: #eee; border-radius: 2px; box-sizing: border-box; text-align: center; line-height: 1.0625rem; font-size: 0.75rem; color: #aaa;';
+                let articleMeta = '<p style="line-height: 1.66; color: #999;margin: 0 0 0.75rem;font-size: 0.75rem;padding: 0">';
+                if (isArticleNonFree) {
+                    articleMeta += `<span style="${iconStyle}">试读</span> `;
+                }
+                if (isOriginal) {
+                    articleMeta += `<span style="${iconStyle}">原创</span> `;
+                }
+                articleMeta += `<span style="margin-inline: 0.25rem;">发布时间: ${createAt}</span> `; // 发布时间
+                articleMeta += `<span style="margin-inline: 0.25rem;">阅读量: ${readCount}</span> `; // 阅读量
+                articleMeta += '</p>';
+                html += articleMeta;
+
+                if (summary) {
+                    html += `<p style="color: #999;line-height: 1.5rem;padding: 0.0625rem 0 0.875rem;margin: 0">${summary}</p>`; // 摘要
+                }
+
+                html += '<div style="height: 0;border-bottom: 1px dashed #999;margin-bottom: 0.75rem;"></div>'; // 分割线
+
+                // 正文处理，加入一些在微博文章页的 CSS 中定义的不可或缺的样式
+                const $ = cheerio.load(content);
+                $('p').each((_, elem) => {
+                    elem = $(elem);
+                    let style = elem.attr('style') || '';
+                    style = 'margin: 0;padding: 0;border: 0;' + style;
+                    elem.attr('style', style);
+                });
+                $('.image').each((_, elem) => {
+                    elem = $(elem);
+                    let style = elem.attr('style') || '';
+                    style = 'display: table;text-align: center;margin-left: auto;margin-right: auto;clear: both;min-width: 50px;' + style;
+                    elem.attr('style', style);
+                });
+                $('img').each((_, elem) => {
+                    elem = $(elem);
+                    let style = elem.attr('style') || '';
+                    style = 'display: block;max-width: 100%;margin-left: auto;margin-right: auto;min-width: 50px;' + style;
+                    elem.attr('style', style);
+                });
+                const contentHtml = $.html();
+                html += `<div style="line-height: 1.59;text-align: justify;font-size: 1.0625rem;color: #333;">${contentHtml}</div>`; // 正文
+
+                html += '</div>';
+                itemDesc += html;
+            }
+        }
+        return itemDesc;
+    },
 };
 
 module.exports = weiboUtils;

package/lib/routes/zhihu/hot.js

@@ -1,4 +1,5 @@
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
 
 const titles = {
     total: '全站',
@@ -23,9 +24,9 @@ module.exports = async (ctx) => {
     });
 
     const items = response.data.data.map((item) => ({
-        link: item.target.url,
+        link: `https://www.zhihu.com/question/${item.target.id}`,
         title: item.target.title,
-        pubDate: new Date(item.target.created * 1000).toUTCString(),
+        pubDate: parseDate(item.target.created * 1000),
         description: item.target.excerpt ? `<p>${item.target.excerpt}</p>` : '',
     }));
 

package/lib/v2/36kr/maintainer.js

@@ -0,0 +1,7 @@
+module.exports = {
+    '/motif/:mid': ['nczitzk'],
+    '/news/:category?': ['nczitzk'],
+    '/newsflashes': ['hillerliao'],
+    '/search/article/:keyword': ['xyqfer', 'kt286'],
+    '/user/:uid': ['nczitzk'],
+};

package/lib/{routes → v2}/36kr/motif.js

@@ -1,4 +1,5 @@
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
     const motifUrl = `https://36kr.com/motif/${ctx.params.mid}`;
@@ -13,7 +14,7 @@ module.exports = async (ctx) => {
     const articleList = motifArticleList.map((item) => ({
         title: item.templateMaterial.widgetTitle,
         link: `https://36kr.com/${item.route.split('?')[0] === 'detail_video' ? 'video' : 'p'}/${item.itemId}`,
-        pubDate: new Date(item.templateMaterial.publishTime).toUTCString(),
+        pubDate: parseDate(item.templateMaterial.publishTime),
     }));
 
     ctx.state.data = {

package/lib/v2/36kr/news.js

@@ -0,0 +1,56 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+const links = {
+    latest: 'information/web_news',
+    recommend: 'information/web_recommend',
+    life: 'information/happy_life',
+    estate: 'information/real_estate',
+    workplace: 'information/web_zhichang',
+};
+
+module.exports = async (ctx) => {
+    const category = ctx.params.category ?? 'latest';
+
+    const rootUrl = 'https://36kr.com';
+    const currentUrl = `${rootUrl}/${links.hasOwnProperty(category) ? links[category] : `information/${category}`}`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const data = JSON.parse(response.data.match(/<script>window\.initialState=(.*?)<\/script>/)[1]);
+
+    const list = data.information.informationList.itemList
+        .filter((item) => item.itemType === 10)
+        .map((item) => ({
+            title: item.templateMaterial.widgetTitle,
+            link: `${rootUrl}/p/${item.itemId} `,
+            pubDate: parseDate(item.templateMaterial.publishTime),
+        }));
+
+    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('.articleDetailContent').html();
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: `${response.data.match(/shareTitle: "(.*)频道.*",/)[1]} - 36氪资讯`,
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/{routes → v2}/36kr/newsflashes.js

@@ -1,4 +1,5 @@
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
     const response = await got({
@@ -21,7 +22,7 @@ module.exports = async (ctx) => {
         const single = {
             title,
             link,
-            pubDate: new Date(date).toUTCString(),
+            pubDate: parseDate(date),
             description,
         };