rsshub 1.0.0-master.fe69819 → 1.0.0-master.fee75c6

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

@@ -0,0 +1,76 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const category = ctx.params.category ?? 'feature-stories';
+    const language = ctx.params.language ?? '';
+
+    const rootUrl = 'https://www.who.int';
+    const currentUrl = `${rootUrl}/${language ? `${language}/` : ''}news-room/${category}`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    let list = $('.list-view--item a');
+
+    if (list.length === 0) {
+        const response = await got({
+            method: 'get',
+            url: `${rootUrl}/api/hubs/${category.replace(/-/g, '')}?sf_culture=zh&$orderby=PublicationDateAndTime%20desc&$select=Title,PublicationDateAndTime,ItemDefaultUrl&$top=30`,
+        });
+
+        list = response.data.value.map((item) => ({
+            title: item.Title,
+            link: `${currentUrl}/detail/${item.ItemDefaultUrl}`,
+            pubDate: parseDate(item.PublicationDateAndTime),
+        }));
+    } else {
+        list = list
+            .map((_, item) => {
+                item = $(item);
+                const link = item.attr('href');
+
+                return {
+                    link: `${link.indexOf('http') === 0 ? '' : 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 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);
+
+                        item.description = content('.sf-content-block').html();
+                    }
+
+                    return item;
+                })
+        )
+    );
+
+    ctx.state.data = {
+        title: `${$('meta[property="og:title"]').attr('content')} - WHO`,
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/{routes → v2}/who/news.js

@@ -2,7 +2,7 @@ const got = require('@/utils/got');
 const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
-    const language = ctx.params.language || 'en';
+    const language = ctx.params.language ?? 'en';
 
     const rootUrl = 'https://www.who.int';
     const currentUrl = `${rootUrl}/${language === 'en' ? '' : `${language}/`}news`;

package/lib/v2/who/radar.js

@@ -0,0 +1,25 @@
+module.exports = {
+    'who.int': {
+        _name: '世界卫生组织 WHO',
+        '.': [
+            {
+                title: '新闻稿',
+                docs: 'https://docs.rsshub.app/government.html#shi-jie-wei-sheng-zu-zhi-who',
+                source: '/news',
+                target: '/who/news',
+            },
+            {
+                title: '媒体中心',
+                docs: 'https://docs.rsshub.app/government.html#shi-jie-wei-sheng-zu-zhi-who',
+                source: '/news-room/:type',
+                target: '/who/news-room/:type',
+            },
+            {
+                title: '总干事的讲话',
+                docs: 'https://docs.rsshub.app/government.html#shi-jie-wei-sheng-zu-zhi-who',
+                source: '/director-general/speeches',
+                target: '/who/speeches',
+            },
+        ],
+    },
+};

package/lib/v2/who/router.js

@@ -0,0 +1,5 @@
+module.exports = (router) => {
+    router.get('/news/:language?', require('./news'));
+    router.get('/news-room/:category?/:language?', require('./news-room'));
+    router.get('/speeches/:language?', require('./speeches'));
+};

package/lib/v2/wikinews/index.js

@@ -0,0 +1,43 @@
+const got = require('@/utils/got');
+const { parseString } = require('xml2js');
+const cheerio = require('cheerio');
+const currentURL = 'https://zh.wikinews.org/wiki/Special:%E6%96%B0%E9%97%BB%E8%AE%A2%E9%98%85';
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const resp = await got(currentURL);
+    const {
+        urlset: { url: urls },
+    } = await new Promise((resolve, reject) => {
+        parseString(resp.data, (err, result) => {
+            if (err) {
+                reject(err);
+                return;
+            }
+            resolve(result);
+        });
+    });
+
+    ctx.state.data = {
+        title: '最新新闻 - 维基新闻',
+        link: currentURL,
+        item: await Promise.all(
+            urls.map(async (url) => {
+                const loc = url.loc[0];
+                const news = url['news:news'][0];
+                const description = await ctx.cache.tryGet(loc, async () => {
+                    const resp = await got(loc);
+                    const $ = cheerio.load(resp.data);
+                    return $('#bodyContent').html();
+                });
+                return {
+                    title: news['news:title'][0],
+                    pubDate: parseDate(news['news:publication_date'][0]),
+                    category: news['news:keywords'][0].split(',').map((item) => item.trim()),
+                    link: loc,
+                    description,
+                };
+            })
+        ),
+    };
+};

package/lib/v2/wikinews/maintainer.js

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

package/lib/v2/wikinews/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'wikinews.org': {
+        _name: '维基新闻',
+        zh: [
+            {
+                title: '最新新闻',
+                docs: 'https://docs.rsshub.app/new-media.html#wei-ji-xin-wen',
+                source: ['/wiki/Special:新闻订阅'],
+                target: '/wikinews/latest',
+            },
+        ],
+    },
+};

package/lib/v2/wikinews/router.js

@@ -0,0 +1,4 @@
+const routerIndex = require('./index');
+module.exports = function (router) {
+    router.get('/latest', routerIndex);
+};

package/lib/{routes → v2}/wsj/index.js

@@ -1,6 +1,7 @@
 const parser = require('@/utils/rss-parser');
 const cheerio = require('cheerio');
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
 
 const categoryToXMLFileName = {
     opinion: 'RSSOpinion.xml',
@@ -57,7 +58,7 @@ module.exports = async (ctx) => {
                 });
                 const html = response.body;
                 const $ = cheerio.load(html);
-                const content = $('.articleBody > div[amp-access="access"]');
+                const content = $('.articleBody > section');
 
                 // Cover
                 const cover = $('.articleLead > div.is-lead-inset > div.header > .img-header > div.image-container > amp-img > img');
@@ -73,6 +74,7 @@ module.exports = async (ctx) => {
                 // Metadata (categories & updatedAt)
                 const updatedAt = $('meta[itemprop="dateModified"]').attr('content');
                 const publishedAt = $('meta[itemprop="datePublished"]').attr('content');
+                const author = $('.author > a[rel="author"]').html();
 
                 const categories = $('meta[name="keywords"]')
                     .attr('content')
@@ -113,9 +115,9 @@ module.exports = async (ctx) => {
                 return {
                     title: item.title,
                     id: item.guid,
-                    pubDate: new Date(publishedAt).toUTCString(),
-                    updated: new Date(updatedAt).toUTCString(),
-                    author: item.creator,
+                    pubDate: parseDate(publishedAt),
+                    updated: parseDate(updatedAt),
+                    author,
                     link: item.link,
                     summary,
                     description: content.html(),

package/lib/v2/wsj/maintainer.js

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

package/lib/v2/wsj/radar.js

@@ -0,0 +1,21 @@
+module.exports = {
+    'wsj.com': {
+        _name: '华尔街日报 The Wall Street Journal (WSJ)',
+        cn: [
+            {
+                title: '新闻',
+                docs: 'https://docs.rsshub.app/traditional-media.html#hua-er-jie-ri-bao-the-wall-street-journal-wsj',
+                souce: '/',
+                target: '/wsj/zh-cn',
+            },
+        ],
+        www: [
+            {
+                title: '新闻',
+                docs: 'https://docs.rsshub.app/traditional-media.html#hua-er-jie-ri-bao-the-wall-street-journal-wsj',
+                souce: '/',
+                target: '/wsj/en-us',
+            },
+        ],
+    },
+};

package/lib/v2/wsj/router.js

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

package/lib/v2/xiaoyuzhou/maintainer.js

@@ -1,4 +1,4 @@
 module.exports = {
     '/': ['prnake', 'Maecenas'],
-    '/podcast/:id': ['hondajojo'],
+    '/podcast/:id': ['hondajojo', 'jtsang4'],
 };

package/lib/v2/xiaoyuzhou/podcast.js

@@ -21,7 +21,7 @@ module.exports = async (ctx) => {
         link: `https://www.xiaoyuzhoufm.com/episode/${item.eid}`,
         pubDate: parseDate(item.pubDate),
         description: item.shownotes,
-        itunes_item_image: item.image.smallPicUrl,
+        itunes_item_image: (item.image || item.podcast?.image)?.smallPicUrl,
     }));
 
     ctx.state.data = {

package/lib/v2/xmanhua/index.js

@@ -0,0 +1,74 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const uid = ctx.params.uid;
+    const host = 'https://xmanhua.com';
+    const url = `https://xmanhua.com/${uid}/`;
+    const response = await got({
+        method: 'get',
+        url,
+        headers: {
+            Referer: host,
+        },
+    });
+
+    const data = response.data;
+    const $ = cheerio.load(data);
+    const list = $('div #chapterlistload').find('.detail-list-form-item');
+    // 作者
+    const autherName = $('body > div.detail-info-1 > div > div > p.detail-info-tip > span:nth-child(1)').text().split('：')[1];
+    // 检查漫画是否已经完结
+    const finished_text = $('div.detail-list-form-title').clone().children().remove().end().text();
+    let finished = false;
+    let newOneDate = finished_text.split(',')[1];
+    if (newOneDate.includes('月') && newOneDate.includes('號')) {
+        const month = parseInt(newOneDate.split('月')[0]);
+        const date = parseInt(newOneDate.split('月')[1].split('號')[0]);
+        const year = new Date().getFullYear();
+        newOneDate = new Date(year, month - 1, date + 1);
+    } else {
+        newOneDate = new Date(newOneDate);
+        newOneDate.setDate(newOneDate.getDate() + 1);
+    }
+    if (finished_text.includes('已完結') || finished_text.includes('已完结')) {
+        finished = true;
+    }
+    // 最新一话的地址
+    const updatedOne = $('div.detail-list-form-title span.s a').attr('href');
+    const items = list
+        .map((index, item) => {
+            item = $(item);
+            const itemTitle = item.text();
+            const itemUrl = item.attr('href');
+            let itemDate;
+            if (itemUrl === updatedOne) {
+                itemDate = parseDate(newOneDate);
+            } else {
+                itemDate = '';
+            }
+            return {
+                title: itemTitle,
+                link: host + itemUrl,
+                auther: autherName,
+                pubDate: itemDate,
+                guid: host + itemUrl,
+            };
+        })
+        .get();
+    const name = $('body > div.detail-info-1 > div > div > p.detail-info-title').text();
+    let description_ = '';
+    if (finished) {
+        description_ = '已完结';
+    } else {
+        description_ = '连载中';
+    }
+    ctx.state.data = {
+        title: `x漫画  ${name}`,
+        link: `https://xmanhua.com/${uid}`,
+        description: description_,
+        allowEmpty: true,
+        item: items,
+    };
+};

package/lib/v2/xmanhua/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'xmanhua.com': {
+        _name: 'X 漫画',
+        '.': [
+            {
+                title: '最新动态',
+                docs: 'https://docs.rsshub.app/anime.html#x-man-hua',
+                source: ['/:uid'],
+                target: '/xmanhua/:uid',
+            },
+        ],
+    },
+};

