rsshub 1.0.0-master.f78ad03 → 1.0.0-master.f796ff1

package/lib/v2/udn/router.js

@@ -0,0 +1,5 @@
+module.exports = (router) => {
+    router.get('/global/tag/:tag?', require('./global/tag'));
+    router.get('/global/:category?', require('./global/index'));
+    router.get('/news/breakingnews/:id', require('./breaking-news'));
+};

package/lib/v2/udn/templates/figure.art

@@ -0,0 +1,4 @@
+<figure>
+<picture><img src={{ src }} alt={{ alt }}></picture>
+<figurecaption>{{ alt }}</figurecaption>
+</figure>

package/lib/v2/unusualwhales/maintainer.js

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

package/lib/v2/unusualwhales/news.js

@@ -0,0 +1,24 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+
+const apiBase = 'https://phx.unusualwhales.com';
+
+module.exports = async (ctx) => {
+    const { data } = await got(`${apiBase}/api/fj_articles`);
+
+    const items = data.map((item) => ({
+        title: item.title,
+        description: item.description,
+        link: item.url,
+        pubDate: parseDate(item.publish_date),
+    }));
+
+    ctx.state.data = {
+        title: 'Flow - News',
+        description: 'Explore unusual options, options flow, dark pools, short activity, and stock activity on unusualwhales.com. Unusual whales has a full news service available!',
+        link: 'https://unusualwhales.com/news-feed',
+        image: 'https://unusualwhales.com/android-icon-192x192.png',
+        language: 'en-US',
+        item: items,
+    };
+};

package/lib/v2/unusualwhales/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'unusualwhales.com': {
+        _name: 'Unusual Whales',
+        '.': [
+            {
+                title: 'News Flow',
+                docs: 'https://docs.rsshub.app/en/finance.html#unusual-whales',
+                source: ['/news', '/'],
+                target: '/unusualwhales/news',
+            },
+        ],
+    },
+};

package/lib/v2/unusualwhales/router.js

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

package/lib/v2/usepanda/index.js

@@ -0,0 +1,26 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const feedId = ctx.params.id;
+    const limit = ctx.query.limit ?? 30; // 默认30条
+
+    const rootUrl = 'https://api-panda.com/v4/';
+    const apiUrl = `${rootUrl}articles?feeds=${feedId}&limit=${limit}&page=1&sort=popular`;
+
+    const { data } = await got(apiUrl);
+
+    const items = data.map((item) => ({
+        title: `${item.title} 🌟 ${item.source.likesCount}`,
+        author: item.source.username,
+        pubDate: parseDate(item.source.createdAt),
+        link: item.source.targetUrl,
+        description: item.description,
+    }));
+
+    ctx.state.data = {
+        title: 'Panda Feeds',
+        link: 'https://usepanda.com/',
+        item: items,
+    };
+};

package/lib/v2/usepanda/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/feeds/:id': ['lyrl'],
+};

package/lib/v2/usepanda/radar.js

@@ -0,0 +1,11 @@
+module.exports = {
+    'usepanda.com': {
+        _name: 'Panda',
+        '.': [
+            {
+                title: 'Feeds',
+                docs: 'https://docs.rsshub.app/other.html#panda',
+            },
+        ],
+    },
+};

package/lib/v2/usepanda/router.js

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

package/lib/v2/vom/featured.js

