rsshub 1.0.0-master.f7f8b7a → 1.0.0-master.f812e91

package/lib/v2/nytimes/router.js

@@ -1,5 +1,4 @@
 module.exports = (router) => {
-    router.get('/author/:byline', require('./author.js'));
     router.get('/book/:category?', require('./book.js'));
     router.get('/daily_briefing_chinese', require('./daily_briefing_chinese'));
     router.get('/:lang?', require('./index'));

package/lib/v2/qweather/3days.js

@@ -28,7 +28,7 @@ module.exports = async (ctx) => {
         data.push(responseData.daily[i]);
     }
     const items = data.map((item) => ({
-        title: '预报日期：' + item.fxDate,
+        title: `${item.fxDate}: ${item.textDay === item.textNight ? item.textDay : item.textDay + '转' + item.textNight}`,
         description: art(path.join(__dirname, 'templates/3days.art'), {
             item,
         }),

package/lib/v2/reuters/common.js

@@ -68,60 +68,67 @@ module.exports = async (ctx) => {
         title: e.title,
         link: new URL(e.canonical_url, rootUrl).href,
         guid: e.id,
+        pubDate: parseDate(e.published_time),
+        updated: parseDate(e.updated_time),
+        author: e.authors.map((e) => e.name).join(', '),
+        category: e.kicker.names,
+        description: e.description,
     }));
 
     items = items.filter((e, i) => items.findIndex((f) => e.guid === f.guid) === i);
 
     const results = await Promise.allSettled(
         items.map((item) =>
-            ctx.cache.tryGet(item.link, async () => {
-                const detailResponse = await got(item.link);
-                const content = cheerio.load(detailResponse.data);
-
-                if (detailResponse.url.startsWith('https://www.reuters.com/investigates/')) {
-                    const ldJson = JSON.parse(content('script[type="application/ld+json"]').text());
-                    content('.special-report-article-container .container, #slide-dek, #slide-end, .share-in-article-container').remove();
-
-                    item.title = ldJson.headline;
-                    item.pubDate = parseDate(ldJson.dateCreated);
-                    item.author = ldJson.creator;
-                    item.category = ldJson.keywords;
-                    item.description = content('.special-report-article-container').html();
-
-                    return item;
-                }
-
-                const matches = content('script#fusion-metadata')
-                    .text()
-                    .match(/Fusion.globalContent=(\{[\s\S]*?});/);
-
-                if (matches) {
-                    const data = JSON.parse(matches[1]);
-
-                    item.title = data.result.title || item.title;
-                    item.description = art(path.join(__dirname, 'templates/description.art'), {
-                        result: data.result,
-                    });
-                    item.pubDate = parseDate(data.result.display_time);
-                    item.author = data.result.authors.map((author) => author.name).join(', ');
-                    item.category = data.result.taxonomy.keywords;
-
-                    return item;
-                }
-
-                content('.title').remove();
-                content('.article-metadata').remove();
-
-                item.title = content('meta[property="og:title"]').attr('content');
-                item.pubDate = parseDate(detailResponse.data.match(/"datePublished":"(.*?)","dateModified/)[1]);
-                item.author = detailResponse.data
-                    .match(/{"@type":"Person","name":"(.*?)"}/g)
-                    .map((p) => p.match(/"name":"(.*?)"/)[1])
-                    .join(', ');
-                item.description = content('article').html();
-
-                return item;
-            })
+            ctx.query.mode !== 'fulltext'
+                ? item
+                : ctx.cache.tryGet(item.link, async () => {
+                      const detailResponse = await got(item.link);
+                      const content = cheerio.load(detailResponse.data);
+
+                      if (detailResponse.url.startsWith('https://www.reuters.com/investigates/')) {
+                          const ldJson = JSON.parse(content('script[type="application/ld+json"]').text());
+                          content('.special-report-article-container .container, #slide-dek, #slide-end, .share-in-article-container').remove();
+
+                          item.title = ldJson.headline;
+                          item.pubDate = parseDate(ldJson.dateCreated);
+                          item.author = ldJson.creator;
+                          item.category = ldJson.keywords;
+                          item.description = content('.special-report-article-container').html();
+
+                          return item;
+                      }
+
+                      const matches = content('script#fusion-metadata')
+                          .text()
+                          .match(/Fusion.globalContent=(\{[\s\S]*?});/);
+
+                      if (matches) {
+                          const data = JSON.parse(matches[1]);
+
+                          item.title = data.result.title || item.title;
+                          item.description = art(path.join(__dirname, 'templates/description.art'), {
+                              result: data.result,
+                          });
+                          item.pubDate = parseDate(data.result.display_time);
+                          item.author = data.result.authors.map((author) => author.name).join(', ');
+                          item.category = data.result.taxonomy.keywords;
+
+                          return item;
+                      }
+
+                      content('.title').remove();
+                      content('.article-metadata').remove();
+
+                      item.title = content('meta[property="og:title"]').attr('content');
+                      item.pubDate = parseDate(detailResponse.data.match(/"datePublished":"(.*?)","dateModified/)[1]);
+                      item.author = detailResponse.data
+                          .match(/{"@type":"Person","name":"(.*?)"}/g)
+                          .map((p) => p.match(/"name":"(.*?)"/)[1])
+                          .join(', ');
+                      item.description = content('article').html();
+
+                      return item;
+                  })
         )
     );
     items = results.filter((r) => r.status === 'fulfilled').map((r) => r.value);

package/lib/v2/sehuatang/index.js

@@ -88,20 +88,18 @@ module.exports = async (ctx) => {
                         $(image).replaceWith($(`<img src="${file}">`));
                     }
                 }
-                // if postMessage does not have any images, try to parse image url from `.pattl`
-                if (images.length === 0) {
-                    const pattl = $('.pattl');
-                    const pattlImages = $(pattl).find('img');
-                    for (const pattlImage of pattlImages) {
-                        const file = $(pattlImage).attr('file');
-                        if (!file || file === 'undefined') {
-                            $(pattlImage).replaceWith('');
-                        } else {
-                            $(pattlImage).replaceWith($(`<img src="${file}" />`));
-                        }
+                // also parse image url from `.pattl`
+                const pattl = $('.pattl');
+                const pattlImages = $(pattl).find('img');
+                for (const pattlImage of pattlImages) {
+                    const file = $(pattlImage).attr('file');
+                    if (!file || file === 'undefined') {
+                        $(pattlImage).replaceWith('');
+                    } else {
+                        $(pattlImage).replaceWith($(`<img src="${file}" />`));
                     }
-                    postMessage.append($(pattl));
                 }
+                postMessage.append($(pattl));
                 $('em[onclick]').remove();
 
                 info.description = (postMessage.html() || '抓取原帖失败').replace(/ignore_js_op/g, 'div');

package/lib/v2/sehuatang/user.js

@@ -62,20 +62,19 @@ module.exports = async (ctx) => {
                         $(image).replaceWith($(`<img src="${file}">`));
                     }
                 }
-                // if postMessage does not have any images, try to parse image url from `.pattl`
-                if (images.length === 0) {
-                    const pattl = $('.pattl');
-                    const pattlImages = $(pattl).find('img');
-                    for (const pattlImage of pattlImages) {
-                        const file = $(pattlImage).attr('file');
-                        if (!file || file === 'undefined') {
-                            $(pattlImage).replaceWith('');
-                        } else {
-                            $(pattlImage).replaceWith($(`<img src="${file}" />`));
-                        }
+                // also parse image url from `.pattl`
+                const pattl = $('.pattl');
+                const pattlImages = $(pattl).find('img');
+                for (const pattlImage of pattlImages) {
+                    const file = $(pattlImage).attr('file');
+                    if (!file || file === 'undefined') {
+                        $(pattlImage).replaceWith('');
+                    } else {
+                        $(pattlImage).replaceWith($(`<img src="${file}" />`));
                     }
-                    postMessage.append($(pattl));
                 }
+                postMessage.append($(pattl));
+
                 $('em[onclick]').remove();
 
                 info.description = (postMessage.html() || '抓取原帖失败').replace(/ignore_js_op/g, 'div');

package/lib/v2/thenewslens/radar.js

@@ -44,12 +44,6 @@ module.exports = {
                 source: ['/review/:sort?', '/'],
                 target: '/thenewslens/review/:sort?',
             },
-            {
-                title: '影音',
-                docs: 'https://docs.rsshub.app/routes/new-media#the-news-lens-guan-jian-ping-lun',
-                source: ['/videos/Projects/:sort?', '/'],
-                target: '/thenewslens/videos/Projects/:sort?',
-            },
         ],
     },
 };

package/lib/v2/thoughtco/index.js

@@ -64,7 +64,7 @@ module.exports = async (ctx) => {
                     new Set(
                         content('meta[name="parsely-tags"]')
                             .prop('content')
-                            .split(/,/)
+                            ?.split(/,/)
                             .map((c) => c.trim())
                     )
                 );

package/lib/v2/threads/index.js

@@ -66,7 +66,7 @@ module.exports = async (ctx) => {
     ctx.state.data = {
         title: `${userData.full_name} (@${userData.username}) on Threads`,
         link: profileUrl(user),
-        image: userData.hd_profile_pic_versions.sort((a, b) => b.width - a.width)[0].url,
+        image: userData.hd_profile_pic_versions?.sort((a, b) => b.width - a.width)[0].url ?? userData.profile_pic_url,
         description: userData.biography,
         item: items,
     };

package/lib/v2/tophub/list.js

@@ -0,0 +1,40 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const config = require('@/config').value;
+const path = require('path');
+const { art } = require('@/utils/render');
+
+module.exports = async (ctx) => {
+    const id = ctx.params.id;
+    const link = `https://tophub.today/n/${id}`;
+    const response = await got.get(link, {
+        headers: {
+            Referer: 'https://tophub.today',
+            Cookie: config.tophub.cookie,
+        },
+    });
+    const $ = cheerio.load(response.data);
+    const title = $('div.Xc-ec-L.b-L').text().trim();
+    const items = $('div.Zd-p-Sc > div:nth-child(1) tr')
+        .toArray()
+        .map((e) => ({
+            title: $(e).find('td.al a').text().trim(),
+            link: $(e).find('td.al a').attr('href'),
+            heatRate: $(e).find('td:nth-child(3)').text().trim(),
+        }));
+    const combinedTitles = items.map((item) => item.title).join('');
+    const renderRank = art(path.join(__dirname, 'templates/rank.art'), { items });
+
+    ctx.state.data = {
+        title,
+        link,
+        item: [
+            {
+                title,
+                link,
+                description: renderRank,
+                guid: combinedTitles,
+            },
+        ],
+    };
+};

package/lib/v2/tophub/maintainer.js

@@ -1,3 +1,4 @@
 module.exports = {
     '/:id': ['LogicJake'],
+    '/list/:id': ['akynazh'],
 };

package/lib/v2/tophub/radar.js

@@ -8,6 +8,12 @@ module.exports = {
                 source: ['/n/:id'],
                 target: '/tophub/:id',
             },
+            {
+                title: '榜单列表',
+                docs: 'https://docs.rsshub.app/routes/new-media#jin-ri-re-bang-bang-dan-lie-biao',
+                source: ['/n/:id'],
+                target: '/tophub/list/:id',
+            },
         ],
     },
 };

package/lib/v2/tophub/router.js

@@ -1,3 +1,4 @@
 module.exports = (router) => {
     router.get('/:id', require('./'));
+    router.get('/list/:id', require('./list'));
 };

package/lib/v2/tophub/templates/rank.art

@@ -0,0 +1,22 @@
+<table>
+  <thead>
+    <tr>
+      <th>排名</th>
+      <th>标题</th>
+      <th>热度</th>
+    </tr>
+  </thead>
+  <tbody>
+    {{each items}}
+      <tr>
+        <td>{{ $index + 1 }}</td>
+        <td>
+          <a href="{{ $value.link }}">
+            {{ $value.title }}
+          </a>
+        </td>
+        <td>{{ $value.heatRate }}</td>
+      </tr>
+    {{/each}}
+  </tbody>
+</table>

package/lib/v2/twreporter/maintainer.js

@@ -1,5 +1,3 @@
 module.exports = {
-    '/category/:cid': ['emdoe'],
     '/newest': ['emdoe'],
-    '/photography': ['emdoe'],
 };

package/lib/v2/twreporter/radar.js

@@ -8,18 +8,6 @@ module.exports = {
                 source: ['/'],
                 target: '/twreporter/newest',
             },
-            {
-                title: '摄影',
-                docs: 'https://docs.rsshub.app/routes/new-media#bao-dao-zhe',
-                source: ['/photography'],
-                target: '/twreporter',
-            },
-            {
-                title: '分类',
-                docs: 'https://docs.rsshub.app/routes/new-media#bao-dao-zhe',
-                source: ['/categories/:tid'],
-                target: '/twreporter/category/:tid',
-            },
         ],
     },
 };

