rsshub 1.0.0-master.fc91df6 → 1.0.0-master.fccb918

package/lib/routes/ximalaya/utils.js

@@ -2,134 +2,9 @@ const crypto = require('crypto');
 const getParams = (ep) => {
     const a1 = 'xkt3a41psizxrh9l';
     const a = [
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        62,
-        -1,
-        -1,
-        -1,
-        63,
-        52,
-        53,
-        54,
-        55,
-        56,
-        57,
-        58,
-        59,
-        60,
-        61,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        0,
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        10,
-        11,
-        12,
-        13,
-        14,
-        15,
-        16,
-        17,
-        18,
-        19,
-        20,
-        21,
-        22,
-        23,
-        24,
-        25,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
-        26,
-        27,
-        28,
-        29,
-        30,
-        31,
-        32,
-        33,
-        34,
-        35,
-        36,
-        37,
-        38,
-        39,
-        40,
-        41,
-        42,
-        43,
-        44,
-        45,
-        46,
-        47,
-        48,
-        49,
-        50,
-        51,
-        -1,
-        -1,
-        -1,
-        -1,
-        -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, 54, 55, 56, 57, 58, 59,
+        60, 61, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+        44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
     ];
     let o = ep.length;
     let r = 0;

package/lib/routes/yahoo-news/index.js

@@ -21,7 +21,7 @@ module.exports = async (ctx) => {
 
                 const $ = cheerio.load(response.data);
                 const $descriptionRoot = cheerio.load('<div><div class="img-root"></div><div class="content-root"></div></div>');
-                $descriptionRoot('div.img-root').append($('article img'));
+                $descriptionRoot('div.img-root').append($('article img:not(header img)'));
                 $descriptionRoot('div.content-root').append($('article p').removeAttr('content'));
                 return $descriptionRoot.html();
             });

package/lib/routes/youtube/channel.js

@@ -3,7 +3,7 @@ const config = require('@/config').value;
 
 module.exports = async (ctx) => {
     if (!config.youtube || !config.youtube.key) {
-        throw 'YouTube RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#%E9%83%A8%E5%88%86-rss-%E6%A8%A1%E5%9D%97%E9%85%8D%E7%BD%AE">relevant config</a>';
+        throw 'YouTube RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#pei-zhi-bu-fen-rss-mo-kuai-pei-zhi">relevant config</a>';
     }
     const id = ctx.params.id;
     const embed = !ctx.params.embed;

package/lib/routes/youtube/playlist.js

@@ -3,7 +3,7 @@ const config = require('@/config').value;
 
 module.exports = async (ctx) => {
     if (!config.youtube || !config.youtube.key) {
-        throw 'YouTube RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#%E9%83%A8%E5%88%86-rss-%E6%A8%A1%E5%9D%97%E9%85%8D%E7%BD%AE">relevant config</a>';
+        throw 'YouTube RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#pei-zhi-bu-fen-rss-mo-kuai-pei-zhi">relevant config</a>';
     }
     const id = ctx.params.id;
     const embed = !ctx.params.embed;

package/lib/routes/youtube/user.js

@@ -3,7 +3,7 @@ const config = require('@/config').value;
 
 module.exports = async (ctx) => {
     if (!config.youtube || !config.youtube.key) {
-        throw 'YouTube RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#%E9%83%A8%E5%88%86-rss-%E6%A8%A1%E5%9D%97%E9%85%8D%E7%BD%AE">relevant config</a>';
+        throw 'YouTube RSS is disabled due to the lack of <a href="https://docs.rsshub.app/install/#pei-zhi-bu-fen-rss-mo-kuai-pei-zhi">relevant config</a>';
     }
     const username = ctx.params.username;
     const embed = !ctx.params.embed;

package/lib/routes/yyets/todayfilelist.js

@@ -28,7 +28,6 @@ module.exports = async (ctx) => {
             // 文章链接
             link: `${item.magnet_url}&tr=http://tr.cili001.com:8070/announce&tr=udp://p4p.arenabg.com:1337&tr=udp://tracker.opentrackr.org:1337/announce&tr=udp://open.demonii.com:1337`,
             enclosure_url: `${item.magnet_url}&tr=http://tr.cili001.com:8070/announce&tr=udp://p4p.arenabg.com:1337&tr=udp://tracker.opentrackr.org:1337/announce&tr=udp://open.demonii.com:1337`, // 磁力链接
-            enclosure_length: '', // 时间戳 (播放长度) , 一般是秒数，可选
             enclosure_type: 'application/x-bittorrent', // 固定为 'application/x-bittorrent'
         })),
     };

package/lib/routes/zcool/top.js

