rsshub 1.0.0-master.f9e891b → 1.0.0-master.f9ec483

package/lib/routes/bilibili/cache.ts

@@ -7,9 +7,19 @@ import logger from '@/utils/logger';
 import puppeteer from '@/utils/puppeteer';
 import { JSDOM } from 'jsdom';
 
-let disableConfigCookie = false;
+const disableConfigCookie = false;
+
 const getCookie = () => {
     if (!disableConfigCookie && Object.keys(config.bilibili.cookies).length > 0) {
+        // Update b_lsid in cookies
+        for (const key of Object.keys(config.bilibili.cookies)) {
+            const cookie = config.bilibili.cookies[key];
+            if (cookie) {
+                const updatedCookie = cookie.replace(/b_lsid=[0-9A-F]+_[0-9A-F]+/, `b_lsid=${utils.lsid()}`);
+                config.bilibili.cookies[key] = updatedCookie;
+            }
+        }
+
         return config.bilibili.cookies[Object.keys(config.bilibili.cookies)[Math.floor(Math.random() * Object.keys(config.bilibili.cookies).length)]];
     }
     const key = 'bili-cookie';
@@ -22,7 +32,9 @@ const getCookie = () => {
             page.on('requestfinished', async (request) => {
                 if (request.url() === 'https://api.bilibili.com/x/internal/gaia-gateway/ExClimbWuzhi') {
                     const cookies = await page.cookies();
-                    const cookieString = cookies.map((cookie) => `${cookie.name}=${cookie.value}`).join('; ');
+                    let cookieString = cookies.map((cookie) => `${cookie.name}=${cookie.value}`).join('; ');
+
+                    cookieString = cookieString.replace(/b_lsid=[0-9A-F]+_[0-9A-F]+/, `b_lsid=${utils.lsid()}`);
                     resolve(cookieString);
                 }
             });
@@ -35,11 +47,6 @@ const getCookie = () => {
     });
 };
 
