rsshub 1.0.0-master.f7cdf8b → 1.0.0-master.f812e91

package/lib/v2/zhihu/maintainer.js

@@ -16,6 +16,8 @@ module.exports = {
     '/topic/:topicId': ['xyqfer'],
     '/weekly': ['LogicJake'],
     '/xhu/collection/:id': ['JimenezLi'],
+    '/xhu/people/activities/:hexId': ['JimenezLi'],
+    '/xhu/people/answers/:hexId': ['JimenezLi'],
     '/xhu/question/:questionId/:sortBy?': ['JimenezLi'],
     '/xhu/topic/:topicId': ['JimenezLi'],
     '/xhu/zhuanlan/:id': ['JimenezLi'],

package/lib/v2/zhihu/radar.js

@@ -80,6 +80,24 @@ module.exports = {
                 source: '/column/:id',
                 target: '/zhihu/zhuanlan/:id',
             },
+            {
+                title: 'xhu - 用户动态',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
+                source: '/people/:id',
+                target: (params, url, document) => {
+                    const hexId = /"id":"([0-9a-f]*?)","urlToken"/.exec(document.getElementById('js-initialData').innerHTML)[1];
+                    return `/zhihu/xhu/people/activities/${hexId}`;
+                },
+            },
+            {
+                title: 'xhu - 用户回答',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
+                source: '/people/:id/answers',
+                target: (params, url, document) => {
+                    const hexId = /"id":"([0-9a-f]*?)","urlToken"/.exec(document.getElementById('js-initialData').innerHTML)[1];
+                    return `/zhihu/xhu/people/answers/${hexId}`;
+                },
+            },
             {
                 title: 'xhu - 收藏夹',
                 docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',

package/lib/v2/zhihu/router.js

@@ -16,6 +16,8 @@ module.exports = (router) => {
     router.get('/topic/:topicId', require('./topic'));
     router.get('/weekly', require('./weekly'));
     router.get('/xhu/collection/:id', require('./xhu/collection'));
+    router.get('/xhu/people/activities/:hexId', require('./xhu/activities'));
+    router.get('/xhu/people/answers/:hexId', require('./xhu/answers'));
     router.get('/xhu/question/:questionId/:sortBy?', require('./xhu/question'));
     router.get('/xhu/topic/:topicId', require('./xhu/topic'));
     router.get('/xhu/zhuanlan/:id', require('./xhu/zhuanlan'));

package/lib/v2/zhihu/xhu/activities.js

@@ -0,0 +1,112 @@
+const got = require('@/utils/got');
+const auth = require('./auth');
+const utils = require('../utils');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const xhuCookie = await auth.getCookie(ctx);
+    const { hexId } = ctx.params;
+    const link = `https://www.zhihu.com/people/${hexId}`;
+    const url = `https://api.zhihuvvv.workers.dev/people/${hexId}/activities?before_id=0&limit=20`;
+
+    const response = await got({
+        method: 'get',
+        url,
+        headers: {
+            Referer: 'https://api.zhihuvvv.workers.dev',
+            Cookie: xhuCookie,
+        },
+    });
+    const data = response.data.data;
+
+    ctx.state.data = {
+        title: `${data[0].actor.name}的知乎动态`,
+        link,
+        image: data[0].actor.avatar_url,
+        description: data[0].actor.headline || data[0].actor.description,
+        item: data.map((item) => {
+            const detail = item.target;
+            let title;
+            let description;
+            let url;
+            const images = [];
+            let text = '';
+            let link = '';
+            let author = '';
+
+            switch (item.target.type) {
+                case 'answer':
+                    title = detail.question.title;
+                    author = detail.author.name;
+                    description = utils.ProcessImage(detail.content);
+                    url = `https://www.zhihu.com/question/${detail.question.id}/answer/${detail.id}`;
+                    break;
+                case 'article':
+                    title = detail.title;
+                    author = detail.author.name;
+                    description = utils.ProcessImage(detail.content);
+                    url = `https://zhuanlan.zhihu.com/p/${detail.id}`;
+                    break;
+                case 'pin':
+                    title = detail.excerpt_title;
+                    author = detail.author.name;
+                    detail.content.forEach((contentItem) => {
+                        if (contentItem.type === 'text') {
+                            text = `<p>${contentItem.own_text}</p>`;
+                        } else if (contentItem.type === 'image') {
+                            images.push(`<p><img src="${contentItem.url.replace('xl', 'r')}"/></p>`);
+                        } else if (contentItem.type === 'link') {
+                            link = `<p><a href="${contentItem.url}" target="_blank">${contentItem.title}</a></p>`;
+                        } else if (contentItem.type === 'video') {
+                            link = `<p><video
+                                controls="controls"
+                                width="${contentItem.playlist[1].width}"
+                                height="${contentItem.playlist[1].height}"
+                                src="${contentItem.playlist[1].url}"></video></p>`;
+                        }
+                    });
+                    description = `${text}${link}${images.join('')}`;
+                    url = `https://www.zhihu.com/pin/${detail.id}`;
+                    break;
+                case 'question':
+                    title = detail.title;
+                    author = detail.author.name;
+                    description = utils.ProcessImage(detail.detail);
+                    url = `https://www.zhihu.com/question/${detail.id}`;
+                    break;
+                case 'collection':
+                    title = detail.title;
+                    url = `https://www.zhihu.com/collection/${detail.id}`;
+                    break;
+                case 'column':
+                    title = detail.title;
+                    description = `<p>${detail.intro}</p><p><img src="${detail.image_url}"/></p>`;
+                    url = `https://zhuanlan.zhihu.com/${detail.id}`;
+                    break;
+                case 'topic':
+                    title = detail.name;
+                    description = `<p>${detail.introduction}</p><p>话题关注者人数：${detail.followers_count}</p>`;
+                    url = `https://www.zhihu.com/topic/${detail.id}`;
+                    break;
+                case 'live':
+                    title = detail.subject;
+                    description = detail.description.replace(/\n|\r/g, '<br>');
+                    url = `https://www.zhihu.com/lives/${detail.id}`;
+                    break;
+                case 'roundtable':
+                    title = detail.name;
+                    description = detail.description;
+                    url = `https://www.zhihu.com/roundtable/${detail.id}`;
+                    break;
+            }
+
+            return {
+                title: `${data[0].actor.name}${item.action_text}: ${title}`,
+                author,
+                description,
+                pubDate: parseDate(item.created_time * 1000),
+                link: url,
+            };
+        }),
+    };
+};

package/lib/v2/zhihu/xhu/answers.js

@@ -0,0 +1,31 @@
+const got = require('@/utils/got');
+const auth = require('./auth');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const xhuCookie = await auth.getCookie(ctx);
+    const { hexId } = ctx.params;
+    const link = `https://www.zhihu.com/people/${hexId}/answers`;
+    const url = `https://api.zhihuvvv.workers.dev/people/${hexId}/answers?limit=20&offset=0`;
+
+    const response = await got({
+        method: 'get',
+        url,
+        headers: {
+            Referer: 'https://api.zhihuvvv.workers.dev',
+            Cookie: xhuCookie,
+        },
+    });
+    const data = response.data.data;
+
+    ctx.state.data = {
+        title: `${data[0].author.name}的知乎回答`,
+        link,
+        item: data.map((item) => ({
+            title: item.question.title,
+            description: item.excerpt,
+            pubDate: parseDate(item.created_time * 1000),
+            link: `https://www.zhihu.com/question/${item.question.id}/answer/${item.id}`,
+        })),
+    };
+};

package/lib/views/error.art

@@ -36,7 +36,7 @@
 <body>
     <div class="content">
         <p>
-            <img src="/logo.png" alt="RSSHub" width="120">
+            <img src="/logo.png" alt="RSSHub" width="120" loading="lazy" />
         </p>
 
         <h1>Looks like something went wrong</h1>

package/lib/views/rss3-ums.js

@@ -0,0 +1,62 @@
+const dayjs = require('dayjs');
+
+/**
+ * This function should be used by RSSHub middleware only.
+ * @param {object} data ctx.state.data
+ * @returns `JSON.stringify`-ed [UMS Result](https://docs.rss3.io/docs/unified-metadata-schemas)
+ */
+
+const NETWORK = 'RSS';
+const TAG = 'RSS';
+const TYPE = 'feed';
+
+const rss3Ums = (data) => {
+    const currentUnixTsp = dayjs().unix();
+    const umsResult = {
+        data: data.item.map((item) => {
+            const owner = getOwnershipFieldFromURL(item);
+            return {
+                owner,
+                id: item.link,
+                network: NETWORK,
+                from: owner,
+                to: owner,
+                tag: TAG,
+                type: TYPE,
+                direction: 'out',
+                feeValue: '0',
+                actions: [
+                    {
+                        tag: TAG,
+                        type: TYPE,
+                        platform: owner,
+                        from: owner,
+                        to: owner,
+                        metadata: {
+                            authors: typeof item.author === 'string' ? [{ name: item.author }] : item.author,
+                            description: item.description,
+                            pub_date: item.pubDate,
+                            tags: typeof item.category === 'string' ? [item.category] : item.category,
+                            title: item.title,
+                        },
+                        related_urls: [item.link],
+                    },
+                ],
+                timestamp: dayjs(item.updated).unix() || currentUnixTsp,
+            };
+        }),
+    };
+    return JSON.stringify(umsResult, null, 4);
+};
+
+// we treat the domain as the owner of the content
+function getOwnershipFieldFromURL(item) {
+    try {
+        const urlObj = new URL(item.link);
+        return urlObj.hostname;
+    } catch (e) {
+        return item.link;
+    }
+}
+
+module.exports = rss3Ums;

package/lib/views/welcome.art

@@ -79,7 +79,7 @@
 <body>
     <div class="content">
         <p>
-            <img src="./logo.png" alt="RSSHub" width="100" />
+            <img src="./logo.png" alt="RSSHub" width="100" loading="lazy" />
         </p>
 
         <h1>Welcome to

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsshub",
-  "version": "1.0.0-master.f7cdf8b",
+  "version": "1.0.0-master.f812e91",
   "description": "Make RSS Great Again!",
   "keywords": [
     "RSS"
@@ -24,7 +24,7 @@
       "eslint --cache --fix",
       "prettier --ignore-unknown --ignore-path ./.gitignore --write"
     ],
-    "*.md": "node website/docs/.format/format.mjs --staged",
+    "*.md?(x)": "node website/docs/.format/format.mjs --staged",
     "*.yml": "eslint --cache --fix"
   },
   "nodemonConfig": {
@@ -67,15 +67,15 @@
   },
   "dependencies": {
     "@koa/router": "12.0.1",
-    "@notionhq/client": "2.2.13",
+    "@notionhq/client": "2.2.14",
     "@postlight/parser": "2.2.3",
-    "@sentry/node": "7.80.1",
-    "@tonyrl/rand-user-agent": "2.0.39",
+    "@sentry/node": "7.88.0",
+    "@tonyrl/rand-user-agent": "2.0.42",
     "aes-js": "3.1.2",
     "art-template": "4.13.2",
     "bbcodejs": "0.0.4",
     "cheerio": "1.0.0-rc.12",
-    "chrono-node": "2.7.0",
+    "chrono-node": "2.7.3",
     "city-timezones": "1.2.1",
     "crypto-js": "4.2.0",
     "currency-symbol-map": "5.1.0",
@@ -85,7 +85,7 @@
     "etag": "1.8.1",
     "fanfou-sdk": "4.2.0",
     "git-rev-sync": "3.0.2",
-    "googleapis": "128.0.0",
+    "googleapis": "129.0.0",
     "got": "11.8.6",
     "html-to-text": "9.0.5",
     "https-proxy-agent": "7.0.2",
@@ -95,31 +95,31 @@
     "ioredis": "5.3.2",
     "ip-regex": "4.3.0",
     "is-localhost-ip": "2.0.0",
-    "jsdom": "22.1.0",
+    "jsdom": "23.0.1",
     "json-bigint": "1.0.0",
     "json5": "2.2.3",
-    "jsrsasign": "10.8.6",
+    "jsrsasign": "10.9.0",
     "koa": "2.14.2",
     "koa-basic-auth": "4.0.0",
     "koa-favicon": "2.1.0",
     "koa-mount": "4.0.0",
     "koa-static": "5.0.0",
-    "lru-cache": "10.0.2",
+    "lru-cache": "10.1.0",
     "lz-string": "1.5.0",
     "mailparser": "3.6.5",
-    "markdown-it": "13.0.2",
+    "markdown-it": "14.0.0",
     "module-alias": "2.2.3",
     "notion-to-md": "3.1.1",
-    "pidusage": "3.0.2",
+    "oauth-1.0a": "2.2.6",
     "plist": "3.1.0",
     "proxy-chain": "2.4.0",
-    "puppeteer": "21.5.2",
+    "puppeteer": "21.6.1",
     "puppeteer-extra": "3.3.6",
     "puppeteer-extra-plugin-stealth": "2.11.2",
     "puppeteer-extra-plugin-user-data-dir": "2.4.1",
     "puppeteer-extra-plugin-user-preferences": "2.4.1",
     "query-string": "7.1.3",
-    "re2js": "0.4.0",
+    "re2js": "0.4.1",
     "require-all": "3.0.0",
     "rfc4648": "1.5.3",
     "rss-parser": "3.13.0",
@@ -127,71 +127,77 @@
     "socks-proxy-agent": "8.0.2",
     "source-map": "0.7.4",
     "tiny-async-pool": "2.1.0",
+    "title": "3.5.3",
     "tough-cookie": "4.1.3",
     "twitter-api-v2": "1.15.2",
-    "winston": "3.11.0"
+    "winston": "3.11.0",
+    "xxhash-wasm": "1.0.2"
   },
   "devDependencies": {
     "@microsoft/eslint-formatter-sarif": "3.0.0",
-    "@stylistic/eslint-plugin-js": "1.2.0",
+    "@stylistic/eslint-plugin-js": "1.5.1",
     "@types/aes-js": "3.1.4",
     "@types/crypto-js": "4.2.1",
-    "@types/eslint": "8.44.7",
+    "@types/eslint": "8.44.9",
     "@types/eslint-config-prettier": "6.11.3",
     "@types/etag": "1.8.3",
     "@types/fs-extra": "11.0.4",
     "@types/git-rev-sync": "2.0.2",
     "@types/html-to-text": "9.0.4",
     "@types/imapflow": "1.0.16",
-    "@types/jsdom": "21.1.5",
+    "@types/jsdom": "21.1.6",
     "@types/json-bigint": "1.0.4",
-    "@types/koa": "2.13.11",
+    "@types/koa": "2.13.12",
     "@types/koa-basic-auth": "2.0.6",
     "@types/koa-favicon": "2.1.3",
     "@types/koa-mount": "4.0.5",
     "@types/koa-static": "4.0.4",
     "@types/koa__router": "12.0.4",
-    "@types/lint-staged": "13.2.2",
+    "@types/lint-staged": "13.3.0",
     "@types/mailparser": "3.4.4",
-    "@types/markdown-it": "13.0.6",
+    "@types/markdown-it": "13.0.7",
     "@types/module-alias": "2.0.4",
-    "@types/nodemon": "1.19.5",
-    "@types/pidusage": "2.0.5",
+    "@types/nodemon": "1.19.6",
     "@types/plist": "3.0.5",
     "@types/request-promise-native": "1.0.21",
     "@types/require-all": "3.0.6",
     "@types/supertest": "2.0.16",
-    "@types/tiny-async-pool": "2.0.2",
+    "@types/tiny-async-pool": "2.0.3",
     "@types/tough-cookie": "4.0.5",
-    "@vercel/nft": "0.24.3",
+    "@vercel/nft": "0.26.0",
     "cross-env": "7.0.3",
-    "eslint": "8.53.0",
-    "eslint-config-prettier": "9.0.0",
-    "eslint-plugin-n": "16.3.1",
+    "eslint": "8.56.0",
+    "eslint-config-prettier": "9.1.0",
+    "eslint-plugin-n": "16.4.0",
     "eslint-plugin-prettier": "5.0.1",
-    "eslint-plugin-yml": "1.10.0",
-    "fs-extra": "11.1.1",
+    "eslint-plugin-yml": "1.11.0",
+    "fs-extra": "11.2.0",
     "husky": "8.0.3",
     "jest": "29.7.0",
     "jest-junit": "16.0.0",
-    "lint-staged": "15.1.0",
+    "lint-staged": "15.2.0",
     "mockdate": "3.0.5",
-    "nock": "13.3.8",
-    "nodemon": "3.0.1",
-    "prettier": "3.1.0",
-    "remark": "13.0.0",
-    "remark-frontmatter": "3.0.0",
-    "remark-gfm": "1.0.0",
+    "nock": "13.4.0",
+    "nodemon": "3.0.2",
+    "prettier": "3.1.1",
+    "remark": "14.0.3",
+    "remark-custom-heading-id": "1.0.1",
+    "remark-directive": "3.0.0",
+    "remark-frontmatter": "4.0.1",
+    "remark-gfm": "3.0.1",
+    "remark-mdx": "2.3.0",
     "remark-pangu": "2.2.0",
     "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",
+    "string-width": "7.0.0",
     "supertest": "6.3.3",
+    "to-vfile": "8.0.0",
     "tosource": "2.0.0-alpha.3",
-    "unified": "9.2.2"
+    "unified": "9.2.2",
+    "unist-util-visit": "4.1.2",
+    "unist-util-visit-parents": "5.1.3"
   },
   "engines": {
     "node": ">=16"

package/lib/routes/8btc/author.js

@@ -1,49 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-
-module.exports = async (ctx) => {
-    const authorid = ctx.params.authorid;
-    const response = await got.get(`https://webapi.8btc.com/bbt_api/comments/list?author_id=${authorid}&fetch_num=20`);
-
-    const ProcessFeed = (data) => {
-        const $ = cheerio.load(data);
-
-        // 提取内容
-        return $('.bbt-html').html();
-    };
-
-    const items = await Promise.all(
-        response.data.data.list.map(async (item) => {
-            const link = `https://www.8btc.com/article/${item.post_id}`;
-
-            const cache = await ctx.cache.get(link);
-            if (cache) {
-                return Promise.resolve(JSON.parse(cache));
-            }
-
-            const response = await got({
-                method: 'get',
-                url: link,
-            });
-
-            const description = ProcessFeed(response.data);
-
-            const single = {
-                title: item.post.title,
-                description,
-                pubDate: item.date_gmt,
-                link,
-                author: item.reviewer.name,
-            };
-            ctx.cache.set(link, JSON.stringify(single));
-            return Promise.resolve(single);
-        })
-    );
-
-    ctx.state.data = {
-        title: '巴比特作者专栏',
-        link: `https://www.8btc.com/author/${authorid}`,
-        description: '巴比特作者专栏',
-        item: items,
-    };
-};

package/lib/routes/8btc/news/flash.js

@@ -1,41 +0,0 @@
-const got = require('@/utils/got');
-
-module.exports = async (ctx) => {
-    const response = await got({
-        method: 'get',
-        url: `https://app.blockmeta.com/w1/news/list?num=30&cat_id=4481&page=1`,
-        headers: {
-            from: 'web',
-            Referer: `https://www.8btc.com/flash`,
-        },
-    });
-
-    const newsflashes = response.data.list;
-
-    let newsflashesList = [];
-    for (let i = 0; i < newsflashes.length; i++) {
-        newsflashesList = newsflashesList.concat(newsflashes[i]);
-    }
-
-    const out = newsflashesList.map((item) => {
-        const pubDate = item.post_date_format;
-        const link = item.source.link;
-        const title = item.title;
-        const description = item.content;
-
-        const single = {
-            title,
-            link,
-            pubDate,
-            description,
-        };
-
-        return single;
-    });
-
-    ctx.state.data = {
-        title: `快讯 - 巴比特`,
-        link: `https://www.8btc.com/flash`,
-        item: out,
-    };
-};

package/lib/routes/91ddcc/stage.js

@@ -1,48 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-
-module.exports = async (ctx) => {
-    const currentUrl = `https://sns.91ddcc.com/s/${ctx.params.stage}`;
-    const response = await got({
-        method: 'get',
-        url: currentUrl,
-    });
-
-    const $ = cheerio.load(response.data);
-    const list = $('div.log-box div.l-single')
-        .slice(0, 5)
-        .map((_, item) => {
-            item = $(item);
-            const a = item.find('div.word a.s-til');
-            return {
-                title: a.text(),
-                link: `https://sns.91ddcc.com${a.attr('href')}`,
-                pubDate: new Date(item.find('div.floor a.fr').text() + ' GMT+8').toUTCString(),
-                author: item.find('div.floor a.fl').text(),
-            };
-        })
-        .get();
-
-    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);
-
-                item.description = content('div.article-con').html();
-
-                return item;
-            })
-        )
-    );
-
-    ctx.state.data = {
-        title: `${$('a.name').text()} - 才符`,
-        link: currentUrl,
-        item: items,
-        description: $('div.bot-info').text(),
-    };
-};

package/lib/routes/91ddcc/user.js

@@ -1,45 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-
-module.exports = async (ctx) => {
-    const currentUrl = `https://sns.91ddcc.com/${ctx.params.user}`;
-    const response = await got({
-        method: 'get',
-        url: currentUrl,
-    });
-
-    const $ = cheerio.load(response.data);
-    const list = $('div.dynamic-single')
-        .slice(0, 10)
-        .map((_, item) => {
-            item = $(item);
-
-            const word = item.find('div.word');
-            const detailTitle = item.find('p.detail-title').text();
-
-            let link = currentUrl;
-            let title = detailTitle || word.html();
-
-            if (word.attr('onclick')) {
-                link = `https://sns.91ddcc.com${word.attr('onclick').split("'")[1]}`;
-            } else {
-                title = item.find('div.fl').text().trim();
-            }
-
-            item.find('p.detail-title').remove();
-
-            return {
-                title,
-                link,
-                description: item.find('div.dynamic-content').html(),
-                pubDate: new Date(item.attr('add-time') * 1000).toUTCString(),
-            };
-        })
-        .get();
-
-    ctx.state.data = {
-        title: `${$('span.user-name').text()} - 才符`,
-        link: currentUrl,
-        item: list,
-    };
-};