rsshub 1.0.0-master.fe69819 → 1.0.0-master.fe775f5

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/fdroid/apprelease.js

@@ -6,7 +6,7 @@ module.exports = async (ctx) => {
     const data = response.data;
     const $ = cheerio.load(data);
 
-    const app_name = $('.package-title').find('h3').text();
+    const app_name = $('.package-title').find('h3').text().trim();
     const app_descr = $('.package-title').find('.package-summary').text();
 
     const items = [];

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

@@ -1,19 +1,16 @@
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
 const cheerio = require('cheerio');
-const url = require('url');
 
 // 加载文章页
 async function load(link) {
     const response = await got.get(link);
     const $ = cheerio.load(response.data);
 
-    const date = new Date(
-        $('#News_Body_Time')
-            .text()
-            .match(/\d{4}-\d{2}-\d{2}/)
-    );
+    const date = parseDate($('.time').text(), 'YYYY-MM-DD HH:mm');
 
-    const pubDate = new Date(date.getTime()).toUTCString();
+    const pubDate = timezone(date, +8);
 
     // 提取内容
     const description = $('#News_Body_Txt_A').html();
@@ -30,13 +27,12 @@ const ProcessFeed = (list, caches) => {
 
             const $title = $('a');
             // 还原相对链接为绝对链接
-            const itemUrl = url.resolve(host, $title.attr('href'));
+            const itemUrl = new URL($title.attr('href'), host);
 
             // 列表上提取到的信息
             const single = {
                 title: $.text(),
                 link: itemUrl,
-                guid: itemUrl,
             };
 
             // 使用tryGet方法从缓存获取内容。
@@ -44,7 +40,7 @@ const ProcessFeed = (list, caches) => {
             const other = await caches.tryGet(itemUrl, () => load(itemUrl));
 
             // 合并解析后的结果集作为该篇文章最终的输出结果
-            return Promise.resolve(Object.assign({}, single, other));
+            return { ...single, ...other };
         })
     );
 };

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/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/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/missevan/drama.js

