rsshub 1.0.0-master.f992838 → 1.0.0-master.f9a482d

package/lib/v2/wechat/radar.js

@@ -32,9 +32,9 @@ module.exports = {
             },
         ],
     },
-    'feeddd.org': {
+    'hamibot.com': {
         _name: '微信',
-        '.': [
+        feed: [
             {
                 title: '公众号（feeddd 来源）',
                 docs: 'https://docs.rsshub.app/new-media.html#wei-xin',
@@ -62,14 +62,20 @@ module.exports = {
             },
         ],
     },
-    'wemp.app': {
+    'sogou.com': {
         _name: '微信',
-        '.': [
+        weixin: [
             {
-                title: '公众号（wemp.app 来源）',
+                title: '公众号（搜狗来源）',
                 docs: 'https://docs.rsshub.app/new-media.html#wei-xin',
-                source: ['/accounts/:id'],
-                target: '/wechat/wemp/:id',
+                source: ['/weixin'],
+                target: (_, url) => {
+                    const id = new URL(url).searchParams.get('query');
+                    if (id === null) {
+                        return false;
+                    }
+                    return `/wechat/sogou/${id}`;
+                },
             },
         ],
     },
@@ -84,4 +90,15 @@ module.exports = {
             },
         ],
     },
+    'xlab.app': {
+        _name: '微信',
+        wechat2rss: [
+            {
+                title: '公众号（wechat2rss 来源）',
+                docs: 'https://docs.rsshub.app/new-media.html#wei-xin',
+                source: ['/feed/:id'],
+                target: (params) => `/wechat/wechat2rss/${params.id.replace('.xml', '')}`,
+            },
+        ],
+    },
 };

package/lib/v2/wechat/router.js

@@ -7,8 +7,9 @@ module.exports = function (router) {
     router.get('/feeds/:id', require('./feeds'));
     router.get('/mp/homepage/:biz/:hid/:cid?', require('./mp'));
     router.get('/mp/msgalbum/:biz/:aid', require('./msgalbum'));
+    router.get('/sogou/:id', require('./sogou'));
     router.get('/tgchannel/:id/:mpName?/:searchQueryType?', require('./tgchannel'));
     router.get('/uread/:userid', require('./uread'));
-    router.get('/wemp/:id', require('./wemp'));
+    router.get('/wechat2rss/:id', require('./wechat2rss'));
     router.get('/wxnmh/:id', require('./wxnmh'));
 };

package/lib/v2/wechat/sogou.js

@@ -0,0 +1,58 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const host = 'https://weixin.sogou.com';
+const { finishArticleItem } = require('@/utils/wechat-mp');
+module.exports = async (ctx) => {
+    const wechatId = ctx.params.id;
+    let url = `${host}/weixin`;
+    let response = await got({
+        method: 'get',
+        url,
+        searchParams: {
+            query: wechatId,
+        },
+    });
+
+    let $ = cheerio.load(response.data);
+    const href = $('a[uigs="account_article_0"]').attr('href');
+    const title = $('a[uigs="account_name_0"]').text();
+    url = `${host}${href}`;
+    response = await got({
+        url,
+        method: 'get',
+        headers: {
+            Cookie: 'SNUID=78725B470A0EF2C3F97AA5EB0BBF95C1; ABTEST=0|1680917938|v1; SUID=8F7B1C682B83A20A000000006430C5B2; PHPSESSID=le2lak0vghad5c98ijd3t51ls4; IPLOC=USUS5',
+        },
+    });
+    $ = cheerio.load(response.data);
+    const jsCode = $('script').text();
+    const regex = /url \+= '([^']+)';/g;
+    const matches = [];
+    let match;
+
+    while ((match = regex.exec(jsCode)) !== null) {
+        matches.push(match[1]);
+    }
+
+    let link = '';
+    if (matches.length > 0) {
+        link = matches
+            .join('')
+            .replace(/(\r\n|\n|\r)/gm, '') // remove newlines
+            .replace(/ /g, ''); // remove spaces
+        url = url.replace('@', '');
+    }
+    const item = {
+        link,
+        guid: link,
+    };
+
+    await finishArticleItem(ctx, item);
+
+    ctx.state.data = {
+        title: `${title} 的微信公众号`,
+        link: url,
+        description: `${title} 的微信公众号`,
+        item: [item],
+    };
+};

package/lib/v2/wechat/tgchannel.js

