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

package/lib/v2/huanqiu/index.js

@@ -1,7 +1,6 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const { parseDate } = require('@/utils/parse-date');
-const timezone = require('@/utils/timezone');
 
 function getKeysRecursive(dic, key, attr, array) {
     Object.values(dic).forEach((v) => {
@@ -47,9 +46,12 @@ module.exports = async (ctx) => {
                     url: item.link,
                 });
                 const content = cheerio.load(detailResponse.data);
-                item.description = content('article').html();
+
+                item.description = content('textarea.article-content').text();
                 item.author = content('span', '.source').text();
-                item.pubDate = timezone(parseDate(content('p.time').text()), +8);
+                item.pubDate = parseDate(parseInt(content('textarea.article-time').text()));
+                item.category = content('meta[name="keywords"]').attr('content').split(',');
+
                 return item;
             })
         )

package/lib/v2/hupu/all.js

@@ -43,18 +43,18 @@ module.exports = async (ctx) => {
 
                     const videos = [];
 
-                    content('.thread-video-wrap').each(function () {
-                        videos.push(content('video').attr('src'));
-                        content(this).remove();
+                    content('.hupu-post-video').each(function () {
+                        videos.push({
+                            source: content(this).attr('src'),
+                            poster: content(this).attr('poster'),
+                        });
                     });
 
-                    content('.bbs-user-info-time span').remove();
-
-                    item.author = content('.bbs-user-info-name').first().text();
-                    item.pubDate = item.pubDate ?? timezone(parseRelativeDate(content('.bbs-user-info-time').first().text()), +8);
+                    item.author = content('.bbs-user-wrapper-content-name-span').first().text();
+                    item.pubDate = item.pubDate ?? timezone(parseRelativeDate(content('.second-line-user-info').first().text()), +8);
                     item.description = art(path.join(__dirname, 'templates/description.art'), {
                         videos,
-                        description: content('.bbs-thread-content').html(),
+                        description: content('.bbs-content').first().html(),
                     });
                 } catch (e) {
                     // no-empty

package/lib/v2/hupu/bbs.js

@@ -2,12 +2,15 @@ const got = require('@/utils/got');
 const cheerio = require('cheerio');
 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 id = ctx.params.id ?? '34';
     const order = ctx.params.order ?? '1';
 
     const rootUrl = 'https://bbs.hupu.com';
+    const apiRootUrl = 'https://games.mobileapi.hupu.com';
     const currentUrl = `${rootUrl}/${id}${order === '1' ? `-postdate` : ''}`;
 
     const response = await got({
@@ -35,7 +38,7 @@ module.exports = async (ctx) => {
         items.map((item) =>
             ctx.cache.tryGet(item.link, async () => {
                 try {
-                    const detailResponse = await got({
+                    let detailResponse = await got({
                         method: 'get',
                         url: item.link,
                     });
@@ -46,6 +49,24 @@ module.exports = async (ctx) => {
 
                     item.author = content('.post-user-comp-info-top-name').first().text();
                     item.description = content('.main-thread').first().html();
+
+                    const matches = detailResponse.data.match(/matchId=(\d+)-BATTLE_REPORT/);
+
+                    if (matches) {
+                        detailResponse = await got({
+                            method: 'get',
+                            url: `${apiRootUrl}/1/7.5.36/basketballapi/news/battleReport?relationId=${matches[1]}&relationType=BATTLE_REPORT`,
+                        });
+
+                        const result = detailResponse.data.result;
+
+                        item.description = art(path.join(__dirname, 'templates/match.art'), {
+                            image: result.img,
+                            description: result.beginContent,
+                            keyEvent: result.keyEvent,
+                            playerImage: result.playerScoreImg,
+                        });
+                    }
                 } catch (e) {
                     // no-empty
                 }

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

@@ -0,0 +1,11 @@
+{{ if videos }}
+{{ each videos video }}
+<video poster= "video.poster" controls>
+<source src="{{ video.source }}" type="video/mp4">
+</video>
+{{ /each }}
+{{ /if }}
+
+{{ if description }}
+{{@ description }}
+{{ /if }}

package/lib/v2/hupu/templates/match.art

@@ -0,0 +1,22 @@
+{{ if image }}
+<img src="{{ image }}">
+{{ /if }}
+
+{{ if description }}
+<p>{{ description }}</p>
+{{ /if }}
+
+{{ if keyEvent }}
+<h1>关键事件</h1>
+{{ each keyEvent event }}
+<p>{{ event.title }}</p>
+{{ each event.gifImgs gif }}
+<img src="{{ gif }}">
+{{ /each }}
+{{ /each }}
+{{ /if }}
+
+{{ if playerImage }}
+<h1>球员评分</h1>
+<img src="{{ playerImage }}">
+{{ /if }}

package/lib/v2/huxiu/briefColumn.js

@@ -0,0 +1,51 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate, parseRelativeDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const { id } = ctx.params;
+    const link = `https://api-brief.huxiu.com/briefColumn/getContentListByCategoryId`;
+    const response = await got
+        .post(link, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+            },
+            body: `platform=www&brief_column_id=${id}&last_id=`,
+        })
+        .json();
+
+    const list = response.data.datalist;
+
+    const items = await Promise.all(
+        list.map((item) => {
+            const link = `https://www.huxiu.com/brief/${item.brief_id}`;
+
+            return ctx.cache.tryGet(link, async () => {
+                const detailResponse = await got(link);
+                const $ = cheerio.load(detailResponse.data);
+
+                const description = $('#js-part').html();
+
+                return {
+                    title: item.title,
+                    pubDate: item.format_publish_time.includes('前') ? parseRelativeDate(item.format_publish_time) : parseDate(item.format_publish_time),
+                    description,
+                    link,
+                };
+            });
+        })
+    );
+
+    const title = async () => {
+        const res = await got(`https://www.huxiu.com/briefColumn/${id}.html`);
+        const $ = cheerio.load(res.data);
+
+        return $('#top > div:nth-child(1) > div > div.brief-content__name').text();
+    };
+
+    ctx.state.data = {
+        title: `虎嗅 - ${await title()}`,
+        link: `https://www.huxiu.com/briefColumn/${id}.html`,
+        item: items,
+    };
+};

package/lib/v2/huxiu/maintainer.js

@@ -2,6 +2,7 @@ module.exports = {
     '/article': ['HenryQW'],
     '/author/:id': ['HenryQW'],
     '/collection/:id': ['AlexdanerZe'],
+    '/moment': ['nczitzk'],
     '/tag/:id': ['xyqfer', 'HenryQW'],
     '/search/:keyword': ['xyqfer', 'HenryQW'],
 };

package/lib/v2/huxiu/moment.js

@@ -0,0 +1,40 @@
+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 rootUrl = 'https://www.huxiu.com';
+    const currentUrl = `${rootUrl}/moment`;
+    const apiRootUrl = 'https://moment-api.huxiu.com';
+    const apiUrl = `${apiRootUrl}/web-v2/moment/feed`;
+
+    const response = await got({
+        method: 'post',
+        url: apiUrl,
+        form: {
+            last_dateline: parseInt(new Date().getTime() / 1000),
+            platform: 'www',
+            is_ai: 0,
+        },
+    });
+
+    const items = response.data.data.moment_list.datalist[0].datalist.map((item) => ({
+        title: item.content,
+        link: item.share_url,
+        author: item.user_info.username,
+        pubDate: parseDate(item.publish_time * 1000),
+        description: art(path.join(__dirname, 'templates/moment.art'), {
+            description: item.content,
+            images: item.img_urls,
+            video: item.video,
+            comments: item.comment,
+        }),
+    }));
+
+    ctx.state.data = {
+        title: '虎嗅 - 24小时',
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/huxiu/radar.js

@@ -8,6 +8,12 @@ module.exports = {
                 source: ['/article', '/'],
                 target: '/huxiu/article',
             },
+            {
+                title: '24小时',
+                docs: 'https://docs.rsshub.app/new-media.html#hu-xiu',
+                source: ['/moment', '/'],
+                target: '/huxiu/moment',
+            },
             {
                 title: '标签',
                 docs: 'https://docs.rsshub.app/new-media.html#hu-xiu',
@@ -30,6 +36,12 @@ module.exports = {
                 source: ['/collection/:id', '/'],
                 target: (params) => `/huxiu/collection/${params.id.replace('.html', '')}`,
             },
+            {
+                title: '简报',
+                docs: 'https://docs.rsshub.app/new-media.html#hu-xiu',
+                source: ['/briefColumn/:id', '/'],
+                target: (params) => `/huxiu/briefcolumn/${params.id.replace('.html', '')}`,
+            },
         ],
     },
 };

package/lib/v2/huxiu/router.js

@@ -2,6 +2,8 @@ module.exports = (router) => {
     router.get('/article', require('./article'));
     router.get('/author/:id', require('./author'));
     router.get('/collection/:id', require('./collection'));
+    router.get('/moment', require('./moment'));
     router.get('/tag/:id', require('./tag'));
     router.get('/search/:keyword', require('./search'));
+    router.get('/briefcolumn/:id', require('./briefColumn'));
 };

package/lib/v2/huxiu/templates/moment.art

@@ -0,0 +1,16 @@
+{{@ description }}
+{{ if images }}
+{{ each images image }}
+<img src="{{ image.origin_pic }}" width="{{ image.origin_width }}" height="{{ image.origin_height }}">
+{{ /each }}
+{{ /if }}
+{{ if video }}
+<video width="{{ video.width }}" height="{{ video.height }}" poster="{{ video.cover_path }}" controls>
+  <source src="{{ video.url }}" type="video/{{ video.format }}">
+</video>
+{{ /if }}
+{{ if comments }}
+{{ each comments.datalist comment }}
+<p>{{ comment.user_info.username }}: {{ comment.content }} ({{ comment.show_time }})</p>
+{{ /each }}
+{{ /if }}

package/lib/v2/ifeng/maintainer.js

@@ -1,3 +1,4 @@
 module.exports = {
     '/feng/:id/:type': ['Jamch'],
+    '/news/:path?': ['nczitzk'],
 };

package/lib/v2/ifeng/news.js

@@ -0,0 +1,54 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+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 limit = ctx.query.limit ? parseInt(ctx.query.limit) : 20;
+
+    const rootUrl = 'https://news.ifeng.com';
+    const currentUrl = `${rootUrl}${ctx.path.replace(/^\/news/, '')}`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    const newsStream = JSON.parse(response.data.match(/"newsstream":(\[.*?\]),"cooperation"/)[1]);
+
+    let items = newsStream.slice(0, limit).map((item) => ({
+        title: item.title,
+        link: item.url,
+        pubDate: timezone(parseDate(item.newsTime), +8),
+        description: item.thumbnails.image.pop(),
+    }));
+
+    items = await Promise.all(
+        items.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+
+                item.author = detailResponse.data.match(/"editorName":"(.*?)",/)[1];
+                item.category = detailResponse.data.match(/},"keywords":"(.*?)",/)[1].split(',');
+                item.description = art(path.join(__dirname, 'templates/description.art'), {
+                    image: item.description,
+                    description: JSON.parse(detailResponse.data.match(/"contentList":(\[.*?\]),/)[1]).map((content) => content.data),
+                });
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: $('title').text(),
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/ifeng/radar.js

@@ -7,5 +7,12 @@ module.exports = {
                 docs: 'https://docs.rsshub.app/new-media.html#feng-huang-wang',
             },
         ],
+        news: [
+            {
+                title: '资讯',
+                docs: 'https://docs.rsshub.app/new-media.html#feng-huang-wang-zi-xun',
+                target: (params, url) => `/ifeng/news${new URL(url).toString().match(/ifeng\.com(.*?)$/)[1]}`,
+            },
+        ],
     },
 };

package/lib/v2/ifeng/router.js

@@ -1,3 +1,4 @@
 module.exports = (router) => {
     router.get('/feng/:id/:type', require('./feng'));
+    router.get(/news([\w-/]+)?/, require('./news'));
 };

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

@@ -0,0 +1,16 @@
+{{ if image }}
+<figure>
+    <img src="{{ image.url }}" height="{{ image.height }}" width="{{ image.width }}">
+</figure>
+{{ /if }}
+{{ if description }}
+{{ each description d }}
+{{ if d.attachmentType === 'video' }}
+<video controls poster="{{ d.bigPosterUrl }}">
+    <source src="{{ d.playUrl }}">
+</video>
+{{ else }}
+{{@ d.replace(/data-lazyload=/g, 'src=') }}
+{{ /if }}
+{{ /each }}
+{{ /if }}

package/lib/v2/indiansinkuwait/latest.js

@@ -0,0 +1,43 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+const baseUrl = 'https://www.indiansinkuwait.com';
+
+module.exports = async (ctx) => {
+    const { data: response } = await got(`${baseUrl}/latest-news`);
+    const $ = cheerio.load(response);
+
+    const list = $('.paragraphs .span4')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            return {
+                title: item.find('.content-heading h6 a').text().trim(),
+                link: baseUrl + item.find('a').attr('href'),
+            };
+        });
+
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const { data: response } = await got(item.link);
+                const $ = cheerio.load(response);
+
+                item.pubDate = parseDate($('#ctl00_ContentPlaceHolder1_SpanAuthor').text());
+                $('#newsdetails h3, #ctl00_ContentPlaceHolder1_SpanAuthor, .noprint, [id^=div-gpt-ad]').remove();
+                item.description = $('#newsdetails').html();
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: $('head title').text(),
+        description: $('head meta[name="description"]').attr('content'),
+        image: 'https://www.indiansinkuwait.com/apple-touch-icon-152x152-precomposed.png',
+        link: `${baseUrl}/latest-news`,
+        item: items,
+    };
+};

package/lib/v2/indiansinkuwait/maintainer.js

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

package/lib/v2/indiansinkuwait/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'indiansinkuwait.com': {
+        _name: 'Indians in Kuwait',
+        '.': [
+            {
+                title: 'News',
+                docs: 'https://docs.rsshub.app/en/new-media.html#indians-in-kuwait',
+                source: ['/latest-news', '/'],
+                target: '/indiansinkuwait/latest',
+            },
+        ],
+    },
+};

package/lib/v2/indiansinkuwait/router.js

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

package/lib/v2/iresearch/maintainer.js

@@ -1,3 +1,4 @@
 module.exports = {
     '/report': ['brilon', 'Fatpandac'],
+    '/weekly/:category?': ['nczitzk'],
 };

package/lib/v2/iresearch/radar.js

@@ -4,10 +4,16 @@ module.exports = {
         www: [
             {
                 title: '研究报告',
-                docs: 'https://docs.rsshub.app/journal.html#ieee-xplore',
+                docs: 'https://docs.rsshub.app/other.html#ai-rui-chan-ye-yan-jiu-bao-gao',
                 source: ['/report.shtml'],
                 target: '/iresearch/report',
             },
+            {
+                title: '周度市场观察',
+                docs: 'https://docs.rsshub.app/other.html#ai-rui-zhou-du-shi-chang-guan-cha',
+                source: ['/report.shtml?type=3', ''],
+                target: '/iresearch/weekly/:category',
+            },
         ],
     },
 };

