Merge branch 'main' into getLotteryInfoByTag

Fixed #293

CHANGELOG.md

@@ -1,5 +1,30 @@
 <!-- markdownlint-disable MD036 MD024-->
 # CHANGELOG
+## 主要变化(2.7.10)
+* 29645bc fixed: 话题搜索功能已失效 #285
+* d950a59 fix: is_imitator导致错误评论
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.9)
+* 3828a0f fix: Cannot read properties of null (#284)
+* 67313f4 feat: 专栏里的动态链接识别优化 (#283)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.8)
+* ad6af97 feat: 专栏短链接识别 (#263)
+* b6c56c5 feat:  取关分区支持设置多分区 (#281)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(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/clear.js

@@ -6,12 +6,13 @@ const config = require("./data/config");
 
 /**
  * 获取关注分区里的uid
+ * @param {string} partition
  * @returns { Promise<number[]> }
  */
-async function getFollowList() {
+async function getFollowList(partition) {
     const
-        { clear_partition, clear_white_list, get_partition_wait } = config,
-        tagid = await bili.checkMyPartition(clear_partition);
+        { clear_white_list, get_partition_wait } = config,
+        tagid = await bili.checkMyPartition(partition);
     let rmup = [];
     if (typeof tagid === 'undefined') {
         log.info('获取关注列表', '未能成功获取关注分区id');
@@ -32,9 +33,9 @@ async function getFollowList() {
  * 清理动态和关注
  */
 async function clear() {
-    const { search_wait, clear_white_list, clear_max_day, clear_quick_remove_attention, clear_remove_dynamic, clear_remove_attention, clear_remove_delay, clear_dynamic_type } = config;
+    const { search_wait, clear_white_list, clear_max_day, clear_quick_remove_attention, clear_remove_dynamic, clear_remove_attention, clear_remove_delay, clear_dynamic_type, clear_partition } = config;
     let success = true;
-    const uid_list = await getFollowList();
+    const uid_list = (await Promise.all(clear_partition.split(',').map(getFollowList))).flat();
     if (!uid_list.length) {
         log.info('清理关注', `关注为空`)
     } else {

lib/core/monitor.js

@@ -396,8 +396,7 @@ class Monitor extends Searcher {
                     || (hasOfficialLottery && model[0] === '1')
                     || (!hasOfficialLottery && model[1] === '1' && has_key_words),
                 isSendChat =
-                    (is_imitator && lottery_info_type === 'uid' && chatmodel !== '00')
-                    || (hasOfficialLottery && chatmodel[0] === '1')
+                    (hasOfficialLottery && chatmodel[0] === '1')
                     || (!hasOfficialLottery && chatmodel[1] === '1'),
                 { blacklist: remote_blacklist } = use_public_blacklist === false
                     ? { blacklist: "" }
@@ -488,7 +487,7 @@ class Monitor extends Searcher {
 
                 let
                     /**转发评语 */
-                    RandomStr = getRandomOne(relays)
+                    RandomStr = (getRandomOne(relays) || "!!!")
                         .replace(/\$\{uname\}/g, uname_map[real_uid] || uname),
                     /**控制字段 */
                     new_ctrl = [];
@@ -541,7 +540,7 @@ class Monitor extends Searcher {
                 /* 是否评论 */
                 if (isSendChat) {
                     onelotteryinfo.rid = rid
-                    onelotteryinfo.chat = getRandomOne(chats)
+                    onelotteryinfo.chat = (getRandomOne(chats) || "!!!")
                         .replace(/\$\{uname\}/g, uname_map[real_uid] || uname)
                 }
 

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) {
@@ -182,6 +186,12 @@ function modifyDynamicRes(res) {
         log.warn('处理动态数据', '未找到任何动态信息')
     }
 
+    if (typeof has_more === "undefined"
+        && typeof offset === "undefined") {
+        log.error('处理动态数据', '该功能已失效');
+        return null;
+    }
+
     const
         /**
          * 字符串offset防止损失精度
@@ -349,14 +359,15 @@ class Searcher {
      * @returns {Promise<LotteryInfo[] | null>}
      */
     async getLotteryInfoByTag(tag_name) {
+        log.info('获取动态', `开始获取带话题#${tag_name}#的动态信息`);
+
         const
-            tag_id = await bili.getTagIDByTagName(tag_name),
+            tag_id = await bili.searchTagIDByTagName(tag_name),
             hotdy = await bili.getHotDynamicInfoByTagID(tag_id),
             modDR = modifyDynamicRes(hotdy);
 
         if (modDR === null) return null;
 
-        log.info('获取动态', `开始获取带话题#${tag_name}#的动态信息`);
         log.info('获取动态', '成功获取热门动态');
 
         /**
@@ -421,13 +432,16 @@ class Searcher {
                 continue
             }
             const
-                content = await bili.getOneArticleByCv(id),
-                dyids = content.match(/(?<=t.bilibili.com\/)[0-9]+/g) || [],
-                dyids_set = [...new Set(dyids)],
+                content = (await bili.getOneArticleByCv(id) || "").split("推荐文章")[0],
+                dyids = content.match(/[0-9]{18}/g) || [],
+                short_ids = content.match(/(?<=b23.tv\/)[a-zA-Z0-9]{7}/g) || [],
+                short_id_set = [...new Set(short_ids)],
+                short_ids_to_dyids = await Promise.all(short_id_set.map(bili.shortDynamicIdToDyid)),
+                dyid_set = [...new Set([...dyids, ...short_ids_to_dyids])],
                 /**判断此专栏是否查看过的权重 */
-                weight = dyids_set.length / 2;
+                weight = dyid_set.length / 2;
 
-            let { length } = dyids_set,
+            let { length } = dyid_set,
                 /**初始权重 */
                 _weight = 0,
                 /**单个专栏中的dyid */
@@ -435,8 +449,9 @@ class Searcher {
             log.info('获取动态', `提取专栏(${id})中提及的dyid(${length})`)
 
             /**遍历某专栏中的dyids */
-            for (const dyid of dyids_set) {
-                if (dyid.length === utils.dyid_length) {
+            for (const dyid of dyid_set) {
+                if (typeof dyid === "string"
+                    && dyid.length === utils.dyid_length) {
 
                     log.info('获取动态', `查看专栏中所提及动态(${dyid}) (${length--})`)
                     const card = await bili.getOneDynamicByDyid(dyid)

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',
@@ -27,8 +32,9 @@ module.exports = Object.freeze({
     SESSION_SVR_GET_SESSIONS: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/get_sessions',
     SESSION_SVR_SINGLE_UNREAD: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/single_unread',
     SESSION_SVR_UPDATE_ACK: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/update_ack',
+    SHORTLINK: 'https://b23.tv/{{short_id}}',
     SPACE_MYINFO: 'https://api.bilibili.com/x/space/myinfo',
-    TAG_INFO: 'https://api.bilibili.com/x/tag/info',
+    TOPIC_PUB_SEARCH: "https://app.bilibili.com/x/topic/pub/search",
     TOP_FEED_RCMD: "https://api.bilibili.com/x/web-interface/index/top/feed/rcmd",
     TOP_RCMD: "https://api.bilibili.com/x/web-interface/index/top/rcmd",
     TOPIC_SVR_TOPIC_HISTORY: 'https://api.vc.bilibili.com/topic_svr/v1/topic_svr/topic_history',

lib/net/bili.js

@@ -378,37 +378,90 @@ const bili_client = {
             return null;
         }
     },
+    /**
+     * @param {string} short_id 
+     * @returns {Promise<string>}
+     */
+    async shortDynamicIdToDyid(short_id) {
+        return get({
+            url: API.SHORTLINK.replace('{{short_id}}', short_id),
+            config: {
+                redirect: false,
+            }
+        }).then(a => {
+            const dyid = (a.match(/[0-9]{18}/) || [])[0];
+            log.info("短连接转换", `${short_id} -> ${dyid}`)
+            return dyid
+        })
+    },
+    _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)
     },
     /**
      * 获取一组动态的信息
@@ -431,27 +484,31 @@ const bili_client = {
         })
     },
     /**
-     * 通过tag名获取tag的id
+     * 通过tag名搜索tag的id
      * @param {string} tag_name
      * tag名
      * @returns {Promise<number | -1>}
      * 正确:tag_ID
      * 错误:-1
      */
-    async getTagIDByTagName(tag_name) {
+    async searchTagIDByTagName(tag_name) {
         const
             responseText = await get({
-                url: API.TAG_INFO,
+                url: API.TOPIC_PUB_SEARCH,
                 query: {
-                    tag_name
+                    keywords: tag_name
                 }
             }),
-            res = strToJson(responseText);
-        if (res.code !== 0) {
+            res = strToJson(responseText),
+            { data = {} } = res,
+            { topic_items = [{}] } = data,
+            { id = -1, name } = topic_items[0];
+        if (id === -1) {
             log.error('获取TagID', '失败');
             return -1;
         } else {
-            return res.data.tag_id;
+            log.info('获取TagID', `${name} -> ${id}`);
+            return id;
         }
     },
     /**
@@ -1115,7 +1172,7 @@ const bili_client = {
         if (res.code === 0) {
             const data = res.data.filter((it) => it.name === name);
             if (data.length) {
-                log.info('获取分区id', '成功');
+                log.info('获取分区id', `成功 ${name}`);
                 tagid = data[0].tagid;
             } else {
                 log.warn('获取分区id', `失败 无指定分区名${name}`);
@@ -1182,10 +1239,10 @@ const bili_client = {
             res.data.forEach(d => {
                 uids.push(d.mid);
             });
-            log.info(`获取分组${tagid}`, `成功获取取关分区列表${n}`);
+            log.info(`获取分组id${tagid}`, `成功获取取关分区列表${n}`);
             return uids;
         } else {
-            log.error(`获取分组${tagid}`, `获取取关分区列表失败\n${responseText}`);
+            log.error(`获取分组id${tagid}`, `获取取关分区列表失败\n${responseText}`);
             return uids;
         }
     }

my_config.example.js

@@ -403,6 +403,7 @@ module.exports = Object.freeze({
         /**
          * - 取关分区
          * - 默认为: 此处存放因抽奖临时关注的up
+         * - 可用逗号分割以取关多分区
          */
         clear_partition: '',
 

package.json

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

test/article.test.js

@@ -0,0 +1,15 @@
+const assert = require('assert');
+const bili_client = require("../lib/net/bili");
+const util = require('./util');
+
+(async () => {
+    await util.par_run([0], [
+        // 0
+        async () => {
+            let info = await bili_client.getOneArticleByCv(22112353);
+            let short_ids = [...new Set(info.match(/(?<=b23.tv\/)[a-zA-Z0-9]{7}/g) || [])];
+            assert.equal((await Promise.all(short_ids.map(bili_client.shortDynamicIdToDyid)))[0], "767357823884460033");
+        },
+    ])
+    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!");