rsshub 1.0.0-master.fdf137b → 1.0.0-master.fe775f5

package/lib/v2/dtcj/datainsight.js

@@ -0,0 +1,53 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const id = ctx.params.id ?? '';
+
+    const rootUrl = 'https://dtcj.com';
+    const currentUrl = `${rootUrl}/${id ? `insighttopic/${id}` : 'datainsight'}`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    const list = $('.info-2_P1UM a')
+        .slice(0, 10)
+        .map((_, item) => {
+            item = $(item);
+
+            return {
+                title: item.text(),
+                link: `${rootUrl}${item.attr('href')}`,
+            };
+        })
+        .get();
+
+    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,
+                    });
+                    const content = cheerio.load(detailResponse.data);
+
+                    item.description = content('.content-3mNFyi').html();
+                    item.pubDate = parseDate(detailResponse.data.match(/"date":"(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}\+\d{2}:\d{2})","thumbnail_url":/)[1]);
+
+                    return item;
+                })
+        )
+    );
+
+    ctx.state.data = {
+        title: $('title').text(),
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/dtcj/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/datahero/:category?': ['nczitzk'],
+    '/datainsight/:id?': ['nczitzk'],
+};

package/lib/v2/dtcj/radar.js

@@ -0,0 +1,25 @@
+module.exports = {
+    'dtcj.com': {
+        _name: 'DT 财经',
+        '.': [
+            {
+                title: '数据侠专栏',
+                docs: 'https://docs.rsshub.app/finance.html#dt-cai-jing',
+                source: ['/datahero/topic'],
+                target: (_params, url) => `/dtcj/datahero/${new URL(url).searchParams.get('topic_id')}`,
+            },
+            {
+                title: '数据洞察',
+                docs: 'https://docs.rsshub.app/finance.html#dt-cai-jing',
+                source: ['/dtcj/datainsight'],
+                target: '/dtcj/datainsight',
+            },
+            {
+                title: '数据洞察',
+                docs: 'https://docs.rsshub.app/finance.html#dt-cai-jing',
+                source: ['/insighttopic/:id'],
+                target: '/dtcj/datainsight/:id',
+            },
+        ],
+    },
+};

package/lib/v2/dtcj/router.js

@@ -0,0 +1,4 @@
+module.exports = (router) => {
+    router.get('/datahero/:category?', require('./datahero'));
+    router.get('/datainsight/:id?', require('./datainsight'));
+};

package/lib/v2/eastday/24.js

@@ -0,0 +1,90 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const timezone = require('@/utils/timezone');
+const { parseDate } = require('@/utils/parse-date');
+
+const categories = {
+    社会: 'shehui',
+    娱乐: 'yule',
+    国际: 'guoji',
+    军事: 'junshi',
+    养生: 'yangsheng',
+    汽车: 'qiche',
+    体育: 'tiyu',
+    财经: 'caijing',
+    游戏: 'youxi',
+    科技: 'keji',
+    国内: 'guonei',
+    宠物: 'chongwu',
+    情感: 'qinggan',
+    人文: 'renwen',
+    教育: 'jiaoyu',
+};
+
+module.exports = async (ctx) => {
+    const category = ctx.params.category ?? '社会';
+
+    const rootUrl = 'https://mini.eastday.com';
+    const currentUrl = `${rootUrl}/ns/api/detail/trust/trust-news-${categories[category]}.json`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const list = JSON.parse(response.data.match(/\((.*)\)/)[1]).data.trust.map((item) => ({
+        title: item.topic,
+        link: `${rootUrl}${item.url}`,
+    }));
+
+    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);
+
+                const pageNumber = parseInt(detailResponse.data.match(/var page_num = '(\d+)'/)[1]);
+
+                item.description = content('#J-contain_detail_cnt').html();
+                item.pubDate = timezone(parseDate(content('meta[property="og:release_date"]').attr('content')), +8);
+
+                if (pageNumber > 1) {
+                    const links = [];
+
+                    for (let i = 2; i <= pageNumber; i++) {
+                        links.push(item.link.replace(/\.html/, `-${i}.html`));
+                    }
+
+                    links.forEach(
+                        async (link) =>
+                            await ctx.cache.tryGet(link, async () => {
+                                const pageResponse = await got({
+                                    method: 'get',
+                                    url: link,
+                                });
+                                const subContent = cheerio.load(pageResponse.data);
+
+                                subContent('img').each(function () {
+                                    subContent(this).attr('src', subContent(this).attr('data-url'));
+                                });
+
+                                item.description += subContent('#J-contain_detail_cnt').html();
+                            })
+                    );
+                }
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: `24小时${category}热闻 - 东方资讯`,
+        link: `${rootUrl}/#${categories[category]}`,
+        item: items,
+    };
+};