package/lib/v2/iresearch/router.js

@@ -1,3 +1,4 @@
 module.exports = function (router) {
     router.get('/report', require('./report'));
+    router.get('/weekly/:category?', require('./weekly'));
 };

package/lib/v2/iresearch/templates/weekly.art

@@ -0,0 +1,11 @@
+{{ if cover }}
+<img src="{{ cover }}"
+{{ /if }}
+{{ if content }}
+<p>{{ content }}</p>
+{{ /if }}
+{{ if pages }}
+<% for (let i = 1; i <= pages; i++){ %>
+<img src="https://pic.iresearch.cn/ireport/{{ id }}/{{ i }}.jpg">
+<% } %>
+{{ /if }}

package/lib/v2/iresearch/weekly.js

@@ -0,0 +1,39 @@
+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 category = ctx.params.category ?? '';
+
+    const rootUrl = 'https://www.iresearch.com.cn';
+    const currentUrl = `${rootUrl}/report.shtml?type=4`;
+    const apiUrl = `${rootUrl}/api/json/report/ireport.json`;
+
+    const response = await got({
+        method: 'get',
+        url: apiUrl,
+    });
+
+    const items = JSON.parse(response.data.slice(1))
+        .slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 200)
+        .filter((item) => (category ? item.classname === category : true))
+        .map((item) => ({
+            title: item.reportname,
+            pubDate: parseDate(item.addtime),
+            link: `${rootUrl}/report/detail?id=${item.id}`,
+            category: [item.classname].concat(item.keywords.split(',')),
+            description: art(path.join(__dirname, 'templates/weekly.art'), {
+                id: item.id,
+                cover: item.reportpic,
+                content: item.shortcoutent,
+                pages: item.PagesCount,
+            }),
+        }));
+
+    ctx.state.data = {
+        title: '艾瑞咨询 - 周度市场观察',
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/islander/maintainer.js

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

package/lib/v2/islander/radar.js

@@ -0,0 +1,19 @@
+module.exports = {
+    'islander.cc': {
+        _name: '島民衛星 Islander',
+        '.': [
+            {
+                title: '事件分析',
+                docs: 'https://docs.rsshub.app/new-media.html#dao-min-wei-xing-islander',
+                source: ['/'],
+                target: '/islander/search',
+            },
+            {
+                title: '單日焦點',
+                docs: 'https://docs.rsshub.app/new-media.html#dao-min-wei-xing-islander',
+                source: ['/top30event', '/'],
+                target: '/islander/top30event',
+            },
+        ],
+    },
+};

package/lib/v2/islander/router.js

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

package/lib/v2/islander/search.js

@@ -0,0 +1,33 @@
+const got = require('@/utils/got');
+const dayjs = require('dayjs');
+const { parseDate } = require('@/utils/parse-date');
+const baseUrl = 'https://islander.cc';
+
+module.exports = async (ctx) => {
+    const today = dayjs();
+    const startDate = today.subtract(13, 'day').format('YYYY-MM-DD');
+    const endDate = today.format('YYYY-MM-DD');
+    const { data: response } = await got(`${baseUrl}/api/v2/search`, {
+        searchParams: {
+            query: '',
+            searchType: 'event',
+            startDate,
+            endDate,
+        },
+    });
+
+    const items = response.rankingEvents.map((item) => ({
+        title: item.title,
+        link: `${baseUrl}/events/${item.groupId}`,
+        pubDate: parseDate(item.date),
+        category: [item.category, ...item.tags],
+    }));
+
+    ctx.state.data = {
+        title: `事件分析 | 島民衛星 Islander`,
+        description: `島民衛星為台灣⼈工智慧實驗室所開發之新聞資訊平台，旨在運用 AI 提供民眾便於接觸各類議題與各類媒體之平台，並呈現各家媒體特色以協助民眾自主選擇。`,
+        link: `${baseUrl}/?query=&searchType=event&startDate=${startDate}&endDate=${endDate}`,
+        image: 'https://islander.cc/islander_og_image.png',
+        item: items,
+    };
+};

package/lib/v2/islander/top30event.js

@@ -0,0 +1,28 @@
+const got = require('@/utils/got');
+const dayjs = require('dayjs');
+
+const baseUrl = 'https://islander.cc';
+
+module.exports = async (ctx) => {
+    const today = dayjs().format('YYYY-MM-DD');
+    const { data: response } = await got(`${baseUrl}/api/v1/events/top30`, {
+        searchParams: {
+            date: today,
+        },
+    });
+
+    const items = response.eventList.map((item) => ({
+        title: item.eventTitle,
+        description: JSON.parse(item.eventSummary).join('<br>'),
+        link: `${baseUrl}/events/${item.eventId}`,
+        category: [item.news_category, ...item.tags],
+    }));
+
+    ctx.state.data = {
+        title: `${today} Top 30 熱門事件 | 島民衛星 Islander`,
+        description: `${today} 這天前三十熱門的事件`,
+        link: `${baseUrl}/top30event`,
+        image: 'https://islander.cc/islander_og_image.png',
+        item: items,
+    };
+};

package/lib/v2/ithome/maintainer.js

@@ -1,6 +1,7 @@
 module.exports = {
     '/ranking/:type': ['immmortal', 'luyuhuang'],
     '/tag/:name': ['Fatpandac'],
+    '/tw/feeds/:category': ['miles170'],
     '/zt/:id': ['nczitzk'],
     '/:caty': ['luyuhuang'],
 };