@@ -0,0 +1,50 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const baseUrl = 'http://www.vom.mn';
+
+module.exports = async (ctx) => {
+    const { lang = 'mn' } = ctx.params;
+    const { data: response } = await got(`${baseUrl}/${lang}`);
+
+    const $ = cheerio.load(response);
+
+    const items = [
+        ...new Set(
+            $('#bigNewsSlide .item, #news_3 .item')
+                .toArray()
+                .map((item) => {
+                    item = $(item);
+                    return {
+                        link: item.find('a').eq(0).attr('href'),
+                    };
+                })
+        ),
+    ];
+
+    await Promise.all(
+        items.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const { data: response } = await got(item.link);
+                const $ = cheerio.load(response);
+
+                item.title = $('h2').text();
+                item.author = $('.uk-border-circle').next().text();
+                item.pubDate = parseDate($('.vom-news-show-meta .right').prev().text());
+                item.category = $('.vom-news-show-meta .uk-button-text').text();
+
+                $('.uk-article-title, .uk-text-meta, article .uk-grid-small').remove();
+
+                item.description = $('article').html();
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: $('meta[name=description]').attr('content'),
+        image: 'http://www.vom.mn/dist/images/vom-logo.png',
+        item: items,
+    };
+};

package/lib/v2/vom/maintainer.js

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

package/lib/v2/vom/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'vom.mn': {
+        _name: '蒙古之声',
+        '.': [
+            {
+                title: '新闻',
+                docs: 'https://docs.rsshub.app/traditional-media.html#meng-gu-zhi-sheng',
+                source: ['/:lang', '/'],
+                target: '/vom/featured/:lang',
+            },
+        ],
+    },
+};

package/lib/v2/vom/router.js

@@ -0,0 +1,3 @@
+module.exports = (router) => {
+    router.get('/featured/:lang?', require('./featured.js'));
+};

package/lib/v2/wallstreetcn/live.js

