docs: 更新CHANGELOG

偷塔模式不检查是否重复转发
* 偷塔模式: 临近开奖时参与抽奖
`sneaktopic: true`

.gitignore

@@ -3,6 +3,7 @@ node_modules/
 tests/
 dyids/
 dist/
+.env
 *.log
 package-lock.json
 env.js

CHANGELOG.md

@@ -1,5 +1,20 @@
 <!-- markdownlint-disable MD036 MD024-->
 # CHANGELOG
+## 主要变化(2.4.6)
+* 043fee2 feat: 新增设置`sneaktopic`(#104)
+* ae34c69 feat: 新增设置`is_repost_then_chat`(#103)
+* 7496bc5 feat:  中奖检查时增加回复信息读取(#102)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.4.5)
+* ef969bb feat: 每组显示动态转发数(#97)
+* 0cbacd6 feat: 推送携带帐号编号(#98)
+* da75c8c feat: 增加设置屏蔽动态类型`block_dynamic_type`(#99)
+* 548ad4b fix: pushplus更新域名(#93)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
 ## 主要变化(2.4.4)
 * c486abf fix: 黑名单不起作用(#92)
 

lib/check.js

@@ -6,28 +6,48 @@ const bili = require('./net/bili')
 
 /**
  * 是否中奖
+ * @param {number} num
  */
-async function isMe() {
+async function isMe(num) {
     let desp = '';
     const
         { notice_key_words, update_session_wait, get_session_wait, check_session_pages } = config,
-        UnreadAtNum = await bili.getUnreadAtNum(),
-        UnreadSessionNum = await bili.getUnreadSessionNum(),
-        { follow_unread, unfollow_unread } = UnreadSessionNum || { unfollow_unread: 0, follow_unread: 0 };
-    if (UnreadAtNum > 0) {
+        { at: unread_at_num, reply: unread_reply_num } = await bili.getUnreadNum(),
+        unread_session_num = await bili.getUnreadSessionNum(),
+        { follow_unread, unfollow_unread } = unread_session_num || { unfollow_unread: 0, follow_unread: 0 };
+    if (unread_at_num) {
         log.info('中奖检测', '<-- 正在检查at');
         const MyAtInfo = await bili.getMyAtInfo();
-        MyAtInfo.forEach(async AtInfo => {
-            const { at_time, up_uname, business, source_content, url } = AtInfo
-            desp += '## [at]检测结果\n\n'
-            desp += '----------------------------------------------------------------\n\n'
-            desp += `发生时间: ${new Date(at_time * 1000).toLocaleString()}\n\n`
-            desp += `用户: ${up_uname}\n\n`
-            desp += `在${business}中@了你(${global_var.get("myUID")})\n\n`
-            desp += `原内容为: ${source_content}\n\n`
-            desp += `[直达链接](${url})\n\n`
-            desp += '----------------------------------------------------------------\n\n'
-        });
+        MyAtInfo
+            .slice(0, unread_at_num)
+            .forEach(({ at_time, up_uname, business, source_content, url }) => {
+                desp += '## [at]检测结果\n\n'
+                desp += '----------------------------------------------------------------\n\n'
+                desp += `发生时间: ${new Date(at_time * 1000).toLocaleString()}\n\n`
+                desp += `用户: ${up_uname}\n\n`
+                desp += `在${business}中@了你(https://space.bilibili.com/${global_var.get("myUID")})\n\n`
+                desp += `原内容为: ${source_content}\n\n`
+                desp += `[直达链接](${url})\n\n`
+                desp += '----------------------------------------------------------------\n\n'
+            });
+        log.info('中奖检测', '--> OK');
+    }
+    if (unread_reply_num) {
+        log.info('中奖检测', '<-- 正在检查回复');
+        const replys = await bili.getReplyMsg();
+        replys
+            .slice(0, unread_reply_num)
+            .forEach(({ nickname, uri, source, timestamp }) => {
+                if (judge(source, notice_key_words)) {
+                    desp += '## 回复检测结果\n\n'
+                    desp += '----------------------------------------------------------------\n\n'
+                    desp += `发生时间: ${new Date(timestamp * 1000).toLocaleString()}\n\n`
+                    desp += `用户: ${nickname}\n\n`
+                    desp += `回复你(https://space.bilibili.com/${global_var.get("myUID")})说:\n${source}\n\n`
+                    desp += `[直达链接](${uri})\n\n`
+                    desp += '----------------------------------------------------------------\n\n'
+                }
+            })
         log.info('中奖检测', '--> OK');
     }
     if (follow_unread + unfollow_unread > 0) {
@@ -46,7 +66,7 @@ async function isMe() {
                             desp += '----------------------------------------------------------------\n\n'
                             desp += `发生时间: ${new Date(timestamp * 1000).toLocaleString()}\n\n`
                             desp += `用户: ${sender_uid}\n\n`
-                            desp += `私信你(${global_var.get("myUID")})说:\n${content}\n\n`
+                            desp += `私信你(https://space.bilibili.com/${global_var.get("myUID")})说:\n${content}\n\n`
                             desp += `[直达链接](https://message.bilibili.com/#/whisper/mid${sender_uid})\n\n`
                             desp += '----------------------------------------------------------------\n\n'
                         }
@@ -75,7 +95,7 @@ async function isMe() {
     if (desp) {
         desp += '中奖了别忘给脚本(https://github.com/shanmiteko/LotteryAutoScript)点一个Star哦, 赞助一两块也不是不可以‍‍‍_(:з」∠)_\n\n'
         log.info('可能中奖了', desp);
-        await sendNotify('可能中奖了', desp);
+        await sendNotify(`帐号${num}可能中奖了`, desp);
     } else {
         log.info('中奖检测', "暂未中奖");
     }

lib/core/monitor.js

@@ -103,11 +103,12 @@ class Monitor extends Searcher {
 
         if (len) {
             let
+                status = 0,
                 is_exception = 0,
-                is_outof_maxfollow = 0;
+                is_outof_maxfollow = 0,
+                relayed_nums = 0;
             for (const [index, lottery] of shuffle(allLottery).entries()) {
-                let status = 0;
-
+                let is_shutdown = false;
                 if (
                     is_outof_maxfollow
                     && lottery.uid.length
@@ -121,7 +122,8 @@ class Monitor extends Searcher {
                     let { ts } = await bili.getLotteryNotice(lottery.dyid);
                     const ts_10 = Date.now() / 1000;
                     if (ts < 0) {
-                        return 6001
+                        status = 6001
+                        break;
                     }
                     if (ts < ts_10) {
                         log.info('过滤', '已过开奖时间')
@@ -140,7 +142,8 @@ class Monitor extends Searcher {
                     if (minfollower > 0) {
                         const followerNum = await bili.getUserInfo(lottery.uid[0]);
                         if (followerNum < 0) {
-                            return 7001
+                            status = 7001
+                            break;
                         }
                         if (followerNum < minfollower) {
                             log.info('过滤', `粉丝数(${followerNum})小于指定数量`)
@@ -165,6 +168,8 @@ class Monitor extends Searcher {
                 status = await this.go(lottery)
                 switch (status) {
                     case 0:
+                        relayed_nums += 1
+                        break;
                     case 1002:
                     case 1003:
                     case 1004:
@@ -190,17 +195,20 @@ class Monitor extends Searcher {
                     case 2001:
                     case 3001:
                     case 5001:
-                        return status
+                        is_shutdown = true
+                        break;
                 }
 
+                if (is_shutdown) break
+
                 d_storage.updateDyid(lottery.dyid)
 
                 await delay(wait * (Math.random() + 0.5));
             }
-            log.info('抽奖', '开始转发下一组动态');
+            log.info('抽奖', `本轮共转发${relayed_nums}条`);
             return is_exception
                 || is_outof_maxfollow
-                || 0
+                || status
         } else {
             log.info('抽奖', '无未转发抽奖');
             return 0
@@ -236,7 +244,7 @@ class Monitor extends Searcher {
         /** 所有抽奖信息 */
         let alllotteryinfo = [];
         const
-            { check_if_duplicated, set_lottery_info_url, key_words, model, chatmodel, max_create_time, is_imitator, only_followed, at_users, blockword, blacklist, use_public_blacklist } = config,
+            { check_if_duplicated, set_lottery_info_url, key_words, model, chatmodel, block_dynamic_type, max_create_time, is_imitator, only_followed, at_users, blockword, blacklist, use_public_blacklist } = config,
             now_ts = Date.now() / 1000;
 
         /**
@@ -300,15 +308,21 @@ class Monitor extends Searcher {
 
             log.debug('正在筛选的动态信息', lottery_info);
 
-            /* 遇到转发过就退出 */
-            if (
-                ((!check_if_duplicated || check_if_duplicated === 2)
-                    && is_liked)
-                || ((check_if_duplicated === 1 || check_if_duplicated === 2)
-                    && dyids_map.get(dyid))
-            ) {
-                log.info("筛选动态", `已转发(https://t.bilibili.com/${dyid})`)
-                return false
+            switch (lottery_info_type) {
+                case 'sneaktopic':
+                    log.info("筛选动态", `偷塔模式(https://t.bilibili.com/${dyid})`)
+                    break;
+                default:
+                    /* 遇到转发过就退出 */
+                    if (
+                        ((!check_if_duplicated || check_if_duplicated === 2)
+                            && is_liked)
+                        || ((check_if_duplicated === 1 || check_if_duplicated === 2)
+                            && dyids_map.get(dyid))
+                    ) {
+                        log.info("筛选动态", `已转发(https://t.bilibili.com/${dyid})`)
+                        return false
+                    }
             }
 
             /* 超过指定时间退出 */
@@ -354,7 +368,12 @@ class Monitor extends Searcher {
                     : blacklist.split(','),
                 keys = [dyid, m_uid, ori_uid];
 
-            log.debug("筛选动态", { real_uid, mIsFollowed, oriIsFollowed, realIsFollowed, needAt, needTopic, isRelayDynamic, key_words, has_key_words, blockword, isBlock, isLottery, isSendChat })
+            log.debug("筛选动态", { real_uid, mIsFollowed, oriIsFollowed, realIsFollowed, needAt, needTopic, type, isRelayDynamic, key_words, has_key_words, blockword, isBlock, isLottery, isSendChat })
+
+            if (block_dynamic_type.includes(type)) {
+                log.warn("筛选动态", `屏蔽动态类型 ${type}`)
+                return false
+            }
 
             if (!has_key_words && description) {
                 log.warn("筛选动态", `无关键词动态的描述: ${description}\n\n考虑是否修改设置key_words:\n${key_words.join('\n')}`)
@@ -506,7 +525,7 @@ class Monitor extends Searcher {
         let status = 0
         const
             { uid, dyid, chat_type, rid, relay_chat, ctrl } = option,
-            { chat, check_if_duplicated } = config;
+            { chat, check_if_duplicated, is_repost_then_chat } = config;
 
         /* 评论 */
         if (rid && chat_type) {
@@ -514,7 +533,11 @@ class Monitor extends Searcher {
             status = await retryfn(
                 5,
                 [1, 4],
-                () => bili.sendChat(rid, getRandomOne(chat), chat_type)
+                () => bili.sendChat(
+                    rid,
+                    is_repost_then_chat ? relay_chat : getRandomOne(chat),
+                    chat_type
+                )
             )
 
             if (status) {

lib/data/config.js

@@ -78,6 +78,27 @@ const config = {
      */
     check_if_duplicated: 1,
 
+    /**
+     * 偷塔模式不检查是否重复转发
+     * * 偷塔模式: 临近开奖时参与抽奖
+     */
+    sneaktopic: true,
+
+    /**
+     * 屏蔽动态类型
+     * 
+     * | 动态类型   | type值 |
+     * | :------- |:----- |
+     * | 转发       | `1`    |
+     * | 含图片     | `2`    |
+     * | 无图纯文字  | `4`    |
+     * | 视频       | `8`    |
+     * | 番剧       | `512`  |
+     * | 活动       | `2048` |
+     * | 专栏       | `64`   |
+     */
+    block_dynamic_type: [0],
+
     /**
      * - 动态创建时间
      * - 多少天前
@@ -245,6 +266,12 @@ const config = {
      */
     blockword: ["脚本", "抽奖号", "钓鱼"],
 
+    /**
+     * 转发并评论
+     * - 评论内容与转发内容相同
+     */
+    is_repost_then_chat: false,
+
     /**
      * 转发评语
      */

lib/helper/notify.js

@@ -621,7 +621,7 @@ function pushPlusNotify(text, desp) {
         if (PUSH_PLUS_TOKEN) {
             send({
                 method: 'POST',
-                url: 'https://pushplus.hxtrip.com/send',
+                url: 'http://www.pushplus.plus/send',
                 contents: {
                     token: PUSH_PLUS_TOKEN,
                     title: text,

lib/net/api.bili.js

@@ -12,6 +12,7 @@ module.exports = Object.freeze({
     FEED_SETUSERFOLLOW: 'https://api.vc.bilibili.com/feed/v1/feed/SetUserFollow',
     LOTTERY_SVR_LOTTERY_NOTICE: 'https://api.vc.bilibili.com/lottery_svr/v1/lottery_svr/lottery_notice',
     MSGFEED_AT: 'https://api.bilibili.com/x/msgfeed/at',
+    MSGFEED_REPLAY: 'https://api.bilibili.com/x/msgfeed/reply',
     MSGFEED_UNREAD: 'https://api.bilibili.com/x/msgfeed/unread',
     READ_CV: 'https://www.bilibili.com/read/cv{{cv}}',
     RELATION_BATCH_MODIFY: 'https://api.bilibili.com/x/relation/batch/modify',

lib/net/bili.js

@@ -185,22 +185,50 @@ const bili_client = {
         }
     },
     /**
-     * 获取未读@
-     * @returns {Promise<number>}
+     * 获取未读信息数量
+     * @returns {Promise<{at: number, reply: number}>}
      */
-    async getUnreadAtNum() {
+    async getUnreadNum() {
         const
             responseText = await get({
                 url: API.MSGFEED_UNREAD
             }),
             res = strToJson(responseText);
         if (res.code === 0) {
-            const { at } = res.data;
-            log.info('获取未读@', `成功 数量: ${at}`);
-            return at;
+            log.info('获取未读信息', `成功`);
+            return res.data;
         } else {
-            log.error('获取未读@', `失败\n${responseText}`);
-            return -1;
+            log.error('获取未读信息', `失败\n${responseText}`);
+            return {};
+        }
+    },
+    /**
+     * 获取一页回复
+     * @returns {Promise<Array<{nickname: string, source: string, uri: string, timestamp: number}>}>}
+     */
+    async getReplyMsg() {
+        const
+            responseText = await get({
+                url: API.MSGFEED_REPLAY
+            }),
+            res = strToJson(responseText);
+        if (res.code === 0) {
+            const data = res.data || {},
+                items = data.items || [];
+            log.info('获取一页回复', `成功(${items.length})`);
+            return items
+                .filter(it => it.item.type === 'reply')
+                .map(it => {
+                    return {
+                        nickname: it.user.nickname,
+                        source: it.item.source_content,
+                        uri: it.item.uri,
+                        timestamp: it.reply_time
+                    }
+                });
+        } else {
+            log.error('获取一页回复', '失败');
+            return []
         }
     },
     /**

main.js

@@ -65,7 +65,7 @@ async function main() {
                 case 'check':
                     log.info('中奖检测', '检查是否中奖');
                     loop_wait = check_loop_wait;
-                    await isMe();
+                    await isMe(NUMBER);
                     break;
                 case 'clear':
                     if (CLEAR) {

my_config.example.js

@@ -92,6 +92,27 @@ module.exports = Object.freeze({
          */
         check_if_duplicated: 1,
 
+        /**
+         * 偷塔模式不检查是否重复转发
+         * * 偷塔模式: 临近开奖时参与抽奖
+         */
+        sneaktopic: true,
+
+        /**
+         * 屏蔽动态类型
+         * 
+         * | 动态类型   | type值 |
+         * | :------- |:----- |
+         * | 转发       | `1`    |
+         * | 含图片     | `2`    |
+         * | 无图纯文字  | `4`    |
+         * | 视频       | `8`    |
+         * | 番剧       | `512`  |
+         * | 活动       | `2048` |
+         * | 专栏       | `64`   |
+         */
+        block_dynamic_type: [0],
+
         /**
          * - 动态创建时间
          * - 多少天前
@@ -260,6 +281,12 @@ module.exports = Object.freeze({
          */
         blockword: ["脚本", "抽奖号", "钓鱼"],
 
+        /**
+         * 转发并评论
+         * - 评论内容与转发内容相同
+         */
+        is_repost_then_chat: false,
+
         /**
          * 转发评语
          */

package.json

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