rsshub 1.0.0-master.fe560d2 → 1.0.0-master.fe6117a

package/lib/v2/zhangyoubao/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         mobile: [
             {
                 title: '推荐',
-                docs: 'https://docs.rsshub.app/game.html#zhang-you-bao-tui-jian',
+                docs: 'https://docs.rsshub.app/routes/game#zhang-you-bao-tui-jian',
                 source: ['/:category/'],
                 target: '/zhangyoubao/:category',
             },

package/lib/v2/zhibo8/forum.js

@@ -7,36 +7,35 @@ module.exports = async (ctx) => {
     const id = ctx.params.id;
     const link = `https://bbs.zhibo8.cc/forum/list/?fid=${id}`;
 
-    const response = await got.get(link);
+    const response = await got(link);
     const $ = cheerio.load(response.data);
 
     const title = $('div.intro > h2').text();
     const list = $('table.topic-list > tbody:nth-child(3) > tr');
 
     const out = await Promise.all(
-        list
-            .map(async (_, item) => {
-                item = $(item);
-                const title = item.find('td:nth-child(1) > a:nth-child(2)').text();
+        list.toArray().map((item) => {
+            item = $(item);
+            const a = item.find('td:nth-child(1) > a:nth-child(2)');
+            const link = 'https://bbs.zhibo8.cc' + a.attr('href');
+            return ctx.cache.tryGet(link, async () => {
+                const title = a.text();
                 const author = item.find('td:nth-child(2) cite a').text();
                 const date = item.find('td:nth-child(2) em').text();
-                const link = 'https://bbs.zhibo8.cc' + item.find('td:nth-child(1) > a:nth-child(2)').attr('href');
 
-                const single = {
+                const response = await got(link);
+                const $ = cheerio.load(response.data);
+                const description = $('.detail_ent').html();
+
+                return {
                     title,
+                    description,
                     author,
                     link,
                     pubDate: timezone(parseDate(date, 'YYYY-MM-DD HH:mm'), +8),
                 };
-
-                single.description = await ctx.cache.tryGet(link, async () => {
-                    const response = await got.get(link);
-                    const $ = cheerio.load(response.data);
-                    return $('.detail_ent').html();
-                });
-                return single;
-            })
-            .get()
+            });
+        })
     );
 
     ctx.state.data = {

package/lib/v2/zhibo8/luxiang.js

@@ -0,0 +1,38 @@
+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 rootUrl = 'https://www.zhibo8.cc';
+    const { category = 'nba' } = ctx.params;
+    const link = `${rootUrl}/${category}/luxiang.htm`;
+
+    const response = await got(link);
+    const $ = cheerio.load(response.data);
+
+    const list = $('.box')
+        .toArray()
+        .flatMap((item) => {
+            item = $(item);
+            const dateStr = item.find('h2').text().split(' ')[0];
+            return item
+                .find('a')
+                .toArray()
+                .map((item) => {
+                    const href = $(item).attr('href');
+                    return {
+                        title: `${item.previousSibling.data.replace(' | ', '')} ${$(item).text()}`,
+                        link: `${rootUrl}${href}`,
+                        pubDate: timezone(parseDate(`${href.replace(`/${category}/`, '').substring(0, 4)} ${dateStr}`, 'YYYY M月D日'), +8),
+                    };
+                });
+        });
+
+    ctx.state.data = {
+        title: $('head title').text(),
+        link,
+        image: 'https://www.zhibo8.cc/favicon.ico',
+        item: list,
+    };
+};

package/lib/v2/zhibo8/maintainer.js

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

package/lib/v2/zhibo8/more.js

@@ -23,34 +23,32 @@ module.exports = async (ctx) => {
     if (category === 'nba' || category === 'zuqiu') {
         currentUrl = `${rootUrl}/${category}/more.htm`;
 
-        response = await got({
-            method: 'get',
-            url: currentUrl,
-        });
+        response = await got(currentUrl);
 
         const $ = cheerio.load(response.data);
 
         list = $('ul.articleList li')
-            .slice(0, 30)
-            .map((_, item) => {
+            .slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 100)
+            .toArray()
+            .map((item) => {
                 item = $(item);
                 const a = item.find('a');
 
                 return {
                     title: a.text(),
-                    link: `http:${a.attr('href')}`,
+                    link: `https:${a.attr('href')}`,
                     pubDate: timezone(parseDate(item.find('span.postTime').text()), +8),
+                    category: item
+                        .attr('data-label')
+                        .split(',')
+                        .filter((c) => c),
                 };
-            })
-            .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,
-        });
+        response = await got(apiUrl);
 
         list = response.data.data.list.map((item) => ({
             title: item.title,
@@ -62,10 +60,7 @@ module.exports = async (ctx) => {
     const items = await Promise.all(
         list.map((item) =>
             ctx.cache.tryGet(item.link, async () => {
-                const res = await got({
-                    method: 'get',
-                    url: item.link,
-                });
+                const res = await got(item.link);
                 const content = cheerio.load(res.data);
 
                 item.description = content('div.content').html();

package/lib/v2/zhibo8/post.js

@@ -1,35 +1,45 @@
 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;
     const link = `https://bbs.zhibo8.cc/forum/topic?tid=${id}`;
 
-    const response = await got.get(link);
+    const response = await got(link);
     const $ = cheerio.load(response.data);
 
     const title = $('div.topic-title > h1').text();
     const list = $('.topic-content .topic-table');
 
-    const out = await Promise.all(
-        list
-            .map((index, item) => {
-                item = $(item);
-                const author = item.find('.topic-left > div > a').text();
-                const floor = item.find('p.topic-foot span:nth-child(2)').text();
-                const description = item.find('.detail_ent').html().replace(/src="/g, 'src="https:');
+    const out = list.toArray().map((item) => {
+        item = $(item);
+        const author = item.find('.topic-left > div > a').text();
+        const floor = item.find('p.topic-foot span:nth-child(2)').text();
+        const description = item.find('.detail_ent').html().replace(/src="/g, 'src="https:');
+        const pubDate = timezone(
+            parseDate(
+                item
+                    .find('p.topic-foot')
+                    .text()
+                    .match(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}/)[0],
+                'YYYY-MM-DD HH:mm'
+            ),
+            +8
+        );
 
-                const single = {
-                    title: `${floor}：${author}发表了新回复`,
-                    author,
-                    description,
-                    guid: floor,
-                };
+        const single = {
+            title: `${floor}：${author}发表了新回复`,
+            author,
+            description,
+            link,
+            pubDate,
+            guid: `zhibo8:post:${id}:${floor}`,
+        };
 
-                return single;
-            })
-            .get()
-    );
+        return single;
+    });
 
     ctx.state.data = {
         title: `“${title}”的新回复—直播吧`,

package/lib/v2/zhibo8/radar.js

@@ -1,16 +1,24 @@
 module.exports = {
     'zhibo8.cc': {
         _name: '直播吧',
+        '.': [
+            {
+                title: '录像',
+                docs: 'https://docs.rsshub.app/routes/multimedia#zhi-bo-ba',
+                source: ['/:category/luxiang.htm'],
+                target: '/zhibo8/luxiang/:category',
+            },
+        ],
         bbs: [
             {
                 title: '子论坛',
-                docs: 'https://docs.rsshub.app/bbs.html#zhi-bo-ba',
+                docs: 'https://docs.rsshub.app/routes/bbs#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',
+                docs: 'https://docs.rsshub.app/routes/bbs#zhi-bo-ba',
                 source: ['/'],
                 target: (_params, url) => `/zhibo8/post/${new URL(url).searchParams.get('tid')}`,
             },
@@ -18,7 +26,7 @@ module.exports = {
         news: [
             {
                 title: '滚动新闻',
-                docs: 'https://docs.rsshub.app/bbs.html#zhi-bo-ba',
+                docs: 'https://docs.rsshub.app/routes/bbs#zhi-bo-ba',
                 source: ['/:category'],
                 target: '/zhibo8/more/:category',
             },

package/lib/v2/zhibo8/router.js

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

package/lib/v2/zhihu/answers.js

@@ -19,16 +19,20 @@ module.exports = async (ctx) => {
     let name = data[0].author.name;
 
     if (name === '知乎用户') {
-        const info = await got({
-            method: 'get',
-            url: `https://www.zhihu.com/api/v4/members/${id}/activities?limit=1`,
-            headers: {
-                ...utils.header,
-                Referer: `https://www.zhihu.com/people/${id}/activities`,
-                Authorization: 'oauth c3cef7c66a1843f8b3a9e6a1e3160e20', // hard-coded in js
-            },
+        const userProfile = await ctx.cache.tryGet(`zhihu:profile:${id}`, async () => {
+            const apiPath = `/api/v4/members/${id}`;
+
+            const { data } = await got({
+                method: 'get',
+                url: `https://www.zhihu.com${apiPath}`,
+                headers: {
+                    ...utils.header,
+                    Referer: `https://www.zhihu.com/people/${id}`,
+                },
+            });
+            return data;
         });
-        name = info.data.data[0].actor.name;
+        name = userProfile.name;
     }
 
     const items = await Promise.all(

package/lib/v2/zhihu/daily_section.js

@@ -1,5 +1,6 @@
 const got = require('@/utils/got');
 const utils = require('./utils');
+const { parseDate } = require('@/utils/parse-date');
 
 // 参考：https://github.com/izzyleung/ZhihuDailyPurify/wiki/%E7%9F%A5%E4%B9%8E%E6%97%A5%E6%8A%A5-API-%E5%88%86%E6%9E%90
 // 文章给出了v7版 api的信息，包含全文api
@@ -21,6 +22,7 @@ module.exports = async (ctx) => {
             const url = 'https://news-at.zhihu.com/api/7/news/' + story.id;
             const item = {
                 title: story.title,
+                pubDate: parseDate(story.date, 'YYYYMMDD'),
                 description: '',
                 link: 'https://daily.zhihu.com/story/' + story.id,
             };

package/lib/v2/zhihu/maintainer.js

@@ -15,5 +15,11 @@ module.exports = {
     '/timeline': ['SeanChao'],
     '/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'],
     '/zhuanlan/:id': ['DIYgod'],
 };

package/lib/v2/zhihu/radar.js

@@ -4,87 +4,129 @@ module.exports = {
         www: [
             {
                 title: '收藏夹',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
                 source: '/collection/:id',
                 target: '/zhihu/collection/:id',
             },
             {
                 title: '用户动态',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
                 source: '/people/:id',
                 target: '/zhihu/people/activities/:id',
             },
             {
                 title: '用户回答',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
                 source: '/people/:id/answers',
                 target: '/zhihu/people/answers/:id',
             },
             {
                 title: '用户想法',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
                 source: '/people/:id/pins',
                 target: '/zhihu/people/pins/:id',
             },
             {
                 title: '用户文章',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
                 source: '/:usertype/:id/posts',
                 target: '/zhihu/posts/:usertype/:id',
             },
 
             {
                 title: '热榜',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
                 source: '/hot',
                 target: '/zhihu/hotlist',
             },
             {
                 title: '想法热榜',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
                 target: '/zhihu/pin/hotlist',
             },
             {
                 title: '问题',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
                 source: '/question/:questionId',
                 target: '/zhihu/question/:questionId',
             },
             {
                 title: '话题',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
                 source: '/topic/:topicId/:type',
                 target: '/zhihu/topic/:topicId',
             },
             {
                 title: '新书',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
                 source: '/zhihu/bookstore/newest',
                 target: '/zhihu/pin/hotlist',
             },
             {
                 title: '想法-24 小时新闻汇总',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
                 source: '/pin/special/972884951192113152',
                 target: '/zhihu/pin/daily',
             },
             {
                 title: '书店-周刊',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
                 source: '/pub/weekly',
                 target: '/zhihu/weekly',
             },
             {
                 title: '专栏',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
                 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',
+                source: '/collection/:id',
+                target: '/zhihu/xhu/collection/:id',
+            },
+            {
+                title: 'xhu - 问题',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
+                source: '/question/:questionId',
+                target: '/zhihu/xhu/question/:questionId',
+            },
+            {
+                title: 'xhu - 话题',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
+                source: '/topic/:topicId/:type',
+                target: '/zhihu/xhu/topic/:topicId',
+            },
+            {
+                title: 'xhu - 专栏',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
+                source: '/column/:id',
+                target: '/zhihu/xhu/zhuanlan/:id',
+            },
         ],
         zhuanlan: [
             {
                 title: '专栏',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
                 source: '/:id',
                 target: '/zhihu/zhuanlan/:id',
             },
@@ -92,14 +134,14 @@ module.exports = {
         daily: [
             {
                 title: '日报',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
+                source: '/',
                 target: '/zhihu/daily',
             },
             {
                 title: '日报',
-                docs: 'https://docs.rsshub.app/social-media.html#zhi-hu',
-                source: '/*tpath',
+                docs: 'https://docs.rsshub.app/routes/social-media#zhi-hu',
+                source: '/*',
                 target: '/zhihu/daily',
             },
         ],

package/lib/v2/zhihu/router.js

@@ -15,5 +15,11 @@ module.exports = (router) => {
     router.get('/timeline', require('./timeline'));
     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'));
     router.get('/zhuanlan/:id', require('./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}`,
+        })),
+    };
+};