Compare commits

...
72 Commits
Author SHA1 Message Date
shanmite 3bc7dafe3e doc: 图片换源gitlab 2022-05-21 17:02:01 +08:00
shanmite 23432edb74 docs: 更新CHANGELOG 2022-05-21 16:36:07 +08:00
shanmite df7b3210a3 fix: 远程设置换源gitlab 2022-05-21 16:35:26 +08:00
shanmite 31e8941415 docs: 更新CHANGELOG 2022-05-03 10:01:55 +08:00
shanmite f329457c9a fix: 评论包含敏感词(#150)
Fixed #150
2022-05-03 09:55:53 +08:00
shanmiteandGitHub 0eddee4f15 Merge pull request #147 from spiritLHLS/patch-1
更换仓库地址
2022-04-11 09:21:36 +08:00
spiritLHLSandGitHub ce2c9e58dd Update README.md
备份迁移至此号
2022-04-11 09:10:09 +08:00
spiritLHLSandGitHub f1bbc9d1da Update README.md
备份迁移至此号
2022-04-11 08:53:58 +08:00
shanmite 29bb2f32a3 docs: 更新CHANGELOG 2022-03-23 15:58:12 +08:00
shanmite 22e4d2aaa1 fix: 转发了不含关键词的抽奖动态(#136)
Fixed #136
2022-03-23 15:04:59 +08:00
shanmite 354d8cff1a fix: 推送异常(#132)
Fixed #132
2022-03-22 15:02:59 +08:00
shanmite 1b80f853ed docs: 更新CHANGELOG 2022-03-02 19:49:10 +08:00
shanmite b1f478cb8e feat: 可选通知现阶段运行到哪个账号(#132)
新增设置`notice_running_state`
 Fixed #132
2022-03-02 19:44:27 +08:00
shanmite 39d69e0448 docs: 更新CHANGELOG 2022-03-01 21:17:53 +08:00
shanmite 45ac58e312 fix: 评论与转发相同时去掉动态原文(#128)
Fixed #128
2022-03-01 21:08:33 +08:00
shanmite a0d910632a docs: 更新CHANGELOG 2022-02-08 11:37:43 +08:00
shanmite 41b954081a fix: 未知错误退出 2022-02-08 11:34:30 +08:00
shanmite 2723048bb3 docs: 更新CHANGELOG 2022-02-07 15:27:09 +08:00
shanmite 3f59076d83 feat: 推送中奖检测可添加账号备注(#121)
详见env.example.js
2022-02-07 15:05:10 +08:00
shanmite b80c65558d docs: 更新CHANGELOG 2022-02-04 10:20:22 +08:00
shanmite f569207dc5 fix: 低版本node(< v15)不支持replaceAll
Nodejs v15 has V8 8.6 and thus that's the
 first nodejs version where you can use .replaceAll()
2022-02-04 10:18:20 +08:00
shanmite 6dbb9854c8 docs: 更新CHANGELOG 2022-02-03 11:53:24 +08:00
shanmite 2fbd292e7a feat: 自动评语中可用up主昵称${uname}变量(#118)
例如:
relay: ["祝${uname}早日百大!"]
2022-02-03 11:46:04 +08:00
shanmite 484f2e9ba9 docs: 更新CHANGELOG 2022-01-25 14:42:33 +08:00
shanmite 266ecf75a9 feat: 添加Qmsg酱推送(#115) 2022-01-25 14:32:04 +08:00
shanmite 4d90d83b67 feat: 日志细节优化
- 下载进度条
- iso+08
- 结构调整缓存变量
2022-01-20 17:51:40 +08:00
shanmite c56ec7a2c2 merge: 更新readme(#110)
相关项目添加
2022-01-20 16:11:23 +08:00
shanmite aa9cb68c81 docs: 更新CHANGELOG 2022-01-16 20:18:13 +08:00
shanmite dd1b1db76a feat(update): 优先使用代理更新失败时切回去 2022-01-16 20:12:35 +08:00
shanmite 86e6b7dbc9 feat: 重命名设置sneaktower(#104) 2022-01-16 16:58:49 +08:00
shanmite 731b8475ec docs: 更新CHANGELOG 2022-01-15 14:48:55 +08:00
shanmite 043fee21e7 feat: 新增设置sneaktopic(#104)
偷塔模式不检查是否重复转发
* 偷塔模式: 临近开奖时参与抽奖
`sneaktopic: true`
2022-01-15 14:23:22 +08:00
shanmite ae34c691b1 feat: 新增设置is_repost_then_chat(#103)
转发并评论
2022-01-05 18:13:48 +08:00
shanmite 7496bc58a8 feat: 中奖检查时增加回复信息读取(#102) 2022-01-05 16:37:49 +08:00
shanmite 7c455aff9c docs: 更新CHANGELOG 2021-12-23 15:28:01 +08:00
shanmite ef969bb2c2 feat: 每组显示动态转发数(#97) 2021-12-23 15:19:07 +08:00
shanmite 0cbacd6ddf feat: 推送携带帐号编号(#98) 2021-12-23 14:54:02 +08:00
shanmite da75c8c17b feat: 增加设置屏蔽动态类型block_dynamic_type(#99) 2021-12-23 14:42:46 +08:00
shanmite 548ad4b589 fix: pushplus更新域名(#93) 2021-12-14 16:54:25 +08:00
shanmite 922dd989bc docs: 更新CHANGELOG 2021-12-13 14:44:55 +08:00
shanmite c486abf0ed fix: 黑名单不起作用(#92)
类型判断错误
2021-12-13 14:31:24 +08:00
shanmite 4bbbfc89a7 docs: 更新CHANGELOG 2021-12-12 16:39:45 +08:00
shanmite aba17ed0ad feat: 提示关键词修改建议 2021-12-12 16:32:49 +08:00
shanmite 5a23043466 feat: 只通过是否点赞判断时点赞 2021-12-12 16:02:01 +08:00
shanmite 76f715248d fix: 黑名单匹配(#90)
子串不参与匹配
2021-12-12 15:57:48 +08:00
shanmite 0d4185d02a fix(Searcher): getLotteryInfoByUID(#89)
是否获取点赞信息
2021-12-12 15:04:37 +08:00
shanmite 2ff4ec812b docs: 更新CHANGELOG 2021-12-11 18:24:38 +08:00
shanmite 20c423fc09 fix: "公共黑名单"显示错误(#87) 2021-12-11 18:21:37 +08:00
shanmite 6851f29f75 fix: 描述中出现undefined(#88) 2021-12-11 18:18:43 +08:00
shanmite 77d198bec5 docs: 更新CHANGELOG 2021-12-10 15:21:26 +08:00
shanmite 0ba6acec31 feat: check_if_duplicated可同时使用多种方式 2021-12-10 15:16:17 +08:00
shanmite dd994263b9 fix: 只转已关注功能失效 2021-12-10 14:50:41 +08:00
shanmite 12847d7cfc docs: 更新CHANGELOG 2021-12-06 16:26:56 +08:00
shanmite 01562b6ee0 ci: verison升级时小版本号归0 2021-12-06 16:26:11 +08:00
shanmite 90ac347ff2 docs: 更新README 2021-12-06 16:14:59 +08:00
shanmite 3cf3939b49 feat: 新增设置check_if_duplicated
检查是否重复转发
- 不检查 -1
- 通过是否点赞判断 0
- 检索本地dyids文件 1
2021-12-06 16:12:41 +08:00
shanmite d0a8aa9169 feat: metainfo显示nodejs版本号 2021-12-05 20:12:47 +08:00
shanmite 10db52f9ae fix: 完善错误延时重试(#82)
- 成功 0
- 评论 未知错误 1001
- 评论 原动态已删除 1002
- 评论 评论区已关闭 1003
- 评论 需要输入验证码 1004
- 评论 已被对方拉入黑名单 1005
- 评论 黑名单用户无法互动 1006
- 评论 UP主已关闭评论区 1007
- 关注 未知错误 2001
- 关注 您已被对方拉入黑名单 2002
- 关注 黑名单用户无法关注 2003
- 关注 账号异常 2004
- 关注 关注已达上限 2005
- 分区 移动失败 3001
- 点赞 未知错误 4001
- 点赞 点赞异常 4002
- 点赞 点赞频繁 4003
- 转发 未知错误 5001
- 转发 该动态不能转发分享 5002
- 转发 请求数据发生错误,请刷新或稍后重试 5003
- 转发 操作太频繁了,请稍后重试 5004
2021-12-05 19:56:50 +08:00
shanmite f9ebbb30eb docs: 更新CHANGELOG 2021-12-03 19:16:39 +08:00
shanmite b36c555c13 ci: auto gen changelog 2021-12-03 19:15:34 +08:00
shanmite 7338e09caf feat: 更新notice_key_words
更新屏蔽通知词
"~你的账号在新设备或平台登录成功",
"~你预约的直播已开始"
2021-12-03 18:46:28 +08:00
shanmite 80a54e87f8 ci: *.exe latest_version0 2021-12-03 15:49:17 +08:00
shanmite 1a6291471a feat: 新增设置is_outof_maxfollow(#80)
关注已达上限时自动切换
2021-12-03 15:29:21 +08:00
shanmite 449c8d9272 docs: update README 2021-12-02 21:53:27 +08:00
shanmite 136379a3aa docs: 更新CHANGELOG 2021-12-02 19:47:00 +08:00
shanmite 313942adb7 ci: pkg.yml tag_name 2021-12-02 19:40:08 +08:00
shanmite 66efd62d56 feat: 新增设置use_public_blacklist 2021-12-02 19:29:26 +08:00
shanmite d7cf7422f4 feat: 增加粉丝数查询第三方接口 2021-12-02 19:18:51 +08:00
shanmite 094e019063 fix: 二级转发带有效抽奖 2021-12-02 19:07:43 +08:00
shanmite 8de74537f7 fix: description获取不到 2021-12-02 18:51:59 +08:00
shanmite 70c10f247b fix: 更改默认设置key_words blockword 2021-12-02 18:50:41 +08:00
shanmite 2f26a393ca feat: 源uid参与筛选判断
- 重构筛选处关于uid的逻辑
- debug日志详细化
2021-12-02 17:53:49 +08:00
26 changed files with 1172 additions and 417 deletions
+2 -7
View File
@@ -6,13 +6,8 @@ on:
- main
paths:
- "lib/**"
- "main.js"
pull_request:
branches:
- main
paths:
- "lib/**"
- "main.js"
- "*.js"
- "*.json"
workflow_dispatch:
jobs:
+5 -9
View File
@@ -1,20 +1,15 @@
name: "Package Node.js project into an executable"
on:
push:
branches:
- main
paths:
- "lib/**"
- "main.js"
pull_request:
branches:
- main
paths:
- "lib/**"
- "main.js"
- "*.js"
- "*.json"
workflow_dispatch:
branches:
- main
jobs:
build_all:
runs-on: ubuntu-latest
@@ -42,4 +37,5 @@ jobs:
with:
file: "dist/*.zip"
delete_file: "dist/*.zip"
tag_name: "v2"
overwrite: true
+2
View File
@@ -3,6 +3,8 @@ node_modules/
tests/
dyids/
dist/
.env
*.log
package-lock.json
env.js
my_config.js
+136
View File
@@ -1,5 +1,141 @@
<!-- markdownlint-disable MD036 MD024-->
# CHANGELOG
## 主要变化(2.5.5)
* df7b321 fix: 远程设置换源gitlab
_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
## 主要变化(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: 日志细节优化
* c56ec7a merge: 更新readme(#110)
_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
## 主要变化(2.4.7)
* dd1b1db feat(update): 优先使用代理更新失败时切回去
* 86e6b7d feat: 重命名设置`sneaktower`(#104)
_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
## 主要变化(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)
_如果之前版本小于上一版本,请查看[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
* 3cf3939 feat: 新增设置`check_if_duplicated`
* d0a8aa9 feat: metainfo显示nodejs版本号
* 10db52f fix: 完善错误延时重试(#82)
_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
## 主要变化(2.3.9)
* b36c555 ci: auto gen changelog
* 7338e09 feat: 更新`notice_key_words`
* 80a54e8 ci: `*.exe` `latest_version0`
* 1a62914 feat: 新增设置`is_outof_maxfollow`(#80)
* 449c8d9 docs: update README
_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
## 主要变化(2.3.8)
* 313942a ci: pkg.yml tag_name
* 66efd62 feat: 新增设置`use_public_blacklist`
* d7cf742 feat: 增加粉丝数查询第三方接口
* 094e019 fix: 二级转发带有效抽奖
* 8de7453 fix: description获取不到
* 70c10f2 fix: 更改默认设置`key_words` `blockword`
* 2f26a39 feat: 源uid参与筛选判断
## 较上一版本变化
* 变更可执行文件
_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
**Full Changelog**: https://github.com/shanmiteko/LotteryAutoScript/compare/v2.3.7...v2.3.8
## 主要变化(2.3.7)
* 50e18e2 feat: 下载更新时有多个版本
* b9c73bd chore: change docker auto build
+38 -35
View File
@@ -9,7 +9,7 @@
- [Windows](#windows)
- [Linux](#linux)
- [Docker](#docker)
- [防重复转发](#防重复转发)
- [防重复转发(可选)](#防重复转发可选)
- [检测中奖](#检测中奖)
- [检测未读信息, 已读未读信息](#检测未读信息-已读未读信息)
- [中奖推送(可选)](#中奖推送可选)
@@ -59,7 +59,7 @@ Chrome浏览器:
(此步骤是为了方便后续采用JS获取Cookies,获取完毕后应再次勾选)
![取消httponly](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/getCookies.png)
![取消httponly](https://gitlab.com/shanmiteko/LotteryAutoScript/-/raw/main/doc/pic/getCookies.png)
3. 在Console中复制以下代码回车
@@ -126,7 +126,7 @@ Chrome浏览器:
```
7. 运行截图
![lottery_start](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/lottery_start.png)
![lottery_start](https://gitlab.com/shanmiteko/LotteryAutoScript/-/raw/main/doc/pic/lottery_start.png)
#### 以源码方式运行
@@ -140,7 +140,7 @@ step1: 下载代码到本地
[点此下载](https://github.com/shanmiteko/LotteryAutoScript/archive/refs/heads/main.zip)或如图示下载↓
![点我加载下载操作图示](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/download.png)
![点我加载下载操作图示](https://gitlab.com/shanmiteko/LotteryAutoScript/-/raw/main/doc/pic/download.png)
下载的压缩包解压后修改env.example.js文件,详见step3
@@ -148,7 +148,7 @@ step2: 下载并安装Node.js
[点此进入nodejs下载页面](http://nodejs.cn/download)
![点我加载下载nodejs操作图示](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/nodejs.png)
![点我加载下载nodejs操作图示](https://gitlab.com/shanmiteko/LotteryAutoScript/-/raw/main/doc/pic/nodejs.png)
step3:修改env.example.js文件及创建运行文件(打开扩展名显示)
@@ -230,6 +230,8 @@ $ tree
└── start.sh
```
[![asciicast](https://asciinema.org/a/453237.svg)](https://asciinema.org/a/453237)
3.更新
进入lottery上一级目录
@@ -238,13 +240,11 @@ $ tree
----------------------------------------
## 防重复转发
## 防重复转发(可选)
~~存储在专栏草稿~~
- 脚本将转发过的动态和被过滤的动态都写入`dyids/dyid*.txt`文件中
~~脚本将转发过的动态和被过滤的动态都写入`dyids/dyid*.txt`文件中~~
是否点赞
- 是否点赞
----------------------------------------
@@ -266,29 +266,31 @@ $ tree
以下是支持的推送方式
| Name | 归属 | 属性 | 说明 |
| :---------------: | :--------------------------------------------------------------------------------: | ------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `SCKEY` | 微信server酱推送(于2021/4月下线) | 非必须 | server酱的微信通知[官方文档](http://sc.ftqq.com/3.version) |
| `SENDKEY` | 微信server酱(Turbo版)推送 | 非必须 | [获取SENDKEY](https://sct.ftqq.com/sendkey) [选择消息通道](https://sct.ftqq.com/forward) |
| `BARK_PUSH` | [BARK推送](https://apps.apple.com/us/app/bark-customed-notifications/id1403753865) | 非必须 | IOS用户下载BARK这个APP,填写内容是app提供的`设备码`,例如:<https://api.day.app/123> ,那么此处的设备码就是`123`,再不懂看 [这个图](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/bark.jpg)(注:支持自建填完整链接即可) |
| `BARK_SOUND` | [BARK推送](https://apps.apple.com/us/app/bark-customed-notifications/id1403753865) | 非必须 | bark推送声音设置,例如`choo`,具体值请在`bark`-`推送铃声`-`查看所有铃声` |
| `TG_BOT_TOKEN` | telegram推送 | 非必须 | tg推送(需设备可连接外网),`TG_BOT_TOKEN`和`TG_USER_ID`两者必需,填写自己申请[@BotFather](https://t.me/BotFather)的Token,如`10xxx4:AAFcqxxxxgER5uw` , [具体教程](doc/TG_PUSH.md) |
| `TG_USER_ID` | telegram推送 | 非必须 | tg推送(需设备可连接外网),`TG_BOT_TOKEN`和`TG_USER_ID`两者必需,填写[@getuseridbot](https://t.me/getuseridbot)中获取到的纯数字ID, [具体教程](doc/TG_PUSH.md) |
| `TG_PROXY_HOST` | Telegram 代理的 IP | 非必须 | 代理类型为 http。例子:http代理 <http://127.0.0.1:1080> 则填写 127.0.0.1 |
| `TG_PROXY_PORT` | Telegram 代理的端口 | 非必须 | 例子:http代理 <http://127.0.0.1:1080> 则填写 1080 |
| `DD_BOT_TOKEN` | 钉钉推送 | 非必须 | 钉钉推送(`DD_BOT_TOKEN`和`DD_BOT_SECRET`两者必需)[官方文档](https://ding-doc.dingtalk.com/doc#/serverapi2/qf2nxq) ,只需`https://oapi.dingtalk.com/robot/send?access_token=XXX` 等于`=`符号后面的XXX即可 |
| `DD_BOT_SECRET` | 钉钉推送 | 非必须 | (`DD_BOT_TOKEN`和`DD_BOT_SECRET`两者必需) ,密钥,机器人安全设置页面,加签一栏下面显示的SEC开头的`SECXXXXXXXXXX`等字符 , 注:钉钉机器人安全设置只需勾选`加签`即可,其他选项不要勾选,再不懂看 [这个图](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/DD_bot.png) |
| `IGOT_PUSH_KEY` | iGot推送 | 非必须 | iGot聚合推送,支持多方式推送,确保消息可达。 [参考文档](https://wahao.github.io/Bark-MP-helper ) |
| `QQ_SKEY` | 酷推(Cool Push)推送 | 非必须 | 推送所需的Skey,登录后获取Skey [参考文档](https://cp.xuthus.cc/) |
| `QQ_MODE` | 酷推(Cool Push)推送 | 非必须 | 推送方式(send或group或者wx,默认send) [参考文档](https://cp.xuthus.cc/) |
| `QYWX_KEY` | 企业微信推送 | 非必须 | 密钥,企业微信推送 webhook 后面的 key [详见官方说明文档](https://work.weixin.qq.com/api/doc/90000/90136/91770) |
| `PUSH_PLUS_TOKEN` | pushplus推送 | 非必须 | 微信扫码登录后一对一推送或一对多推送下面的token(您的Token) [官方网站](http://pushplus.hxtrip.com/) |
| `PUSH_PLUS_USER` | pushplus推送 | 非必须 | 一对多推送的“群组编码”(一对多推送下面->您的群组(如无则新建)->群组编码)注:(1、需订阅者扫描二维码 2、如果您是创建群组所属人,也需点击“查看二维码”扫描绑定,否则不能接受群组消息推送),只填`PUSH_PLUS_TOKEN`默认为一对一推送 |
| `SMTP_HOST` | 电子邮件 | 非必须 | smtp服务器的主机名 如: `smtp.qq.com` |
| `SMTP_PORT` | 电子邮件 | 非必须 | smtp服务器的端口 如: `465` |
| `SMTP_USER` | 电子邮件 | 非必须 | 发送方的电子邮件 如: `xxxxxxxxx@qq.com` |
| `SMTP_PASS` | 电子邮件 | 非必须 | smtp服务对应的授权码 |
| `SMTP_TO_USER` | 电子邮件 | 非必须 | 接收方电子邮件 |
| Name | 归属 | 说明 |
| :---------------: | :--------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `SCKEY` | 微信server酱推送(于2021/4月下线) | server酱的微信通知[官方文档](http://sc.ftqq.com/3.version) |
| `SENDKEY` | 微信server酱(Turbo版)推送 | [获取SENDKEY](https://sct.ftqq.com/sendkey) [选择消息通道](https://sct.ftqq.com/forward) |
| `BARK_PUSH` | [BARK推送](https://apps.apple.com/us/app/bark-customed-notifications/id1403753865) | IOS用户下载BARK这个APP,填写内容是app提供的`设备码`,例如:<https://api.day.app/123> ,那么此处的设备码就是`123`,再不懂看 [这个图](https://gitlab.com/shanmiteko/LotteryAutoScript/-/raw/main/doc/pic/bark.jpg)(注:支持自建填完整链接即可) |
| `BARK_SOUND` | [BARK推送](https://apps.apple.com/us/app/bark-customed-notifications/id1403753865) | bark推送声音设置,例如`choo`,具体值请在`bark`-`推送铃声`-`查看所有铃声` |
| `TG_BOT_TOKEN` | telegram推送 | tg推送(需设备可连接外网),`TG_BOT_TOKEN`和`TG_USER_ID`两者必需,填写自己申请[@BotFather](https://t.me/BotFather)的Token,如`10xxx4:AAFcqxxxxgER5uw` , [具体教程](doc/TG_PUSH.md) |
| `TG_USER_ID` | telegram推送 | tg推送(需设备可连接外网),`TG_BOT_TOKEN`和`TG_USER_ID`两者必需,填写[@getuseridbot](https://t.me/getuseridbot)中获取到的纯数字ID, [具体教程](doc/TG_PUSH.md) |
| `TG_PROXY_HOST` | Telegram 代理的 IP | 代理类型为 http。例子:http代理 <http://127.0.0.1:1080> 则填写 127.0.0.1 |
| `TG_PROXY_PORT` | Telegram 代理的端口 | 例子:http代理 <http://127.0.0.1:1080> 则填写 1080 |
| `DD_BOT_TOKEN` | 钉钉推送 | 钉钉推送(`DD_BOT_TOKEN`和`DD_BOT_SECRET`两者必需)[官方文档](https://ding-doc.dingtalk.com/doc#/serverapi2/qf2nxq) ,只需`https://oapi.dingtalk.com/robot/send?access_token=XXX` 等于`=`符号后面的XXX即可 |
| `DD_BOT_SECRET` | 钉钉推送 | (`DD_BOT_TOKEN`和`DD_BOT_SECRET`两者必需) ,密钥,机器人安全设置页面,加签一栏下面显示的SEC开头的`SECXXXXXXXXXX`等字符 , 注:钉钉机器人安全设置只需勾选`加签`即可,其他选项不要勾选,再不懂看 [这个图](https://gitlab.com/shanmiteko/LotteryAutoScript/-/raw/main/doc/pic/DD_bot.png) |
| `IGOT_PUSH_KEY` | iGot推送 | iGot聚合推送,支持多方式推送,确保消息可达。 [参考文档](https://wahao.github.io/Bark-MP-helper ) |
| `QQ_SKEY` | 酷推(Cool Push)推送 | 推送所需的Skey,登录后获取Skey [参考文档](https://cp.xuthus.cc/) |
| `QQ_MODE` | 酷推(Cool Push)推送 | 推送方式(send或group或者wx,默认send) [参考文档](https://cp.xuthus.cc/) |
| `QYWX_KEY` | 企业微信推送 | 密钥,企业微信推送 webhook 后面的 key [详见官方说明文档](https://work.weixin.qq.com/api/doc/90000/90136/91770) |
| `PUSH_PLUS_TOKEN` | pushplus推送 | 微信扫码登录后一对一推送或一对多推送下面的token(您的Token) [官方网站](http://pushplus.hxtrip.com/) |
| `PUSH_PLUS_USER` | pushplus推送 | 一对多推送的“群组编码”(一对多推送下面->您的群组(如无则新建)->群组编码)注:(1、需订阅者扫描二维码 2、如果您是创建群组所属人,也需点击“查看二维码”扫描绑定,否则不能接受群组消息推送),只填`PUSH_PLUS_TOKEN`默认为一对一推送 |
| `QMSG_KEY` | [Qmsg酱](https://qmsg.zendee.cn)私聊推送 | [Qmsg注册](https://qmsg.zendee.cn/login.html) |
| `QMSG_QQ` | 私聊消息推送接口,指定需要接收消息的QQ | 指定的QQ号必须在你的[管理台](https://qmsg.zendee.cn/me.html)已添加 |
| `SMTP_HOST` | 电子邮件 | smtp服务器的主机名 如: `smtp.qq.com` |
| `SMTP_PORT` | 电子邮件 | smtp服务器的端口 如: `465` |
| `SMTP_USER` | 电子邮件 | 发送方的电子邮件 如: `xxxxxxxxx@qq.com` |
| `SMTP_PASS` | 电子邮件 | smtp服务对应的授权码 |
| `SMTP_TO_USER` | 电子邮件 | 接收方电子邮件 |
----------------------------------------
@@ -301,5 +303,6 @@ $ tree
## Awesome
相关项目
- [LotteryAutoScript_Station](https://github.com/spiritLHL/LotteryAutoScript_Station) - @spiritLHL
- [sync_lottery](https://github.com/spiritLHL/sync_lottery) - @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)
+3 -3
View File
@@ -4,16 +4,16 @@
.首先在Telegram上搜索[BotFather](https://t.me/BotFather)机器人<br>
![TG_PUSH1](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/TG_PUSH1.png)
![TG_PUSH1](https://gitlab.com/shanmiteko/LotteryAutoScript/-/raw/main/doc/pic/TG_PUSH1.png)
Ⅱ.利用[BotFather](https://t.me/BotFather)创建一个属于自己的通知机器人,按照下图中的1、2、3步骤拿到token,格式形如```10xxx4:AAFcqxxxxgER5uw```。填入```TG_BOT_TOKEN```<br>
![TG_PUSH2](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/TG_PUSH2.png)<br>
![TG_PUSH2](https://gitlab.com/shanmiteko/LotteryAutoScript/-/raw/main/doc/pic/TG_PUSH2.png)<br>
**新创建的机器人需要跟它发一条消息来开启对话,否则可能会遇到secret填对了但是收不到消息的情况**<br>
Ⅲ.再次在Telegram上搜索[getuserIDbot](https://t.me/getuserIDbot)机器人,获取UserID。填入```TG_USER_ID```<br>
![TG_PUSH3](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/TG_PUSH3.png)
![TG_PUSH3](https://gitlab.com/shanmiteko/LotteryAutoScript/-/raw/main/doc/pic/TG_PUSH3.png)
至此,获取**TG_BOT_TOKEN**以及**TG_USER_ID**的教程结束
+1 -1
View File
@@ -73,7 +73,7 @@ PATH=/sbin:/bin:/usr/sbin/:/usr/bin
看看有没有效果
![image-start](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/image-start.png)
![image-start](https://gitlab.com/shanmiteko/LotteryAutoScript/-/raw/main/doc/pic/image-start.png)
7.如果本地的脚本需要更新
+3 -3
View File
@@ -16,13 +16,13 @@
7.在`操作`页面中点击`新建`,选择操作为`启动程序`,在设置里点击浏览找到`start.bat`文件并选择,在`起始于(可选)(T)`中的空白框里输入`start.bat`文件的目录地址,也就是`程序或脚本(P)``start.bat`的前面那一串目录地址,最后是以`\`结尾的 ,填好东西后按下面`确认`
![点我加载步骤7结果图示](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/step_menu.png)
![点我加载步骤7结果图示](https://gitlab.com/shanmiteko/LotteryAutoScript/-/raw/main/doc/pic/step_menu.png)
8.在`条件`页面中选择`网络`,设定启动条件为任何连接
9.在`设置`页面中选择如图示选项,或者不修改默认设置
![点我加载步骤9结果图示](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/shezhi_renwu.png)
![点我加载步骤9结果图示](https://gitlab.com/shanmiteko/LotteryAutoScript/-/raw/main/doc/pic/shezhi_renwu.png)
10.最后按`确定`
@@ -30,6 +30,6 @@
最后你可以在任务列表中选择已有的任务,右边的操作框中选择`运行`点击,启动计划的任务,如下图所示
![点我加载运行图示](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/start_renwu.png)
![点我加载运行图示](https://gitlab.com/shanmiteko/LotteryAutoScript/-/raw/main/doc/pic/start_renwu.png)
具体看任务是否正常执行,你可以看看自己的账号动态的最新转发,运行成功每几分钟自动转发抽奖动态
+11
View File
@@ -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
@@ -61,6 +70,8 @@ module.exports = Object.freeze({
IGOT_PUSH_KEY: "",
PUSH_PLUS_TOKEN: "",
PUSH_PLUS_USER: "",
QMSG_KEY: "",
QMSG_QQ: "",
SMTP_HOST: "",
SMTP_PORT: "",
SMTP_USER: "",
+41 -19
View File
@@ -6,28 +6,49 @@ const bili = require('./net/bili')
/**
* 是否中奖
* @param {number} num
* @param {string} [note]
*/
async function isMe() {
async function isMe(num, note = "无") {
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 +67,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'
}
@@ -73,9 +94,10 @@ async function isMe() {
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('可能中奖了', desp);
await sendNotify(`帐号${num}可能中奖了`, desp);
} else {
log.info('中奖检测', "暂未中奖");
}
+271 -120
View File
@@ -1,4 +1,4 @@
const { log, hasEnv, shuffle, getRandomOne, delay, try_for_each } = require('../utils');
const { log, hasEnv, shuffle, getRandomOne, delay, try_for_each, retryfn } = require('../utils');
const { send } = require('../net/http');
const bili = require('../net/bili');
const { sendNotify } = require('../helper/notify');
@@ -7,6 +7,7 @@ const { randomDynamic } = require('../helper/randomDynamic')
const { Searcher } = require('./searcher');
const global_var = require("../data/global_var");
const config = require("../data/config");
const d_storage = require('../helper/d_storage');
/**
* 监视器
@@ -49,13 +50,16 @@ class Monitor extends Searcher {
case 0:
event_bus.emit('Turn_on_the_Monitor')
break;
case 11:
case 1001:
event_bus.emit('Turn_off_the_Monitor', '评论失败')
break
case 21:
break;
case 2001:
event_bus.emit('Turn_off_the_Monitor', '关注出错')
break
case 22:
break;
case 3001:
event_bus.emit('Turn_off_the_Monitor', '分区移动出错')
break;
case 2004:
log.warn('账号异常', `UID(${global_var.get('myUID')})异常号只会对部分UP出现关注异常`)
if (!config.is_exception) {
await sendNotify('[动态抽奖]账号异常通知', `UID: ${global_var.get('myUID')}\n\n异常号只会对部分UP出现关注异常\n\n可在设置中令is_exception为true关闭此推送`)
@@ -63,17 +67,26 @@ class Monitor extends Searcher {
config.is_exception = true;
event_bus.emit('Turn_on_the_Monitor')
break
case 31:
case 2005:
log.warn('关注已达上限', `UID(${global_var.get('myUID')})关注已达上限,已临时进入只转已关注模式`)
if (!config.is_outof_maxfollow) {
await sendNotify('[动态抽奖]关注已达上限', `UID: ${global_var.get('myUID')}\n\n关注已达上限,已临时进入只转已关注模式\n\n可在设置中令is_outof_maxfollow为true关闭此推送`)
}
config.is_outof_maxfollow = true;
config.only_followed = true;
event_bus.emit('Turn_on_the_Monitor')
break
case 5001:
event_bus.emit('Turn_off_the_Monitor', '转发失败')
break
case 41:
case 6001:
event_bus.emit('Turn_off_the_Monitor', '获取开奖时间失败')
break
case 51:
case 7001:
event_bus.emit('Turn_off_the_Monitor', '获取关注数失败')
break
default:
event_bus.emit('Turn_off_the_Monitor', '未知错误')
event_bus.emit('Turn_off_the_Monitor', '??? 未知错误')
break;
}
}
@@ -89,35 +102,52 @@ class Monitor extends Searcher {
log.info('筛选动态', `筛选完毕(${len})`);
if (len) {
let is_exception = false;
for (const [index, Lottery] of shuffle(allLottery).entries()) {
let status = 0;
let
status = 0,
is_exception = 0,
is_outof_maxfollow = 0,
relayed_nums = 0;
for (const [index, lottery] of shuffle(allLottery).entries()) {
let is_shutdown = false;
if (
is_outof_maxfollow
&& lottery.uid.length
&& (new RegExp(lottery.uid.join('|'))).test(this.attentionList)
) {
log.info('过滤', `已关注(${lottery.uid.join(',')})`)
continue
}
if (Lottery.isOfficialLottery) {
let { ts } = await bili.getLotteryNotice(Lottery.dyid);
if (lottery.isOfficialLottery) {
let { ts } = await bili.getLotteryNotice(lottery.dyid);
const ts_10 = Date.now() / 1000;
if (ts < 0) {
return 41
status = 6001
break;
}
if (ts < ts_10) {
log.info('过滤', '已过开奖时间')
d_storage.updateDyid(lottery.dyid)
await delay(filter_wait)
continue
}
if (ts > ts_10 + config.maxday * 86400) {
log.info('过滤', '超过指定开奖时间')
d_storage.updateDyid(lottery.dyid)
await delay(filter_wait)
continue
}
} else if (Lottery.uid[0]) {
} else if (lottery.uid[0]) {
const { minfollower } = config
if (minfollower > 0) {
const followerNum = await bili.getUserInfo(Lottery.uid[0]);
const followerNum = await bili.getUserInfo(lottery.uid[0]);
if (followerNum < 0) {
return 51
status = 7001
break;
}
if (followerNum < minfollower) {
log.info('过滤', `粉丝数(${followerNum})小于指定数量`)
d_storage.updateDyid(lottery.dyid)
await delay(filter_wait)
continue
}
@@ -135,27 +165,51 @@ class Monitor extends Searcher {
randomDynamic(number)
}
status = await this.go(Lottery)
status = await this.go(lottery)
switch (status) {
case 0:
case 9:
case 19:
relayed_nums += 1
break;
case 22:
is_exception = true
case 1002:
case 1003:
case 1004:
case 1005:
case 1006:
case 1007:
case 2002:
case 2003:
case 4001:
case 4002:
case 4003:
case 5002:
case 5003:
case 5004:
status = 0
break;
case 2004:
is_exception = 2004
break;
case 2005:
is_outof_maxfollow = 2005
break;
case 1001:
case 2001:
case 3001:
case 5001:
is_shutdown = true
break;
default:
return status
}
if (is_shutdown) break
d_storage.updateDyid(lottery.dyid)
await delay(wait * (Math.random() + 0.5));
}
log.info('抽奖', '开始转发下一组动态');
if (is_exception) {
return 22
} else {
return 0
}
log.info('抽奖', `本轮共转发${relayed_nums}`);
return is_exception
|| is_outof_maxfollow
|| status
} else {
log.info('抽奖', '无未转发抽奖');
return 0
@@ -170,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[]>}
@@ -188,12 +243,10 @@ class Monitor extends Searcher {
log.info('筛选动态', `开始筛选(${protoLotteryInfo.length})`);
log.debug('未进行筛选的动态信息', protoLotteryInfo);
/** 所有抽奖信息 */
let alllotteryinfo = [];
const
{ set_lottery_info_url, key_words, model, chatmodel, max_create_time, is_imitator, only_followed, at_users, blockword, 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;
/**
@@ -212,6 +265,18 @@ class Monitor extends Searcher {
log.info('筛选动态', `去重后(${protoLotteryInfo.length})`);
/**并发查询dyid */
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("上传抽奖信息", "开始")
await new Promise((resolve) => {
@@ -235,68 +300,113 @@ class Monitor extends Searcher {
}
/* 检查动态是否满足要求 */
await try_for_each(protoLotteryInfo, async function ({
lottery_info_type, is_liked,
uids, uname, dyid, create_time,
ctrl, rid, des, type,
hasOfficialLottery
}) {
/* 遇到转发过就退出 */
if (is_liked) {
log.info("筛选动态", `已转发(${dyid})`)
return false
await try_for_each(protoLotteryInfo, async function (lottery_info) {
const {
lottery_info_type, is_liked,
uids, uname, dyid, create_time,
ctrl, rid, des, type,
hasOfficialLottery
} = lottery_info;
log.debug('正在筛选动态信息', lottery_info);
if (lottery_info_type.startsWith('sneak') && sneaktower) {
log.info("筛选动态", `偷塔模式不检查是否已转发(https://t.bilibili.com/${dyid})`)
} else {
/* 遇到转发过就退出 */
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
}
}
/* 超过指定时间退出 */
if (now_ts - create_time > max_create_time * 86400) {
log.info("筛选动态", `过时动态(${dyid})`)
log.info("筛选动态", `过时动态(https://t.bilibili.com/${dyid})`)
return false
}
const
/**判断是转发源动态还是现动态 */
uid = lottery_info_type === 'uid' ? uids[1] : uids[0],
isFollowed = (new RegExp(uid)).test(attentionList),
description = typeof des === 'string' ? des : '',
[m_uid, ori_uid] = uids,
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]
: [m_uid, mIsFollowed],
description = des.split(/\/\/@.*?:/)[0],
needAt = /(?:@|艾特)[^@|(艾特)]*?好友/.test(description),
needTopic = [...new Set(description.match(/(?<=[带加上](?:话题|tag).*)#.+?#|(?<=[带加上])#.+?#(?=话题|tag)/ig) || [])].join(' '),
isRelayDynamic = type === 1,
isTwoLevelDynamic = /\/\/@/.test(description),
has_key_words = key_words.every(it => new RegExp(it).test(description)),
isBlock = new RegExp(blockword.join('|')).test(description),
isLottery =
(is_imitator && lottery_info_type === 'uid' && model !== '00')
|| (hasOfficialLottery && model[0] === '1')
|| (!hasOfficialLottery && model[1] === '1' && !isTwoLevelDynamic && has_key_words),
|| (!hasOfficialLottery && model[1] === '1' && has_key_words),
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, 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')}`)
return false
}
/**屏蔽词 */
if (isBlock) {
log.info("筛选动态", `包含屏蔽词(${dyid})`)
log.info("筛选动态", `包含屏蔽词(https://t.bilibili.com/${dyid})`)
return false
}
/**若勾选只转已关注 */
if (only_followed && !isFollowed) {
log.info("筛选动态", `只转已关注(${dyid})`)
if (only_followed
&& (!mIsFollowed || !oriIsFollowed)
) {
log.info("筛选动态", `只转已关注(https://t.bilibili.com/${dyid})`)
return false
}
/* 获取黑名单并去重合并 */
const { blacklist: remote_blacklist } = global_var.get("remoteconfig")
, new_blacklist = remote_blacklist
? [...new Set([...blacklist.split(','), ...remote_blacklist.split(',')])].join()
: blacklist;
if ((new RegExp(dyid + '|' + uid)).test(new_blacklist)) {
log.info("筛选动态", `黑名单用户(${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) {
const { uname_map = {} } = global_var.get("remoteconfig")
let onelotteryinfo = {};
onelotteryinfo.isOfficialLottery = hasOfficialLottery;
@@ -304,15 +414,16 @@ class Monitor extends Searcher {
/**初始化待关注列表 */
onelotteryinfo.uid = []
if (!isFollowed) {
onelotteryinfo.uid.push(uid);
if (!realIsFollowed) {
onelotteryinfo.uid.push(real_uid);
}
onelotteryinfo.dyid = dyid;
let
/**转发评语 */
RandomStr = getRandomOne(config.relay),
RandomStr = getRandomOne(relays)
.replace(/\$\{uname\}/g, uname_map[real_uid] || uname),
/**控制字段 */
new_ctrl = [];
@@ -340,7 +451,7 @@ class Monitor extends Searcher {
const addlength = RandomStr.length + 2 + uname.length + 1 + 1;
onelotteryinfo.relay_chat = RandomStr + `//@${uname}:` + des;
new_ctrl.push({
data: String(uid),
data: String(real_uid),
location: RandomStr.length + 2,
length: uname.length + 1,
type: 1
@@ -349,8 +460,9 @@ class Monitor extends Searcher {
item.location += addlength;
return item;
}).forEach(it => new_ctrl.push(it))
if (!(new RegExp(uids[1])).test(attentionList))
onelotteryinfo.uid.push(uids[1]);
if (!oriIsFollowed) {
onelotteryinfo.uid.push(ori_uid);
}
} else {
onelotteryinfo.relay_chat = RandomStr;
}
@@ -368,11 +480,15 @@ 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 {
log.info("筛选动态", `非抽奖动态(${dyid})`)
log.info("筛选动态", `非抽奖动态(https://t.bilibili.com/${dyid})`)
}
})
@@ -382,13 +498,27 @@ class Monitor extends Searcher {
* 关注转发评论
* @param {LotteryOptions} option
* @returns {Promise<number>}
* 0 - 成功
* 9 - 评论黑名单/评论区关闭/动态删除
* 11 - 评论错误
* 19 - 关注黑名单
* 21 - 关注错误
* 22 - 关注异常
* 31 - 转发失败
* - 成功 0
* - 评论 未知错误 1001
* - 评论 原动态已删除 1002
* - 评论 评论区已关闭 1003
* - 评论 需要输入验证码 1004
* - 评论 已被对方拉入黑名单 1005
* - 评论 黑名单用户无法互动 1006
* - 评论 UP主已关闭评论区 1007
* - 关注 未知错误 2001
* - 关注 您已被对方拉入黑名单 2002
* - 关注 黑名单用户无法关注 2003
* - 关注 账号异常 2004
* - 关注 关注已达上限 2005
* - 分区 移动失败 3001
* - 点赞 未知错误 4001
* - 点赞 点赞异常 4002
* - 点赞 点赞频繁 4003
* - 转发 未知错误 5001
* - 转发 该动态不能转发分享 5002
* - 转发 请求数据发生错误,请刷新或稍后重试 5003
* - 转发 操作太频繁了,请稍后重试 5004
*/
async go(option) {
log.debug('正在转发的动态信息', option);
@@ -397,63 +527,84 @@ class Monitor extends Searcher {
return 0
}
const { uid, dyid, chat_type, rid, relay_chat, ctrl } = option;
let status = 0
const
{ uid, dyid, chat_type, rid, relay_chat, ctrl, chat } = option,
{ check_if_duplicated, is_repost_then_chat } = config;
/* 评论 */
if (rid && chat_type) {
let status = 0
const
{ chat } = config,
retry = [...new Array(5).keys()],
max_retry_times = retry.length;
await try_for_each(retry, async (times) => {
status = await bili.sendChat(rid, getRandomOne(chat), chat_type)
switch (status) {
case 0:
return true
case -1:
log.warn('抽奖信息', `uid: ${uid},dyid: ${dyid}`)
return true
default:
log.error('抽奖信息', `uid: ${uid},dyid: ${dyid}`)
log.info('自动评论', `将在 ${times + 1} 分钟后再次发送评论(${times + 1}/${max_retry_times})`)
await delay(60 * 1000 * (times + 1))
return false
}
})
if (status) return 10 + status;
status = await retryfn(
5,
[1, 4],
() => bili.sendChat(
rid,
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
}
}
/* 关注 */
if (uid.length) {
let status = 0
await try_for_each(uid, async (u) => {
status = await bili.autoAttention(u)
switch (status) {
case 0:
if (await bili.movePartition(u, this.tagid)) {
log.error('抽奖信息', `uid: ${u},dyid: ${dyid}`)
}
return false
case -1:
case 2:
log.warn('抽奖信息', `uid: ${u},dyid: ${dyid}`)
return true
default:
log.error('抽奖信息', `uid: ${u},dyid: ${dyid}`)
return true
if (status) {
log.warn("抽奖信息", `dyid: ${dyid}, uid: ${u}`)
return true
} else if (await bili.movePartition(u, this.tagid)) {
log.warn("抽奖信息", `dyid: ${dyid}, uid: ${u} tagid: ${this.tagid}`)
/* 3000系错误 */
status = 1001
return true
} else {
return false
}
})
if (status) return 20 + status
if (status) return 2000 + status
}
/* 点赞 */
await bili.autolike(dyid)
if (!check_if_duplicated) {
status = await retryfn(
5,
[1, 2, 3],
() => bili.autolike(dyid)
)
if (status) {
log.warn("抽奖信息", `dyid: ${dyid}`)
return 4000 + status
}
}
/* 转发 */
if (await bili.autoRelay(global_var.get("myUID"), dyid, relay_chat, ctrl)) return 31;
status = await retryfn(
5,
[1, 3, 4],
() => bili.autoRelay(global_var.get("myUID"), dyid, relay_chat, ctrl)
)
return 0
if (status) {
log.warn("抽奖信息", `dyid: ${dyid}`)
return 5000 + status
}
return status
}
}
+58 -45
View File
@@ -1,7 +1,8 @@
const utils = require('../utils');
const bili = require('../net/bili');
const { send } = require("../net/http");
const { article_scan_page, article_create_time, not_check_article, get_dynamic_detail_wait, uid_scan_page, search_wait, tag_scan_page } = require("../data/config");
const { check_if_duplicated, article_scan_page, article_create_time, not_check_article, get_dynamic_detail_wait, uid_scan_page, search_wait, tag_scan_page } = require("../data/config");
const d_storage = require("../helper/d_storage")
const { log } = utils
@@ -74,8 +75,11 @@ 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)) || '';
/* 转发者的描述 纯文字内容 图片动态描述 后两个分别是视频动态的描述和视频本身的描述*/
obj.description =
(item && (item.content || '' + item.description || ''))
|| (cardToJson.dynamic || '' + cardToJson.desc || '')
|| '';
if (obj.type === 1) {
const { origin_extension, origin } = cardToJson
, originToJson = strToJson(origin)
@@ -93,7 +97,10 @@ function parseDynamicCard(dynamic_detail_card) {
/* 被转发者的name */
obj.origin_uname = (user && (user.name || user.uname)) || '';
/* 被转发者的描述 */
obj.origin_description = (item && (item.content || item.description || originToJson.dynamic || originToJson.desc)) || '';
obj.origin_description =
(item && (item.content || '' + item.description || ''))
|| (originToJson.dynamic || '' + originToJson.desc || '')
|| '';
}
return obj
@@ -234,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}的动态信息`);
@@ -363,6 +367,7 @@ class Searcher {
for (const dyid of dyids_set) {
if (dyid.length === utils.dyid_length) {
log.info('获取动态', `查看专栏中所提及动态(${dyid}) (${length--})`)
const card = await bili.getOneDynamicByDyid(dyid)
if (card) {
@@ -371,8 +376,12 @@ class Searcher {
const parsed_card = parseDynamicCard(card)
, { is_liked } = parsed_card;
log.info('获取动态', `查看专栏中所提及动态(${dyid})是否点赞 (${length--})`)
if (is_liked) {
if (
((!check_if_duplicated || check_if_duplicated === 2)
&& is_liked)
|| ((check_if_duplicated === 1 || check_if_duplicated === 2)
&& await d_storage.searchDyid(dyid))
) {
log.info('获取动态', `动态(${dyid})已转发过`)
_weight += 1;
}
@@ -439,23 +448,27 @@ class Searcher {
if (length) {
const lottery_info = raw_lottery_info
.reduce(async (pre, cur) => {
const results = await pre
let results = await pre
, { dyid } = cur;
const card = await bili.getOneDynamicByDyid(dyid)
if (card) {
await utils.delay(get_dynamic_detail_wait)
const { is_liked } = parseDynamicCard(card)
if (!check_if_duplicated || check_if_duplicated === 2) {
log.info('获取动态', `查看动态(${dyid})是否点赞 (${length--})`)
if (is_liked) {
log.info('获取动态', `动态(${dyid})已转发过`)
} else {
cur.is_liked = is_liked
return [...results, cur]
const card = await bili.getOneDynamicByDyid(dyid)
if (card) {
await utils.delay(get_dynamic_detail_wait)
const { is_liked } = parseDynamicCard(card)
if (is_liked) {
log.info('获取动态', `动态(${dyid})已转发过`)
} else {
cur.is_liked = is_liked
results.push(cur)
}
}
} else {
results.push(cur)
}
return results
+58 -5
View File
@@ -49,8 +49,8 @@ const config = {
* 符合js正则表达式的字符串
*/
key_words: [
"[抽奖]",
"[转关].*[转关]"
"[抽奖送揪]|福利",
"[转关评粉]|参与"
],
/**
@@ -69,6 +69,36 @@ const config = {
*/
chatmodel: '01',
/**
* 检查是否重复转发
* - 不检查 -1
* - 通过是否点赞判断 0
* - 检索本地dyids文件 1
* - 通过是否点赞判断+检索本地dyids文件 2
*/
check_if_duplicated: 1,
/**
* 偷塔模式不检查是否重复转发
* * 偷塔模式: 临近开奖时参与抽奖
*/
sneaktower: true,
/**
* 屏蔽动态类型
*
* | 动态类型 | type值 |
* | :------- |:----- |
* | 转发 | `1` |
* | 含图片 | `2` |
* | 无图纯文字 | `4` |
* | 视频 | `8` |
* | 番剧 | `512` |
* | 活动 | `2048` |
* | 专栏 | `64` |
*/
block_dynamic_type: [0],
/**
* - 动态创建时间
* - 多少天前
@@ -221,15 +251,26 @@ const config = {
at_users: [['转发抽奖娘', 294887687], ['你的工具人老公', 100680137]],
/**
* - 自动同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
* - 英文逗号分隔 如: 1,2,3
*/
blacklist: '',
/**
* - 自动同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
* - 使用公共黑名单
*/
use_public_blacklist: true,
/**
* 屏蔽词
*/
blockword: ["脚本抽奖", "恭喜", "结果", "抽奖号", "钓鱼", "涨粉"],
blockword: ["脚本", "抽奖号", "钓鱼"],
/**
* 转发并评论
* - 评论内容与转发内容相同
*/
is_repost_then_chat: false,
/**
* 转发评语
@@ -258,6 +299,11 @@ const config = {
*/
is_exception: false,
/**
* 是否关注已达上限
*/
is_outof_maxfollow: false,
/**
* - 中奖通知关键词(满足一个就推送)
* - 符合js正则表达式的字符串
@@ -266,9 +312,16 @@ const config = {
*/
notice_key_words: [
"~预约成功|预约主题",
"中奖|获得|填写|写上|提供|收货地址|支付宝账号|码|大会员"
"中奖|获得|填写|写上|提供|收货地址|支付宝账号|码|大会员",
"~你的账号在新设备或平台登录成功",
"~你预约的直播已开始"
],
/**
* 是否发送运行状态通知
*/
notice_running_state: false,
/**
* - 获取私信页数
*/
+6 -3
View File
@@ -1,4 +1,4 @@
const { getRemoteConfig } = require("../utils");
const { getRemoteConfig, createDir, createFile } = require("../utils");
const config = require("../data/config");
const key_map = new Map([['DedeUserID', 'myUID'], ['bili_jct', 'csrf']]);
@@ -15,10 +15,11 @@ let global_var = {
* 全局变量初始化
* 更新config
* @param {string} cookie
* @param {string} num
*/
async init(cookie) {
async init(cookie, num) {
if (cookie) {
config.updata(process.env.NUMBER);
config.updata(num);
this.set('cookie', cookie);
@@ -37,6 +38,8 @@ let global_var = {
]);
this.set('remoteconfig', await getRemoteConfig());
}
await createDir('dyids');
await createFile(num < 2 ? 'dyid.txt' : `dyid${num}.txt`, '', 'a')
}
};
+52
View File
@@ -0,0 +1,52 @@
const { log, readDyidFile, writeDyidFile, dyid_length } = require("../utils");
const d_storage = {
/**
* 搜索dyid
* @param {string} dyid
* @returns {Promise<boolean>}
*/
searchDyid: (dyid) => {
return new Promise((resolve) => {
const Rdyid = new RegExp(dyid);
const rs = readDyidFile(Number(process.env.NUMBER));
let status = false;
rs.on('data', chunk => {
if (Rdyid.test(chunk)) {
status = true
}
})
rs.on('end', () => {
resolve(status)
})
rs.on('error', err => {
log.error('搜索dyid', err)
resolve(status)
})
})
},
/**
* 更新dyid
* @param {string} dyid
*/
updateDyid: (dyid) => {
log.info('更新dyid', `写入${dyid}`);
if (dyid.length !== dyid_length) {
log.error('更新dyid', `dyid(${dyid})长度不为18 若出现此问题请即时通知开发者`)
}
return new Promise((resolve) => {
const ws = writeDyidFile(Number(process.env.NUMBER));
ws.write(dyid + ',', () => {
ws.destroy();
resolve()
})
ws.on('error', err => {
log.error('更新dyid', err)
resolve()
})
});
}
}
module.exports = d_storage;
+72 -21
View File
@@ -60,6 +60,10 @@ let IGOT_PUSH_KEY = '';
let PUSH_PLUS_TOKEN = '';
let PUSH_PLUS_USER = '';
// ===========================================QMSG===========================================
let QMSG_KEY = '';
let QMSG_QQ = '';
// ===========================================邮件推送===============================================
let SMTP_HOST = '';
let SMTP_PORT = '';
@@ -136,6 +140,14 @@ if (process.env.PUSH_PLUS_USER) {
PUSH_PLUS_USER = process.env.PUSH_PLUS_USER;
}
if (process.env.QMSG_KEY) {
QMSG_KEY = process.env.QMSG_KEY;
}
if (process.env.QMSG_QQ) {
QMSG_QQ = process.env.QMSG_QQ;
}
if (process.env.SMTP_HOST) {
SMTP_HOST = process.env.SMTP_HOST;
}
@@ -177,6 +189,8 @@ async function sendNotify(text, desp, params = {}) {
iGotNotify(text, desp, params),
//QQ酷推
coolPush(text, desp),
// Qmsg
qmsg(text, desp),
//电子邮件
email(text, desp)
])
@@ -216,8 +230,8 @@ function serverNotify(text, desp) {
}
},
failure: err => {
log.error('发送通知', 'server酱 发送通知调用API失败!!')
throw new Error(err);
log.error('发送通知', 'server酱 发送通知调用API失败!!' + err)
resolve()
}
})
} else {
@@ -258,8 +272,8 @@ function serverNotifyTurbo(text, desp) {
}
},
failure: err => {
log.error('发送通知', 'server酱(Turbo版) 发送通知调用API失败!!')
throw new Error(err);
log.error('发送通知', 'server酱(Turbo版) 发送通知调用API失败!!' + err)
resolve()
}
})
} else {
@@ -314,8 +328,8 @@ function coolPush(text, desp) {
}
},
failure: err => {
log.error('发送通知', `酷推 发送${pushMode(QQ_MODE)}通知调用API失败!!`)
throw new Error(err);
log.error('发送通知', `酷推 发送${pushMode(QQ_MODE)}通知调用API失败!!${err}`)
resolve()
}
})
} else {
@@ -356,9 +370,8 @@ function barkNotify(text, desp, params = {}) {
}
},
failure: err => {
log.error('发送通知', 'Bark APP发送通知调用API失败!!');
log.error('发送通知', 'Bark APP发送通知调用API失败!!' + err);
resolve();
throw new Error(err)
}
})
} else {
@@ -404,9 +417,8 @@ function tgBotNotify(text, desp) {
}
},
failure: err => {
log.error('发送通知', 'telegram发送通知消息失败!!')
log.error('发送通知', 'telegram发送通知消息失败!!' + err)
resolve()
throw new Error(err)
}
}
if (TG_PROXY_HOST && TG_PROXY_PORT) {
@@ -467,8 +479,8 @@ function ddBotNotify(text, desp) {
}
},
failure: err => {
log.error('发送通知', '钉钉发送通知消息失败!!')
throw new Error(err);
log.error('发送通知', '钉钉发送通知消息失败!!' + err)
resolve()
}
})
} else if (DD_BOT_TOKEN) {
@@ -506,9 +518,8 @@ function ddBotNotify(text, desp) {
}
},
failure: err => {
log.error('发送通知', '钉钉发送通知消息失败!!');
log.error('发送通知', '钉钉发送通知消息失败!!' + err);
resolve();
throw new Error(err)
}
})
} else {
@@ -552,9 +563,8 @@ function qywxBotNotify(text, desp) {
}
},
failure: err => {
log.error('发送通知', '企业微信发送通知消息失败!!');
log.error('发送通知', '企业微信发送通知消息失败!!' + err);
resolve();
throw new Error(err)
}
})
} else {
@@ -604,9 +614,8 @@ function iGotNotify(text, desp, params = {}) {
}
},
failure: err => {
log.error('发送通知', 'iGot 发送通知调用API失败!!')
log.error('发送通知', 'iGot 发送通知调用API失败!!' + err)
resolve();
throw new Error(err)
}
})
} else {
@@ -621,7 +630,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,
@@ -650,9 +659,8 @@ function pushPlusNotify(text, desp) {
}
},
failure: err => {
log.error('发送通知', `push+发送${PUSH_PLUS_USER ? '一对多' : '一对一'}通知消息失败!!`)
log.error('发送通知', `push+发送${PUSH_PLUS_USER ? '一对多' : '一对一'}通知消息失败!!${err}`)
resolve();
throw new Error(err)
}
})
} else {
@@ -662,6 +670,49 @@ function pushPlusNotify(text, desp) {
})
}
async function qmsg(text, desp) {
return new Promise(resolve => {
if (QMSG_KEY) {
send({
method: 'POST',
url: 'https://qmsg.zendee.cn/send/' + QMSG_KEY,
contents: {
msg: text + "\n\n" + desp,
qq: QMSG_QQ
},
config: {
retry: false
},
headers: {
accept: 'application/json, text/plain, */*',
'content-type': 'application/x-www-form-urlencoded',
},
success: res => {
try {
const data = JSON.parse(res.body);
if (data.code === 200) {
log.info('发送通知', `qmsg发送通知消息完成。`)
} else {
log.error('发送通知', `qmsg通知消息失败: ${data.reason}`)
}
} catch (e) {
log.error('发送通知', e);
} finally {
resolve();
}
},
failure: err => {
log.error('发送通知', `qmsg通知消息失败!!` + err)
resolve();
}
})
} else {
log.debug('发送通知', '您未提供qmsg推送所需的QMSG_KEY,取消qmsg推送消息通知');
resolve()
}
})
}
async function email(text, desp) {
if (SMTP_HOST && SMTP_PORT && SMTP_USER && SMTP_PASS && SMTP_TO_USER) {
try {
+10 -3
View File
@@ -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();
+1
View File
@@ -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',
+127 -57
View File
@@ -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 []
}
},
/**
@@ -526,6 +554,17 @@ const bili_client = {
query: {
vmid: uid
}
}),
/**
* 线路三
* @param {number} uid
* @returns {Promise<string>}
*/
(uid) => get({
url: "https://tenapi.cn/bilibilifo/",
query: {
uid
}
})
], responseText => {
const res = strToJson(responseText);
@@ -607,11 +646,13 @@ const bili_client = {
case 0:
return [false, 0, '关注+1']
case 22002:
return [false, -1, '您已被对方拉入黑名单']
return [false, 2, '您已被对方拉入黑名单']
case 22003:
return [false, -1, '黑名单用户无法关注', -1]
return [false, 3, '黑名单用户无法关注']
case 22015:
return [false, 2, '账号异常', 2]
return [false, 4, '账号异常']
case 22009:
return [false, 5, '关注已达上限']
default:
return [true, 1, `未知错误\n${responseText}`]
}
@@ -623,10 +664,12 @@ const bili_client = {
* @param {Number} uid
* 被关注者的UID
* @returns {Promise<number>}
* -1 - 黑名单
* 0 - 成功
* 1 - 失败
* 2 - 异常
* - 成功 0
* - 未知错误 1
* - 您已被对方拉入黑名单 2
* - 黑名单用户无法关注 3
* - 账号异常 4
* - 关注已达上限 5
*/
autoAttention(uid) {
return this._autoAttention.run(uid)
@@ -636,8 +679,8 @@ const bili_client = {
* @param {number} uid
* @param {number} tagid 关注分区的ID
* @returns {Promise<number>}
* 0 - 成功
* 1 - 失败
* - 成功 0
* - 失败 1
*/
async movePartition(uid, tagid) {
const responseText = await post({
@@ -689,25 +732,36 @@ const bili_client = {
* 动态自动点赞
* @param {string} dyid
* @returns {Promise<number>}
* 0 - 成功
* 1 - 失败
* - 成功 0
* - 未知错误 1
* - 点赞异常 2
* - 点赞频繁 3
*/
async autolike(dyid) {
const responseText = await post({
url: API.DYNAMIC_LIKE_THUMB,
contents: {
uid: GlobalVar.get("myUID"),
dynamic_id: dyid,
up: 1,
csrf: GlobalVar.get("csrf")
}
});
if (/^{"code":0/.test(responseText)) {
log.info('自动点赞', '点赞成功');
return 0;
} else {
log.error('自动点赞', `点赞失败\n${responseText}`);
return 1;
const
responseText = await post({
url: API.DYNAMIC_LIKE_THUMB,
contents: {
uid: GlobalVar.get("myUID"),
dynamic_id: dyid,
up: 1,
csrf: GlobalVar.get("csrf")
}
}),
res = strToJson(responseText);
switch (res.code) {
case 0:
log.info('自动点赞', '点赞成功');
return 0;
case 1000113:
log.warn('自动点赞', '点赞异常');
return 2;
case 1000001:
log.warn('自动点赞', '点赞频繁');
return 3;
default:
log.error('自动点赞', `未知错误\n${responseText}`);
return 1;
}
},
/**
@@ -719,8 +773,11 @@ const bili_client = {
* @param {string} [msg]
* 动态的ID
* @returns {Promise<number>}
* 0 - 成功
* 1 - 失败
* - 成功 0
* - 未知错误 1
* - 该动态不能转发分享 2
* - 请求数据发生错误,请刷新或稍后重试 3
* - 操作太频繁了,请稍后重试 4
*/
async autoRelay(uid, dyid, msg = '转发动态', ctrl = '[]') {
const len = msg.length;
@@ -742,18 +799,22 @@ const bili_client = {
}
}),
res = strToJson(responseText);
if (res.code === 0) {
log.info('转发动态', '成功转发一条动态');
return 0;
} else if (res.code === 1101004) {
log.warn('转发动态', '该动态不能转发分享');
return 0;
} else if (res.code === 2201116) {
log.warn('转发动态', '请求数据发生错误,请刷新或稍后重试');
return 0;
} else {
log.error('转发动态', `转发动态失败\n${responseText}`);
return 1;
switch (res.code) {
case 0:
log.info('转发动态', '成功转发一条动态');
return 0;
case 1101004:
log.warn('转发动态', '该动态不能转发分享');
return 2;
case 2201116:
log.warn('转发动态', '请求数据发生错误,请刷新或稍后重试');
return 3;
case 1101008:
log.warn('转发动态', '操作太频繁了,请稍后重试');
return 4;
default:
log.error('转发动态', `未知错误\n${responseText}`);
return 1;
}
},
/**
@@ -883,8 +944,14 @@ const bili_client = {
* 17(无图)
* @returns {Promise<number>}
* - 成功 0
* - 失败 1
* - 黑名单/评论区关闭/动态删除 -1
* - 未知错误 1
* - 动态删除 2
* - 评论区已关闭 3
* - 需要输入验证码 4
* - 已被对方拉入黑名单 5
* - 黑名单用户无法互动 6
* - UP主已关闭评论区 7
* - 评论内容包含敏感信息 8
*/
async sendChat(rid, msg, type) {
const
@@ -900,26 +967,29 @@ const bili_client = {
res = strToJson(responseText);
switch (res.code) {
case 0:
log.info('自动评论', '评论成功');
log.info('自动评论', `评论成功: ${msg}`);
return 0;
case -404:
log.error('自动评论', '原动态已删除');
return -1;
return 2;
case 12002:
log.error('自动评论', '评论区已关闭');
return -1;
return 3;
case 12015:
log.error('自动评论', '需要输入验证码');
return 1;
return 4;
case 12035:
log.error('自动评论', `已被对方拉入黑名单`);
return -1;
return 5;
case 12053:
log.error('自动评论', '黑名单用户无法互动');
return -1;
return 6;
case 12061:
log.error('自动评论', 'UP主已关闭评论区');
return -1;
return 7;
case 12016:
log.error('自动评论', '评论内容包含敏感信息');
return 8;
default:
log.error('自动评论', `未知错误\n${responseText}`);
return 1;
+54 -43
View File
@@ -2,13 +2,25 @@ const { send } = require('./net/http')
const { strToJson, download, try_for_each } = require('./utils')
const { version, checkVersion, log } = require('./utils')
const
platform = new Map([
['win32', 'win'],
['linux', 'linux'],
['darwin', 'macos']
]).get(process.platform),
arch = new Map([
['x64', 'x64'],
['arm', 'armv7'],
['arm64', 'arm64']
]).get(process.arch);
/**
* 获取下载链接
* @param {string} owner
* @param {string} repo
* @returns {Promise<{ download_url: string[], text: string }>}
* @returns {Promise<{ tag_name:string, assets:Object, text:string }>}
*/
function getLatestReleaseDownloadUrl(owner, repo) {
function getLatestRelease(owner, repo) {
return new Promise((resolve, reject) => {
send({
url: `https://api.github.com/repos/${owner}/${repo}/releases/latest`,
@@ -19,37 +31,9 @@ function getLatestReleaseDownloadUrl(owner, repo) {
retry: false
},
success: ({ body }) => {
const { tag_name, assets, body: text } = strToJson(body)
if (tag_name) {
if (checkVersion(version) < checkVersion(tag_name)) {
const platform = new Map([
['win32', 'win'],
['linux', 'linux'],
['darwin', 'macos']
]).get(process.platform)
const arch = new Map([
['x64', 'x64'],
['arm', 'armv7'],
['arm64', 'arm64']
]).get(process.arch)
if (platform && arch) {
try {
const download_url = assets
.filter(({ name }) => name.includes(platform) && name.includes(arch))
.map(({ browser_download_url }) => browser_download_url)
if (!download_url.length) {
reject(`未找到能在此平台(${process.platform})-(${process.arch})上运行的版本`)
}
resolve({ download_url, text })
} catch (err) {
reject(err)
}
} else {
reject(`未找到能在此平台(${process.platform})-(${process.arch})上运行的版本`)
}
} else {
reject('当前已是最新版本')
}
const release = strToJson(body);
if (release.tag_name) {
resolve(release)
} else {
reject(body)
}
@@ -61,21 +45,48 @@ function getLatestReleaseDownloadUrl(owner, repo) {
});
}
/**
* @param {string} releases
* @return {boolean}
*/
function checkPlatform(releases) {
return releases.includes(platform)
&& releases.includes(arch)
}
/**
* 半自动更新
*/
async function update() {
try {
const { download_url, text } = await getLatestReleaseDownloadUrl('shanmiteko', 'LotteryAutoScript')
await try_for_each(download_url.entries(), async ([i, url]) => {
let proxy_url = new URL(url)
proxy_url.host = 'download.fastgit.org'
await download(proxy_url.href, `latest_version${i}.zip`)
return false
})
log.info('自动下载', '成功下载到当前目录')
log.info('更新说明', '\n' + text + '\n')
const { tag_name, assets, body: text } = await getLatestRelease('shanmiteko', 'LotteryAutoScript')
if (checkVersion(version) < checkVersion(tag_name)) {
const download_url = assets
.filter(({ name }) => checkPlatform(name))
.map(({ browser_download_url }) => browser_download_url)
if (download_url.length) {
const proxy_host = ['download.fastgit.org']
await try_for_each(download_url.entries(), async ([i, url]) => {
let proxy_url = new URL(url)
proxy_url.host = proxy_host[0]
log.warn('自动下载', `切换代理${proxy_host[0]}`)
await download(proxy_url.href, `latest_version${i}.zip`)
.catch(async err => {
log.error('自动下载', err)
proxy_url.host = 'github.com'
log.warn('自动下载', `使用原始链接github.com`)
await download(proxy_url.href, `latest_version${i}.zip`)
})
return false
})
log.info('自动下载', '成功下载到当前目录')
log.info('更新说明', '\n' + text + '\n')
} else {
throw `未找到能在此平台(${process.platform})-(${process.arch})上运行的版本,建议以源码运行`
}
} else {
throw '当前已是最新版本'
}
} catch (error) {
log.error('更新脚本', error)
}
+101 -24
View File
@@ -13,6 +13,8 @@ const utils = {
env_file: path.join(process.cwd(), "env.js"),
/**配置文件 */
config_file: path.join(process.cwd(), "my_config.js"),
/**dyids存放目录 */
dyids_dir: path.join(process.cwd(), "dyids"),
/**dyid长度 */
dyid_length: 18,
/**
@@ -57,6 +59,25 @@ const utils = {
if (await fn(item)) break
}
},
/**
* @template T
* @param {number} max_times
* @param {Array<T>} unexpected
* @param {() => Promise<T>} fn
*/
async retryfn(max_times, unexpected, fn) {
let ret = null;
for (let times = 0; times < max_times; times++) {
ret = await fn()
if (unexpected.includes(ret)) {
utils.log.warn('自动重试', `将在 ${times + 1} 分钟后再次尝试(${times + 1}/${max_times})`)
await utils.delay(60 * 1000 * (times + 1))
} else {
break
}
}
return ret;
},
/**
* 函数柯里化
* @template T
@@ -82,11 +103,7 @@ const utils = {
*/
delay(time = 1000) {
utils.log.info('时延', `${~~time}ms`);
return new Promise(resolve => {
setTimeout(() => {
resolve();
}, time);
});
return new Promise(resolve => setTimeout(resolve, time));
},
/**
* 计数器 0..Infinity
@@ -164,13 +181,19 @@ const utils = {
},
/**日志 */
log: {
level: 3,
_level: 3,
_colors: [
chalk.hex('#64B3FF'), chalk.grey, chalk.hex('#FFA500'),
chalk.hex('#0070BB'), chalk.hex('#48BB31'), chalk.hex('#BBBB23'), chalk.hex('#FF0006')
],
_iso_time: () => new Date(Date.now() + 288e5).toISOString().slice(0, -1) + '+08'
,
/**
* 初始化默认level为3
*/
init() {
let _level = Number(process.env.LOTTERY_LOG_LEVEL);
this.level = isNaN(_level) ? 3 : _level;
this._level = isNaN(_level) ? 3 : _level;
},
/**
* @param {String|Array<String>} msg
@@ -190,26 +213,36 @@ const utils = {
const
colors = ['red', 'yellow', 'green', 'cyan', 'blue', 'magenta'],
colorsCount = colors.length;
this.proPrint(msg.map(it => it.split('').map((l, i) => chalk[colors[i % colorsCount]](l)).join('')), '\n')
},
/**
* @param {number} done
* @param {number} total
* @param {number} size
*/
progress_bar(done, total, size = 30) {
let perc = done >= total ? 1 : done / total,
bar = ~~(perc * size),
status_bar = `\r[${"=".repeat(bar) + ">" + " ".repeat(size - bar)}] ${(perc * 100 + ' ').slice(0, 4)}%`
process.stdout.write(status_bar)
},
debug(context, msg) {
if (this.level > 3) {
if (this._level > 3) {
if (msg instanceof Object) msg = JSON.stringify(msg, null, 4);
this.proPrint([chalk.hex('#64B3FF')(`[${new Date(Date.now() + 288e5).toISOString()}]`), chalk.grey("[Debug]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#0070BB')(`[\n${msg}\n]`)])
this.proPrint([this._colors[0](`[${this._iso_time()}]`), this._colors[1]("[Debug]"), this._colors[2](`[${context}]`), this._colors[3](`[\n${msg}\n]`)])
}
},
info(context, msg) {
if (this.level > 2)
this.proPrint([chalk.hex('#64B3FF')(`[${new Date(Date.now() + 288e5).toISOString()}]`), chalk.grey("[Info]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#48BB31')(`[${msg}]`)])
if (this._level > 2)
this.proPrint([this._colors[0](`[${this._iso_time()}]`), this._colors[1]("[Info]"), this._colors[2](`[${context}]`), this._colors[4](`[${msg}]`)])
},
warn(context, msg) {
if (this.level > 1)
this.proPrint([chalk.hex('#64B3FF')(`[${new Date(Date.now() + 288e5).toISOString()}]`), chalk.grey("[Warn]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#BBBB23')(`[\n${msg}\n]`)])
if (this._level > 1)
this.proPrint([this._colors[0](`[${this._iso_time()}]`), this._colors[1]("[Warn]"), this._colors[2](`[${context}]`), this._colors[5](`[\n${msg}\n]`)])
},
error(context, msg) {
if (this.level > 0)
this.proPrint([chalk.hex('#64B3FF')(`[${new Date(Date.now() + 288e5).toISOString()}]`), chalk.grey("[Error]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#FF0006')(`[\n${msg}\n]`)])
if (this._level > 0)
this.proPrint([this._colors[0](`[${this._iso_time()}]`), this._colors[1]("[Error]"), this._colors[2](`[${context}]`), this._colors[6](`[\n${msg}\n]`)])
}
},
/**
@@ -227,12 +260,13 @@ const utils = {
redirect: true,
retry: false
},
success: ({ resStream }) => {
success: ({ headers, resStream }) => {
const total_len = Number(headers["content-length"]) || 16000000;
let recv_length = 0;
const wtbs = fs.createWriteStream(file_name);
resStream.on('data', chuck => {
recv_length += chuck.length
utils.log.proPrint(`已收到:${recv_length} Bytes`)
utils.log.progress_bar(recv_length, total_len)
})
resStream.pipe(wtbs)
wtbs.on('finish', () => {
@@ -240,7 +274,7 @@ const utils = {
resolve()
}).on('error', error => {
wtbs.destroy()
resolve(error)
reject(error)
})
},
failure: error => {
@@ -257,11 +291,9 @@ const utils = {
return new Promise((resolve) => {
send({
method: 'GET',
url: 'https://gitee.com/shanmite/lottery-notice/raw/master/notice.json',
url: 'https://gitlab.com/shanmiteko/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',
accept: 'text/plain; charset=utf-8',
referer: 'https://gitee.com/shanmite/lottery-notice/blob/master/notice.json',
},
success: res => {
try {
@@ -269,12 +301,13 @@ const utils = {
if (body.node_msg) utils.log.info('公告', '\n' + body.node_msg + '\n');
resolve(body.config)
} catch (error) {
resolve(JSON.parse('{}'))
utils.log.error('获取远程设置', '获取远程设置错误: ' + error);
resolve({})
}
},
failure: err => {
utils.log.error('获取远程设置', '获取远程设置错误: ' + err);
resolve(JSON.parse('{}'));
resolve({})
}
})
})
@@ -306,6 +339,50 @@ const utils = {
resolve()
})
});
},
/**
* CreateFile
* @param {string} filepath 相对于dyids的文件路径
* @param {string} [defaultValue] 写入默认值
* @param {string} flag
* @returns {Promise<void>}
*/
createFile(filepath, defaultValue, flag) {
const fpath = path.join(utils.dyids_dir, filepath);
const buffer = Buffer.from(defaultValue);
return new Promise((resolve, rejects) => {
fs.open(fpath, flag, (err, fd) => {
if (err) {
rejects(err)
} else {
fs.write(fd, buffer, 0, buffer.length, 0, err => {
if (err) {
rejects(err)
} else {
resolve();
}
})
}
})
});
},
/**
* 读取dyid文件
* @param {number} num
* @returns {fs.ReadStream}
*/
readDyidFile(num) {
const fpath = num < 2 ? path.join(utils.dyids_dir, 'dyid.txt') : path.join(utils.dyids_dir, `dyid${num}.txt`);
return fs.createReadStream(fpath, { encoding: 'utf8', highWaterMark: (utils.dyid_length + 1) * 1000 })
},
/**
* 追加dyid
* @param {number} num
* @returns {fs.WriteStream}
*/
writeDyidFile(num) {
const fpath = num < 2 ? path.join(utils.dyids_dir, 'dyid.txt') : path.join(utils.dyids_dir, `dyid${num}.txt`);
return fs.createWriteStream(fpath, { flags: 'a' })
}
};
+7 -7
View File
@@ -10,8 +10,7 @@ const metainfo = [
` __/ | | | `,
` |___/ |_| `,
` `,
` Verison: v${ve}`,
` Written By shanmite`,
` This: v${ve} Nodejs: ${process.version} Written By shanmite`,
]
/**多账号存储 */
let multiple_account = [];
@@ -22,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
@@ -34,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
@@ -46,7 +46,7 @@ async function main() {
process.env.ENABLE_MULTIPLE_ACCOUNT = ENABLE_MULTIPLE_ACCOUNT;
} else if (COOKIE) {
const global_var = require("./lib/data/global_var");
await global_var.init(COOKIE, Number(NUMBER));
await global_var.init(COOKIE, NUMBER);
/**引入基础功能 */
const { start, isMe, clear, update, checkCookie } = require("./lib/index");
@@ -61,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();
await isMe(NUMBER, NOTE);
break;
case 'clear':
if (CLEAR) {
@@ -89,7 +89,7 @@ async function main() {
}
} else {
log.error('Cookie已失效', '切换账号时不要点击退出账号而应直接删除Cookie退出')
return ''
return
}
} else {
return '请查看README文件, 在env.js指定位置填入cookie'
+64 -6
View File
@@ -48,7 +48,7 @@ module.exports = Object.freeze({
* API传回数据类型 {RespondBody}
* 获取抽奖信息的链接字符串
* @example
* "https://raw.fastgit.org/spiritLHL/sync_lottery/master/archive_datas/datas.json"
* "https://github.com/spiritLHL/sync_lottery"
*/
APIs: [],
@@ -63,8 +63,8 @@ module.exports = Object.freeze({
* 符合js正则表达式的字符串
*/
key_words: [
"[抽奖]",
"[转关].*[转关]"
"[抽奖送揪]|福利",
"[转关评粉]|参与"
],
/**
@@ -83,6 +83,36 @@ module.exports = Object.freeze({
*/
chatmodel: '01',
/**
* 检查是否重复转发
* - 不检查 -1
* - 通过是否点赞判断 0
* - 检索本地dyids文件 1
* - 通过是否点赞判断+检索本地dyids文件 2
*/
check_if_duplicated: 1,
/**
* 偷塔模式不检查是否重复转发
* * 偷塔模式: 临近开奖时参与抽奖
*/
sneaktower: true,
/**
* 屏蔽动态类型
*
* | 动态类型 | type值 |
* | :------- |:----- |
* | 转发 | `1` |
* | 含图片 | `2` |
* | 无图纯文字 | `4` |
* | 视频 | `8` |
* | 番剧 | `512` |
* | 活动 | `2048` |
* | 专栏 | `64` |
*/
block_dynamic_type: [0],
/**
* - 动态创建时间
* - 多少天前
@@ -235,23 +265,39 @@ module.exports = Object.freeze({
at_users: [['转发抽奖娘', 294887687], ['你的工具人老公', 100680137]],
/**
* - 自动同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
* - 动态dyid或UID
* - 英文逗号分隔 如: 1,2,3
*/
blacklist: '',
/**
* - 自动同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
* - 使用公共黑名单
*/
use_public_blacklist: true,
/**
* 屏蔽词
*/
blockword: ["脚本抽奖", "恭喜", "结果", "抽奖号", "钓鱼", "涨粉"],
blockword: ["脚本", "抽奖号", "钓鱼"],
/**
* 转发并评论
* - 评论内容与转发内容相同
*/
is_repost_then_chat: false,
/**
* 转发评语
* 支持变量${uname}
*/
relay: ['转发动态'],
/**
* 评论内容
* 支持变量${uname}
* @example
* "祝${uname}早日百大!"
*/
chat: [
'[OK]', '[星星眼]', '[歪嘴]', '[喜欢]', '[偷笑]', '[笑]', '[喜极而泣]', '[辣眼睛]', '[吃瓜]', '[奋斗]',
@@ -272,6 +318,11 @@ module.exports = Object.freeze({
*/
is_exception: false,
/**
* 是否关注已达上限
*/
is_outof_maxfollow: false,
/**
* - 中奖通知关键词(满足一个就推送)
* - 符合js正则表达式的字符串
@@ -280,9 +331,16 @@ module.exports = Object.freeze({
*/
notice_key_words: [
"~预约成功|预约主题",
"中奖|获得|填写|写上|提供|收货地址|支付宝账号|码|大会员"
"中奖|获得|填写|写上|提供|收货地址|支付宝账号|码|大会员",
"~你的账号在新设备或平台登录成功",
"~你预约的直播已开始"
],
/**
* 是否发送运行状态通知
*/
notice_running_state: false,
/**
* - 获取私信页数
*/
+4 -3
View File
@@ -1,6 +1,6 @@
{
"name": "lottery-auto-script",
"version": "2.3.7",
"version": "2.5.5",
"description": "自动参与B站动态抽奖",
"main": "main.js",
"scripts": {
@@ -8,7 +8,8 @@
"clear": "node main.js clear",
"check": "node main.js check",
"update": "node main.js update",
"build_all": "bash script/build/pkg.sh"
"build_all": "bash script/build/pkg.sh",
"changelog": "bash script/build/changelog.sh"
},
"files": [
"lib",
@@ -53,4 +54,4 @@
"chalk": "^4.1.2",
"nodemailer": "^6.7.0"
}
}
}
+39
View File
@@ -0,0 +1,39 @@
#!/usr/bin/env bash
# version: <major.minor.patch>
level=patch
npm version $level \
--no-commit-hooks \
--no-git-tag-version
OLD_VERSION_ARRAY=($(npm view lottery-auto-script version | tr '.' ' '))
major=${OLD_VERSION_ARRAY[0]}
minor=${OLD_VERSION_ARRAY[1]}
patch=${OLD_VERSION_ARRAY[2]}
case "${level}" in
"major")
((major += 1))
minor=0
patch=0
;;
"minor")
((minor += 1))
patch=0
;;
*)
((patch += 1))
;;
esac
NEW_VERSION="$major.$minor.$patch"
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
git add .
git commit -m "docs: 更新CHANGELOG"
+6 -3
View File
@@ -35,13 +35,16 @@ for file in "$TARGET_DIR/"*; do
for item in "${BATS[@]}"; do
create_win_bat "${item}" >"$TMPDIR/$item.bat"
done
mv "$TMPDIR/$BIN_NAME" "$TMPDIR/$BIN_NAME.exe"
else
ZIP_NAME=latest_version0
cat >"$TMPDIR/update.sh" <<-EOF
#!/bin/bash
./lottery update
if [[ -r "latest_version.zip" ]]; then
unzip latest_version.zip
rm latest_version0.zip
ZIP_NAME=$ZIP_NAME
if [[ -r "\$ZIP_NAME.zip" ]]; then
unzip \$ZIP_NAME.zip
rm \$ZIP_NAME.zip
chmod u+x lottery
fi
EOF