rsshub 1.0.0-master.fdbb6fa → 1.0.0-master.fdc59d2

package/lib/{routes/bangumi → v2/bangumi/tv}/calendar/today.js

@@ -1,27 +1,25 @@
 const getData = require('./_base');
+const { art } = require('@/utils/render');
+const path = require('path');
 
 module.exports = async (ctx) => {
-    const [list, data] = await getData(ctx);
+    const [list, data] = await getData(ctx.cache.tryGet);
     const siteMeta = data.siteMeta;
 
     const today = new Date(Date.now());
-
     // 将 UTC 时间向前移动9小时，即可在数值上表示东京时间
     today.setUTCHours(today.getUTCHours() + 9);
-
     const day = today.getUTCDay();
 
-    const todayList = list.filter((l) => l.weekday.id % 7 === day)[0];
-
-    const todayBgmId = todayList.items.map((t) => t.id);
+    const todayList = list.find((l) => l.weekday.id % 7 === day);
+    const todayBgmId = todayList.items.map((t) => t.id.toString());
     const images = todayList.items.reduce((p, c) => {
         p[c.id] = (c.images || {}).large;
         return p;
     }, {});
-
-    const todayBgm = data.items.filter((d) => todayBgmId.includes(d.bgm_id));
+    const todayBgm = data.items.filter((d) => todayBgmId.includes(d.bgmId));
     todayBgm.forEach((bgm) => {
-        bgm.image = images[bgm.bgm_id];
+        bgm.image = images[bgm.bgmId];
     });
 
     ctx.state.data = {
@@ -35,25 +33,13 @@ module.exports = async (ctx) => {
             updated.setMinutes(begin.getMinutes());
             updated.setSeconds(begin.getSeconds());
 
-            const link = `http://bangumi.tv/subject/${bgm.bgm_id}`;
+            const link = `https://bangumi.tv/subject/${bgm.bgmId}`;
             const id = `${link}#${new Intl.DateTimeFormat('zh-CN').format(updated)}`;
 
-            const image = `<img src=${bgm.image} />`;
-            const html =
-                image +
-                '<ul>' +
-                bgm.sites
-                    .map((s) => {
-                        let url;
-                        if (s.url) {
-                            url = s.url;
-                        } else {
-                            url = siteMeta[s.site].urlTemplate.replace('{{id}}', s.id);
-                        }
-                        return `<li><a href="${url}">${siteMeta[s.site].title}</a></li>`;
-                    })
-                    .join('') +
-                '</ul>';
+            const html = art(path.resolve(__dirname, '../../templates/tv/today.art'), {
+                bgm,
+                siteMeta,
+            });
 
             return {
                 id,
@@ -63,7 +49,9 @@ module.exports = async (ctx) => {
                     Object.values(bgm.titleTranslate)
                         .map((t) => t.join('｜'))
                         .join('｜'),
-                ].join('｜'),
+                ]
+                    .filter((t) => t) // don't join if empty
+                    .join('｜'),
                 updated: updated.toISOString(),
                 pubDate: updated.toUTCString(),
                 link,

package/lib/{routes/bangumi → v2/bangumi/tv}/group/reply.js

@@ -1,16 +1,18 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
 
 module.exports = async (ctx) => {
     // bangumi.tv未提供获取小组话题的API，因此仍需要通过抓取网页来获取
     const topicID = ctx.params.id;
     const link = `https://bgm.tv/group/topic/${topicID}`;
-    const html = (await got.get(link)).data;
+    const { data: html } = await got(link);
     const $ = cheerio.load(html);
     const title = $('#pageHeader h1').text();
     const latestReplies = $('.row_reply')
-        .slice(-10)
-        .map((i, el) => {
+        .toArray()
+        .map((el) => {
             const $el = $(el);
             return {
                 id: $el.attr('id'),
@@ -18,19 +20,28 @@ module.exports = async (ctx) => {
                 content: $el.find('.reply_content .message').html(),
                 date: $el.children().first().find('small').children().remove().end().text().slice(3),
             };
-        })
-        .get()
-        .reverse();
+        });
+
+    const postTopic = {
+        title,
+        description: $('.postTopic .topic_content').html(),
+        author: $('.postTopic .inner strong a').first().text(),
+        pubDate: timezone(parseDate($('.postTopic .re_info small').text().trim().slice(5)), +8),
+        link,
+    };
 
     ctx.state.data = {
         title: `${title}的最新回复`,
         link,
-        item: latestReplies.map((c) => ({
-            title: `${c.author}回复了小组话题《${title}》`,
-            description: c.content,
-            guid: c.id,
-            pubDate: new Date(c.date).toUTCString(),
-            link,
-        })),
+        item: [
+            ...latestReplies.map((c) => ({
+                title: `${c.author} 回复了小组话题《${title}》`,
+                description: c.content,
+                pubDate: timezone(parseDate(c.date), +8),
+                author: c.author,
+                link: `${link}#${c.id}`,
+            })),
+            postTopic,
+        ],
     };
 };

package/lib/v2/bangumi/tv/group/topic.js

@@ -0,0 +1,26 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const base_url = 'https://bgm.tv';
+
+module.exports = async (ctx) => {
+    const groupID = ctx.params.id;
+    const link = `${base_url}/group/${groupID}/forum`;
+    const { data: html } = await got(link);
+    const $ = cheerio.load(html);
+    const title = 'Bangumi - ' + $('.SecondaryNavTitle').text();
+
+    ctx.state.data = {
+        title,
+        link,
+        item: $('.topic_list .topic')
+            .toArray()
+            .map((elem) => ({
+                link: new URL($('.subject a', elem).attr('href'), base_url).href,
+                title: $('.subject a', elem).attr('title'),
+                pubDate: parseDate($('.lastpost .time', elem).text()),
+                description: 'Reply: ' + $('.posts', elem).text(),
+                author: $('.author a', elem).text(),
+            })),
+    };
+};

package/lib/{routes/bangumi → v2/bangumi/tv}/person/index.js

@@ -1,15 +1,17 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
     // bangumi.tv未提供获取“人物信息”的API，因此仍需要通过抓取网页来获取
     const personID = ctx.params.id;
     const link = `https://bgm.tv/person/${personID}/works?sort=date`;
-    const html = (await got.get(link)).data;
+    const { data: html } = await got(link);
     const $ = cheerio.load(html);
     const personName = $('.nameSingle a').text();
     const works = $('.item')
-        .map((i, el) => {
+        .toArray()
+        .map((el) => {
             const $el = $(el);
             const $workEl = $el.find('.l');
             return {
@@ -18,17 +20,19 @@ module.exports = async (ctx) => {
                 workInfo: $el.find('p.info').text(),
                 job: $el.find('.badge_job').text(),
             };
-        })
-        .get();
+        });
 
     ctx.state.data = {
         title: `${personName}参与的作品`,
         link,
-        item: works.map((c) => ({
-            title: `${personName}以${c.job}的身份参与了作品《${c.work}》`,
-            description: c.workInfo,
-            link: c.workURL,
-            pubDate: c.workInfo.substring(0, c.workInfo.indexOf(' /')) === '' ? new Date(0).toUTCString() : new Date(c.workInfo.substring(0, c.workInfo.indexOf(' /'))).toUTCString(),
-        })),
+        item: works.map((c) => {
+            const match = c.workInfo.match(/(\d{4}(?:-|年)\d{1,2}(?:-|月)\d{1,2})/);
+            return {
+                title: `${personName}以${c.job}的身份参与了作品《${c.work}》`,
+                description: c.workInfo,
+                link: c.workURL,
+                pubDate: match ? parseDate(match[1], ['YYYY-MM-DD', 'YYYY-M-D']) : null,
+            };
+        }),
     };
 };

package/lib/{routes/bangumi → v2/bangumi/tv}/subject/comments.js

@@ -1,34 +1,32 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
+const { parseDate, parseRelativeDate } = require('@/utils/parse-date');
 
 module.exports = async (subjectID, minLength) => {
     // bangumi.tv未提供获取“吐槽（comments）”的API，因此仍需要通过抓取网页来获取
     const link = `https://bgm.tv/subject/${subjectID}/comments`;
-    const html = (await got.get(link)).data;
+    const { data: html } = await got(link);
     const $ = cheerio.load(html);
     const title = $('.nameSingle').find('a').text();
     const comments = $('.item')
-        .map((i, el) => {
+        .toArray()
+        .map((el) => {
             const $el = $(el);
-            const $rateEl = $el.find('.starsinfo');
+            const $rateEl = $el.find('.starlight');
             let rate = null;
             if ($rateEl.length > 0) {
-                rate = $rateEl.attr('class').match(/sstars(\d)/)[1];
+                rate = $rateEl.attr('class').match(/stars(\d)/)[1];
             }
 
             const dateString = $el.find('small.grey').text().slice(2);
+
             let date;
             if (dateString.includes('ago')) {
                 // 处理表示相对日期的字符串
-                const list = dateString
-                    .match(/(\dd )?(\d{1,2}h )?(\d{1,2}m )?ago/)
-                    .slice(1)
-                    .map((s) => (s ? Number(s.slice(0, -2)) : 0));
-
-                date = new Date(new Date().getTime() - 1000 * 60 * 60 * 24 * list[0] - 1000 * 60 * 60 * list[1] - 1000 * 60 * list[2]).toUTCString();
+                date = parseRelativeDate(dateString);
             } else {
                 // 表示绝对日期的字符串
-                date = new Date(dateString).toUTCString();
+                date = parseDate(dateString);
             }
 
             return {
@@ -38,15 +36,15 @@ module.exports = async (subjectID, minLength) => {
                 date,
             };
         })
-        .get()
         .filter((obj) => obj.content.length >= minLength);
+
     return {
-        title: `${title}的Bangumi吐槽箱`,
+        title: `${title}的 Bangumi 吐槽箱`,
         link,
         item: comments.map((c) => ({
             title: `${c.user}的吐槽`,
             description: `【评分：${c.rate}】  ${c.content}`,
-            guid: c.user,
+            guid: `${link}#${c.user}`,
             pubDate: c.date,
             link,
         })),

package/lib/v2/bangumi/tv/subject/ep.js

@@ -0,0 +1,31 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (subjectID) => {
+    const url = `https://api.bgm.tv/subject/${subjectID}?responseGroup=large`;
+    const { data: epsInfo } = await got(url);
+    const activeEps = [];
+
+    epsInfo.eps.forEach((e) => {
+        if (e.status === 'Air') {
+            activeEps.push(e);
+        }
+    });
+
+    return {
+        title: epsInfo.name_cn || epsInfo.name,
+        link: `https://bgm.tv/subject/${subjectID}`,
+        description: epsInfo.summary,
+        item: activeEps.map((e) => ({
+            title: `ep.${e.sort} ${e.name_cn || e.name}`,
+            description: art(path.resolve(__dirname, '../../templates/tv/ep.art'), {
+                e,
+                epsInfo,
+            }),
+            pubDate: parseDate(e.airdate),
+            link: e.url.replace('http:', 'https:'),
+        })),
+    };
+};

package/lib/{routes/bangumi → v2/bangumi/tv}/subject/index.js

@@ -1,6 +1,5 @@
 const getComments = require('./comments.js');
 const getFromAPI = require('./offcial-subject-api.js');
-
 const getEps = require('./ep.js');
 
 module.exports = async (ctx) => {
@@ -9,7 +8,7 @@ module.exports = async (ctx) => {
     if (ctx.params.type) {
         switch (ctx.params.type) {
             case 'comments':
-                response = await getComments(id, Number(ctx.request.query.minLength) || 0);
+                response = await getComments(id, Number(ctx.query.minLength) || 0);
                 break;
             case 'blogs':
                 response = await getFromAPI('blog')(id);

package/lib/{routes/bangumi → v2/bangumi/tv}/subject/offcial-subject-api.js

@@ -1,4 +1,5 @@
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = (type) => {
     const mapping = {
@@ -13,17 +14,18 @@ module.exports = (type) => {
     };
 
     return async (subjectID) => {
-        // 官方提供的条目API文档见https://github.com/bangumi/api/blob/master/docs-raw/Subject-API.md
+        // 官方提供的条目API文档见 https://github.com/bangumi/api/blob/3f3fa6390c468816f9883d24be488e41f8946159/docs-raw/Subject-API.md
         const url = `https://api.bgm.tv/subject/${subjectID}?responseGroup=large`;
-        const subjectInfo = (await got.get(url)).data;
+        const { data: subjectInfo } = await got(url);
         return {
-            title: `${subjectInfo.name_cn || subjectInfo.name}的Bangumi${mapping[type].cn}`,
+            title: `${subjectInfo.name_cn || subjectInfo.name}的 Bangumi ${mapping[type].cn}`,
             link: `https://bgm.tv/subject/${subjectInfo.id}/${mapping[type].en}`,
             item: subjectInfo[type].map((article) => ({
                 title: `${article.user.nickname}：${article.title}`,
                 description: article.summary || '',
-                link: article.url,
-                pubDate: new Date(article.timestamp * 1000).toUTCString(),
+                link: article.url.replace('http:', 'https:'),
+                pubDate: parseDate(article.timestamp, 'X'),
+                author: article.user.nickname,
             })),
         };
     };

package/lib/{routes/bangumi → v2/bangumi/tv}/user/blog.js

@@ -1,6 +1,7 @@
-const url = require('url');
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
 
 module.exports = async (ctx) => {
     const currentUrl = `https://bgm.tv/user/${ctx.params.id}/blog`;
@@ -11,16 +12,16 @@ module.exports = async (ctx) => {
     const $ = cheerio.load(response.data);
     const list = $('#entry_list div.item')
         .find('h2.title')
-        .map((_, item) => {
+        .toArray()
+        .map((item) => {
             item = $(item);
             const a = item.find('a');
             return {
                 title: a.text(),
-                link: url.resolve(`https://bgm.tv/`, a.attr('href')),
-                pubDate: new Date(item.parent().find('small.time').text() + ' GMT+8').toUTCString(),
+                link: new URL(a.attr('href'), 'https://bgm.tv').href,
+                pubDate: timezone(parseDate(item.parent().find('small.time').text()), 0),
             };
-        })
-        .get();
+        });
 
     const items = await Promise.all(
         list.map((item) =>

package/lib/v2/bilibili/cache.js

@@ -1,112 +1,107 @@
 const got = require('@/utils/got');
-const iconv = require('iconv-lite');
-const cheerio = require('cheerio');
 
 module.exports = {
-    getUsernameFromUID: async (ctx, uid) => {
+    getCookie: (ctx) => {
+        const key = 'bili-cookie';
+        return ctx.cache.tryGet(key, async () => {
+            const response = await got(`https://www.bilibili.com/`);
+            return response.headers['set-cookie'];
+        });
+    },
+    getUsernameFromUID: (ctx, uid) => {
         const key = 'bili-username-from-uid-' + uid;
-        let name = await ctx.cache.get(key);
-        if (!name) {
-            const nameResponse = await got({
-                method: 'get',
-                url: `https://api.bilibili.com/x/space/acc/info?mid=${uid}&jsonp=jsonp`,
+        return ctx.cache.tryGet(key, async () => {
+            const cookie = await module.exports.getCookie(ctx);
+            await got(`https://space.bilibili.com/${uid}/`, {
+                headers: {
+                    Referer: 'https://www.bilibili.com/',
+                    Cookie: cookie,
+                },
             });
-            name = nameResponse.data.data.name;
-            ctx.cache.set(key, name);
-        }
-        return name;
+            const { data: nameResponse } = await got(`https://api.bilibili.com/x/space/acc/info?mid=${uid}&token=&platform=web&jsonp=jsonp`, {
+                headers: {
+                    Referer: `https://space.bilibili.com/${uid}/`,
+                    Cookie: cookie,
+                },
+            });
+            return nameResponse.data.name;
+        });
     },
     getUsernameAndFaceFromUID: async (ctx, uid) => {
+        const cookie = await module.exports.getCookie(ctx);
         const nameKey = 'bili-username-from-uid-' + uid;
         const faceKey = 'bili-userface-from-uid-' + uid;
         let name = await ctx.cache.get(nameKey);
         let face = await ctx.cache.get(faceKey);
-        if (!name) {
-            const nameResponse = await got({
-                method: 'get',
-                url: `https://api.bilibili.com/x/space/acc/info?mid=${uid}&jsonp=jsonp`,
+        if (!name || !face) {
+            await got(`https://space.bilibili.com/${uid}/`, {
+                headers: {
+                    Referer: `https://www.bilibili.com/`,
+                    Cookie: cookie,
+                },
             });
-            name = nameResponse.data.data.name;
-            face = nameResponse.data.data.face;
+            const { data: nameResponse } = await got(`https://api.bilibili.com/x/space/acc/info?mid=${uid}&token=&platform=web&jsonp=jsonp`, {
+                headers: {
+                    Referer: `https://space.bilibili.com/${uid}/`,
+                    Cookie: cookie,
+                },
+            });
+            name = nameResponse.data.name;
+            face = nameResponse.data.face;
             ctx.cache.set(nameKey, name);
             ctx.cache.set(faceKey, face);
         }
         return [name, face];
     },
-    getLiveIDFromShortID: async (ctx, shortID) => {
+    getLiveIDFromShortID: (ctx, shortID) => {
         const key = `bili-liveID-from-shortID-${shortID}`;
-        let liveID = await ctx.cache.get(key);
-        if (!liveID) {
-            const liveIDResponse = await got({
-                method: 'get',
-                url: `https://api.live.bilibili.com/room/v1/Room/room_init?id=${shortID}`,
+        return ctx.cache.tryGet(key, async () => {
+            const { data: liveIDResponse } = await got(`https://api.live.bilibili.com/room/v1/Room/room_init?id=${shortID}`, {
                 headers: {
                     Referer: `https://live.bilibili.com/${shortID}`,
                 },
             });
-            liveID = liveIDResponse.data.data.room_id;
-            ctx.cache.set(key, liveID);
-        }
-        return liveID;
+            return liveIDResponse.data.room_id;
+        });
     },
-    getUsernameFromLiveID: async (ctx, liveID) => {
+    getUsernameFromLiveID: (ctx, liveID) => {
         const key = `bili-username-from-liveID-${liveID}`;
-        let name = await ctx.cache.get(key);
-
-        if (!name) {
-            const nameResponse = await got({
-                method: 'get',
-                url: `https://api.live.bilibili.com/live_user/v1/UserInfo/get_anchor_in_room?roomid=${liveID}`,
+        return ctx.cache.tryGet(key, async () => {
+            const { data: nameResponse } = await got(`https://api.live.bilibili.com/live_user/v1/UserInfo/get_anchor_in_room?roomid=${liveID}`, {
                 headers: {
                     Referer: `https://live.bilibili.com/${liveID}`,
                 },
             });
-            name = nameResponse.data.data.info.uname;
-            ctx.cache.set(key, name);
-        }
-        return name;
+            return nameResponse.data.info.uname;
+        });
     },
-    getVideoNameFromId: async (ctx, aid, bvid) => {
+    getVideoNameFromId: (ctx, aid, bvid) => {
         const key = `bili-videoname-from-id-${bvid || aid}`;
-        let name = await ctx.cache.get(key);
-
-        if (!name) {
-            const nameResponse = await got({
-                method: 'get',
-                url: `https://www.bilibili.com/video/${bvid || `av${aid}`}`,
-                responseType: 'buffer',
+        return ctx.cache.tryGet(key, async () => {
+            const { data } = await got(`https://api.bilibili.com/x/web-interface/view`, {
+                searchParams: {
+                    aid: aid ? aid : undefined,
+                    bvid: bvid ? bvid : undefined,
+                },
+                referer: `https://www.bilibili.com/video/${bvid || `av${aid}`}`,
             });
-            const responseHtml = iconv.decode(nameResponse.data, 'UTF-8');
-            const $ = cheerio.load(responseHtml);
-            name = $('title').text();
-            name = name.substr(0, name.indexOf('_哔哩哔哩'));
-            ctx.cache.set(key, name);
-        }
-        return name;
+            return data.data.title;
+        });
     },
-    getCidFromId: async (ctx, aid, pid, bvid) => {
+    getCidFromId: (ctx, aid, pid, bvid) => {
         const key = `bili-cid-from-id-${bvid || aid}-${pid}`;
-        let cid = await ctx.cache.get(key);
-        if (!cid) {
-            const cidResponse = await got({
-                method: 'get',
-                url: `https://api.bilibili.com/x/web-interface/view?${bvid ? `bvid=${bvid}` : `aid=${aid}`}`,
-                headers: {
-                    Referer: `https://www.bilibili.com/video/${bvid || `av${aid}`}`,
-                },
+        return ctx.cache.tryGet(key, async () => {
+            const { data } = await got(`https://api.bilibili.com/x/web-interface/view?${bvid ? `bvid=${bvid}` : `aid=${aid}`}`, {
+                referer: `https://www.bilibili.com/video/${bvid || `av${aid}`}`,
             });
-            cid = cidResponse.data.data.pages[pid - 1].cid;
-            ctx.cache.set(key, cid);
-        }
-        return cid;
+            return data.data.pages[pid - 1].cid;
+        });
     },
     getAidFromBvid: async (ctx, bvid) => {
         const key = `bili-cid-from-bvid-${bvid}`;
         let aid = await ctx.cache.get(key);
         if (!aid) {
-            const response = await got({
-                method: 'get',
-                url: `https://api.bilibili.com/x/web-interface/view?bvid=${bvid}`,
+            const response = await got(`https://api.bilibili.com/x/web-interface/view?bvid=${bvid}`, {
                 headers: {
                     Referer: `https://www.bilibili.com/video/${bvid}`,
                 },

package/lib/v2/bilibili/dynamic.js

@@ -1,6 +1,7 @@
 const got = require('@/utils/got');
 const JSONbig = require('json-bigint');
 const utils = require('./utils');
+const { parseDate } = require('@/utils/parse-date');
 
 /**
     @by CaoMeiYouRen 2020-05-05 添加注释
@@ -155,11 +156,13 @@ module.exports = async (ctx) => {
 
             // emoji
             let data_content = getDes(data);
+            // 换行处理
+            data_content = data_content.replace(new RegExp('\r\n', 'g'), '<br>').replace(new RegExp('\n', 'g'), '<br>');
             if (item.display.emoji_info) {
                 const emoji = item.display.emoji_info.emoji_details;
                 emoji.forEach((item) => {
                     data_content = data_content.replace(
-                        new RegExp(`\\${item.text}`, 'g'),
+                        new RegExp(`\\${item.text}`.replace(new RegExp('\\?', 'g'), '\\?'), 'g'),
                         `<img alt="${item.text}" src="${item.url}"style="margin: -1px 1px 0px; display: inline-block; width: 20px; height: 20px; vertical-align: text-bottom;" title="" referrerpolicy="no-referrer">`
                     );
                 });
@@ -198,7 +201,7 @@ module.exports = async (ctx) => {
                     const videoHTMLSource = videoHTML ? `<br>${videoHTML}` : '';
                     return `${description}${originName}<br>${getUrl(data)}${getUrl(origin)}${getIframe(data)}${getIframe(origin)}${imgHTMLSource}${videoHTMLSource}`;
                 })(),
-                pubDate: new Date(item.desc.timestamp * 1000),
+                pubDate: item.desc ? (item.desc.timestamp ? parseDate(item.desc.timestamp, 'X') : null) : null,
                 link,
             };
         }),

package/lib/v2/bilibili/maintainer.js

@@ -25,8 +25,9 @@ module.exports = {
     '/topic/:topic': ['Qixingchen'],
     '/user/article/:uid': ['lengthmin'],
     '/user/bangumi/:uid/:type?': ['wdssmq'],
-    '/user/channel/:uid/:cid/:disableEmbed?': ['HenryQW'],
+    '/user/channel/:uid/:sid/:disableEmbed?': ['weirongxu'],
     '/user/coin/:uid/:disableEmbed?': ['DIYgod'],
+    '/user/collection/:uid/:sid/:disableEmbed?': ['shininome'],
     '/user/dynamic/:uid/:disableEmbed?': ['DIYgod', 'zytomorrow'],
     '/user/fav/:uid/:disableEmbed?': ['DIYgod'],
     '/user/followers/:uid': ['Qixingchen'],

package/lib/v2/bilibili/radar.js

@@ -54,6 +54,24 @@ module.exports = {
                 source: '/:uid',
                 target: '/bilibili/user/video-all/:uid',
             },
+            {
+                title: 'UP 主频道的合集',
+                docs: 'https://docs.rsshub.app/social-media.html#bilibili',
+                source: '/:uid/channel/collectiondetail',
+                target: (params, url) => {
+                    const sid = new URL(url).searchParams.get('sid');
+                    return `/bilibili/user/collection/${params.uid}/${sid}`;
+                },
+            },
+            {
+                title: 'UP 主频道的视频列表',
+                docs: 'https://docs.rsshub.app/social-media.html#bilibili',
+                source: '/:uid/channel/seriesdetail',
+                target: (params, url) => {
+                    const sid = new URL(url).searchParams.get('sid');
+                    return `/bilibili/user/channel/${params.uid}/${sid}`;
+                },
+            },
             {
                 title: 'UP 主专栏',
                 docs: 'https://docs.rsshub.app/social-media.html#bilibili',

package/lib/v2/bilibili/router.js

@@ -25,8 +25,9 @@ module.exports = (router) => {
     router.get('/topic/:topic', require('./topic'));
     router.get('/user/article/:uid', require('./article'));
     router.get('/user/bangumi/:uid/:type?', require('./user_bangumi'));
-    router.get('/user/channel/:uid/:cid/:disableEmbed?', require('./userChannel'));
+    router.get('/user/channel/:uid/:sid/:disableEmbed?', require('./userChannel'));
     router.get('/user/coin/:uid/:disableEmbed?', require('./coin'));
+    router.get('/user/collection/:uid/:sid/:disableEmbed?', require('./userCollection'));
     router.get('/user/dynamic/:uid/:disableEmbed?', require('./dynamic'));
     router.get('/user/fav/:uid/:disableEmbed?', require('./userFav'));
     router.get('/user/followers/:uid', require('./followers'));