From eae72dbdd78dd12b91dc1f054bd02475fc32f31d Mon Sep 17 00:00:00 2001
From: shanmite <shanmite@hotmail.com>
Date: Sun, 28 Nov 2021 21:33:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20minfollower=E5=A1=AB0=E5=8F=AF=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E6=9C=AC=E5=9C=B0=E7=B2=89=E4=B8=9D=E6=95=B0=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/core/monitor.js  | 21 +++++++++++++--------
 lib/core/searcher.js |  8 +++-----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/lib/core/monitor.js b/lib/core/monitor.js
index ef4667d..6498667 100644
--- a/lib/core/monitor.js
+++ b/lib/core/monitor.js
@@ -110,14 +110,19 @@ class Monitor extends Searcher {
                         continue
                     }
                 } else if (Lottery.uid[0]) {
-                    const followerNum = await bili.getUserInfo(Lottery.uid[0]);
-                    if (followerNum < 0) {
-                        return 51
-                    }
-                    if (followerNum < config.minfollower) {
-                        log.info('过滤', `粉丝数(${followerNum})小于指定数量`)
-                        await delay(filter_wait)
-                        continue
+                    const { minfollower } = config
+                    if (minfollower > 0) {
+                        const followerNum = await bili.getUserInfo(Lottery.uid[0]);
+                        if (followerNum < 0) {
+                            return 51
+                        }
+                        if (followerNum < minfollower) {
+                            log.info('过滤', `粉丝数(${followerNum})小于指定数量`)
+                            await delay(filter_wait)
+                            continue
+                        }
+                    } else {
+                        log.info('过滤', "不过滤粉丝数")
                     }
                 }
 
diff --git a/lib/core/searcher.js b/lib/core/searcher.js
index c53bffd..66a99ae 100644
--- a/lib/core/searcher.js
+++ b/lib/core/searcher.js
@@ -237,8 +237,6 @@ class Searcher {
                 const results = await pre
                     , { origin_dynamic_id } = cur;
 
-                log.info('获取动态', `查看源动态(${origin_dynamic_id})是否点赞 (${length--})`)
-
                 const card = await bili.getOneDynamicByDyid(origin_dynamic_id)
 
                 if (card) {
@@ -246,6 +244,7 @@ class Searcher {
 
                     const { is_liked } = parseDynamicCard(card)
 
+                    log.info('获取动态', `查看源动态(${origin_dynamic_id})是否点赞 (${length--})`)
                     if (is_liked) {
                         log.info('获取动态', `动态(${origin_dynamic_id})已转发过`)
                     }
@@ -363,7 +362,6 @@ class Searcher {
             /**遍历某专栏中的dyids */
             for (const dyid of dyids_set) {
                 if (dyid.length === utils.dyid_length) {
-                    log.info('获取动态', `查看专栏中所提及动态(${dyid})是否点赞 (${length--})`)
 
                     const card = await bili.getOneDynamicByDyid(dyid)
 
@@ -373,6 +371,7 @@ class Searcher {
                         const parsed_card = parseDynamicCard(card)
                             , { is_liked } = parsed_card;
 
+                        log.info('获取动态', `查看专栏中所提及动态(${dyid})是否点赞 (${length--})`)
                         if (is_liked) {
                             log.info('获取动态', `动态(${dyid})已转发过`)
                             _weight += 1;
@@ -443,8 +442,6 @@ class Searcher {
                                             const results = await pre
                                                 , { dyid } = cur;
 
-                                            log.info('获取动态', `查看动态(${dyid})是否点赞 (${length--})`)
-
                                             const card = await bili.getOneDynamicByDyid(dyid)
 
                                             if (card) {
@@ -452,6 +449,7 @@ class Searcher {
 
                                                 const { is_liked } = parseDynamicCard(card)
 
+                                                log.info('获取动态', `查看动态(${dyid})是否点赞 (${length--})`)
                                                 if (is_liked) {
                                                     log.info('获取动态', `动态(${dyid})已转发过`)
                                                 }