@@ -25,12 +25,12 @@ module.exports = async (ctx) => {
                 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) {
+                        highlightMarks.forEach((mark) => {
+                            mark = $(mark);
+                            const markInnerHtml = mark.html();
+                            mark.replaceWith(markInnerHtml);
+                        });
                         item = $(item.html()); // 删除关键字高亮后，相邻的裸文本节点不会被自动合并，重新生成 cheerio 对象以确保后续流程正常运行
                     }
                 }

package/lib/v2/wechat/wechat2rss.js

@@ -0,0 +1,28 @@
+const parser = require('@/utils/rss-parser');
+const { parseDate } = require('@/utils/parse-date');
+const { finishArticleItem } = require('@/utils/wechat-mp');
+
+module.exports = async (ctx) => {
+    const { id } = ctx.params;
+
+    const baseUrl = 'https://wechat2rss.xlab.app';
+    const feedUrl = `${baseUrl}/feed/${id}.xml`;
+
+    const { title, link, description, image, items: item } = await parser.parseURL(feedUrl);
+
+    let items = item.map((i) => ({
+        title: i.title,
+        pubDate: parseDate(i.pubDate),
+        link: i.link,
+    }));
+
+    items = await Promise.all(items.map((item) => finishArticleItem(ctx, item)));
+
+    ctx.state.data = {
+        title,
+        link,
+        description,
+        image: image.url,
+        item: items,
+    };
+};

package/lib/v2/weekendhk/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '': ['TonyRL'],
+    '/': ['TonyRL'],
+};

package/lib/v2/weekendhk/posts.js

@@ -0,0 +1,29 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const baseUrl = 'https://www.weekendhk.com';
+    const response = await got(`${baseUrl}/wp-json/wp/v2/posts`, {
+        searchParams: {
+            per_page: ctx.query.limit ?? 100,
+        },
+    });
+
+    const items = response.data.map((item) => ({
+        title: item.title.rendered,
+        link: item.link,
+        guid: item.guid.rendered,
+        description: item.content.rendered,
+        pubDate: parseDate(item.date_gmt),
+        author: item.creator_editor,
+    }));
+
+    ctx.state.data = {
+        title: '新假期周刊',
+        description: '新假期周刊網站為全港最強吃喝玩樂搵節目平台。網羅世界各地最詳盡旅遊潮流資訊；最新鮮熱辣本地飲食情報；最好玩周末玩樂節目，即時瞓身報導，全天候為你update。',
+        link: baseUrl,
+        language: 'zh-HK',
+        image: `${baseUrl}/wp-content/themes/bucket/theme-content/images/196x196.png`,
+        item: items,
+    };
+};

package/lib/v2/weekendhk/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'weekendhk.com': {
+        _name: '新假期周刊',
+        '.': [
+            {
+                title: '最新文章',
+                docs: 'https://docs.rsshub.app/traditional-media.html#xin-jia-qi-zhou-kan',
+                source: ['/'],
+                target: '/weekendhk',
+            },
+        ],
+    },
+};

package/lib/v2/weekendhk/router.js

@@ -0,0 +1,3 @@
+module.exports = (router) => {
+    router.get('/', require('./posts'));
+};

package/lib/v2/weibo/group.js

