From 28fc79ea3339b34b30babaebd233c309a656ab16 Mon Sep 17 00:00:00 2001
From: shanmite <shanmite@hotmail.com>
Date: Tue, 15 Nov 2022 14:49:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=9A=E7=9F=A5=E5=86=85=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=8A=BD=E5=A5=96=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/core/monitor.js | 10 ++++++++--
 lib/lottery.js      |  5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/core/monitor.js b/lib/core/monitor.js
index 103d8e1..eb9236c 100644
--- a/lib/core/monitor.js
+++ b/lib/core/monitor.js
@@ -66,7 +66,10 @@ class Monitor extends Searcher {
             case 2004:
                 log.warn('账号异常', `UID(${global_var.get('myUID')})异常号只会对部分UP出现关注异常`)
                 if (!config.is_exception) {
-                    await sendNotify('[动态抽奖]账号异常通知', `UID: ${global_var.get('myUID')}\n异常号只会对部分UP出现关注异常\n可在设置中令is_exception为true关闭此推送\n${log._cache.filter(it => /Error|\[抽奖信息\]/.test(it)).join('\n')}`)
+                    await sendNotify(
+                        '[动态抽奖]账号异常通知',
+                        `UID: ${global_var.get('myUID')}\n异常号只会对部分UP出现关注异常\n可在设置中令is_exception为true关闭此推送\n${log._cache.filter(it => /Error|\s抽奖信息\]/.test(it)).join('\n')}`
+                    )
                 }
                 config.is_exception = true;
                 event_bus.emit('Turn_on_the_Monitor')
@@ -74,7 +77,10 @@ class Monitor extends Searcher {
             case 2005:
                 log.warn('关注已达上限', `UID(${global_var.get('myUID')})关注已达上限,已临时进入只转已关注模式`)
                 if (!config.is_outof_maxfollow) {
-                    await sendNotify('[动态抽奖]关注已达上限', `UID: ${global_var.get('myUID')}\n关注已达上限,已临时进入只转已关注模式\n可在设置中令is_outof_maxfollow为true关闭此推送\n${log._cache.filter(it => /Error|\[抽奖信息\]/.test(it)).join('\n')}`)
+                    await sendNotify(
+                        '[动态抽奖]关注已达上限',
+                        `UID: ${global_var.get('myUID')}\n关注已达上限,已临时进入只转已关注模式\n可在设置中令is_outof_maxfollow为true关闭此推送\n${log._cache.filter(it => /Error|\s抽奖信息\]/.test(it)).join('\n')}`
+                    )
                 }
                 config.is_outof_maxfollow = true;
                 config.only_followed = true;
diff --git a/lib/lottery.js b/lib/lottery.js
index 46037c6..8bb1bde 100644
--- a/lib/lottery.js
+++ b/lib/lottery.js
@@ -55,7 +55,10 @@ function start(num) {
         event_bus.on('Turn_off_the_Monitor', async (msg) => {
             log.info('结束抽奖', '原因: ' + msg);
             if (config.notice_running_state) {
-                sendNotify(`动态抽奖-帐号${num}结束抽奖`, `${log._cache.filter(it => /抽奖\]|Error|\[抽奖信息\]/.test(it)).join('\n')}`);
+                sendNotify(
+                    `动态抽奖-帐号${num}结束抽奖`,
+                    `${log._cache.filter(it => /抽奖\]|Error|\s抽奖信息\]/.test(it)).join('\n')}`
+                );
             }
             await createRandomDynamic(config.create_dy_num);
             event_bus.flush();