@@ -1,5 +1,7 @@
 const got = require('@/utils/got');
 const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
 
 const titles = {
     global: '要闻',
@@ -30,9 +32,13 @@ module.exports = async (ctx) => {
         .map((item) => ({
             link: item.uri,
             title: item.title || item.content_text,
-            description: item.content + (item.content_more ?? ''),
             pubDate: parseDate(item.display_time * 1000),
             author: item.author?.display_name ?? '',
+            description: art(path.join(__dirname, 'templates/description.art'), {
+                description: item.content,
+                more: item.content_more,
+                images: item.images,
+            }),
         }));
 
     ctx.state.data = {

package/lib/v2/wallstreetcn/news.js

@@ -28,12 +28,14 @@ module.exports = async (ctx) => {
         url: apiUrl,
     });
 
-    let items = response.data.data.items.map((item) => ({
-        type: item.resource_type,
-        guid: item.resource.id,
-        link: item.resource.uri,
-        pubDate: parseDate(item.resource.display_time * 1000),
-    }));
+    let items = response.data.data.items
+        .filter((item) => item.resource_type !== 'ad')
+        .map((item) => ({
+            type: item.resource_type,
+            guid: item.resource.id,
+            link: item.resource.uri,
+            pubDate: parseDate(item.resource.display_time * 1000),
+        }));
 
     items = await Promise.all(
         items.map((item) =>

package/lib/v2/wallstreetcn/templates/description.art

@@ -0,0 +1,11 @@
+{{ if description }}
+{{@ description }}
+{{ /if }}
+{{ if more }}
+{{@ more }}
+{{ /if }}
+{{ if images }}
+{{ each images image }}
+<img src="{{ image.uri }}" width="{{ image.width }}" height="{{ image.height }}">
+{{ /each }}
+{{ /if }}

package/lib/v2/warthunder/news.js

@@ -3,6 +3,7 @@ const cheerio = require('cheerio');
 const path = require('path');
 const { art } = require('@/utils/render');
 const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
 const renderDescription = (desc) => art(path.join(__dirname, 'templates/description.art'), desc);
 
 module.exports = async (ctx) => {
@@ -15,7 +16,8 @@ module.exports = async (ctx) => {
     const pageFace = $('div.showcase__item.widget')
         .map((_, item) => {
             item = $(item);
-            const pubDate = parseDate(item.find('div.widget__content > ul > li').text(), 'D MMMM YYYY');
+            let pubDate = parseDate(item.find('div.widget__content > ul > li.widget-meta__item.widget-meta__item--right').text(), 'D MMMM YYYY');
+            pubDate = timezone(pubDate, 0);
             const category = [];
             if (item.find('div.widget__pin').length !== 0) {
                 category.push('pinned');

package/lib/v2/web3caff/index.js

@@ -0,0 +1,63 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const params = ctx.path === '/' ? '' : ctx.path;
+
+    const rootUrl = 'https://web3caff.com';
+    const currentUrl = `${rootUrl}${params}`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    let items = $('.list-grouped')
+        .first()
+        .find('.list-body')
+        .slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 10)
+        .toArray()
+        .map((item) => {
+            item = $(item);
+
+            const a = item.find('.list-title');
+
+            return {
+                title: a.text(),
+                link: a.attr('href'),
+            };
+        });
+
+    items = await Promise.all(
+        items.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+
+                const content = cheerio.load(detailResponse.data);
+
+                content('.ss-inline-share-wrapper').remove();
+
+                item.description = content('.post-content').html();
+                item.author = content('.author-name .author-popup').text();
+                item.category = content('a[rel="category tag"]')
+                    .toArray()
+                    .map((tag) => $(tag).text());
+                item.pubDate = parseDate(content('meta[property="article:published_time"]').attr('content'));
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: $('title').text(),
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/web3caff/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/:path?': ['nczitzk'],
+};

package/lib/v2/web3caff/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'web3caff.com': {
+        _name: 'web3caff',
+        '.': [
+            {
+                title: '发现',
+                docs: 'https://docs.rsshub.app/new-media.html#web3caff-fa-xian',
+                source: ['/'],
+                target: (params, url) => `/web3caff${new URL(url).toString().match(/\.com(.*)/)[1]}`,
+            },
+        ],
+    },
+};

package/lib/v2/web3caff/router.js

@@ -0,0 +1,3 @@
+module.exports = function (router) {
+    router.get(/([\w-/]+)?/, require('./index'));
+};

package/lib/v2/wechat/feeddd.js

@@ -31,6 +31,7 @@ module.exports = async (ctx) => {
     ctx.state.json = {
         title: response.data.title,
         link: response.data.feed_url,
+        image: 'https://mp.weixin.qq.com/favicon.ico',
         description: response.data.title,
         item: items,
     };

package/lib/{routes → v2}/weibo/keyword.js

@@ -28,7 +28,7 @@ module.exports = async (ctx) => {
     );
 
     const routeParams = querystring.parse(ctx.params.routeParams);
-    ctx.state.data = {
+    ctx.state.data = weiboUtils.sinaimgTvax({
         title: `又有人在微博提到${keyword}了`,
         link: `http://s.weibo.com/weibo/${encodeURIComponent(keyword)}&b=1&nodup=1`,
         description: `又有人在微博提到${keyword}了`,
@@ -51,5 +51,5 @@ module.exports = async (ctx) => {
                 link: `https://weibo.com/${item.mblog.user.id}/${item.mblog.bid}`,
             };
         }),
-    };
+    });
 };

package/lib/v2/weibo/maintainer.js

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

package/lib/v2/weibo/oasis/user.js

@@ -0,0 +1,20 @@
+const buildData = require('@/utils/common-config');
+const weiboUtils = require('../utils');
+
+module.exports = async (ctx) => {
+    const userid = ctx.params.userid;
+    const link = `https://oasis.weibo.cn/v1/h5/share?uid=${userid}`;
+    ctx.state.data = weiboUtils.sinaimgTvax(
+        await buildData({
+            link,
+            url: link,
+            title: `$('.name-main').text().trim() + ' - 用户 - 绿洲'`,
+            description: `$('.desc').text().trim()`,
+            item: {
+                item: '.container .item',
+                title: `$('.status-desc').text()`,
+                description: `$('.status-desc').text() + '<br>' + $('.media-wrapper').html()`,
+            },
+        })
+    );
+};

package/lib/v2/weibo/radar.js

@@ -0,0 +1,48 @@
+module.exports = {
+    'weibo.com': {
+        _name: '微博',
+        '.': [
+            {
+                title: '博主',
+                docs: 'https://docs.rsshub.app/social-media.html#wei-bo',
+                source: ['/u/:id', '/:id'],
+                target: (params, url, document) => {
+                    let uid = document?.documentElement.innerHTML.match(/\$CONFIG\['oid']='(\d+)'/)?.[1];
+                    if (!uid && !isNaN(params.id)) {
+                        uid = params.id;
+                    }
+                    return uid ? `/weibo/user/${uid}` : '';
+                },
+            },
+            {
+                title: '关键词',
+                docs: 'https://docs.rsshub.app/social-media.html#wei-bo',
+            },
+            {
+                title: '超话',
+                docs: 'https://docs.rsshub.app/social-media.html#wei-bo',
+                source: '/p/:id/super_index',
+                target: '/weibo/super_index/:id',
+            },
+        ],
+        s: [
+            {
+                title: '热搜榜',
+                docs: 'https://docs.rsshub.app/social-media.html#wei-bo',
+                source: '/top/summary',
+                target: '/weibo/search/hot',
+            },
+        ],
+    },
+    'weibo.cn': {
+        _name: '微博',
+        m: [
+            {
+                title: '博主',
+                docs: 'https://docs.rsshub.app/social-media.html#wei-bo',
+                source: ['/u/:uid', '/profile/:uid'],
+                target: '/weibo/user/:uid',
+            },
+        ],
+    },
+};

package/lib/v2/weibo/router.js

@@ -0,0 +1,8 @@
+module.exports = (router) => {
+    router.get('/keyword/:keyword/:routeParams?', require('./keyword'));
+    router.get('/oasis/user/:userid', require('./oasis/user'));
+    router.get('/search/hot', require('./search/hot'));
+    router.get('/super_index/:id/:type?/:routeParams?', require('./super_index'));
+    router.get('/timeline/:uid/:feature?/:routeParams?', require('./timeline'));
+    router.get('/user/:uid/:routeParams?', require('./user'));
+};

package/lib/{routes → v2}/weibo/search/hot.js

@@ -1,4 +1,5 @@
 const got = require('@/utils/got');
+// const weiboUtils = require('../utils');
 
 module.exports = async (ctx) => {
     const {
@@ -30,4 +31,5 @@ module.exports = async (ctx) => {
             };
         }),
     };
+    // ctx.state.data = weiboUtils.sinaimgTvax(ctx.state.data); // no image in the route
 };

package/lib/{routes → v2}/weibo/super_index.js

@@ -53,10 +53,10 @@ module.exports = async (ctx) => {
         }
     }
 
-    ctx.state.data = {
+    ctx.state.data = weiboUtils.sinaimgTvax({
         title: `微博超话 - ${containerData.pageInfo.page_title}`,
         link: `https://weibo.com/p/${id}/super_index`,
         description: `#${containerData.pageInfo.page_title}# 的超话`,
         item: resultItems,
-    };
+    });
 };

package/lib/{routes → v2}/weibo/timeline.js

@@ -125,13 +125,13 @@ module.exports = async (ctx) => {
             })
         );
 
