diff --git a/lib/routes/bilibili/dynamic.js b/lib/routes/bilibili/dynamic.js
index 7a4c9a234..0c1de1251 100644
--- a/lib/routes/bilibili/dynamic.js
+++ b/lib/routes/bilibili/dynamic.js
@@ -27,21 +27,29 @@ module.exports = async (ctx) => {
// img
let imgHTML = '';
- if (data.pictures) {
- for (let i = 0; i < data.pictures.length; i++) {
- imgHTML += `
`;
+ const getImgs = (data) => {
+ let imgs = '';
+ if (data.pictures) {
+ for (let i = 0; i < data.pictures.length; i++) {
+ imgs += `
`;
+ }
}
- }
- if (data.pic) {
- imgHTML += `
`;
- }
- if (origin && origin.item && origin.item.pictures) {
- for (let i = 0; i < origin.item.pictures.length; i++) {
- imgHTML += `
`;
+ if (data.pic) {
+ imgs += `
`;
}
- }
- if (origin && origin.pic) {
- imgHTML += `
`;
+ if (data.cover) {
+ imgs += `
`;
+ }
+ if (data.sketch && data.sketch.cover_url) {
+ imgs += `
`;
+ }
+ return imgs;
+ };
+
+ imgHTML += getImgs(data);
+
+ if (origin) {
+ imgHTML += getImgs(origin.item || origin);
}
// link
let link = '';
@@ -51,17 +59,16 @@ module.exports = async (ctx) => {
link = `https://t.bilibili.com/${item.desc.dynamic_id}`;
}
const getTitle = (data) => data.title || data.description || data.content || (data.vest && data.vest.content) || '';
- const getDes = (data) => data.desc || data.description || data.content || data.summary || (data.vest && data.vest.content) + (data.sketch && data.sketch.title) || data.intro || '';
- const getOriginDes = (data) =>
- (data && data.author && data.author.name && `转发自: @${data.author.name}: `) + (data && data.title) + (data && data.image_urls && data.image_urls.length > 0 && `
`) ||
- (data && data.apiSeasonInfo && data.apiSeasonInfo.title && `转发自: ${data.apiSeasonInfo.title}`) + (data && data.cover && `
`) ||
- '';
- const getOriginName = (data) => (data.user && (data.user.uname || data.user.name)) || (data.owner && data.owner.name) || '';
+ const getDes = (data) => data.desc || data.description || data.content || data.summary || (data.vest && data.vest.content) + (data.sketch && `
${data.sketch.title}
${data.sketch.desc_text}`) || data.intro || '';
+ const getOriginDes = (data) => (data && data.apiSeasonInfo && data.apiSeasonInfo.title && `//转发自: ${data.apiSeasonInfo.title}`) || '';
+ const getOriginName = (data) => data.uname || (data.author && data.author.name) || (data.user && (data.user.uname || data.user.name)) || (data.owner && data.owner.name) || '';
+ const getOriginTitle = (data) => (data.title ? `${data.title}
` : '');
+ const getIframe = (data) => (!disableEmbed && data && data.aid ? `
${utils.iframe(data.aid)}
` : '');
return {
title: getTitle(data),
description: `${getDes(data)}${
- origin && (origin.user || origin.owner) ? `
转发自: @${getOriginName(origin)}: ${origin.title ? `${origin.title}
` : ''}${getDes(origin.item || origin)}` : `${getOriginDes(origin)}`
- }${!disableEmbed && data.aid ? `
${utils.iframe(data.aid)}
` : ''}${!disableEmbed && origin && origin.aid ? `
${utils.iframe(origin.aid)}
` : ''}
${imgHTML} `,
+ origin && getOriginName(origin) ? `
//转发自: @${getOriginName(origin)}: ${getOriginTitle(origin.item || origin)}${getDes(origin.item || origin)}` : `${getOriginDes(origin)}`
+ }${getIframe(data)}${getIframe(origin)}${imgHTML ? `
${imgHTML}` : ''}`,
pubDate: new Date(item.desc.timestamp * 1000).toUTCString(),
link: link,
};