package/lib/v2/eastday/maintainer.js

@@ -1,4 +1,6 @@
 module.exports = {
+    '/24/:category?': ['nczitzk'],
     '/find': ['nczitzk'],
     '/portrait': ['nczitzk'],
+    '/sh': ['saury'],
 };

package/lib/v2/eastday/radar.js

@@ -1,6 +1,22 @@
 module.exports = {
     'eastday.com': {
         _name: '东方网',
+        mini: [
+            {
+                title: '24 小时热闻',
+                docs: 'https://docs.rsshub.app/traditional-media.html#dong-fang-wang',
+                source: '/',
+                target: '/eastday/24',
+            },
+        ],
+        sh: [
+            {
+                title: '上海新闻',
+                docs: 'https://docs.rsshub.app/traditional-media.html#dong-fang-wang',
+                source: '/',
+                target: '/eastday/sh',
+            },
+        ],
         www: [
             {
                 title: '热点搜索',

package/lib/v2/eastday/router.js

@@ -1,4 +1,6 @@
 module.exports = function (router) {
+    router.get('/24/:category?', require('./24'));
     router.get('/find', require('./find'));
     router.get('/portrait', require('./portrait'));
+    router.get('/sh', require('./sh'));
 };

package/lib/{routes → v2}/eastday/sh.js

@@ -1,6 +1,8 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const logger = require('@/utils/logger');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
 
 module.exports = async (ctx) => {
     const domain = 'http://wap.eastday.com';
@@ -16,28 +18,21 @@ module.exports = async (ctx) => {
             const entity = {
                 title: item.title,
                 description: item.abstracts,
-                pubDate: new Date(item.time).toUTCString(),
+                pubDate: timezone(parseDate(item.time), +8),
                 link,
             };
 
             try {
                 const cacheKey = `eastday_sh_${link}`;
-                // 判断缓存中是否存在
-                const cacheValue = await ctx.cache.get(cacheKey);
-                if (cacheValue) {
-                    entity.description = cacheValue;
-                } else {
+                entity.description = await ctx.cache.tryGet(cacheKey, async () => {
                     const article = await got({
                         method: 'get',
                         url: link,
                     });
                     // 解析html内容
                     const $ = cheerio.load(article.body);
-                    const content = $('.article_wrapper .mainLayer .content').html() || $('.contentBox .article .detail').html();
-                    // 存放到缓存区
-                    ctx.cache.set(cacheKey, content);
-                    entity.description = content;
-                }
+                    return $('.article_wrapper .mainLayer .content').html() || $('.contentBox .article .detail').html();
+                });
             } catch (error) {
                 logger.error(error);
             }

package/lib/v2/eastmoney/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'eastmoney.com': {
+        _name: '东方财富',
+        fundbarmob: [
+            {
+                title: '天天基金用户动态',
+                docs: 'https://docs.rsshub.app/finance.html#dong-fang-cai-fu',
+                source: ['/'],
+                target: (_param, url) => `/eastmoney/ttjj/user/${new URL(url).searchParams.get('userid')}`,
+            },
+        ],
+    },
+};

package/lib/v2/eastmoney/router.js

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

package/lib/v2/eastmoney/ttjj/user.js

@@ -0,0 +1,65 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
+
+module.exports = async (ctx) => {
+    const uid = ctx.params.uid;
+
+    const urlPrefix = 'https://jijinbaapi.eastmoney.com/gubaapi/v3/read';
+
+    const userProfileUrl = `${urlPrefix}/User/UserInfo.ashx?ServerVersion=1.0.0&PhoneType=windows&Location=zh-CN&ctoken=&utoken=&deviceid=000000&ps=8&plat=Wap&product=Fund&version=201&followuid=`;
+    const userProfileResponse = await got(`${userProfileUrl}${uid}`);
+    const username = userProfileResponse.data.user_nickname || '不存在的用户';
+
+    const userPostListUrl = `${urlPrefix}/Article/Post/UserPostList.ashx`;
+
+    const listResponse = await got({
+        method: 'post',
+        url: userPostListUrl,
+        headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/x-www-form-urlencoded',
+        },
+        form: {
+            uid,
+            deviceId: 666666,
+            version: 201,
+            p: 1,
+            ps: 20,
+        },
+    });
+
+    const data = listResponse.data.re;
+
+    const userArticleUrl = `${urlPrefix}/Article/Post/ArticleContent.ashx`;
+
+    const result = await Promise.all(
+        data.map((item) =>
+            ctx.cache.tryGet(userArticleUrl + item.post_id, async () => {
+                const detailResponse = await got({
+                    method: 'post',
+                    url: userArticleUrl,
+                    headers: {
+                        Accept: 'application/json',
+                        'Content-Type': 'application/x-www-form-urlencoded',
+                    },
+                    body: `postid=${item.post_id}&ServerVersion=1.0.0&PhoneType=windows&Location=zh-CN&ctoken=&utoken=&deviceId=000000&userId=&plat=Wap&product=Fund&version=201`,
+                });
+                const description = detailResponse.data.post.post_content;
+                const single = {
+                    title: item.post_title,
+                    description,
+                    pubDate: timezone(parseDate(item.post_display_time, 'YYYY-MM-DD HH:mm:ss'), +8),
+                    link: `https://fundbarmob.eastmoney.com/index.html?goPage=articleView&lastPage=personDetailView&aid=${item.post_id}`,
+                };
+                return single;
+            })
+        )
+    );
+    ctx.state.data = {
+        title: `天天基金-${username}的主页`,
+        link: `https://fundbarmob.eastmoney.com/index.html?goPage=personDetailView&userid=${uid}`,
+        description: `${username} 的动态`,
+        item: result,
+    };
+};

package/lib/v2/ems/apple.js

@@ -0,0 +1,42 @@
+const got = require('@/utils/got');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+const rootUrl = 'https://www.ems.com.cn';
+
+module.exports = async (ctx) => {
+    const id = ctx.params.id;
+    const link = `${rootUrl}/apple/query/${id}`;
+    const APIUrl = `${rootUrl}/apple/getMailNoLastRoutes`;
+
+    const { trails } = await got
+        .post(APIUrl, {
+            form: {
+                mailNum: id,
+            },
+        })
+        .json();
+
+    let item;
+    try {
+        item = [
+            {
+                title: `${trails[0][0].despatchCity} → ${trails[0][0].destinationCity}`,
+                link,
+                description: art(path.join(__dirname, 'templates/apple.art'), {
+                    trails: trails[0],
+                }),
+                guid: trails[0][0],
+            },
+        ];
+    } catch (e) {
+        throw new Error(`没有找到 ${id} 的信息，请检查是否输入正确或者稍后再试。`);
+    }
+
+    ctx.state.data = {
+        allowEmpty: true,
+        title: `Apple EMS 快递 ${id}`,
+        link,
+        item,
+    };
+};

package/lib/v2/ems/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/news': ['luyuhuang'],
+    '/apple/:id': ['Fatpandac'],
+};

package/lib/v2/ems/radar.js

@@ -0,0 +1,19 @@
+module.exports = {
+    'ems.com.cn': {
+        _name: '中国邮政速递物流',
+        www: [
+            {
+                title: '新闻',
+                docs: 'https://docs.rsshub.app/other.html#zhong-guo-you-zheng-su-di-wu-liu',
+                source: '/aboutus/xin_wen_yu_shi_jian.html',
+                target: '/ems/news',
+            },
+            {
+                title: '苹果邮件',
+                docs: 'https://docs.rsshub.app/other.html#zhong-guo-you-zheng-su-di-wu-liu',
+                source: ['/apple/query/:id'],
+                target: '/apple/ems/:id',
+            },
+        ],
+    },
+};

package/lib/v2/ems/router.js

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

package/lib/v2/ems/templates/apple.art

@@ -0,0 +1,6 @@
+{{ each trails}}
+<H2>{{ $value.optime }}</H2>
+<p>{{ $value.opreateType}} </p>
+<p>{{ $value.processingInstructions }}</p>
+<hr>
+{{/each}}

package/lib/v2/eprice/rss.js

@@ -30,9 +30,10 @@ module.exports = async (ctx) => {
                 // remove unwanted elements
                 $('noscript').remove();
                 $('div[id^=dablewidget]').remove();
+                $('div[class^=parallax-ads]').remove();
                 $('.adsbygoogle, .join-eprice-fb, .teads').remove();
                 $('div.ad-336x280-g, div.ad-728x90-g').remove();
-                $('div.clear, div.news-vote, div.text-left, div.signature').remove();
+                $('div.clear, div.news-vote, div.signature').remove();
                 $('ul.inner, ul.navigator, ul.infobar').remove();
                 $('iframe[src^="https://www.facebook.com/plugins/like.php"]').remove();
 
@@ -76,7 +77,8 @@ module.exports = async (ctx) => {
                 delete item.isoDate;
 
                 item.description = art(path.join(__dirname, 'templates/description.art'), {
-                    desc: $('div.user-comment-block').html() ?? $('div.content').html() ?? $('li.inner').html(),
+                    // tw || tw || hk || hk
+                    desc: $('div.user-comment-block').html() || $('div.content').html() || $('li.inner').html() || $('div.section-content').html(),
                 });
                 item.pubDate = parseDate(item.pubDate);
 

package/lib/{routes → v2}/ff14/ff14_global.js

@@ -1,12 +1,15 @@
 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 type = ctx.params.type;
     const lang = ctx.params.lang;
+    const type = ctx.params.type ?? 'all';
 
     const response = await got({
         method: 'get',
-        url: `http://${lang}.lodestonenews.com/news/${type}`,
+        url: `https://lodestonenews.com/news/${type}?locale=${lang}`,
     });
 
     let data;
@@ -23,8 +26,11 @@ module.exports = async (ctx) => {
         item: data.map(({ id, url, title, time, description, image }) => ({
             title,
             link: url,
-            description: `<img src="${image}"><br>${description}<br>`,
-            pubDate: time,
+            description: art(path.join(__dirname, 'templates/description.art'), {
+                image,
+                description,
+            }),
+            pubDate: parseDate(time),
             guid: id,
         })),
     };

package/lib/{routes → v2}/ff14/ff14_zh.js

@@ -1,8 +1,12 @@
 const got = require('@/utils/got');
 const timezone = require('@/utils/timezone');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
 module.exports = async (ctx) => {
-    const referer = 'http://ff.sdo.com/web8/index.html';
-    const type = ctx.params.type;
+    const referer = 'https://ff.sdo.com/web8/index.html';
+    const type = ctx.params.type ?? 'all';
 
     const type_number = {
         news: '5310',
@@ -29,8 +33,11 @@ module.exports = async (ctx) => {
         item: data.map(({ Title, Summary, Author, PublishDate, HomeImagePath }) => ({
             title: Title,
             link: Author,
-            description: `<img src="${HomeImagePath}"/><br>${Summary}`,
-            pubDate: timezone(new Date(PublishDate), +8),
+            description: art(path.join(__dirname, 'templates/description.art'), {
+                image: HomeImagePath,
+                description: Summary,
+            }),
+            pubDate: timezone(parseDate(PublishDate), +8),
         })),
     };
 };

package/lib/v2/ff14/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/global/:lang/:type?': ['chengyuhui'],
+    '/zh/:type?': ['Kiotlin', 'ZeroClad', '15x15G'],
+};

package/lib/v2/ff14/router.js

@@ -0,0 +1,7 @@
+module.exports = (router) => {
+    router.get('/global/:lang/:type?', require('./ff14_global'));
+    router.get('/zh/:type?', require('./ff14_zh'));
+    // Deprecated
+    router.get('/ff14_global/:lang/:type?', require('./ff14_global'));
+    router.get('/ff14_zh/:type?', require('./ff14_zh'));
+};

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

@@ -0,0 +1,4 @@
+{{ if image }}
+    <img src="{{ image }}"/><br>
+{{ /if }}
+{{ description }}

package/lib/v2/flyert/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/preferential': ['howel52'],
+    '/creditcard/:bank': ['nicolaszf'],
+};

package/lib/v2/flyert/preferential.js

@@ -0,0 +1,48 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const iconv = require('iconv-lite');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
+
+const gbk2utf8 = (s) => iconv.decode(s, 'gbk');
+const host = 'https://www.flyert.com';
+const target = `${host}/forum.php?mod=forumdisplay&sum=all&fid=all&catid=322`;
+
+module.exports = async (ctx) => {
+    const response = await got(target, {
+        responseType: 'buffer',
+    });
+
+    const $ = cheerio.load(gbk2utf8(response.data));
+    const list = $('.comiis_wzli')
+        .map((_index, item) => ({
+            title: $(item).find('.wzbt').text(),
+            link: `${host}/${$(item).find('.wzbt a').attr('href')}`,
+            description: $(item).find('.wznr > div:first-child').text(),
+        }))
+        .get();
+
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got(item.link, {
+                    responseType: 'buffer',
+                });
+                const content = cheerio.load(gbk2utf8(detailResponse.data));
+
+                // remove top ad
+                content('div.artical_top').remove();
+
+                item.description = content('#artMain').html();
+                item.pubDate = timezone(parseDate(content('p.xg1 > span:nth-child(1)').attr('title') || content('p.xg1').text().split('|')[0], 'YYYY-M-D HH:mm'), +8);
+                return item;
+            })
+        )
+    );
+    ctx.state.data = {
+        title: '飞客茶馆优惠',
+        link: 'https://www.flyert.com/',
+        description: '飞客茶馆优惠',
+        item: items,
+    };
+};

package/lib/v2/flyert/radar.js

@@ -0,0 +1,19 @@
+module.exports = {
+    'flyert.com': {
+        _name: '飞客茶馆',
+        '.': [
+            {
+                title: '优惠信息',
+                docs: 'https://docs.rsshub.app/travel.html#fei-ke-cha-guan-you-hui-xin-xi',
+                source: '/',
+                target: '/flyert/preferential',
+            },
+            {
+                title: '信用卡',
+                docs: 'https://docs.rsshub.app/travel.html#fei-ke-cha-guan-xin-yong-ka',
+                source: '/',
+                target: '/flyert/creditcard/:bank',
+            },
+        ],
+    },
+};

package/lib/v2/flyert/router.js

@@ -0,0 +1,4 @@
+module.exports = function (router) {
+    router.get('/preferential', require('./preferential'));
+    router.get('/creditcard/:bank', require('./creditcard'));
+};

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

@@ -13,7 +13,8 @@ async function load(link) {
 
     // 去除全文末尾多与内容
     $('.lookMore').remove();
-    $('script').remove();
+    $('script, style').remove();
+    $('#loginDialog').remove();
 
     // 修改图片中的链接
     $('ignore_js_op img').each(function () {