From 66efd62d5605ded714b8198bc4f0f78da6e7b8e1 Mon Sep 17 00:00:00 2001
From: shanmite <shanmite@hotmail.com>
Date: Thu, 2 Dec 2021 19:29:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=AE=BE=E7=BD=AE`us?=
 =?UTF-8?q?e=5Fpublic=5Fblacklist`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/core/monitor.js  | 8 +++++---
 lib/data/config.js   | 7 ++++++-
 my_config.example.js | 7 ++++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/core/monitor.js b/lib/core/monitor.js
index e38bad6..08de548 100644
--- a/lib/core/monitor.js
+++ b/lib/core/monitor.js
@@ -191,7 +191,7 @@ class Monitor extends Searcher {
         /** 所有抽奖信息 */
         let alllotteryinfo = [];
         const
-            { set_lottery_info_url, key_words, model, chatmodel, max_create_time, is_imitator, only_followed, at_users, blockword, blacklist } = config,
+            { set_lottery_info_url, key_words, model, chatmodel, max_create_time, is_imitator, only_followed, at_users, blockword, blacklist, use_public_blacklist } = config,
             now_ts = Date.now() / 1000;
 
         /**
@@ -292,9 +292,11 @@ class Monitor extends Searcher {
                 return false
             }
 
-            /* 获取黑名单并去重合并 */
             const
-                { blacklist: remote_blacklist } = global_var.get("remoteconfig"),
+                { blacklist: remote_blacklist } = use_public_blacklist === false
+                    ? { blacklist: "" }
+                    : global_var.get("remoteconfig"),
+                /* 获取黑名单并去重合并 */
                 new_blacklist = remote_blacklist
                     ? [
                         ...new Set([...blacklist.split(','),
diff --git a/lib/data/config.js b/lib/data/config.js
index 1ff8d4b..de7a0ab 100644
--- a/lib/data/config.js
+++ b/lib/data/config.js
@@ -221,11 +221,16 @@ const config = {
     at_users: [['转发抽奖娘', 294887687], ['你的工具人老公', 100680137]],
 
     /**
-     * - 自动同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
      * - 英文逗号分隔 如: 1,2,3
      */
     blacklist: '',
 
+    /**
+     * - 自动同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
+     * - 使用公共黑名单
+     */
+    use_public_blacklist: true,
+
     /**
      * 屏蔽词
      */
diff --git a/my_config.example.js b/my_config.example.js
index 0d7ac53..ef61177 100644
--- a/my_config.example.js
+++ b/my_config.example.js
@@ -235,11 +235,16 @@ module.exports = Object.freeze({
         at_users: [['转发抽奖娘', 294887687], ['你的工具人老公', 100680137]],
 
         /**
-         * - 自动同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
          * - 英文逗号分隔 如: 1,2,3
          */
         blacklist: '',
 
+        /**
+         * - 自动同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
+         * - 使用公共黑名单
+         */
+        use_public_blacklist: true,
+
         /**
          * 屏蔽词
          */