-const clearCookie = () => {
-    cache.set('bili-cookie');
-    disableConfigCookie = true;
-};
-
 const getRenderData = (uid) => {
     const key = 'bili-web-render-data';
     return cache.tryGet(key, async () => {
@@ -129,13 +136,9 @@ const getUsernameAndFaceFromUID = async (uid) => {
     if (!name || !face) {
         const cookie = await getCookie();
         const wbiVerifyString = await getWbiVerifyString();
-        // await got(`https://space.bilibili.com/${uid}/`, {
-        //     headers: {
-        //         Referer: `https://www.bilibili.com/`,
-        //         Cookie: cookie,
-        //     },
-        // });
-        const params = utils.addWbiVerifyInfo(`mid=${uid}&token=&platform=web&web_location=1550101`, wbiVerifyString);
+        const dmImgList = utils.getDmImgList();
+        const renderData = await getRenderData(uid);
+        const params = utils.addWbiVerifyInfo(utils.addRenderData(utils.addDmVerifyInfo(`mid=${uid}&token=&platform=web&web_location=1550101`, dmImgList), renderData), wbiVerifyString);
         const { data: nameResponse } = await got(`https://api.bilibili.com/x/space/wbi/acc/info?${params}`, {
             headers: {
                 Referer: `https://space.bilibili.com/${uid}/`,
@@ -273,7 +276,6 @@ const getArticleDataFromCvid = async (cvid, uid) => {
 
 export default {
     getCookie,
-    clearCookie,
     getWbiVerifyString,
     getUsernameFromUID,
     getUsernameAndFaceFromUID,

package/lib/routes/bilibili/coin.ts

@@ -5,10 +5,10 @@ import utils from './utils';
 import { parseDate } from '@/utils/parse-date';
 
 export const route: Route = {
-    path: '/user/coin/:uid/:disableEmbed?',
+    path: '/user/coin/:uid/:embed?',
     categories: ['social-media'],
     example: '/bilibili/user/coin/208259',
-    parameters: { uid: '用户 id, 可在 UP 主主页中找到', disableEmbed: '默认为开启内嵌视频, 任意值为关闭' },
+    parameters: { uid: '用户 id, 可在 UP 主主页中找到', embed: '默认为开启内嵌视频, 任意值为关闭' },
     features: {
         requireConfig: false,
         requirePuppeteer: false,
@@ -30,7 +30,7 @@ export const route: Route = {
 
 async function handler(ctx) {
     const uid = ctx.req.param('uid');
-    const disableEmbed = ctx.req.param('disableEmbed');
+    const embed = !ctx.req.param('embed');
 
     const name = await cache.getUsernameFromUID(uid);
 
@@ -51,7 +51,7 @@ async function handler(ctx) {
         description: `${name} 的 bilibili 投币视频`,
         item: data.map((item) => ({
             title: item.title,
-            description: `${item.desc}${disableEmbed ? '' : `<br><br>${utils.iframe(item.aid)}`}<br><img src='${item.pic}'>`,
+            description: utils.renderUGCDescription(embed, item.pic, item.desc, item.aid, undefined, item.bvid),
             pubDate: parseDate(item.time * 1000),
             link: item.time > utils.bvidTime && item.bvid ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.aid}`,
             author: item.owner.name,

package/lib/routes/bilibili/dynamic.ts

@@ -16,15 +16,15 @@ export const route: Route = {
     parameters: {
         uid: '用户 id, 可在 UP 主主页中找到',
         routeParams: `
-| 键           | 含义                              | 接受的值       | 默认值 |
-| ------------ | --------------------------------- | -------------- | ------ |
-| showEmoji    | 显示或隐藏表情图片                | 0/1/true/false | false  |
-| disableEmbed | 关闭内嵌视频                      | 0/1/true/false | false  |
-| useAvid      | 视频链接使用 AV 号 (默认为 BV 号) | 0/1/true/false | false  |
-| directLink   | 使用内容直链                      | 0/1/true/false | false  |
-| hideGoods    | 隐藏带货动态                      | 0/1/true/false | false  |
+| 键         | 含义                              | 接受的值       | 默认值 |
+| ---------- | --------------------------------- | -------------- | ------ |
+| showEmoji  | 显示或隐藏表情图片                | 0/1/true/false | false  |
+| embed      | 默认开启内嵌视频                  | 任意值         |        |
+| useAvid    | 视频链接使用 AV 号 (默认为 BV 号) | 0/1/true/false | false  |
+| directLink | 使用内容直链                      | 0/1/true/false | false  |
+| hideGoods  | 隐藏带货动态                      | 0/1/true/false | false  |
 
-用例：\`/bilibili/user/dynamic/2267573/showEmoji=1&disableEmbed=1&useAvid=1\``,
+用例：\`/bilibili/user/dynamic/2267573/showEmoji=1&embed=0&useAvid=1\``,
     },
     features: {
         requireConfig: [
@@ -108,16 +108,16 @@ const getDes = (data: Modules): string => {
 const getOriginTitle = (data?: Modules) => data && getTitle(data);
 const getOriginDes = (data?: Modules) => data && getDes(data);
 const getOriginName = (data?: Modules) => data?.module_author?.name;
-const getIframe = (data?: Modules, disableEmbed: boolean = false) => {
-    if (disableEmbed) {
+const getIframe = (data?: Modules, embed: boolean = true) => {
+    if (!embed) {
         return '';
     }
     const aid = data?.module_dynamic?.major?.archive?.aid;
     const bvid = data?.module_dynamic?.major?.archive?.bvid;
-    if (!aid) {
+    if (aid === undefined && bvid === undefined) {
         return '';
     }
-    return utils.iframe(aid, null, bvid);
+    return utils.renderUGCDescription(embed, '', '', aid, undefined, bvid);
 };
 
 const getImgs = (data?: Modules) => {
@@ -226,7 +226,7 @@ async function handler(ctx) {
     const uid = ctx.req.param('uid');
     const routeParams = Object.fromEntries(new URLSearchParams(ctx.req.param('routeParams')));
     const showEmoji = fallback(undefined, queryToBoolean(routeParams.showEmoji), false);
-    const disableEmbed = fallback(undefined, queryToBoolean(routeParams.disableEmbed), false);
+    const embed = !ctx.req.param('embed');
     const displayArticle = ctx.req.query('mode') === 'fulltext';
     const useAvid = fallback(undefined, queryToBoolean(routeParams.useAvid), false);
     const directLink = fallback(undefined, queryToBoolean(routeParams.directLink), false);
@@ -243,8 +243,7 @@ async function handler(ctx) {
     });
     const body = JSONbig.parse(response.body);
     if (body?.code === -352) {
-        cacheIn.clearCookie();
-        throw new Error('The cookie has expired, please try again.');
+        throw new Error('Request failed, please try again.');
     }
     const items = (body as BilibiliWebDynamicResponse)?.data?.items;
 
@@ -356,7 +355,7 @@ async function handler(ctx) {
                 description = description.replaceAll('\r\n', '<br>').replaceAll('\n', '<br>');
                 originDescription = originDescription.replaceAll('\r\n', '<br>').replaceAll('\n', '<br>');
 
-                const descriptions = [description, originDescription, urlText, originUrlText, getIframe(data, disableEmbed), getIframe(origin, disableEmbed), getImgs(data), getImgs(origin)]
+                const descriptions = [description, originDescription, urlText, originUrlText, getIframe(data, embed), getIframe(origin, embed), getImgs(data), getImgs(origin)]
                     .filter(Boolean)
                     .map((e) => e?.trim())
                     .join('<br>');

package/lib/routes/bilibili/fav.ts

@@ -5,10 +5,10 @@ import { parseDate } from '@/utils/parse-date';
 import { config } from '@/config';
 
 export const route: Route = {
-    path: '/fav/:uid/:fid/:disableEmbed?',
+    path: '/fav/:uid/:fid/:embed?',
     categories: ['social-media'],
     example: '/bilibili/fav/756508/50948568',
-    parameters: { uid: '用户 id, 可在 UP 主主页中找到', fid: '收藏夹 ID, 可在收藏夹的 URL 中找到, 默认收藏夹建议使用 UP 主默认收藏夹功能', disableEmbed: '默认为开启内嵌视频, 任意值为关闭' },
+    parameters: { uid: '用户 id, 可在 UP 主主页中找到', fid: '收藏夹 ID, 可在收藏夹的 URL 中找到, 默认收藏夹建议使用 UP 主默认收藏夹功能', embed: '默认为开启内嵌视频, 任意值为关闭' },
     features: {
         requireConfig: false,
         requirePuppeteer: false,
@@ -25,7 +25,7 @@ export const route: Route = {
 async function handler(ctx) {
     const fid = ctx.req.param('fid');
     const uid = ctx.req.param('uid');
-    const disableEmbed = ctx.req.param('disableEmbed');
+    const embed = !ctx.req.param('embed');
 
     const response = await got({
         url: `https://api.bilibili.com/x/v3/fav/resource/list?media_id=${fid}&ps=20`,
@@ -51,7 +51,7 @@ async function handler(ctx) {
             data.medias &&
             data.medias.map((item) => ({
                 title: item.title,
-                description: `${item.intro}${disableEmbed ? '' : `<br><br>${utils.iframe(item.id)}`}<br><img src='${item.cover}'>`,
+                description: utils.renderUGCDescription(embed, item.cover, item.intro, item.id, undefined, item.bvid),
                 pubDate: parseDate(item.fav_time * 1000),
                 link: item.fav_time > utils.bvidTime && item.bvid ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.id}`,
                 author: item.upper.name,

package/lib/routes/bilibili/followings-dynamic.ts

@@ -12,7 +12,19 @@ export const route: Route = {
     path: '/followings/dynamic/:uid/:routeParams?',
     categories: ['social-media'],
     example: '/bilibili/followings/dynamic/109937383',
-    parameters: { uid: '用户 id', routeParams: '额外参数；请参阅 [#UP 主动态](#bilibili-up-zhu-dong-tai) 的说明和表格' },
+    parameters: {
+        uid: '用户 id, 可在 UP 主主页中找到',
+        routeParams: `
+| 键         | 含义                              | 接受的值       | 默认值 |
+| ---------- | --------------------------------- | -------------- | ------ |
+| showEmoji  | 显示或隐藏表情图片                | 0/1/true/false | false  |
+| embed      | 默认开启内嵌视频                  | 任意值         |        |
+| useAvid    | 视频链接使用 AV 号 (默认为 BV 号) | 0/1/true/false | false  |
+| directLink | 使用内容直链                      | 0/1/true/false | false  |
+| hideGoods  | 隐藏带货动态                      | 0/1/true/false | false  |
+
+用例：\`/bilibili/followings/dynamic/2267573/showEmoji=1&embed=0&useAvid=1\``,
+    },
     features: {
         requireConfig: [
             {
@@ -43,7 +55,7 @@ async function handler(ctx) {
     const routeParams = querystring.parse(ctx.req.param('routeParams'));
 
     const showEmoji = fallback(undefined, queryToBoolean(routeParams.showEmoji), false);
-    const disableEmbed = fallback(undefined, queryToBoolean(routeParams.disableEmbed), false);
+    const embed = !ctx.req.param('embed');
     const displayArticle = fallback(undefined, queryToBoolean(routeParams.displayArticle), false);
 
     const name = await cache.getUsernameFromUID(uid);
@@ -74,7 +86,17 @@ async function handler(ctx) {
     const getOriginDes = (data) => (data && (data.apiSeasonInfo && data.apiSeasonInfo.title && `//转发自: ${data.apiSeasonInfo.title}`) + (data.index_title && `<br>${data.index_title}`)) || '';
     const getOriginName = (data) => data.uname || (data.author && data.author.name) || (data.upper && data.upper.name) || (data.user && (data.user.uname || data.user.name)) || (data.owner && data.owner.name) || '';
     const getOriginTitle = (data) => (data.title ? `${data.title}<br>` : '');
-    const getIframe = (data) => (!disableEmbed && data && data.aid ? `<br><br>${utils.iframe(data.aid)}<br>` : '');
+    const getIframe = (data) => {
+        if (!embed) {
+            return '';
+        }
+        const aid = data?.aid;
+        const bvid = data?.bvid;
+        if (aid === undefined && bvid === undefined) {
+            return '';
+        }
+        return utils.renderUGCDescription(embed, '', '', aid, undefined, bvid);
+    };
     const getImgs = (data) => {
         let imgs = '';
         // 动态图片
@@ -110,7 +132,9 @@ async function handler(ctx) {
         data.map(async (item) => {
             const parsed = JSONbig.parse(item.card);
             const data = parsed.apiSeasonInfo || (getTitle(parsed.item) ? parsed.item : parsed);
-            const origin = parsed.origin ? JSONbig.parse(parsed.origin) : null;
+            // parsed.origin is already parsed, and it may be json or string.
+            // Don't parse it again, or it will cause an error.
+            const origin = parsed.origin || null;
 
             // img
             let imgHTML = '';

package/lib/routes/bilibili/followings-video.ts

@@ -7,10 +7,10 @@ import ConfigNotFoundError from '@/errors/types/config-not-found';
 import logger from '@/utils/logger';
 
 export const route: Route = {
-    path: '/followings/video/:uid/:disableEmbed?',
+    path: '/followings/video/:uid/:embed?',
     categories: ['social-media'],
     example: '/bilibili/followings/video/2267573',
-    parameters: { uid: '用户 id', disableEmbed: '默认为开启内嵌视频, 任意值为关闭' },
+    parameters: { uid: '用户 id', embed: '默认为开启内嵌视频，任意值为关闭' },
     features: {
         requireConfig: [
             {
@@ -38,7 +38,7 @@ export const route: Route = {
 
 async function handler(ctx) {
     const uid = String(ctx.req.param('uid'));
-    const disableEmbed = ctx.req.param('disableEmbed');
+    const embed = !ctx.req.param('embed');
     const name = await cache.getUsernameFromUID(uid);
 
     const cookie = config.bilibili.cookies[uid];
@@ -69,9 +69,9 @@ async function handler(ctx) {
 
         return {
             title: card_data.title,
-            description: `${card_data.desc}${disableEmbed ? '' : `<br><br>${utils.iframe(card_data.aid)}`}<br><img src="${card_data.pic}">`,
+            description: utils.renderUGCDescription(embed, card_data.pic, card_data.desc, card_data.aid, undefined, card.desc.bvid),
             pubDate: new Date(card_data.pubdate * 1000).toUTCString(),
-            link: card_data.pubdate > utils.bvidTime && card_data.bvid ? `https://www.bilibili.com/video/${card_data.bvid}` : `https://www.bilibili.com/video/av${card_data.aid}`,
+            link: card_data.pubdate > utils.bvidTime && card.desc.bvid ? `https://www.bilibili.com/video/${card.desc.bvid}` : `https://www.bilibili.com/video/av${card_data.aid}`,
             author: card.desc.user_profile.info.uname,
         };
     });

package/lib/routes/bilibili/like.ts

@@ -5,10 +5,10 @@ import utils from './utils';
 import { parseDate } from '@/utils/parse-date';
 
 export const route: Route = {
-    path: '/user/like/:uid/:disableEmbed?',
+    path: '/user/like/:uid/:embed?',
     categories: ['social-media'],
     example: '/bilibili/user/like/208259',
-    parameters: { uid: '用户 id, 可在 UP 主主页中找到', disableEmbed: '默认为开启内嵌视频, 任意值为关闭' },
+    parameters: { uid: '用户 id, 可在 UP 主主页中找到', embed: '默认为开启内嵌视频, 任意值为关闭' },
     features: {
         requireConfig: false,
         requirePuppeteer: false,
@@ -30,7 +30,7 @@ export const route: Route = {
 
 async function handler(ctx) {
     const uid = ctx.req.param('uid');
-    const disableEmbed = ctx.req.param('disableEmbed');
+    const embed = !ctx.req.param('embed');
 
     const name = await cache.getUsernameFromUID(uid);
 
@@ -51,7 +51,7 @@ async function handler(ctx) {
         description: `${name} 的 bilibili 点赞视频`,
         item: data.list.map((item) => ({
             title: item.title,
-            description: `${item.desc}${disableEmbed ? '' : `<br><br>${utils.iframe(item.aid)}`}<br><img src='${item.pic}'>`,
+            description: utils.renderUGCDescription(embed, item.pic, item.desc, item.aid, undefined, item.bvid),
             pubDate: parseDate(item.pubdate * 1000),
             link: item.pubdate > utils.bvidTime && item.bvid ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.aid}`,
             author: item.owner.name,

package/lib/routes/bilibili/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '哔哩哔哩 bilibili',
     url: 'www.bilibili.com',
+    lang: 'zh-CN',
 };

package/lib/routes/bilibili/page.ts

@@ -3,10 +3,10 @@ import got from '@/utils/got';
 import utils from './utils';
 
 export const route: Route = {
-    path: '/video/page/:bvid/:disableEmbed?',
+    path: '/video/page/:bvid/:embed?',
     categories: ['social-media'],
     example: '/bilibili/video/page/BV1i7411M7N9',
-    parameters: { bvid: '可在视频页 URL 中找到', disableEmbed: '默认为开启内嵌视频, 任意值为关闭' },
+    parameters: { bvid: '可在视频页 URL 中找到', embed: '默认为开启内嵌视频, 任意值为关闭' },
     features: {
         requireConfig: false,
         requirePuppeteer: false,
@@ -27,7 +27,7 @@ async function handler(ctx) {
         aid = bvid;
         bvid = null;
     }
-    const disableEmbed = ctx.req.param('disableEmbed');
+    const embed = !ctx.req.param('embed');
     const link = `https://www.bilibili.com/video/${bvid || `av${aid}`}`;
     const response = await got({
         method: 'get',
@@ -37,6 +37,7 @@ async function handler(ctx) {
         },
     });
 
+    const respdata = response.data.data;
     const { title: name, pages: data } = response.data.data;
 
     return {
@@ -48,7 +49,7 @@ async function handler(ctx) {
             .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 10)
             .map((item) => ({
                 title: item.part,
-                description: `${item.part} - ${name}${disableEmbed ? '' : `<br><br>${utils.iframe(aid, item.page, bvid)}`}`,
+                description: utils.renderUGCDescription(embed, respdata.pic, `${item.part} - ${name}`, respdata.aid, item.cid, respdata.bvid),
                 link: `${link}?p=${item.page}`,
             })),
     };

package/lib/routes/bilibili/partion-ranking.ts

@@ -16,10 +16,10 @@ function formatDate(now) {
 }
 
 export const route: Route = {
-    path: '/partion/ranking/:tid/:days?/:disableEmbed?',
+    path: '/partion/ranking/:tid/:days?/:embed?',
     categories: ['social-media'],
     example: '/bilibili/partion/ranking/171/3',
-    parameters: { tid: '分区 id, 见上方表格', days: '缺省为 7, 指最近多少天内的热度排序', disableEmbed: '默认为开启内嵌视频, 任意值为关闭' },
+    parameters: { tid: '分区 id, 见上方表格', days: '缺省为 7, 指最近多少天内的热度排序', embed: '默认为开启内嵌视频, 任意值为关闭' },
     features: {
         requireConfig: false,
         requirePuppeteer: false,
@@ -36,7 +36,7 @@ export const route: Route = {
 async function handler(ctx) {
     const tid = ctx.req.param('tid');
     const days = ctx.req.param('days') ?? 7;
-    const disableEmbed = ctx.req.param('disableEmbed');
+    const embed = !ctx.req.param('embed');
 
     const responseApi = `https://api.bilibili.com/x/web-interface/newlist?ps=15&rid=${tid}&_=${Date.now()}`;
 
@@ -59,7 +59,7 @@ async function handler(ctx) {
     for (let item of hotlist) {
         item = {
             title: item.title,
-            description: `${item.description}${disableEmbed ? '' : `<br><br>${utils.iframe(item.id)}`}<br><img src="https:${item.pic}"><br/>Tags:${item.tag}`,
+            description: utils.renderUGCDescription(embed, item.pic, `${item.description} - ${item.tag}`, item.id, undefined, item.bvid),
             pubDate: new Date(item.pubdate).toUTCString(),
             link: item.pubdate > utils.bvidTime && item.bvid ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.id}`,
             author: item.author,

package/lib/routes/bilibili/partion.ts

@@ -3,10 +3,10 @@ import got from '@/utils/got';
 import utils from './utils';
 
 export const route: Route = {
-    path: '/partion/:tid/:disableEmbed?',
+    path: '/partion/:tid/:embed?',
     categories: ['social-media'],
     example: '/bilibili/partion/33',
-    parameters: { tid: '分区 id', disableEmbed: '默认为开启内嵌视频, 任意值为关闭' },
+    parameters: { tid: '分区 id', embed: '默认为开启内嵌视频, 任意值为关闭' },
     features: {
         requireConfig: false,
         requirePuppeteer: false,
@@ -135,7 +135,7 @@ export const route: Route = {
 
 async function handler(ctx) {
     const tid = ctx.req.param('tid');
-    const disableEmbed = ctx.req.param('disableEmbed');
+    const embed = !ctx.req.param('embed');
 
     const response = await got({
         method: 'get',
@@ -159,7 +159,7 @@ async function handler(ctx) {
             list &&
             list.map((item) => ({
                 title: item.title,
-                description: `${item.desc}${disableEmbed ? '' : `<br><br>${utils.iframe(item.aid)}`}<br><img src="${item.pic}">`,
+                description: utils.renderUGCDescription(embed, item.pic, item.desc, item.aid, undefined, item.bvid),
                 pubDate: new Date(item.pubdate * 1000).toUTCString(),
                 link: item.pubdate > utils.bvidTime && item.bvid ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.aid}`,
                 author: item.owner.name,

package/lib/routes/bilibili/popular.ts

@@ -3,10 +3,12 @@ import got from '@/utils/got';
 import utils from './utils';
 
 export const route: Route = {
-    path: '/popular/all',
+    path: '/popular/all/:embed?',
     categories: ['social-media'],
     example: '/bilibili/popular/all',
-    parameters: {},
+    parameters: {
+        embed: '默认为开启内嵌视频, 任意值为关闭',
+    },
     features: {
         requireConfig: false,
         requirePuppeteer: false,
@@ -21,7 +23,7 @@ export const route: Route = {
 };
 
 async function handler(ctx) {
-    const disableEmbed = ctx.req.param('disableEmbed');
+    const embed = !ctx.req.param('embed');
     const response = await got({
         method: 'get',
         url: `https://api.bilibili.com/x/web-interface/popular`,
@@ -39,7 +41,7 @@ async function handler(ctx) {
             list &&
             list.map((item) => ({
                 title: item.title,
-                description: `${item.desc}${disableEmbed ? '' : `<br><br>${utils.iframe(item.aid)}`}<br><img src="${item.pic}">`,
+                description: utils.renderUGCDescription(embed, item.pic, item.desc, item.aid, undefined, item.bvid),
                 pubDate: new Date(item.pubdate * 1000).toUTCString(),
                 link: item.pubdate > utils.bvidTime && item.bvid ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.aid}`,
                 author: item.owner.name,

package/lib/routes/bilibili/ranking.ts

@@ -3,7 +3,7 @@ import got from '@/utils/got';
 import utils from './utils';
 
 export const route: Route = {
-    path: '/ranking/:rid?/:day?/:arc_type?/:disableEmbed?',
+    path: '/ranking/:rid?/:day?/:arc_type?/:embed?',
     name: '排行榜',
     maintainers: ['DIYgod'],
     categories: ['social-media', 'popular'],
@@ -104,9 +104,7 @@ export const route: Route = {
                 },
             ],
         },
-        disableEmbed: {
-            description: '默认为开启内嵌视频, 任意值为关闭',
-        },
+        embed: '默认为开启内嵌视频, 任意值为关闭',
     },
     handler,
 };
@@ -115,7 +113,7 @@ async function handler(ctx) {
     const rid = ctx.req.param('rid') || '0';
     const day = ctx.req.param('day') || '3';
     const arc_type = ctx.req.param('arc_type') || '1';
-    const disableEmbed = ctx.req.param('disableEmbed');
+    const embed = !ctx.req.param('embed');
     const arc_type1 = arc_type === '0' ? '全部投稿' : '近期投稿';
     const rid_1 = ['0', '1', '168', '3', '129', '4', '36', '188', '160', '119', '155', '5', '181'];
     const rid_2 = ['全站', '动画', '国创相关', '音乐', '舞蹈', '游戏', '科技', '数码', '生活', '鬼畜', '时尚', '娱乐', '影视'];
@@ -144,7 +142,7 @@ async function handler(ctx) {
         link: `https://www.bilibili.com/ranking/all/${rid}/0/${day}`,
         item: list.map((item) => ({
             title: item.title,
-            description: `${item.description || item.title}${disableEmbed ? '' : `<br><br>${utils.iframe(item.aid, null, item.bvid)}`}<br><img src="${item.pic}">`,
+            description: utils.renderUGCDescription(embed, item.pic, item.description || item.title, item.aid, undefined, item.bvid),
             pubDate: item.create && new Date(item.create).toUTCString(),
             author: item.author,
             link: !item.create || (new Date(item.create) / 1000 > utils.bvidTime && item.bvid) ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.aid}`,

package/lib/routes/bilibili/templates/description.art

@@ -0,0 +1,12 @@
+{{ if embed }}
+{{ if ugc }}
+<iframe width="640" height="360" src="https://www.bilibili.com/blackboard/html5mobileplayer.html?aid={{ aid }}&cid={{ cid }}&bvid={{ bvid }}" frameborder="0" allowfullscreen></iframe>
+{{ /if }}
+{{ if ogv }}
+<iframe width="640" height="360" src="https://www.bilibili.com/blackboard/html5mobileplayer.html?seasonId={{ seasonId }}&episodeId={{ episodeId }}" frameborder="0" allowfullscreen></iframe>
+{{ /if }}
+<br>
+{{ /if }}
+<img src="{{ img }}">
+<br>
+{{@ description }}

package/lib/routes/bilibili/types.ts

@@ -0,0 +1,52 @@
+export interface ResultResponse<Result> {
+    result: Result;
+}
+
+/**
+ * 番剧信息
+ *
+ * @interface MediaResult
+ *
+ * @property {string} cover - 封面。
+ * @property {string} evaluate - 摘要。
+ * @property {number} media_id - 媒体 ID。
+ * @property {number} season_id - 季度 ID。
+ * @property {string} share_url - 分享 URL。此属性是注入的。
+ * @property {string} title - 标题。
+ */
+export interface MediaResult {
+    cover: string;
+    evaluate: string;
+    media_id: number;
+    season_id: number;
+    share_url: string; // injected
+    title: string;
+}
+
+export interface SeasonResult {
+    main_section: SectionResult;
+    section: SectionResult[];
+}
+
+export interface SectionResult {
+    episodes: EpisodeResult[];
+}
+
+/**
+ * 番剧剧集信息
+ *
+ * @interface EpisodeResult
+ *
+ * @property {string} cover - 封面。
+ * @property {number} id - 剧集 ID。
+ * @property {string} long_title - 完整标题。
+ * @property {string} share_url - 分享 URL。
+ * @property {string} title - 短标题。
+ */
+export interface EpisodeResult {
+    cover: string;
+    id: number;
+    long_title: string;
+    share_url: string;
+    title: string;
+}

package/lib/routes/bilibili/user-channel.ts

@@ -10,10 +10,10 @@ const notFoundData = {
 };
 
 export const route: Route = {
-    path: '/user/channel/:uid/:sid/:disableEmbed?',
+    path: '/user/channel/:uid/:sid/:embed?',
     categories: ['social-media'],
     example: '/bilibili/user/channel/2267573/396050',
-    parameters: { uid: '用户 id, 可在 UP 主主页中找到', sid: '频道 id, 可在频道的 URL 中找到', disableEmbed: '默认为开启内嵌视频, 任意值为关闭' },
+    parameters: { uid: '用户 id, 可在 UP 主主页中找到', sid: '频道 id, 可在频道的 URL 中找到', embed: '默认为开启内嵌视频, 任意值为关闭' },
     features: {
         requireConfig: false,
         requirePuppeteer: false,
@@ -30,7 +30,7 @@ export const route: Route = {
 async function handler(ctx) {
     const uid = Number.parseInt(ctx.req.param('uid'));
     const sid = Number.parseInt(ctx.req.param('sid'));
-    const disableEmbed = ctx.req.param('disableEmbed');
+    const embed = !ctx.req.param('embed');
     const limit = ctx.req.query('limit') ?? 25;
 
     const link = `https://space.bilibili.com/${uid}/channel/seriesdetail?sid=${sid}`;
@@ -70,19 +70,12 @@ async function handler(ctx) {
         description: `${userName} 的 bilibili 频道`,
         logo: face,
         icon: face,
-        item: data.archives.map((item) => {
-            const descList = [];
-            if (!disableEmbed) {
-                descList.push(utils.iframe(item.aid));
-            }
-            descList.push(`<img src="${item.pic}">`);
-            return {
-                title: item.title,
-                description: descList.join('<br>'),
-                pubDate: parseDate(item.pubdate, 'X'),
-                link: item.pubdate > utils.bvidTime && item.bvid ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.aid}`,
-                author: userName,
-            };
-        }),
+        item: data.archives.map((item) => ({
+            title: item.title,
+            description: utils.renderUGCDescription(embed, item.pic, '', item.aid, undefined, item.bvid),
+            pubDate: parseDate(item.pubdate, 'X'),
+            link: item.pubdate > utils.bvidTime && item.bvid ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.aid}`,
+            author: userName,
+        })),
     };
 }