@@ -17,7 +17,7 @@ module.exports = async (ctx) => {
                 return {
                     title: item.name,
                     enclosure_url: soundData.soundurl,
-                    enclosure_length: soundData.duration,
+                    itunes_duration: ~~(soundData.duration / 1000),
                     enclosure_type: 'audio/mpeg',
                     image: dramaResp.data.info.drama.cover,
                     itunes_author: soundData.username,

package/lib/routes/missevan/latest.js

@@ -24,7 +24,7 @@ module.exports = async (ctx) => {
                 return {
                     title: item.name + (item.integrity === 3 ? '（已完结）' : '（更新至 ' + item.newest + '）'),
                     enclosure_url: soundData.soundurl,
-                    enclosure_length: soundData.duration,
+                    itunes_duration: ~~(soundData.duration / 1000),
                     enclosure_type: 'audio/mpeg',
                     image: item.cover,
                     itunes_author: soundData.username,

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/ncm/djradio.js

@@ -38,12 +38,12 @@ module.exports = async (ctx) => {
             const list = programs.map((pg) => {
                 const description = (pg.description || '').split('\n').map((p) => p);
                 const duration = ~~(pg.duration / 1000);
-                const itunes_duration = `${(duration / 60).toFixed(0).padStart(2, '0')}:${(duration % 60).toFixed(0).padStart(2, '0')}`;
+                const mm_ss_duration = `${(duration / 60).toFixed(0).padStart(2, '0')}:${(duration % 60).toFixed(0).padStart(2, '0')}`;
 
                 const html = art(path.join(__dirname, 'templates/djradio-content.art'), {
                     pg,
                     description,
-                    itunes_duration,
+                    itunes_duration: mm_ss_duration,
                 });
 
                 return {
@@ -56,9 +56,8 @@ module.exports = async (ctx) => {
                     content: { html },
                     itunes_item_image: pg.coverUrl,
                     enclosure_url: `https://music.163.com/song/media/outer/url?id=${pg.mainTrackId}.mp3`,
-                    enclosure_length: duration,
                     enclosure_type: 'audio/mpeg',
-                    itunes_duration,
+                    itunes_duration: duration,
                 };
             });
             return list;

package/lib/routes/nhentai/util.js

@@ -91,7 +91,7 @@ const parseSimpleDetail = ($ele) => {
     const link = resolve('https://nhentai.net', $ele.attr('href'));
     const thumb = $ele.children('img');
     const thumbSrc = thumb.attr('data-src') || thumb.attr('src');
-    const highResoThumbSrc = thumbSrc.replace('thumb', '1').replace('t.nhentai.net', 'i.nhentai.net');
+    const highResoThumbSrc = thumbSrc.replace('thumb', '1').replace(/t\d+\.nhentai\.net/, 'i.nhentai.net');
     return {
         title: $ele.children('.caption').text(),
         link,
@@ -121,7 +121,7 @@ const getDetail = async (simple) => {
         .map((_, ele) => resolve('https://nhentai.net', $(ele).attr('data-src')))
         .get()
         .map((src) => src.replace(/(.+)(\d+)t\.(.+)/, (_, p1, p2, p3) => `${p1}${p2}.${p3}`)) // thumb to high-quality
-        .map((src) => src.replace('t.nhentai.net', 'i.nhentai.net'));
+        .map((src) => src.replace(/t\d+\.nhentai\.net/, 'i.nhentai.net'));
 
     const renderImg = (src) => `<img src="${src}" /><br />`;
     return {

package/lib/routes/novel/biquge.js

@@ -2,6 +2,7 @@ const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const iconv = require('iconv-lite');
 const asyncPool = require('tiny-async-pool');
+const { parseDate } = require('@/utils/parse-date');
 
 const baseUrl = 'http://www.biquge5200.com/';
 // 获取小说的最新章节列表
@@ -25,36 +26,36 @@ module.exports = async (ctx) => {
         .map((_, e) => ({
             title: e.children[0].data,
             link: e.attribs.href,
-            pubDate: new Date((parseInt(e.attribs.href.split('/').pop().replace('.html', '')) - 15015015) * 10000).toUTCString(),
+            pubDate: parseDate((parseInt(e.attribs.href.split('/').pop().replace('.html', '')) - 15015015) * 10000),
         }))
         .get();
 
-    const items = await asyncPool(3, chapter_item, async (item) => {
-        const cache = await ctx.cache.get(item.link);
-        if (cache) {
-            return Promise.resolve(JSON.parse(cache));
-        }
+    const items = [];
+    for await (const item of asyncPool(3, chapter_item, (item) =>
+        ctx.cache.tryGet(item, async () => {
+            const response = await got({
+                method: 'get',
+                url: item.link,
+                responseType: 'buffer',
+            });
 
-        const response = await got({
-            method: 'get',
-            url: item.link,
-            responseType: 'buffer',
-        });
+            const responseHtml = iconv.decode(response.data, 'GBK');
+            const $ = cheerio.load(responseHtml);
 
-        const responseHtml = iconv.decode(response.data, 'GBK');
-        const $ = cheerio.load(responseHtml);
+            const description = $('#content').html();
 
-        const description = $('#content').html();
+            const single = {
+                title: item.title,
+                description,
+                link: item.link,
+                pubDate: item.pubDate,
+            };
+            return single;
+        })
+    )) {
+        items.push(item);
+    }
 
-        const single = {
-            title: item.title,
-            description,
-            link: item.link,
-            pubDate: item.pubDate,
-        };
-        ctx.cache.set(item.link, JSON.stringify(single));
-        return Promise.resolve(single);
-    });
     ctx.state.data = {
         title: `笔趣阁 ${title}`,
         link: `${baseUrl}${id}/`,

package/lib/routes/novel/biqugeinfo.js

@@ -1,15 +1,15 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const iconv = require('iconv-lite');
-const url = require('url');
 const asyncPool = require('tiny-async-pool');
+const { parseDate } = require('@/utils/parse-date');
 
 const firstDay = new Date('2020-01-01');
 const baseUrl = 'http://www.biquge.info';
 // 获取小说的最新章节列表
 module.exports = async (ctx) => {
     const { id, limit = 10 } = ctx.params; // 小说id
-    const pageUrl = url.resolve(baseUrl, `/${id}/`);
+    const pageUrl = new URL(`/${id}/`, baseUrl);
 
     const response = await got({
         method: 'get',
@@ -28,37 +28,37 @@ module.exports = async (ctx) => {
         .find('a')
         .map((i, e) => ({
             title: e.children[0].data,
-            link: url.resolve(pageUrl, e.attribs.href),
-            pubDate: new Date(firstDay.getTime() + (nItems - parseInt(limit) + i) * 1000 * 60 * 60 * 24),
+            link: new URL(e.attribs.href, pageUrl),
+            pubDate: parseDate(firstDay.getTime() + (nItems - parseInt(limit) + i) * 1000 * 60 * 60 * 24),
         }))
         .get();
 
-    const items = await asyncPool(3, chapter_item, async (item) => {
-        const cache = await ctx.cache.get(item.link);
-        if (cache) {
-            return Promise.resolve(JSON.parse(cache));
-        }
+    const items = [];
+    for await (const item of asyncPool(3, chapter_item, (item) =>
+        ctx.cache.tryGet(item, async () => {
+            const response = await got({
+                method: 'get',
+                url: item.link,
+                responseType: 'buffer',
+            });
 
-        const response = await got({
-            method: 'get',
-            url: item.link,
-            responseType: 'buffer',
-        });
+            const responseHtml = iconv.decode(response.data, 'utf-8');
+            const $ = cheerio.load(responseHtml);
 
-        const responseHtml = iconv.decode(response.data, 'utf-8');
-        const $ = cheerio.load(responseHtml);
+            const description = $('#content').html();
 
-        const description = $('#content').html();
+            const single = {
+                title: item.title,
+                description,
+                link: item.link,
+                pubDate: item.pubDate,
+            };
+            return single;
+        })
+    )) {
+        items.push(item);
+    }
 
-        const single = {
-            title: item.title,
-            description,
-            link: item.link,
-            pubDate: item.pubDate,
-        };
-        ctx.cache.set(item.link, JSON.stringify(single));
-        return Promise.resolve(single);
-    });
     ctx.state.data = {
         title: `笔趣阁 ${title}`,
         link: pageUrl,

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/radio/radio.js

@@ -31,7 +31,7 @@ module.exports = async (ctx) => {
                 guid: item.id,
                 itunes_item_image: 'http://www.radio.cn/pc-portal/image/icon_32.jpg',
                 enclosure_url: 'http://' + item.stream_domain1 + item.stream_url1,
-                enclosure_length: item.resource_length,
+                itunes_duration: item.resource_length,
                 enclosure_type: 'audio/x-m4a',
             };
             return single;

package/lib/routes/sina/rollnews.js

@@ -1,8 +1,13 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
-    const response = await got.get(`https://feed.mix.sina.com.cn/api/roll/get?pageid=372&lid=2431&k=&num=50&page=1&r=${Math.random()}&callback=&_=${new Date().getTime()}`);
+    const response = await got(`https://feed.mix.sina.com.cn/api/roll/get?pageid=372&lid=2431&k=&num=50&page=1&r=${Math.random()}&callback=&_=${new Date().getTime()}`, {
+        headers: {
+            Referer: 'https://tech.sina.com.cn/',
+        },
+    });
     const list = response.data.result.data;
 
     const out = await Promise.all(
@@ -22,9 +27,9 @@ module.exports = async (ctx) => {
                 title,
                 link,
                 description,
-                pubDate: new Date(date).toUTCString(),
+                pubDate: parseDate(date),
             };
-            return Promise.resolve(single);
+            return single;
         })
     );
 

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();
@@ -88,7 +143,13 @@ module.exports = async (ctx) => {
                 }
 
                 // 修复文字格式错误
-                single.description = single.description.replace(/<section(.*?)>/g, '<p $1/>');
+                single.description = single.description
+                    .replace(/(<strong.*?>)(.*?)(<\/strong>)/g, '$1<span style="font-size: 16px; line-height: 16px;">$2</span>$3')
+                    .replace(/<section(.*?)>(.*?)<\/section>/g, '<p $1>$2</p>')
+                    .replace(/(<p.*?>)(.*?)(<\/p>)/g, '$1<span style="font-size: 16px; line-height: 16px;">$2</span>$3')
+                    .replace(/<p.*?data-encc.*?>.*?<\/p>/g, '')
+                    .replace(/<h\d(.*?)>(.*?)<\/h\d>/g, '<p $1>$2</p>')
+                    .replace(/<br.*?>/g, '');
 
                 return single;
             })