rsshub 1.0.0-master.fc91df6 → 1.0.0-master.fd40700

package/lib/routes/weibo/timeline.js

@@ -1,12 +1,37 @@
+const querystring = require('querystring');
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
 const config = require('@/config').value;
+const weiboUtils = require('./utils');
+const { fallback, queryToBoolean } = require('@/utils/readable-social');
 
 module.exports = async (ctx) => {
     const uid = ctx.params.uid;
     const feature = ctx.params.feature || 0;
+    const routeParams = ctx.params.routeParams || undefined;
     const token = await ctx.cache.get('weibotimelineuid' + uid, false);
+    let displayVideo = '1';
+    if (routeParams) {
+        if (routeParams === '1' || routeParams === '0') {
+            displayVideo = routeParams;
+        } else {
+            const routeParams = querystring.parse(ctx.params.routeParams);
+            displayVideo = fallback(undefined, queryToBoolean(routeParams.displayVideo), true) ? '1' : '0';
+        }
+    }
 
     if (token) {
+        const containerResponse = await got({
+            method: 'get',
+            url: `https://m.weibo.cn/api/container/getIndex?type=uid&value=${uid}`,
+            headers: {
+                Referer: 'https://m.weibo.cn/',
+            },
+        });
+        const name = containerResponse.data.data.userInfo.screen_name;
+        const description = containerResponse.data.data.userInfo.description;
+        const profileImageUrl = containerResponse.data.data.userInfo.profile_image_url;
+
         const response = await got.get(`https://api.weibo.com/2/statuses/home_timeline.json?access_token=${token}&count=100&feature=${feature}`);
         // 检查token失效
         if (response.data.error !== undefined) {
@@ -16,143 +41,66 @@ module.exports = async (ctx) => {
             ctx.set({
                 'Cache-Control': 'no-cache',
             });
-            ctx.redirect(`https://api.weibo.com/oauth2/authorize?client_id=${app_key}&redirect_uri=${redirect_url}`);
+            ctx.redirect(`https://api.weibo.com/oauth2/authorize?client_id=${app_key}&redirect_uri=${redirect_url}${routeParams ? `&state=${routeParams}` : ''}`);
         }
-        // 获取所有表情
-        const weiboEmotion = await ctx.cache.tryGet('weiboEmotion', async () => {
-            const tmpEmotionList = {};
-            await Promise.all(
-                ['face', 'ani', 'cartoon'].map(async (type) => {
-                    try {
-                        const rep = await got.get(`https://api.weibo.com/2/emotions.json?access_token=${token}&type=${type}`);
-                        rep.data.forEach((item) => {
-                            tmpEmotionList[item.phrase] = item.url;
-                        });
-                        return Promise.resolve(rep);
-                    } catch (err) {
-                        // pass
-                    }
-                })
-            );
-            return tmpEmotionList;
-        });
-
-        const data = await Promise.all(
+        const resultItem = await Promise.all(
             response.data.statuses.map(async (item) => {
-                const realContent = await ctx.cache.tryGet('weibotimelineurl' + item.user.id + item.id, async () => {
-                    const res = [];
-                    const videoList = [];
-                    let picUrlList = [];
-                    picUrlList = picUrlList.concat(item.pic_urls);
-                    try {
-                        const rep = await got.get(`https://m.weibo.cn/${item.user.id}/${item.id}`);
-                        rep.body.replace(/"text": "([\s\S]*?)",/g, (s, value) => {
-                            res.push(value.replace(/\\"/g, "'"));
-                        });
-                        rep.body.replace(/"mp4_720p_mp4": "([\s\S]*?)",/, (s, value) => {
-                            videoList.push(value);
-                        });
-                        if (res.length > 1) {
-                            const sub_rep = await got.get(`https://m.weibo.cn/${item.retweeted_status.user.id}/${item.retweeted_status.id}`);
-                            sub_rep.body.replace(/"text": "([\s\S]*?)",/g, (s, value) => {
-                                res[1] = value.replace(/\\"/g, "'");
-                            });
-                            sub_rep.body.replace(/"mp4_720p_mp4": "([\s\S]*?)",/, (s, value) => {
-                                videoList.push(value);
-                            });
-                            picUrlList = picUrlList.concat(item.retweeted_status.pic_urls);
-                        }
-                    } catch (err) {
-                        res.push(item.text);
-                        if (item.retweeted_status) {
-                            res.push(item.retweeted_status.text);
-                            picUrlList = picUrlList.concat(item.retweeted_status.pic_urls);
-                        }
-                        // 非全文获取的微博内容需要替换表情
-                        res.forEach((content, index) => {
-                            const emotion = [];
-                            content.replace(/(\[.*?\])/g, (s, value) => {
-                                emotion.push(value);
-                            });
+                const key = `weibotimelineurl${item.user.id}${item.id}`;
+                const value = await ctx.cache.tryGet(key, async () => {
+                    const _data = await weiboUtils.getShowData(uid, item.id);
+                    return JSON.stringify(_data);
+                });
+                const data = JSON.parse(value);
 
-                            if (content.length > 0) {
-                                emotion.forEach((item) => {
-                                    res[index] = content.replace(new RegExp(`\\${item}`, 'g'), `<img alt="${item}" src="${weiboEmotion[item]}" style="width:1em; height:1em;" referrerpolicy="no-referrer">`);
-                                });
-                            }
-                        });
-                    }
-                    let content = '';
-                    try {
-                        if (res.length >= 2) {
-                            content = `${res[0]}<br><br><hr style="height:5px;border:none;border-top:5px ridge green;" /><span style="background-color:#71adec">${item.retweeted_status.user.screen_name}:<hr style="height:1px;border:none;border-top:1px solid #555555;" /><br>${res[1]}</span>`;
-                        } else if (res.length === 1) {
-                            content = res[0];
-                        }
+                // 是否通过api拿到了data
+                const isDataOK = data?.text;
+                if (isDataOK) {
+                    item = data;
+                }
 
-                        // 手机端reeder查看内容时，表情会导致换行-此处做转换
-                        content.replace(/<span class='url-icon'>([\s\S]*?)<\/span>/g, (s, value) => {
-                            content = content.replace(s, value);
-                        });
-                    } catch (error) {
-                        // pass
+                // 转发的长微博处理
+                const retweet = item.retweeted_status;
+                if (retweet?.isLongText) {
+                    const retweetData = await weiboUtils.getShowData(retweet.user.id, retweet.id);
+                    if (retweetData?.text) {
+                        item.retweeted_status.text = retweetData.text;
                     }
+                }
 
-                    let title = '';
-                    if (res.length >= 2) {
-                        title = `${item.user.name}--转发微博`;
-                    } else if (item.pic_urls.length > 0) {
-                        title = `${item.user.name}--原创图文微博`;
-                    } else {
-                        title = `${item.user.name}--原创微博`;
-                    }
-                    return {
-                        title,
-                        content,
-                        author: item.user.name,
-                        date: item.created_at,
-                        link: `https://m.weibo.cn/detail/${item.id}`,
-                        pic_urls: picUrlList,
-                        videoList: Array.from(new Set(videoList)),
-                    };
-                });
-                return Promise.resolve(realContent);
-            })
-        );
+                const link = `https://weibo.com/${uid}/${item.id}`;
 
-        ctx.state.data = {
-            title: '个人微博时间线',
-            link: 'https://weibo.com',
-            item: data.map((item) => {
-                let description = '';
-                if (item.content !== null) {
-                    description = item.content;
-                }
+                const formatExtended = weiboUtils.formatExtended(ctx, item);
+                let description = formatExtended.description;
+                const title = formatExtended.title;
+                const pubDate = isDataOK ? parseDate(data.created_at) : parseDate(item.created_at);
 
-                item.pic_urls.forEach((pic) => {
-                    description += `<img alt="配图" style="margin: 0 auto" src="${pic.thumbnail_pic.replace('thumbnail', 'large')}"><br>`;
-                });
-                if (item.videoList.length !== 0) {
-                    item.videoList.forEach((url) => {
-                        description += `<iframe height=720 width=1080 src='${url}' frameborder=0 'allowfullscreen'></iframe>`;
-                    });
+                // 视频的处理
+                if (displayVideo === '1') {
+                    description = weiboUtils.formatVideo(description, item);
                 }
+
                 return {
-                    description: description
-                        .replace(/\b(url|href|src)\b=(['|"])http:/g, '$1=$2https:')
-                        .replace('http://t.cn/', 'https://t.cn/')
-                        .replace('http://m.weibo.', 'https://m.weibo.'),
-                    link: item.link,
-                    pubDate: item.date,
-                    title: item.title,
-                    author: item.author,
+                    title,
+                    description,
+                    link,
+                    pubDate,
+                    author: item.user.screen_name,
                 };
-            }),
+            })
+        );
+
+        ctx.state.data = {
+            title: `个人微博时间线--${name}`,
+            link: `http://weibo.com/${uid}/`,
+            description,
+            image: profileImageUrl,
+            item: resultItem,
         };
     } else if (uid === '0' || ctx.querystring) {
         const { app_key = '', redirect_url = ctx.request.origin + '/weibo/timeline/0', app_secret = '' } = config.weibo;
 
-        const code = Object.values(ctx.query)[0];
+        const code = ctx.query.code;
+        const routeParams = ctx.query.state;
         if (code) {
             const rep = await got.post(`https://api.weibo.com/oauth2/access_token?client_id=${app_key}&client_secret=${app_secret}&code=${code}&redirect_uri=${redirect_url}&grant_type=authorization_code`);
             const token = rep.data.access_token;
@@ -164,7 +112,7 @@ module.exports = async (ctx) => {
                 'Content-Type': 'text/html; charset=UTF-8',
                 'Cache-Control': 'no-cache',
             });
-            ctx.body = `<script>window.location = '/weibo/timeline/${uid}'</script>`;
+            ctx.body = `<script>window.location = '/weibo/timeline/${uid}${routeParams ? `/${routeParams}` : ''}'</script>`;
         }
     } else {
         const { app_key = '', redirect_url = ctx.request.origin + '/weibo/timeline/0' } = config.weibo;
@@ -173,6 +121,6 @@ module.exports = async (ctx) => {
         ctx.set({
             'Cache-Control': 'no-cache',
         });
-        ctx.redirect(`https://api.weibo.com/oauth2/authorize?client_id=${app_key}&redirect_uri=${redirect_url}`);
+        ctx.redirect(`https://api.weibo.com/oauth2/authorize?client_id=${app_key}&redirect_uri=${redirect_url}${routeParams ? `&state=${feature}/${routeParams.replace(/&/g, '%26')}` : ''}`);
     }
 };

package/lib/routes/weibo/user.js

@@ -39,22 +39,47 @@ module.exports = async (ctx) => {
         },
     });
 
+    let earliestDate;
+
     const resultItem = await Promise.all(
         response.data.data.cards
-            .filter((item) => item.mblog)
+            .reverse() // reverse first to ensure the pinned card will be processed lastly
             .map(async (item) => {
+                if (!item.mblog && item.card_group && Array.isArray(item.card_group) && item.card_group.length > 0) {
+                    // w/o `mblog`, it may have a `card_group` containing only 1 card
+                    // only get the 1st card because we haven't observed that there can be multiple cards in it
+                    item = item.card_group[0];
+                }
+
+                if (!item.mblog) {
+                    return; // drop
+                }
+
                 const key = 'weibo:user:' + item.mblog.bid;
                 const data = await ctx.cache.tryGet(key, () => weiboUtils.getShowData(uid, item.mblog.bid));
 
                 if (data && data.text) {
                     item.mblog.text = data.text;
                     item.mblog.created_at = parseDate(data.created_at);
+                    item.mblog.pics = data.pics;
                     if (item.mblog.retweeted_status && data.retweeted_status) {
                         item.mblog.retweeted_status.created_at = data.retweeted_status.created_at;
                     }
                 } else {
                     item.mblog.created_at = timezone(item.mblog.created_at, +8);
                 }
+
+                // drop too old pinned weibo, otherwise preserve it
+                if (!item.mblog.title || item.mblog.title.text !== '置顶') {
+                    if (!earliestDate || (item.mblog.created_at && earliestDate > item.mblog.created_at)) {
+                        earliestDate = item.mblog.created_at;
+                    }
+                } else {
+                    if (earliestDate && item.mblog.created_at && earliestDate > item.mblog.created_at) {
+                        return;
+                    }
+                }
+
                 // 转发的长微博处理
                 const retweet = item.mblog.retweeted_status;
                 if (retweet && retweet.isLongText) {
@@ -91,6 +116,6 @@ module.exports = async (ctx) => {
         link: `http://weibo.com/${uid}/`,
         description,
         image: profileImageUrl,
-        item: resultItem,
+        item: resultItem.filter((item) => item).reverse(),
     };
 };

package/lib/routes/weibo/utils.js

@@ -22,6 +22,7 @@ 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),
         };
 
         params = mergedParams;
@@ -41,17 +42,20 @@ const weiboUtils = {
             widthOfPics,
             heightOfPics,
             sizeOfAuthorAvatar,
+            showEmojiInDescription,
         } = 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');
+        if (!showEmojiInDescription) {
+            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, '');
+        // htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<span class=["|']url-icon["|']>(.*?)<\/span>/g, '');
         // 去掉全文
         htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/全文<br>/g, '<br>');
         htmlNewLineUnreplaced = htmlNewLineUnreplaced.replace(/<a href="(.*?)">全文<\/a>/g, '');

package/lib/routes/who/news-room.js

@@ -1,7 +1,7 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const url = require('url');
-const date = require('@/utils/date');
+const { parseDate } = require('@/utils/parse-date');
 
 const host = 'https://www.who.int/';
 
@@ -20,7 +20,7 @@ module.exports = async (ctx) => {
                 const $elem = $(elem);
                 const title = $elem.find('p').text();
                 const link = url.resolve(host, $elem.find('a').attr('href'));
-                const pubDate = date($elem.find('.timestamp').text());
+                const pubDate = parseDate($elem.find('.timestamp').text(), 'YYYY年M月D日');
 
                 const item = {
                     title,

package/lib/routes/ximalaya/album.js

@@ -1,12 +1,7 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
 const { getUrl, getRandom16 } = require('./utils');
-const baseUrl = 'http://www.ximalaya.com';
-const gotIns = got.extend({
-    headers: {
-        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.141 Safari/537.36',
-    },
-});
+const baseUrl = 'https://www.ximalaya.com';
 const config = require('@/config').value;
 
 // Find category from: https://help.apple.com/itc/podcasts_connect/?lang=en#/itc9267a2f12
@@ -47,11 +42,12 @@ function getTextFromElement(element) {
     return '';
 }
 
-async function parseAlbumData(album_id) {
+async function parseAlbumData(category, album_id) {
     // 解析网页版的 HTML 获取该专辑的信息
     // 这里的 {category} 并不重要，系统会准确的返回该 id 对应专辑的信息
+    // 现在 {category} 必须要精确到大的类别
     // https://www.ximalaya.com/{category}/{album_id}/
-    const response = await gotIns(`https://www.ximalaya.com/category/${album_id}/`);
+    const response = await got(`https://www.ximalaya.com/${category}/${album_id}/`);
     const data = response.body;
     const $ = cheerio.load(data);
     const stateElement = $('script')
@@ -83,12 +79,13 @@ function judgeTrue(str, ...validStrings) {
 }
 
 module.exports = async (ctx) => {
+    const type = ctx.params.type; // 专辑分类
     const id = ctx.params.id; // 专辑id
     const shouldAll = judgeTrue(ctx.params.all, 'all');
     const shouldShowNote = judgeTrue(ctx.params.shownote, 'shownote');
     const pageSize = shouldAll ? 200 : 30;
 
-    const albumData = await parseAlbumData(id);
+    const albumData = await parseAlbumData(type, id);
 
     const isPaid = albumData.store.AlbumDetailPage.albumPageMainInfo.isPaid;
 
@@ -108,7 +105,7 @@ module.exports = async (ctx) => {
     // const isAsc = albumData.store.AlbumDetailTrackList.sort === 0;
     // 喜马拉雅的 API 的 query 参数 isAsc=0 时才是升序，不写就是降序。
     const trackInfoApi = `http://mobile.ximalaya.com/mobile/v1/album/track/?albumId=${id}&pageSize=${pageSize}&pageId=`;
-    const trackInfoResponse = await gotIns.get(trackInfoApi + '1');
+    const trackInfoResponse = await got.get(trackInfoApi + '1');
     const maxPageId = trackInfoResponse.data.data.maxPageId; // 最大页数
 
     let playList = trackInfoResponse.data.data.list;
@@ -117,7 +114,7 @@ module.exports = async (ctx) => {
         const promises = [];
         for (let i = 2; i <= maxPageId; i++) {
             // string + number -> string
-            promises.push(gotIns.get(trackInfoApi + i));
+            promises.push(got.get(trackInfoApi + i));
         }
         const responses = await Promise.all(promises);
         for (let j = 0; j < responses.length; j++) {
@@ -132,7 +129,7 @@ module.exports = async (ctx) => {
                 let _desc;
                 if (shouldShowNote) {
                     const trackRichInfoApi = `https://mobile.ximalaya.com/mobile-track/richIntro?trackId=${item.trackId}`;
-                    const trackRichInfoResponse = await gotIns.get(trackRichInfoApi);
+                    const trackRichInfoResponse = await got.get(trackRichInfoApi);
                     _desc = trackRichInfoResponse.data.richIntro;
                 }
                 if (!_desc) {

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/youzhiyouxing/materials.js

@@ -0,0 +1,29 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+
+module.exports = async (ctx) => {
+    const link = `https://youzhiyouxing.cn/materials`;
+    const response = await got({
+        method: 'get',
+        url: link,
+    });
+    const $ = cheerio.load(response.data);
+    const list = $('[phx-click=material]');
+    const resData = {
+        title: '有知有行 - 有知',
+        link,
+        description: '有知有行 - 有知',
+        item: list
+            .map((_index, item) => {
+                const $item = $(item);
+                const res = {
+                    title: $item.find('.title-bar > h3').text(),
+                    description: $item.find('.sm-text').text(),
+                    link: `https://youzhiyouxing.cn/materials/${$item.attr('phx-value-id')}`,
+                };
+                return res;
+            })
+            .get(),
+    };
+    ctx.state.data = resData;
+};

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(),
                       }
             ),