From 03e24b9b84fabcd1205646acb5868edbf5b94e2d Mon Sep 17 00:00:00 2001
From: shanmite <shanmite@hotmail.com>
Date: Sat, 25 Jun 2022 10:28:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20`extend=5Fjson`=E4=B8=AD=E7=9A=84`reserv?=
 =?UTF-8?q?e`=E8=8E=B7=E5=8F=96=E5=A4=B1=E8=B4=A5(#155)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

隐藏于`“”`键之下{“”:{reserve:{}}}
---
 lib/core/monitor.js  | 13 +++++++++----
 lib/core/searcher.js |  5 +++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/core/monitor.js b/lib/core/monitor.js
index e10c333..4b9d67d 100644
--- a/lib/core/monitor.js
+++ b/lib/core/monitor.js
@@ -373,6 +373,15 @@ class Monitor extends Searcher {
                 return false
             }
 
+            if (reserve_id) {
+                log.info("预约抽奖", "开始");
+                if (hasEnv('NOT_GO_LOTTERY')) {
+                    log.info('NOT_GO_LOTTERY', 'ON');
+                } else {
+                    await bili.reserve_lottery(reserve_id)
+                }
+            }
+
             if (!has_key_words && description) {
                 log.warn("筛选动态", `无关键词动态的描述: ${description}\n\n考虑是否修改设置key_words:\n${key_words.join('\n')}`)
                 return false
@@ -405,10 +414,6 @@ class Monitor extends Searcher {
                 return false
             }
 
-            if (reserve_id) {
-                await bili.reserve_lottery(reserve_id)
-            }
-
             if (isLottery) {
                 const { uname_map = {} } = global_var.get("remoteconfig")
                 let onelotteryinfo = {};
diff --git a/lib/core/searcher.js b/lib/core/searcher.js
index 0b3af6d..36d97df 100644
--- a/lib/core/searcher.js
+++ b/lib/core/searcher.js
@@ -57,6 +57,7 @@ function parseDynamicCard(dynamic_detail_card) {
         , { is_liked = 1, user_profile = {} } = desc
         , { info = {} } = user_profile
         , extendjsonToJson = strToJson(extend_json)
+        , extendjsonToJsonHidden = extendjsonToJson[""] || {}
         , cardToJson = strToJson(card)
         , { item } = cardToJson;
     /* 转发者的UID */
@@ -78,8 +79,8 @@ function parseDynamicCard(dynamic_detail_card) {
     /* 定位@信息 */
     obj.ctrl = (extendjsonToJson.ctrl) || [];
     /* 预约抽奖信息 */
-    if (extendjsonToJson.reserve) {
-        let { reserve_id, reserve_lottery } = extendjsonToJson.reserve;
+    if (extendjsonToJsonHidden.reserve) {
+        let { reserve_id, reserve_lottery } = extendjsonToJsonHidden.reserve;
         obj.reserve_id = reserve_lottery === 1 ? reserve_id : 0;
     }
     /* 是否有官方抽奖 */