docs: 更新CHANGELOG

fixed: #167

.github/workflows/mirror.yml

@@ -0,0 +1,19 @@
+name: Mirror and run GitLab CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Mirror + trigger CI
+      uses: SvanBoxel/gitlab-mirror-and-ci-action@master
+      with:
+        args: "https://gitlab.com/shanmiteko/LotteryAutoScript"
+      env:
+        GITLAB_HOSTNAME: "gitlab.com"
+        GITLAB_USERNAME: "shanmiteko"
+        GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }}
+        GITLAB_PROJECT_ID: "36365601"
+        GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,22 @@
 <!-- markdownlint-disable MD036 MD024-->
 # CHANGELOG
+## 主要变化(2.5.9)
+* 292b8e0 fix: 动态数据为null时异常退出
+* ca6549d feat:  程序在请求多次输入验证码时切换下一个账号 (#167)
+* e03b483 fix: 远程设置换源gitee
+* 3e01e42 feat: 预约抽奖奖品屏蔽词 (#159)
+* 00b5310 feat: 自动点赞且检索本地(#162)
+* ba100e0 docs: 更新docker运行说明(#160)
+* 29676d5 ci: mirror to gitlab
+* dd9ff1b docs: 修改changelog.sh使用http链接
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.5.8)
+* 4238ee5 fix: 预约验重(#158)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
 ## 主要变化(2.5.7)
 * 607b2d7 feat: 新增设置`disable_reserve_lottery`
 * 03e24b9 fix: `extend_json`中的`reserve`获取失败(#155)

README.md

@@ -18,10 +18,14 @@
 
 [Github仓库链接](https://github.com/shanmiteko/LotteryAutoScript)
 
-[![Package Node.js project into an executable](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/pkg.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/pkg.yml)<br>
-[![Build and push Docker images](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/docker.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/docker.yml)<br>
+[![Package Node.js project into an executable](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/pkg.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/pkg.yml)
+
+[![Build and push Docker images](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/docker.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/docker.yml)
+
 [![Publishing to NPM](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/npmp.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/npmp.yml)
 
+[![Mirror and run GitLab CI](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/mirror.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/mirror.yml)
+
 已实现功能:
 
 - 监控用户转发
@@ -220,19 +224,23 @@ cd lottery
 ```
 $ tree
 .
-├── check.sh
-├── clear.sh
+├── check.sh 检查中奖
+├── clear.sh 清理动态
 ├── debug.sh 进入临时容器查看内容
 ├── env.js
 ├── my_config.js
 ├── new_env.js
 ├── new_my_config.js
 ├── remove_all.sh 移除对应docker镜像和所有相关容器
-└── start.sh 
+└── start.sh 启动抽奖
 ```
-
 [![asciicast](https://asciinema.org/a/453237.svg)](https://asciinema.org/a/453237)
 
+完成配置后
+
+```sh
+$ ./start.sh
+```
 3.更新
 
 进入lottery上一级目录

lib/core/monitor.js

@@ -173,6 +173,8 @@ class Monitor extends Searcher {
                     case 1002:
                     case 1003:
                     case 1004:
+                        is_shutdown = true;
+                        break;
                     case 1005:
                     case 1006:
                     case 1007:
@@ -266,7 +268,7 @@ class Monitor extends Searcher {
         log.info('筛选动态', `去重后(${protoLotteryInfo.length})`);
 
         /**并发查询dyid */
-        if (check_if_duplicated === 1 || check_if_duplicated === 2) {
+        if (check_if_duplicated >= 1) {
             await Promise.all(
                 [...dyids_map.keys()]
                     .map(it => d_storage
@@ -303,7 +305,7 @@ class Monitor extends Searcher {
         await try_for_each(protoLotteryInfo, async function (lottery_info) {
             const {
                 lottery_info_type, is_liked,
-                uids, uname, dyid, reserve_id, create_time,
+                uids, uname, dyid, reserve_id, reserve_lottery_text, create_time,
                 ctrl, rid, des, type,
                 hasOfficialLottery
             } = lottery_info;
@@ -315,8 +317,8 @@ class Monitor extends Searcher {
             } else {
                 /* 遇到转发过就退出 */
                 if (
-                    ((!check_if_duplicated || check_if_duplicated === 2) && is_liked)
-                    || ((check_if_duplicated === 1 || check_if_duplicated === 2) && dyids_map.get(dyid))
+                    ((!check_if_duplicated || check_if_duplicated >= 2) && is_liked)
+                    || ((check_if_duplicated >= 1) && dyids_map.get(dyid))
                 ) {
                     log.info("筛选动态", `已转发(https://t.bilibili.com/${dyid})`)
                     return false
@@ -342,7 +344,7 @@ class Monitor extends Searcher {
                 needTopic = [...new Set(description.match(/(?<=[带加上](?:话题|tag).*)#.+?#|(?<=[带加上])#.+?#(?=话题|tag)/ig) || [])].join(' '),
                 isRelayDynamic = type === 1,
                 has_key_words = key_words.every(it => new RegExp(it).test(description)),
-                isBlock = new RegExp(blockword.join('|')).test(description),
+                isBlock = new RegExp(blockword.join('|')).test(description + reserve_lottery_text),
                 isLottery =
                     (is_imitator && lottery_info_type === 'uid' && model !== '00')
                     || (hasOfficialLottery && model[0] === '1')
@@ -368,43 +370,6 @@ class Monitor extends Searcher {
 
             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 (reserve_id) {
-                if (disable_reserve_lottery) {
-                    log.info("已关闭预约抽奖功能")
-                } else {
-                    log.info("预约抽奖", "开始");
-                    if (hasEnv('NOT_GO_LOTTERY')) {
-                        log.info('NOT_GO_LOTTERY', 'ON');
-                    } else {
-                        await bili.reserve_lottery(reserve_id)
-                    }
-                }
-            }
-
-            if (!has_key_words && description) {
-                log.warn("筛选动态", `无关键词动态的描述: ${description}\n\n考虑是否修改设置key_words:\n${key_words.join('\n')}`)
-                return false
-            }
-
-            /**屏蔽词 */
-            if (isBlock) {
-                log.info("筛选动态", `包含屏蔽词(https://t.bilibili.com/${dyid})`)
-                return false
-            }
-
-            /**若勾选只转已关注 */
-            if (only_followed
-                && (!mIsFollowed || !oriIsFollowed)
-            ) {
-                log.info("筛选动态", `只转已关注(https://t.bilibili.com/${dyid})`)
-                return false
-            }
-
             if (
                 new_blacklist.some(id => keys.some(key => {
                     if (key + '' === id) {
@@ -418,6 +383,44 @@ class Monitor extends Searcher {
                 return false
             }
 
+            if (block_dynamic_type.includes(type)) {
+                log.warn("筛选动态", `屏蔽动态类型 ${type}`)
+                return false
+            }
+
+            /**屏蔽词 */
+            if (isBlock) {
+                log.info("筛选动态", `包含屏蔽词(https://t.bilibili.com/${dyid})`)
+                return false
+            }
+
+            if (reserve_id) {
+                if (disable_reserve_lottery) {
+                    log.info("已关闭预约抽奖功能")
+                } else {
+                    log.info("预约抽奖", "开始");
+                    log.info("预约抽奖", `奖品: ${reserve_lottery_text}`);
+                    if (hasEnv('NOT_GO_LOTTERY')) {
+                        log.info('NOT_GO_LOTTERY', 'ON');
+                    } else {
+                        await bili.reserve_lottery(reserve_id)
+                    }
+                }
+            }
+
+            if (!has_key_words && description) {
+                log.warn("筛选动态", `无关键词动态的描述: ${description}\n\n考虑是否修改设置key_words:\n${key_words.join('\n且满足: ')}`)
+                return false
+            }
+
+            /**若勾选只转已关注 */
+            if (only_followed
+                && (!mIsFollowed || !oriIsFollowed)
+            ) {
+                log.info("筛选动态", `只转已关注(https://t.bilibili.com/${dyid})`)
+                return false
+            }
+
             if (isLottery) {
                 const { uname_map = {} } = global_var.get("remoteconfig")
                 let onelotteryinfo = {};
@@ -549,7 +552,7 @@ class Monitor extends Searcher {
         if (rid && chat_type) {
 
             status = await retryfn(
-                5,
+                6,
                 [1, 4],
                 () => bili.sendChat(
                     rid,
@@ -592,7 +595,7 @@ class Monitor extends Searcher {
         }
 
         /* 点赞 */
-        if (!check_if_duplicated) {
+        if (!check_if_duplicated || check_if_duplicated === 3) {
             status = await retryfn(
                 5,
                 [1, 2, 3],

lib/core/searcher.js

@@ -18,7 +18,8 @@ const { log } = utils
  * @property {string} dynamic_id
  * @property {number} type
  * @property {string} description
- * @property {number} reserve_id
+ * @property {string} reserve_id
+ * @property {string} reserve_lottery_text
  * @property {boolean} hasOfficialLottery
  * @property {Array<Object.<string,string|number>>} ctrl
  * @property {number} origin_create_time 10
@@ -28,7 +29,8 @@ const { log } = utils
  * @property {string} origin_dynamic_id
  * @property {number} orig_type
  * @property {string} origin_description
- * @property {number} origin_reserve_id
+ * @property {string} origin_reserve_id
+ * @property {string} origin_reserve_lottery_text
  * @property {boolean} origin_hasOfficialLottery
  * 
  * 整理后的抽奖信息
@@ -40,7 +42,8 @@ const { log } = utils
  * @property {string} uname
  * @property {Array<{}>} ctrl
  * @property {string} dyid
- * @property {number} reserve_id
+ * @property {string} reserve_id
+ * @property {string} reserve_lottery_text
  * @property {string} rid
  * @property {string} des
  * @property {number} type
@@ -53,12 +56,12 @@ function parseDynamicCard(dynamic_detail_card) {
     const { strToJson } = utils;
     /**临时储存单个动态中的信息 */
     let obj = {};
-    const { desc, card, extension, extend_json } = dynamic_detail_card
+    const { desc, card, extension, extend_json, display = {} } = dynamic_detail_card
         , { is_liked = 1, user_profile = {} } = desc
         , { info = {} } = user_profile
-        , extendjsonToJson = strToJson(extend_json)
-        , extendjsonToJsonHidden = extendjsonToJson[""] || {}
         , cardToJson = strToJson(card)
+        , extendjsonToJson = strToJson(extend_json)
+        , { add_on_card_info = [] } = display
         , { item } = cardToJson;
     /* 转发者的UID */
     obj.uid = desc.uid
@@ -79,9 +82,19 @@ function parseDynamicCard(dynamic_detail_card) {
     /* 定位@信息 */
     obj.ctrl = (extendjsonToJson.ctrl) || [];
     /* 预约抽奖信息 */
-    if (extendjsonToJsonHidden.reserve) {
-        let { reserve_id, reserve_lottery } = extendjsonToJsonHidden.reserve;
-        obj.reserve_id = reserve_lottery === 1 ? reserve_id : 0;
+    if (add_on_card_info.length > 0) {
+        const [status, oid_str, text] = add_on_card_info
+            .filter(it => typeof it.reserve_attach_card !== 'undefined'
+                && typeof it.reserve_attach_card.reserve_lottery !== 'undefined'
+                && typeof it.reserve_attach_card.reserve_button !== 'undefined')
+            .map(({ reserve_attach_card }) => [
+                reserve_attach_card.reserve_button.status,
+                reserve_attach_card.oid_str,
+                reserve_attach_card.reserve_lottery.text])[0] || [];
+        if (status === 1) {
+            obj.reserve_id = oid_str;
+            obj.reserve_lottery_text = text;
+        }
     }
     /* 是否有官方抽奖 */
     obj.hasOfficialLottery = extension && extension.lott && true;
@@ -91,9 +104,9 @@ function parseDynamicCard(dynamic_detail_card) {
         || (cardToJson.dynamic || '' + cardToJson.desc || '')
         || '';
     if (obj.type === 1) {
-        const { origin_extension, origin, origin_extend_json } = cardToJson
+        const { origin_extension, origin } = cardToJson
             , originToJson = strToJson(origin)
-            , originextendjsonToJson = strToJson(origin_extend_json)
+            , { add_on_card_info = [] } = display.origin || {}
             , { user, item } = originToJson;
         /* 源动态的ts10 */
         obj.origin_create_time = desc.origin.timestamp;
@@ -104,9 +117,19 @@ function parseDynamicCard(dynamic_detail_card) {
         /* 被转发者的动态的ID !!!!此为大数需使用字符串值,不然JSON.parse()会有丢失精度 */
         obj.origin_dynamic_id = desc.orig_dy_id_str;
         /* 预约抽奖信息 */
-        if (originextendjsonToJson.reserve) {
-            let { reserve_id, reserve_lottery } = originextendjsonToJson.reserve;
-            obj.origin_reserve_id = reserve_lottery === 1 ? reserve_id : 0;
+        if (add_on_card_info.length > 0) {
+            const [status, oid_str, text] = add_on_card_info
+                .filter(it => typeof it.reserve_attach_card !== 'undefined'
+                    && typeof it.reserve_attach_card.reserve_lottery !== 'undefined'
+                    && typeof it.reserve_attach_card.reserve_button !== 'undefined')
+                .map(({ reserve_attach_card }) => [
+                    reserve_attach_card.reserve_button.status,
+                    reserve_attach_card.oid_str,
+                    reserve_attach_card.reserve_lottery.text])[0] || [];
+            if (status === 1) {
+                obj.origin_reserve_id = oid_str;
+                obj.origin_reserve_lottery_text = text;
+            }
         }
         /* 是否有官方抽奖 */
         obj.origin_hasOfficialLottery = origin_extension && origin_extension.lott;
@@ -241,9 +264,12 @@ class Searcher {
      */
     async getLotteryInfoByUID(UID) {
         log.info('获取动态', `开始获取用户${UID}的动态信息`);
-        const { allModifyDynamicResArray } = await Searcher.checkAllDynamic(UID, uid_scan_page, search_wait);
+        const AllDynamic = await Searcher.checkAllDynamic(UID, uid_scan_page, search_wait);
 
-        let { length } = allModifyDynamicResArray
+        if (AllDynamic === null) return null
+
+        let { allModifyDynamicResArray } = AllDynamic,
+            { length } = allModifyDynamicResArray;
 
         if (!length) return null;
 
@@ -262,7 +288,7 @@ class Searcher {
                     { origin_dynamic_id } = cur,
                     is_liked = false;
 
-                if (!check_if_duplicated || check_if_duplicated === 2) {
+                if (!check_if_duplicated || check_if_duplicated >= 2) {
                     const card = await bili.getOneDynamicByDyid(origin_dynamic_id)
                     log.info('获取动态', `查看源动态(${origin_dynamic_id})是否点赞 (${length--})`)
                     if (card) {
@@ -280,6 +306,7 @@ class Searcher {
                     ctrl: [],
                     dyid: cur.origin_dynamic_id,
                     reserve_id: cur.origin_reserve_id,
+                    reserve_lottery_text: cur.origin_reserve_lottery_text,
                     rid: cur.origin_rid_str,
                     des: cur.origin_description,
                     type: cur.orig_type,
@@ -339,6 +366,7 @@ class Searcher {
                 ctrl: o.ctrl,
                 dyid: o.dynamic_id,
                 reserve_id: o.reserve_id,
+                reserve_lottery_text: o.reserve_lottery_text,
                 rid: o.rid_str,
                 des: o.description,
                 type: o.type,
@@ -395,9 +423,9 @@ class Searcher {
                             , { is_liked } = parsed_card;
 
                         if (
-                            ((!check_if_duplicated || check_if_duplicated === 2)
+                            ((!check_if_duplicated || check_if_duplicated >= 2)
                                 && is_liked)
-                            || ((check_if_duplicated === 1 || check_if_duplicated === 2)
+                            || ((check_if_duplicated >= 1)
                                 && await d_storage.searchDyid(dyid))
                         ) {
                             log.info('获取动态', `动态(${dyid})已转发过`)
@@ -428,6 +456,7 @@ class Searcher {
                 ctrl: o.ctrl,
                 dyid: o.dynamic_id,
                 reserve_id: o.reserve_id,
+                reserve_lottery_text: o.reserve_lottery_text,
                 rid: o.rid_str,
                 des: o.description,
                 type: o.type,
@@ -470,7 +499,7 @@ class Searcher {
                                             let results = await pre
                                                 , { dyid } = cur;
 
-                                            if (!check_if_duplicated || check_if_duplicated === 2) {
+                                            if (!check_if_duplicated || check_if_duplicated >= 2) {
                                                 log.info('获取动态', `查看动态(${dyid})是否点赞 (${length--})`)
                                                 const card = await bili.getOneDynamicByDyid(dyid)
 

lib/data/config.js

@@ -26,6 +26,8 @@ const config = {
      * @property {string} uname
      * @property {Array<{}>} ctrl
      * @property {string} dyid
+     * @property {string} reserve_id
+     * @property {string} reserve_lottery_text
      * @property {string} rid
      * @property {string} des
      * @property {number} type
@@ -74,12 +76,14 @@ const config = {
      */
     disable_reserve_lottery: false,
 
+
     /**
      * 检查是否重复转发
      * - 不检查 -1
-     * - 通过是否点赞判断 0
+     * - 通过是否点赞判断(自动点赞) 0
      * - 检索本地dyids文件 1
-     * - 通过是否点赞判断+检索本地dyids文件 2
+     * - 通过是否点赞判断(不自动点赞)+检索本地dyids文件 2
+     * - 通过是否点赞判断(自动点赞)+检索本地dyids文件 3
      */
     check_if_duplicated: 1,
 

lib/net/bili.js

@@ -837,6 +837,9 @@ const bili_client = {
             case 0:
                 log.info('预约抽奖', '预约成功');
                 return 0;
+            case 7604003:
+                log.warn('预约抽奖', '重复预约');
+                return 0;
             default:
                 log.error('预约抽奖', `未知错误\n${responseText}`);
                 return 1;

lib/utils.js

@@ -292,13 +292,13 @@ const utils = {
         return new Promise((resolve) => {
             send({
                 method: 'GET',
-                url: 'https://gitlab.com/shanmiteko/lottery-notice/-/raw/master/notice.json',
+                url: 'https://gitee.com/shanmite/lottery-notice/raw/master/notice.json',
                 headers: {
                     'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36',
                 },
                 success: res => {
                     try {
-                        const body = JSON.parse(res.body);
+                        const body = JSON.parse(Buffer.from(res.body, "base64").toString());
                         if (body.node_msg) utils.log.info('公告', '\n' + body.node_msg + '\n');
                         resolve(body.config)
                     } catch (error) {

my_config.example.js

@@ -38,7 +38,8 @@ module.exports = Object.freeze({
          * @property {string} uname
          * @property {Array<{}>} ctrl
          * @property {string} dyid
-         * @property {number} reserve_id
+         * @property {string} reserve_id
+         * @property {string} reserve_lottery_text
          * @property {string} rid
          * @property {string} des
          * @property {number} type
@@ -92,9 +93,10 @@ module.exports = Object.freeze({
         /**
          * 检查是否重复转发
          * - 不检查 -1
-         * - 通过是否点赞判断 0
+         * - 通过是否点赞判断(自动点赞) 0
          * - 检索本地dyids文件 1
-         * - 通过是否点赞判断+检索本地dyids文件 2
+         * - 通过是否点赞判断(不自动点赞)+检索本地dyids文件 2
+         * - 通过是否点赞判断(自动点赞)+检索本地dyids文件 3
          */
         check_if_duplicated: 1,
 

package.json

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

script/build/changelog.sh

@@ -33,7 +33,7 @@ echo "New Version: $NEW_VERSION"
 
 GIT_LOG="$(git log --pretty=format:"* %h %s" | sed -e '/CHANGELOG/,$d' | sed ':a;N;s/\n/\\n/g;ta')"
 
-sed -i "/# CHANGELOG/a\## 主要变化($NEW_VERSION)\n$GIT_LOG\n\n_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_\n" CHANGELOG.md
+sed -i "/# CHANGELOG/a\## 主要变化($NEW_VERSION)\n$GIT_LOG\n\n_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_\n" CHANGELOG.md
 
 git add .
 git commit -m "docs: 更新CHANGELOG"