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

package/lib/v2/zhitongcaijing/index.js

@@ -0,0 +1,118 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+const ids = {
+    recommend: {
+        url: 'content/recommend',
+        title: '推荐',
+    },
+    hkstock: {
+        url: 'content/hkstock',
+        title: '港股',
+    },
+    meigu: {
+        url: 'content/meigu',
+        title: '美股',
+    },
+    agu: {
+        url: 'content/agu',
+        title: '沪深',
+    },
+    ct: {
+        url: 'content/ct',
+        title: '创投',
+    },
+    esg: {
+        url: 'content/esg',
+        title: 'ESG',
+    },
+    aqs: {
+        url: 'content/aqs',
+        title: '券商',
+    },
+    ajj: {
+        url: 'content/ajj',
+        title: '基金',
+    },
+    focus: {
+        url: 'focus',
+        title: '要闻',
+    },
+    announcement: {
+        url: 'announcement',
+        title: '公告',
+    },
+    research: {
+        url: 'research',
+        title: '研究',
+    },
+    shares: {
+        url: 'shares',
+        title: '新股',
+    },
+    bazaar: {
+        url: 'bazaar',
+        title: '市场',
+    },
+    company: {
+        url: 'company',
+        title: '公司',
+    },
+};
+
+module.exports = async (ctx) => {
+    const id = ctx.params.id ?? 'recommend';
+    const category = ctx.params.category ?? '';
+
+    const limit = ctx.query.limit ? parseInt(ctx.query.limit) : 20;
+
+    const rootUrl = 'https://www.zhitongcaijing.com';
+    const currentUrl = `${rootUrl}/${ids[id].url}.html${category === '' ? '' : `?category_key=${category}`}`;
+    const apiUrl = `${rootUrl}/${ids[id].url}.html?data_type=1&page=1${category === '' ? '' : `&category_key=${category}`}`;
+
+    const response = await got({
+        method: 'get',
+        url: apiUrl,
+    });
+
+    let items = response.data.data.slice(0, limit).map((item) => ({
+        title: item.title,
+        link: `${rootUrl}${item.url}`,
+        description: item.digest,
+        author: item.author_info.author_name,
+        pubDate: parseDate((item.create_time ?? parseInt(item.original_time)) * 1000),
+        category: (item.keywords?.split(',') ?? []).concat([item.category_name ?? item.type_tag]),
+    }));
+
+    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('#subscribe-vip-box').remove();
+                content('#news-content').remove();
+
+                item.description = art(path.join(__dirname, 'templates/description.art'), {
+                    digest: content('.digetst-box').html() || content('.telegram-origin-contentn').html(),
+                    description: content('.news-body-content').html(),
+                });
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: `智通财经 - ${ids[id].title}`,
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/zhitongcaijing/maintainer.js

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

package/lib/v2/zhitongcaijing/radar.js

@@ -0,0 +1,17 @@
+module.exports = {
+    'zhitongcaijing.com': {
+        _name: '智通财经',
+        '.': [
+            {
+                title: '资讯',
+                docs: 'https://docs.rsshub.app/finance.html#zhi-tong-cai-jing-zi-xun',
+                source: ['/:category', '/'],
+                target: (params, url) => {
+                    const id = new URL(url).toString().match(/\/(\w+)\.html/)[1];
+                    const category = new URL(url).searchParams.get('category_key');
+                    return `/zhitongcaijing/${id}${category ? `/${category}` : ''}`;
+                },
+            },
+        ],
+    },
+};

package/lib/v2/zhitongcaijing/router.js

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

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

@@ -0,0 +1,6 @@
+{{ if digest }}
+{{@ digest }}
+{{ /if }}
+{{ if description }}
+{{@ description }}
+{{ /if }}

package/lib/v2/zju/grs/index.js

@@ -1,15 +1,16 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
 
 const host = 'http://www.grs.zju.edu.cn/';
 
 const map = new Map([
-    [1, { title: '浙大研究生院 -- 全部公告', tag: '1335' }],
-    [2, { title: '浙大研究生院 -- 教学管理', tag: '1336' }],
-    [3, { title: '浙大研究生院 -- 各类资助', tag: '1337' }],
-    [4, { title: '浙大研究生院 -- 学科建设', tag: '1338' }],
-    [5, { title: '浙大研究生院 -- 海外交流', tag: '1339' }],
+    [1, { title: '浙大研究生院 -- 全部公告', tag: 'qbgg' }],
+    [2, { title: '浙大研究生院 -- 教学管理', tag: 'jxgl' }],
+    [3, { title: '浙大研究生院 -- 各类资助', tag: 'glzz' }],
+    [4, { title: '浙大研究生院 -- 学科建设', tag: 'xkjs' }],
+    [5, { title: '浙大研究生院 -- 海外交流', tag: 'hwjl' }],
 ]);
 
 module.exports = async (ctx) => {
@@ -19,7 +20,7 @@ module.exports = async (ctx) => {
     const res = await got(url);
 
     const $ = cheerio.load(res.data);
-    const list = $('#wp_news_w24').find('.list_nav');
+    const list = $('#wp_news_w09').find('.list-item');
 
     const items =
         list &&
@@ -27,10 +28,10 @@ module.exports = async (ctx) => {
             .map((index, item) => {
                 item = $(item);
                 return {
-                    title: item.find('.list_tit').children('a').attr('title'),
-                    pubDate: parseDate(item.find('.list_time').text()),
-                    link: `http://www.grs.zju.edu.cn/${item.find('a').eq(-1).attr('href')}`,
-                    description: item.find('.list_intro a').text(),
+                    title: item.find('h3').attr('title'),
+                    pubDate: timezone(parseDate(item.find('.date').text().trim(), 'YY-MM-DD'), +8),
+                    link: `http://www.grs.zju.edu.cn${item.find('a').eq(-1).attr('href')}`,
+                    description: item.find('p').text(),
                 };
             })
             .get();

package/lib/v2/zju/radar.js

@@ -112,19 +112,19 @@ module.exports = {
                 target: (params) => {
                     let type;
                     switch (params.path) {
-                        case '1335/list.htm':
+                        case 'qbgg/list.htm':
                             type = 1;
                             break;
-                        case '1336/list.htm':
+                        case 'jxgl/list.htm':
                             type = 2;
                             break;
-                        case '1337/list.htm':
+                        case 'glzz/list.htm':
                             type = 3;
                             break;
-                        case '1338/list.htm':
+                        case 'xkjs/list.htm':
                             type = 4;
                             break;
-                        case '1339/list.htm':
+                        case 'hwjl/list.htm':
                             type = 5;
                             break;
                         default:

package/lib/v2/zodgame/forum.js

@@ -0,0 +1,54 @@
+const got = require('@/utils/got');
+const config = require('@/config').value;
+const cheerio = require('cheerio');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+const rootUrl = 'https://zodgame.xyz';
+
+module.exports = async (ctx) => {
+    const fid = ctx.params.fid;
+    const subUrl = `${rootUrl}/forum.php?mod=forumdisplay&fid=${fid}`;
+    const cookie = config.zodgame.cookie;
+
+    if (cookie === undefined) {
+        throw Error('Zodgame RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#pei-zhi-bu-fen-rss-mo-kuai-pei-zhi">relevant config</a>');
+    }
+
+    const response = await got({
+        method: 'get',
+        url: subUrl,
+        headers: {
+            Cookie: cookie,
+        },
+    });
+    const $ = cheerio.load(response.data);
+    const pageTitle = $('title').text();
+    const list = $('#threadlisttableid tbody');
+
+    const items = list
+        .map((_, item) => {
+            const title = $(item).find('tr th a.s.xst').text();
+            const author = $(item).find('tr td.by cite a').text();
+            const type = $(item).find('tr th em a').text();
+            const link = $(item).find('tr th a.s.xst').attr('href');
+            return {
+                title,
+                author,
+                link,
+                category: type,
+                description: art(path.join(__dirname, 'templates/forum.art'), {
+                    type,
+                    title,
+                    author,
+                }),
+            };
+        })
+        .get();
+
+    ctx.state.data = {
+        title: pageTitle,
+        link: rootUrl,
+        item: items,
+    };
+};

package/lib/v2/zodgame/maintainer.js

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

package/lib/v2/zodgame/radar.js

@@ -0,0 +1,18 @@
+module.exports = {
+    'zodgame.xyz': {
+        _name: 'zodgame',
+        '.': [
+            {
+                title: '论坛版块',
+                docs: 'https://docs.rsshub.app/bbs.html#zodgame',
+                source: '/forum.php',
+                target: (params, url) => {
+                    const fid = new URL(url).searchParams.get('fid');
+                    if (fid) {
+                        return `/zodgame/forum/${fid}`;
+                    }
+                },
+            },
+        ],
+    },
+};

package/lib/v2/zodgame/router.js

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

package/lib/v2/zodgame/templates/forum.art

@@ -0,0 +1 @@
+<span>{{ if type !== "" }}[{{ type }}]{{ /if }}{{ title }} - {{ author }}</span>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsshub",
-  "version": "1.0.0-master.f78ad03",
+  "version": "1.0.0-master.f796ff1",
   "description": "Make RSS Great Again!",
   "main": "lib/pkg.js",
   "files": [
@@ -20,10 +20,17 @@
     "format:staged": "eslint \"**/*.{js,yml}\" --fix && node docs/.format/format.js --staged && pretty-quick --staged --verbose --pattern \"**/*.{js,json}\"",
     "format:check": "eslint \"**/*.{js,yml}\" && prettier-check \"**/*.{js,json}\"",
     "jest": "cross-env NODE_ENV=test jest --runInBand --forceExit --detectOpenHandles",
-    "jest:coverage": "cross-env NODE_ENV=test jest --coverage --runInBand --forceExit --detectOpenHandles",
+    "jest:coverage": "cross-env NODE_ENV=test jest --coverage --reporters=default --reporters=jest-junit --runInBand --forceExit --detectOpenHandles",
     "jest:watch": "cross-env NODE_ENV=test jest --watch",
     "test": "npm run format:check && npm run jest:coverage"
   },
+  "reporters": [
+    "default",
+    "jest-junit"
+  ],
+  "jest-junit": {
+    "outputDirectory": "coverage"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/DIYgod/RSSHub.git"
@@ -41,24 +48,26 @@
   },
   "homepage": "https://github.com/DIYgod/RSSHub#readme",
   "devDependencies": {
-    "@napi-rs/pinyin": "1.7.0",
+    "@napi-rs/pinyin": "1.7.1",
     "@types/koa": "2.13.5",
-    "@vercel/nft": "0.21.0",
+    "@vercel/nft": "0.22.1",
     "@vuepress/plugin-back-to-top": "1.9.7",
     "@vuepress/plugin-google-analytics": "1.9.7",
     "@vuepress/plugin-pwa": "1.9.7",
     "@vuepress/shared-utils": "1.9.7",
     "cross-env": "7.0.3",
-    "eslint": "8.22.0",
+    "eslint": "8.29.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-yml": "1.1.0",
+    "eslint-plugin-yml": "1.2.0",
     "fs-extra": "10.1.0",
-    "jest": "28.1.3",
+    "jest": "29.3.1",
+    "jest-junit": "15.0.0",
+    "meilisearch": "0.30.0",
     "mockdate": "3.0.5",
     "nock": "13.2.9",
-    "nodemon": "2.0.19",
-    "prettier": "2.7.1",
+    "nodemon": "2.0.20",
+    "prettier": "2.8.0",
     "prettier-check": "2.0.0",
     "pretty-quick": "3.1.3",
     "remark": "13.0.0",
@@ -68,62 +77,66 @@
     "remark-parse": "9.0.0",
     "remark-preset-prettier": "0.5.1",
     "remark-stringify": "9.0.1",
+    "request-promise-native": "1.0.9",
     "staged-git-files": "1.3.0",
     "string-width": "4.2.3",
-    "supertest": "6.2.4",
+    "supertest": "6.3.2",
     "tosource": "2.0.0-alpha.3",
     "unified": "9.2.2",
     "vuepress": "1.9.7",
+    "vuepress-plugin-meilisearch": "0.13.0",
+    "vuepress-plugin-sitemap": "2.3.1",
     "yorkie": "2.0.0"
   },
   "dependencies": {
     "@koa/router": "12.0.0",
-    "@postlight/mercury-parser": "2.2.1",
-    "@sentry/node": "7.11.1",
+    "@postlight/parser": "2.2.3",
+    "@sentry/node": "7.23.0",
     "aes-js": "3.1.2",
     "art-template": "4.13.2",
     "bbcodejs": "0.0.4",
     "cheerio": "1.0.0-rc.12",
-    "chrono-node": "2.3.9",
+    "chrono-node": "2.4.2",
     "city-timezones": "1.2.1",
     "crypto-js": "4.1.1",
     "currency-symbol-map": "5.1.0",
-    "dayjs": "1.11.5",
-    "dotenv": "16.0.1",
+    "dayjs": "1.11.6",
+    "dotenv": "16.0.3",
     "emailjs-imap-client": "3.1.0",
     "entities": "3.0.1",
     "etag": "1.8.1",
     "fanfou-sdk": "4.2.0",
     "git-rev-sync": "3.0.2",
-    "googleapis": "105.0.0",
+    "googleapis": "109.0.1",
     "got": "11.8.5",
     "https-proxy-agent": "5.0.1",
     "iconv-lite": "0.6.3",
     "instagram-private-api": "1.45.3",
-    "ioredis": "5.2.2",
+    "ioredis": "5.2.4",
     "ip-regex": "4.3.0",
     "is-localhost-ip": "2.0.0",
-    "jsdom": "20.0.0",
+    "jsdom": "20.0.3",
     "json-bigint": "1.0.0",
     "json5": "2.2.1",
     "koa": "2.13.4",
     "koa-basic-auth": "4.0.0",
     "koa-favicon": "2.1.0",
     "koa-mount": "4.0.0",
-    "lru-cache": "7.14.0",
+    "lru-cache": "7.14.1",
     "lz-string": "1.4.4",
     "mailparser": "3.5.0",
     "markdown-it": "13.0.1",
     "module-alias": "2.2.2",
     "parse-torrent": "9.1.5",
-    "pidusage": "3.0.0",
+    "pidusage": "3.0.2",
     "plist": "3.0.6",
-    "puppeteer": "16.2.0",
+    "proxy-chain": "2.2.0",
+    "puppeteer": "19.3.0",
     "puppeteer-extra": "3.3.4",
     "puppeteer-extra-plugin-stealth": "2.11.1",
-    "query-string": "7.1.1",
-    "rand-user-agent": "1.0.77",
-    "re2": "1.17.7",
+    "query-string": "7.1.3",
+    "rand-user-agent": "1.0.92",
+    "re2": "1.17.8",
     "require-all": "3.0.0",
     "rss-parser": "3.12.0",
     "showdown": "2.1.0",
@@ -132,10 +145,10 @@
     "string-similarity": "4.0.4",
     "tiny-async-pool": "2.1.0",
     "torrent-search-api": "2.1.4",
-    "tough-cookie": "4.0.0",
+    "tough-cookie": "4.1.2",
     "tunnel": "0.0.6",
-    "twitter-api-v2": "1.12.5",
-    "winston": "3.8.1",
+    "twitter-api-v2": "1.12.9",
+    "winston": "3.8.2",
     "xml2js": "0.4.23"
   },
   "jest": {

package/lib/routes/adnmb/index.js

@@ -1,69 +0,0 @@
-const got = require('@/utils/got');
-
-const adnmbBaseUrl = 'https://adnmb3.com';
-const cdnBaseUrl = 'https://nmbimg.fastmirror.org/image/';
-
-async function getForumInfo(pid, ctx) {
-    const cache_key = `adnmb::forum::${pid}`;
-    const cache = await ctx.cache.get(cache_key);
-    if (cache) {
-        return JSON.parse(cache);
-    }
-    const forumListResponse = await got(`${adnmbBaseUrl}/Api/getForumList`);
-    const matchedForum = forumListResponse.data
-        .map((a) => a.forums)
-        .flat()
-        .filter((c) => c.id === pid || c.name === pid || c.showName === pid);
-    if (matchedForum.length === 0) {
-        throw 'Forum Not Found';
-    }
-    const basicForumInfo = (({ id, name, showName, msg }) => ({ id, name, showName, msg }))(matchedForum[0]);
-    ctx.cache.set(cache_key, JSON.stringify(basicForumInfo));
-    return basicForumInfo;
-}
-
-module.exports = async (ctx) => {
-    const pid = ctx.params.pid;
-
-    const forumInfo = await getForumInfo(pid, ctx);
-
-    const url = forumInfo.name === '时间线' ? `${adnmbBaseUrl}/Api/timeline?page=1` : `${adnmbBaseUrl}/Api/showf?id=${forumInfo.id}&page=1`;
-    const response = await got({
-        method: 'get',
-        url,
-    });
-    const data = response.data;
-
-    const items = [];
-    data.forEach((item) => {
-        const newItems = {
-            title: item.content,
-            pubDate: new Date(item.now.replace(/\(.*?\)/g, ' ') + ' +0800').toUTCString(),
-            link: `${adnmbBaseUrl}/t/${item.id}`,
-        };
-        const img = item.img !== '' ? '<img style="max-width: 100%" src="' + cdnBaseUrl + item.img + item.ext + '"/>' : '';
-        let replys = '';
-        item.replys.forEach((reply) => {
-            const replyImg = reply.img !== '' ? '<img style="max-width: 100%" src="' + cdnBaseUrl + reply.img + reply.ext + '"/>' : '';
-            replys += `<h4>${reply.title} ${reply.name}  ${reply.now} ID:${reply.userid} No.${reply.id}</h4> </br>
-                          ${reply.content}
-                          ${replyImg}
-                          <hr />
-            `;
-        });
-        newItems.description = `<h2>${item.title} ${item.name}  ${item.now} ID:${item.userid} No.${item.id}</h2> </br>
-                          ${item.content}
-                           ${img}
-                          <hr />
-                          ${replys}
-            `;
-        items.push(newItems);
-    });
-
-    ctx.state.data = {
-        title: `${forumInfo.showName ? forumInfo.showName : forumInfo.name} - A岛匿名版`,
-        link: `${adnmbBaseUrl}/f/${forumInfo.name}`,
-        description: forumInfo.msg,
-        item: items,
-    };
-};

package/lib/routes/aljazeera/news.js

@@ -1,38 +0,0 @@
-const url = require('url');
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-
-module.exports = async (ctx) => {
-    const link = `https://chinese.aljazeera.net/news`;
-    const response = await got({
-        method: 'get',
-        url: link,
-    });
-    const $ = cheerio.load(response.data);
-
-    const list = $('h3 a')
-        .map((_, item) => {
-            item = $(item);
-            return {
-                title: item.text(),
-                link: url.resolve(`https://chinese.aljazeera.net`, item.attr('href')),
-            };
-        })
-        .get();
-
-    ctx.state.data = {
-        title: `Aljazeera半岛网 - 新闻`,
-        link,
-        item: 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);
-                    item.pubDate = new Date(detailResponse.data.match(/"datePublished": "(.*?)",/)[1]).toUTCString();
-                    item.description = content('div.wysiwyg').html();
-                    return item;
-                })
-            )
-        ),
-    };
-};

package/lib/routes/aqk/category.js

@@ -1,22 +0,0 @@
-const got = require('@/utils/got');
-
-module.exports = async (ctx) => {
-    const api = 'https://api.anquanke.com/data/v1/posts?size=10&page=1&category=';
-    const type = ctx.params.category;
-    const host = 'https://www.anquanke.com';
-    const res = await got.get(`${api}${type}`);
-    const dataArray = res.data.data;
-
-    const items = dataArray.map((item) => ({
-        title: item.title,
-        description: item.desc,
-        pubDate: item.date,
-        link: `${host}/${type === 'week' ? 'week' : 'post'}/id/${item.id}`,
-    }));
-
-    ctx.state.data = {
-        title: `安全客-${dataArray[0].category_name}`,
-        link: 'https://www.anquanke.com',
-        item: items,
-    };
-};

package/lib/routes/bangumi/calendar/_base.js

@@ -1,43 +0,0 @@
-const got = require('@/utils/got');
-
-module.exports = async (ctx) => {
-    const bgmCalendarUrl = 'https://api.bgm.tv/calendar';
-    const bgmDataUrl = 'https://cdn.jsdelivr.net/npm/bangumi-data/dist/data.json';
-
-    const url = [bgmCalendarUrl, bgmDataUrl];
-
-    const cache = await Promise.all(url.map(ctx.cache.get));
-    const result = await Promise.all(
-        cache.map(async (c, i) => {
-            if (c) {
-                return Promise.resolve(JSON.parse(c));
-            } else {
-                const response = await got({
-                    method: 'get',
-                    url: url[i],
-                });
-                const data = response.data;
-
-                if (i === 1) {
-                    // 只保留有 bangumi id 的番剧
-                    const length = data.items.length;
-                    const items = [];
-                    for (let index = 0; index < length; index++) {
-                        const item = data.items[index];
-                        const bgm_site = item.sites.find((s) => s.site === 'bangumi');
-                        if (bgm_site) {
-                            item.bgm_id = bgm_site.id;
-                            items.push(item);
-                        }
-                    }
-                    data.items = items;
-                }
-
-                ctx.cache.set(url[i], JSON.stringify(data));
-                return Promise.resolve(data);
-            }
-        })
-    );
-
-    return result;
-};