@@ -8,7 +8,7 @@ module.exports = async (ctx) => {
     const topResponse = await got({
         method: 'get',
         url,
-        header: {
+        headers: {
             Referer: 'https://www.zcool.com.cn',
         },
     });
@@ -20,7 +20,7 @@ module.exports = async (ctx) => {
         const articleResponse = await got({
             method: 'get',
             url: 'https://www.zcool.com.cn/top/article.do?rankType=8&rankId=' + rankId,
-            header: {
+            headers: {
                 Referer: url,
             },
         });
@@ -56,7 +56,7 @@ module.exports = async (ctx) => {
             const itemResponse = await got({
                 method: 'get',
                 url: link,
-                header: {
+                headers: {
                     Referer: url,
                 },
             });

package/lib/routes/zhihu/activities.js

@@ -19,6 +19,7 @@ module.exports = async (ctx) => {
     ctx.state.data = {
         title: `${data[0].actor.name}的知乎动态`,
         link: `https://www.zhihu.com/people/${id}/activities`,
+        image: data[0].actor.avatar_url,
         description: data[0].actor.headline || data[0].actor.description,
         item: data.map((item) => {
             const detail = item.target;

package/lib/routes/zhihu/collection.js

@@ -5,6 +5,7 @@ const { generateData } = require('./pin/utils');
 
 module.exports = async (ctx) => {
     const id = ctx.params.id;
+    const getAll = ctx.params.getAll;
 
     const response = await got({
         method: 'get',
@@ -17,6 +18,29 @@ module.exports = async (ctx) => {
 
     const list = response.data.data;
 
+    if (getAll) {
+        const totals = response.data.paging.totals;
+
+        const offsetList = [...new Array(Math.round(totals / 20)).keys()].map((item) => item * 20).slice(1);
+        const otherList = await Promise.all(
+            offsetList.map((offset) =>
+                ctx.cache.tryGet(`https://www.zhihu.com/api/v4/collections/${id}/items?offset=${offset}&limit=20`, async () => {
+                    const response = await got({
+                        method: 'get',
+                        url: `https://www.zhihu.com/api/v4/collections/${id}/items?offset=${offset}&limit=20`,
+                        headers: {
+                            ...utils.header,
+                            Referer: `https://www.zhihu.com/collection/${id}`,
+                        },
+                    });
+
+                    return response.data.data;
+                })
+            )
+        ).then((item) => item.flat());
+        list.push(...otherList);
+    }
+
     const response2 = await got({
         method: 'get',
         url: `https://www.zhihu.com/collection/${id}`,
@@ -42,9 +66,9 @@ module.exports = async (ctx) => {
                 item.content.type === 'pin'
                     ? generateDataPin(item)
                     : {
-                          title: item.content.type === 'article' ? item.content.title : item.content.question.title,
+                          title: item.content.type === 'article' || item.content.type === 'zvideo' ? item.content.title : item.content.question.title,
                           link: item.content.url,
-                          description: item.content.content,
+                          description: item.content.type === 'zvideo' ? `<img src=${item.content.video.url}/>` : item.content.content,
                           pubDate: new Date((item.content.type === 'article' ? item.content.updated : item.content.updated_time) * 1000).toUTCString(),
                       }
             ),

package/lib/routes/zhihu/daily.js

@@ -49,6 +49,7 @@ module.exports = async (ctx) => {
         title: '知乎日报',
         link: 'https://daily.zhihu.com',
         description: '每天3次，每次7分钟',
+        image: 'http://static.daily.zhihu.com/img/new_home_v3/mobile_top_logo.png',
         item: items,
     };
 };

package/lib/routes/zhihu/daily_section.js

@@ -49,6 +49,7 @@ module.exports = async (ctx) => {
         title: `${listRes.data.name} - 知乎日报`,
         link: 'https://daily.zhihu.com',
         description: '每天3次，每次7分钟',
+        image: 'http://static.daily.zhihu.com/img/new_home_v3/mobile_top_logo.png',
         item: resultItem,
     };
 };

package/lib/routes/zhihu/hot.js

@@ -1,4 +1,5 @@
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
 
 const titles = {
     total: '全站',
@@ -23,9 +24,9 @@ module.exports = async (ctx) => {
     });
 
     const items = response.data.data.map((item) => ({
-        link: item.target.url,
+        link: `https://www.zhihu.com/question/${item.target.id}`,
         title: item.target.title,
-        pubDate: new Date(item.target.created * 1000).toUTCString(),
+        pubDate: parseDate(item.target.created * 1000),
         description: item.target.excerpt ? `<p>${item.target.excerpt}</p>` : '',
     }));
 

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

@@ -17,13 +17,23 @@ module.exports = {
                         break;
 
                     case 'video':
-                        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}"
-                  >`;
+                        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':

package/lib/routes/zhihu/posts.js

@@ -1,6 +1,7 @@
 const got = require('@/utils/got');
 const utils = require('./utils');
 const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
     const id = ctx.params.id;
@@ -38,7 +39,7 @@ module.exports = async (ctx) => {
                 title: String(item.title),
                 description: item.content,
                 link: item.url,
-                pubDate: new Date(item.updated).toUTCString(),
+                pubDate: parseDate(item.updated * 1000),
             })),
     };
 };

package/lib/routes/zhihu/topic.js

@@ -1,5 +1,6 @@
 const got = require('@/utils/got');
 const utils = require('./utils');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
     const { topicId } = ctx.params;
@@ -32,7 +33,7 @@ module.exports = async (ctx) => {
                     title = `${item.question.title}-${item.author.name}的回答：${item.excerpt}`;
                     description = `<strong>${item.question.title}</strong><br>${item.author.name}的回答<br/>${utils.ProcessImage(item.content)}`;
                     link = `https://www.zhihu.com/question/${item.question.id}/answer/${item.id}`;
-                    pubDate = new Date(item.updated_time * 1000).toUTCString();
+                    pubDate = parseDate(item.updated_time * 1000);
                     author = item.author.name;
                     break;
 
@@ -40,7 +41,14 @@ module.exports = async (ctx) => {
                     title = item.title;
                     description = item.title;
                     link = `https://www.zhihu.com/question/${item.id}`;
-                    pubDate = new Date(item.created * 1000).toUTCString();
+                    pubDate = parseDate(item.created * 1000);
+                    break;
+
+                case 'article':
+                    title = item.title;
+                    description = item.content;
+                    link = item.url;
+                    pubDate = parseDate(item.created * 1000);
                     break;
 
                 default:

package/lib/routes/zhihu/zhuanlan.js

@@ -14,6 +14,17 @@ module.exports = async (ctx) => {
         },
     });
 
+    const pinnedRes = await got({
+        method: 'get',
+        url: `https://www.zhihu.com/api/v4/columns/${id}/pinned-items`,
+        headers: {
+            ...utils.header,
+            Referer: `https://zhuanlan.zhihu.com/${id}`,
+        },
+    });
+
+    listRes.data.data = listRes.data.data.concat(pinnedRes.data.data);
+
     // 知乎专栏链接存在两种格式, 一种以 'zhuanlan.' 开头, 另一种新增的以 'c_' 结尾
     let url = `https://zhuanlan.zhihu.com/${id}`;
     if (id.search('c_') === 0) {
@@ -41,7 +52,7 @@ module.exports = async (ctx) => {
 
         if (item.type === 'answer') {
             title = item.question.title;
-            author = item.question.author.name;
+            author = item.question.author ? item.question.author.name : '';
             link = `https://www.zhihu.com/question/${item.question.id}/answer/${item.id}`;
             pubDate = new Date(item.created_time * 1000);
         } else if (item.type === 'article') {

package/lib/utils/common-config.js

@@ -3,6 +3,10 @@ const got = require('@/utils/got');
 const iconv = require('iconv-lite');
 // eslint-disable-next-line no-unused-vars
 const date = require('@/utils/date');
+// eslint-disable-next-line no-unused-vars
+const { parseDate } = require('@/utils/parse-date');
+// eslint-disable-next-line no-unused-vars
+const timezone = require('@/utils/timezone');
 
 function transElemText($, prop) {
     const regex = new RegExp(/\$\((.*)\)/g);

package/lib/utils/common-utils.js

@@ -1,3 +1,5 @@
+const { parseDate } = require('@/utils/parse-date');
+
 // convert a string into title case
 const toTitleCase = (str) =>
     str
@@ -6,6 +8,30 @@ const toTitleCase = (str) =>
         .map((word) => word.replace(word[0], word[0].toUpperCase()))
         .join(' ');
 
+const rWhiteSpace = /\s+/;
+const rAllWhiteSpace = /\s+/g;
+
+// collapse all whitespaces into a single space (like "white-space: normal;" would do), and trim
+const collapseWhitespace = (str) => {
+    if (str && rWhiteSpace.test(str)) {
+        return str.replace(rAllWhiteSpace, ' ').trim();
+    }
+    return str;
+};
+
+const convertDateToISO8601 = (date) => {
+    if (!date) {
+        return date;
+    }
+    if (typeof date !== 'object') {
+        // some routes may call `.toUTCString()` before passing the date to ctx...
+        date = parseDate(date);
+    }
+    return date.toISOString();
+};
+
 module.exports = {
     toTitleCase,
+    collapseWhitespace,
+    convertDateToISO8601,
 };