docs: 更新CHANGELOG

Fixed #279

CHANGELOG.md

@@ -1,5 +1,12 @@
 <!-- markdownlint-disable MD036 MD024-->
 # CHANGELOG
+## 主要变化(2.7.7)
+* 2426fe2 fix: 动态详情获取接口412频繁 (#279)
+* d370fef fix: 获取动态详情出现undefined (#271)
+* 00174b0 fix(monitor): L615
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
 ## 主要变化(2.7.6)
 * 881923b fix: 开奖时间和粉丝数判断逻辑 (#253)
 * 097e2d6 fix: 筛选掉置顶的评论，与该动态UP的评论 (#252)

lib/core/searcher.js

@@ -110,8 +110,12 @@ function parseDynamicCard(dynamic_detail_card) {
     obj.hasOfficialLottery = extension && extension.lott && true;
     /* 转发者的描述 纯文字内容 图片动态描述 后两个分别是视频动态的描述和视频本身的描述*/
     obj.description =
-        (item && (item.content || '' + item.description || ''))
-        || (cardToJson.dynamic || '' + cardToJson.desc || '')
+        (item && ((item.content || '') + (item.description || '')))
+        || (
+            (cardToJson.dynamic || '')
+            + (cardToJson.desc || '')
+            + (cardToJson.vest && cardToJson.vest.content || '')
+        )
         || '';
     /* 转发 */
     if (obj.type === 1) {

lib/net/api.bili.js

@@ -5,7 +5,12 @@ module.exports = Object.freeze({
     DYNAMIC_REPOST_SHARE: 'https://api.vc.bilibili.com/dynamic_repost/v1/dynamic_repost/share',
     DYNAMIC_SVR_CREATE_DRAW: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/create_draw',
     DYNAMIC_SVR_CREATE: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/create',
-    DYNAMIC_SVR_GET_DYNAMIC_DETAIL: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V2: 'https://api.vc.bilibili.com/dynamic_svr/v2/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V3: 'https://api.vc.bilibili.com/dynamic_svr/v3/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V4: 'https://api.vc.bilibili.com/dynamic_svr/v4/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V5: 'https://api.vc.bilibili.com/dynamic_svr/v5/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V6: 'https://api.vc.bilibili.com/dynamic_svr/v6/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V7: 'https://api.vc.bilibili.com/dynamic_svr/v7/dynamic_svr/get_dynamic_detail',
     DYNAMIC_SVR_RM_DYNAMIC: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/rm_dynamic',
     DYNAMIC_SVR_SPACE_HISTORY: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/space_history',
     FEED_GET_ATTENTION_LIST: 'https://api.vc.bilibili.com/feed/v1/feed/get_attention_list',

lib/net/bili.js

@@ -378,37 +378,74 @@ const bili_client = {
             return null;
         }
     },
+    _getOneDynamicByDyid: new Line('获取一个动态的细节', [
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V2,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V3,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V4,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V5,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V6,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V7,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+    ], responseText => {
+        const
+            res = strToJson(responseText),
+            { code, data } = res,
+            { card } = data || {};
+        switch (code) {
+            case 0:
+                if (card) {
+                    return [false, card, `ok`];
+                } else {
+                    return [false, undefined, `动态不存在`];
+                }
+            case 500207:
+                return [false, undefined, `该动态为包月充电专属可以给UP主充电后观看`];
+            default:
+                return [true, undefined, `获取动态数据出错:\n${responseText}`]
+        }
+    }),
     /**
      * 获取一个动态的细节
      * @param {string} dynamic_id
      * @return {Promise<JSON>} 失败返回undefined
      */
     async getOneDynamicByDyid(dynamic_id) {
-        const
-            responseText = await get({
-                url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL,
-                query: {
-                    dynamic_id
-                }
-            }),
-            { code, data } = strToJson(responseText),
-            { card } = data || {};
-        switch (code) {
-            case 0:
-                if (card) {
-                    log.info('获取一个动态的细节', `动态id(${dynamic_id})`);
-                    return card;
-                } else {
-                    log.warn('获取一个动态的细节', `动态id(${dynamic_id})不存在`);
-                    return;
-                }
-            case 500207:
-                log.warn('获取一个动态的细节', `动态id(${dynamic_id})该动态为包月充电专属可以给UP主充电后观看`);
-                return;
-            default:
-                log.error('获取一个动态的细节', `获取动态(${dynamic_id})数据出错:\n${responseText}`);
-                return;
-        }
+        return this._getOneDynamicByDyid.run(dynamic_id)
     },
     /**
      * 获取一组动态的信息

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lottery-auto-script",
-  "version": "2.7.6",
+  "version": "2.7.7",
   "description": "自动参与B站动态抽奖",
   "main": "main.js",
   "scripts": {

test/article.test.js

@@ -0,0 +1,16 @@
+const assert = require('assert');
+const bili_client = require("../lib/net/bili");
+const searcher = require("../lib/core/searcher");
+const util = require('./util');
+
+(async () => {
+    await util.par_run([0], [
+        // 0
+        async () => {
+            let info = await bili_client.getOneArticleByCv(22112353);
+            console.log(info);
+        },
+    ])
+
+    console.log("article.test ... ok!");
+})()

test/dynamic_card.test.js

@@ -4,7 +4,7 @@ const searcher = require("../lib/core/searcher");
 const util = require('./util');
 
 (async () => {
-    await util.par_run([0, 1, 2, 3, 4, 5], [
+    await util.par_run([0, 1, 2, 3, 4, 5, 6], [
         // 0
         async () => {
             let info = await bili_client.getOneDynamicByDyid("728424890210713624");
@@ -44,6 +44,12 @@ const util = require('./util');
             chats = await bili_client.getChat(card.rid_str, card.chat_type)
             assert.equal(chats.filter(it => it[0] === '六的月').length, 0)
         },
+        // 6
+        async () => {
+            const dy = await bili_client.getOneDynamicByDyid("774973685666676768");
+            const card = searcher.parseDynamicCard(dy)
+            assert.notEqual(card.description + "", undefined + "");
+        },
     ])
 
     console.log("dynamic_card.test ... ok!");