package/lib/v2/xmanhua/router.js

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

package/lib/{routes → v2}/zhibo8/forum.js

@@ -1,5 +1,7 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
 
 module.exports = async (ctx) => {
     const id = ctx.params.id;
@@ -13,7 +15,7 @@ module.exports = async (ctx) => {
 
     const out = await Promise.all(
         list
-            .map(async (index, item) => {
+            .map(async (_, item) => {
                 item = $(item);
                 const title = item.find('td:nth-child(1) > a:nth-child(2)').text();
                 const author = item.find('td:nth-child(2) cite a').text();
@@ -24,25 +26,15 @@ module.exports = async (ctx) => {
                     title,
                     author,
                     link,
-                    pubDate: new Date(date).toUTCString(),
+                    pubDate: timezone(parseDate(date, 'YYYY-MM-DD HH:mm'), +8),
                 };
 
-                const key = link;
-                const value = await ctx.cache.get(key);
-                if (value) {
-                    single.description = value;
-                } else {
+                single.description = await ctx.cache.tryGet(link, async () => {
                     const response = await got.get(link);
                     const $ = cheerio.load(response.data);
-                    $('.detail_ent img').each(function () {
-                        const $img = $(this);
-                        const src = $img.attr('src');
-                        $img.attr('src', 'https:' + src);
-                    });
-                    single.description = $('.detail_ent').html();
-                    ctx.cache.set(key, single.description);
-                }
-                return Promise.resolve(single);
+                    return $('.detail_ent').html();
+                });
+                return single;
             })
             .get()
     );

package/lib/v2/zhibo8/maintainer.js

@@ -0,0 +1,5 @@
+module.exports = {
+    '/forum/:id': ['LogicJake'],
+    '/more/:category?': ['nczitzk'],
+    '/post/:id': ['LogicJake'],
+};

package/lib/v2/zhibo8/more.js

@@ -0,0 +1,82 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const timezone = require('@/utils/timezone');
+const { parseDate } = require('@/utils/parse-date');
+
+const categories = {
+    nba: 'NBA',
+    zuqiu: '足球',
+    dianjing: '电竞',
+    other: '综合',
+};
+
+module.exports = async (ctx) => {
+    const category = ctx.params.category ?? 'nba';
+
+    const rootUrl = 'https://news.zhibo8.cc';
+
+    let list,
+        apiUrl = '',
+        currentUrl = '',
+        response;
+
+    if (category === 'nba' || category === 'zuqiu') {
+        currentUrl = `${rootUrl}/${category}/more.htm`;
+
+        response = await got({
+            method: 'get',
+            url: currentUrl,
+        });
+
+        const $ = cheerio.load(response.data);
+
+        list = $('ul.articleList li')
+            .slice(0, 30)
+            .map((_, item) => {
+                item = $(item);
+                const a = item.find('a');
+
+                return {
+                    title: a.text(),
+                    link: `http:${a.attr('href')}`,
+                    pubDate: timezone(parseDate(item.find('span.postTime').text()), +8),
+                };
+            })
+            .get();
+    } else {
+        currentUrl = `${rootUrl}/${category}`;
+        apiUrl = `https://api.qiumibao.com/application/app/index.php?_url=/news/${category}List`;
+
+        response = await got({
+            method: 'get',
+            url: apiUrl,
+        });
+
+        list = response.data.data.list.map((item) => ({
+            title: item.title,
+            link: `https:${item.url}`,
+            pubDate: timezone(parseDate(item.createtime), +8),
+        }));
+    }
+
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const res = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+                const content = cheerio.load(res.data);
+
+                item.description = content('div.content').html();
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: `${categories[category]} - 直播吧`,
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/{routes → v2}/zhibo8/post.js

@@ -26,7 +26,7 @@ module.exports = async (ctx) => {
                     guid: floor,
                 };
 
-                return Promise.resolve(single);
+                return single;
             })
             .get()
     );

package/lib/v2/zhibo8/radar.js

@@ -0,0 +1,27 @@
+module.exports = {
+    'zhibo8.cc': {
+        _name: '直播吧',
+        bbs: [
+            {
+                title: '子论坛',
+                docs: 'https://docs.rsshub.app/bbs.html#zhi-bo-ba',
+                source: ['/'],
+                target: (_params, url) => `/zhibo8/forum/${new URL(url).searchParams.get('fid')}`,
+            },
+            {
+                title: '回帖',
+                docs: 'https://docs.rsshub.app/bbs.html#zhi-bo-ba',
+                source: ['/'],
+                target: (_params, url) => `/zhibo8/post/${new URL(url).searchParams.get('tid')}`,
+            },
+        ],
+        news: [
+            {
+                title: '滚动新闻',
+                docs: 'https://docs.rsshub.app/bbs.html#zhi-bo-ba',
+                source: ['/:category'],
+                target: '/zhibo8/more/:category',
+            },
+        ],
+    },
+};

package/lib/v2/zhibo8/router.js

@@ -0,0 +1,5 @@
+module.exports = (router) => {
+    router.get('/forum/:id', require('./forum'));
+    router.get('/more/:category?', require('./more'));
+    router.get('/post/:id', require('./post'));
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsshub",
-  "version": "1.0.0-master.fe69819",
+  "version": "1.0.0-master.fee75c6",
   "description": "Make RSS Great Again!",
   "main": "lib/pkg.js",
   "files": [
@@ -50,11 +50,11 @@
     "@vuepress/plugin-pwa": "1.9.7",
     "ci-info": "3.3.0",
     "cross-env": "7.0.3",
-    "eslint": "8.9.0",
-    "eslint-config-prettier": "8.3.0",
+    "eslint": "8.10.0",
+    "eslint-config-prettier": "8.5.0",
     "eslint-plugin-prettier": "4.0.0",
     "eslint-plugin-yml": "0.14.0",
-    "fs-extra": "10.0.0",
+    "fs-extra": "10.0.1",
     "jest": "27.5.1",
     "mockdate": "3.0.5",
     "nock": "13.2.4",
@@ -78,7 +78,7 @@
   "dependencies": {
     "@koa/router": "10.1.1",
     "@postlight/mercury-parser": "2.2.1",
-    "@sentry/node": "6.17.9",
+    "@sentry/node": "6.18.1",
     "aes-js": "3.1.2",
     "art-template": "4.13.2",
     "bbcodejs": "0.0.4",
@@ -87,7 +87,7 @@
     "city-timezones": "1.2.0",
     "crypto-js": "4.1.1",
     "currency-symbol-map": "5.0.1",
-    "dayjs": "1.10.7",
+    "dayjs": "1.10.8",
     "dotenv": "16.0.0",
     "emailjs-imap-client": "3.1.0",
     "entities": "3.0.1",
@@ -118,11 +118,11 @@
     "parse-torrent": "9.1.4",
     "pidusage": "3.0.0",
     "plist": "3.0.4",
-    "puppeteer": "11.0.0",
+    "puppeteer": "13.4.1",
     "query-string": "7.1.1",
     "require-all": "3.0.0",
     "rss-parser": "3.12.0",
-    "showdown": "2.0.0",
+    "showdown": "2.0.1",
     "simplecc-wasm": "0.1.4",
     "socks-proxy-agent": "6.1.1",
     "string-similarity": "4.0.4",
@@ -131,7 +131,8 @@
     "tough-cookie": "4.0.0",
     "tunnel": "0.0.6",
     "twit": "2.2.11",
-    "winston": "3.5.1"
+    "winston": "3.6.0",
+    "xml2js": "0.4.23"
   },
   "jest": {
     "testMatch": [