docs: 更新CHANGELOG

Fixed #150

CHANGELOG.md

@@ -1,5 +1,50 @@
 <!-- markdownlint-disable MD036 MD024-->
 # CHANGELOG
+## 主要变化(2.5.4)
+* f329457 fix: 评论包含敏感词(#150)
+* 0eddee4 Merge pull request #147 from spiritLHLS/patch-1
+* ce2c9e5 Update README.md
+* f1bbc9d Update README.md
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.5.3)
+* 22e4d2a fix: 转发了不含关键词的抽奖动态(#136)
+* 354d8cf fix: 推送异常(#132)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.5.2)
+* b1f478c  feat: 可选通知现阶段运行到哪个账号(#132)
+  * 新增设置`notice_running_state`
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.5.1)
+* 45ac58e fix: 评论与转发相同时去掉动态原文(#128)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.5.0)
+* 41b9540 fix: 未知错误退出
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.4.11)
+* 3f59076 feat: 推送中奖检测可添加账号备注(#121)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.4.10)
+* f569207 fix: 低版本node(< v15)不支持replaceAll
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.4.9)
+* 2fbd292 feat: 自动评语中可用up主昵称`${uname}`变量(#118)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
 ## 主要变化(2.4.8)
 * 266ecf7 feat: 添加Qmsg酱推送(#115)
 * 4d90d83 feat: 日志细节优化

README.md

@@ -303,6 +303,6 @@ $ tree
 ## Awesome
 相关项目
 
-- [LotteryAutoScript_Station](https://github.com/spiritLHL/LotteryAutoScript_Station) - [@spiritLHL](https://github.com/spiritLHL)
-- [sync_lottery](https://github.com/spiritLHL/sync_lottery) - [@spiritLHL](https://github.com/spiritLHL)
-- [BDSF](https://github.com/spiritLHL/BDSF) - [@spiritLHL](https://github.com/spiritLHL)
+- [LotteryAutoScript_Station](https://github.com/spiritLHLS/LotteryAutoScript_Station) - [@spiritLHL](https://github.com/spiritLHLS)
+- [sync_lottery](https://github.com/spiritLHLS/sync_lottery) - [@spiritLHL](https://github.com/spiritLHLS)
+- [BDSF](https://github.com/spiritLHLS/BDSF) - [@spiritLHL](https://github.com/spiritLHLS)

env.example.js

@@ -2,6 +2,7 @@ module.exports = Object.freeze({
     /**
      * ## 账号相关
      * - `COOKIE` 是必填项
+     * - `NOTE` 帐号备注
      * - `NUMBER` 表示是第几个账号
      * - `CLEAR` 是否启用清理功能
      * - `ENABLE_MULTIPLE_ACCOUNT` 是否启用多账号
@@ -18,6 +19,7 @@ module.exports = Object.freeze({
      */
     account_parm: {
         COOKIE: "",
+        NOTE: "",
         NUMBER: 1,
         CLEAR: true,
 
@@ -31,10 +33,17 @@ module.exports = Object.freeze({
     /**
      * 为防止环境变量过长, 请将多账号填在此处
      * 以大括号内容为模板依次复制(包含大括号),逗号分割
+     * ```
+     * ...
+     * NUMBER: 1
+     * ...
+     * NUMBER: 2
+     * ```
      */
     multiple_account_parm: [
         {
             COOKIE: "",
+            NOTE: "",
             NUMBER: 1,
             CLEAR: true,
             WAIT: 60 * 1000

lib/check.js

@@ -7,8 +7,9 @@ const bili = require('./net/bili')
 /**
  * 是否中奖
  * @param {number} num
+ * @param {string} [note]
  */
-async function isMe(num) {
+async function isMe(num, note = "无") {
     let desp = '';
     const
         { notice_key_words, update_session_wait, get_session_wait, check_session_pages } = config,
@@ -93,7 +94,8 @@ async function isMe(num) {
         log.info('中奖检测', '--> OK');
     }
     if (desp) {
-        desp += '中奖了别忘给脚本(https://github.com/shanmiteko/LotteryAutoScript)点一个Star哦, 赞助一两块也不是不可以‍‍‍_(:з」∠)_\n\n'
+        desp += `帐号备注: ${note}\n\n`;
+        desp += '中奖了别忘给脚本(https://github.com/shanmiteko/LotteryAutoScript)点一个Star哦, 赞助一两块也不是不可以_(:з」∠)_\n\n'
         log.info('可能中奖了', desp);
         await sendNotify(`帐号${num}可能中奖了`, desp);
     } else {

lib/core/monitor.js

@@ -184,6 +184,7 @@ class Monitor extends Searcher {
                     case 5002:
                     case 5003:
                     case 5004:
+                        status = 0
                         break;
                     case 2004:
                         is_exception = 2004
@@ -223,8 +224,9 @@ class Monitor extends Searcher {
      * @property {boolean} isOfficialLottery 是否官方抽奖
      * @property {string} relay_chat 转发词
      * @property {string} ctrl 定位@
-     * @property {string} rid 评论标识
+     * @property {string} [rid] 评论标识
      * @property {number} chat_type 评论类型
+     * @property {string} [chat] 评论词
      */
     /**
      * @returns {Promise<LotteryOptions[]>}
@@ -244,7 +246,7 @@ class Monitor extends Searcher {
         /** 所有抽奖信息 */
         let alllotteryinfo = [];
         const
-            { check_if_duplicated, set_lottery_info_url, sneaktower, key_words, model, chatmodel, block_dynamic_type, max_create_time, is_imitator, only_followed, at_users, blockword, blacklist, use_public_blacklist } = config,
+            { check_if_duplicated, set_lottery_info_url, sneaktower, key_words, model, chatmodel, chat: chats, relay: relays, block_dynamic_type, max_create_time, is_imitator, only_followed, at_users, blockword, blacklist, use_public_blacklist } = config,
             now_ts = Date.now() / 1000;
 
         /**
@@ -373,6 +375,7 @@ class Monitor extends Searcher {
 
             if (!has_key_words && description) {
                 log.warn("筛选动态", `无关键词动态的描述: ${description}\n\n考虑是否修改设置key_words:\n${key_words.join('\n')}`)
+                return false
             }
 
             /**屏蔽词 */
@@ -403,6 +406,7 @@ class Monitor extends Searcher {
             }
 
             if (isLottery) {
+                const { uname_map = {} } = global_var.get("remoteconfig")
                 let onelotteryinfo = {};
 
                 onelotteryinfo.isOfficialLottery = hasOfficialLottery;
@@ -418,7 +422,8 @@ class Monitor extends Searcher {
 
                 let
                     /**转发评语 */
-                    RandomStr = getRandomOne(config.relay),
+                    RandomStr = getRandomOne(relays)
+                        .replace(/\$\{uname\}/g, uname_map[real_uid] || uname),
                     /**控制字段 */
                     new_ctrl = [];
 
@@ -475,7 +480,11 @@ class Monitor extends Searcher {
                                 : 0;
 
                 /* 是否评论 */
-                if (isSendChat) onelotteryinfo.rid = rid;
+                if (isSendChat) {
+                    onelotteryinfo.rid = rid
+                    onelotteryinfo.chat = getRandomOne(chats)
+                        .replace(/\$\{uname\}/g, uname_map[real_uid] || uname)
+                }
 
                 alllotteryinfo.push(onelotteryinfo);
             } else {
@@ -520,8 +529,8 @@ class Monitor extends Searcher {
 
         let status = 0
         const
-            { uid, dyid, chat_type, rid, relay_chat, ctrl } = option,
-            { chat, check_if_duplicated, is_repost_then_chat } = config;
+            { uid, dyid, chat_type, rid, relay_chat, ctrl, chat } = option,
+            { check_if_duplicated, is_repost_then_chat } = config;
 
         /* 评论 */
         if (rid && chat_type) {
@@ -531,11 +540,19 @@ class Monitor extends Searcher {
                 [1, 4],
                 () => bili.sendChat(
                     rid,
-                    is_repost_then_chat ? relay_chat : getRandomOne(chat),
+                    is_repost_then_chat ? relay_chat.split('//')[0] : chat,
                     chat_type
                 )
             )
 
+            if (status === 8) {
+                status = await bili.sendChat(
+                    rid,
+                    "[doge]",
+                    chat_type
+                )
+            }
+
             if (status) {
                 log.warn("抽奖信息", `dyid: ${dyid}, rid: ${rid}, chat_type: ${chat_type}`)
                 return 1000 + status

lib/data/config.js

@@ -317,6 +317,11 @@ const config = {
         "~你预约的直播已开始"
     ],
 
+    /**
+     * 是否发送运行状态通知
+     */
+    notice_running_state: false,
+
     /**
      * - 获取私信页数
      */

lib/lottery.js

@@ -5,6 +5,7 @@ const { Searcher } = require('./core/searcher');
 const { Monitor } = require('./core/monitor');
 const config = require('./data/config');
 const { randomDynamic } = require('./helper/randomDynamic');
+const { sendNotify } = require('./helper/notify');
 const { log } = utils;
 
 async function createRandomDynamic(num) {
@@ -23,18 +24,21 @@ async function createRandomDynamic(num) {
 
 /**
  * 抽奖主函数
- * @param {string} cookie
+ * @param {string} num
  * @returns {Promise<void>}
  */
-function start() {
+function start(num) {
     return new Promise(resolve => {
         let times = utils.counter();
+        if (config.notice_running_state) {
+            sendNotify(`动态抽奖-帐号${num}开始抽奖`, "运行正常")
+        }
         /* 注册事件 */
         event_bus.on('Turn_on_the_Monitor', async () => {
             const lotterys = global_var.get("Lottery");
             if (lotterys.length === 0) {
                 log.info('抽奖', '抽奖信息为空');
-                resolve();
+                event_bus.emit('Turn_off_the_Monitor', '抽奖信息为空')
                 return;
             }
             if (times.value() === lotterys.length) {
@@ -48,6 +52,9 @@ function start() {
             await (new Monitor(lottery)).init();
         });
         event_bus.on('Turn_off_the_Monitor', async (msg) => {
+            if (config.notice_running_state) {
+                sendNotify(`动态抽奖-帐号${num}结束抽奖`, msg)
+            }
             await createRandomDynamic(config.create_dy_num);
             log.info('结束抽奖', '原因: ' + msg);
             event_bus.flush();

lib/net/bili.js

@@ -951,6 +951,7 @@ const bili_client = {
      * - 已被对方拉入黑名单 5
      * - 黑名单用户无法互动 6
      * - UP主已关闭评论区 7
+     * - 评论内容包含敏感信息 8
      */
     async sendChat(rid, msg, type) {
         const
@@ -966,7 +967,7 @@ const bili_client = {
             res = strToJson(responseText);
         switch (res.code) {
             case 0:
-                log.info('自动评论', '评论成功');
+                log.info('自动评论', `评论成功: ${msg}`);
                 return 0;
             case -404:
                 log.error('自动评论', '原动态已删除');
@@ -986,6 +987,9 @@ const bili_client = {
             case 12061:
                 log.error('自动评论', 'UP主已关闭评论区');
                 return 7;
+            case 12016:
+                log.error('自动评论', '评论内容包含敏感信息');
+                return 8;
             default:
                 log.error('自动评论', `未知错误\n${responseText}`);
                 return 1;

lib/utils.js

@@ -303,12 +303,12 @@ const utils = {
                         if (body.node_msg) utils.log.info('公告', '\n' + body.node_msg + '\n');
                         resolve(body.config)
                     } catch (error) {
-                        resolve(JSON.parse('{}'))
+                        resolve({})
                     }
                 },
                 failure: err => {
                     utils.log.error('获取远程设置', '获取远程设置错误: ' + err);
-                    resolve(JSON.parse('{}'));
+                    resolve({})
                 }
             })
         })

main.js

@@ -21,7 +21,7 @@ let loop_wait = 0;
  * @returns {Promise<string>} 错误信息
  */
 async function main() {
-    const { COOKIE, NUMBER, CLEAR, ENABLE_MULTIPLE_ACCOUNT, MULTIPLE_ACCOUNT_PARM } = process.env;
+    const { COOKIE, NOTE, NUMBER, CLEAR, ENABLE_MULTIPLE_ACCOUNT, MULTIPLE_ACCOUNT_PARM } = process.env;
     if (ENABLE_MULTIPLE_ACCOUNT) {
         let muti_acco = multiple_account.length
             ? multiple_account
@@ -33,6 +33,7 @@ async function main() {
             process.env.COOKIE = acco.COOKIE;
             process.env.NUMBER = acco.NUMBER;
             process.env.CLEAR = acco.CLEAR;
+            process.env.NOTE = acco.NOTE;
             const err_msg = await main();
             if (err_msg) {
                 return err_msg
@@ -60,12 +61,12 @@ async function main() {
                 case 'start':
                     log.info('抽奖', '开始运行');
                     loop_wait = lottery_loop_wait;
-                    await start();
+                    await start(NUMBER);
                     break;
                 case 'check':
                     log.info('中奖检测', '检查是否中奖');
                     loop_wait = check_loop_wait;
-                    await isMe(NUMBER);
+                    await isMe(NUMBER, NOTE);
                     break;
                 case 'clear':
                     if (CLEAR) {

my_config.example.js

@@ -289,11 +289,15 @@ module.exports = Object.freeze({
 
         /**
          * 转发评语
+         * 支持变量${uname}
          */
         relay: ['转发动态'],
 
         /**
          * 评论内容
+         * 支持变量${uname}
+         * @example
+         * "祝${uname}早日百大!"
          */
         chat: [
             '[OK]', '[星星眼]', '[歪嘴]', '[喜欢]', '[偷笑]', '[笑]', '[喜极而泣]', '[辣眼睛]', '[吃瓜]', '[奋斗]',
@@ -332,6 +336,11 @@ module.exports = Object.freeze({
             "~你预约的直播已开始"
         ],
 
+        /**
+         * 是否发送运行状态通知
+         */
+        notice_running_state: false,
+
         /**
          * - 获取私信页数
          */

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lottery-auto-script",
-  "version": "2.4.8",
+  "version": "2.5.4",
   "description": "自动参与B站动态抽奖",
   "main": "main.js",
   "scripts": {