rsshub 1.0.0-master.f944cc9 → 1.0.0-master.f97cdb2

package/lib/routes/weibo/utils.js

@@ -1,5 +1,6 @@
 const querystring = require('querystring');
 const got = require('@/utils/got');
+const cheerio = require('cheerio');
 const { fallback, queryToBoolean, queryToInteger } = require('@/utils/readable-social');
 
 const weiboUtils = {
@@ -22,6 +23,8 @@ const weiboUtils = {
             widthOfPics: fallback(params.widthOfPics, queryToInteger(routeParams.widthOfPics), -1),
             heightOfPics: fallback(params.heightOfPics, queryToInteger(routeParams.heightOfPics), -1),
             sizeOfAuthorAvatar: fallback(params.sizeOfAuthorAvatar, queryToInteger(routeParams.sizeOfAuthorAvatar), 48),
+            showEmojiInDescription: fallback(params.showEmojiInDescription, queryToInteger(routeParams.showEmojiInDescription), true),
+            showLinkIconInDescription: fallback(params.showLinkIconInDescription, queryToInteger(routeParams.showLinkIconInDescription), true),
         };
 
         params = mergedParams;
@@ -41,17 +44,25 @@ const weiboUtils = {
             widthOfPics,
             heightOfPics,
             sizeOfAuthorAvatar,
+            showEmojiInDescription,
+            showLinkIconInDescription,
         } = params;
 
         let retweeted = '';
         // 长文章的处理
         let htmlNewLineUnreplaced = (status.longText && status.longText.longTextContent) || status.text || '';
         // 表情图标转换为文字
-        htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<span class="url-icon"><img.*?alt="?(.*?)"? [\s\S]*?\/><\/span>/g, '$1');
-        // 去掉外部链接的图标
-        htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<span class=["|']url-icon["|']>.*?<\/span><span class="surl-text">(.*?)<\/span>/g, '$1');
-        // 去掉乱七八糟的图标
-        htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<span class=["|']url-icon["|']>(.*?)<\/span>/g, '');
+        if (!showEmojiInDescription) {
+            htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<span class=["']?url-icon["']?><img\s[^>]*?alt=["']?([^>]+?)["']?\s[^>]*?\/><\/span>/g, '$1');
+        }
+        // 去掉链接的图标，保留 a 标签链接
+        if (!showLinkIconInDescription) {
+            htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/(<a\s[^>]*>)<span class=["']?url-icon["']?><img\s[^>]*><\/span>[^<>]*?<span class=["']?surl-text["']?>([^<>]*?)<\/span><\/a>/g, '$1$2</a>');
+        }
+        // 去掉乱七八糟的图标  // 不需要，上述的替换应该已经把所有的图标都替换掉了，且这条 regex 会破坏上述替换不发生时的输出
+        // htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<span class=["']?url-icon["']?>(<img\s[^>]*?>)<\/span>/g, '');
+        // 将行内图标的高度设置为一行，改善阅读体验。但有些阅读器删除了 style 属性，无法生效  // 不需要，微博已经作此设置
+        // htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/(?<=<span class=["']?url-icon["']?>)<img/g, '<img style="height: 1em"');
         // 去掉全文
         htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/全文<br>/g, '<br>');
         htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<a href="(.*?)">全文<\/a>/g, '');
@@ -79,8 +90,28 @@ const weiboUtils = {
             html = usernameAndAvatar + html;
         }
 
+        // 添加文章头图，此处不需要回落到被转发的微博，后续处理被转发的微博时，还会执行到这里
+        if (status.page_info && status.page_info.type === 'article' && status.page_info.page_pic && status.page_info.page_pic.url) {
+            // 如果以后后续流程会用到其他字段，记得修改这里
+            const pagePic = {
+                large: {
+                    url: status.page_info.page_pic.url,
+                },
+            };
+            // 文章微博一般不会有配图，但也有可能有：https://weibo.com/6882481489/Lh85BkS3m
+            if (status.pics) {
+                status.pics.push(pagePic);
+            } else {
+                status.pics = [pagePic];
+            }
+        }
+
+        // drop live photo
+        const livePhotoCount = status.pics ? status.pics.filter((pic) => pic.type === 'livephotos').length : 0;
+        const pics = status.pics && status.pics.filter((pic) => pic.type !== 'livephotos');
+
         // 添加微博配图
-        if (status.pics) {
+        if (pics) {
             if (readable) {
                 html += '<br clear="both" /><div style="clear: both"></div>';
             }
@@ -88,12 +119,12 @@ const weiboUtils = {
             // 一些RSS Reader会识别所有<img>标签作为内含图片显示，我们不想要头像也作为内含图片之一
             // 让所有配图在description的最前面再次出现一次，但宽高设为0
             let picsPrefix = '';
-            status.pics.forEach((item) => {
+            pics.forEach((item) => {
                 picsPrefix += `<img width="0" height="0" hidden="true" src="${item.large.url}">`;
             });
             picsPrefixes.push(picsPrefix);
 
-            status.pics.forEach((item) => {
+            pics.forEach((item) => {
                 if (addLinkForPics) {
                     html += '<a href="' + item.large.url + '">';
                 }
@@ -170,16 +201,29 @@ const weiboUtils = {
         }
         if (!status.retweeted_status || showRetweetTextInTitle) {
             title += htmlNewLineUnreplaced
+                .replace(/<span class=["']url-icon["']><img\s[^>]*?alt=["']?([^>]+?)["']?\s[^>]*?\/><\/span>/g, '$1') // 表情转换
+                .replace(/<span class=["']url-icon["']>(<img\s[^>]*?>)<\/span>/g, '') // 去掉所有图标
                 .replace(/<img[\s\S]*?>/g, '[图片]')
                 .replace(/<.*?>/g, '')
-                .replace('\n', '');
+                .replace('\n', '')
+                .trim();
         }
         if (status.retweeted_status) {
             title += showEmojiForRetweet ? '🔁 ' : ' - 转发 ';
             title += retweeted
+                .replace(/<span class=["']url-icon["']><img\s[^>]*?alt=["']?([^>]+?)["']?\s[^>]*?\/><\/span>/g, '$1') // 表情转换
+                .replace(/<span class=["']url-icon["']>(<img\s[^>]*?>)<\/span>/g, '') // 去掉所有图标
                 .replace(/<img[\s\S]*?>/g, '[图片]')
                 .replace(/<.*?>/g, '')
-                .replace('\n', '');
+                .replace('\n', '')
+                .trim();
+        }
+        if (livePhotoCount > 0) {
+            title += ' ';
+            title += new Array(livePhotoCount + 1).join('[Live Photo]');
+        }
+        if (status.page_info && status.page_info === 'video') {
+            title += ' [视频]';
         }
 
         return { description: html, title };
@@ -198,14 +242,177 @@ const weiboUtils = {
     },
     formatVideo: (itemDesc, status) => {
         const pageInfo = status.page_info;
+        const livePhotos = status.pics && status.pics.filter((pic) => pic.type === 'livephotos' && pic.videoSrc);
+        let video = '<br clear="both" /><div style="clear: both"></div>';
+        let anyVideo = false;
+        if (livePhotos) {
+            livePhotos.forEach((livePhoto) => {
+                video += `<video controls="controls" poster="${(livePhoto.large && livePhoto.large.url) || livePhoto.url}" src="${livePhoto.videoSrc}" style="width: 100%"></video>`;
+                anyVideo = true;
+            });
+        }
         if (pageInfo && pageInfo.type === 'video') {
             const pagePic = pageInfo.page_pic;
-            const mediaInfo = pageInfo.media_info;
             const posterUrl = pagePic ? pagePic.url : '';
-            const videoUrl = mediaInfo ? mediaInfo.stream_url_hd || mediaInfo.stream_url || mediaInfo.mp4_hd_url || mediaInfo.mp4_sd_url || mediaInfo.mp4_720p_mp4 : '';
-            if (videoUrl) {
-                const video = `<br clear="both" /><div style="clear: both"></div><video src="${videoUrl}"  controls="controls" poster="${posterUrl}" style="width: 100%"></video>`;
-                itemDesc += video;
+            const pageUrl = pageInfo.page_url; // video page url
+            const mediaInfo = pageInfo.media_info || {}; // stream_url, stream_url_hd; deprecated: mp4_720p_mp4, mp4_hd_url, mp4_sd_url
+            const urls = pageInfo.urls || {}; // mp4_720p_mp4, mp4_hd_mp4, hevc_mp4_hd, mp4_ld_mp4
+
+            const video720p = urls.mp4_720p_mp4 || mediaInfo.mp4_720p_mp4 || '';
+            const videoHd = urls.mp4_hd_mp4 || mediaInfo.mp4_hd_url || mediaInfo.stream_url_hd || '';
+            const videoHdHevc = urls.hevc_mp4_hd || '';
+            const videoLd = urls.mp4_ld_mp4 || mediaInfo.mp4_sd_url || mediaInfo.stream_url || '';
+
+            const hasVideo = video720p || videoHd || videoHdHevc || videoLd;
+
+            if (hasVideo) {
+                video += `<video controls="controls" poster="${posterUrl}" style="width: 100%">`;
+                if (video720p) {
+                    video += `<source src="${video720p}">`;
+                }
+                if (videoHd) {
+                    video += `<source src="${videoHd}">`;
+                }
+                if (videoHdHevc) {
+                    video += `<source src="${videoHdHevc}">`;
+                }
+                if (videoLd) {
+                    video += `<source src="${videoLd}">`;
+                }
+                if (pageUrl) {
+                    video += `<p>视频无法显示，请前往<a href="${pageUrl}" target="_blank" rel="noopener noreferrer">微博视频</a>观看。</p>`;
+                }
+                video += '</video>';
+                anyVideo = true;
+            }
+        }
+        if (anyVideo) {
+            itemDesc += video;
+        }
+        return itemDesc;
+    },
+    formatArticle: async (ctx, itemDesc, status) => {
+        const pageInfo = status.page_info;
+        if (pageInfo && pageInfo.type === 'article' && pageInfo.page_url) {
+            const pageUrl = pageInfo.page_url;
+            const articleIdMatch = pageUrl.match(/id=(\d+)/);
+            if (!articleIdMatch) {
+                return itemDesc;
+            }
+            const articleId = articleIdMatch[1];
+            const link = `https://card.weibo.com/article/m/aj/detail?id=${articleId}`;
+            const response = await ctx.cache.tryGet(link, async () => {
+                const _response = await got.get(link, {
+                    headers: {
+                        Referer: `https://card.weibo.com/article/m/show/id/${articleId}`,
+                        'MWeibo-Pwa': 1,
+                        'X-Requested-With': 'XMLHttpRequest',
+                        'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1',
+                    },
+                });
+                return _response.data;
+            }); // cache it!
+            const article = response.data;
+            if (article && article.title && article.content) {
+                const title = article.title;
+                const content = article.content;
+                const summary = article.summary;
+                const createAt = article.create_at;
+                const readCount = article.read_count;
+                const isOriginal = article.is_original;
+                const isArticleNonFree = article.is_article_free; // 微博起错了字段名，它为 1 时才是收费文章
+
+                // 许多微博文章都给文字设置了白色背景，这里也只好使用白色背景了
+                let html = '<br clear="both" /><br clear="both" />';
+                html += '<div style="clear: both"></div><div style="background: #fff;border:5px solid #80808030;margin:0;padding:3% 5%;overflow-wrap: break-word">';
+
+                html += `<h1 style="font-size: 1.5rem;line-height: 1.25;color: #333;">${title}</h1>`; // 加入标题
+
+                // 加入文章信息
+                const iconStyle =
+                    'display: inline-block;margin-inline: 0.25rem;width: 2.25rem; height: 1.125rem; background: #eee; border-radius: 2px; box-sizing: border-box; text-align: center; line-height: 1.0625rem; font-size: 0.75rem; color: #aaa;';
+                let articleMeta = '<p style="line-height: 1.66; color: #999;margin: 0 0 0.75rem;font-size: 0.75rem;padding: 0">';
+                if (isArticleNonFree) {
+                    articleMeta += `<span style="${iconStyle}">试读</span> `;
+                }
+                if (isOriginal) {
+                    articleMeta += `<span style="${iconStyle}">原创</span> `;
+                }
+                articleMeta += `<span style="margin-inline: 0.25rem;">发布时间: ${createAt}</span> `; // 发布时间
+                articleMeta += `<span style="margin-inline: 0.25rem;">阅读量: ${readCount}</span> `; // 阅读量
+                articleMeta += '</p>';
+                html += articleMeta;
+
+                if (summary) {
+                    html += `<p style="color: #999;line-height: 1.5rem;padding: 0.0625rem 0 0.875rem;margin: 0">${summary}</p>`; // 摘要
+                }
+
+                html += '<div style="height: 0;border-bottom: 1px dashed #999;margin-bottom: 0.75rem;"></div>'; // 分割线
+
+                // 正文处理，加入一些在微博文章页的 CSS 中定义的不可或缺的样式
+                const $ = cheerio.load(content);
+                $('p').each((_, elem) => {
+                    elem = $(elem);
+                    let style = elem.attr('style') || '';
+                    style = 'margin: 0;padding: 0;border: 0;' + style;
+                    elem.attr('style', style);
+                });
+                $('.image').each((_, elem) => {
+                    elem = $(elem);
+                    let style = elem.attr('style') || '';
+                    style = 'display: table;text-align: center;margin-left: auto;margin-right: auto;clear: both;min-width: 50px;' + style;
+                    elem.attr('style', style);
+                });
+                $('img').each((_, elem) => {
+                    elem = $(elem);
+                    let style = elem.attr('style') || '';
+                    style = 'display: block;max-width: 100%;margin-left: auto;margin-right: auto;min-width: 50px;' + style;
+                    elem.attr('style', style);
+                });
+                const contentHtml = $.html();
+                html += `<div style="line-height: 1.59;text-align: justify;font-size: 1.0625rem;color: #333;">${contentHtml}</div>`; // 正文
+
+                html += '</div>';
+                itemDesc += html;
+            }
+        }
+        return itemDesc;
+    },
+    formatComments: async (ctx, itemDesc, status) => {
+        if (status && status.comments_count && status.id && status.mid) {
+            const id = status.id;
+            const mid = status.mid;
+            const link = `https://m.weibo.cn/comments/hotflow?id=${id}&mid=${mid}&max_id_type=0`;
+            const response = await ctx.cache.tryGet(link, async () => {
+                const _response = await got.get(link, {
+                    headers: {
+                        Referer: `https://m.weibo.cn/detail/${id}`,
+                        'MWeibo-Pwa': 1,
+                        'X-Requested-With': 'XMLHttpRequest',
+                        'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1',
+                    },
+                });
+                return _response.data;
+            });
+            if (response.data && response.data.data) {
+                const comments = response.data.data;
+                itemDesc += `<br clear="both" /><div style="clear: both"></div><div style="background: #80808010;border-top:1px solid #80808030;border-bottom:1px solid #80808030;margin:0;padding:5px 20px;">`;
+                itemDesc += '<h3>热门评论</h3>';
+                comments.forEach((comment) => {
+                    itemDesc += '<p style="margin-bottom: 0.5em;margin-top: 0.5em">';
+                    itemDesc += `<a href="https://weibo.com/${comment.user.id}" target="_blank">${comment.user.screen_name}</a>: ${comment.text}`;
+                    if (comment.comments) {
+                        itemDesc += '<blockquote style="border-left:0.2em solid #80808080; margin-left: 0.3em; padding-left: 0.5em; margin-bottom: 0.5em; margin-top: 0.25em">';
+                        comment.comments.forEach((comment) => {
+                            itemDesc += '<div style="font-size: 0.9em">';
+                            itemDesc += `<a href="https://weibo.com/${comment.user.id}" target="_blank">${comment.user.screen_name}</a>: ${comment.text}`;
+                            itemDesc += '</div>';
+                        });
+                        itemDesc += '</blockquote>';
+                    }
+                    itemDesc += '</p>';
+                });
+                itemDesc += '</div>';
             }
         }
         return itemDesc;

package/lib/routes/ximalaya/album.js

@@ -179,7 +179,7 @@ module.exports = async (ctx) => {
         const itunesItemImage = item.coverLarge ? item.coverLarge : albumCover;
         const link = baseUrl + albumUrl + trackId;
         const pubDate = new Date(item.createdAt).toUTCString();
-        const enclosureLength = item.duration; // 时间长度：单位（秒）
+        const duration = item.duration; // 时间长度：单位（秒）
         const enclosureUrl = item.playPathAacv224 || item.playPathAacv164;
 
         let resultItem = {
@@ -199,7 +199,7 @@ module.exports = async (ctx) => {
             resultItem = {
                 ...resultItem,
                 enclosure_url: enclosureUrl,
-                enclosure_length: enclosureLength,
+                itunes_duration: duration,
                 enclosure_type: 'audio/x-m4a',
             };
         }

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-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,
 };