From 98a7297eab2f4dde4c04377e961f9da74f4f86c8 Mon Sep 17 00:00:00 2001
From: CaoMeiYouRen <40430746+CaoMeiYouRen@users.noreply.github.com>
Date: Sat, 2 May 2020 13:10:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Db=E7=AB=99=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E4=B8=AD=E8=BD=AC=E5=8F=91=E7=9B=B4=E6=92=AD=E9=97=B4?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=87=BA=E7=8E=B0undefined;=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85b=E7=AB=99=E5=8A=A8=E6=80=81=E4=B8=AD=E8=BD=AC?=
 =?UTF-8?q?=E5=8F=91=E4=B8=93=E9=A2=98=E9=A1=B5=E7=9A=84=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=92=8C=E5=9B=BE=E7=89=87=20(#4642)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/routes/bilibili/dynamic.js | 49 +++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 21 deletions(-)

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 += `<img src="${data.pictures[i].img_src}">`;
+            const getImgs = (data) => {
+                let imgs = '';
+                if (data.pictures) {
+                    for (let i = 0; i < data.pictures.length; i++) {
+                        imgs += `<img src="${data.pictures[i].img_src}">`;
+                    }
                 }
-            }
-            if (data.pic) {
-                imgHTML += `<img src="${data.pic}">`;
-            }
-            if (origin && origin.item && origin.item.pictures) {
-                for (let i = 0; i < origin.item.pictures.length; i++) {
-                    imgHTML += `<img src="${origin.item.pictures[i].img_src}">`;
+                if (data.pic) {
+                    imgs += `<img src="${data.pic}">`;
                 }
-            }
-            if (origin && origin.pic) {
-                imgHTML += `<img src="${origin.pic}">`;
+                if (data.cover) {
+                    imgs += `<img src="${data.cover}">`;
+                }
+                if (data.sketch && data.sketch.cover_url) {
+                    imgs += `<img src="${data.sketch.cover_url}">`;
+                }
+                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 && `<br><img src="${data.image_urls[0]}">`) ||
-                (data && data.apiSeasonInfo && data.apiSeasonInfo.title && `转发自: ${data.apiSeasonInfo.title}`) + (data && data.cover && `<br><img src="${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 && `<br>${data.sketch.title}<br>${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}<br>` : '');
+            const getIframe = (data) => (!disableEmbed && data && data.aid ? `<br><br>${utils.iframe(data.aid)}<br>` : '');
             return {
                 title: getTitle(data),
                 description: `${getDes(data)}${
-                    origin && (origin.user || origin.owner) ? `<br><br>转发自: @${getOriginName(origin)}: ${origin.title ? `${origin.title}<br>` : ''}${getDes(origin.item || origin)}` : `${getOriginDes(origin)}`
-                }${!disableEmbed && data.aid ? `<br><br>${utils.iframe(data.aid)}<br>` : ''}${!disableEmbed && origin && origin.aid ? `<br><br>${utils.iframe(origin.aid)}<br>` : ''}<br>${imgHTML} `,
+                    origin && getOriginName(origin) ? `<br><br>//转发自: @${getOriginName(origin)}: ${getOriginTitle(origin.item || origin)}${getDes(origin.item || origin)}` : `${getOriginDes(origin)}`
+                }${getIframe(data)}${getIframe(origin)}${imgHTML ? `<br>${imgHTML}` : ''}`,
                 pubDate: new Date(item.desc.timestamp * 1000).toUTCString(),
                 link: link,
             };