@@ -0,0 +1,93 @@
+const querystring = require('querystring');
+const got = require('@/utils/got');
+const config = require('@/config').value;
+const weiboUtils = require('./utils');
+const { fallback, queryToBoolean } = require('@/utils/readable-social');
+
+module.exports = async (ctx) => {
+    if (!config.weibo_cookies) {
+        throw 'Weibo Group Timeline is not available due to the absense of [Weibo Cookies]. Check <a href="https://docs.rsshub.app/install/#pei-zhi-bu-fen-rss-mo-kuai-pei-zhi">relevant config tutorial</a>';
+    }
+
+    const gid = ctx.params.gid;
+    const groupName = ctx.params.gname || '微博分组';
+    let displayVideo = '1';
+    let displayArticle = '0';
+    let displayComments = '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';
+            displayComments = fallback(undefined, queryToBoolean(routeParams.displayComments), false) ? '1' : '0';
+        }
+    }
+
+    const responseData = await ctx.cache.tryGet(
+        `weibo:group:index:${gid}`,
+        async () => {
+            const _r = await got({
+                method: 'get',
+                url: `https://m.weibo.cn/feed/group?gid=${gid}`,
+                headers: {
+                    Referer: `https://m.weibo.cn/`,
+                    'MWeibo-Pwa': 1,
+                    'X-Requested-With': 'XMLHttpRequest',
+                    Cookie: config.weibo.cookies,
+                },
+            });
+            return _r.data.data;
+        },
+        config.cache.routeExpire,
+        false
+    );
+
+    const resultItems = await Promise.all(
+        responseData.statuses.map(async (item) => {
+            const retweet = item.retweeted_status;
+            if (retweet && retweet.isLongText) {
+                const retweetData = await ctx.cache.tryGet(`weibo:retweeted:${retweet.user.id}:${retweet.bid}`, () => weiboUtils.getShowData(retweet.user.id, retweet.bid));
+                if (retweetData !== undefined && retweetData.text) {
+                    item.retweeted_status.text = retweetData.text;
+                }
+            }
+
+            const formatExtended = weiboUtils.formatExtended(ctx, item);
+            let description = formatExtended.description;
+
+            if (displayVideo === '1') {
+                if (item.retweeted_status) {
+                    description = weiboUtils.formatVideo(description, item.retweeted_status);
+                } else {
+                    description = weiboUtils.formatVideo(description, item);
+                }
+            }
+
+            if (displayComments === '1') {
+                description = await weiboUtils.formatComments(ctx, 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 {
+                ...formatExtended,
+                description,
+            };
+        })
+    );
+
+    ctx.state.data = weiboUtils.sinaimgTvax({
+        title: groupName,
+        link: `https://weibo.com/mygroups?gid=${gid}`,
+        description: '微博自定义分组',
+        item: resultItems,
+    });
+};

package/lib/v2/weibo/keyword.js

@@ -37,19 +37,10 @@ module.exports = async (ctx) => {
             if (item.mblog.retweeted_status && item.mblog.retweeted_status.created_at) {
                 item.mblog.retweeted_status.created_at = timezone(item.mblog.retweeted_status.created_at, +8);
             }
-            const formatExtended = weiboUtils.formatExtended(ctx, item.mblog, {
+            return weiboUtils.formatExtended(ctx, item.mblog, undefined, {
                 showAuthorInTitle: fallback(undefined, queryToBoolean(routeParams.showAuthorInTitle), true),
                 showAuthorInDesc: fallback(undefined, queryToBoolean(routeParams.showAuthorInDesc), true),
             });
-            const title = formatExtended.title;
-            const description = formatExtended.description;
-            return {
-                title,
-                description,
-                pubDate: item.mblog.created_at,
-                author: item.mblog.user.screen_name,
-                link: `https://weibo.com/${item.mblog.user.id}/${item.mblog.bid}`,
-            };
         }),
     });
 };

package/lib/v2/weibo/maintainer.js

@@ -1,8 +1,9 @@
 module.exports = {
-    '/keyword/:keyword/:routeParams?': ['DIYgod'],
+    '/group/:gid/:gname?/:routeParams?': ['monologconnor', 'Rongronggg9'],
+    '/keyword/:keyword/:routeParams?': ['DIYgod', 'Rongronggg9'],
     '/oasis/user/:userid': ['kt286'],
     '/search/hot': ['xyqfer'],
-    '/super_index/:id/:type?/:routeParams?': ['zengxs'],
-    '/timeline/:uid/:feature?/:routeParams?': ['zytomorrow', 'DIYgod ', 'Rongronggg9'],
+    '/super_index/:id/:type?/:routeParams?': ['zengxs', 'Rongronggg9'],
+    '/timeline/:uid/:feature?/:routeParams?': ['zytomorrow', 'DIYgod', 'Rongronggg9'],
     '/user/:uid/:routeParams?': ['DIYgod', 'iplusx', 'Rongronggg9'],
 };

package/lib/v2/weibo/router.js

@@ -1,4 +1,5 @@
 module.exports = (router) => {
+    router.get('/group/:gid/:gname?/:routeParams?', require('./group'));
     router.get('/keyword/:keyword/:routeParams?', require('./keyword'));
     router.get('/oasis/user/:userid', require('./oasis/user'));
     router.get('/search/hot', require('./search/hot'));

package/lib/v2/weibo/super_index.js

@@ -1,6 +1,5 @@
 const got = require('@/utils/got');
 const weiboUtils = require('./utils');
-const timezone = require('@/utils/timezone');
 const queryString = require('query-string');
 const config = require('@/config').value;
 
@@ -40,15 +39,7 @@ module.exports = async (ctx) => {
             if (mblogCard.card_type === '9' && 'mblog' in mblogCard) {
                 const mblog = mblogCard.mblog;
                 const formatExtended = weiboUtils.formatExtended(ctx, mblog);
-                const title = formatExtended.title;
-                const desc = formatExtended.description;
-                resultItems.push({
-                    title,
-                    description: desc,
-                    author: mblog.user.screen_name,
-                    link: `https://weibo.com/${mblog.user.id}/${mblog.bid}`,
-                    pubDate: timezone(mblog.created_at, +8),
-                });
+                resultItems.push(formatExtended);
             }
         }
     }

