CodeCow/LotteryAutoScript
1
0
Fork 0
mirror of https://github.com/shanmiteko/LotteryAutoScript.git synced 2026-06-04 21:01:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: 新增设置use_public_blacklist

Browse Source
This commit is contained in:
shanmite 2021-12-02 19:29:26 +08:00
parent d7cf7422f4
commit 66efd62d56
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/core/monitor.js
View File

@ -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(','),

7
lib/data/config.js
View File

@ -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,
/**
* 屏蔽词
*/

7
my_config.example.js
View File

@ -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,
/**
* 屏蔽词
*/