-        ctx.state.data = {
+        ctx.state.data = weiboUtils.sinaimgTvax({
             title: `个人微博时间线--${name}`,
             link: `http://weibo.com/${uid}/`,
             description,
             image: profileImageUrl,
             item: resultItem,
-        };
+        });
     } else if (uid === '0' || ctx.querystring) {
         const { app_key = '', redirect_url = ctx.request.origin + '/weibo/timeline/0', app_secret = '' } = config.weibo;
 

package/lib/{routes → v2}/weibo/user.js

@@ -145,11 +145,11 @@ module.exports = async (ctx) => {
         resultItems = ordinaryItems;
     }
 
-    ctx.state.data = {
+    ctx.state.data = weiboUtils.sinaimgTvax({
         title: `${name}的微博`,
         link: `https://weibo.com/${uid}/`,
         description,
         image: profileImageUrl,
         item: resultItems,
-    };
+    });
 };

package/lib/{routes → v2}/weibo/utils.js

@@ -4,6 +4,16 @@ const cheerio = require('cheerio');
 const { fallback, queryToBoolean, queryToInteger } = require('@/utils/readable-social');
 
 const weiboUtils = {
+    formatTitle: (html) =>
+        html
+            .replace(/<span class=["']url-icon["']><img\s[^>]*?alt=["']?([^>]+?)["']?\s[^>]*?\/?><\/span>/g, '$1') // 表情转换
+            .replace(/<span class=["']url-icon["']>(<img\s[^>]*>)<\/span>/g, '') // 去掉所有图标
+            .replace(/<img\s[^<]*>/g, '[图片]')
+            // impossible to have inline script in weibo posts, but CodeQL complains about it
+            // Dismiss it through the UI: https://github.com/github/codeql/issues/11427
+            .replace(/<[^<]*>/g, '')
+            .replace(/\n/g, ' ')
+            .trim(),
     formatExtended: (ctx, status, params = {}, picsPrefixes = []) => {
         // undefined and strings like "1" is also safely parsed, so no if branch is needed
         const routeParams = querystring.parse(ctx.params.routeParams);
@@ -90,6 +100,13 @@ const weiboUtils = {
             html = usernameAndAvatar + html;
         }
 
+        // status.pics can be either an array or an object:
+        // array: [ object, object, ... ]
+        // object: { '0': object, '1': object, ... }  // REALLY AMAZING data structure
+        if (status.pics && !Array.isArray(status.pics) && typeof status.pics === 'object') {
+            status.pics = Object.values(status.pics);
+        }
+
         // 添加文章头图，此处不需要回落到被转发的微博，后续处理被转发的微博时，还会执行到这里
         if (status.page_info && status.page_info.type === 'article' && status.page_info.page_pic && status.page_info.page_pic.url) {
             // 如果以后后续流程会用到其他字段，记得修改这里
@@ -200,23 +217,11 @@ const weiboUtils = {
             title += status.user.screen_name + ': ';
         }
         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', '')
-                .trim();
+            title += weiboUtils.formatTitle(htmlNewLineUnreplaced);
         }
         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', '')
-                .trim();
+            title += weiboUtils.formatTitle(retweeted);
         }
         if (livePhotoCount > 0) {
             title += ' ';
@@ -417,6 +422,36 @@ const weiboUtils = {
         }
         return itemDesc;
     },
+    sinaimgTvax: (() => {
+        // https://datatracker.ietf.org/doc/html/rfc1808#section-2.4.3
+        const regex = /(?<=\/\/)wx(?=[1-4]\.sinaimg\.cn\/)/gi;
+        const prefixes = ['tva', 'tvax'];
+        let cnt = 0;
+        const replace = (html) => {
+            cnt = (cnt + 1) % 2;
+            return html.replace(regex, prefixes[cnt]);
+        };
+        const replaceKV = (obj, keys) => {
+            keys.forEach((key) => {
+                if (obj[key]) {
+                    obj[key] = replace(obj[key]);
+                }
+            });
+        };
+        const dataKeys = ['description', 'image'];
+        const itemKeys = ['description'];
+        return (data) => {
+            if (data) {
+                replaceKV(data, dataKeys);
+                if (data.item) {
+                    data.item.forEach((item) => {
+                        replaceKV(item, itemKeys);
+                    });
+                }
+            }
+            return data;
+        };
+    })(),
 };
 
 module.exports = weiboUtils;

package/lib/v2/wise/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/pair/:source/:target': ['HenryQW'],
+};