docs: 更新CHANGELOG

类型判断错误

.github/workflows/pkg.yml

@@ -37,5 +37,5 @@ jobs:
         with:
           file: "dist/*.zip"
           delete_file: "dist/*.zip"
-          tag_name: "v*.*.*"
+          tag_name: "v2"
           overwrite: true

.gitignore

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

CHANGELOG.md

@@ -1,5 +1,38 @@
 <!-- markdownlint-disable MD036 MD024-->
 # CHANGELOG
+## 主要变化(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)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.4.3)
+* aba17ed feat: 提示关键词修改建议
+* 5a23043 feat: 只通过是否点赞判断时点赞
+* 76f7152 fix: 黑名单匹配(#90)
+* 0d4185d fix(Searcher): getLotteryInfoByUID(#89)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.4.2)
+* 20c423f fix: "公共黑名单"显示错误(#87)
+* 6851f29 fix: 描述中出现undefined(#88)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+## 主要变化(2.4.1)
+* 0ba6ace feat: check_if_duplicated可同时使用多种方式
+* dd99426 fix: 只转已关注功能失效
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
 ## 主要变化(2.4.0)
 * 01562b6 ci: verison升级时小版本号归0
 * 90ac347 docs: 更新README

lib/check.js

@@ -6,8 +6,9 @@ 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,
@@ -23,7 +24,7 @@ async function isMe() {
             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 += `在${business}中@了你(https://space.bilibili.com/${global_var.get("myUID")})\n\n`
             desp += `原内容为: ${source_content}\n\n`
             desp += `[直达链接](${url})\n\n`
             desp += '----------------------------------------------------------------\n\n'
@@ -46,7 +47,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 +76,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;
 
         /**
@@ -256,13 +264,16 @@ class Monitor extends Searcher {
         log.info('筛选动态', `去重后(${protoLotteryInfo.length})`);
 
         /**并发查询dyid */
-        await Promise.all(
-            [...dyids_map.keys()]
-                .map(it => d_storage
-                    .searchDyid(it)
-                    .then(hasIt => dyids_map.set(it, hasIt))
-                )
-        )
+        if (check_if_duplicated === 1 || check_if_duplicated === 2) {
+            await Promise.all(
+                [...dyids_map.keys()]
+                    .map(it => d_storage
+                        .searchDyid(it)
+                        .then(hasIt => dyids_map.set(it, hasIt))
+                    )
+            )
+            log.info('筛选动态', `并发查询本地dyid完毕`);
+        }
 
         if (lottery_param[0] !== "APIs" && set_lottery_info_url && protoLotteryInfo.length) {
             log.info("上传抽奖信息", "开始")
@@ -299,9 +310,9 @@ class Monitor extends Searcher {
 
             /* 遇到转发过就退出 */
             if (
-                (!check_if_duplicated
+                ((!check_if_duplicated || check_if_duplicated === 2)
                     && is_liked)
-                || (check_if_duplicated === 1
+                || ((check_if_duplicated === 1 || check_if_duplicated === 2)
                     && dyids_map.get(dyid))
             ) {
                 log.info("筛选动态", `已转发(https://t.bilibili.com/${dyid})`)
@@ -316,8 +327,8 @@ class Monitor extends Searcher {
 
             const
                 [m_uid, ori_uid] = uids,
-                mIsFollowed = m_uid && (new RegExp(m_uid)).test(attentionList),
-                oriIsFollowed = ori_uid && (new RegExp(ori_uid)).test(attentionList),
+                mIsFollowed = !m_uid || (new RegExp(m_uid)).test(attentionList),
+                oriIsFollowed = !ori_uid || (new RegExp(ori_uid)).test(attentionList),
                 /**判断是转发源动态还是现动态 实际发奖人*/
                 [real_uid, realIsFollowed] = lottery_info_type === 'uid'
                     ? [ori_uid, oriIsFollowed]
@@ -335,9 +346,32 @@ class Monitor extends Searcher {
                 isSendChat =
                     (is_imitator && lottery_info_type === 'uid' && chatmodel !== '00')
                     || (hasOfficialLottery && chatmodel[0] === '1')
-                    || (!hasOfficialLottery && chatmodel[1] === '1');
+                    || (!hasOfficialLottery && chatmodel[1] === '1'),
+                { blacklist: remote_blacklist } = use_public_blacklist === false
+                    ? { blacklist: "" }
+                    : global_var.get("remoteconfig"),
+                /**
+                 * 获取黑名单并去重合并
+                 * @type {string[]}
+                 */
+                new_blacklist = remote_blacklist
+                    ? [
+                        ...new Set([...blacklist.split(','),
+                        ...remote_blacklist.split(',')])
+                    ]
+                    : 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')}`)
+            }
 
             /**屏蔽词 */
             if (isBlock) {
@@ -346,29 +380,26 @@ class Monitor extends Searcher {
             }
 
             /**若勾选只转已关注 */
-            if (only_followed && !mIsFollowed && !oriIsFollowed) {
+            if (only_followed
+                && (!mIsFollowed || !oriIsFollowed)
+            ) {
                 log.info("筛选动态", `只转已关注(https://t.bilibili.com/${dyid})`)
                 return false
             }
 
-            const
-                { blacklist: remote_blacklist } = use_public_blacklist === false
-                    ? { blacklist: "" }
-                    : global_var.get("remoteconfig"),
-                /* 获取黑名单并去重合并 */
-                new_blacklist = remote_blacklist
-                    ? [
-                        ...new Set([...blacklist.split(','),
-                        ...remote_blacklist.split(',')])
-                    ].join()
-                    : blacklist;
-
-            if ((new RegExp(dyid + '|' + m_uid + '|' + ori_uid)).test(new_blacklist)) {
-                log.info("筛选动态", `公共黑名单用户(https://t.bilibili.com/${dyid})`)
+            if (
+                new_blacklist.some(id => keys.some(key => {
+                    if (key + '' === id) {
+                        log.info("筛选动态", `黑名单匹配(${id})(https://t.bilibili.com/${dyid})`)
+                        return true
+                    } else {
+                        return false
+                    }
+                }))
+            ) {
                 return false
             }
 
-
             if (isLottery) {
                 let onelotteryinfo = {};
 
@@ -408,7 +439,7 @@ class Monitor extends Searcher {
                 }
 
                 /* 是否是转发的动态 */
-                if (isRelayDynamic && real_uid) {
+                if (isRelayDynamic) {
                     /* 转发内容长度+'//'+'@'+用户名+':'+源内容 */
                     const addlength = RandomStr.length + 2 + uname.length + 1 + 1;
                     onelotteryinfo.relay_chat = RandomStr + `//@${uname}:` + des;

lib/core/searcher.js

@@ -75,10 +75,10 @@ function parseDynamicCard(dynamic_detail_card) {
     obj.ctrl = (extend_json && strToJson(extend_json).ctrl) || [];
     /* 是否有官方抽奖 */
     obj.hasOfficialLottery = extension && extension.lott && true;
-    /* 转发者的描述 后两个分别是视频动态的描述和视频本身的描述*/
+    /* 转发者的描述 纯文字内容 图片动态描述 后两个分别是视频动态的描述和视频本身的描述*/
     obj.description =
-        (item && (item.content + item.description))
-        || (cardToJson.dynamic + cardToJson.desc)
+        (item && (item.content || '' + item.description || ''))
+        || (cardToJson.dynamic || '' + cardToJson.desc || '')
         || '';
     if (obj.type === 1) {
         const { origin_extension, origin } = cardToJson
@@ -98,8 +98,8 @@ function parseDynamicCard(dynamic_detail_card) {
         obj.origin_uname = (user && (user.name || user.uname)) || '';
         /* 被转发者的描述 */
         obj.origin_description =
-            (item && (item.content + item.description))
-            || (originToJson.dynamic + originToJson.desc)
+            (item && (item.content || '' + item.description || ''))
+            || (originToJson.dynamic || '' + originToJson.desc || '')
             || '';
     }
 
@@ -241,38 +241,35 @@ class Searcher {
                 }
             })
             .reduce(async (pre, cur) => {
-                const results = await pre
-                    , { origin_dynamic_id } = cur;
-
-                const card = await bili.getOneDynamicByDyid(origin_dynamic_id)
-
-                if (card) {
-                    await utils.delay(get_dynamic_detail_wait)
-
-                    const { is_liked } = parseDynamicCard(card)
+                let
+                    results = await pre,
+                    { origin_dynamic_id } = cur,
+                    is_liked = false;
 
+                if (!check_if_duplicated || check_if_duplicated === 2) {
+                    const card = await bili.getOneDynamicByDyid(origin_dynamic_id)
                     log.info('获取动态', `查看源动态(${origin_dynamic_id})是否点赞 (${length--})`)
-                    if (is_liked) {
-                        log.info('获取动态', `动态(${origin_dynamic_id})已转发过`)
-                    } else {
-                        return [...results, {
-                            lottery_info_type: 'uid',
-                            create_time: cur.origin_create_time,
-                            is_liked,
-                            uids: [cur.uid, cur.origin_uid],
-                            uname: cur.origin_uname,
-                            ctrl: [],
-                            dyid: cur.origin_dynamic_id,
-                            rid: cur.origin_rid_str,
-                            des: cur.origin_description,
-                            type: cur.orig_type,
-                            hasOfficialLottery: cur.origin_hasOfficialLottery
-                        }]
+                    if (card) {
+                        ({ is_liked } = parseDynamicCard(card))
                     }
+                    await utils.delay(get_dynamic_detail_wait)
                 }
 
-                return results
+                results.push({
+                    lottery_info_type: 'uid',
+                    create_time: cur.origin_create_time,
+                    is_liked,
+                    uids: [cur.uid, cur.origin_uid],
+                    uname: cur.origin_uname,
+                    ctrl: [],
+                    dyid: cur.origin_dynamic_id,
+                    rid: cur.origin_rid_str,
+                    des: cur.origin_description,
+                    type: cur.orig_type,
+                    hasOfficialLottery: cur.origin_hasOfficialLottery
+                })
 
+                return results
             }, Promise.resolve([]))
 
         log.info('获取动态', `成功获取用户${UID}的动态信息`);
@@ -380,9 +377,9 @@ class Searcher {
                             , { is_liked } = parsed_card;
 
                         if (
-                            (!check_if_duplicated
+                            ((!check_if_duplicated || check_if_duplicated === 2)
                                 && is_liked)
-                            || (check_if_duplicated === 1
+                            || ((check_if_duplicated === 1 || check_if_duplicated === 2)
                                 && await d_storage.searchDyid(dyid))
                         ) {
                             log.info('获取动态', `动态(${dyid})已转发过`)
@@ -454,7 +451,7 @@ class Searcher {
                                             let results = await pre
                                                 , { dyid } = cur;
 
-                                            if (!check_if_duplicated) {
+                                            if (!check_if_duplicated || check_if_duplicated === 2) {
                                                 log.info('获取动态', `查看动态(${dyid})是否点赞 (${length--})`)
                                                 const card = await bili.getOneDynamicByDyid(dyid)
 

lib/data/config.js

@@ -49,8 +49,8 @@ const config = {
      * 符合js正则表达式的字符串
      */
     key_words: [
-        "[抽奖送]",
-        "[转关评]"
+        "[抽奖送揪]|福利",
+        "[转关评粉]|参与"
     ],
 
     /**
@@ -74,8 +74,24 @@ const config = {
      * - 不检查 -1
      * - 通过是否点赞判断 0
      * - 检索本地dyids文件 1
+     * - 通过是否点赞判断+检索本地dyids文件 2
      */
-    check_if_duplicated: 0,
+    check_if_duplicated: 1,
+
+    /**
+     * 屏蔽动态类型
+     * 
+     * | 动态类型   | type值 |
+     * | :------- |:----- |
+     * | 转发       | `1`    |
+     * | 含图片     | `2`    |
+     * | 无图纯文字  | `4`    |
+     * | 视频       | `8`    |
+     * | 番剧       | `512`  |
+     * | 活动       | `2048` |
+     * | 专栏       | `64`   |
+     */
+    block_dynamic_type: [0],
 
     /**
      * - 动态创建时间

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,

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

@@ -63,8 +63,8 @@ module.exports = Object.freeze({
          * 符合js正则表达式的字符串
          */
         key_words: [
-            "[抽奖送]",
-            "[转关评]"
+            "[抽奖送揪]|福利",
+            "[转关评粉]|参与"
         ],
 
         /**
@@ -88,8 +88,24 @@ module.exports = Object.freeze({
          * - 不检查 -1
          * - 通过是否点赞判断 0
          * - 检索本地dyids文件 1
+         * - 通过是否点赞判断+检索本地dyids文件 2
          */
-        check_if_duplicated: 0,
+        check_if_duplicated: 1,
+
+        /**
+         * 屏蔽动态类型
+         * 
+         * | 动态类型   | type值 |
+         * | :------- |:----- |
+         * | 转发       | `1`    |
+         * | 含图片     | `2`    |
+         * | 无图纯文字  | `4`    |
+         * | 视频       | `8`    |
+         * | 番剧       | `512`  |
+         * | 活动       | `2048` |
+         * | 专栏       | `64`   |
+         */
+        block_dynamic_type: [0],
 
         /**
          * - 动态创建时间
@@ -243,6 +259,7 @@ module.exports = Object.freeze({
         at_users: [['转发抽奖娘', 294887687], ['你的工具人老公', 100680137]],
 
         /**
+         * - 动态dyid或UID
          * - 英文逗号分隔 如: 1,2,3
          */
         blacklist: '',

package.json

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

script/build/changelog.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # version: <major.minor.patch>
-level=minor
+level=patch
 
 npm version $level \
     --no-commit-hooks \