diff --git a/README.md b/README.md index be316eb..c2a9b65 100644 --- a/README.md +++ b/README.md @@ -382,6 +382,16 @@ lottery_*: * @param { string | Picture[] } content */ ``` + - `at_users` + - 转发时[at]的用户 + - `AtInfo[]` + ```js + /** + * @typedef {string} NickName + * @typedef {number} UID + * @typedef {(NickName | UID)[]} AtInfo + */ + ``` - `blacklist` - 防钓鱼uid黑名单 - 逗号分割字符串 diff --git a/env.example.bat b/env.example.bat index 8533fe4..4d32946 100644 --- a/env.example.bat +++ b/env.example.bat @@ -6,7 +6,7 @@ :: 进入文件夹打开CMD :: npm run test_start 启动脚本 :: npm run test_check 检查是否中奖(只查看两个小时内的奖) -:: npm run test_clear 清空动态和关注(须set CLEAR=true) +:: npm run test_clear 清空动态和关注 :: 运行成功后在lib文件夹下会生成一个GlobalVar.json文件和dyid.txt文件 :: ==换参数时须先将GlobalVar.json文件删除== :: 如果要运行多账号只能复制本项目并依次独立运行 @@ -15,6 +15,7 @@ set COOKIE= set NUMBER=1 set CLEAR= set LOCALLAUNCH=true +set CLEAR=true :: 推送所需环境变量(可不填) :: 推送限制时间(小时) 默认为2 即只推送两小时内的中奖信息防止重复发送 diff --git a/lib/BiliAPI.js b/lib/BiliAPI.js index 8cc7c8a..85d5579 100644 --- a/lib/BiliAPI.js +++ b/lib/BiliAPI.js @@ -676,9 +676,11 @@ const BiliAPI = { * 检查分区 * 不存在指定分区时创建 * 获取到tagid添加为对象的属性 + * @param {string} [name] * @returns {Promise} */ - checkMyPartition: (name = '此处存放因抽奖临时关注的up') => { + checkMyPartition: (name) => { + if (!name) name = '此处存放因抽奖临时关注的up'; return new Promise((resolve) => { Ajax.get({ url: 'https://api.bilibili.com/x/relation/tags', diff --git a/lib/Monitor.js b/lib/Monitor.js index 4af84a8..3102465 100644 --- a/lib/Monitor.js +++ b/lib/Monitor.js @@ -75,7 +75,7 @@ class Monitor extends Public { protoLotteryInfo = typeof self.UID === 'number' ? await self.getLotteryInfoByUID(self.UID) : await self.getLotteryInfoByTag(self.tag_name); if (protoLotteryInfo === null) return []; let alllotteryinfo = []; - const { model, chatmodel, maxday: _maxday, minfollower, only_followed, blockword, blacklist } = config; + const { model, chatmodel, maxday: _maxday, minfollower, only_followed, at_users, blockword, blacklist } = config; const maxday = _maxday === '-1' || _maxday === '' ? Infinity : (Number(_maxday) * 86400); for (const info of protoLotteryInfo) { const { lottery_info_type, uids, uname, dyid, official_verify, ctrl, befilter, rid, des, type, hasOfficialLottery } = info; @@ -134,12 +134,7 @@ class Monitor extends Public { let RandomStr = Base.getRandomStr(config.relay); let new_ctrl = []; if (hasAt) { - /**如要修改请手动填写 */ - const _at = [ - ['转发抽奖娘', 294887687], - ['你的工具人老公', 100680137] - ]; - _at.forEach(it => { + at_users.forEach(it => { new_ctrl.push({ data: String(it[1]), location: RandomStr.length, diff --git a/lib/config.js b/lib/config.js index 78eb5e1..9bd2a09 100644 --- a/lib/config.js +++ b/lib/config.js @@ -12,6 +12,7 @@ const default_config = { only_followed: '0', create_dy: '1', dy_contents: ['[doge]'], + at_users: [['转发抽奖娘', 294887687], ['你的工具人老公', 100680137]], /* 与最新黑名单同步 */ blacklist: '28008897,28272016,140389827,24598781,28008860,28008880,28008743,28008948,28009292,319696958,90138218,28272000,28272047,28271978,8831288,175979009,3177443,486780865,403048135,474325039,455274996,477519424,292671666,448873224,22498938,1770865,444796995,306112375,320193786,606637517,305276429,204487541,404761800,186914127,99439379,457697569,270886929,477519424,401575,201296348,206804212,333584926,34679178,699923691,392689522,178700744,272882445,350977368,487168411,22682842,444949061,523974463,192231907,503908324,383189098,252909207,336467750,264875137,90721742,452299642,677739290,441522918,8766623,698327474,5439672,483247863,237055308,95404163,202052696,1309889741,627942060,455030741,406353670,18036870,470220612', blockword: ["脚本抽奖", "恭喜", "结果", "抽奖号"], @@ -24,6 +25,7 @@ const default_config = { 'rush', '来来来', 'ok', '冲', '凑热闹', '我要我要[打call]', '我还能中!让我中!!!', '大家都散了吧,已经抽完了,是我的', '我是天选之子', '给我中一次吧!', '坚持不懈,迎难而上,开拓创新!', '[OK][OK]', '我来抽个奖', '中中中中中中', '[doge][doge][doge]', '我我我', ], + clear_partition: '' }; /** * 自己修改过的设置