package/lib/v2/weibo/timeline.js

@@ -83,11 +83,11 @@ module.exports = async (ctx) => {
                     }
                 }
 
-                const link = `https://weibo.com/${uid}/${item.id}`;
+                const guid = `https://weibo.com/${uid}/${item.id}`;
+                // not using formatExtended.guid in order not to introduce breaking change
 
-                const formatExtended = weiboUtils.formatExtended(ctx, item);
+                const formatExtended = weiboUtils.formatExtended(ctx, item, uid);
                 let description = formatExtended.description;
-                const title = formatExtended.title;
                 const pubDate = isDataOK ? parseDate(data.created_at) : parseDate(item.created_at);
 
                 // 视频的处理
@@ -116,9 +116,9 @@ module.exports = async (ctx) => {
                 }
 
                 return {
-                    title,
+                    ...formatExtended,
+                    guid,
                     description,
-                    link,
                     pubDate,
                     author: item.user.screen_name,
                 };

package/lib/v2/weibo/user.js

@@ -94,11 +94,8 @@ module.exports = async (ctx) => {
                     }
                 }
 
-                const link = `https://weibo.com/${uid}/${item.mblog.bid}`;
-                const formatExtended = weiboUtils.formatExtended(ctx, item.mblog);
+                const formatExtended = weiboUtils.formatExtended(ctx, item.mblog, uid);
                 let description = formatExtended.description;
-                const title = formatExtended.title;
-                const pubDate = item.mblog.created_at;
 
                 // 视频的处理
                 if (displayVideo === '1') {
@@ -126,11 +123,8 @@ module.exports = async (ctx) => {
                 }
 
                 return {
-                    title,
+                    ...formatExtended,
                     description,
-                    link,
-                    pubDate,
-                    author: item.mblog.user.screen_name,
                     isPinned: item.profile_type_id?.startsWith('proweibotop'),
                 };
             })

package/lib/v2/weibo/utils.js

@@ -14,7 +14,9 @@ const weiboUtils = {
             .replace(/<[^<]*>/g, '')
             .replace(/\n/g, ' ')
             .trim(),
-    formatExtended: (ctx, status, params = {}, picsPrefixes = []) => {
+    formatExtended: (ctx, status, uid = undefined, params = {}, picsPrefixes = []) => {
+        // `uid = undefined` to explicitly mark it as optional, avoiding IDEs prompting warnings
+
         // undefined and strings like "1" is also safely parsed, so no if branch is needed
         const routeParams = querystring.parse(ctx.params.routeParams);
 
@@ -35,6 +37,7 @@ const weiboUtils = {
             sizeOfAuthorAvatar: fallback(params.sizeOfAuthorAvatar, queryToInteger(routeParams.sizeOfAuthorAvatar), 48),
             showEmojiInDescription: fallback(params.showEmojiInDescription, queryToInteger(routeParams.showEmojiInDescription), true),
             showLinkIconInDescription: fallback(params.showLinkIconInDescription, queryToInteger(routeParams.showLinkIconInDescription), true),
+            preferMobileLink: fallback(params.preferMobileLink, queryToBoolean(routeParams.preferMobileLink), false),
         };
 
         params = mergedParams;
@@ -56,6 +59,7 @@ const weiboUtils = {
             sizeOfAuthorAvatar,
             showEmojiInDescription,
             showLinkIconInDescription,
+            preferMobileLink,
         } = params;
 
         let retweeted = '';
@@ -191,7 +195,7 @@ const weiboUtils = {
             retweetedParams.showAuthorInDesc = true;
             retweetedParams.showAuthorAvatarInDesc = false;
             retweetedParams.showAtBeforeAuthor = true;
-            retweeted += weiboUtils.formatExtended(ctx, status.retweeted_status, retweetedParams, picsPrefixes).description;
+            retweeted += weiboUtils.formatExtended(ctx, status.retweeted_status, undefined, retweetedParams, picsPrefixes).description;
 
             html += retweeted;
 
@@ -231,7 +235,15 @@ const weiboUtils = {
             title += ' [视频]';
         }
 
-        return { description: html, title };
+        uid = uid || status.user?.id;
+        const bid = status.bid || status.id;
+        const guid = uid ? `https://weibo.com/${uid}/${bid}` : `https://m.weibo.cn/status/${bid}`;
+        const link = preferMobileLink ? `https://m.weibo.cn/status/${bid}` : guid;
+
+        const author = status.user?.screen_name;
+        const pubDate = status.created_at;
+
+        return { description: html, title, link, guid, author, pubDate };
     },
     getShowData: async (uid, bid) => {
         const link = `https://m.weibo.cn/statuses/show?id=${bid}`;

package/lib/v2/wfdf/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/news': ['HankChow'],
+};

package/lib/v2/wfdf/news.js

@@ -0,0 +1,29 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const baseUrl = 'https://wfdf.sport';
+    const { data: response } = await got(`${baseUrl}/wp-json/wp/v2/posts`, {
+        searchParams: {
+            per_page: ctx.query.limit ?? 100,
+            _embed: 1,
+        },
+    });
+
+    const items = response.map((item) => ({
+        title: item.title.rendered,
+        link: item.link,
+        guid: item.guid.rendered,
+        description: item.content.rendered,
+        pubDate: parseDate(item.date_gmt),
+        author: item._embedded.author[0].name,
+    }));
+
+    ctx.state.data = {
+        title: 'WFDF News',
+        link: `${baseUrl}/news/`,
+        image: `${baseUrl}/favicon.ico`,
+        description: 'WFDF 新闻',
+        item: items,
+    };
+};

package/lib/v2/wfdf/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'wfdf.sport': {
+        _name: 'WFDF',
+        '.': [
+            {
+                title: 'News',
+                docs: 'https://docs.rsshub.app/other.html#wfdf',
+                source: ['/news/', '/'],
+                target: '/wfdf/news',
+            },
+        ],
+    },
+};

package/lib/v2/wfdf/router.js

@@ -0,0 +1,3 @@
+module.exports = function (router) {
+    router.get('/news', require('./news'));
+};

package/lib/v2/wfu/news.js

@@ -80,7 +80,7 @@ module.exports = async (ctx) => {
 
                 // 对于列表的每一项, 单独获取 时间与详细内容
                 // eslint-disable-next-line no-return-await
-                const other = await ctx.cache.tryGet($item_url, async () => await load($item_url));
+                const other = await ctx.cache.tryGet($item_url, () => load($item_url));
                 // 合并解析后的结果集作为该篇文章最终的输出结果
                 return { ...single, ...other };
             })

