From f1514212db1d7e01af72bebd8d84f70d7dc37abc Mon Sep 17 00:00:00 2001
From: qixingchen <qixingchen@lovelive.moe>
Date: Tue, 11 Jun 2019 11:29:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20B=E7=AB=99=E8=AF=9D=E9=A2=98(=E9=A2=91?=
 =?UTF-8?q?=E9=81=93/=E6=A0=87=E7=AD=BE)=E5=A4=B1=E6=95=88=20(#2367)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/routes/bilibili/topic.js | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/lib/routes/bilibili/topic.js b/lib/routes/bilibili/topic.js
index 952b3b1e54..7e0648a076 100644
--- a/lib/routes/bilibili/topic.js
+++ b/lib/routes/bilibili/topic.js
@@ -1,5 +1,4 @@
 const got = require('@/utils/got');
-const JSONbig = require('json-bigint');
 
 module.exports = async (ctx) => {
     const topic = ctx.params.topic;
@@ -13,38 +12,36 @@ module.exports = async (ctx) => {
         },
         transformResponse: [(data) => data],
     });
-    const data = JSONbig.parse(response.data).data.cards;
+    const data = response.data.data.cards;
 
     ctx.state.data = {
         title: `${topic} 的全部话题`,
         link: `https://www.bilibili.com/tag/${topic}/feed`,
         description: `https://www.bilibili.com/tag/${topic}/feed`,
         item: data.map((item) => {
-            const parsed = JSONbig.parse(item.card);
-            const data = parsed.item || parsed;
+            const parsed = JSON.parse(item.card);
+            const cardData = parsed.item || parsed;
 
             // img
             let imgHTML = '';
-            if (data.pictures) {
-                for (let i = 0; i < data.pictures.length; i++) {
-                    imgHTML += `<img referrerpolicy="no-referrer" src="${data.pictures[i].img_src}">`;
+            if (cardData.pictures) {
+                for (let i = 0; i < cardData.pictures.length; i++) {
+                    imgHTML += `<img referrerpolicy="no-referrer" src="${cardData.pictures[i].img_src}">`;
                 }
             }
-            if (data.pic) {
-                imgHTML += `<img referrerpolicy="no-referrer" src="${data.pic}">`;
+            if (cardData.pic) {
+                imgHTML += `<img referrerpolicy="no-referrer" src="${cardData.pic}">`;
             }
 
             // link
             let link = '';
-            if (data.dynamic_id) {
-                link = `https://t.bilibili.com/${data.dynamic_id}`;
-            } else if (item.desc && item.desc.dynamic_id) {
-                link = `https://t.bilibili.com/${item.desc.dynamic_id}`;
+            if (item.desc && item.desc.dynamic_id_str) {
+                link = `https://t.bilibili.com/${item.desc.dynamic_id_str}`;
             }
 
             return {
-                title: data.title || data.description || data.content || (data.vest && data.vest.content),
-                description: `${data.desc || data.description || data.content || data.summary || (data.vest && data.vest.content) + (data.sketch && data.sketch.title)}${imgHTML} `,
+                title: cardData.title || cardData.description || cardData.content || (cardData.vest && cardData.vest.content),
+                description: `${cardData.desc || cardData.description || cardData.content || cardData.summary || (cardData.vest && cardData.vest.content) + (cardData.sketch && cardData.sketch.title)}${imgHTML} `,
                 pubDate: new Date(item.desc.timestamp * 1000).toUTCString(),
                 link: link,
             };