rsshub 1.0.0-master.fe4f650 → 1.0.0-master.fe560d2

package/lib/v2/zhihu/pin/utils.js

@@ -1,5 +1,47 @@
 const { parseDate } = require('@/utils/parse-date');
 
+const generateDescription = (target, init) =>
+    target.content.reduce((description, item) => {
+        switch (item.type) {
+            case 'text':
+                description += `<div>${item.content}</div>`;
+                break;
+
+            case 'image':
+                description += `<img src="${item.url.replace(/_.+\.jpg/g, '.jpg')}" />`;
+                break;
+
+            case 'video':
+                try {
+                    description += `<video
+            controls="controls"
+            width="${item.playlist.hd.width}"
+            height="${item.playlist.hd.height}"
+            poster="${item.cover_info.thumbnail}"
+            src="${item.playlist.hd.play_url}"
+          >`;
+                } catch (e) {
+                    description += `<video
+                controls="controls"
+                width="${item.playlist.pop().width}"
+                height="${item.playlist.pop().height}"
+                poster="${item.thumbnail}"
+                src="${item.playlist.pop().play_url}"
+              >`;
+                }
+                break;
+
+            case 'link':
+                description += `<div><a href="${item.url}">${item.title}</a><br><img src="${item.image_url}" /></div>`;
+                break;
+
+            default:
+                description += '未知类型，请点击<a href="https://github.com/DIYgod/RSSHub/issues">链接</a>提交issue';
+        }
+
+        return description;
+    }, init);
+
 module.exports = {
     generateData: (data) =>
         data.map((item) => {
@@ -8,47 +50,13 @@ module.exports = {
             const author = target.author.name;
             const title = `${author}：${target.excerpt_title}`;
             const link = `https://www.zhihu.com/pin/${target.id}`;
-            const description = target.content.reduce((description, item) => {
-                switch (item.type) {
-                    case 'text':
-                        description += `<div>${item.content}</div>`;
-                        break;
-
-                    case 'image':
-                        description += `<img src="${item.url.replace(/_.+\.jpg/g, '.jpg')}" />`;
-                        break;
-
-                    case 'video':
-                        try {
-                            description += `<video
-                        controls="controls"
-                        width="${item.playlist.hd.width}"
-                        height="${item.playlist.hd.height}"
-                        poster="${item.cover_info.thumbnail}"
-                        src="${item.playlist.hd.play_url}"
-                      >`;
-                        } catch (e) {
-                            description += `<video
-                            controls="controls"
-                            width="${item.playlist.pop().width}"
-                            height="${item.playlist.pop().height}"
-                            poster="${item.thumbnail}"
-                            src="${item.playlist.pop().play_url}"
-                          >`;
-                        }
-                        break;
-
-                    case 'link':
-                        description += `<div><a href="${item.url}">${item.title}</a><br><img src="${item.image_url}" /></div>`;
-                        break;
-
-                    default:
-                        description += '未知类型，请点击<a href="https://github.com/DIYgod/RSSHub/issues">链接</a>提交issue';
-                }
-
-                return description;
-            }, `<a href="https://www.zhihu.com${target.author.url}">${author}</a>：`);
-
+            let description = generateDescription(target, `<a href="https://www.zhihu.com${target.author.url}">${author}</a>：`);
+            if (target.origin_pin !== undefined) {
+                const t = target.origin_pin;
+                const origin_link = `<a href="https://www.zhihu.com/pin/${t.id}">转发原文</a>：`;
+                const origin_description = generateDescription(t, `<a href="https://www.zhihu.com${t.author.url}">${t.author.name}</a>：`);
+                description = `${description} ${origin_link} ${origin_description}`;
+            }
             return {
                 title,
                 description,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsshub",
-  "version": "1.0.0-master.fe4f650",
+  "version": "1.0.0-master.fe560d2",
   "description": "Make RSS Great Again!",
   "main": "lib/pkg.js",
   "files": [
@@ -50,24 +50,24 @@
   "devDependencies": {
     "@napi-rs/pinyin": "1.7.1",
     "@types/koa": "2.13.5",
-    "@vercel/nft": "0.22.1",
+    "@vercel/nft": "0.22.6",
     "@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.26.0",
+    "eslint": "8.30.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-yml": "1.2.0",
-    "fs-extra": "10.1.0",
-    "jest": "29.2.2",
-    "jest-junit": "14.0.1",
-    "meilisearch": "0.29.0",
+    "eslint-plugin-yml": "1.4.0",
+    "fs-extra": "11.1.0",
+    "jest": "29.3.1",
+    "jest-junit": "15.0.0",
+    "meilisearch": "0.30.0",
     "mockdate": "3.0.5",
     "nock": "13.2.9",
     "nodemon": "2.0.20",
-    "prettier": "2.7.1",
+    "prettier": "2.8.1",
     "prettier-check": "2.0.0",
     "pretty-quick": "3.1.3",
     "remark": "13.0.0",
@@ -80,7 +80,7 @@
     "request-promise-native": "1.0.9",
     "staged-git-files": "1.3.0",
     "string-width": "4.2.3",
-    "supertest": "6.3.1",
+    "supertest": "6.3.3",
     "tosource": "2.0.0-alpha.3",
     "unified": "9.2.2",
     "vuepress": "1.9.7",
@@ -91,52 +91,52 @@
   "dependencies": {
     "@koa/router": "12.0.0",
     "@postlight/parser": "2.2.3",
-    "@sentry/node": "7.17.3",
+    "@sentry/node": "7.28.1",
     "aes-js": "3.1.2",
     "art-template": "4.13.2",
     "bbcodejs": "0.0.4",
     "cheerio": "1.0.0-rc.12",
-    "chrono-node": "2.4.1",
+    "chrono-node": "2.5.0",
     "city-timezones": "1.2.1",
     "crypto-js": "4.1.1",
     "currency-symbol-map": "5.1.0",
-    "dayjs": "1.11.6",
+    "dayjs": "1.11.7",
     "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": "109.0.0",
-    "got": "11.8.5",
+    "googleapis": "110.0.0",
+    "got": "11.8.6",
     "https-proxy-agent": "5.0.1",
     "iconv-lite": "0.6.3",
     "instagram-private-api": "1.45.3",
-    "ioredis": "5.2.3",
+    "ioredis": "5.2.4",
     "ip-regex": "4.3.0",
     "is-localhost-ip": "2.0.0",
-    "jsdom": "20.0.2",
+    "jsdom": "20.0.3",
     "json-bigint": "1.0.0",
-    "json5": "2.2.1",
-    "koa": "2.13.4",
+    "json5": "2.2.2",
+    "koa": "2.14.1",
     "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",
+    "mailparser": "3.6.3",
     "markdown-it": "13.0.1",
     "module-alias": "2.2.2",
     "parse-torrent": "9.1.5",
     "pidusage": "3.0.2",
     "plist": "3.0.6",
     "proxy-chain": "2.2.0",
-    "puppeteer": "19.0.0",
+    "puppeteer": "19.4.1",
     "puppeteer-extra": "3.3.4",
     "puppeteer-extra-plugin-stealth": "2.11.1",
-    "query-string": "7.1.1",
-    "rand-user-agent": "1.0.88",
-    "re2": "1.17.7",
+    "query-string": "7.1.3",
+    "rand-user-agent": "1.0.96",
+    "re2": "1.18.0",
     "require-all": "3.0.0",
     "rss-parser": "3.12.0",
     "showdown": "2.1.0",
@@ -146,8 +146,7 @@
     "tiny-async-pool": "2.1.0",
     "torrent-search-api": "2.1.4",
     "tough-cookie": "4.1.2",
-    "tunnel": "0.0.6",
-    "twitter-api-v2": "1.12.9",
+    "twitter-api-v2": "1.13.0",
     "winston": "3.8.2",
     "xml2js": "0.4.23"
   },

package/lib/routes/blogs/foreverblog.js

@@ -1,33 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-
-module.exports = async (ctx) => {
-    const response = await got({
-        method: 'get',
-        url: 'https://www.foreverblog.cn/feeds.html',
-    });
-
-    const data = response.data;
-
-    const $ = cheerio.load(data);
-    const list = $('article[class="post post-type-normal"]');
-
-    ctx.state.data = {
-        title: '十年之约 - 订阅',
-        link: 'https://www.foreverblog.cn/feeds.html',
-        language: 'zh-cn',
-        item:
-            list &&
-            list
-                .map((index, item) => {
-                    item = $(item);
-                    return {
-                        title: item.find('a.post-title-link>span').text(),
-                        description: item.find('div.post-author').text(),
-                        link: item.find('a.post-title-link').attr('href'),
-                        pubDate: item.find('time.post-time').text(),
-                    };
-                })
-                .get(),
-    };
-};

package/lib/routes/gov/zhengce/govall.js

@@ -1,59 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-
-module.exports = async (ctx) => {
-    const { advance } = ctx.params;
-    const link = `http://sousuo.gov.cn/list.htm`;
-    const params = new URLSearchParams({
-        n: 20,
-        t: 'govall',
-        sort: 'pubtime',
-        advance: 'true',
-    });
-    const query = `${params.toString()}&${advance}`;
-    const res = await got.get(link, {
-        searchParams: query.replace(/([\u4e00-\u9fa5])/g, (str) => encodeURIComponent(str)),
-    });
-    const $list = cheerio.load(res.data);
-
-    ctx.state.data = {
-        title: `信息稿件 - 中国政府网`,
-        link: `${link}?${query}`,
-        item: await Promise.all(
-            $list('body > div.dataBox > table > tbody > tr')
-                .slice(1)
-                .map(async (_, el) => {
-                    const item = $list(el);
-
-                    const number = item.find('td.info').next();
-                    const title = item.find('td.info > a');
-                    const href = title.attr('href');
-
-                    const key = `gov_zhengce: ${href}`;
-                    let description;
-                    const value = await ctx.cache.get(key);
-
-                    if (value) {
-                        description = value;
-                    } else {
-                        try {
-                            const contentData = await got.get(href);
-                            const $content = cheerio.load(contentData.data);
-                            description = $content('#UCAP-CONTENT').html();
-                        } catch (error) {
-                            description = '文章已被删除';
-                        }
-
-                        ctx.cache.set(key, description);
-                    }
-
-                    return {
-                        title: number.text() + ' | ' + title.text(),
-                        description,
-                        link: href,
-                    };
-                })
-                .get()
-        ),
-    };
-};

package/lib/routes/gov/zhengce/wenjian.js

@@ -1,53 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const queryString = require('query-string');
-
-module.exports = async (ctx) => {
-    const { pcodeJiguan } = ctx.params;
-    const link = `http://sousuo.gov.cn/list.htm`;
-    const res = await got.get(link, {
-        searchParams: queryString.stringify({
-            n: 20,
-            sort: 'pubtime',
-            t: 'paper',
-            pcodeJiguan: pcodeJiguan ? pcodeJiguan : '',
-        }),
-    });
-    const $list = cheerio.load(res.data);
-
-    ctx.state.data = {
-        title: `最新文件 - 中国政府网`,
-        link,
-        item: await Promise.all(
-            $list('body > div.dataBox > table > tbody > tr')
-                .slice(1)
-                .map(async (_, el) => {
-                    const item = $list(el);
-
-                    const number = item.find('td.info').next();
-                    const title = item.find('td.info > a');
-                    const href = title.attr('href');
-
-                    const key = `gov_zhengce: ${href}`;
-                    let description;
-                    const value = await ctx.cache.get(key);
-
-                    if (value) {
-                        description = value;
-                    } else {
-                        const contentData = await got.get(href);
-                        const $content = cheerio.load(contentData.data);
-                        description = $content('#UCAP-CONTENT').html();
-                        ctx.cache.set(key, description);
-                    }
-
-                    return {
-                        title: number.text() + ' | ' + title.text(),
-                        description,
-                        link: href,
-                    };
-                })
-                .get()
-        ),
-    };
-};

package/lib/routes/gov/zhengce/zuixin.js

@@ -1,42 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-
-module.exports = async (ctx) => {
-    const link = `http://www.gov.cn/zhengce/zuixin.htm`;
-    const listData = await got.get(link);
-    const $list = cheerio.load(listData.data);
-    ctx.state.data = {
-        title: `最新政策 - 中国政府网`,
-        link,
-        item: await Promise.all(
-            $list('.news_box .list li:not(.line)')
-                .map(async (_, el) => {
-                    const $el = $list(el);
-                    const $a = $el.find('h4 a');
-                    const href = $a.attr('href');
-                    const link = href.startsWith('/zhengce') ? `http://www.gov.cn${href}` : href;
-                    const key = `gov_zhengce_zuixin: ${link}`;
-                    let description;
-                    const value = await ctx.cache.get(key);
-
-                    if (value) {
-                        description = value;
-                    } else {
-                        const contentData = await got.get(link);
-                        const $content = cheerio.load(contentData.data);
-                        description = $content('#UCAP-CONTENT').html();
-                        ctx.cache.set(key, description);
-                    }
-
-                    return {
-                        title: $a.text(),
-                        description,
-                        guid: href,
-                        link,
-                        pubDate: new Date($el.find('.date').text()).toUTCString(),
-                    };
-                })
-                .get()
-        ),
-    };
-};

package/lib/routes/langlive/room.js

@@ -1,33 +0,0 @@
-const got = require('@/utils/got');
-
-module.exports = async (ctx) => {
-    const id = ctx.params.id;
-    const url = `https://play.lang.live/${id}`;
-
-    const api = `https://game-api.lang.live/webapi/v1/room/info?room_id=${id}`;
-    const response = await got({
-        method: 'get',
-        url: api,
-    });
-
-    let item = [];
-    let name = '';
-    if (response.data.data.live_info.live_status === 1) {
-        name = response.data.data.live_info.nickname;
-        item = [
-            {
-                title: response.data.data.live_info.nickname + '开播了',
-                link: url,
-                guid: response.data.data.live_info.live_id,
-                description: response.data.data.live_info.describe,
-            },
-        ];
-    }
-
-    ctx.state.data = {
-        title: `${name}的浪Play直播`,
-        link: url,
-        item,
-        allowEmpty: true,
-    };
-};

package/lib/routes/nautilus/topics.js

@@ -1,45 +0,0 @@
-const cheerio = require('cheerio');
-const got = require('@/utils/got');
-
-module.exports = async (ctx) => {
-    const url = `http://nautil.us/term/f/${ctx.params.tid}`;
-
-    const res = await got.get(url);
-    const $ = cheerio.load(res.data);
-    const list = $('article.search-result').get();
-
-    const out = await Promise.all(
-        list.map(async (item) => {
-            const $ = cheerio.load(item);
-            const title = $('h3 > a').text();
-            const partial = $('h3 > a').attr('href');
-            const address = `http://nautil.us${partial}`;
-            const cache = await ctx.cache.get(address);
-            if (cache) {
-                return Promise.resolve(JSON.parse(cache));
-            }
-            const res = await got.get(address);
-            const capture = cheerio.load(res.data);
-            capture('div.reco').remove();
-            const banner = capture('div.banner').html();
-            const textWithTime = capture('div.byline').text();
-            const author = capture('div.byline > span:nth-child(2)').text();
-            const contents = banner + capture('div.page-content').html();
-            const single = {
-                title,
-                author,
-                description: contents,
-                link: address,
-                guid: address,
-                pubDate: new Date(textWithTime).toUTCString(),
-            };
-            ctx.cache.set(address, JSON.stringify(single));
-            return Promise.resolve(single);
-        })
-    );
-    ctx.state.data = {
-        title: 'Nautilus | ' + $('title').text(),
-        link: url,
-        item: out,
-    };
-};

package/lib/routes/nintendo/direct.js

@@ -1,34 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-
-module.exports = async (ctx) => {
-    const response = await got({
-        method: 'get',
-        url: 'https://www.nintendo.com/nintendo-direct/archive/',
-    });
-    const data = response.data;
-
-    const $ = cheerio.load(data);
-    const list = $('.news-tiles li').get().slice(0, 9);
-
-    const result = list.map((item) => {
-        const $ = cheerio.load(item);
-        return {
-            title: $('.b7').html(),
-            cover: $('img ').attr('src').replace('../', 'https://www.nintendo.com/nintendo-direct/'),
-            des: $('p').html(),
-            url: $('a').attr('href').replace('../', 'https://www.nintendo.com/nintendo-direct/'),
-        };
-    });
-
-    ctx.state.data = {
-        title: `Nintendo Direct (任天堂直面会)`,
-        link: `https://www.nintendo.com/nintendo-direct/archive/`,
-        description: `最新的任天堂直面会日程信息`,
-        item: result.map((item) => ({
-            title: item.title,
-            description: `<img src="${item.cover}" /><br>${item.des}`,
-            link: item.url,
-        })),
-    };
-};

package/lib/routes/nintendo/eshop_cn.js

@@ -1,51 +0,0 @@
-const got = require('@/utils/got');
-const util = require('./utils');
-const software_url = 'https://www.nintendoswitch.com.cn/software/';
-
-module.exports = async (ctx) => {
-    const response = await got({
-        method: 'get',
-        url: software_url,
-    });
-
-    // 获取Nuxt对象
-    const result = await util.nuxtReader(response.data);
-
-    /* expectedReleaseNS[]
-        coverImageUrl: "//switch-cn.gtgres.com/global-images/c50e3390-14e5-11ea-9b40-236e671bca9e.png"
-        expectedReleaseDate: 0
-        expectedReleaseDateFuzzy: ""
-        gameName: "Mario Tennis Aces"
-        id: 1852
-        newsPageUrl: ""
-      softwareData[]
-        gameProductCode: "HAC-P-ADALB"
-        image: "//switch-cn.gtgres.com/global-images/c247f0e0-1654-11ea-9b40-236e671bca9e.png"
-        name: "新 超级马力欧兄弟U 豪华版"
-        nsUid: "70010000027088"
-        publisher: "任天堂"
-        releaseDatetime: 1575907200000
-        softcardType: (2)[]
-    */
-    if (!result.softwareData) {
-        throw new Error('软件信息不存在，请报告这个问题');
-    }
-
-    let data = result.softwareData.map((item) => ({
-        title: item.name,
-        author: item.publisher,
-        description: util.generateImageLink(`https${item.image}`),
-        category: item.softcardType,
-        link: `${software_url}${item.nsUid}`,
-        pubDate: new Date(parseInt(item.releaseTime)).toUTCString(),
-    }));
-
-    data = await util.ProcessItemChina(data, ctx.cache);
-
-    ctx.state.data = {
-        title: `Nintendo eShop (国服) 新游戏`,
-        link: `https://www.nintendo.com.hk/topics`,
-        description: `Nintendo  (国服) 新上架的游戏`,
-        item: data,
-    };
-};

package/lib/routes/nintendo/eshop_hk.js

@@ -1,26 +0,0 @@
-const got = require('@/utils/got');
-const util = require('./utils');
-
-module.exports = async (ctx) => {
-    const response = await got({
-        method: 'get',
-        url: 'https://www.nintendo.com.hk/data/json/switch_software.json',
-    });
-    const data = response.data.slice(0, 9).filter(({ link }) => link.startsWith('https://'));
-
-    // 获取游戏描述
-    const result = await util.ProcessItem(data, ctx.cache);
-
-    ctx.state.data = {
-        title: `Nintendo eShop (港服) 新游戏`,
-        link: `https://www.nintendo.com.hk/software/switch/index.html`,
-        description: `Nintendo eShop (港服) 新上架的游戏`,
-        item: result.map((item) => ({
-            title: item.title,
-            description: `<img src="https://www.nintendo.com.hk/software/img/bnr/${item.thumb_img}"><br><strong>发售日期：</strong>${item.release_date}<br><strong>价格：</strong>${item.price}港币<br><strong>支持中文：</strong>${
-                item.lang === 'CN' ? '是' : '否'
-            }<br><strong>发行商：</strong>${item.maker_publisher}<br>${item.content}`,
-            link: item.link,
-        })),
-    };
-};

package/lib/routes/nintendo/eshop_jp.js

@@ -1,20 +0,0 @@
-const got = require('@/utils/got');
-
-module.exports = async (ctx) => {
-    const response = await got({
-        method: 'get',
-        url: `https://search.nintendo.jp/nintendo_soft/search.json?opt_sshow=1&fq=ssitu_s%3Aonsale%20OR%20ssitu_s%3Apreorder%20OR%20memo_bg%3Aforced&limit=24&page=1&c=50310840317994813&opt_osale=1&opt_hard=1_HAC&sort=sodate%20desc%2Cscore`,
-    });
-    const data = response.data.result.items.slice(0, 9);
-
-    ctx.state.data = {
-        title: `Nintendo eShop (日服) 新游戏`,
-        link: `https://www.nintendo.co.jp/software/switch/index.html`,
-        description: `Nintendo eShop (日服) 新上架的游戏`,
-        item: data.map((item) => ({
-            title: item.title,
-            description: `<img src="https://img-eshop.cdn.nintendo.net/i/${item.iurl}.jpg"><br><strong>发售日期：</strong>${item.pdate}<br><strong>价格：</strong>${item.dprice}円`,
-            link: `https://ec.nintendo.com/JP/ja/titles/${item.id}`,
-        })),
-    };
-};