package/lib/v2/who/news-room.js

@@ -43,28 +43,27 @@ module.exports = async (ctx) => {
     }
 
     const items = await Promise.all(
-        list.map(
-            async (item) =>
-                await ctx.cache.tryGet(item.link, async () => {
-                    const detailResponse = await got({
-                        method: 'get',
-                        url: item.link,
-                    });
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
 
-                    const matches = detailResponse.data.match(/"headline":"(.*)","description":"(.*)","datePublished":"(.*)","image"/);
+                const matches = detailResponse.data.match(/"headline":"(.*)","description":"(.*)","datePublished":"(.*)","image"/);
 
-                    if (matches) {
-                        item.title = matches[1];
-                        item.description = matches[2];
-                        item.pubDate = parseDate(matches[3]);
-                    } else {
-                        const content = cheerio.load(detailResponse.data);
+                if (matches) {
+                    item.title = matches[1];
+                    item.description = matches[2];
+                    item.pubDate = parseDate(matches[3]);
+                } else {
+                    const content = cheerio.load(detailResponse.data);
 
-                        item.description = content('.sf-content-block').html();
-                    }
+                    item.description = content('.sf-content-block').html();
+                }
 
-                    return item;
-                })
+                return item;
+            })
         )
     );
 

package/lib/v2/who/news.js

@@ -20,18 +20,17 @@ module.exports = async (ctx) => {
     }));
 
     const items = await Promise.all(
-        list.map(
-            async (item) =>
-                await ctx.cache.tryGet(item.link, async () => {
-                    const detailResponse = await got({
-                        method: 'get',
-                        url: item.link,
-                    });
-
-                    item.description = detailResponse.data.match(/"description":"(.*)","datePublished"/)[1];
-
-                    return item;
-                })
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+
+                item.description = detailResponse.data.match(/"description":"(.*)","datePublished"/)[1];
+
+                return item;
+            })
         )
     );
 

package/lib/v2/winstall/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/:appId': ['TonyRL'],
+};

package/lib/v2/winstall/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'winstall.app': {
+        _name: 'winstall',
+        '.': [
+            {
+                title: '应用更新',
+                docs: 'https://docs.rsshub.app/program-update.html#winstall',
+                source: ['/apps/:appId'],
+                target: '/winstall/:appId',
+            },
+        ],
+    },
+};