package/lib/v2/twreporter/router.js

@@ -1,5 +1,3 @@
 module.exports = (router) => {
-    router.get('/category/:cid', require('./category'));
     router.get('/newest', require('./newest'));
-    router.get('/photography', require('./photography'));
 };

package/lib/v2/worldjournal/index.js

@@ -43,7 +43,7 @@ module.exports = async (ctx) => {
                 });
 
                 item.description = $('.article-content__paragraph').html();
-                item.categories = $('meta[name=news_keywords]').attr('content').split(',');
+                item.categories = $('meta[name=news_keywords]').attr('content')?.split(',');
 
                 return item;
             })

package/lib/v2/woshipm/maintainer.js

@@ -1,6 +1,4 @@
 module.exports = {
-    '/bookmarks/:id': ['LogicJake'],
-    '/latest': ['Director-0428'],
     '/popular/:range?': ['WenryXu'],
     '/user_article/:id': ['LogicJake'],
     '/wen': ['WenryXu'],

package/lib/v2/woshipm/radar.js

@@ -8,24 +8,12 @@ module.exports = {
                 source: ['/'],
                 target: '/woshipm/popular',
             },
-            {
-                title: '用户收藏',
-                docs: 'https://docs.rsshub.app/routes/new-media#ren-ren-dui-shi-chan-pin-jing-li',
-                source: ['/u/:id'],
-                target: '/woshipm/bookmarks/:id',
-            },
             {
                 title: '用户文章',
                 docs: 'https://docs.rsshub.app/routes/new-media#ren-ren-dui-shi-chan-pin-jing-li',
                 source: ['/u/:id'],
                 target: '/woshipm/user_article/:id',
             },
-            {
-                title: '最新文章',
-                docs: 'https://docs.rsshub.app/routes/new-media#ren-ren-dui-shi-chan-pin-jing-li',
-                source: ['/'],
-                target: '/woshipm/latest',
-            },
         ],
         wen: [
             {

package/lib/v2/woshipm/router.js

@@ -1,6 +1,4 @@
 module.exports = (router) => {
-    router.get('/bookmarks/:id', require('./bookmarks'));
-    router.get('/latest', require('./latest'));
     router.get('/popular/:range?', require('./popular'));
     router.get('/user_article/:id', require('./user_article'));
     router.get('/wen', require('./wen'));

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/rss3-ums.js

@@ -35,7 +35,7 @@ const rss3Ums = (data) => {
                         metadata: {
                             authors: typeof item.author === 'string' ? [{ name: item.author }] : item.author,
                             description: item.description,
-                            pubDate: item.pubDate,
+                            pub_date: item.pubDate,
                             tags: typeof item.category === 'string' ? [item.category] : item.category,
                             title: item.title,
                         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsshub",
-  "version": "1.0.0-master.f7f8b7a",
+  "version": "1.0.0-master.f812e91",
   "description": "Make RSS Great Again!",
   "keywords": [
     "RSS"
@@ -153,7 +153,7 @@
     "@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.7",
     "@types/module-alias": "2.0.4",
@@ -166,7 +166,7 @@
     "@types/tough-cookie": "4.0.5",
     "@vercel/nft": "0.26.0",
     "cross-env": "7.0.3",
-    "eslint": "8.55.0",
+    "eslint": "8.56.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-n": "16.4.0",
     "eslint-plugin-prettier": "5.0.1",