1
0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-06-30 11:53:25 +00:00

Compare commits

...

891 Commits

Author SHA1 Message Date
4aeba55550 upload to dist 2021-03-27 12:45:56 +08:00
2b3842e61c use goreleaser 2021-03-26 23:52:09 +08:00
65ed6e89a7 remove webui config. 2021-03-26 16:34:22 +08:00
931a720692 fix conflict of password encryption and qrcode login. 2021-03-26 16:03:00 +08:00
e98e4eef8c another way to get version 2021-03-25 23:33:11 +08:00
03c3af14aa feat: self private message. 2021-03-24 18:46:36 +08:00
372ad1e94f update MiraiGo. 2021-03-24 18:45:34 +08:00
b6878f1bf9 add: private message event target id field. 2021-03-24 18:42:08 +08:00
6bb1939f90 Merge pull request #751 from wdvxdr1123/dev.contributing
add CONTRIBUTING.md
2021-03-23 08:37:56 +08:00
f020436c51 add CONTRIBUTING.md
添加贡献指南
2021-03-21 22:16:45 +08:00
b273a4fc54 Merge pull request #750 from StarHeartHunt/patch-1
Typo
2021-03-21 21:14:46 +08:00
0d3e772d76 Typo 2021-03-21 21:07:26 +08:00
e0a551cea2 feat: qrcode login & remove admin api. 2021-03-21 19:37:14 +08:00
c51e603337 Merge branch 'master' into dev 2021-03-21 15:07:44 +08:00
7528898565 Merge pull request #730 from sam01101/patch-1
引导有问题的用户优先查看帮助
2021-03-21 14:52:21 +08:00
0d35c423d1 Merge branch 'master' into dev 2021-03-20 21:36:23 +08:00
067fa37723 Merge branch 'master' into patch-1 2021-03-20 03:12:46 +08:00
5d61a254e6 fix lock 2021-03-19 22:17:31 +08:00
ee3e47bb53 ci(issuebot): enable recheck on edit (#743) 2021-03-19 20:20:52 +08:00
30a80ee53c Merge pull request #742 from Afanyiyu/patch-1
Remove Duplicate 获取中文分词
2021-03-19 14:59:58 +08:00
e03bc433c5 Merge pull request #736 from sam01101/patch-2
Create feat--.md
2021-03-19 14:28:04 +08:00
6581cac208 Remove Duplicate 获取中文分词 2021-03-19 14:16:04 +08:00
3301077c46 websocket read with buffer pool 2021-03-18 22:32:54 +08:00
44cf145b28 Create feat--.md 2021-03-18 10:47:40 +08:00
5e52cecd71 ci: pr suggest 2021-03-17 23:53:17 +08:00
ec965a9eb7 ci(chore): Fix stylings 2021-03-17 14:44:57 +00:00
c43cb5d0f5 ci: auto fix 2021-03-17 22:39:18 +08:00
dd47ebe5dc update README.md 2021-03-17 21:46:08 +08:00
bf09ce7268 only marshal once 2021-03-17 19:52:08 +08:00
41a67ca012 switch to buffer pool 2021-03-17 17:26:28 +08:00
fb483e4e4f Redirect users with problem to the answer they need
他使我的灵魂苏醒,为自己的名引导我走义路。 (诗篇23:3)
2021-03-17 15:16:50 +08:00
125100ead2 Merge pull request #729 from fossabot/add-license-scan-badge
Add license scan report and status
2021-03-17 13:29:37 +08:00
fa83ae22f3 Add license scan report and status
Signed off by: fossabot <badges@fossa.com>
2021-03-16 22:24:27 -07:00
ad260f6217 update go-silk
support darwin arm64
2021-03-17 13:19:47 +08:00
965c5377eb Merge pull request #713 from scjtqs/origin/dev
添加cli命令行 -c 指定加载配置文件
2021-03-17 10:33:59 +08:00
13b71965ae 解决 lint问题 2021-03-16 22:01:19 +08:00
9c93ccb37b 解决 lint 问题 2021-03-16 22:01:07 +08:00
2f536c42f8 调整 注释 2021-03-16 21:56:05 +08:00
373127b799 goimport 2021-03-16 21:42:53 +08:00
7818603f39 Merge branch 'dev' of https://github.com/Mrs4s/go-cqhttp into origin/dev
# Conflicts:
#	main.go
#	server/daemon.go
2021-03-16 21:26:47 +08:00
91bd57f98b Merge branch 'origin/dev' of https://github.com/scjtqs/go-cqhttp into origin/dev 2021-03-16 20:51:31 +08:00
a08c7d81ea Merge pull request #724 from wdvxdr1123/dev.golangci
ci: update golangci-lint
2021-03-16 16:14:46 +08:00
b823827d61 fix: pre alloc 2021-03-16 14:00:18 +08:00
ee73fca2ce ci: update golangci-lint
fix golint
update golangci-lint
2021-03-16 13:33:55 +08:00
3200ac2b5f Merge pull request #718 from sam01101/dev
Fixes #717
2021-03-14 21:06:32 +08:00
Sam
2febee01d9 Fixes #717 2021-03-13 13:24:21 +08:00
678e5023cc 添加cli命令行 -c 指定加载配置文件 2021-03-12 17:36:15 +08:00
ee91df70b2 Merge pull request #707 from scjtqs/origin/dev
对cli命令行提供了一些标准化功能 例如 daemon
2021-03-10 21:12:28 +08:00
2e5f33fb08 对新增函数 添加注释 2021-03-10 21:10:43 +08:00
eee0484894 daemon 后台服务 简单实现 2021-03-10 16:51:38 +08:00
dcd0bfc5e0 daemon test 2021-03-10 16:12:10 +08:00
5049a8f697 Merge pull request #697 from povsister/ldflags-typo
Fix a comment typo
2021-03-09 16:11:39 +08:00
c0260bc82d update MiraiGo. 2021-03-09 16:07:29 +08:00
8185c4cdf1 fix typo 2021-03-08 22:32:15 +08:00
0bcd16b252 Merge pull request #702 from sam01101/dev
限制 handle_quick_op... 的 at_sender 使用场景
2021-03-08 08:35:17 +08:00
Sam
b2738d909b 限制 handle_quick_op... 的 at_sender 使用场景, Closes #701 2021-03-06 20:31:58 +08:00
95f2227898 Merge pull request #698 from sam01101/dev
Fix bug
2021-03-05 19:59:59 +08:00
cdb700c92f update MiraiGo. 2021-03-05 19:03:09 +08:00
Sam
626de1cb17 Closes #556 2021-03-05 17:34:21 +08:00
bfc3958f34 Fix a comment typo 2021-03-05 12:57:07 +08:00
9a2b69ccf0 Merge branch 'dev' of https://github.com/Mrs4s/go-cqhttp into dev 2021-03-04 19:49:32 +08:00
5854f51506 update MiraiGo. 2021-03-04 19:49:19 +08:00
cf5d3cef95 Merge pull request #696 from sam01101/dev
临时会话添加Group字段, Fixes #695
2021-03-04 16:36:24 +08:00
6864dc449b more memory usage. 2021-03-04 16:16:54 +08:00
b781c3b43b [temp_msg] Changed gorup_id to sender list 2021-03-04 16:11:41 +08:00
e36a9a95c5 update MiraiGo. 2021-03-04 16:09:10 +08:00
Sam
a639b60155 临时会话添加Group字段, Fixes #695 2021-03-04 15:13:22 +08:00
77e0363e32 update. 2021-03-04 11:13:33 +08:00
5d0d8f3908 update MiraiGo. fix #689 2021-03-04 09:07:07 +08:00
a90af94eda feat enable_self_message config. 2021-03-03 19:14:24 +08:00
93da16897a feat double click check. 2021-03-03 19:01:40 +08:00
604a05b625 fix first-run log cannot be formatted. 2021-03-03 18:51:53 +08:00
af9e130273 update MiraiGo & fix #352 again. 2021-03-03 00:41:20 +08:00
3719ef1fe8 Merge pull request #686 from sam01101/dev
修复bug&更正代码
2021-03-03 00:10:10 +08:00
Sam
45102614b8 多项改动
修复:
- SendGroupForwardMessage 添加发送失败Handler
- 禁言逻辑修复, 可以进行30(整)天的禁言
- 添加无法撤回临时信息Handling
- 临时会话发送与接收信息入库 (暂时不能撤回信息, Fixes #495)
更改:
- 临时会话中的变量改名 (code -> groupId)
- 警告信息添加空格 (见cqcode.go)
- 更新文档: 添加seq说明, 缩短某个网址, 添加某个CQcode定义的导向
添加:
- 为自定义reply添加seq选项让信息更具真实性
- 添加删除好友处理 (https://github.com/Mrs4s/MiraiGo/pull/129, Fixes #374)
2021-03-02 04:55:37 +08:00
b385ed20b5 fix group message event panic. 2021-03-01 20:11:05 +08:00
ca826f67b3 fix event error. 2021-03-01 20:05:10 +08:00
49a6cfd50a Merge pull request #685 from xiangxiangxiong9/dev
Repair: 获取群信息却返回了群列表
2021-03-01 15:59:55 +08:00
d2fb26da10 Repair: 获取群信息却返回了群列表 2021-03-01 10:57:34 +08:00
80517e25ad update MiraiGo. fix #352 2021-03-01 09:29:59 +08:00
d4e2e2fb69 Merge pull request #683 from wdvxdr1123/patch/refactor
refactor: 将http,ws的api调用统一
2021-02-28 20:25:31 +08:00
f86bb69536 Merge branch 'master' into dev 2021-02-28 20:24:00 +08:00
a0d4dfd0eb fix exist 2021-02-28 16:48:21 +08:00
8ef877777d refactor: 将http,ws的api调用统一
方便以后添加接口,添加中间件
2021-02-28 16:39:16 +08:00
b7991fc229 Merge pull request #677 from wfjsw/ci-cd/issuebot
ci-cd/issuebot
2021-02-27 19:56:42 +08:00
5b24492702 enable issuebot 2021-02-27 19:55:02 +08:00
e88854a058 Merge pull request #675 from sam01101/patch-1
Make issue better
2021-02-27 14:17:37 +08:00
52a0061360 config.md -> config.yml
对不起我忘记改名了
2021-02-26 23:33:04 +08:00
dd13fe6847 Added issue template config.md
- 关闭可以提交空白issue的功能
- 引导用户前往Discussions发布信息
2021-02-26 23:29:33 +08:00
3bb3000e79 Added more detail on issue template bug.md 2021-02-26 23:27:51 +08:00
550e8d3531 Merge pull request #660 from wdvxdr1123/patch/cqcode_fast
Accelerate cqcode again!
2021-02-22 17:43:10 +08:00
42e5b0564c fast!!!
goos: windows
goarch: amd64
pkg: github.com/Mrs4s/go-cqhttp/coolq
cpu: Intel(R) Core(TM) i5-9300H CPU @ 2.40GHz
BenchmarkCQBot_ConvertStringMessage-8             963939              1205 ns/op             368 B/op         11 allocs/op
PASS
ok      github.com/Mrs4s/go-cqhttp/coolq        1.764s
2021-02-22 16:36:24 +08:00
62024a4403 ci: trimpath! 2021-02-22 16:16:50 +08:00
65112f8752 Merge pull request #659 from wdvxdr1123/patch/cqcode_fast
 Speed up cqcode parsing
2021-02-21 23:42:21 +08:00
36c0aaae6b fix golint 2021-02-21 22:48:57 +08:00
976f2233b4 Speed up cqcode parsing
BenchmarkCQBot_ConvertStringMessage-8             232700              4743 ns/op            2672 B/op         65 allocs/op
BenchmarkCQBot_ConvertStringMessage2-8            752025              1643 ns/op            1376 B/op         17 allocs/op
2021-02-21 22:43:12 +08:00
f1a1b0ec30 Merge pull request #657 from Akegarasu/develop
add cardimage brief support #478
2021-02-21 19:28:01 +08:00
3cc0453958 add cardimage brief support #478 2021-02-20 20:45:45 +08:00
fff33e304c fix atall permission error. 2021-02-20 18:50:34 +08:00
977ee0c859 update MiraiGo. fix #649 2021-02-20 18:44:14 +08:00
4021f95c24 change self message event type. 2021-02-20 14:23:45 +08:00
b1ca827187 feat self group message event. 2021-02-19 21:04:34 +08:00
c1a36caa99 Merge branch 'dev' 2021-02-19 20:48:06 +08:00
e9b6e477f1 Merge pull request #652 from YumeMichi/patch-1
去掉无用的登录错误提示
2021-02-19 20:46:18 +08:00
6d0a6c137d Merge pull request #650 from qianjunakasumi/master
修复新建 Issue 引用问题 #632
2021-02-19 20:44:25 +08:00
69703f560f Merge pull request #635 from nnnewb/pr/get-version-info
onebot get_version_info 字段兼容
2021-02-19 20:43:35 +08:00
580a5feabf fix comment. 2021-02-19 18:14:51 +08:00
5db56b99c6 add darwin_arm64 ci build. 2021-02-19 18:09:03 +08:00
e56a297437 fix darwin_arm64 build. 2021-02-19 18:02:50 +08:00
f9d1cf93a2 update to go 1.16. 2021-02-19 17:28:51 +08:00
916c79d2cf update MiraiGo. fix 582. 2021-02-19 17:15:22 +08:00
1dcfa0d025 Merge branch 'master' into dev 2021-02-19 17:13:25 +08:00
d2be362f84 Remove unnecessary logs 2021-02-19 12:18:39 +08:00
a0cdf2c410 缩短下 URL 2021-02-19 00:40:37 +08:00
8f8529af9e 修复新建 Issue 引用问题 2021-02-19 00:38:09 +08:00
0afbe3d64a Merge branch 'dev' of https://github.com/Mrs4s/go-cqhttp into pr/get-version-info 2021-02-18 21:13:13 +08:00
3851a60869 Merge pull request #628 from Yukari316/master
fix typo
2021-02-18 14:32:59 +08:00
a9fb84eb47 Merge pull request #641 from ishkong/patch-5
🍻 Make admin/do_web_write support more input
2021-02-18 14:32:32 +08:00
56f648aaca Merge branch 'master' into master 2021-02-18 14:10:53 +08:00
945fbf6a2b Merge branch 'dev' into patch-5 2021-02-17 21:15:21 +08:00
185f11f6a0 Update apiAdmin.go 2021-02-17 21:04:29 +08:00
8602490711 Merge pull request #645 from Akegarasu/master
fix #638
2021-02-17 17:44:55 +08:00
a1fb629798 refresh group mem 2021-02-17 17:34:57 +08:00
396ce82baa Merge pull request #632 from qianjunakasumi/master
让更多人知道如何有效、准确地提出 Issues
2021-02-17 17:17:39 +08:00
2d90a16fbf Merge pull request #637 from nnnewb/pr/at-sender
feat: 实现快速操作中 at_sender 功能
2021-02-17 17:09:16 +08:00
afd0c8987d Merge pull request #647 from wdvxdr1123/patch/cqcode
fix cqcode
2021-02-17 17:08:04 +08:00
70a4d129c8 Merge pull request #587 from sam01101/patch-1
修复并更新文档
2021-02-17 17:05:53 +08:00
1ff9de190d fix cqcode 2021-02-17 16:04:28 +08:00
569a718dc6 fix #638 2021-02-16 18:20:18 +08:00
32771eb8b0 Merge pull request #4 from Mrs4s/master
update
2021-02-16 18:09:15 +08:00
2ce0d145e8 Merge branch 'dev' into patch-1 2021-02-16 18:06:49 +08:00
02581ff8a9 Merge pull request #624 from qianjunakasumi/dev
修复登录和重连逻辑,支持重连的验证码等处理,Fix #620
2021-02-16 17:58:15 +08:00
ee0da0a14f 新增“我已阅读提示”复选框
https://github.com/Mrs4s/go-cqhttp/pull/632#discussion_r575967478
2021-02-15 15:12:16 +08:00
71ce6f362f 🍻 Make admin/do_web_write support more input
Make admin/do_web_write support more input from web pages when logging in
2021-02-15 12:43:45 +08:00
ce30d63907 fix: fix line ending 2021-02-13 18:50:50 +08:00
19556cbab3 refactor: 略微优化下实现 2021-02-13 18:37:22 +08:00
3bfdc4d8a2 fix: 解决原本的 isAnonymous 判断错误 2021-02-13 18:24:20 +08:00
fba4819adc fix: 修复 at_sender 默认行为符合 onebot 2021-02-13 18:05:28 +08:00
e30e21e296 fix: import fmt 2021-02-13 17:34:53 +08:00
6e8ef3ef0f fix: 兼容 onebot v11 规定的 GetVersionInfo 字段 2021-02-13 17:34:45 +08:00
31cfb9283e feat: 实现 at_sender 功能 2021-02-13 17:29:29 +08:00
0e71acaf38 建议阅读《提问的智慧》 2021-02-13 00:35:01 +08:00
879cbe4f19 新增《提问的智慧》链接 2021-02-13 00:27:49 +08:00
775a210e3e 修复 GitHub Actions/ lint 的 Check failure 呜呜 2021-02-11 15:54:52 +08:00
f5bd4644fd 修复解决分支冲突时的疏忽 2021-02-11 15:44:47 +08:00
e8129a7e57 Merge branch 'dev' into dev 2021-02-11 15:34:29 +08:00
adbe194e63 Merge pull request #617 from wdvxdr1123/music_share
embed silk encoder
2021-02-11 13:54:46 +08:00
7e5b293d36 update dependency 2021-02-11 13:37:45 +08:00
8dc2349a9b rebase to upstream/dev
embed silk encoder
2021-02-11 13:27:28 +08:00
337b7fd134 Merge pull request #592 from Ink-33/dev
fix golint
2021-02-11 10:11:30 +08:00
967e79ecd1 fix typo 2021-02-10 18:51:30 +08:00
cc14be66bd 导出函数添加注释 2021-02-09 22:27:33 +08:00
667ad8fbd6 修复登录和重连逻辑,支持重连的验证码等处理,Fix #620 2021-02-09 03:58:05 +08:00
1b3842fc98 add glangci-lint to ci 2021-02-09 02:05:41 +08:00
203b68b740 fix golint 2021-02-09 01:56:26 +08:00
eaf7067196 fix errcheck 2021-02-09 01:47:48 +08:00
82bca7183d fix golint 2021-02-09 01:33:27 +08:00
13975c02df Merge remote-tracking branch 'upstream/master' into dev 2021-02-09 01:00:26 +08:00
d5c624d6f2 Merge branch 'master' of https://github.com/Mrs4s/go-cqhttp 2021-02-08 22:49:03 +08:00
3bbcdc9171 fix null pointer dereference on at. 2021-02-08 22:48:39 +08:00
c72bc3b1b0 Merge pull request #619 from ishkong/patch-4
📝 Update README.md
2021-02-08 12:23:57 +08:00
22a02542af 📝 Update README.md 2021-02-08 10:34:51 +08:00
ff75b0a2a9 update doc. 2021-02-06 21:55:32 +08:00
4a13f35003 update MiraiGo. 2021-02-06 21:46:28 +08:00
8d0a0b7f4d fix typo. 2021-02-06 19:11:24 +08:00
4c570bdfe6 feature check_url_safely. 2021-02-06 06:40:39 +08:00
d4e8a3df4f update MiraiGo. 2021-02-06 06:34:29 +08:00
307a09dd11 feature upload_group_file. 2021-02-05 22:24:49 +08:00
4445af6ff2 update MiraiGo. 2021-02-05 21:46:25 +08:00
7b71cd9219 Shorten url
update comment
2021-02-05 02:22:44 +08:00
d291aa02fe Merge remote-tracking branch 'upstream/dev' into dev
Update upstream
2021-02-05 00:54:51 +08:00
dbd0f85025 Merge pull request #611 from wdvxdr1123/patch/essence
feat group essence msg operate
2021-02-03 01:26:44 +08:00
0bacbde4d7 Merge branch 'dev' into patch/essence 2021-02-03 01:26:27 +08:00
c92dd39191 Merge pull request #610 from wdvxdr1123/group_info
get group info by search
2021-02-03 01:23:27 +08:00
7da1918c0c update docs 2021-02-02 23:59:00 +08:00
89d466d3e1 feat group essence msg operate 2021-02-02 23:36:05 +08:00
5b57aeb1d1 get group info by search 2021-02-02 22:12:47 +08:00
08567ec240 fix message history media. 2021-02-02 07:53:41 +08:00
08dea6dcf1 update MiraiGo. fix #604 2021-02-02 07:51:39 +08:00
252293afb9 update MiraiGo. fix #605 2021-02-02 07:22:38 +08:00
ca0b931fa4 update MiraiGo. 2021-02-02 07:13:42 +08:00
01dca0305c Merge branch 'master' into dev 2021-02-02 07:12:59 +08:00
6053918ee3 Merge branch 'dev' of https://github.com/Mrs4s/go-cqhttp into dev 2021-02-02 07:12:32 +08:00
e7547ed257 Merge pull request #601 from sam01101/patch-2
isFastStart setting appiled to config.hjson gen
2021-01-29 21:28:48 +08:00
96a036201d Move isFastStart outside 2021-01-29 15:16:31 +08:00
ccee8ac77a isFastStart setting appiled to config.hjson gen 2021-01-29 15:13:39 +08:00
ae806c53bb fix typo. 2021-01-28 20:54:38 +08:00
a9619b25bd Merge pull request #598 from wdvxdr1123/music_share
fix null json
2021-01-27 17:58:21 +08:00
69cda4e029 fix null json 2021-01-27 16:08:59 +08:00
dc18944a98 update MiraiGo. 2021-01-26 04:52:11 +08:00
717f816294 fix bugs. 2021-01-26 04:51:39 +08:00
430e734ff6 Merge pull request #591 from wdvxdr1123/music_share
simplify music share
2021-01-26 03:48:57 +08:00
21531fd70a Merge branch 'master' into dev 2021-01-26 03:47:42 +08:00
2214570c4f Merge pull request #590 from zkonge/master
增强保存密码安全性
2021-01-26 03:46:14 +08:00
18a839b699 update MiraiGo 2021-01-25 17:41:15 +08:00
23b90e288c better error 2021-01-25 17:34:23 +08:00
22c9a6728b Make golint happy 2021-01-25 17:05:51 +08:00
81ff71ee3b Merge pull request #580 from xuthus5/master
更加简明的logrus hook
2021-01-25 16:45:27 +08:00
939307efc7 upgrade dependencies 2021-01-25 15:47:11 +08:00
bf65b576f3 update docs 2021-01-25 15:27:45 +08:00
817bb0e493 simplify music share
support Kugou,Kuwo custom
2021-01-25 15:06:30 +08:00
d2529a04c9 Enhance password security
No plain password left in memory, except first run
Attacker can't verify password correctness offline
2021-01-25 05:56:27 +08:00
02446f7791 update README.md 2021-01-25 01:31:39 +08:00
cff7ac8e0b add go report card 2021-01-25 01:19:12 +08:00
6f5e582213 fix golint 2021-01-25 01:04:39 +08:00
a74c623cc1 go mod tidy 2021-01-25 01:02:59 +08:00
614109e116 fix golint 2021-01-24 19:04:05 +08:00
6d5b0e01a2 go mod tidy 2021-01-24 19:03:42 +08:00
13df58331c fix 2021-01-24 17:40:38 +08:00
61c9939f03 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	main.go
2021-01-24 17:29:26 +08:00
f6e620b412 Merge pull request #5 from Mrs4s/master
Update Upstream
2021-01-24 16:25:16 +08:00
a2a0b4c86f update doc. 2021-01-24 15:15:09 +08:00
8532c4ecbe update MiraiGo. 2021-01-24 15:04:09 +08:00
5aaade7835 Merge pull request #573 from Diving-Fish/master
fix: get gender of group member
2021-01-24 14:50:13 +08:00
3c309a8e06 update MiraiGo. fix #577 2021-01-24 14:38:21 +08:00
7c794d113f update MiraiGo. fix #586 2021-01-24 02:33:39 +08:00
c918182dec Add time arg optional tips 2021-01-24 00:20:43 +08:00
c0a813a093 修复并更新文档
我只更新了我看到的
2021-01-24 00:15:05 +08:00
61625f2e32 feature client status updated event. 2021-01-23 00:19:48 +08:00
8a81b67511 doc update. 2021-01-23 00:11:43 +08:00
164feca7c7 feature get_online_clients. 2021-01-23 00:04:57 +08:00
2ac94a7e95 update MiraiGo. 2021-01-20 23:33:25 +08:00
219005d384 fix #540. 2021-01-20 01:30:18 +08:00
e19e797aac log support print report_line 2021-01-19 22:33:05 +08:00
aa54ed5610 reset default config log_level 2021-01-19 22:17:12 +08:00
360f7188e1 local log hook 2021-01-19 22:07:28 +08:00
0002185e45 feature get_group_msg_history. 2021-01-19 12:07:06 +08:00
5480deff4b fix ua. 2021-01-19 01:59:41 +08:00
9a81b02791 Merge pull request #576 from sam01101/master
添加非破坏性(Unbreakable)功能
2021-01-19 01:54:47 +08:00
5280c68bfc Merge pull request #575 from sam01101/patch-1
Make send_group_forward_msg can use on get_msg
2021-01-19 01:31:00 +08:00
0bd5afbf21 fix #562. 2021-01-19 01:23:09 +08:00
297284f957 update MiraiGo. 2021-01-19 01:18:28 +08:00
eb618393e5 update string message 2021-01-18 23:22:46 +08:00
bdc2b03690 Added unbreakable feature
- Reply message customizable
- Forward message able to customize time

Signed-off-by: Sam <lau.sam745033858@gmail.com>
2021-01-18 23:01:54 +08:00
63d26dfdb5 Merge pull request #572 from Ink-33/dev
fix golint warning
2021-01-18 22:27:01 +08:00
7e49ed4869 Make send_group_forward_msg can use on get_msg
理论上这个是正常支持的, Fix https://github.com/Mrs4s/go-cqhttp/issues/542
2021-01-18 21:29:25 +08:00
19b6106c93 Merge pull request #1 from sam01101/dev
Dev
2021-01-18 18:52:50 +08:00
77a4f9a64f Merge branch 'dev' into dev 2021-01-17 17:40:45 +08:00
c69129f80b Merge pull request #571 from ishkong/patch-4
Try force transcoding
2021-01-17 16:59:28 +08:00
61f4e7826a fix golint 2021-01-17 16:39:01 +08:00
ddd303375d fix get gender of group member 2021-01-17 13:14:35 +08:00
46cae86442 fix get gender of group member 2021-01-17 12:48:54 +08:00
d16fd6f34d fix: golangci-lint errcheck 2021-01-17 02:52:43 +08:00
1001cefb6f fix: golangci-lint staticcheck 2021-01-17 02:46:25 +08:00
1d9f719d13 fix: golangci-lint ineffassign 2021-01-17 02:16:29 +08:00
468befb0fd update import 2021-01-17 01:48:48 +08:00
9f99b1571d fix: golangci-lint gosimple 2021-01-17 01:47:45 +08:00
77445fe96e update go.mod 2021-01-17 01:06:49 +08:00
bbd85eb219 Try force transcoding
Attempt to brute force ffmpeg transcoding after failure
2021-01-17 00:28:31 +08:00
2156b6083b update MiraiGo. 2021-01-16 06:00:33 +08:00
b47c2aeac6 Merge branch 'master' into dev 2021-01-16 05:59:31 +08:00
9beae584de Merge pull request #560 from wdvxdr1123/patch-2
fix #557
2021-01-14 02:31:34 +08:00
59cd986050 fix #561 2021-01-13 22:56:28 +08:00
7a9a021c54 fix codec path 2021-01-13 22:35:44 +08:00
de4de5052d fix #557 & remove some goto 2021-01-13 11:43:39 +08:00
b075280d2b fix build 2021-01-13 11:22:59 +08:00
4cb3d8f33e Merge pull request #559 from Ink-33/master
修复codec编译问题
2021-01-13 08:06:02 +08:00
0cd06daf08 Update github action 2021-01-13 04:05:50 +08:00
7ac31a8b76 Update github action 2021-01-13 04:00:01 +08:00
c9c6e48b8c add codec/codec_unsupported.go 2021-01-13 03:55:28 +08:00
0c3ba714f7 fix #558 2021-01-13 03:52:49 +08:00
1f7dcc4e91 fix forward img & video upload. 2021-01-13 02:58:54 +08:00
ef713bc59c fix show pic error. 2021-01-13 02:58:54 +08:00
85624d1a27 fix forward img & video upload. 2021-01-11 16:58:07 +08:00
b2d8a61a99 fix show pic error. 2021-01-11 14:36:29 +08:00
38a2c3a945 Merge pull request #550 from Ink-33/patch-1
Fix misspell
2021-01-11 00:53:32 +08:00
eaec0e545f fix thumb. 2021-01-11 00:50:50 +08:00
50f0f572bc fix multi-threading upload. 2021-01-11 00:45:49 +08:00
36532a8782 fix message. 2021-01-11 00:33:41 +08:00
620ecdbdbb update MiraiGo. 2021-01-11 00:22:59 +08:00
7737fc8457 update MiraiGo & qid support. 2021-01-10 21:30:35 +08:00
e03a989083 Fix misspell 2021-01-09 20:38:33 +08:00
56da9adeab Merge pull request #549 from wdvxdr1123/patch-2
fix file close
2021-01-09 17:56:11 +08:00
249e528457 support video cache file 2021-01-09 14:26:21 +08:00
1eeae13b4a fix file close 2021-01-09 12:23:24 +08:00
fe83ce716e update MiraiGo & fix user-agent & fix file lock. 2021-01-09 04:25:18 +08:00
a5a842a337 update MiraiGo. 2021-01-09 03:12:16 +08:00
be47ff3437 Merge pull request #548 from wdvxdr1123/patch-2
private video
2021-01-09 00:27:35 +08:00
392904f144 fix typo 2021-01-08 22:37:51 +08:00
a4c3ef8923 fix private video 2021-01-08 22:34:57 +08:00
816c142822 Merge pull request #547 from wdvxdr1123/patch-2
fix video
2021-01-08 22:18:02 +08:00
2e2002668b fix video 2021-01-08 22:14:23 +08:00
c58066e287 Merge pull request #544 from wdvxdr1123/patch-2
cq video
2021-01-08 17:38:30 +08:00
87ada9c57e update docs 2021-01-08 16:06:53 +08:00
b717e23626 feat CQ:video 2021-01-08 15:40:32 +08:00
f501b31152 encode mp4 2021-01-08 14:12:25 +08:00
2d020bc7f7 drop go-silk 2021-01-08 12:14:09 +08:00
1843bd6a4e fix reconnect loop on account banned. 2021-01-06 22:08:02 +08:00
938ebf630f update doc. 2021-01-06 21:43:55 +08:00
2bbf969cfa feature download_file. 2021-01-06 21:27:07 +08:00
416a3460ab Merge pull request #541 from wdvxdr1123/patch-2
fix reconnect
2021-01-06 21:00:21 +08:00
f98c334089 fix reconnect 2021-01-06 12:46:10 +08:00
0e5276ea4d fix ptt. 2021-01-06 02:38:21 +08:00
6113eb9200 update MiraiGo. 2021-01-06 02:36:56 +08:00
1e56c4f986 update doc. 2021-01-05 01:25:29 +08:00
9573ce1f16 update MiraiGo. 2021-01-05 01:21:12 +08:00
a02219a64f fix typo. 2021-01-05 00:57:14 +08:00
773952d6d6 update MiraiGo. 2021-01-05 00:53:24 +08:00
b8916d2570 fix message type. 2021-01-04 19:56:43 +08:00
6769421b7a Merge pull request #534 from wdvxdr1123/patch-1
fix none msg
2021-01-04 01:05:23 +08:00
4262430340 Merge pull request #535 from kokororin/patch-1
fix typo
2021-01-04 01:05:06 +08:00
d20ff4eeb2 feature multi-threading download & fix invalid file. 2021-01-04 01:04:11 +08:00
935faa1159 fix typo 2021-01-03 22:09:29 +08:00
9c81b81820 fix none msg 2021-01-03 11:08:11 +08:00
808c275f3d update MiraiGo. 2021-01-03 00:37:19 +08:00
d6fba106d3 Merge pull request #531 from ishkong/patch-3
Update API docs.
2021-01-03 00:09:53 +08:00
e25536fbe5 Update cqhttp.md 2021-01-03 00:06:01 +08:00
1de12bdcd2 Update cqhttp.md 2021-01-03 00:03:44 +08:00
f8fc023e2f Merge pull request #528 from wdvxdr1123/self-update
删除依赖getlatern/go-update
2021-01-01 19:57:01 +08:00
6c89921a87 tidy 2021-01-01 19:41:58 +08:00
cfc5d6d2ff drop getlantern/go-update 2021-01-01 19:22:37 +08:00
a6a78dfcac Merge pull request #526 from wdvxdr1123/patch/forwardmsg
支持复读转发 和 合并转发中套娃[CQ:forward]
2020-12-31 22:59:48 +08:00
5a8d918d9d feat send CQ:forward 2020-12-31 16:41:03 +08:00
ec3c2d6244 update MiraiGo. 2020-12-29 22:15:49 +08:00
c1af182732 Merge branch 'master' of https://github.com/Mrs4s/go-cqhttp 2020-12-27 22:15:41 +08:00
4c942964c7 update MiraiGo. 2020-12-27 22:15:20 +08:00
0080011f40 Merge pull request #520 from mzdluo123/patch-1
添加跳过五秒钟延时的文档
2020-12-27 19:39:36 +08:00
589fbd21df Update quick_start.md 2020-12-27 19:32:14 +08:00
97acd956f0 update doc. 2020-12-27 15:17:22 +08:00
f7144523d9 fix panic. 2020-12-27 15:06:08 +08:00
ad51264efa update. 2020-12-27 02:02:01 +08:00
9c17f501b1 update doc. 2020-12-27 01:59:01 +08:00
2baf622b83 fix silder. 2020-12-26 17:32:17 +08:00
99a68b144b feature solve silder. 2020-12-26 01:30:01 +08:00
569b89a117 fix onebot protocol. 2020-12-26 00:59:43 +08:00
690384a9a3 update MiraiGo. 2020-12-26 00:54:23 +08:00
20f2290ba4 feature set_group_anonymous_ban. 2020-12-25 23:12:29 +08:00
fc2fc3494e Merge pull request #518 from wdvxdr1123/patch/forwardmsg
forward msg套娃
2020-12-25 22:26:10 +08:00
5664567685 update MiraiGo 2020-12-25 22:24:26 +08:00
13a0a0cfd1 group forward msg套娃 2020-12-25 20:34:51 +08:00
86e98c8287 Merge pull request #517 from yanyongyu/dev
Update Readme
2020-12-25 17:29:14 +08:00
7b831cfa1e 📝 update readme 2020-12-25 14:18:37 +08:00
05f2503631 Merge pull request #516 from ishkong/patch-1
update doc.
2020-12-24 21:42:17 +08:00
e398dc2e02 Update README.md 2020-12-24 20:32:00 +08:00
4b32b30f89 update doc. 2020-12-24 20:26:40 +08:00
17ea1e54bd add user group. 2020-12-20 22:30:46 +08:00
68a41d4543 Merge pull request #509 from wdvxdr1123/patch/ios
websocket not found method fix#508
2020-12-20 19:21:09 +08:00
73774681af fix lock 2020-12-20 19:14:42 +08:00
f258b010b9 websocket not found method 2020-12-20 19:11:19 +08:00
a1e19bb66e update MiraiGo. 2020-12-20 13:01:55 +08:00
e32137ceeb update MiraiGo. 2020-12-19 02:10:57 +08:00
9dc519ff77 feature fix url & update doc. 2020-12-19 02:09:36 +08:00
3d5cec13d0 update doc. 2020-12-18 23:56:27 +08:00
6ea4bd829e fix issue of get_msg image url empty. #503 2020-12-18 23:47:49 +08:00
6e3501a6f8 fix #501. 2020-12-18 09:10:09 +08:00
289b96f187 update raw. 2020-12-18 08:57:41 +08:00
aa77810491 support old coolq data path. #499 2020-12-17 08:12:57 +08:00
474de6ad3d feature get_group_at_all_remain. 2020-12-16 20:35:15 +08:00
cbbe196f26 update MiraiGo. 2020-12-15 23:48:26 +08:00
00783380b7 update ISSUE_TEMPLATE. 2020-12-14 16:51:16 +08:00
4ef476cb67 update MiraiGo. 2020-12-14 16:44:43 +08:00
d50442b85f update MiraiGo. 2020-12-12 22:16:35 +08:00
370e08ad7e update MiraiGo. 2020-12-12 21:44:39 +08:00
627924fbf9 Merge branch 'master' into dev 2020-12-12 21:29:19 +08:00
c492465480 Merge pull request #487 from Ink-33/dev
Fix #486
2020-12-12 21:20:01 +08:00
d84b7c423a [Break Change]feature: key entry without echoing
Remove unexpected "CR" & "LF" while scaning key. This will cause the previous encrypted password unusable.
2020-12-11 23:44:24 +08:00
1af61737dc Merge pull request #480 from wdvxdr1123/patch/ios
fix ios record
2020-12-11 07:54:58 +08:00
f789609a23 fix ios record 2020-12-10 22:28:09 +08:00
9a4b284559 update MiraiGo. 2020-12-10 02:05:09 +08:00
37abe25cd6 update MiraiGo. 2020-12-10 02:01:44 +08:00
e8e78b596d Merge branch 'dev' of https://github.com/Mrs4s/go-cqhttp into dev 2020-12-10 01:32:31 +08:00
054ad47da9 feature auto fragment. 2020-12-10 01:32:08 +08:00
e694e8b482 support event recover. 2020-12-09 14:24:39 +08:00
d07e1ee77a Merge branch 'master' into dev. 2020-12-09 14:18:41 +08:00
818cecc279 Merge pull request #461 from wdvxdr1123/patch/eventfilter 2020-12-08 22:51:18 +08:00
950011b694 update docs 2020-12-08 22:12:58 +08:00
53b857b721 Merge pull request #473 from Yiwen-Chan/master 2020-12-08 20:57:13 +08:00
26372c0939 improve doc 2020-12-08 20:28:10 +08:00
e6de0c33cd improve doc 2020-12-08 20:24:48 +08:00
302ae89a75 fix pprof. 2020-12-07 10:53:18 +08:00
d8b9eb611f add stacktrace on panic. 2020-12-07 10:51:30 +08:00
35a1a0f8b5 update MiraiGo. 2020-12-05 18:17:37 +08:00
7cd6475c6b Merge pull request #467 from shirokurakana/dev
补充并整理文档
2020-12-05 00:53:56 +08:00
b3c4cecdac 补充并整理文档 2020-12-04 22:01:50 +08:00
469054e5a3 more info for 当前上网环境异常. close #465. 2020-12-04 14:29:12 +08:00
14278190e3 fix msg. 2020-12-04 09:39:53 +08:00
cc6c042516 feature pprof service. 2020-12-04 09:36:03 +08:00
abd32556cb Merge branch 'dev' of https://github.com/Mrs4s/go-cqhttp into dev 2020-12-04 00:41:24 +08:00
de1cd8b314 Merge pull request #463 from wdvxdr1123/patch/voice
尝试修复ios无法播放语音
2020-12-04 00:24:56 +08:00
4883c05d67 Merge pull request #462 from wdvxdr1123/patch/group_info
feat get group info no cache
2020-12-04 00:21:52 +08:00
1f20f26c49 update go-silk 2020-12-03 23:57:13 +08:00
12ac895b21 feat get group info no cache 2020-12-03 23:04:27 +08:00
70e8ea07bd remove convert 2020-12-03 22:19:46 +08:00
947d165ac5 improve event filter 2020-12-03 20:52:13 +08:00
93d0d87fbb optimization cqcode converter. 2020-12-03 15:02:36 +08:00
1fbaa6107d feature remove test for ocr_image api. 2020-12-03 11:05:36 +08:00
a4ec4077e2 fix #458. 2020-12-03 11:02:19 +08:00
8a75a6e95a update MiraiGo. 2020-12-03 10:58:29 +08:00
d63d10b69e update MiraiGo. 2020-12-03 00:59:35 +08:00
dfeadef1a2 update MiraiGo. 2020-12-02 22:13:52 +08:00
b23f68e746 try to fix #422. 2020-12-02 22:13:02 +08:00
c5a5f71664 update MiraiGo. 2020-12-02 20:34:15 +08:00
6973a10b4b fix #455. 2020-12-02 19:29:31 +08:00
3468c38fbc clear code. 2020-12-02 15:05:20 +08:00
d76bcfb1f0 update MiraiGo. 2020-12-02 00:36:26 +08:00
716c38bab4 Merge branch 'master' into dev 2020-12-02 00:35:24 +08:00
03518b4823 more error message. 2020-12-01 21:14:48 +08:00
09eeff3ce6 feature new cqcode converter 2020-12-01 19:31:17 +08:00
6599bf6aa6 update MiraiGo. 2020-11-29 21:17:16 +08:00
ffb2faeae7 Merge pull request #452 from brownchow/master
remove mkdir, add set -ex
2020-11-29 21:05:54 +08:00
71e3e97aeb update MiraiGo. 2020-11-29 21:01:12 +08:00
dcb708e3e3 remove mkdir, add set -ex 2020-11-29 18:21:01 +08:00
b9fb833af4 Merge pull request #451 from daofeng2015/master
fix:Dockerfile增加代理源
2020-11-29 13:55:19 +08:00
b93df0250d fix:Dockerfile增加代理源 2020-11-28 23:24:24 +08:00
33d64b6e27 update README.md 2020-11-27 01:46:42 +08:00
7f831cf856 update MiraiGo. 2020-11-27 01:38:08 +08:00
7a713c9327 update MiraiGo. 2020-11-27 01:28:52 +08:00
28d536a3af update MiraiGo. 2020-11-25 20:12:35 +08:00
375fdc8dca update config comment. 2020-11-25 17:28:19 +08:00
d1c6053df8 update MiraiGo. 2020-11-25 16:32:41 +08:00
143d5ef8ab feature proxy rewrite. 2020-11-24 19:03:37 +08:00
439c3422fb doc update. 2020-11-24 18:21:33 +08:00
2c7b56a79c fix get_msg. 2020-11-23 14:59:00 +08:00
1549ef4a32 update MiraiGo. 2020-11-23 14:19:41 +08:00
4ad684061b Merge branch 'master' into dev 2020-11-23 14:17:46 +08:00
c7e6457e9e Merge pull request #446 from Shigma/patch-1
get_status: fix inconsistant bahavior compared to onebot spec
2020-11-22 23:32:17 +08:00
9d5842f09b fix inconsistant bahaviour compared to spec
https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_status-%E8%8E%B7%E5%8F%96%E8%BF%90%E8%A1%8C%E7%8A%B6%E6%80%81

good:状态符合预期,意味着各模块正常运行、功能正常,且 QQ 在线
2020-11-22 23:26:38 +08:00
b6f3c300ab fix #442. 2020-11-21 21:27:25 +08:00
2057e769da update MiraiGo. 2020-11-20 23:51:17 +08:00
0ea85e2fab Merge pull request #438 from wfjsw/patches/add-reject_add_request-to-group-kick
reject_add_request
2020-11-20 21:26:43 +08:00
36b081eeec reject_add_request
(cherry picked from commit 061a230c9fb723ad49e00776fa37aca080973ecd)
2020-11-20 14:05:17 +08:00
2a044a62d2 update MiraiGo. 2020-11-20 09:07:30 +08:00
e0ffb98665 add comments for default config. 2020-11-20 03:01:58 +08:00
861bcf30b1 Merge branch 'dev' of https://github.com/Mrs4s/go-cqhttp into dev 2020-11-20 02:21:17 +08:00
56d7815f6a Merge pull request #437 from fkx4-p/patch-3
Update quick_start.md
2020-11-20 01:56:58 +08:00
59934982b9 Update quick_start.md
1.Fixed Ink33's typo and my error.
2.Added a discription and an example to make the checking part more reasonable.
2020-11-19 22:48:30 +08:00
09c4801b56 fix config. 2020-11-19 09:16:32 +08:00
f1f58b4072 update MiraiGo. 2020-11-19 09:12:41 +08:00
86c2f3cb11 Merge branch 'master' into dev 2020-11-19 09:04:30 +08:00
03c3340954 Merge pull request #426 from Ink-33/master
Fix: set_restart api panic
2020-11-19 00:22:56 +08:00
64b1a223cc Fix #427 2020-11-18 22:46:52 +08:00
b2be595fb8 simplifies composite literals 2020-11-18 22:33:51 +08:00
22225f2b74 Merge pull request #429 from wdvxdr1123/dev
change config file to hjson
2020-11-18 21:47:30 +08:00
eb3d7434cc use hjson 2020-11-18 21:06:37 +08:00
8f7f207891 Merge remote-tracking branch 'upstream/master' into dev 2020-11-18 12:29:17 +08:00
83e0aaa0f8 Fix: set_restart api panic 2020-11-18 01:31:45 +08:00
8f76558317 fix actions. 2020-11-18 00:37:00 +08:00
d94d389843 doc update. 2020-11-18 00:17:05 +08:00
df0d5af07a update MiraiGo. 2020-11-18 00:04:33 +08:00
277629e784 Merge branch 'master' into dev 2020-11-18 00:00:24 +08:00
d66a99c5a3 Merge pull request #424 from wfjsw/patches/proper-flash-pic-support
proper flash pic support
2020-11-17 21:26:27 +08:00
55895e0de1 Update dependencies 2020-11-17 21:03:00 +08:00
39da163641 proper flash pic support 2020-11-17 21:01:28 +08:00
1dbd72c138 update MiraiGo. 2020-11-17 19:13:44 +08:00
31756e9e1d update MiraiGo. 2020-11-17 19:06:23 +08:00
5ab713e7d3 fix cqcode encoder. 2020-11-17 19:05:11 +08:00
b6eb559172 Merge pull request #419 from Ink-33/master
Feather support: set_restart #407
2020-11-17 19:00:54 +08:00
da2e34aaa5 Update http.go 2020-11-17 14:02:44 +08:00
beb1a2883a Update websocket.go 2020-11-17 14:02:44 +08:00
8f34003c6f Update websocket.go 2020-11-17 14:02:44 +08:00
7f3e58f97a Update ci.yml 2020-11-17 01:45:14 +08:00
0fc004077b delete unused import 2020-11-17 01:30:05 +08:00
e9a03b68b5 delete test function 2020-11-17 01:26:13 +08:00
e9b39f3379 Fix: set_restart delay不生效的问题 2020-11-17 01:24:16 +08:00
e053da62e1 Update adminApi.md 2020-11-17 01:23:44 +08:00
f87b5c8215 Fix seflUpdate 2020-11-17 00:26:51 +08:00
28f1594539 feather: faststart 2020-11-17 00:24:25 +08:00
990e7744a3 Update docs 2020-11-17 00:13:14 +08:00
8900839018 Improved restart method 2020-11-16 23:51:45 +08:00
4a3288cb8d feather: add set_restart api support 2020-11-16 22:36:47 +08:00
0f0f74ece8 feather: use startup params to decrypt password 2020-11-16 22:34:05 +08:00
79ba9474a3 update 2020-11-15 16:19:57 +08:00
cb9d872071 Fix ineffectual assignment. 2020-11-15 16:17:43 +08:00
4c3105fa24 Merge remote-tracking branch 'upstream/master' 2020-11-15 16:08:00 +08:00
a8176e69e6 Merge pull request #416 from TheresaQWQ/master
fix typo
2020-11-15 13:47:33 +08:00
afa356e551 Update adminApi.md 2020-11-14 19:30:32 +08:00
a52ae1c828 update MiraiGo. 2020-11-14 19:07:08 +08:00
b8ec05e1c1 feature private poke. 2020-11-14 19:03:36 +08:00
2cbf23bceb trim for custom ip file. 2020-11-14 18:54:17 +08:00
3e5c2bc8e3 update MiraiGo. 2020-11-14 15:18:41 +08:00
69a2360d02 Merge pull request #413 from wdvxdr1123/dev
add some gift id
2020-11-14 12:47:13 +08:00
5b0ede5346 add some gift id 2020-11-13 22:32:00 +08:00
80af002668 Merge remote-tracking branch 'upstream/dev' into dev 2020-11-13 21:03:50 +08:00
b3152bb514 update MiraiGo. 2020-11-13 19:55:57 +08:00
9a018e2a47 doc update. 2020-11-13 19:51:03 +08:00
998b8cb146 feature custom server address. 2020-11-13 19:47:54 +08:00
7e3f94ad2e Merge pull request #412 from wdvxdr1123/dev
修改代码样式
2020-11-13 18:51:31 +08:00
f9dc22f2e5 update MiraiGo. 2020-11-13 18:48:39 +08:00
0ce54ac21b Merge remote-tracking branch 'upstream/dev' into dev 2020-11-13 17:27:13 +08:00
06ac2fcb0c 🎨 clear code 2020-11-13 17:27:01 +08:00
30f1f3199a update MiraiGo. 2020-11-13 16:19:00 +08:00
535b4ee641 feature sso address control. 2020-11-12 23:07:34 +08:00
0ed6522535 fix xml escape error. 2020-11-12 22:43:55 +08:00
3326660880 fix cardimage cannot load on pc. 2020-11-12 22:20:22 +08:00
171aba527e fix xml escape. 2020-11-12 21:50:57 +08:00
d2bdf47bf8 update MiraiGo. 2020-11-12 20:55:15 +08:00
4c2b56457e update MiraiGo. 2020-11-11 22:15:59 +08:00
8b5d63e02c update MiraiGo. 2020-11-11 22:12:16 +08:00
7dd0001dc8 Merge pull request #405 from wdvxdr1123/dev
添加自更新
2020-11-10 18:06:59 +08:00
7f9e4e6a20 clear 2020-11-10 13:17:46 +08:00
f59ce1480e fmt & fix do_restart 2020-11-09 23:17:36 +08:00
c2c7b96f1b add self update 2020-11-09 22:51:50 +08:00
c49c68891b Merge remote-tracking branch 'upstream/dev' into dev 2020-11-09 21:24:15 +08:00
5b394b7a78 Merge pull request #403 from wfjsw/patches/fix-misinterpretation-of-whole-ban
fix misinterpretation of whole ban
2020-11-08 23:58:51 +08:00
0cc3d90581 fix misinterpretation of whole ban 2020-11-08 23:50:31 +08:00
d906bbf0ff doc update. 2020-11-07 15:04:27 +08:00
e2d2461595 feature: group file api. 2020-11-07 14:50:10 +08:00
6bb1f1603e feature: update check. 2020-11-07 13:59:43 +08:00
5e02883028 fix #381. 2020-11-07 13:19:37 +08:00
1f5c9acefb Merge branch 'master' into dev 2020-11-06 09:31:44 +08:00
36b235871f fix #397. 2020-11-06 09:18:20 +08:00
f675a70af3 update MiraiGo & log http post error details. 2020-11-05 20:33:06 +08:00
26afca1555 Merge pull request #387 from sam01101/patch-1
Updated README.md get_group_msg -> get_msg
2020-11-03 17:14:12 +08:00
76b793f119 Updated README.md get_group_msg -> get_msg 2020-11-02 16:27:00 +08:00
491bd2276e replace error msg. 2020-11-01 18:14:21 +08:00
3d81777ed1 clear code. 2020-10-30 09:23:58 +08:00
7b1f0d72eb Merge branch 'dev' of https://github.com/Mrs4s/go-cqhttp into dev 2020-10-28 11:53:04 +08:00
a0219d76ea fix empty friend message. 2020-10-28 11:52:47 +08:00
08b55473aa update MiraiGo. 2020-10-27 18:32:14 +08:00
66d76aa1f1 fix build. 2020-10-27 18:23:51 +08:00
151e44628c fix #376. 2020-10-27 18:23:31 +08:00
d32f427328 update doc. 2020-10-27 18:12:03 +08:00
e911123a30 update MiraiGo. 2020-10-26 13:35:12 +08:00
cc72332455 update doc. 2020-10-25 22:13:31 +08:00
84b4889def fix issue of sending the empty message. 2020-10-25 22:06:03 +08:00
6ad0d68978 feature get_group_system_msg. 2020-10-25 22:03:14 +08:00
1b63a15bbe update MiraiGo. 2020-10-25 21:53:03 +08:00
ce0a5b0271 fix timeout. 2020-10-22 22:10:15 +08:00
f96abc5e26 update gout. 2020-10-22 20:51:29 +08:00
2cdb341db4 fix oneway recall. 2020-10-20 21:12:53 +08:00
c2fd0f1bb2 fix #372. 2020-10-20 21:05:59 +08:00
8ab874ca2b Merge pull request #371 from wdvxdr1123/dev
fix array message
2020-10-20 11:54:29 +08:00
8e61060ef0 fix array message 2020-10-20 09:44:55 +08:00
508117d30b Merge remote-tracking branch 'upstream/dev' into dev 2020-10-20 09:44:20 +08:00
1c965ab9ac Merge branch 'master' into dev 2020-10-19 12:04:21 +08:00
9db1dcc76a Merge pull request #370 from Shigma/patch-1
fix get_msg response payload
2020-10-18 23:52:22 +08:00
fffed72d44 Update api.go 2020-10-18 23:50:13 +08:00
dd5fdb0735 Merge pull request #367 from wdvxdr1123/dev
feature: support custom migu music
2020-10-18 23:07:03 +08:00
c35f46e033 update doc. 2020-10-18 22:40:41 +08:00
98b9be575e fix typo 2020-10-17 19:50:14 +08:00
b99986d112 feature: support custom migu misic 2020-10-17 19:46:24 +08:00
2302cf6263 Merge remote-tracking branch 'upstream/dev' into dev 2020-10-17 19:29:55 +08:00
6a20a86e49 update doc. 2020-10-17 17:13:27 +08:00
9b36645b73 fix input. 2020-10-17 16:57:49 +08:00
d1372332f3 fix db & private recall supported & private reply supported. 2020-10-17 16:53:04 +08:00
2978116c89 fix ci. 2020-10-17 15:08:49 +08:00
8c82082991 fix ci. 2020-10-17 15:04:46 +08:00
08394ae87d update golang version. 2020-10-17 15:02:51 +08:00
7df17f7ff2 update MiraiGo & private ptt support. 2020-10-17 14:58:35 +08:00
9bd41c7792 update MiraiGo & private ptt support. 2020-10-17 14:55:53 +08:00
18f8a12b8c update MiraiGo. 2020-10-15 20:31:33 +08:00
755a794150 feature: use leveldb. 2020-10-15 17:20:25 +08:00
0ab52da0f0 fix type. 2020-10-15 16:49:07 +08:00
2d768c3c1f fix exit. 2020-10-14 20:19:54 +08:00
1feb44d6ba Update README.md 2020-10-14 20:17:02 +08:00
06e40a940e feature: offline file event. 2020-10-13 21:05:09 +08:00
95376a8a63 feature: custom music type supported. 2020-10-13 20:56:50 +08:00
c619ee7feb fix private rich msg. 2020-10-13 14:40:49 +08:00
a53e549e6c update MiraiGo. 2020-10-13 13:05:46 +08:00
a6c13b68cd update MiraiGo. 2020-10-12 14:18:37 +08:00
7659a214d6 Merge branch 'master' into dev 2020-10-12 14:16:38 +08:00
b7d3aec9b7 switch to scanf. 2020-10-12 14:14:25 +08:00
584159d285 update QA.md 2020-10-12 13:30:11 +08:00
6d2f464bee Merge pull request #355 from wdvxdr1123/dev
support showPic flashPic
2020-10-11 19:14:16 +08:00
e719c86731 doc showPic & flashPic 2020-10-11 18:19:58 +08:00
c984f22d4f fix tts panic & support showPic flashPic 2020-10-11 18:02:10 +08:00
aaa73ef5f5 Merge
Dev
2020-10-11 17:57:43 +08:00
f9c0b94af6 Merge remote-tracking branch 'upstream/master' into master
Update Upstream
2020-10-11 10:41:44 +08:00
4c9f60da09 update Dockerfile 2020-10-11 10:39:33 +08:00
a72a688a62 fix vip song. 2020-10-10 17:07:56 +08:00
1d7f1cc5d5 add: group_card event. 2020-10-08 23:28:22 +08:00
24937f2386 update go-silk. 2020-10-08 23:06:33 +08:00
73bd756c20 fix #341. 2020-10-08 22:48:47 +08:00
9d58c56b35 fix typo. 2020-10-08 21:38:03 +08:00
6879197107 fix typo. 2020-10-08 15:54:40 +08:00
a979c46563 update MiraiGo. 2020-10-08 15:52:33 +08:00
e8513da090 Merge pull request #345 from wdvxdr1123/dev
feature support silk encoder
2020-10-07 19:32:16 +08:00
2a5f78499b feature support silk encoder 2020-10-06 10:30:52 +08:00
b167231787 Merge
sync
2020-10-06 09:38:48 +08:00
7ae9c2d220 Merge branch 'dev' of https://github.com/Mrs4s/go-cqhttp into dev 2020-10-05 16:49:45 +08:00
31f24525f0 fix filter panic. 2020-10-05 16:42:13 +08:00
51101f02cd Merge pull request #344 from scjtqs/adminApiDev
修复 获取 当前配置的方法名错误问题,增加当前admin api的 doc
2020-10-04 21:35:39 +08:00
4d404eacd9 修复 获取 当前参数的方法名错误问题,增加当前admin api的 doc 2020-10-04 20:01:59 +08:00
ff29e16220 Merge
sync
2020-10-04 12:51:48 +08:00
d4811d53e7 Merge pull request #340 from scjtqs/adminApiDev
fix: 修复 无法关闭 web admin监听的问题
2020-10-04 00:23:02 +08:00
b19b114d3a fix web输入api显示 2020-10-03 17:54:15 +08:00
95c399a003 添加了 admin api 的监听 host支持,验证码提示增加 host+port 2020-10-03 17:43:03 +08:00
e3f0dbc4ac fix: 修复 无法关闭 web admin监听的问题 2020-10-03 17:28:21 +08:00
b0d5589dcd update MiraiGo. 2020-10-03 13:23:50 +08:00
b4d29e270a fix typo. 2020-10-03 13:13:13 +08:00
a5958e0877 fix typo. 2020-10-03 13:05:17 +08:00
cc1093ff57 Merge pull request #333 from scjtqs/adminApiDev
admin api 初版
2020-10-03 12:57:34 +08:00
a712db5d50 Merge pull request #339 from wdvxdr1123/dev
feature support .get_word_slices
2020-10-03 12:55:24 +08:00
030eb6b7c4 feature support [CQ:tts] 2020-10-03 09:59:21 +08:00
6b706ca3ff Merge
Dev
2020-10-02 23:45:49 +08:00
bbf2025350 feature support .get_word_slices 2020-10-02 23:41:02 +08:00
e386a52fed 解决冲突 2020-10-02 20:11:15 +08:00
4c8ae2f08b fix #239 2020-10-02 17:46:02 +08:00
d70e5d91b3 update config. 2020-10-02 17:42:15 +08:00
c2fae1e6f5 update MiraiGo. fix #327 #258 2020-10-02 16:42:38 +08:00
1ce73cb36a Merge branch 'master' into dev 2020-10-02 16:38:35 +08:00
dfbea6ac28 Merge pull request #338 from fkx4-p/patch-1
Update quick_start.md
2020-10-02 16:22:15 +08:00
29d001d60c Merge pull request #337 from wdvxdr1123/dev
Feature:  support [CQ:gift]
2020-10-01 20:43:54 +08:00
93f3786059 Update quick_start.md 2020-10-01 20:25:09 +08:00
e59d0a1bfd Update quick_start.md 2020-10-01 19:54:54 +08:00
5c1ad4ad8e Update quick_start.md 2020-10-01 19:41:14 +08:00
9cd044c402 Merge branch 'dev' of https://github.com/wdvxdr1123/go-cqhttp into dev 2020-10-01 18:12:04 +08:00
add9d3fc20 feature [CQ:gift] 2020-10-01 18:11:28 +08:00
0d1dfeefa1 Merge
Dev
2020-10-01 17:47:55 +08:00
d438543746 Merge pull request #335 from qianjunakasumi/dev
修复机器人已登录但继续尝试登录的缺陷
2020-10-01 11:40:13 +08:00
79b0c95f09 Merge pull request #334 from takayama-lily/master
Update QA.md
2020-10-01 11:39:19 +08:00
f5f3a314eb 修复机器人已登录但继续尝试登录的缺陷 2020-10-01 09:23:55 +08:00
de234c7721 Update QA.md 2020-10-01 08:38:11 +09:00
a6a1de0a00 admin api 初版 2020-09-30 20:10:59 +08:00
062a898383 Merge branch 'dev' 2020-09-29 19:16:15 +08:00
83ce4e58a5 update MiraiGo. fix #329 2020-09-29 19:15:30 +08:00
eef140e922 Merge pull request #328 from wdvxdr1123/dev
fix [CQ:record] & docs set_group_portrait
2020-09-29 18:45:13 +08:00
6581394ae1 fix [CQ:record] & docs set_group_portrait 2020-09-28 18:45:34 +08:00
2e59cb8a17 Merge
sync
2020-09-28 18:37:47 +08:00
b73162238f update MiraiGo. fix #320 2020-09-28 16:26:21 +08:00
1a3cba5425 add sending log limit. 2020-09-28 16:13:37 +08:00
9ecef96205 update MiraiGo. 2020-09-28 16:04:34 +08:00
43ecc25989 upload QA.md 2020-09-27 19:29:34 +08:00
9b41cd8ea2 update MiraiGo. 2020-09-26 21:44:22 +08:00
e0ab2417c4 update MiraiGo. 2020-09-26 21:43:21 +08:00
c7ab32fead update MiraiGo. fix #304 2020-09-25 13:06:50 +08:00
8f5b8375a7 remove 'servers.bin' 2020-09-25 11:27:49 +08:00
9049018d2f update MiraiGo. 2020-09-25 11:26:55 +08:00
fffe64651a Merge branch 'master' into dev 2020-09-25 11:19:12 +08:00
a9d53f038f Merge pull request #316 from XYenon/patch-1
Fix empty message segment
2020-09-24 00:47:01 +08:00
cec81b7ad8 Update cqcode.go 2020-09-23 23:08:11 +08:00
dddb3d2299 Merge pull request #314 from scjtqs/dev4
添加,好友消息和群消息发送成功日志。可用于正则匹配(历史聊天记录
2020-09-23 01:28:18 +08:00
f6d37d460c 修正 array message 遗漏问题 2020-09-23 01:07:50 +08:00
aca6a3cf28 添加,好友消息和群消息发送成功日志。可用于正则匹配(历史聊天记录 2020-09-22 22:47:01 +08:00
d390dd539b update doc. 2020-09-22 21:59:12 +08:00
3269387163 Merge pull request #310 from wdvxdr1123/dev
feature set_group_portrait
2020-09-22 13:15:38 +08:00
cd09a68e0d simplify 2020-09-22 11:39:14 +08:00
d2d408a8e9 feature set_group_portrait
[2020-09-22 10:50:46] [ERROR]: 读取服务器地址时出现错误: %vEOF
2020-09-22 11:17:53 +08:00
995737b0b8 Merge pull request #4 from Mrs4s/dev
Dev
2020-09-22 08:36:00 +08:00
72d62ad7c3 update MiraiGo. 2020-09-21 22:28:34 +08:00
387d33a01b update MiraiGo. fix #307 #306 2020-09-21 21:55:54 +08:00
65811d4e22 Merge pull request #300 from the-25th-Nova/patch-1
修复Docs中Markdown错误
2020-09-20 12:01:42 +08:00
01dd760b5c Fix Markdown 2020-09-20 11:58:37 +08:00
c31169b99b fix #298. 2020-09-20 00:29:50 +08:00
b5b6117487 fix server. 2020-09-20 00:00:53 +08:00
4662f1e170 update MiraiGo. fix #288 2020-09-19 23:37:40 +08:00
ea65e545ad supported: get_stranger_info. 2020-09-19 17:02:21 +08:00
d67621487d update MiraiGo. fix #278 2020-09-19 16:46:19 +08:00
c4e54446c5 update MiraiGo. fix #283 2020-09-17 08:48:09 +08:00
1d1925208b update doc. 2020-09-13 22:11:28 +08:00
741a91cf70 add: poke sending. 2020-09-13 22:07:45 +08:00
fef9395890 update MiraiGo. 2020-09-13 21:33:01 +08:00
50bfc08974 fix typo. 2020-09-13 21:02:04 +08:00
2005cbccb0 fix #276. 2020-09-13 20:58:41 +08:00
69cadad155 update README.md 2020-09-13 20:56:15 +08:00
a4c6c6d7f3 fix typo. 2020-09-13 20:53:44 +08:00
6f251e3dec fix typo. 2020-09-13 20:51:57 +08:00
6101c4d8a9 add: honor changed event. 2020-09-13 20:16:01 +08:00
9b77f09d2f Merge pull request #3 from Mrs4s/master
1
2020-09-13 17:58:36 +08:00
e9db10c9b7 update MiraiGo. fix #270 2020-09-12 20:51:34 +08:00
e87de2f6b3 doc update. 2020-09-12 19:44:14 +08:00
a1a3e26b0b add: protocol switch & group notify & redbag info. 2020-09-12 18:59:13 +08:00
92c224be5b Merge pull request #268 from ivanallen/master
fix docs
2020-09-11 23:30:55 +08:00
c691aa70ea fix docs 2020-09-11 19:23:19 +08:00
ec45d04c81 Merge pull request #2 from Mrs4s/master
sync
2020-09-11 19:11:34 +08:00
30c4d508bc fix panic. 2020-09-11 18:44:22 +08:00
b0e00fe052 fix #266. 2020-09-11 18:25:45 +08:00
8b1d950a29 Merge pull request #3 from Mrs4s/master
update
2020-09-11 12:34:49 +08:00
09aa852308 Merge pull request #260 from wdvxdr1123/master
Fix EventFilter & Add reload_event_filter
2020-09-11 08:19:56 +08:00
0cfaa4c7ad fix bug
修复当无法连接WS时未初始化EventFilter的bug
2020-09-10 20:56:38 +08:00
faba3e042f Fix EventFilter & Add reload_event_filter
修复憨批错误
2020-09-10 19:28:20 +08:00
b33bb37da9 Merge pull request #1 from Mrs4s/master
sync
2020-09-10 17:33:21 +08:00
50ebfe4766 update MiraiGo. fix #253 2020-09-10 09:47:53 +08:00
e4a458e7c8 update MiraiGo. try to fix group list limit. 2020-09-10 09:13:54 +08:00
8c63a420a3 feature: set_group_admin. 2020-09-09 19:02:36 +08:00
b1fccbc0a3 update MiraiGo. fix #255 2020-09-09 17:55:50 +08:00
1a2fa65347 Merge pull request #254 from wdvxdr1123/master
feature: _rate_limit
2020-09-09 14:43:28 +08:00
5ddb246ab2 feature: _rate_limit
api限速
2020-09-09 10:47:14 +08:00
86da65771d fix #251. 2020-09-09 08:44:47 +08:00
eca396afb3 update. 2020-09-08 22:41:39 +08:00
e5718fc47c Merge pull request #249 from Shigma/patch-1
docs: use identical indentation
2020-09-08 13:45:06 +08:00
4b12bbc1e4 docs: use identical indentation 2020-09-08 02:26:42 +08:00
a26681a4d9 update post error. 2020-09-07 05:13:38 +08:00
a417ff0881 Merge pull request #245 from scjtqs/master
cq码 添加 cardimage 类型,一种xml的 特殊图片格式,json和xml的格式上报
2020-09-07 05:10:46 +08:00
845b483242 Merge pull request #244 from wdvxdr1123/master
add: api _get_vip_info
2020-09-07 05:10:29 +08:00
da8b0931f1 默认最小宽高调整到 200*200 2020-09-06 14:57:08 +08:00
3dc436b534 docs : EventFilter 2020-09-06 14:47:46 +08:00
6a0f44f6cc add _send_group_notice 2020-09-06 11:53:31 +08:00
5501c6192f Update MiraiGo 2020-09-06 11:12:23 +08:00
ca62f6f591 修改对应的 文档范围 2020-09-06 10:42:18 +08:00
ac5803a539 xml和json消息以及cq码上报支持.
富文本的xml和json的消息识别,依赖miraigo的pr
2020-09-06 10:39:46 +08:00
828ca2ec3c 修复 ios 支持 2020-09-06 01:38:41 +08:00
514f93b527 调整 xml 2020-09-06 01:28:31 +08:00
4d260be76a 调整 xml 2020-09-06 01:19:26 +08:00
793cf2e2b9 修复下Log 2020-09-06 00:27:24 +08:00
2a56475daf 去掉一个调试日志 2020-09-06 00:24:04 +08:00
f9e2130b9f 修复 对本地文件格式的支持 2020-09-06 00:21:24 +08:00
e2073f5371 Merge branch 'master-Mrs4s' into master
* master-Mrs4s:
  feature: send netease with json
  fix: fit onebot
2020-09-05 23:40:24 +08:00
b1fcfc6f97 添加 说明文档 2020-09-05 23:30:43 +08:00
6a14998928 添加 说明文档 2020-09-05 23:29:41 +08:00
24dad3d6f9 fix 2020-09-05 23:19:24 +08:00
b104b21ab9 add: api _get_vip_info 2020-09-05 23:03:08 +08:00
5024cc08a7 暂存 2020-09-05 22:22:57 +08:00
3c73769db3 Merge pull request #243 from wdvxdr1123/master
send netease music with json
2020-09-05 22:08:32 +08:00
d79cb0b536 feature: send netease with json 2020-09-05 18:49:32 +08:00
2b00b49755 fix: fit onebot
适配onebot标准
2020-09-05 17:47:30 +08:00
a77977b12e Merge pull request #7 from Mrs4s/master
2
2020-09-05 11:17:26 +08:00
6565a19aaa fix #238. 2020-09-05 08:16:50 +08:00
a9001d5c9e fix ci. 2020-09-05 08:10:45 +08:00
a991add799 update default heartbeat value. close #232 2020-09-05 08:09:07 +08:00
42434956d9 fix light app. 2020-09-05 08:06:52 +08:00
49e3995129 move reply pos. close #220 2020-09-05 08:02:31 +08:00
8c1770318c Merge pull request #6 from Mrs4s/master
1
2020-09-03 22:57:01 +08:00
7d3265b6d4 Merge pull request #221 from scjtqs/master
初步支持 `[CQ:json]` .
2020-09-03 22:05:05 +08:00
4c65859608 Merge branch 'master' of https://github.com/Mrs4s/go-cqhttp
# Conflicts:
#	coolq/cqcode.go
2020-09-03 20:31:53 +08:00
0100b85fb1 update qq music content. 2020-09-03 18:05:31 +08:00
3bd557d7a0 fmt 2020-09-03 00:37:57 +08:00
05d8e773f2 配合 最新的MiraiGo调整代码 2020-09-03 00:34:20 +08:00
b2f46b4bbe Merge branch 'master' of https://github.com/Mrs4s/go-cqhttp into master 2020-09-03 00:09:14 +08:00
9fa1b7727e Merge pull request #235 from wdvxdr1123/master
feature [cq:music] send qqmusic share with json
2020-09-02 23:18:29 +08:00
9e43d9c2bb change into NewLightApp 2020-09-02 22:52:57 +08:00
ad5e87c4c7 Revert "Auto stash before merge of "master" and "origin/master""
This reverts commit ff8fd92a26.
2020-09-02 22:50:01 +08:00
ff8fd92a26 Auto stash before merge of "master" and "origin/master" 2020-09-02 22:45:17 +08:00
0f96950757 Merge branch 'master' into master 2020-09-02 22:39:17 +08:00
993f05bfa6 feature [cq:music] send qqmusic share with json
用json代替qq音乐的分享
2020-09-02 22:26:56 +08:00
d309a10fba Merge pull request #229 from rMuchan/master
反向WS连接时发送connect元事件
2020-09-02 15:26:24 +08:00
755949fb33 反向WS连接时发送connect元事件 2020-09-02 14:22:56 +08:00
7f103a7f9a Merge pull request #227 from shitianshiwa/master
补充关于“是否强制分片发送群长消息”开关说明
2020-09-01 22:34:05 +08:00
f487d12b83 Update config.md 2020-09-01 21:12:45 +09:00
df1cb3de87 Merge pull request #1 from Mrs4s/master
跟进
2020-09-01 20:55:33 +09:00
7d62db2ec0 Merge pull request #223 from F0ur/master
feat(api): make json response [] instead of null(empty list)
2020-08-31 23:46:27 +08:00
9b5358351f feat(api): make GetFriendList/GetGroupList/GetGroupMemberList/GetForwardMessage json response data as [] instead of null 2020-08-31 22:58:03 +08:00
a048353067 json cq 码 添加 说明 2020-08-31 00:45:36 +08:00
a455aeea39 去掉不需要的方法 2020-08-31 00:36:42 +08:00
710a8588b7 cq:json 消息的初步支持 2020-08-31 00:34:38 +08:00
d25674a9ef json 初步支持 2020-08-30 03:00:18 +08:00
0133944c0b Merge remote-tracking branch 'upstream/master' into master
# Conflicts:
#	global/net.go
2020-08-30 02:43:26 +08:00
bcdbefb355 go fmt 2020-08-30 02:29:29 +08:00
fc18b84d4b 添加 [CQ:json,data={json代码}]的支持 2020-08-30 02:28:01 +08:00
e55b7d846f Merge pull request #219 from Ink-33/master
Fix #218
2020-08-29 22:30:48 +08:00
1f7c4cab50 Update 2020-08-29 22:24:53 +08:00
d35ad66adf 拒绝空Token 2020-08-29 20:24:11 +08:00
047b5208f4 Builder更换为1.14.7 2020-08-29 17:55:08 +08:00
804bd9a711 升级依赖 2020-08-29 17:54:39 +08:00
f569225305 加载配置失败后备份源配置文件
配置结构升级不备份,我配置没了
2020-08-29 17:49:40 +08:00
9c65ff4dcd 尝试修复正向WebSocket下的鉴权panic 2020-08-29 17:24:09 +08:00
d0398f30c6 Revert "Update websocket.go"
This reverts commit 33120b2496.

revert
2020-08-29 17:06:25 +08:00
517e2ea3d4 Merge pull request #1 from Ink-33/patch-1
Update websocket.go
2020-08-29 16:46:14 +08:00
33120b2496 Update websocket.go 2020-08-29 16:44:31 +08:00
38b6fab496 Merge pull request #4 from Mrs4s/master
pull
2020-08-29 16:15:19 +08:00
304b38f6af Merge pull request #213 from ceerRep/patch-1
Fix indent
2020-08-29 02:40:18 +08:00
e8fd57d477 Merge pull request #216 from qianjunakasumi/master
新增多次自动重连 #154
2020-08-29 02:39:27 +08:00
4d376c0518 新增多次自动重连 2020-08-28 23:46:29 +08:00
027aeca622 Fix indent 2020-08-28 15:02:53 +08:00
cefbfb64ce update MiraiGo. fix #172 2020-08-28 02:32:27 +08:00
04bcd2e270 supported one-way friend msg. close #98 2020-08-28 00:27:40 +08:00
0e7c30e854 fix image error. 2020-08-27 23:51:38 +08:00
0894f2ac44 Merge pull request #210 from qianjunakasumi/master
新增自定义心跳服务间隔时间及开关
2020-08-27 23:38:22 +08:00
50191fcedf 删除错误加入的配置 2020-08-27 23:29:10 +08:00
41614b9d16 更新心跳服务间隔文档 2020-08-27 23:20:45 +08:00
11592c4483 新增自定义心跳服务间隔时间及开关 2020-08-27 23:15:37 +08:00
a9d08e5d92 Merge pull request #201 from yyuueexxiinngg/patch-1
Match netease music app id
2020-08-27 02:23:27 +08:00
1c4cb96ce0 Merge pull request #200 from xuthus5/master
add:errlog file; fix:show version when start program
2020-08-27 02:23:16 +08:00
46747354c8 Match netease music app id 2020-08-27 01:59:02 +08:00
01988cd3d7 add:errlog file; fix:show version when start program 2020-08-27 01:24:49 +08:00
0e95977ff3 Merge pull request #197 from F0ur/master
fix(ws): fix concurrent write to ws conn
2020-08-26 16:27:52 +08:00
be17920559 Merge branch 'master' of github.com:Mrs4s/go-cqhttp into master 2020-08-26 14:31:14 +08:00
fe7a1f5028 fix(ws): fix concurrent write to ws conn 2020-08-26 14:30:41 +08:00
8b14409aaf Merge pull request #2 from Mrs4s/master
up to author
2020-08-26 08:22:49 +08:00
174ebfae9d update MiraiGo. 2020-08-25 20:18:18 +08:00
02355db0f1 update config. close #190 2020-08-25 17:26:08 +08:00
bda02d895a update MiraiGo. 2020-08-25 17:05:44 +08:00
5fe15163f8 Merge pull request #192 from F0ur/master
feat(music): add netease(163) music for [CQ:music]
2020-08-25 17:04:54 +08:00
174bb0bbe1 feat(music): add netease(163) music for [CQ:music] 2020-08-25 15:17:20 +08:00
e319f2645e update MiraiGo & more debug & fmt code. 2020-08-25 00:50:03 +08:00
52c911056e Merge pull request #182 from wdvxdr1123/master
update event filter
2020-08-24 20:29:15 +08:00
ac97c04cef Merge pull request #175 from scjtqs/master
添加 CQ:xml 发送的支持
2020-08-24 20:27:58 +08:00
801fa9a204 update event filter
对所有通信方式支持事件过滤器
2020-08-24 20:05:10 +08:00
17f8232a1c Merge pull request #3 from Mrs4s/master
pull
2020-08-24 19:52:55 +08:00
cb9436601f 移动xml处理位置 2020-08-24 16:16:36 +08:00
03cc0dba95 移动xml处理位置 2020-08-24 16:01:21 +08:00
248ba84a0c fix bug. 2020-08-24 14:47:24 +08:00
8874ed0392 添加 CQ:xml的支持 2020-08-24 04:32:02 +08:00
9acf598209 update MiraiGo. fix #118 2020-08-24 02:43:55 +08:00
15085d0a6b 开放自由xml的支持接口,方便开发者自行设计和调用 2020-08-24 02:04:32 +08:00
4e2fb91d8f image download supported. 2020-08-23 20:13:01 +08:00
37ea92b928 fix #167. 2020-08-23 19:58:02 +08:00
fc1680aa2e update MiraiGo. fix #170 2020-08-23 15:58:29 +08:00
6b256c8b82 fix #168. 2020-08-23 13:52:07 +08:00
65acc888fd Merge pull request #2 from Mrs4s/master
update
2020-08-23 07:24:58 +08:00
84a826815d fix #164. 2020-08-23 03:34:42 +08:00
8ae2c1c9be music supported. 2020-08-23 03:16:48 +08:00
8fa804a2c9 Merge branch 'master' of https://github.com/Mrs4s/go-cqhttp 2020-08-23 01:46:13 +08:00
d6961fc69b move reply pos. 2020-08-23 01:46:02 +08:00
b4229c5b0e Merge pull request #166 from F0ur/master
fix(ws): fix eventConn panic when ws connect close
2020-08-23 00:31:52 +08:00
8a8ce4049d perf: format code 2020-08-22 23:09:22 +08:00
7d1ed2577e fix(ws): fix eventConn panic when ws connect close 2020-08-22 23:06:53 +08:00
b3c706cb70 update MiraiGo. 2020-08-22 18:30:08 +08:00
382daf48a5 Merge pull request #162 from wdvxdr1123/master
反向WS添加事件过滤器
2020-08-22 16:29:12 +08:00
2b92035fdc remove unnecessary info 2020-08-22 16:24:17 +08:00
5868b68437 与原版event filter基本一致 2020-08-22 16:14:26 +08:00
2949f68532 反向WS事件过滤器 2020-08-22 13:24:32 +08:00
d7abe6f7e3 Merge pull request #1 from Mrs4s/master
同步
2020-08-22 10:56:30 +08:00
2259e7ccba deadline update. 2020-08-22 03:28:38 +08:00
5e6b3e09f7 kusa. 2020-08-22 03:21:43 +08:00
9f060ce2ed fix lock & http server error. 2020-08-22 03:02:19 +08:00
3709f5c7b9 clear. 2020-08-22 02:44:00 +08:00
fa0a2d80f8 update MiraiGo. 2020-08-22 02:27:23 +08:00
894a5d9641 fix Content-Type. 2020-08-22 01:21:04 +08:00
30ff055126 Merge pull request #148 from xuthus5/master
add:go-cqhttp_version
2020-08-21 22:30:18 +08:00
f8d74a6ac9 update debug. 2020-08-21 22:28:11 +08:00
d625c79f7c Merge pull request #157 from wfjsw/patches/reduce-websocket-lock-contention
reduce websocket lock contention
2020-08-21 21:15:11 +08:00
c500bfc55c reduce websocket conn lock contention
(cherry-picked from commit dac8933..83772e2)
2020-08-21 20:47:33 +08:00
c3da6f29e2 ignore go vendor 2020-08-21 20:33:55 +08:00
196cffb099 ws async supported. close #122 2020-08-21 19:27:07 +08:00
cb9599271a update MiraiGo. 2020-08-21 19:24:06 +08:00
5ec4e3331d fix:action 2020-08-21 00:50:45 +08:00
739d486b09 add:go-cqhttp_version 2020-08-20 22:14:31 +08:00
322b70c6b5 fix bug. 2020-08-20 03:33:55 +08:00
470efa07ab url cache supported. 2020-08-20 03:05:46 +08:00
b7572f8d2c fix log. 2020-08-20 02:31:51 +08:00
c9a914b5d5 fix #141. 2020-08-20 02:30:44 +08:00
51696e8054 /get_group_list supported no_cache param. 2020-08-20 02:12:54 +08:00
a6bcd96415 fix event push error. 2020-08-20 01:59:31 +08:00
08694f5ae8 heartbeat event supported. close #131 2020-08-19 18:37:12 +08:00
8c71dbff68 honor api supported. 2020-08-19 16:04:30 +08:00
568b0e479f update MiraiGo. 2020-08-18 17:06:59 +08:00
d1da08a376 fix at. 2020-08-18 13:22:11 +08:00
5768c61bc7 Merge pull request #99 from mirai-qq/master
support silk audio
2020-08-17 14:15:11 +08:00
864120d3fe Merge pull request #127 from richardchien/auto_escape
support "auto_escape" in api and quick operation
2020-08-17 14:12:11 +08:00
99b414530a remove todo comment 2020-08-17 14:10:33 +08:00
4820eb2fec support "auto_escape" in api and quick operation 2020-08-17 13:46:11 +08:00
00d80d5dfc fix #107. 2020-08-16 19:35:38 +08:00
22d9ddb4ea try to fix #115. 2020-08-16 19:31:40 +08:00
fa33dbdd4e Merge branch 'master' of https://github.com/Mrs4s/go-cqhttp 2020-08-16 19:28:34 +08:00
be8b68c8e9 update MiraiGo & async loading supported. close #111 2020-08-16 19:27:43 +08:00
cef129eff7 Merge pull request #109 from SJTU-Plus/master
fix #103
2020-08-16 02:26:42 +08:00
1fac06f58a fix #103 2020-08-15 23:47:29 +08:00
1a1f860dbe fix #108. 2020-08-15 16:07:56 +08:00
f325b26e1a doc update. close #102 2020-08-14 13:41:48 +08:00
b545e05a9d Merge branch 'master' of https://github.com/Mrs4s/go-cqhttp 2020-08-14 08:28:55 +08:00
b290a0a596 try to fix group image upload failed. #65 2020-08-14 08:28:37 +08:00
9af61a336b support silk audio 2020-08-13 23:36:16 +08:00
774a1e32da Merge pull request #96 from mirai-qq/master
remove os.ModePerm
2020-08-13 21:24:15 +08:00
50eee15a67 remove os.ModePerm 2020-08-13 20:53:42 +08:00
edf6180e1c fix ci failed. 2020-08-13 20:09:57 +08:00
3c04573e82 fix #89. 2020-08-13 20:07:21 +08:00
5e49820319 update README.md 2020-08-13 17:21:54 +08:00
1418e36bab cq code 'video' supported. 2020-08-13 17:18:16 +08:00
611d16d79e update README.md 2020-08-13 11:14:21 +08:00
c6f701e8c8 Merge pull request #84 from Shigma/master
adjust unescape order
2020-08-12 12:32:06 +08:00
a49a57b964 adjust unescape order 2020-08-12 12:23:48 +08:00
bb03315930 try to support escape again. #9 2020-08-12 09:52:32 +08:00
5683db6324 fix #80. 2020-08-12 09:33:25 +08:00
f1ffa17d20 update MiraiGo. 2020-08-12 09:19:00 +08:00
69675aa0f9 fix #75. 2020-08-12 05:01:16 +08:00
782a3e2a39 add default 'http_config.post_message_format' value. 2020-08-11 17:47:16 +08:00
1967e687af fix perm error. 2020-08-11 17:38:33 +08:00
23d436972c save captcha to local file. close #71 2020-08-11 17:35:03 +08:00
129622dd24 fix reverse push issue. 2020-08-11 17:32:09 +08:00
19104d00a3 Merge pull request #78 from yyuueexxiinngg/patch-1
移除上报消息为array时的文本转义
2020-08-11 15:32:45 +08:00
6c0e78b60c Remove content escape when using array post message format. 2020-08-11 15:22:26 +08:00
a075f41a51 http post timeout setting supported. close #77 2020-08-11 15:19:54 +08:00
cdbf903361 Merge pull request #74 from Shigma/api-type-check
sendXXX api type check
2020-08-11 11:20:17 +08:00
906247fcf0 Merge pull request #70 from XYenon/master
Add support for post_message_format: array
2020-08-11 04:54:37 +08:00
72a7430841 add api type check 2020-08-10 20:43:31 +08:00
5c4f586c36 Use string format in db 2020-08-10 19:44:54 +08:00
464122af4a Merge pull request #1 from Mrs4s/master
1
2020-08-10 19:00:56 +08:00
5d2e202b0c Merge pull request #47 from purerosefallen/patch-1
Add Dockerfile
2020-08-10 16:57:34 +08:00
c27ebadbc4 Add support for post_message_format: array 2020-08-10 13:59:46 +08:00
d5a8f3ead2 Merge pull request #69 from Shigma/master
& escape should come first
2020-08-10 12:51:26 +08:00
03bfd9dd3d & escape should come first 2020-08-10 12:48:50 +08:00
0b02178402 supported voice download. 2020-08-10 12:38:58 +08:00
3819f2c2da fix #66 2020-08-10 10:31:50 +08:00
b297aa2e13 fix typo. 2020-08-10 08:06:48 +08:00
c8160550ec update doc. 2020-08-10 08:05:00 +08:00
44b26b70a3 password encrypt supported. close #22 2020-08-10 07:58:00 +08:00
97f7de85a2 fix #12. 2020-08-10 07:24:48 +08:00
ae58d26047 supported event: friend_add. 2020-08-10 07:22:53 +08:00
47cb3a5235 temp message sending supported. #26 2020-08-10 05:53:24 +08:00
4941f0c3f8 try to support escape. #9 2020-08-10 04:21:40 +08:00
bc47267c3c fix /can_send_record response. 2020-08-09 10:39:37 +08:00
8449770b6d fix #61. 2020-08-09 10:21:49 +08:00
a38c74a767 Update issue templates 2020-08-09 05:25:27 +08:00
4ab1812640 Merge pull request #59 from XYenon/patch-1
修正 config 文档 http_config 中 post_urls 的格式
2020-08-09 05:08:07 +08:00
c87836355f try to fix reverse ws delay. #52 2020-08-09 05:05:38 +08:00
8524fbf1ce fix reverse ws connect issue. 2020-08-08 22:42:19 +08:00
92fb69beef 修正 config 文档 http_config 中 post_urls 的格式 2020-08-08 20:46:28 +08:00
dd03efc9c8 update default config. 2020-08-08 15:06:00 +08:00
d8bad9a66a fix cqcode convert error. 2020-08-08 13:01:59 +08:00
c854339b2d update voice. 2020-08-08 12:59:49 +08:00
b61fe4e43e update README.md 2020-08-08 08:50:01 +08:00
d5ee8fb331 cqcode record supported. 2020-08-08 08:47:51 +08:00
fa5ee669f4 update. 2020-08-08 08:06:24 +08:00
61f103ac1d bug fix. 2020-08-07 16:18:12 +08:00
0564314671 bug fix. 2020-08-07 15:41:10 +08:00
fdd517ee8c dockerignore 2020-08-07 14:36:00 +08:00
2d010326c7 Add a Dockerfile and more configurable environment variables 2020-08-07 14:34:47 +08:00
2ec7f83d38 supported .cqimg direct sending. 2020-08-07 13:56:56 +08:00
06f4a10cf7 update MiraiGo. fix #28. 2020-08-07 11:10:57 +08:00
b229b9e543 fix #37. 2020-08-07 01:46:07 +08:00
54 changed files with 8462 additions and 1429 deletions

5
.dockerignore Normal file
View File

@ -0,0 +1,5 @@
.gitlab-ci.yml
.dockerignore
Dockerfile
README.md
LICENSE

44
.github/ISSUE_TEMPLATE/bug--.md vendored Normal file
View File

@ -0,0 +1,44 @@
---
name: Bug汇报
about: 遇到了bug? 你可以在这里开始汇报(仅限软件本体问题)
title: ''
labels: bug?
assignees: ''
---
<!--
!请不要删除此处内容!
在您发布此Issue前, 请您花一点时间查看下面几条指引🔽
1: ❗ | 确定没有相同问题的ISSUE已被提出. (教程: https://github.com/Mrs4s/go-cqhttp/issues/633)
2: 🌎| 请准确填写环境信息.
3: ❔ | 打开DEBUG模式复现并提供出现问题前后至少 10 秒的完整日志内容。请自行删除日志内存在的个人信息及敏感内容。
4: ⚠ | 如果涉及内存泄漏/CPU占用异常请打开DEBUG模式并下载pprof性能分析.
注: 如果您不知道如何有效、精准地表述,我们建议您先阅读《提问的智慧》
(链接: https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/main/README-zh_CN.md)
请确保您已经仔细阅读此教程,并勾选下方的确认框。(将 [ ] 修改为 [x])
--------
- [ ] 我已经仔细阅读上述教程和"提问前需知 [图+文]": https://github.com/Mrs4s/go-cqhttp/issues/633
- [ ] 我已知晓并同意,如果我不遵循以下格式提交 Issue或者我使用的并非最新版本或者我没有提供足够的环境信息则我的 Issue 可能会被无条件自动关闭和锁定。
- [ ] 我已知晓并同意,我仅需要把选项前的 [ ] 替换为 [x]。如果我删除、修改这些复选框的其他部分,或是在 x 之前或之后留了空格,则我的 Issue 可能会被无条件自动关闭和锁定。
- [ ] 我已知晓并同意,此处仅用于汇报程序中存在的问题。若这个 Issue 是关于其他非程序本身问题或是新功能需求,则我的 Issue 可能会被无条件自动关闭和锁定。(这些问题应当在 Discussion 板块提出。)
--------
-->
**环境信息**
<!-- 请根据实际使用环境修改以下信息。请勿删除或留空。 -->
go-cqhttp版本:
运行环境:
连接方式:
使用协议:
**bug内容**
<!-- 请在这里详细描述bug的内容 -->
**复现方法**
<!-- 请在这里分步骤的描述如何复现这个bug -->

8
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: 不知道怎么做?
url: https://github.com/Mrs4s/go-cqhttp/issues/633
about: 建议你先查看此教程
- name: 讨论区
url: https://github.com/Mrs4s/go-cqhttp/discussions/
about: 使用中若遇到问题或有新点子新需求,请先在这里求助和征求意见。

15
.github/ISSUE_TEMPLATE/feat--.md vendored Normal file
View File

@ -0,0 +1,15 @@
---
name: 新功能提议
about: 提出新功能
title: ''
labels: feature request
assignees: ''
---
**环境信息**
<!-- 请尽量填写 -->
go-cqhttp版本:
**需要添加的功能内容**
<!-- 请在这里详细描述新功能的实现方法 -->

View File

@ -14,22 +14,23 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
# build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/386, darwin/amd64 # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/amd64, darwin/arm64
goos: [linux, windows, darwin] goos: [linux, windows, darwin]
goarch: ["386", amd64, arm] goarch: ["386", amd64, arm, arm64]
exclude: exclude:
- goos: darwin - goos: darwin
goarch: arm goarch: arm
- goos: darwin
goarch: "386"
- goos: windows
goarch: arm64
fail-fast: true fail-fast: true
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Setup Go environment - name: Setup Go environment
uses: actions/setup-go@v2.1.1 uses: actions/setup-go@v2.1.3
with: with:
go-version: 1.14 go-version: 1.16
- name: Build binary file - name: Build binary file
env: env:
GOOS: ${{ matrix.goos }} GOOS: ${{ matrix.goos }}
@ -40,13 +41,10 @@ jobs:
if $IS_PR ; then echo $PR_PROMPT; fi if $IS_PR ; then echo $PR_PROMPT; fi
export BINARY_NAME="$BINARY_PREFIX$GOOS_$GOARCH$BINARY_SUFFIX" export BINARY_NAME="$BINARY_PREFIX$GOOS_$GOARCH$BINARY_SUFFIX"
export CGO_ENABLED=0 export CGO_ENABLED=0
go build -o "output/$BINARY_NAME" -ldflags "$LD_FLAGS" . go build -o "output/$BINARY_NAME" -trimpath -ldflags "$LD_FLAGS" .
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
if: ${{ !github.head_ref }} if: ${{ !github.head_ref }}
with: with:
name: ${{ matrix.goos }}_${{ matrix.goarch }} name: ${{ matrix.goos }}_${{ matrix.goarch }}
path: output/ path: output/

24
.github/workflows/golint.yml vendored Normal file
View File

@ -0,0 +1,24 @@
name: Lint
on: [push]
jobs:
golangci:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: golangci-lint
uses: golangci/golangci-lint-action@v2
with:
version: latest
- name: Commit back
continue-on-error: true
run: |
git config --local user.name 'Github Actions'
git config --local user.email 'github-actions@users.noreply.github.com'
git add --all
git commit -m "ci(chore): Fix stylings"
git push

12
.github/workflows/issuebot.yml vendored Normal file
View File

@ -0,0 +1,12 @@
name: Issuebot
on:
issues:
types: [opened, edited]
jobs:
new_issue:
name: Run Issuebot on new Issue
runs-on: ubuntu-latest
steps:
- uses: wfjsw/actions-gocqhttp-issue-prefilter@master

View File

@ -1,27 +1,48 @@
name: release
on: on:
release: push:
types: [created] tags:
- 'v*'
jobs: jobs:
releases-matrix: goreleaser:
name: Release Go Binary
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy:
matrix:
# build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/386, darwin/amd64
goos: [linux, windows, darwin]
goarch: ["386", amd64, arm]
exclude:
- goos: darwin
goarch: arm
steps: steps:
- uses: actions/checkout@v2 - name: Checkout
- uses: wangyoucao577/go-release-action@master uses: actions/checkout@v2.3.4
env:
CGO_ENABLED: 0
with: with:
github_token: ${{ secrets.GITHUB_TOKEN }} fetch-depth: 0
goos: ${{ matrix.goos }}
goarch: ${{ matrix.goarch }} - name: Set up Go
ldflags: "-w -s" uses: actions/setup-go@v2
with:
go-version: '1.16.2'
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2
with:
version: latest
args: release --rm-dist
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Checkout Dist
uses: actions/checkout@v2
with:
repository: 'wdvxdr1123/dist'
ref: master
ssh-key: ${{ secrets.SSH_KEY }}
path: upstream/dist
- name: Update Dist
run: |
cp dist/*.tar.gz upstream/dist/
cp dist/*.zip upstream/dist/
cd upstream/dist
git config --local user.name 'Github Actions'
git config --local user.email 'github-actions@users.noreply.github.com'
git add --all
git commit -m "update to ${GITHUB_REF#"refs/tags/"}"
git push

20
.github/workflows/suggester.yml vendored Normal file
View File

@ -0,0 +1,20 @@
name: Lint
on: [pull_request]
jobs:
golangci:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: golangci-lint
uses: golangci/golangci-lint-action@v2
with:
version: latest
- name: Suggester
uses: reviewdog/action-suggester@v1
with:
tool_name: golangci-lint

7
.gitignore vendored Normal file
View File

@ -0,0 +1,7 @@
vendor/
.idea
config.hjson
device.json
codec/
data/
logs/

92
.golangci.yml Normal file
View File

@ -0,0 +1,92 @@
linters-settings:
errcheck:
ignore: fmt:.*,io/ioutil:^Read.*
ignoretests: true
goimports:
local-prefixes: github.com/Mrs4s/go-cqhttp
gocritic:
disabled-checks:
- exitAfterDefer
forbidigo:
# Forbid the following identifiers
forbid:
- ^fmt\.Errorf$ # consider errors.Errorf in github.com/pkg/errors
linters:
# please, do not use `enable-all`: it's deprecated and will be removed soon.
# inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
disable-all: true
fast: false
enable:
- bodyclose
- deadcode
- depguard
- dogsled
- dupl
- errcheck
- exportloopref
- exhaustive
#- funlen
#- goconst
- gocritic
#- gocyclo
- gofmt
- goimports
- goprintffuncname
#- gosec
- gosimple
- govet
- ineffassign
- misspell
- nolintlint
- rowserrcheck
- staticcheck
- structcheck
- stylecheck
- typecheck
- unconvert
- unparam
- unused
- varcheck
- whitespace
- prealloc
- predeclared
- asciicheck
- revive
- forbidigo
- makezero
#- interfacer
# don't enable:
# - scopelint
# - gochecknoglobals
# - gocognit
# - godot
# - godox
# - goerr113
# - interfacer
# - maligned
# - nestif
# - testpackage
# - wsl
run:
# default concurrency is a available CPU number.
# concurrency: 4 # explicitly omit this value to fully utilize available resources.
deadline: 5m
issues-exit-code: 1
tests: false
# output configuration options
output:
format: 'colored-line-number'
print-issued-lines: true
print-linter-name: true
uniq-by-line: true
issues:
# Fix found issues (if it's supported by the linter)
fix: true

60
.goreleaser.yml Normal file
View File

@ -0,0 +1,60 @@
env:
- GO111MODULE=on
before:
hooks:
- go mod tidy
builds:
- env:
- CGO_ENABLED=0
- GO111MODULE=on
goos:
- linux
- darwin
- windows
goarch:
- 386
- amd64
- arm
- arm64
goarm:
- 7
ignore:
- goos: darwin
goarch: arm
- goos: darwin
goarch: 386
- goos: windows
goarch: arm64
mod_timestamp: '{{ .CommitTimestamp }}'
flags:
- -trimpath
ldflags:
- -s -w -X github.com/Mrs4s/go-cqhttp/coolq.Version=v{{.Version}}
checksum:
name_template: '{{ .ProjectName }}_checksums.txt'
changelog:
sort: asc
filters:
exclude:
- '^docs:'
- '^test:'
- fix typo
- Merge pull request
- Merge branch
- Merge remote-tracking
- go mod tidy
archives:
- name_template: '{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
format_overrides:
- goos: windows
format: zip
nfpms:
- license: AGPL 3.0
homepage: https://go-cqhttp.org
file_name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
formats:
- deb
- rpm

74
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,74 @@
# Contributing to go-cqhttp
想要成为 go-cqhttp 的 Contributor? Awesome!
这个页面提供了一些 Tips ,可能对您的开发提供一些帮助.
## 开发环境准备
go-cqhttp 使用了 `golangci-lint` 检查可能的问题,规范代码风格,为了减少不必要的麻烦,
我们推荐在开发环境中安装 `golangci-lint` 工具.
```shell
go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
```
在提交代码前运行 `golangci-lint` 检查你的代码:
```shell
golangci-lint run
```
**注意**: `golangci-lint` 需要 `diff` 工具,在 windows 环境中,你可能需要使用 `Git Bash` 运行。
## Pull requests
首先,为了方便项目管理,请将您的 PR 推送至**dev**分支。
### 检查 issue 列表
不管你是已经明确了要提交什么代码,还是正在寻找一个想法,你都应该先到 issue 列表看一下。
如果在 issue 中找到了感兴趣的,请在 issue 表明正在对这个 issue 进行开发。
### 项目结构
下面是 go-cqhttp 项目结构的简单介绍.
<table class="tg">
<tr>
<td>coolq</td>
<td>
包含与 MiraiGo 交互部分, CQ码解析等部分
</td>
</tr>
<tr>
<td>server</td>
<td>
包含 httpws 通信的实现部分
</td>
</tr>
<tr>
<td>global</td>
<td>
一个<del>实用的</del>工具包
</td>
</tr>
<tr>
<td>docs</td>
<td>
使用教程与文档
</td>
</tr>
</table>
## 社区准则
为了让社区保持强大,不断发展,我们向整个社区提出了一些通用准则:
**友善**:对社区成员要礼貌,尊重和礼貌。 请不要在社区中发布任何有关种族歧视、性别歧视、
地域歧视、人格侮辱等言论。
**鼓励参与**:在社区中讲礼貌的每个人都受到欢迎,无论他们的贡献程度如何,
我们鼓励一切人参与(不一定需要提交代码) `go-cqhttp` 的开发。
**紧贴主题**:请避免主题外的讨论。当您更新或回复时, 可能会给大量人员发送邮件,
请牢记,没有人喜欢垃圾邮件。

22
Dockerfile Normal file
View File

@ -0,0 +1,22 @@
FROM golang:1.15.5-alpine AS builder
RUN go env -w GO111MODULE=auto \
&& go env -w CGO_ENABLED=0 \
&& go env -w GOPROXY=https://goproxy.cn,direct
WORKDIR /build
COPY ./ .
RUN set -ex \
&& cd /build \
&& go build -ldflags "-s -w -extldflags '-static'" -o cqhttp
FROM alpine:latest
COPY --from=builder /build/cqhttp /usr/bin/cqhttp
RUN chmod +x /usr/bin/cqhttp
WORKDIR /data
ENTRYPOINT [ "/usr/bin/cqhttp" ]

319
README.md
View File

@ -1,95 +1,286 @@
<p align="center">
<a href="https://ishkong.github.io/go-cqhttp-docs/"><img src="https://i.loli.net/2020/12/20/qSLMDWxiocRQgu6.jpg" width="200" height="200" alt="go-cqhttp"></a>
</p>
<div align="center">
# go-cqhttp # go-cqhttp
使用 [mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://github.com/Mrs4s/MiraiGo) 开发的cqhttp golang原生实现, 并在[cqhttp原版](https://github.com/richardchien/coolq-http-api)的基础上做了部分修改和拓展.
文档暂时可查看 `docs` 目录, 目前还在撰写中.
测试版可前往 Release 下载 _✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://github.com/Mrs4s/MiraiGo) 的 [OneBot](https://github.com/howmanybots/onebot/blob/master/README.md) Golang 原生实现 ✨_
# 兼容性
#### 接口 </div>
<p align="center">
<a href="https://raw.githubusercontent.com/Mrs4s/go-cqhttp/master/LICENSE">
<img src="https://img.shields.io/github/license/Mrs4s/go-cqhttp" alt="license">
</a>
<a href="https://github.com/Mrs4s/go-cqhttp/releases">
<img src="https://img.shields.io/github/v/release/Mrs4s/go-cqhttp?color=blueviolet&include_prereleases" alt="release">
</a>
<a href="https://app.fossa.com/projects/git%2Bgithub.com%2FMrs4s%2Fgo-cqhttp?ref=badge_shield" alt="FOSSA Status"><img src="https://app.fossa.com/api/projects/git%2Bgithub.com%2FMrs4s%2Fgo-cqhttp.svg?type=shield"/></a>
<a href="https://github.com/howmanybots/onebot/blob/master/README.md">
<img src="https://img.shields.io/badge/OneBot-v11-blue?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABABAMAAABYR2ztAAAAIVBMVEUAAAAAAAADAwMHBwceHh4UFBQNDQ0ZGRkoKCgvLy8iIiLWSdWYAAAAAXRSTlMAQObYZgAAAQVJREFUSMftlM0RgjAQhV+0ATYK6i1Xb+iMd0qgBEqgBEuwBOxU2QDKsjvojQPvkJ/ZL5sXkgWrFirK4MibYUdE3OR2nEpuKz1/q8CdNxNQgthZCXYVLjyoDQftaKuniHHWRnPh2GCUetR2/9HsMAXyUT4/3UHwtQT2AggSCGKeSAsFnxBIOuAggdh3AKTL7pDuCyABcMb0aQP7aM4AnAbc/wHwA5D2wDHTTe56gIIOUA/4YYV2e1sg713PXdZJAuncdZMAGkAukU9OAn40O849+0ornPwT93rphWF0mgAbauUrEOthlX8Zu7P5A6kZyKCJy75hhw1Mgr9RAUvX7A3csGqZegEdniCx30c3agAAAABJRU5ErkJggg==" alt="cqhttp">
</a>
<a href="https://github.com/Mrs4s/go-cqhttp/actions">
<img src="https://github.com/Mrs4s/go-cqhttp/workflows/CI/badge.svg" alt="action">
</a>
<a href="https://goreportcard.com/report/github.com/Mrs4s/go-cqhttp">
<img src="https://goreportcard.com/badge/github.com/Mrs4s/go-cqhttp" alt="GoReportCard">
</a>
</p>
<p align="center">
<a href="https://docs.go-cqhttp.org/">文档</a>
·
<a href="https://github.com/Mrs4s/go-cqhttp/releases">下载</a>
·
<a href="https://docs.go-cqhttp.org/guide/quick_start.html">开始使用</a>
·
<a href="https://github.com/Mrs4s/go-cqhttp/blob/master/CONTRIBUTING.md">参与贡献</a>
</p>
## 兼容性
go-cqhttp兼容[OneBot-v11](https://github.com/howmanybots/onebot/tree/master/v11/specs)绝大多数内容并在其基础上做了一些扩展详情请看go-cqhttp的文档
### 接口
- [x] HTTP API - [x] HTTP API
- [x] 反向HTTP POST - [x] 反向 HTTP POST
- [x] 正向Websocket - [x] 正向 Websocket
- [x] 反向Websocket - [x] 反向 Websocket
#### 拓展支持 ### 拓展支持
> 拓展API可前往 [文档](docs/cqhttp.md) 查看
- [x] HTTP POST多点上报 > 拓展 API 可前往 [文档](docs/cqhttp.md) 查看
- [x] 反向WS多点连接
- [x] HTTP POST 多点上报
- [x] 反向 WS 多点连接
- [x] 修改群名 - [x] 修改群名
- [x] 消息撤回事件 - [x] 消息撤回事件
- [x] 解析/发送 回复消息 - [x] 解析/发送 回复消息
- [x] 解析/发送 合并转发 - [x] 解析/发送 合并转发
- [ ] 使用代理请求网络图片 - [x] 使用代理请求网络图片
### 实现
#### 实现
<details> <details>
<summary>已实现CQ码</summary> <summary>已实现CQ码</summary>
- [CQ:image] #### 符合 Onebot 标准的 CQ 码
- [CQ:face]
- [CQ:at] | CQ 码 | 功能 |
- [CQ:share] | ------------ | --------------------------- |
- [CQ:reply] | [CQ:face] | [QQ 表情] |
- [CQ:forward] | [CQ:record] | [语音] |
- [CQ:node] | [CQ:video] | [短视频] |
| [CQ:at] | [@某人] |
| [CQ:share] | [链接分享] |
| [CQ:music] | [音乐分享] [音乐自定义分享] |
| [CQ:reply] | [回复] |
| [CQ:forward] | [合并转发] |
| [CQ:node] | [合并转发节点] |
| [CQ:xml] | [XML 消息] |
| [CQ:json] | [JSON 消息] |
[qq 表情]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#qq-%E8%A1%A8%E6%83%85
[语音]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E8%AF%AD%E9%9F%B3
[短视频]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E7%9F%AD%E8%A7%86%E9%A2%91
[@某人]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E6%9F%90%E4%BA%BA
[链接分享]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E9%93%BE%E6%8E%A5%E5%88%86%E4%BA%AB
[音乐分享]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E9%9F%B3%E4%B9%90%E5%88%86%E4%BA%AB-
[音乐自定义分享]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E9%9F%B3%E4%B9%90%E8%87%AA%E5%AE%9A%E4%B9%89%E5%88%86%E4%BA%AB-
[回复]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E5%9B%9E%E5%A4%8D
[合并转发]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91-
[合并转发节点]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E8%8A%82%E7%82%B9-
[xml 消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#xml-%E6%B6%88%E6%81%AF
[json 消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#json-%E6%B6%88%E6%81%AF
#### 拓展 CQ 码及与 Onebot 标准有略微差异的 CQ 码
| 拓展 CQ 码 | 功能 |
| -------------- | --------------------------------- |
| [CQ:image] | [图片] |
| [CQ:redbag] | [红包] |
| [CQ:poke] | [戳一戳] |
| [CQ:gift] | [礼物] |
| [CQ:node] | [合并转发消息节点] |
| [CQ:cardimage] | [一种 xml 的图片消息(装逼大图)] |
| [CQ:tts] | [文本转语音] |
[图片]: docs/cqhttp.md#%E5%9B%BE%E7%89%87
[红包]: docs/cqhttp.md#%E7%BA%A2%E5%8C%85
[戳一戳]: docs/cqhttp.md#%E6%88%B3%E4%B8%80%E6%88%B3
[礼物]: docs/cqhttp.md#%E7%A4%BC%E7%89%A9
[合并转发消息节点]: docs/cqhttp.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E6%B6%88%E6%81%AF%E8%8A%82%E7%82%B9
[一种 xml 的图片消息(装逼大图)]: docs/cqhttp.md#cardimage-%E4%B8%80%E7%A7%8Dxml%E7%9A%84%E5%9B%BE%E7%89%87%E6%B6%88%E6%81%AF%E8%A3%85%E9%80%BC%E5%A4%A7%E5%9B%BE
[文本转语音]: docs/cqhttp.md#%E6%96%87%E6%9C%AC%E8%BD%AC%E8%AF%AD%E9%9F%B3
</details> </details>
<details> <details>
<summary>已实现API</summary> <summary>已实现API</summary>
##### 注意: 部分API实现与CQHTTP原版略有差异请参考文档 #### 符合 Onebot 标准的 API
| API | 功能 | | API | 功能 |
| ------------------------ | ------------------------------------------------------------ | | ------------------------ | ---------------------- |
| /get_login_info | [获取登录号信息](https://cqhttp.cc/docs/4.15/#/API?id=get_login_info-获取登录号信息) | | /send_private_msg | [发送私聊消息] |
| /get_friend_list | [获取好友列表](https://cqhttp.cc/docs/4.15/#/API?id=get_friend_list-获取好友列表) | | /send_group_msg | [发送群消息] |
| /get_group_list | [获取群列表](https://cqhttp.cc/docs/4.15/#/API?id=get_group_list-获取群列表) | | /send_msg | [发送消息] |
| /get_group_info | [获取群信息](https://cqhttp.cc/docs/4.15/#/API?id=get_group_info-获取群信息) | | /delete_msg | [撤回信息] |
| /get_group_member_list | [获取群成员列表](https://cqhttp.cc/docs/4.15/#/API?id=get_group_member_list-获取群成员列表) | | /set_group_kick | [群组踢人] |
| /get_group_member_info | [获取群成员信息](https://cqhttp.cc/docs/4.15/#/API?id=get_group_member_info-获取群成员信息) | | /set_group_ban | [群组单人禁言] |
| /send_msg | [发送消息](https://cqhttp.cc/docs/4.15/#/API?id=send_msg-发送消息) | | /set_group_whole_ban | [群组全员禁言] |
| /send_group_msg | [发送群消息](https://cqhttp.cc/docs/4.15/#/API?id=send_group_msg-发送群消息) | | /set_group_admin | [群组设置管理员] |
| /send_private_msg | [发送私聊消息](https://cqhttp.cc/docs/4.15/#/API?id=send_private_msg-发送私聊消息) | | /set_group_card | [设置群名片(群备注)] |
| /delete_msg | [撤回信息](https://cqhttp.cc/docs/4.15/#/API?id=delete_msg-撤回消息) | | /set_group_name | [设置群名] |
| /set_friend_add_request | [处理加好友请求](https://cqhttp.cc/docs/4.15/#/API?id=set_friend_add_request-处理加好友请求) | | /set_group_leave | [退出群组] |
| /set_group_add_request | [处理加群请求/邀请](https://cqhttp.cc/docs/4.15/#/API?id=set_group_add_request-处理加群请求/邀请) | | /set_group_special_title | [设置群组专属头衔] |
| /set_group_card | [设置群名片(群备注)](https://cqhttp.cc/docs/4.15/#/API?id=set_group_card-设置群名片(群备注)) | | /set_friend_add_request | [处理加好友请求] |
| /set_group_special_title | [设置群组专属头衔](https://cqhttp.cc/docs/4.15/#/API?id=set_group_special_title-设置群组专属头衔) | | /set_group_add_request | [处理加群请求/邀请] |
| /set_group_kick | [群组T人](https://cqhttp.cc/docs/4.15/#/API?id=set_group_kick-群组踢人) | | /get_login_info | [获取登录号信息] |
| /set_group_ban | [群组单人禁言](https://cqhttp.cc/docs/4.15/#/API?id=set_group_ban-群组单人禁言) | | /get_stranger_info | [获取陌生人信息] |
| /set_group_whole_ban | [群组全员禁言](https://cqhttp.cc/docs/4.15/#/API?id=set_group_whole_ban-群组全员禁言) | | /get_friend_list | [获取好友列表] |
| /set_group_leave | [退出群组](https://cqhttp.cc/docs/4.15/#/API?id=set_group_leave-退出群组) | | /get_group_info | [获取群信息] |
| /set_group_name | 设置群组名(拓展API) | | /get_group_list | [获取群列表] |
| /get_image | 获取图片信息(拓展API) | | /get_group_member_info | [获取群成员信息] |
| /get_group_msg | 获取群组消息(拓展API) | | /get_group_member_list | [获取群成员列表] |
| /can_send_image | [检查是否可以发送图片](https://cqhttp.cc/docs/4.15/#/API?id=can_send_image-检查是否可以发送图片) | | /get_group_honor_info | [获取群荣誉信息] |
| /can_send_record | [检查是否可以发送语音](https://cqhttp.cc/docs/4.15/#/API?id=can_send_record-检查是否可以发送语音) | | /can_send_image | [检查是否可以发送图片] |
| /get_status | [获取插件运行状态](https://cqhttp.cc/docs/4.15/#/API?id=get_status-获取插件运行状态) | | /can_send_record | [检查是否可以发送语音] |
| /get_version_info | [获取 酷Q 及 CQHTTP插件的版本信息](https://cqhttp.cc/docs/4.15/#/API?id=get_version_info-获取-酷q-及-cqhttp-插件的版本信息) | | /get_version_info | [获取版本信息] |
| /set_restart | [重启 go-cqhttp] |
| /.handle_quick_operation | [对事件执行快速操作] |
[发送私聊消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_private_msg-%E5%8F%91%E9%80%81%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF
[发送群消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_group_msg-%E5%8F%91%E9%80%81%E7%BE%A4%E6%B6%88%E6%81%AF
[发送消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_msg-%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF
[撤回信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#delete_msg-%E6%92%A4%E5%9B%9E%E6%B6%88%E6%81%AF
[群组踢人]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_kick-%E7%BE%A4%E7%BB%84%E8%B8%A2%E4%BA%BA
[群组单人禁言]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_ban-%E7%BE%A4%E7%BB%84%E5%8D%95%E4%BA%BA%E7%A6%81%E8%A8%80
[群组全员禁言]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_whole_ban-%E7%BE%A4%E7%BB%84%E5%85%A8%E5%91%98%E7%A6%81%E8%A8%80
[群组设置管理员]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_admin-%E7%BE%A4%E7%BB%84%E8%AE%BE%E7%BD%AE%E7%AE%A1%E7%90%86%E5%91%98
[设置群名片(群备注)]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_card-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D%E7%89%87%E7%BE%A4%E5%A4%87%E6%B3%A8
[设置群名]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_name-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D
[退出群组]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_leave-%E9%80%80%E5%87%BA%E7%BE%A4%E7%BB%84
[设置群组专属头衔]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_special_title-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E7%BB%84%E4%B8%93%E5%B1%9E%E5%A4%B4%E8%A1%94
[处理加好友请求]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_friend_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82
[处理加群请求/邀请]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7
[获取登录号信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_login_info-%E8%8E%B7%E5%8F%96%E7%99%BB%E5%BD%95%E5%8F%B7%E4%BF%A1%E6%81%AF
[获取陌生人信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_stranger_info-%E8%8E%B7%E5%8F%96%E9%99%8C%E7%94%9F%E4%BA%BA%E4%BF%A1%E6%81%AF
[获取好友列表]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_friend_list-%E8%8E%B7%E5%8F%96%E5%A5%BD%E5%8F%8B%E5%88%97%E8%A1%A8
[获取群信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E4%BF%A1%E6%81%AF
[获取群列表]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%88%97%E8%A1%A8
[获取群成员信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E4%BF%A1%E6%81%AF
[获取群成员列表]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8
[获取群荣誉信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_honor_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E8%8D%A3%E8%AA%89%E4%BF%A1%E6%81%AF
[检查是否可以发送图片]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_image-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E5%9B%BE%E7%89%87
[检查是否可以发送语音]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_record-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E8%AF%AD%E9%9F%B3
[获取版本信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_version_info-%E8%8E%B7%E5%8F%96%E7%89%88%E6%9C%AC%E4%BF%A1%E6%81%AF
[重启 go-cqhttp]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_restart-%E9%87%8D%E5%90%AF-onebot-%E5%AE%9E%E7%8E%B0
[对事件执行快速操作]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/hidden.md#handle_quick_operation-%E5%AF%B9%E4%BA%8B%E4%BB%B6%E6%89%A7%E8%A1%8C%E5%BF%AB%E9%80%9F%E6%93%8D%E4%BD%9C
#### 拓展 API 及与 Onebot 标准有略微差异的 API
| 拓展 API | 功能 |
| --------------------------- | ---------------------- |
| /set_group_portrait | [设置群头像] |
| /get_image | [获取图片信息] |
| /get_msg | [获取消息] |
| /get_forward_msg | [获取合并转发内容] |
| /send_group_forward_msg | [发送合并转发(群)] |
| /.get_word_slices | [获取中文分词] |
| /.ocr_image | [图片 OCR] |
| /get_group_system_msg | [获取群系统消息] |
| /get_group_file_system_info | [获取群文件系统信息] |
| /get_group_root_files | [获取群根目录文件列表] |
| /get_group_files_by_folder | [获取群子目录文件列表] |
| /get_group_file_url | [获取群文件资源链接] |
| /get_status | [获取状态] |
[设置群头像]: docs/cqhttp.md#%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%A4%B4%E5%83%8F
[获取图片信息]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E5%9B%BE%E7%89%87%E4%BF%A1%E6%81%AF
[获取消息]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E6%B6%88%E6%81%AF
[获取合并转发内容]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E5%86%85%E5%AE%B9
[发送合并转发(群)]: docs/cqhttp.md#%E5%8F%91%E9%80%81%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E7%BE%A4
[获取中文分词]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E4%B8%AD%E6%96%87%E5%88%86%E8%AF%8D
[图片 ocr]: docs/cqhttp.md#%E5%9B%BE%E7%89%87ocr
[获取群系统消息]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%BE%A4%E7%B3%BB%E7%BB%9F%E6%B6%88%E6%81%AF
[获取群文件系统信息]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%96%87%E4%BB%B6%E7%B3%BB%E7%BB%9F%E4%BF%A1%E6%81%AF
[获取群根目录文件列表]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%A0%B9%E7%9B%AE%E5%BD%95%E6%96%87%E4%BB%B6%E5%88%97%E8%A1%A8
[获取群子目录文件列表]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%AD%90%E7%9B%AE%E5%BD%95%E6%96%87%E4%BB%B6%E5%88%97%E8%A1%A8
[获取群文件资源链接]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%96%87%E4%BB%B6%E8%B5%84%E6%BA%90%E9%93%BE%E6%8E%A5
[获取状态]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%8A%B6%E6%80%81
</details> </details>
<details> <details>
<summary>已实现Event</summary> <summary>已实现Event</summary>
##### 注意: 部分Event数据与CQHTTP原版略有差异请参考文档 #### 符合 Onebot 标准的 Event部分 Event 比 Onebot 标准多上报几个字段,不影响使用)
| Event |
| ------------------------------------------------------------ | | 事件类型 | Event |
| [私聊信息](https://cqhttp.cc/docs/4.15/#/Post?id=私聊消息) | | -------- | ---------------- |
| [群消息](https://cqhttp.cc/docs/4.15/#/Post?id=群消息) | | 消息事件 | [私聊信息] |
| [群消息撤回(拓展Event)](docs/cqhttp.md#群消息撤回) | | 消息事件 | [群消息] |
| [好友消息撤回(拓展Event)](docs/cqhttp.md#好友消息撤回) | | 通知事件 | [群文件上传] |
| [群管理员变动](https://cqhttp.cc/docs/4.15/#/Post?id=群管理员变动) | | 通知事件 | [群管理员变动] |
| [群成员减少](https://cqhttp.cc/docs/4.15/#/Post?id=群成员减少) | | 通知事件 | [群成员减少] |
| [群成员增加](https://cqhttp.cc/docs/4.15/#/Post?id=群成员增加) | | 通知事件 | [群成员增加] |
| [群禁言](https://cqhttp.cc/docs/4.15/#/Post?id=群禁言) | | 通知事件 | [群禁言] |
| [群文件上传](https://cqhttp.cc/docs/4.15/#/Post?id=群文件上传)| | 通知事件 | [好友添加] |
| [加好友请求](https://cqhttp.cc/docs/4.15/#/Post?id=加好友请求) | | 通知事件 | [群消息撤回] |
| [加群请求/邀请](https://cqhttp.cc/docs/4.15/#/Post?id=加群请求/邀请) | | 通知事件 | [好友消息撤回] |
| 通知事件 | [群内戳一戳] |
| 通知事件 | [群红包运气王] |
| 通知事件 | [群成员荣誉变更] |
| 请求事件 | [加好友请求] |
| 请求事件 | [加群请求/邀请] |
[私聊信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/message.md#%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF
[群消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/message.md#%E7%BE%A4%E6%B6%88%E6%81%AF
[群文件上传]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%96%87%E4%BB%B6%E4%B8%8A%E4%BC%A0
[群管理员变动]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%AE%A1%E7%90%86%E5%91%98%E5%8F%98%E5%8A%A8
[群成员减少]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%87%8F%E5%B0%91
[群成员增加]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%A2%9E%E5%8A%A0
[群禁言]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%A6%81%E8%A8%80
[好友添加]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E5%A5%BD%E5%8F%8B%E6%B7%BB%E5%8A%A0
[群消息撤回]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%B6%88%E6%81%AF%E6%92%A4%E5%9B%9E
[好友消息撤回]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E5%A5%BD%E5%8F%8B%E6%B6%88%E6%81%AF%E6%92%A4%E5%9B%9E
[群内戳一戳]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E5%86%85%E6%88%B3%E4%B8%80%E6%88%B3
[群红包运气王]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%BA%A2%E5%8C%85%E8%BF%90%E6%B0%94%E7%8E%8B
[群成员荣誉变更]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E8%8D%A3%E8%AA%89%E5%8F%98%E6%9B%B4
[加好友请求]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/request.md#%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82
[加群请求/邀请]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/request.md#%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7
#### 拓展 Event
| 事件类型 | 拓展 Event |
| -------- | ---------------- |
| 通知事件 | [好友戳一戳] |
| 通知事件 | [群成员名片更新] |
| 通知事件 | [接收到离线文件] |
[好友戳一戳]: docs/cqhttp.md#%E5%A5%BD%E5%8F%8B%E6%88%B3%E4%B8%80%E6%88%B3
[群成员名片更新]: docs/cqhttp.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%90%8D%E7%89%87%E6%9B%B4%E6%96%B0
[接收到离线文件]: docs/cqhttp.md#%E6%8E%A5%E6%94%B6%E5%88%B0%E7%A6%BB%E7%BA%BF%E6%96%87%E4%BB%B6
</details> </details>
# 性能 ## 关于 ISSUE
在关闭数据库的情况下, 加载25个好友128个群运行24小时后内存使用为10MB左右. 开启数据库后内存使用将根据消息量增加10-20MB, 如果系统内存小于128M建议关闭数据库使用. 以下 ISSUE 会被直接关闭
- 提交 BUG 不使用 Template
- 询问已知问题
- 提问找不到重点
- 重复提问
> 请注意, 开发者并没有义务回复您的问题. 您应该具备基本的提问技巧。
> 有关如何提问,请阅读[《提问的智慧》](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/main/README-zh_CN.md)
## 性能
在关闭数据库的情况下, 加载 25 个好友 128 个群运行 24 小时后内存使用为 15MB 左右. 开启数据库后内存使用将根据消息量增加 10-20MB, 如果系统内存小于 128M 建议关闭数据库使用.

File diff suppressed because it is too large Load Diff

View File

@ -3,42 +3,56 @@ package coolq
import ( import (
"bytes" "bytes"
"encoding/gob" "encoding/gob"
"encoding/json" "encoding/hex"
"fmt" "fmt"
"hash/crc32"
"io"
"os"
"path"
"runtime/debug"
"sync"
"time"
"github.com/Mrs4s/go-cqhttp/global"
"github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/binary"
"github.com/Mrs4s/MiraiGo/client" "github.com/Mrs4s/MiraiGo/client"
"github.com/Mrs4s/MiraiGo/message" "github.com/Mrs4s/MiraiGo/message"
"github.com/Mrs4s/go-cqhttp/global" "github.com/Mrs4s/MiraiGo/utils"
jsoniter "github.com/json-iterator/go"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/xujiajun/nutsdb" "github.com/syndtr/goleveldb/leveldb"
"hash/crc32"
"path"
"sync"
) )
var json = jsoniter.ConfigCompatibleWithStandardLibrary
// CQBot CQBot结构体,存储Bot实例相关配置
type CQBot struct { type CQBot struct {
Client *client.QQClient Client *client.QQClient
events []func(MSG) events []func(*bytes.Buffer)
db *nutsdb.DB db *leveldb.DB
friendReqCache sync.Map friendReqCache sync.Map
invitedReqCache sync.Map tempMsgCache sync.Map
joinReqCache sync.Map oneWayMsgCache sync.Map
} }
// MSG 消息Map
type MSG map[string]interface{} type MSG map[string]interface{}
func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot { // ForceFragmented 是否启用强制分片
var ForceFragmented = false
// NewQQBot 初始化一个QQBot实例
func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
bot := &CQBot{ bot := &CQBot{
Client: cli, Client: cli,
} }
if conf.EnableDB { if conf.EnableDB {
opt := nutsdb.DefaultOptions p := path.Join("data", "leveldb")
opt.Dir = path.Join("data", "db") db, err := leveldb.OpenFile(p, nil)
opt.EntryIdxMode = nutsdb.HintBPTSparseIdxMode
db, err := nutsdb.Open(opt)
if err != nil { if err != nil {
log.Fatalf("打开数据库失败, 如果频繁遇到此问题请清理 data/db 文件夹或关闭数据库功能。") log.Fatalf("打开数据库失败, 如果频繁遇到此问题请清理 data/leveldb 文件夹或关闭数据库功能。")
} }
bot.db = db bot.db = db
gob.Register(message.Sender{}) gob.Register(message.Sender{})
@ -48,83 +62,280 @@ func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot {
} }
bot.Client.OnPrivateMessage(bot.privateMessageEvent) bot.Client.OnPrivateMessage(bot.privateMessageEvent)
bot.Client.OnGroupMessage(bot.groupMessageEvent) bot.Client.OnGroupMessage(bot.groupMessageEvent)
if conf.EnableSelfMessage {
bot.Client.OnSelfPrivateMessage(bot.privateMessageEvent)
bot.Client.OnSelfGroupMessage(bot.groupMessageEvent)
}
bot.Client.OnTempMessage(bot.tempMessageEvent) bot.Client.OnTempMessage(bot.tempMessageEvent)
bot.Client.OnGroupMuted(bot.groupMutedEvent) bot.Client.OnGroupMuted(bot.groupMutedEvent)
bot.Client.OnGroupMessageRecalled(bot.groupRecallEvent) bot.Client.OnGroupMessageRecalled(bot.groupRecallEvent)
bot.Client.OnGroupNotify(bot.groupNotifyEvent)
bot.Client.OnFriendNotify(bot.friendNotifyEvent)
bot.Client.OnFriendMessageRecalled(bot.friendRecallEvent) bot.Client.OnFriendMessageRecalled(bot.friendRecallEvent)
bot.Client.OnReceivedOfflineFile(bot.offlineFileEvent)
bot.Client.OnJoinGroup(bot.joinGroupEvent) bot.Client.OnJoinGroup(bot.joinGroupEvent)
bot.Client.OnLeaveGroup(bot.leaveGroupEvent) bot.Client.OnLeaveGroup(bot.leaveGroupEvent)
bot.Client.OnGroupMemberJoined(bot.memberJoinEvent) bot.Client.OnGroupMemberJoined(bot.memberJoinEvent)
bot.Client.OnGroupMemberLeaved(bot.memberLeaveEvent) bot.Client.OnGroupMemberLeaved(bot.memberLeaveEvent)
bot.Client.OnGroupMemberPermissionChanged(bot.memberPermissionChangedEvent) bot.Client.OnGroupMemberPermissionChanged(bot.memberPermissionChangedEvent)
bot.Client.OnGroupMemberCardUpdated(bot.memberCardUpdatedEvent)
bot.Client.OnNewFriendRequest(bot.friendRequestEvent) bot.Client.OnNewFriendRequest(bot.friendRequestEvent)
bot.Client.OnNewFriendAdded(bot.friendAddedEvent)
bot.Client.OnGroupInvited(bot.groupInvitedEvent) bot.Client.OnGroupInvited(bot.groupInvitedEvent)
bot.Client.OnUserWantJoinGroup(bot.groupJoinReqEvent) bot.Client.OnUserWantJoinGroup(bot.groupJoinReqEvent)
bot.Client.OnOtherClientStatusChanged(bot.otherClientStatusChangedEvent)
bot.Client.OnGroupDigest(bot.groupEssenceMsg)
go func() {
i := conf.HeartbeatInterval
if i < 0 {
log.Warn("警告: 心跳功能已关闭,若非预期,请检查配置文件。")
return
}
if i == 0 {
i = 5
}
for {
time.Sleep(time.Second * i)
bot.dispatchEventMessage(MSG{
"time": time.Now().Unix(),
"self_id": bot.Client.Uin,
"post_type": "meta_event",
"meta_event_type": "heartbeat",
"status": bot.CQGetStatus()["data"],
"interval": 1000 * i,
})
}
}()
return bot return bot
} }
func (bot *CQBot) OnEventPush(f func(m MSG)) { // OnEventPush 注册事件上报函数
func (bot *CQBot) OnEventPush(f func(buf *bytes.Buffer)) {
bot.events = append(bot.events, f) bot.events = append(bot.events, f)
} }
func (bot *CQBot) GetGroupMessage(mid int32) MSG { // GetMessage 获取给定消息id对应的消息
func (bot *CQBot) GetMessage(mid int32) MSG {
if bot.db != nil { if bot.db != nil {
m := MSG{} m := MSG{}
err := bot.db.View(func(tx *nutsdb.Tx) error { data, err := bot.db.Get(binary.ToBytes(mid), nil)
e, err := tx.Get("group-messages", binary.ToBytes(mid)) if err == nil {
if err != nil { buff := global.NewBuffer()
return err defer global.PutBuffer(buff)
} buff.Write(binary.GZipUncompress(data))
buff := new(bytes.Buffer) err = gob.NewDecoder(buff).Decode(&m)
buff.Write(binary.GZipUncompress(e.Value))
return gob.NewDecoder(buff).Decode(&m)
})
if err == nil { if err == nil {
return m return m
} }
log.Warnf("获取信息时出现错误: %v", err) }
log.Warnf("获取信息时出现错误: %v id: %v", err, mid)
} }
return nil return nil
} }
func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int32 { // UploadLocalImageAsGroup 上传本地图片至群聊
var newElem []message.IMessageElement func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (*message.GroupImageElement, error) {
for _, elem := range m.Elements { if img.Stream != nil {
if i, ok := elem.(*message.ImageElement); ok { return bot.Client.UploadGroupImage(groupCode, img.Stream)
gm, err := bot.Client.UploadGroupImage(groupId, i.Data) }
return bot.Client.UploadGroupImageByFile(groupCode, img.File)
}
// UploadLocalVideo 上传本地短视频至群聊
func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message.ShortVideoElement, error) {
if v.File != "" {
video, err := os.Open(v.File)
if err != nil { if err != nil {
log.Warnf("警告: 群 %v 消息图片上传失败: %v", groupId, err) return nil, err
}
defer video.Close()
hash, _ := utils.ComputeMd5AndLength(io.MultiReader(video, v.thumb))
cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash)+".cache")
_, _ = video.Seek(0, io.SeekStart)
_, _ = v.thumb.Seek(0, io.SeekStart)
return bot.Client.UploadGroupShortVideo(target, video, v.thumb, cacheFile)
}
return &v.ShortVideoElement, nil
}
// UploadLocalImageAsPrivate 上传本地图片至私聊
func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement) (*message.FriendImageElement, error) {
if img.Stream != nil {
return bot.Client.UploadPrivateImage(userID, img.Stream)
}
// need update.
f, err := os.Open(img.File)
if err != nil {
return nil, err
}
defer f.Close()
return bot.Client.UploadPrivateImage(userID, f)
}
// SendGroupMessage 发送群消息
func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int32 {
var newElem = make([]message.IMessageElement, 0, len(m.Elements))
group := bot.Client.FindGroup(groupID)
for _, elem := range m.Elements {
if i, ok := elem.(*LocalImageElement); ok {
gm, err := bot.UploadLocalImageAsGroup(groupID, i)
if err != nil {
log.Warnf("警告: 群 %v 消息图片上传失败: %v", groupID, err)
continue continue
} }
newElem = append(newElem, gm) newElem = append(newElem, gm)
continue continue
} }
if i, ok := elem.(*message.VoiceElement); ok {
gv, err := bot.Client.UploadGroupPtt(groupID, bytes.NewReader(i.Data))
if err != nil {
log.Warnf("警告: 群 %v 消息语音上传失败: %v", groupID, err)
continue
}
newElem = append(newElem, gv)
continue
}
if i, ok := elem.(*LocalVideoElement); ok {
gv, err := bot.UploadLocalVideo(groupID, i)
if err != nil {
log.Warnf("警告: 群 %v 消息短视频上传失败: %v", groupID, err)
continue
}
newElem = append(newElem, gv)
continue
}
if i, ok := elem.(*PokeElement); ok {
if group := bot.Client.FindGroup(groupID); group != nil {
if mem := group.FindMember(i.Target); mem != nil {
mem.Poke()
return 0
}
}
}
if i, ok := elem.(*GiftElement); ok {
bot.Client.SendGroupGift(uint64(groupID), uint64(i.Target), i.GiftID)
return 0
}
if i, ok := elem.(*message.MusicShareElement); ok {
ret, err := bot.Client.SendGroupMusicShare(groupID, i)
if err != nil {
log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupID, err)
return -1
}
return bot.InsertGroupMessage(ret)
}
if i, ok := elem.(*message.AtElement); ok && i.Target == 0 && group.SelfPermission() == client.Member {
newElem = append(newElem, message.NewText("@全体成员"))
continue
}
newElem = append(newElem, elem) newElem = append(newElem, elem)
} }
if len(newElem) == 0 {
log.Warnf("群消息发送失败: 消息为空.")
return -1
}
m.Elements = newElem m.Elements = newElem
ret := bot.Client.SendGroupMessage(groupId, m) bot.checkMedia(newElem)
ret := bot.Client.SendGroupMessage(groupID, m, ForceFragmented)
if ret == nil || ret.Id == -1 {
log.Warnf("群消息发送失败: 账号可能被风控.")
return -1
}
return bot.InsertGroupMessage(ret) return bot.InsertGroupMessage(ret)
} }
func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) int32 { // SendPrivateMessage 发送私聊消息
var newElem []message.IMessageElement func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.SendingMessage) int32 {
var newElem = make([]message.IMessageElement, 0, len(m.Elements))
for _, elem := range m.Elements { for _, elem := range m.Elements {
if i, ok := elem.(*message.ImageElement); ok { if i, ok := elem.(*LocalImageElement); ok {
fm, err := bot.Client.UploadPrivateImage(target, i.Data) fm, err := bot.UploadLocalImageAsPrivate(target, i)
if err != nil { if err != nil {
log.Warnf("警告: 好友 %v 消息图片上传失败.", target) log.Warnf("警告: 私聊 %v 消息图片上传失败.", target)
continue continue
} }
newElem = append(newElem, fm) newElem = append(newElem, fm)
continue continue
} }
if i, ok := elem.(*PokeElement); ok {
bot.Client.SendFriendPoke(i.Target)
return 0
}
if i, ok := elem.(*message.VoiceElement); ok {
fv, err := bot.Client.UploadPrivatePtt(target, i.Data)
if err != nil {
log.Warnf("警告: 私聊 %v 消息语音上传失败: %v", target, err)
continue
}
newElem = append(newElem, fv)
continue
}
if i, ok := elem.(*LocalVideoElement); ok {
gv, err := bot.UploadLocalVideo(target, i)
if err != nil {
log.Warnf("警告: 私聊 %v 消息短视频上传失败: %v", target, err)
continue
}
newElem = append(newElem, gv)
continue
}
if i, ok := elem.(*message.MusicShareElement); ok {
bot.Client.SendFriendMusicShare(target, i)
return 0
}
newElem = append(newElem, elem) newElem = append(newElem, elem)
} }
if len(newElem) == 0 {
log.Warnf("好友消息发送失败: 消息为空.")
return -1
}
m.Elements = newElem m.Elements = newElem
ret := bot.Client.SendPrivateMessage(target, m) bot.checkMedia(newElem)
return ToGlobalId(target, ret.Id) var id int32 = -1
if bot.Client.FindFriend(target) != nil { // 双向好友
msg := bot.Client.SendPrivateMessage(target, m)
if msg != nil {
id = bot.InsertPrivateMessage(msg)
}
} else if code, ok := bot.tempMsgCache.Load(target); ok || groupID != 0 { // 临时会话
switch {
case bot.Client.FindGroup(groupID) == nil:
log.Errorf("错误: 找不到群(%v)", groupID)
id = -1
case groupID != 0 && !bot.Client.FindGroup(groupID).AdministratorOrOwner():
log.Errorf("错误: 机器人在群(%v) 为非管理员或群主, 无法主动发起临时会话", groupID)
id = -1
case groupID != 0 && bot.Client.FindGroup(groupID).FindMember(target) == nil:
log.Errorf("错误: 群员(%v) 不在 群(%v), 无法发起临时会话", target, groupID)
id = -1
default:
if code != nil {
groupID = code.(int64)
}
msg := bot.Client.SendTempMessage(groupID, target, m)
if msg != nil {
id = bot.InsertTempMessage(target, msg)
}
}
} else if _, ok := bot.oneWayMsgCache.Load(target); ok { // 单向好友
msg := bot.Client.SendPrivateMessage(target, m)
if msg != nil {
id = bot.InsertPrivateMessage(msg)
}
} else {
nickname := "Unknown"
if summaryInfo, _ := bot.Client.GetSummaryInfo(target); summaryInfo != nil {
nickname = summaryInfo.Nickname
}
log.Errorf("错误: 请先添加 %v(%v) 为好友", nickname, target)
}
if id == -1 {
return -1
}
return id
} }
// InsertGroupMessage 群聊消息入数据库
func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 { func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
val := MSG{ val := MSG{
"message-id": m.Id, "message-id": m.Id,
@ -135,16 +346,15 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
"time": m.Time, "time": m.Time,
"message": ToStringMessage(m.Elements, m.GroupCode, true), "message": ToStringMessage(m.Elements, m.GroupCode, true),
} }
id := ToGlobalId(m.GroupCode, m.Id) id := toGlobalID(m.GroupCode, m.Id)
if bot.db != nil { if bot.db != nil {
err := bot.db.Update(func(tx *nutsdb.Tx) error { buf := global.NewBuffer()
buf := new(bytes.Buffer) defer global.PutBuffer(buf)
if err := gob.NewEncoder(buf).Encode(val); err != nil { if err := gob.NewEncoder(buf).Encode(val); err != nil {
return err log.Warnf("记录聊天数据时出现错误: %v", err)
return -1
} }
return tx.Put("group-messages", binary.ToBytes(id), binary.GZipCompress(buf.Bytes()), 0) if err := bot.db.Put(binary.ToBytes(id), binary.GZipCompress(buf.Bytes()), nil); err != nil {
})
if err != nil {
log.Warnf("记录聊天数据时出现错误: %v", err) log.Warnf("记录聊天数据时出现错误: %v", err)
return -1 return -1
} }
@ -152,10 +362,66 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
return id return id
} }
func ToGlobalId(code int64, msgId int32) int32 { // InsertPrivateMessage 私聊消息入数据库
return int32(crc32.ChecksumIEEE([]byte(fmt.Sprintf("%d-%d", code, msgId)))) func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
val := MSG{
"message-id": m.Id,
"internal-id": m.InternalId,
"target": m.Target,
"sender": m.Sender,
"time": m.Time,
"message": ToStringMessage(m.Elements, m.Sender.Uin, true),
}
id := toGlobalID(m.Sender.Uin, m.Id)
if bot.db != nil {
buf := global.NewBuffer()
defer global.PutBuffer(buf)
if err := gob.NewEncoder(buf).Encode(val); err != nil {
log.Warnf("记录聊天数据时出现错误: %v", err)
return -1
}
if err := bot.db.Put(binary.ToBytes(id), binary.GZipCompress(buf.Bytes()), nil); err != nil {
log.Warnf("记录聊天数据时出现错误: %v", err)
return -1
}
}
return id
} }
// InsertTempMessage 临时消息入数据库
func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32 {
val := MSG{
"message-id": m.Id,
// FIXME(InsertTempMessage) InternalId missing
"group": m.GroupCode,
"group-name": m.GroupName,
"target": target,
"sender": m.Sender,
"time": time.Now().Unix(),
"message": ToStringMessage(m.Elements, m.Sender.Uin, true),
}
id := toGlobalID(m.Sender.Uin, m.Id)
if bot.db != nil {
buf := global.NewBuffer()
defer global.PutBuffer(buf)
if err := gob.NewEncoder(buf).Encode(val); err != nil {
log.Warnf("记录聊天数据时出现错误: %v", err)
return -1
}
if err := bot.db.Put(binary.ToBytes(id), binary.GZipCompress(buf.Bytes()), nil); err != nil {
log.Warnf("记录聊天数据时出现错误: %v", err)
return -1
}
}
return id
}
// toGlobalID 构建`code`-`msgID`的字符串并返回其CRC32 Checksum的值
func toGlobalID(code int64, msgID int32) int32 {
return int32(crc32.ChecksumIEEE([]byte(fmt.Sprintf("%d-%d", code, msgID))))
}
// Release 释放Bot实例
func (bot *CQBot) Release() { func (bot *CQBot) Release() {
if bot.db != nil { if bot.db != nil {
_ = bot.db.Close() _ = bot.db.Close()
@ -163,9 +429,104 @@ func (bot *CQBot) Release() {
} }
func (bot *CQBot) dispatchEventMessage(m MSG) { func (bot *CQBot) dispatchEventMessage(m MSG) {
for _, f := range bot.events { if global.EventFilter != nil && !global.EventFilter.Eval(global.MSG(m)) {
f(m) log.Debug("Event filtered!")
return
} }
buf := global.NewBuffer()
wg := sync.WaitGroup{}
wg.Add(len(bot.events))
_ = json.NewEncoder(buf).Encode(m)
for _, f := range bot.events {
go func(fn func(*bytes.Buffer)) {
defer func() {
wg.Done()
if pan := recover(); pan != nil {
log.Warnf("处理事件 %v 时出现错误: %v \n%s", m, pan, debug.Stack())
}
}()
start := time.Now()
fn(buf)
end := time.Now()
if end.Sub(start) > time.Second*5 {
log.Debugf("警告: 事件处理耗时超过 5 秒 (%v), 请检查应用是否有堵塞.", end.Sub(start))
}
}(f)
}
wg.Wait()
global.PutBuffer(buf)
}
func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
cqm := ToStringMessage(m.Elements, m.GroupCode, true)
gm := MSG{
"anonymous": nil,
"font": 0,
"group_id": m.GroupCode,
"message": ToFormattedMessage(m.Elements, m.GroupCode, false),
"message_type": "group",
"message_seq": m.Id,
"post_type": func() string {
if m.Sender.Uin == bot.Client.Uin {
return "message_sent"
}
return "message"
}(),
"raw_message": cqm,
"self_id": bot.Client.Uin,
"sender": MSG{
"age": 0,
"area": "",
"level": "",
"sex": "unknown",
"user_id": m.Sender.Uin,
},
"sub_type": "normal",
"time": time.Now().Unix(),
"user_id": m.Sender.Uin,
}
if m.Sender.IsAnonymous() {
gm["anonymous"] = MSG{
"flag": m.Sender.AnonymousInfo.AnonymousId + "|" + m.Sender.AnonymousInfo.AnonymousNick,
"id": m.Sender.Uin,
"name": m.Sender.AnonymousInfo.AnonymousNick,
}
gm["sender"].(MSG)["nickname"] = "匿名消息"
gm["sub_type"] = "anonymous"
} else {
group := bot.Client.FindGroup(m.GroupCode)
mem := group.FindMember(m.Sender.Uin)
if mem == nil {
log.Warnf("获取 %v 成员信息失败,尝试刷新成员列表", m.Sender.Uin)
t, err := bot.Client.GetGroupMembers(group)
if err != nil {
log.Warnf("刷新群 %v 成员列表失败: %v", group.Uin, err)
return nil
}
group.Members = t
mem = group.FindMember(m.Sender.Uin)
if mem == nil {
return nil
}
}
ms := gm["sender"].(MSG)
ms["role"] = func() string {
switch mem.Permission {
case client.Owner:
return "owner"
case client.Administrator:
return "admin"
case client.Member:
return "member"
default:
return "member"
}
}()
ms["nickname"] = mem.Nickname
ms["card"] = mem.CardName
ms["title"] = mem.SpecialTitle
}
return gm
} }
func formatGroupName(group *client.GroupInfo) string { func formatGroupName(group *client.GroupInfo) string {
@ -173,10 +534,14 @@ func formatGroupName(group *client.GroupInfo) string {
} }
func formatMemberName(mem *client.GroupMemberInfo) string { func formatMemberName(mem *client.GroupMemberInfo) string {
if mem == nil {
return "未知"
}
return fmt.Sprintf("%s(%d)", mem.DisplayName(), mem.Uin) return fmt.Sprintf("%s(%d)", mem.DisplayName(), mem.Uin)
} }
func (m MSG) ToJson() string { // ToJSON 生成JSON字符串
func (m MSG) ToJSON() string {
b, _ := json.Marshal(m) b, _ := json.Marshal(m)
return string(b) return string(b)
} }

File diff suppressed because it is too large Load Diff

25
coolq/cqcode_test.go Normal file
View File

@ -0,0 +1,25 @@
package coolq
import (
"fmt"
"testing"
"github.com/Mrs4s/MiraiGo/client"
"github.com/Mrs4s/go-cqhttp/global"
)
var bot = NewQQBot(client.NewClient(1, ""), global.DefaultConfig())
func TestCQBot_ConvertStringMessage(t *testing.T) {
for _, v := range bot.ConvertStringMessage(`[CQ:face,id=115,text=111][CQ:face,id=217]] [CQ:text,text=123] [`, false) {
fmt.Println(v)
}
}
var bench = `asdfqwerqwerqwer[CQ:face,id=115,text=111]asdfasdfasdfasdfasdfasdfasd[CQ:face,id=217]] [CQ:text,text=123] [`
func BenchmarkCQBot_ConvertStringMessage(b *testing.B) {
for i := 0; i < b.N; i++ {
bot.ConvertStringMessage(bench, false)
}
}

2
coolq/doc.go Normal file
View File

@ -0,0 +1,2 @@
// Package coolq 包含CQBot实例,CQ码处理,消息发送,消息处理等的相关函数与结构体
package coolq

View File

@ -2,28 +2,56 @@ package coolq
import ( import (
"encoding/hex" "encoding/hex"
"github.com/Mrs4s/MiraiGo/binary"
"github.com/Mrs4s/MiraiGo/client"
"github.com/Mrs4s/MiraiGo/message"
"github.com/Mrs4s/go-cqhttp/global"
log "github.com/sirupsen/logrus"
"io/ioutil" "io/ioutil"
"path" "path"
"strconv" "strconv"
"strings"
"time" "time"
"github.com/Mrs4s/go-cqhttp/global"
"github.com/Mrs4s/MiraiGo/binary"
"github.com/Mrs4s/MiraiGo/client"
"github.com/Mrs4s/MiraiGo/message"
log "github.com/sirupsen/logrus"
) )
var format = "string"
// SetMessageFormat 设置消息上报格式默认为string
func SetMessageFormat(f string) {
format = f
}
// ToFormattedMessage 将给定[]message.IMessageElement转换为通过coolq.SetMessageFormat所定义的消息上报格式
func ToFormattedMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r interface{}) {
if format == "string" {
r = ToStringMessage(e, id, isRaw...)
} else if format == "array" {
r = ToArrayMessage(e, id, isRaw...)
}
return
}
func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMessage) { func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMessage) {
checkImage(m.Elements) bot.checkMedia(m.Elements)
cqm := ToStringMessage(m.Elements, 0, true) cqm := ToStringMessage(m.Elements, m.Sender.Uin, true)
log.Infof("收到好友 %v(%v) 的消息: %v", m.Sender.DisplayName(), m.Sender.Uin, cqm) if !m.Sender.IsFriend {
bot.oneWayMsgCache.Store(m.Sender.Uin, "")
}
id := m.Id
if bot.db != nil {
id = bot.InsertPrivateMessage(m)
}
log.Infof("收到好友 %v(%v) 的消息: %v (%v)", m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
fm := MSG{ fm := MSG{
"post_type": "message", "post_type": "message",
"message_type": "private", "message_type": "private",
"sub_type": "friend", "sub_type": "friend",
"message_id": ToGlobalId(m.Sender.Uin, m.Id), "message_id": id,
"user_id": m.Sender.Uin, "user_id": m.Sender.Uin,
"message": ToStringMessage(m.Elements, 0, false), "target_id": m.Target,
"message": ToFormattedMessage(m.Elements, m.Sender.Uin, false),
"raw_message": cqm, "raw_message": cqm,
"font": 0, "font": 0,
"self_id": c.Uin, "self_id": c.Uin,
@ -39,7 +67,7 @@ func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMess
} }
func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage) { func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage) {
checkImage(m.Elements) bot.checkMedia(m.Elements)
for _, elem := range m.Elements { for _, elem := range m.Elements {
if file, ok := elem.(*message.GroupFileElement); ok { if file, ok := elem.(*message.GroupFileElement); ok {
log.Infof("群 %v(%v) 内 %v(%v) 上传了文件: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, file.Name) log.Infof("群 %v(%v) 内 %v(%v) 上传了文件: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, file.Name)
@ -67,72 +95,37 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
id = bot.InsertGroupMessage(m) id = bot.InsertGroupMessage(m)
} }
log.Infof("收到群 %v(%v) 内 %v(%v) 的消息: %v (%v)", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm, id) log.Infof("收到群 %v(%v) 内 %v(%v) 的消息: %v (%v)", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
gm := MSG{ gm := bot.formatGroupMessage(m)
"anonymous": nil, if gm == nil {
"font": 0, return
"group_id": m.GroupCode,
"message": ToStringMessage(m.Elements, m.GroupCode, false),
"message_id": id,
"message_type": "group",
"post_type": "message",
"raw_message": cqm,
"self_id": c.Uin,
"sender": MSG{
"age": 0,
"area": "",
"level": "",
"sex": "unknown",
"user_id": m.Sender.Uin,
},
"sub_type": "normal",
"time": time.Now().Unix(),
"user_id": m.Sender.Uin,
}
if m.Sender.IsAnonymous() {
gm["anonymous"] = MSG{
"flag": "",
"id": 0,
"name": m.Sender.Nickname,
}
gm["sender"].(MSG)["nickname"] = "匿名消息"
gm["sub_type"] = "anonymous"
} else {
mem := c.FindGroup(m.GroupCode).FindMember(m.Sender.Uin)
ms := gm["sender"].(MSG)
ms["role"] = func() string {
switch mem.Permission {
case client.Owner:
return "owner"
case client.Administrator:
return "admin"
default:
return "member"
}
}()
ms["nickname"] = mem.Nickname
ms["card"] = mem.CardName
ms["title"] = mem.SpecialTitle
} }
gm["message_id"] = id
bot.dispatchEventMessage(gm) bot.dispatchEventMessage(gm)
} }
func (bot *CQBot) tempMessageEvent(c *client.QQClient, m *message.TempMessage) { func (bot *CQBot) tempMessageEvent(c *client.QQClient, m *message.TempMessage) {
checkImage(m.Elements) bot.checkMedia(m.Elements)
cqm := ToStringMessage(m.Elements, 0, true) cqm := ToStringMessage(m.Elements, m.Sender.Uin, true)
bot.tempMsgCache.Store(m.Sender.Uin, m.GroupCode)
id := m.Id
if bot.db != nil {
id = bot.InsertTempMessage(m.Sender.Uin, m)
}
log.Infof("收到来自群 %v(%v) 内 %v(%v) 的临时会话消息: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm) log.Infof("收到来自群 %v(%v) 内 %v(%v) 的临时会话消息: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm)
tm := MSG{ tm := MSG{
"post_type": "message", "post_type": "message",
"message_type": "private", "message_type": "private",
"sub_type": "group", "sub_type": "group",
"message_id": m.Id, "message_id": id,
"user_id": m.Sender.Uin, "user_id": m.Sender.Uin,
"message": ToStringMessage(m.Elements, 0, false), "message": ToFormattedMessage(m.Elements, m.Sender.Uin, false),
"raw_message": cqm, "raw_message": cqm,
"font": 0, "font": 0,
"self_id": c.Uin, "self_id": c.Uin,
"time": time.Now().Unix(), "time": time.Now().Unix(),
"sender": MSG{ "sender": MSG{
"user_id": m.Sender.Uin, "user_id": m.Sender.Uin,
"group_id": m.GroupCode,
"nickname": m.Sender.Nickname, "nickname": m.Sender.Nickname,
"sex": "unknown", "sex": "unknown",
"age": 0, "age": 0,
@ -143,13 +136,24 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, m *message.TempMessage) {
func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent) { func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent) {
g := c.FindGroup(e.GroupCode) g := c.FindGroup(e.GroupCode)
if e.TargetUin == 0 {
if e.Time != 0 {
log.Infof("群 %v 被 %v 开启全员禁言.",
formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)))
} else {
log.Infof("群 %v 被 %v 解除全员禁言.",
formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)))
}
} else {
if e.Time > 0 { if e.Time > 0 {
log.Infof("群 %v 内 %v 被 %v 禁言了 %v秒.", log.Infof("群 %v 内 %v 被 %v 禁言了 %v 秒.",
formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)), e.Time) formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)), e.Time)
} else { } else {
log.Infof("群 %v 内 %v 被 %v 解除禁言.", log.Infof("群 %v 内 %v 被 %v 解除禁言.",
formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin))) formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)))
} }
}
bot.dispatchEventMessage(MSG{ bot.dispatchEventMessage(MSG{
"post_type": "notice", "post_type": "notice",
"duration": e.Time, "duration": e.Time,
@ -160,17 +164,17 @@ func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent)
"user_id": e.TargetUin, "user_id": e.TargetUin,
"time": time.Now().Unix(), "time": time.Now().Unix(),
"sub_type": func() string { "sub_type": func() string {
if e.Time > 0 { if e.Time == 0 {
return "ban"
}
return "lift_ban" return "lift_ban"
}
return "ban"
}(), }(),
}) })
} }
func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRecalledEvent) { func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRecalledEvent) {
g := c.FindGroup(e.GroupCode) g := c.FindGroup(e.GroupCode)
gid := ToGlobalId(e.GroupCode, e.MessageId) gid := toGlobalID(e.GroupCode, e.MessageId)
log.Infof("群 %v 内 %v 撤回了 %v 的消息: %v.", log.Infof("群 %v 内 %v 撤回了 %v 的消息: %v.",
formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)), formatMemberName(g.FindMember(e.AuthorUin)), gid) formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)), formatMemberName(g.FindMember(e.AuthorUin)), gid)
bot.dispatchEventMessage(MSG{ bot.dispatchEventMessage(MSG{
@ -185,20 +189,124 @@ func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRec
}) })
} }
func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
group := c.FindGroup(e.From())
switch notify := e.(type) {
case *client.GroupPokeNotifyEvent:
sender := group.FindMember(notify.Sender)
receiver := group.FindMember(notify.Receiver)
log.Infof("群 %v 内 %v 戳了戳 %v", formatGroupName(group), formatMemberName(sender), formatMemberName(receiver))
bot.dispatchEventMessage(MSG{
"post_type": "notice",
"group_id": group.Code,
"notice_type": "notify",
"sub_type": "poke",
"self_id": c.Uin,
"user_id": notify.Sender,
"sender_id": notify.Sender,
"target_id": notify.Receiver,
"time": time.Now().Unix(),
})
case *client.GroupRedBagLuckyKingNotifyEvent:
sender := group.FindMember(notify.Sender)
luckyKing := group.FindMember(notify.LuckyKing)
log.Infof("群 %v 内 %v 的红包被抢完, %v 是运气王", formatGroupName(group), formatMemberName(sender), formatMemberName(luckyKing))
bot.dispatchEventMessage(MSG{
"post_type": "notice",
"group_id": group.Code,
"notice_type": "notify",
"sub_type": "lucky_king",
"self_id": c.Uin,
"user_id": notify.Sender,
"sender_id": notify.Sender,
"target_id": notify.LuckyKing,
"time": time.Now().Unix(),
})
case *client.MemberHonorChangedNotifyEvent:
log.Info(notify.Content())
bot.dispatchEventMessage(MSG{
"post_type": "notice",
"group_id": group.Code,
"notice_type": "notify",
"sub_type": "honor",
"self_id": c.Uin,
"user_id": notify.Uin,
"time": time.Now().Unix(),
"honor_type": func() string {
switch notify.Honor {
case client.Talkative:
return "talkative"
case client.Performer:
return "performer"
case client.Emotion:
return "emotion"
case client.Legend:
return "legend"
case client.StrongNewbie:
return "strong_newbie"
default:
return "ERROR"
}
}(),
})
}
}
func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
friend := c.FindFriend(e.From())
if notify, ok := e.(*client.FriendPokeNotifyEvent); ok {
log.Infof("好友 %v 戳了戳你.", friend.Nickname)
bot.dispatchEventMessage(MSG{
"post_type": "notice",
"notice_type": "notify",
"sub_type": "poke",
"self_id": c.Uin,
"user_id": notify.Sender,
"sender_id": notify.Sender,
"target_id": notify.Receiver,
"time": time.Now().Unix(),
})
}
}
func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageRecalledEvent) { func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageRecalledEvent) {
f := c.FindFriend(e.FriendUin) f := c.FindFriend(e.FriendUin)
gid := ToGlobalId(e.FriendUin, e.MessageId) gid := toGlobalID(e.FriendUin, e.MessageId)
if f != nil {
log.Infof("好友 %v(%v) 撤回了消息: %v", f.Nickname, f.Uin, gid) log.Infof("好友 %v(%v) 撤回了消息: %v", f.Nickname, f.Uin, gid)
} else {
log.Infof("好友 %v 撤回了消息: %v", e.FriendUin, gid)
}
bot.dispatchEventMessage(MSG{ bot.dispatchEventMessage(MSG{
"post_type": "notice", "post_type": "notice",
"notice_type": "friend_recall", "notice_type": "friend_recall",
"self_id": c.Uin, "self_id": c.Uin,
"user_id": f.Uin, "user_id": e.FriendUin,
"time": e.Time, "time": e.Time,
"message_id": gid, "message_id": gid,
}) })
} }
func (bot *CQBot) offlineFileEvent(c *client.QQClient, e *client.OfflineFileEvent) {
f := c.FindFriend(e.Sender)
if f == nil {
return
}
log.Infof("好友 %v(%v) 发送了离线文件 %v", f.Nickname, f.Uin, e.FileName)
bot.dispatchEventMessage(MSG{
"post_type": "notice",
"notice_type": "offline_file",
"user_id": e.Sender,
"file": MSG{
"name": e.FileName,
"size": e.FileSize,
"url": e.DownloadUrl,
},
"self_id": c.Uin,
"time": time.Now().Unix(),
})
}
func (bot *CQBot) joinGroupEvent(c *client.QQClient, group *client.GroupInfo) { func (bot *CQBot) joinGroupEvent(c *client.QQClient, group *client.GroupInfo) {
log.Infof("Bot进入了群 %v.", formatGroupName(group)) log.Infof("Bot进入了群 %v.", formatGroupName(group))
bot.dispatchEventMessage(bot.groupIncrease(group.Code, 0, c.Uin)) bot.dispatchEventMessage(bot.groupIncrease(group.Code, 0, c.Uin))
@ -231,6 +339,20 @@ func (bot *CQBot) memberPermissionChangedEvent(c *client.QQClient, e *client.Mem
}) })
} }
func (bot *CQBot) memberCardUpdatedEvent(c *client.QQClient, e *client.MemberCardUpdatedEvent) {
log.Infof("群 %v 的 %v 更新了名片 %v -> %v", formatGroupName(e.Group), formatMemberName(e.Member), e.OldCard, e.Member.CardName)
bot.dispatchEventMessage(MSG{
"post_type": "notice",
"notice_type": "group_card",
"group_id": e.Group.Code,
"user_id": e.Member.Uin,
"card_new": e.Member.CardName,
"card_old": e.OldCard,
"time": time.Now().Unix(),
"self_id": c.Uin,
})
}
func (bot *CQBot) memberJoinEvent(c *client.QQClient, e *client.MemberJoinGroupEvent) { func (bot *CQBot) memberJoinEvent(c *client.QQClient, e *client.MemberJoinGroupEvent) {
log.Infof("新成员 %v 进入了群 %v.", formatMemberName(e.Member), formatGroupName(e.Group)) log.Infof("新成员 %v 进入了群 %v.", formatMemberName(e.Member), formatGroupName(e.Group))
bot.dispatchEventMessage(bot.groupIncrease(e.Group.Code, 0, e.Member.Uin)) bot.dispatchEventMessage(bot.groupIncrease(e.Group.Code, 0, e.Member.Uin))
@ -260,10 +382,21 @@ func (bot *CQBot) friendRequestEvent(c *client.QQClient, e *client.NewFriendRequ
}) })
} }
func (bot *CQBot) friendAddedEvent(c *client.QQClient, e *client.NewFriendEvent) {
log.Infof("添加了新好友: %v(%v)", e.Friend.Nickname, e.Friend.Uin)
bot.tempMsgCache.Delete(e.Friend.Uin)
bot.dispatchEventMessage(MSG{
"post_type": "notice",
"notice_type": "friend_add",
"self_id": c.Uin,
"user_id": e.Friend.Uin,
"time": time.Now().Unix(),
})
}
func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRequest) { func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRequest) {
log.Infof("收到来自群 %v(%v) 内用户 %v(%v) 的加群邀请.", e.GroupName, e.GroupCode, e.InvitorNick, e.InvitorUin) log.Infof("收到来自群 %v(%v) 内用户 %v(%v) 的加群邀请.", e.GroupName, e.GroupCode, e.InvitorNick, e.InvitorUin)
flag := strconv.FormatInt(e.RequestId, 10) flag := strconv.FormatInt(e.RequestId, 10)
bot.invitedReqCache.Store(flag, e)
bot.dispatchEventMessage(MSG{ bot.dispatchEventMessage(MSG{
"post_type": "request", "post_type": "request",
"request_type": "group", "request_type": "group",
@ -278,22 +411,82 @@ func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRe
} }
func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *client.UserJoinGroupRequest) { func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *client.UserJoinGroupRequest) {
log.Infof("群 %v(%v) 收到来自用户 %v(%v) 的加群请求.", e.GroupName, e.GroupName, e.RequesterNick, e.RequesterUin) log.Infof("群 %v(%v) 收到来自用户 %v(%v) 的加群请求.", e.GroupName, e.GroupCode, e.RequesterNick, e.RequesterUin)
flag := strconv.FormatInt(e.RequestId, 10) flag := strconv.FormatInt(e.RequestId, 10)
bot.joinReqCache.Store(flag, e)
bot.dispatchEventMessage(MSG{ bot.dispatchEventMessage(MSG{
"post_type": "request", "post_type": "request",
"request_type": "group", "request_type": "group",
"sub_type": "add", "sub_type": "add",
"group_id": e.GroupCode, "group_id": e.GroupCode,
"user_id": e.RequesterUin, "user_id": e.RequesterUin,
"comment": "", "comment": e.Message,
"flag": flag, "flag": flag,
"time": time.Now().Unix(), "time": time.Now().Unix(),
"self_id": c.Uin, "self_id": c.Uin,
}) })
} }
func (bot *CQBot) otherClientStatusChangedEvent(c *client.QQClient, e *client.OtherClientStatusChangedEvent) {
if e.Online {
log.Infof("Bot 账号在客户端 %v (%v) 登录.", e.Client.DeviceName, e.Client.DeviceKind)
} else {
log.Infof("Bot 账号在客户端 %v (%v) 登出.", e.Client.DeviceName, e.Client.DeviceKind)
}
bot.dispatchEventMessage(MSG{
"post_type": "notice",
"notice_type": "client_status",
"online": e.Online,
"client": MSG{
"app_id": e.Client.AppId,
"device_name": e.Client.DeviceName,
"device_kind": e.Client.DeviceKind,
},
"self_id": c.Uin,
"time": time.Now().Unix(),
})
}
func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent) {
g := c.FindGroup(e.GroupCode)
gid := toGlobalID(e.GroupCode, e.MessageID)
if e.OperationType == 1 {
log.Infof(
"群 %v 内 %v 将 %v 的消息(%v)设为了精华消息.",
formatGroupName(g),
formatMemberName(g.FindMember(e.OperatorUin)),
formatMemberName(g.FindMember(e.SenderUin)),
gid,
)
} else {
log.Infof(
"群 %v 内 %v 将 %v 的消息(%v)移出了精华消息.",
formatGroupName(g),
formatMemberName(g.FindMember(e.OperatorUin)),
formatMemberName(g.FindMember(e.SenderUin)),
gid,
)
}
if e.OperatorUin == bot.Client.Uin {
return
}
bot.dispatchEventMessage(MSG{
"post_type": "notice",
"group_id": e.GroupCode,
"notice_type": "essence",
"sub_type": func() string {
if e.OperationType == 1 {
return "add"
}
return "delete"
}(),
"self_id": c.Uin,
"sender_id": e.SenderUin,
"operator_id": e.OperatorUin,
"time": time.Now().Unix(),
"message_id": gid,
})
}
func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) MSG { func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) MSG {
return MSG{ return MSG{
"post_type": "notice", "post_type": "notice",
@ -333,19 +526,87 @@ func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.Group
} }
} }
func checkImage(e []message.IMessageElement) { func (bot *CQBot) checkMedia(e []message.IMessageElement) {
for _, elem := range e { for _, elem := range e {
if i, ok := elem.(*message.ImageElement); ok { switch i := elem.(type) {
case *message.ImageElement:
filename := hex.EncodeToString(i.Md5) + ".image" filename := hex.EncodeToString(i.Md5) + ".image"
if !global.PathExists(path.Join(global.IMAGE_PATH, filename)) { if !global.PathExists(path.Join(global.ImagePath, filename)) {
_ = ioutil.WriteFile(path.Join(global.IMAGE_PATH, filename), binary.NewWriterF(func(w *binary.Writer) { _ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
w.Write(i.Md5) w.Write(i.Md5)
w.WriteUInt32(uint32(i.Size)) w.WriteUInt32(uint32(i.Size))
w.WriteString(i.Filename) w.WriteString(i.Filename)
w.WriteString(i.Url) w.WriteString(i.Url)
}), 0777) }), 0644)
} }
i.Filename = filename i.Filename = filename
case *message.GroupImageElement:
filename := hex.EncodeToString(i.Md5) + ".image"
if !global.PathExists(path.Join(global.ImagePath, filename)) {
_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
w.Write(i.Md5)
w.WriteUInt32(uint32(i.Size))
w.WriteString(filename)
w.WriteString(i.Url)
}), 0644)
}
case *message.FriendImageElement:
filename := hex.EncodeToString(i.Md5) + ".image"
if !global.PathExists(path.Join(global.ImagePath, filename)) {
_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
w.Write(i.Md5)
w.WriteUInt32(uint32(0)) // 发送时会调用url, 大概没事
w.WriteString(filename)
w.WriteString(i.Url)
}), 0644)
}
case *message.GroupFlashImgElement:
filename := hex.EncodeToString(i.Md5) + ".image"
if !global.PathExists(path.Join(global.ImagePath, filename)) {
_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
w.Write(i.Md5)
w.WriteUInt32(uint32(i.Size))
w.WriteString(i.Filename)
w.WriteString("")
}), 0644)
}
i.Filename = filename
case *message.FriendFlashImgElement:
filename := hex.EncodeToString(i.Md5) + ".image"
if !global.PathExists(path.Join(global.ImagePath, filename)) {
_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
w.Write(i.Md5)
w.WriteUInt32(uint32(i.Size))
w.WriteString(i.Filename)
w.WriteString("")
}), 0644)
}
i.Filename = filename
case *message.VoiceElement:
i.Name = strings.ReplaceAll(i.Name, "{", "")
i.Name = strings.ReplaceAll(i.Name, "}", "")
if !global.PathExists(path.Join(global.VoicePath, i.Name)) {
b, err := global.GetBytes(i.Url)
if err != nil {
log.Warnf("语音文件 %v 下载失败: %v", i.Name, err)
continue
}
_ = ioutil.WriteFile(path.Join(global.VoicePath, i.Name), b, 0644)
}
case *message.ShortVideoElement:
filename := hex.EncodeToString(i.Md5) + ".video"
if !global.PathExists(path.Join(global.VideoPath, filename)) {
_ = ioutil.WriteFile(path.Join(global.VideoPath, filename), binary.NewWriterF(func(w *binary.Writer) {
w.Write(i.Md5)
w.Write(i.ThumbMd5)
w.WriteUInt32(uint32(i.Size))
w.WriteUInt32(uint32(i.ThumbSize))
w.WriteString(i.Name)
w.Write(i.Uuid)
}), 0644)
}
i.Name = filename
i.Url = bot.Client.GetShortVideoUrl(i.Uuid, i.Md5)
} }
} }
} }

142
docs/EventFilter.md Normal file
View File

@ -0,0 +1,142 @@
# 事件过滤器
在go-cqhttp同级目录下新建`filter.json`文件即可开启事件过滤器,启动时会读取该文件中定义的过滤规则(使用 JSON 编写),若文件不存在,或过滤规则语法错误,则不会启用事件过滤器。
事件过滤器会处理所有事件(包括心跳事件在内的元事件),请谨慎使用!!
注意: 与客户端建立连接的握手事件**不会**经过事件过滤器
## 示例
这节首先给出一些示例,演示过滤器的基本用法,下一节将给出具体语法说明。
### 过滤所有事件
```json
{
".not": {}
}
```
### 只上报以「!!」开头的消息
```json
{
"raw_message": {
".regex": "^!!"
}
}
```
### 只上报群组的非匿名消息
```json
{
"message_type": "group",
"anonymous": {
".eq": null
}
}
```
### 只上报私聊或特定群组的非匿名消息
```json
{
".or": [
{
"message_type": "private"
},
{
"message_type": "group",
"group_id": {
".in": [
123456
]
},
"anonymous": {
".eq": null
}
}
]
}
```
### 只上报群组 11111、22222、33333 中不是用户 12345 发送的消息,以及用户 66666 发送的所有消息
```json
{
".or": [
{
"group_id": {
".in": [11111, 22222, 33333]
},
"user_id": {
".neq": 12345
}
},
{
"user_id": 66666
}
]
}
```
### 一个更复杂的例子
```json
{
".or": [
{
"message_type": "private",
"user_id": {
".not": {
".in": [11111, 22222, 33333]
},
".neq": 44444
}
},
{
"message_type": {
".regex": "group|discuss"
},
".or": [
{
"group_id": 12345
},
{
"raw_message": {
".contains": "通知"
}
}
]
}
]
}
```
## 语法说明
过滤规则最外层是一个 JSON 对象,其中的键,如果以 `.`(点号)开头,则表示运算符,其值为运算符的参数,如果不以 `.` 开头,则表示对事件数据对象中相应键的过滤。过滤规则中任何一个对象,只有在它的所有项都匹配的情况下,才会让事件通过(等价于一个 `and` 运算);其中,不以 `.` 开头的键,若其值不是对象,则只有在这个值和事件数据相应值相等的情况下,才会通过(等价于一个 `eq` 运算符)。
下面列出所有运算符(「要求的参数类型」是指运算符的键所对应的值的类型,「可作用于的类型」是指在过滤时事件对象相应值的类型):
| 运算符 | 要求的参数类型 | 可作用于的类型 |
| ----------- | -------------------------- | ----------------------------------------------------- |
| `.not` | object | 任何 |
| `.and` | object | 若参数中全为运算符,则任何;若不全为运算符,则 object |
| `.or` | array数组元素为 object | 任何 |
| `.eq` | 任何 | 任何 |
| `.neq` | 任何 | 任何 |
| `.in` | string/array | 若参数为 string则 string若参数为 array则任何 |
| `.contains` | string | string |
| `.regex` | string | string |
## 过滤时的事件数据对象
过滤器在go-cqhttp构建好事件数据后运行各事件的数据字段见[OneBot标准]( https://github.com/howmanybots/onebot/blob/master/v11/specs/event/README.md )。
这里有几点需要注意:
- `message` 字段在运行过滤器时和上报信息类型相同(见 [消息格式]( https://github.com/howmanybots/onebot/blob/master/v11/specs/message/array.md )
- `raw_message` 字段为未经**CQ码**处理的原始消息字符串,这意味着其中可能会出现形如 `[CQ:face,id=123]` 的 CQ 码

5
docs/QA.md Normal file
View File

@ -0,0 +1,5 @@
# 常见问题
### Q: 为什么挂一段时间后就会出现 `消息发送失败,账号可能被风控`?
### A: 如果你刚开始使用 go-cqhttp 建议挂机3-7天即可解除风控

251
docs/adminApi.md Normal file
View File

@ -0,0 +1,251 @@
# 管理 API
> 支持跨域
## 公共参数
参数:
| 参数名 | 类型 | 说明 |
| ------------ | ------ | --------------------------- |
| access_token | string | 校验口令config.hjson中配置 |
## admin/do_restart
### 热重启
> 热重启
> ps: 目前不支持ws部分的修改生效
method`POST/GET`
参数:
| 参数名 | 类型 | 说明 |
| ------ | ---- | ---- |
| 无 | | |
返回:
```json
{"data": {}, "retcode": 0, "status": "ok"}
```
### admin/get_web_write
> 拉取验证码/设备锁
method: `GET`
参数:
| 参数名 | 类型 | 说明 |
| ------ | ---- | ---- |
| 无 | | |
返回:
```json
{"data": {"ispic": true,"picbase64":"xxxxx"}, "retcode": 0, "status": "ok"}
```
| 参数名 | 类型 | 说明 |
| -------- | ------ | --------------------------------------------------- |
| ispic | bool | 是否是验证码类型 true是false为不是比如设备锁 |
| picbas64 | string | 验证码的base64编码内容加上头放入img标签即可显示 |
### admin/do_web_write
> web输入验证码/设备锁确认
method: `POST` formdata
参数:
| 参数名 | 类型 | 说明 |
| ------ | ------ | ---------- |
| input | string | 输入的内容 |
返回:
```json
{"data": {}, "retcode": 0, "status": "ok"}
```
### admin/do_restart_docker
> 冷重启
> 注意此api 会直接结束掉进程需要依赖docker/supervisor等进程管理工具来自动拉起
method: `POST`
参数:
| 参数名 | 类型 | 说明 |
| ------ | ---- | ---- |
| 无 | | |
返回:
```json
{"data": {}, "retcode": 0, "status": "ok"}
```
### admin/do_process_restart
> 冷重启
method: `POST`
参数:
| 参数名 | 类型 | 说明 |
| ------ | ---- | ---- |
| 无 | | |
返回:
```json
{"data": {}, "retcode": 0, "status": "ok"}
```
### admin/do_config_base
> 基础配置
method: `POST` formdata
参数:
| 参数名 | 类型 | 说明 |
| ------------ | ------ | ------------------------------------- |
| uin | string | qq号 |
| password | string | qq密码 |
| enable_db | string | 是否启动数据库,填 'true' 或者 'false' |
| access_token | string | 授权 token |
返回:
```json
{"data": {}, "retcode": 0, "status": "ok"}
```
### admin/do_config_http
> http服务配置
method: `POST` formdata
参数:
| 参数名 | 类型 | 说明 |
| ----------- | ------ | --------------------------------------------- |
| port | string | 服务端口 |
| host | string | 服务监听地址 |
| enable | string | 是否启用 ,填 'true' 或者 'false' |
| timeout | string | http请求超时时间 |
| post_url | string | post上报地址 不需要就填空字符串,或者不填 |
| post_secret | string | post上报的secret 不需要就填空字符串,或者不填 |
返回:
```json
{"data": {}, "retcode": 0, "status": "ok"}
```
### admin/do_config_ws
> 正向ws设置
method: `POST` formdata
参数:
| 参数名 | 类型 | 说明 |
| ------ | ------ | -------------------------------- |
| port | string | 服务端口 |
| host | string | 服务监听地址 |
| enable | string | 是否启用 ,填 'true' 或者 'false' |
返回:
```json
{"data": {}, "retcode": 0, "status": "ok"}
```
### admin/do_config_reverse
> 反向ws配置
method: `POST` formdata
参数:
| 参数名 | 类型 | 说明 |
| ------ | ------ | -------------------------------- |
| port | string | 服务端口 |
| host | string | 服务监听地址 |
| enable | string | 是否启用 ,填 'true' 或者 'false' |
返回:
```json
{"data": {}, "retcode": 0, "status": "ok"}
```
### admin/do_config_json
> 直接修改 config.hjson配置
method: `POST` formdata
参数:
| 参数名 | 类型 | 说明 |
| ------ | ------ | ----------------------------------- |
| json | string | 完整的config.hjson的配合json字符串 |
返回:
```json
{"data": {}, "retcode": 0, "status": "ok"}
```
### admin/get_config_json
> 获取当前 config.hjson配置
method: `GET`
参数:
| 参数名 | 类型 | 说明 |
| ------ | ---- | ---- |
| 无 | | |
返回:
```json
{"data": {"config":"xxxx"}, "retcode": 0, "status": "ok"}
```
| 参数名 | 类型 | 说明 |
| ------ | ------ | ----------------------------------- |
| config | string | 完整的config.hjson的配合json字符串 |

View File

@ -1,6 +1,6 @@
# 配置 # 配置
go-cqhttp 包含 `config.json``device.json` 两个配置文件, 其中 `config.json` 为运行配置 `device.json` 为虚拟设备信息. go-cqhttp 包含 `config.hjson``device.json` 两个配置文件, 其中 `config.json` 为运行配置 `device.json` 为虚拟设备信息.
## 从原CQHTTP导入配置 ## 从原CQHTTP导入配置
@ -18,15 +18,34 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
{ {
"uin": 0, "uin": 0,
"password": "", "password": "",
"encrypt_password": false,
"password_encrypted": "",
"enable_db": true, "enable_db": true,
"enable_self_message": false,
"access_token": "", "access_token": "",
"relogin": false, "relogin": {
"relogin_delay": 0, "enabled": true,
"relogin_delay": 3,
"max_relogin_times": 0
},
"_rate_limit": {
"enabled": false,
"frequency": 1,
"bucket_size": 1
},
"post_message_format": "string",
"ignore_invalid_cqcode": false,
"force_fragmented": true,
"heartbeat_interval": 5,
"use_sso_address": false,
"http_config": { "http_config": {
"enabled": true, "enabled": true,
"host": "0.0.0.0", "host": "0.0.0.0",
"port": 5700, "port": 5700,
"post_urls": [] "timeout": 5,
"post_urls": {
"url:port": "secret"
}
}, },
"ws_config": { "ws_config": {
"enabled": true, "enabled": true,
@ -46,15 +65,74 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
```` ````
| 字段 | 类型 | 说明 | | 字段 | 类型 | 说明 |
| ------------------ | -------- | ------------------------------------------------------------------- | | --------------------- | -------- | ---------------------------------------------------------------------------------------- |
| uin | int64 | 登录用QQ号 | | uin | int64 | 登录用QQ号 |
| password | string | 登录用密码 | | password | string | 登录用密码 |
| encrypt_password | bool | 是否对密码进行加密. |
| password_encrypted | string | 加密后的密码(请勿修改) |
| enable_db | bool | 是否开启内置数据库, 关闭后将无法使用 **回复/撤回** 等上下文相关接口 | | enable_db | bool | 是否开启内置数据库, 关闭后将无法使用 **回复/撤回** 等上下文相关接口 |
| enable_self_message | bool | 是否启用 `message_sent` 事件 |
| access_token | string | 同CQHTTP的 `access_token` 用于身份验证 | | access_token | string | 同CQHTTP的 `access_token` 用于身份验证 |
| relogin | bool | 是否自动重新登录 | | relogin | bool | 是否自动重新登录 |
| relogin_delay | int | 重登录延时(秒) | | relogin_delay | int | 重登录延时(秒) |
| max_relogin_times | uint | 最大重登录次数若0则不设置上限 |
| _rate_limit | bool | 是否启用API调用限速 |
| frequency | float64 | 1s内能调用API的次数 |
| bucket_size | int | 令牌桶的大小默认为1修改此值可允许一定程度内连续调用api |
| post_message_format | string | 上报信息类型 |
| ignore_invalid_cqcode | bool | 是否忽略错误的CQ码 |
| force_fragmented | bool | 是否强制分片发送群长消息 |
| fix_url | bool | 是否对链接的发送进行预处理, 可缓解链接信息被风控导致无法发送的情况, 但可能影响客户端着色(不影响内容)|
| use_sso_address | bool | 是否使用服务器下发的地址 |
| heartbeat_interval | int64 | 心跳间隔时间单位秒。小于0则关闭心跳等于0使用默认值(5秒) |
| http_config | object | HTTP API配置 | | http_config | object | HTTP API配置 |
| ws_config | object | Websocket API 配置 | | ws_config | object | Websocket API 配置 |
| ws_reverse_servers | object[] | 反向 Websocket API 配置 | | ws_reverse_servers | object[] | 反向 Websocket API 配置 |
| log_level | string | 指定日志收集级别,将收集的日志单独存放到固定文件中,便于查看日志线索 当前支持 warn,error |
> 注: 开启密码加密后程序将在每次启动时要求输入解密密钥, 密钥错误会导致登录时提示密码错误.
> 解密后密码将储存在内存中,用于自动重连等功能. 所以此加密并不能防止内存读取.
> 解密密钥在使用完成后并不会留存在内存中, 所以可用相对简单的字符串作为密钥
> 注2: 分片发送为原酷Q发送长消息的老方案, 发送速度更优/兼容性更好,但在有发言频率限制的群里,可能无法发送。关闭后将优先使用新方案, 能发送更长的消息, 但发送速度更慢,在部分老客户端将无法解析.
> 注3关闭心跳服务可能引起断线请谨慎关闭
## 设备信息
默认生成的设备信息如下所示:
``` json
{
"protocol": 0,
"display": "xxx",
"finger_print": "xxx",
"boot_id": "xxx",
"proc_version": "xxx",
"imei": "xxx"
}
```
在大部分情况下 我们只需要关心 `protocol` 字段:
| 值 | 类型 | 限制 |
| --- | ------------- | ---------------------------------------------------------------- |
| 0 | iPad | 无 |
| 1 | Android Phone | 无 |
| 2 | Android Watch | 无法接收 `notify` 事件、无法接收口令红包、无法接收撤回消息 |
| 3 | MacOS | 无 |
> 注意, 根据协议的不同, 各类消息有所限制
## 自定义服务器IP
> 某些海外服务器使用默认地址可能会存在链路问题,此功能可以指定 go-cqhttp 连接哪些地址以达到最优化.
将文件 `address.txt` 创建到 `go-cqhttp` 工作目录, 并键入 `IP:PORT` 以换行符为分割即可.
示例:
````
1.1.1.1:53
1.1.2.2:8899
````

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@ go-cqhttp 默认生成的文件树如下所示:
```` ````
. .
├── go-cqhttp ├── go-cqhttp
├── config.json ├── config.hjson
├── device.json ├── device.json
├── logs ├── logs
│ └── xx-xx-xx.log │ └── xx-xx-xx.log
@ -18,7 +18,7 @@ go-cqhttp 默认生成的文件树如下所示:
| 文件 | 用途 | | 文件 | 用途 |
| ----------- | ------------------- | | ----------- | ------------------- |
| go-cqhttp | go-cqhttp可执行文件 | | go-cqhttp | go-cqhttp可执行文件 |
| config.json | 运行配置文件 | | config.hjson | 运行配置文件 |
| device.json | 虚拟设备配置文件 | | device.json | 虚拟设备配置文件 |
| logs | 日志存放目录 | | logs | 日志存放目录 |
| data | 数据目录 | | data | 数据目录 |

View File

@ -1,3 +1,155 @@
# 开始 # 开始
欢迎来到 go-cqhttp 文档 欢迎来到 go-cqhttp 文档 目前还在咕
# 基础教程
## 下载
从[release](https://github.com/Mrs4s/go-cqhttp/releases)界面下载最新版本的go-cqhttp
- Windows下32位文件为 `go-cqhttp-v*-windows-386.zip`
- Windows下64位文件为 `go-cqhttp-v*-windows-amd64.zip`
- Windows下arm用(如使用高通CPU的笔记本)文件为 `go-cqhttp-v*-windows-arm.zip`
- Linux下32位文件为 `go-cqhttp-v*-linux-386.tar.gz`
- Linux下64位文件为 `go-cqhttp-v*-linux-amd64.tar.gz`
- Linux下arm用(如树莓派)文件为 `go-cqhttp-v*-linux-arm.tar.gz`
- MD5文件为 `*.md5` ,用于校验文件完整性
- 如果没有你所使用的系统版本或者希望自己构建,请移步[进阶指南-如何自己构建](#如何自己构建)
## 解压
- Windows下请使用自己熟悉的解压软件自行解压
- Linux下在命令行中输入 `tar -xzvf [文件名]`
## 使用
### Windows
#### 标准方法
1. 双击`go-cqhttp.exe`此时将提示
```
[WARNING]: 尝试加载配置文件 config.hjson 失败: 文件不存在
[INFO]: 默认配置文件已生成,请编辑 config.hjson 后重启程序.
```
2. 参照[config.md](https://github.com/Mrs4s/go-cqhttp/blob/master/docs/config.md)和你所用到的插件的 `README` 填入参数
3. 再次双击`go-cqhttp.exe`
```
[INFO]: 登录成功 欢迎使用: balabala
```
如出现需要认证的信息,请自行认证设备。
此时,基础配置完成
#### 懒人法
1. [下载包含Windows.bat的zip](https://github.com/fkx4-p/go-cqhttp-lazy/archive/master.zip)
2. 解压
3.`Windows.bat`复制/剪切到**go-cqhttp**文件夹
4. 双击运行
效果如下
```
QQ account:
[QQ账号]
QQ password:
[QQ密码]
enable http?(Y/n)
[是否开启http(y/n),默认开启]
enable ws?(Y/n)
[是否开启websocket(y/n),默认开启]
请按任意键继续. . .
```
5. 双击`go-cqhttp.exe`
```
[INFO]: 登录成功 欢迎使用: balabala
```
如出现需要认证的信息,请自行认证设备。
此时,基础配置完成
### Linux
#### 标准方法
1. 打开一个命令行/ssh
2. `cd`到解压目录
3. 输入 `./go-cqhttp``Enter`运行 ,此时将提示
```
[WARNING]: 尝试加载配置文件 config.hjson 失败: 文件不存在
[INFO]: 默认配置文件已生成,请编辑 config.hjson 后重启程序.
```
4. 参照[config.md](https://github.com/Mrs4s/go-cqhttp/blob/master/docs/config.md)和你所用到的插件的 `README` 填入参数
5. 再次输入 `./go-cqhttp``Enter`运行
```
[INFO]: 登录成功 欢迎使用: balabala
```
如出现需要认证的信息,请自行认证设备。
此时,基础配置完成
#### 懒人法
暂时咕咕咕了
## 验证http是否成功配置
此时,如果在本地开启的服务器,可以在浏览器输入`http://127.0.0.1:5700/send_private_msg?user_id=[接收者qq号]&message=[发送的信息]`来发送一条测试信息
如果出现`{"data":{"message_id":balabala},"retcode":0,"status":"ok"}`则证明已经成功配置HTTP
*注:请 连 中括号 也替换掉,就像这样:*`http://127.0.0.1:5700/send_private_msg?user_id=10001&message=ffeecoishp`
# 进阶指南
## 跳过启动的五秒延时
使用命令行参数 `faststart`即可跳过启动的五秒钟延时,例如
```
.\go-cqhttp.exe faststart
```
## 如何自己构建
1. [下载源码](https://github.com/Mrs4s/go-cqhttp/archive/master.zip)并解压 || 使用`git clone https://github.com/Mrs4s/go-cqhttp.git`来拉取
2. [下载golang binary release](https://golang.google.cn/dl/)并安装或者[自己构建golang](https://golang.google.cn/doc/install/source)
3.`cmd`或Linux命令行中`cd`到目录中
4. 输入`go build -ldflags "-s -w -extldflags '-static'"``Enter`运行
*注:可以使用*`go env -w GOPROXY=https://goproxy.cn,direct`*来加速国内依赖安装速度*
## 更新
### 方法一
从[release](https://github.com/Mrs4s/go-cqhttp/releases)界面下载最新版本的go-cqhttp
并替换之前的版本
### 方法二
使用更新参数在命令行中打开go-cqhttp所在目录
#### windows
输入指令
`go-cqhttp.exe update`
如果在国内连接github下载速度可能很慢可以使用镜像源下载
`go-cqhttp.exe update https://github.rc1844.workers.dev`
几个可用的镜像源
- `https://hub.fastgit.org`
- `https://github.com.cnpmjs.org`
- `https://github.bajins.com`
- `https://github.rc1844.workers.dev`
#### linux
方法与windows基本一致`go-cqhttp.exe` 替换为 `./go-cqhttp`即可

74
docs/slider.md Normal file
View File

@ -0,0 +1,74 @@
# 滑块验证码
由于TX最新的限制, 所有协议在陌生设备/IP登录时都有可能被要求通过滑块验证码, 否则将会出现 `当前上网环境异常` 的错误. 目前我们准备了两个临时方案应对该验证码.
> 如果您有一台运行Windows的PC/Server 并且不会抓包操作, 我们建议直接使用方案B
## 方案A: 自行抓包
由于滑块验证码和QQ本体的协议独立, 我们无法直接处理并提交. 需要在浏览器通过后抓包并获取 `Ticket` 提交.
该方案为具体的抓包教程, 如果您已经知道如何在浏览器中抓包. 可以略过接下来的文档并直接抓取 `cap_union_new_verify` 的返回值, 提取 `Ticket` 并在命令行提交.
首先获取滑块验证码的地址, 并在浏览器中打开. 这里以 *Microsoft Edge* 浏览器为例, *Chrome* 同理.
![image.png](https://i.loli.net/2020/12/27/yXdomOnQ8tkauMe.png)
首先选择 `1` 并提取链接在浏览器中打开
![image.png](https://i.loli.net/2020/12/27/HYhmZv1wARMV7Uq.png)
![image.png](https://i.loli.net/2020/12/27/otk9Hz7lBCaRFMV.png)
此时不要滑动验证码, 首先按下 `F12` (键盘右上角退格键上方) 打开 *开发者工具*
![image.png](https://i.loli.net/2020/12/27/JDioadLPwcKWpt1.png)
点击 `Network` 选项卡 (在某些浏览器它可能叫做 `网络`)
![image.png](https://i.loli.net/2020/12/27/qEzTB5jrDZUWSwp.png)
点开 `Filter` (箭头) 按钮以确定您能看到下面的工具栏, 勾选 `Preserve log`(红框)
此时可以滑动并通过验证码
![image.png](https://i.loli.net/2020/12/27/Id4hxzyDprQuF2G.png)
回到 *开发者工具*, 我们可以看到已经有了一个请求.
![image.png](https://i.loli.net/2020/12/27/3C6Y2XVKBRv1z9E.png)
此时如果有多个请求, 请不要慌张. 看到上面的 `Filter` 没? 此时在 `Filter` 输入框中输入 `cap_union_new`, 就应该只剩一个请求了.
然后点击该请求. 点开 `Preview` 选项卡 (箭头):
![image.png](https://i.loli.net/2020/12/27/P1VtxRWpjY8524Z.png)
此时就能看到一个标准的 `JSON`, 复制 `ticket` 字段并回到 `go-cqhttp` 粘贴. 即可通过滑块验证.
如果您看到这里还是不会如何操作, 没关系! 我们还准备了方案B.
## 方案B: 使用专用工具
此方案需要您有一台可以操作的 `Windows` 电脑.
首先下载工具: [蓝奏云](https://wws.lanzous.com/i2vn0jrofte) [Google Drive](https://drive.google.com/file/d/1peMDHqgP8AgWBVp5vP-cfhcGrb2ksSrE/view?usp=sharing)
解压并打开工具:
![image.png](https://i.loli.net/2020/12/27/winG4SkxhgLoNDZ.png)
打开 `go-cqhttp` 并选择 `2`:
![image.png](https://i.loli.net/2020/12/27/yXdomOnQ8tkauMe.png)
复制 `ID` 并前往工具粘贴:
![image.png](https://i.loli.net/2020/12/27/fIwXx5nN9r8Zbc7.png)
![image.png](https://i.loli.net/2020/12/27/WZsTCyGwSjc9mb5.png)
点击 `OK` 并处理滑块, 完成即可登录成功. (OK可能反应稍微慢点, 请不要多次点击)
![image.png](https://i.loli.net/2020/12/27/UnvAuxreijYzgLC.png)

27
global/buffer.go Normal file
View File

@ -0,0 +1,27 @@
package global
import (
"bytes"
"sync"
)
var bufferPool = sync.Pool{
New: func() interface{} {
return new(bytes.Buffer)
},
}
// NewBuffer 从池钟获取新 bytes.Buffer
func NewBuffer() *bytes.Buffer {
return bufferPool.Get().(*bytes.Buffer)
}
// PutBuffer 将 Buffer放入池中
func PutBuffer(buf *bytes.Buffer) {
// See https://golang.org/issue/23199
const maxSize = 1 << 16
if buf.Cap() < maxSize { // 对于大Buffer直接丢弃
buf.Reset()
bufferPool.Put(buf)
}
}

48
global/codec.go Normal file
View File

@ -0,0 +1,48 @@
package global
import (
"crypto/md5"
"fmt"
"io/ioutil"
"os/exec"
"path"
"github.com/Mrs4s/go-cqhttp/global/codec"
"github.com/pkg/errors"
)
// EncoderSilk 将音频编码为Silk
func EncoderSilk(data []byte) ([]byte, error) {
h := md5.New()
_, err := h.Write(data)
if err != nil {
return nil, errors.Wrap(err, "calc md5 failed")
}
tempName := fmt.Sprintf("%x", h.Sum(nil))
if silkPath := path.Join("data/cache", tempName+".silk"); PathExists(silkPath) {
return ioutil.ReadFile(silkPath)
}
slk, err := codec.EncodeToSilk(data, tempName, true)
if err != nil {
return nil, errors.Wrap(err, "encode silk failed")
}
return slk, nil
}
// EncodeMP4 将给定视频文件编码为MP4
func EncodeMP4(src string, dst string) error { // -y 覆盖文件
cmd1 := exec.Command("ffmpeg", "-i", src, "-y", "-c", "copy", "-map", "0", dst)
err := cmd1.Run()
if err != nil {
cmd2 := exec.Command("ffmpeg", "-i", src, "-y", "-c:v", "h264", "-c:a", "mp3", dst)
return errors.Wrap(cmd2.Run(), "convert mp4 failed")
}
return err
}
// ExtractCover 获取给定视频文件的Cover
func ExtractCover(src string, target string) error {
cmd := exec.Command("ffmpeg", "-i", src, "-y", "-r", "1", "-f", "image2", target)
return errors.Wrap(cmd.Run(), "extract video cover failed")
}

53
global/codec/codec.go Normal file
View File

@ -0,0 +1,53 @@
// +build linux windows,!arm darwin
// +build 386 amd64 arm arm64
// Package codec Slik编码核心模块
package codec
import (
"io/ioutil"
"os"
"os/exec"
"path"
"github.com/pkg/errors"
"github.com/wdvxdr1123/go-silk"
)
const (
silkCachePath = "data/cache"
)
// EncodeToSilk 将音频编码为Silk
func EncodeToSilk(record []byte, tempName string, useCache bool) (silkWav []byte, err error) {
// 1. 写入缓存文件
rawPath := path.Join(silkCachePath, tempName+".wav")
err = ioutil.WriteFile(rawPath, record, os.ModePerm)
if err != nil {
return nil, errors.Wrap(err, "write temp file error")
}
defer os.Remove(rawPath)
// 2.转换pcm
pcmPath := path.Join(silkCachePath, tempName+".pcm")
cmd := exec.Command("ffmpeg", "-i", rawPath, "-f", "s16le", "-ar", "24000", "-ac", "1", pcmPath)
if err = cmd.Run(); err != nil {
return nil, errors.Wrap(err, "convert pcm file error")
}
defer os.Remove(pcmPath)
// 3. 转silk
pcm, err := ioutil.ReadFile(pcmPath)
if err != nil {
return nil, errors.Wrap(err, "read pcm file err")
}
silkWav, err = silk.EncodePcmBuffToSilk(pcm, 24000, 24000, true)
if err != nil {
return nil, errors.Wrap(err, "silk encode error")
}
if useCache {
silkPath := path.Join(silkCachePath, tempName+".silk")
err = ioutil.WriteFile(silkPath, silkWav, 0666)
}
return
}

View File

@ -0,0 +1,10 @@
// +build !arm,!arm64,!amd64,!386
package codec
import "errors"
//EncodeToSilk 将音频编码为Silk
func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
return nil, errors.New("not supported now")
}

View File

@ -0,0 +1,10 @@
// +build !windows,!linux,!darwin
package codec
import "errors"
//EncodeToSilk 将音频编码为Silk
func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
return nil, errors.New("not supported now")
}

View File

@ -0,0 +1,8 @@
package codec
import "errors"
//EncodeToSilk 将音频编码为Silk
func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
return nil, errors.New("not supported now")
}

View File

@ -1,108 +1,346 @@
package global package global
import ( import (
"encoding/json" "os"
"path"
"strconv"
"time"
"github.com/hjson/hjson-go"
jsoniter "github.com/json-iterator/go"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
type JsonConfig struct { var json = jsoniter.ConfigCompatibleWithStandardLibrary
var currentPath = getCurrentPath()
var DefaultConfFile = path.Join(currentPath, "config.hjson")
// DefaultConfigWithComments 为go-cqhttp的默认配置文件
var DefaultConfigWithComments = `
/*
go-cqhttp 默认配置文件
*/
{
// QQ号
uin: 0
// QQ密码
password: ""
// 是否启用密码加密
encrypt_password: false
// 加密后的密码, 如未启用密码加密将为空, 请勿随意修改.
password_encrypted: ""
// 是否启用内置数据库
// 启用将会增加10-20MB的内存占用和一定的磁盘空间
// 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能
enable_db: true
// 访问密钥, 强烈推荐在公网的服务器设置
access_token: ""
// 重连设置
relogin: {
// 是否启用自动重连
// 如不启用掉线后将不会自动重连
enabled: true
// 重连延迟, 单位秒
relogin_delay: 3
// 最大重连次数, 0为无限制
max_relogin_times: 0
}
// API限速设置
// 该设置为全局生效
// 原 cqhttp 虽然启用了 rate_limit 后缀, 但是基本没插件适配
// 目前该限速设置为令牌桶算法, 请参考:
// https://baike.baidu.com/item/%E4%BB%A4%E7%89%8C%E6%A1%B6%E7%AE%97%E6%B3%95/6597000?fr=aladdin
_rate_limit: {
// 是否启用限速
enabled: false
// 令牌回复频率, 单位秒
frequency: 1
// 令牌桶大小
bucket_size: 1
}
// 是否忽略无效的CQ码
// 如果为假将原样发送
ignore_invalid_cqcode: false
// 是否强制分片发送消息
// 分片发送将会带来更快的速度
// 但是兼容性会有些问题
force_fragmented: false
// 心跳频率, 单位秒
// -1 为关闭心跳
heartbeat_interval: 0
// HTTP设置
http_config: {
// 是否启用正向HTTP服务器
enabled: true
// 服务端监听地址
host: 0.0.0.0
// 服务端监听端口
port: 5700
// 反向HTTP超时时间, 单位秒
// 最小值为5小于5将会忽略本项设置
timeout: 0
// 反向HTTP POST地址列表
// 格式:
// {
// 地址: secret
// }
post_urls: {}
}
// 正向WS设置
ws_config: {
// 是否启用正向WS服务器
enabled: true
// 正向WS服务器监听地址
host: 0.0.0.0
// 正向WS服务器监听端口
port: 6700
}
// 反向WS设置
ws_reverse_servers: [
// 可以添加多个反向WS推送
{
// 是否启用该推送
enabled: false
// 反向WS Universal 地址
// 注意 设置了此项地址后下面两项将会被忽略
// 留空请使用 ""
reverse_url: ws://you_websocket_universal.server
// 反向WS API 地址
reverse_api_url: ws://you_websocket_api.server
// 反向WS Event 地址
reverse_event_url: ws://you_websocket_event.server
// 重连间隔 单位毫秒
reverse_reconnect_interval: 3000
}
]
// 上报数据类型
// 可选: string array
post_message_format: string
// 是否使用服务器下发的新地址进行重连
// 注意, 此设置可能导致在海外服务器上连接情况更差
use_sso_address: false
// 是否启用 DEBUG
debug: false
// 日志等级 trace,debug,info,warn,error
log_level: "info"
// WebUi 设置
web_ui: {
// 是否启用 WebUi
enabled: true
// 监听地址
host: 127.0.0.1
// 监听端口
web_ui_port: 9999
// 是否接收来自web的输入
web_input: false
}
}
`
// PasswordHash 存储QQ密码哈希供登录使用
var PasswordHash [16]byte
// JSONConfig Config对应的结构体
type JSONConfig struct {
Uin int64 `json:"uin"` Uin int64 `json:"uin"`
Password string `json:"password"` Password string `json:"password"`
EncryptPassword bool `json:"encrypt_password"`
PasswordEncrypted string `json:"password_encrypted"`
EnableDB bool `json:"enable_db"` EnableDB bool `json:"enable_db"`
EnableSelfMessage bool `json:"enable_self_message"`
AccessToken string `json:"access_token"` AccessToken string `json:"access_token"`
ReLogin bool `json:"relogin"` ReLogin struct {
Enabled bool `json:"enabled"`
ReLoginDelay int `json:"relogin_delay"` ReLoginDelay int `json:"relogin_delay"`
HttpConfig *GoCQHttpConfig `json:"http_config"` MaxReloginTimes uint `json:"max_relogin_times"`
WSConfig *GoCQWebsocketConfig `json:"ws_config"` } `json:"relogin"`
ReverseServers []*GoCQReverseWebsocketConfig `json:"ws_reverse_servers"` RateLimit struct {
Enabled bool `json:"enabled"`
Frequency float64 `json:"frequency"`
BucketSize int `json:"bucket_size"`
} `json:"_rate_limit"`
IgnoreInvalidCQCode bool `json:"ignore_invalid_cqcode"`
ForceFragmented bool `json:"force_fragmented"`
FixURL bool `json:"fix_url"`
ProxyRewrite string `json:"proxy_rewrite"`
HeartbeatInterval time.Duration `json:"heartbeat_interval"`
HTTPConfig *GoCQHTTPConfig `json:"http_config"`
WSConfig *GoCQWebSocketConfig `json:"ws_config"`
ReverseServers []*GoCQReverseWebSocketConfig `json:"ws_reverse_servers"`
PostMessageFormat string `json:"post_message_format"`
UseSSOAddress bool `json:"use_sso_address"`
Debug bool `json:"debug"` Debug bool `json:"debug"`
LogLevel string `json:"log_level"`
// WebUI *GoCQWebUI `json:"web_ui"`
} }
type CQHttpApiConfig struct { // CQHTTPAPIConfig HTTPAPI对应的Config结构体
type CQHTTPAPIConfig struct {
Host string `json:"host"` Host string `json:"host"`
Port uint16 `json:"port"` Port uint16 `json:"port"`
UseHttp bool `json:"use_http"` UseHTTP bool `json:"use_http"`
WSHost string `json:"ws_host"` WSHost string `json:"ws_host"`
WSPort uint16 `json:"ws_port"` WSPort uint16 `json:"ws_port"`
UseWS bool `json:"use_ws"` UseWS bool `json:"use_ws"`
WSReverseUrl string `json:"ws_reverse_url"` WSReverseURL string `json:"ws_reverse_url"`
WSReverseApiUrl string `json:"ws_reverse_api_url"` WSReverseAPIURL string `json:"ws_reverse_api_url"`
WSReverseEventUrl string `json:"ws_reverse_event_url"` WSReverseEventURL string `json:"ws_reverse_event_url"`
WSReverseReconnectInterval uint16 `json:"ws_reverse_reconnect_interval"` WSReverseReconnectInterval uint16 `json:"ws_reverse_reconnect_interval"`
WSReverseReconnectOnCode1000 bool `json:"ws_reverse_reconnect_on_code_1000"` WSReverseReconnectOnCode1000 bool `json:"ws_reverse_reconnect_on_code_1000"`
UseWsReverse bool `json:"use_ws_reverse"` UseWsReverse bool `json:"use_ws_reverse"`
PostUrl string `json:"post_url"` PostURL string `json:"post_url"`
AccessToken string `json:"access_token"` AccessToken string `json:"access_token"`
Secret string `json:"secret"` Secret string `json:"secret"`
PostMessageFormat string `json:"post_message_format"` PostMessageFormat string `json:"post_message_format"`
} }
type GoCQHttpConfig struct { // GoCQHTTPConfig 正向HTTP对应config结构体
type GoCQHTTPConfig struct {
Enabled bool `json:"enabled"` Enabled bool `json:"enabled"`
Host string `json:"host"` Host string `json:"host"`
Port uint16 `json:"port"` Port uint16 `json:"port"`
Timeout int32 `json:"timeout"`
PostUrls map[string]string `json:"post_urls"` PostUrls map[string]string `json:"post_urls"`
} }
type GoCQWebsocketConfig struct { // GoCQWebSocketConfig 正向WebSocket对应Config结构体
type GoCQWebSocketConfig struct {
Enabled bool `json:"enabled"` Enabled bool `json:"enabled"`
Host string `json:"host"` Host string `json:"host"`
Port uint16 `json:"port"` Port uint16 `json:"port"`
} }
type GoCQReverseWebsocketConfig struct { // GoCQReverseWebSocketConfig 反向WebSocket对应Config结构体
type GoCQReverseWebSocketConfig struct {
Enabled bool `json:"enabled"` Enabled bool `json:"enabled"`
ReverseUrl string `json:"reverse_url"` ReverseURL string `json:"reverse_url"`
ReverseApiUrl string `json:"reverse_api_url"` ReverseAPIURL string `json:"reverse_api_url"`
ReverseEventUrl string `json:"reverse_event_url"` ReverseEventURL string `json:"reverse_event_url"`
ReverseReconnectInterval uint16 `json:"reverse_reconnect_interval"` ReverseReconnectInterval uint16 `json:"reverse_reconnect_interval"`
} }
func DefaultConfig() *JsonConfig { /*
return &JsonConfig{ // GoCQWebUI WebUI对应Config结构体
type GoCQWebUI struct {
Enabled bool `json:"enabled"`
Host string `json:"host"`
WebUIPort uint64 `json:"web_ui_port"`
WebInput bool `json:"web_input"`
}
*/
// DefaultConfig 返回一份默认配置对应结构体
func DefaultConfig() *JSONConfig {
return &JSONConfig{
EnableDB: true, EnableDB: true,
HttpConfig: &GoCQHttpConfig{ ReLogin: struct {
Enabled bool `json:"enabled"`
ReLoginDelay int `json:"relogin_delay"`
MaxReloginTimes uint `json:"max_relogin_times"`
}{
Enabled: true,
ReLoginDelay: 3,
MaxReloginTimes: 0,
},
RateLimit: struct {
Enabled bool `json:"enabled"`
Frequency float64 `json:"frequency"`
BucketSize int `json:"bucket_size"`
}{
Enabled: false,
Frequency: 1,
BucketSize: 1,
},
PostMessageFormat: "string",
ForceFragmented: false,
HTTPConfig: &GoCQHTTPConfig{
Enabled: true, Enabled: true,
Host: "0.0.0.0", Host: "0.0.0.0",
Port: 5700, Port: 5700,
PostUrls: map[string]string{}, PostUrls: map[string]string{},
}, },
WSConfig: &GoCQWebsocketConfig{ WSConfig: &GoCQWebSocketConfig{
Enabled: true, Enabled: true,
Host: "0.0.0.0", Host: "0.0.0.0",
Port: 6700, Port: 6700,
}, },
ReverseServers: []*GoCQReverseWebsocketConfig{ ReverseServers: []*GoCQReverseWebSocketConfig{
{ {
Enabled: false, Enabled: false,
ReverseUrl: "ws://you_websocket_universal.server", ReverseURL: "ws://you_websocket_universal.server",
ReverseApiUrl: "ws://you_websocket_api.server", ReverseAPIURL: "ws://you_websocket_api.server",
ReverseEventUrl: "ws://you_websocket_event.server", ReverseEventURL: "ws://you_websocket_event.server",
ReverseReconnectInterval: 3000, ReverseReconnectInterval: 3000,
}, },
}, },
} }
} }
func Load(p string) *JsonConfig { // LoadConfig 加载配置文件
func LoadConfig(p string) *JSONConfig {
if !PathExists(p) { if !PathExists(p) {
log.Warnf("尝试加载配置文件 %v 失败: 文件不存在", p) log.Warnf("尝试加载配置文件 %v 失败: 文件不存在", p)
return nil return nil
} }
c := JsonConfig{} var dat map[string]interface{}
err := json.Unmarshal([]byte(ReadAllText(p)), &c) var c = JSONConfig{}
err := hjson.Unmarshal([]byte(ReadAllText(p)), &dat)
if err == nil {
b, _ := json.Marshal(dat)
err = json.Unmarshal(b, &c)
}
if err != nil { if err != nil {
log.Warnf("尝试加载配置文件 %v 时出现错误: %v", p, err) log.Warnf("尝试加载配置文件 %v 时出现错误: %v", p, err)
log.Infoln("原文件已备份")
_ = os.Rename(p, p+".backup"+strconv.FormatInt(time.Now().Unix(), 10))
return nil return nil
} }
return &c return &c
} }
func (c *JsonConfig) Save(p string) error { // Save 写入配置文件至path
data, err := json.MarshalIndent(c, "", "\t") func (c *JSONConfig) Save(path string) error {
data, err := hjson.MarshalWithOptions(c, hjson.EncoderOptions{
Eol: "\n",
BracesSameLine: true,
IndentBy: " ",
})
if err != nil { if err != nil {
return err return err
} }
WriteAllText(p, string(data)) return WriteAllText(path, string(data))
return nil
} }
// getCurrentPath 获取当前文件的路径直接返回string
func getCurrentPath() string {
cwd, e := os.Getwd()
if e != nil {
panic(e)
}
return cwd
}
/*
// GetCurrentPath 预留,获取当前目录地址
func GetCurrentPath() (string, error) {
file, err := exec.LookPath(os.Args[0])
if err != nil {
return "", err
}
fpath, err := filepath.Abs(file)
if err != nil {
return "", err
}
if runtime.GOOS == "windows" {
// fpath = strings.Replace(fpath, "\\", "/", -1)
fpath = strings.ReplaceAll(fpath, "\\", "/")
}
i := strings.LastIndex(fpath, "/")
if i < 0 {
return "", errors.New("system/path_error,Can't find '/' or '\\'")
}
return fpath[0 : i+1], nil
}
*/

2
global/doc.go Normal file
View File

@ -0,0 +1,2 @@
// Package global 包含文件下载,视频音频编码,本地文件缓存处理,消息过滤器,调用速率限制,gocq主配置等的相关函数与结构体
package global

312
global/filter.go Normal file
View File

@ -0,0 +1,312 @@
package global
import (
"fmt"
"io/ioutil"
"regexp"
"strings"
log "github.com/sirupsen/logrus"
"github.com/tidwall/gjson"
)
// MSG 消息Map
type MSG map[string]interface{}
// Get 尝试从消息Map中取出key为s的值,若不存在则返回MSG{}
//
// 若所给key对应的值的类型是global.MSG,则返回此值
//
// 若所给key对应值的类型不是global.MSG,则返回MSG{"__str__": Val}
func (m MSG) Get(s string) MSG {
if v, ok := m[s]; ok {
if msg, ok := v.(MSG); ok {
return msg
}
return MSG{"__str__": v} // 用这个名字应该没问题吧
}
return nil // 不存在为空
}
// String 将消息Map转化为String。若Map存在key "__str__",则返回此key对应的值,否则将输出整张消息Map对应的JSON字符串
func (m MSG) String() string {
if m == nil {
return "" // 空 JSON
}
if str, ok := m["__str__"]; ok {
if str == nil {
return "" // 空 JSON
}
return fmt.Sprint(str)
}
str, _ := json.MarshalToString(m)
return str
}
// Filter 定义了一个消息上报过滤接口
type Filter interface {
Eval(payload MSG) bool
}
type operationNode struct {
key string
filter Filter
}
// NotOperator 定义了过滤器中Not操作符
type NotOperator struct {
operand Filter
}
func notOperatorConstruct(argument gjson.Result) *NotOperator {
if !argument.IsObject() {
panic("the argument of 'not' operator must be an object")
}
op := new(NotOperator)
op.operand = Generate("and", argument)
return op
}
// Eval 对payload执行Not过滤
func (op *NotOperator) Eval(payload MSG) bool {
return !op.operand.Eval(payload)
}
// AndOperator 定义了过滤器中And操作符
type AndOperator struct {
operands []operationNode
}
func andOperatorConstruct(argument gjson.Result) *AndOperator {
if !argument.IsObject() {
panic("the argument of 'and' operator must be an object")
}
op := new(AndOperator)
argument.ForEach(func(key, value gjson.Result) bool {
switch {
case key.Str[0] == '.':
// is an operator
// ".foo": {
// "bar": "baz"
// }
opKey := key.Str[1:]
op.operands = append(op.operands, operationNode{"", Generate(opKey, value)})
case value.IsObject():
// is an normal key with an object as the value
// "foo": {
// ".bar": "baz"
// }
opKey := key.String()
op.operands = append(op.operands, operationNode{opKey, Generate("and", value)})
default:
// is an normal key with a non-object as the value
// "foo": "bar"
opKey := key.String()
op.operands = append(op.operands, operationNode{opKey, Generate("eq", value)})
}
return true
})
return op
}
// Eval 对payload执行And过滤
func (op *AndOperator) Eval(payload MSG) bool {
res := true
for _, operand := range op.operands {
if len(operand.key) == 0 {
// is an operator
res = res && operand.filter.Eval(payload)
} else {
// is an normal key
val := payload.Get(operand.key)
res = res && operand.filter.Eval(val)
}
if !res {
break
}
}
return res
}
// OrOperator 定义了过滤器中Or操作符
type OrOperator struct {
operands []Filter
}
func orOperatorConstruct(argument gjson.Result) *OrOperator {
if !argument.IsArray() {
panic("the argument of 'or' operator must be an array")
}
op := new(OrOperator)
argument.ForEach(func(_, value gjson.Result) bool {
op.operands = append(op.operands, Generate("and", value))
return true
})
return op
}
// Eval 对payload执行Or过滤
func (op *OrOperator) Eval(payload MSG) bool {
res := false
for _, operand := range op.operands {
res = res || operand.Eval(payload)
if res {
break
}
}
return res
}
// EqualOperator 定义了过滤器中Equal操作符
type EqualOperator struct {
operand string
}
func equalOperatorConstruct(argument gjson.Result) *EqualOperator {
op := new(EqualOperator)
op.operand = argument.String()
return op
}
// Eval 对payload执行Equal过滤
func (op *EqualOperator) Eval(payload MSG) bool {
return payload.String() == op.operand
}
// NotEqualOperator 定义了过滤器中NotEqual操作符
type NotEqualOperator struct {
operand string
}
func notEqualOperatorConstruct(argument gjson.Result) *NotEqualOperator {
op := new(NotEqualOperator)
op.operand = argument.String()
return op
}
// Eval 对payload执行NotEqual过滤
func (op *NotEqualOperator) Eval(payload MSG) bool {
return !(payload.String() == op.operand)
}
// InOperator 定义了过滤器中In操作符
type InOperator struct {
operandString string
operandArray []string
}
func inOperatorConstruct(argument gjson.Result) *InOperator {
if argument.IsObject() {
panic("the argument of 'in' operator must be an array or a string")
}
op := new(InOperator)
if argument.IsArray() {
op.operandArray = []string{}
argument.ForEach(func(_, value gjson.Result) bool {
op.operandArray = append(op.operandArray, value.String())
return true
})
} else {
op.operandString = argument.String()
}
return op
}
// Eval 对payload执行In过滤
func (op *InOperator) Eval(payload MSG) bool {
payloadStr := payload.String()
if op.operandArray != nil {
for _, value := range op.operandArray {
if value == payloadStr {
return true
}
}
return false
}
return strings.Contains(op.operandString, payloadStr)
}
// ContainsOperator 定义了过滤器中Contains操作符
type ContainsOperator struct {
operand string
}
func containsOperatorConstruct(argument gjson.Result) *ContainsOperator {
if argument.IsArray() || argument.IsObject() {
panic("the argument of 'contains' operator must be a string")
}
op := new(ContainsOperator)
op.operand = argument.String()
return op
}
// Eval 对payload执行Contains过滤
func (op *ContainsOperator) Eval(payload MSG) bool {
return strings.Contains(payload.String(), op.operand)
}
// RegexOperator 定义了过滤器中Regex操作符
type RegexOperator struct {
regex *regexp.Regexp
}
func regexOperatorConstruct(argument gjson.Result) *RegexOperator {
if argument.IsArray() || argument.IsObject() {
panic("the argument of 'regex' operator must be a string")
}
op := new(RegexOperator)
op.regex = regexp.MustCompile(argument.String())
return op
}
// Eval 对payload执行RegexO过滤
func (op *RegexOperator) Eval(payload MSG) bool {
matched := op.regex.MatchString(payload.String())
return matched
}
// Generate 根据给定操作符名opName及操作符参数argument创建一个过滤器实例
func Generate(opName string, argument gjson.Result) Filter {
switch opName {
case "not":
return notOperatorConstruct(argument)
case "and":
return andOperatorConstruct(argument)
case "or":
return orOperatorConstruct(argument)
case "neq":
return notEqualOperatorConstruct(argument)
case "eq":
return equalOperatorConstruct(argument)
case "in":
return inOperatorConstruct(argument)
case "contains":
return containsOperatorConstruct(argument)
case "regex":
return regexOperatorConstruct(argument)
default:
panic("the operator " + opName + " is not supported")
}
}
// EventFilter 初始化一个nil过滤器
var EventFilter Filter
// BootFilter 启动事件过滤器
func BootFilter() {
defer func() {
if e := recover(); e != nil {
log.Warnf("事件过滤器启动失败: %v", e)
EventFilter = nil
} else {
log.Info("事件过滤器启动成功.")
}
}()
f, err := ioutil.ReadFile("filter.json")
if err != nil {
panic(err)
} else {
EventFilter = Generate("and", gjson.ParseBytes(f))
}
}

View File

@ -1,33 +1,254 @@
package global package global
import ( import (
log "github.com/sirupsen/logrus" "bufio"
"bytes"
"compress/bzip2"
"crypto/md5"
"encoding/base64"
"encoding/hex"
"errors"
"fmt"
"io"
"io/ioutil" "io/ioutil"
"net"
"net/url"
"os" "os"
"path" "path"
"path/filepath"
"runtime"
"strconv"
"strings"
"github.com/kardianos/osext"
"github.com/dustin/go-humanize"
log "github.com/sirupsen/logrus"
) )
var IMAGE_PATH = path.Join("data", "images") const (
// ImagePath go-cqhttp使用的图片缓存目录
ImagePath = "data/images"
// ImagePathOld 兼容旧版go-cqhttp使用的图片缓存目录
ImagePathOld = "data/image"
// VoicePath go-cqhttp使用的语音缓存目录
VoicePath = "data/voices"
// VoicePathOld 兼容旧版go-cqhttp使用的语音缓存目录
VoicePathOld = "data/record"
// VideoPath go-cqhttp使用的视频缓存目录
VideoPath = "data/videos"
// CachePath go-cqhttp使用的缓存目录
CachePath = "data/cache"
)
var (
// ErrSyntax Path语法错误时返回的错误
ErrSyntax = errors.New("syntax error")
// HeaderAmr AMR文件头
HeaderAmr = []byte("#!AMR")
// HeaderSilk Silkv3文件头
HeaderSilk = []byte("\x02#!SILK_V3")
)
// PathExists 判断给定path是否存在
func PathExists(path string) bool { func PathExists(path string) bool {
_, err := os.Stat(path) _, err := os.Stat(path)
return err == nil || os.IsExist(err) return err == nil || os.IsExist(err)
} }
// ReadAllText 读取给定path对应文件无法读取时返回空值
func ReadAllText(path string) string { func ReadAllText(path string) string {
b, err := ioutil.ReadFile(path) b, err := ioutil.ReadFile(path)
if err != nil { if err != nil {
log.Error(err)
return "" return ""
} }
return string(b) return string(b)
} }
func WriteAllText(path, text string) { // WriteAllText 将给定text写入给定path
_ = ioutil.WriteFile(path, []byte(text), 0777) func WriteAllText(path, text string) error {
return ioutil.WriteFile(path, []byte(text), 0644)
} }
// Check 检测err是否为nil
func Check(err error) { func Check(err error) {
if err != nil { if err != nil {
log.Fatalf("遇到错误: %v", err) log.Fatalf("遇到错误: %v", err)
} }
} }
// IsAMRorSILK 判断给定文件是否为Amr或Silk格式
func IsAMRorSILK(b []byte) bool {
return bytes.HasPrefix(b, HeaderAmr) || bytes.HasPrefix(b, HeaderSilk)
}
// FindFile 从给定的File寻找文件并返回文件byte数组。File是一个合法的URL。p为文件寻找位置。
// 对于HTTP/HTTPS形式的URLCache为"1"或空时表示启用缓存
func FindFile(file, cache, p string) (data []byte, err error) {
data, err = nil, ErrSyntax
switch {
case strings.HasPrefix(file, "http") || strings.HasPrefix(file, "https"):
if cache == "" {
cache = "1"
}
hash := md5.Sum([]byte(file))
cacheFile := path.Join(CachePath, hex.EncodeToString(hash[:])+".cache")
if PathExists(cacheFile) && cache == "1" {
return ioutil.ReadFile(cacheFile)
}
data, err = GetBytes(file)
_ = ioutil.WriteFile(cacheFile, data, 0644)
if err != nil {
return nil, err
}
case strings.HasPrefix(file, "base64"):
data, err = base64.StdEncoding.DecodeString(strings.ReplaceAll(file, "base64://", ""))
if err != nil {
return nil, err
}
case strings.HasPrefix(file, "file"):
var fu *url.URL
fu, err = url.Parse(file)
if err != nil {
return nil, err
}
if strings.HasPrefix(fu.Path, "/") && runtime.GOOS == `windows` {
fu.Path = fu.Path[1:]
}
data, err = ioutil.ReadFile(fu.Path)
if err != nil {
return nil, err
}
case PathExists(path.Join(p, file)):
data, err = ioutil.ReadFile(path.Join(p, file))
if err != nil {
return nil, err
}
}
return
}
// DelFile 删除一个给定path并返回删除结果
func DelFile(path string) bool {
err := os.Remove(path)
if err != nil {
// 删除失败
log.Error(err)
return false
}
// 删除成功
log.Info(path + "删除成功")
return true
}
// ReadAddrFile 从给定path中读取合法的IP地址与端口,每个IP地址以换行符"\n"作为分隔
func ReadAddrFile(path string) []*net.TCPAddr {
d, err := ioutil.ReadFile(path)
if err != nil {
return nil
}
str := string(d)
lines := strings.Split(str, "\n")
var ret []*net.TCPAddr
for _, l := range lines {
ip := strings.Split(strings.TrimSpace(l), ":")
if len(ip) == 2 {
port, _ := strconv.Atoi(ip[1])
ret = append(ret, &net.TCPAddr{IP: net.ParseIP(ip[0]), Port: port})
}
}
return ret
}
// WriteCounter 写入量计算实例
type WriteCounter struct {
Total uint64
}
// Write 方法将写入的byte长度追加至写入的总长度Total中
func (wc *WriteCounter) Write(p []byte) (int, error) {
n := len(p)
wc.Total += uint64(n)
wc.PrintProgress()
return n, nil
}
// PrintProgress 方法将打印当前的总写入量
func (wc *WriteCounter) PrintProgress() {
fmt.Printf("\r%s", strings.Repeat(" ", 35))
fmt.Printf("\rDownloading... %s complete", humanize.Bytes(wc.Total))
}
// UpdateFromStream copy form getlantern/go-update
func UpdateFromStream(updateWith io.Reader) (err error, errRecover error) {
updatePath, err := osext.Executable()
if err != nil {
return
}
var newBytes []byte
// no patch to apply, go on through
var fileHeader []byte
bufBytes := bufio.NewReader(updateWith)
fileHeader, err = bufBytes.Peek(2)
if err != nil {
return
}
// The content is always bzip2 compressed except when running test, in
// which case is not prefixed with the magic byte sequence for sure.
if bytes.Equal([]byte{0x42, 0x5a}, fileHeader) {
// Identifying bzip2 files.
updateWith = bzip2.NewReader(bufBytes)
} else {
updateWith = io.Reader(bufBytes)
}
newBytes, err = ioutil.ReadAll(updateWith)
if err != nil {
return
}
// get the directory the executable exists in
updateDir := filepath.Dir(updatePath)
filename := filepath.Base(updatePath)
// Copy the contents of of newbinary to a the new executable file
newPath := filepath.Join(updateDir, fmt.Sprintf(".%s.new", filename))
fp, err := os.OpenFile(newPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0755)
if err != nil {
return
}
// We won't log this error, because it's always going to happen.
defer func() { _ = fp.Close() }()
if _, err = io.Copy(fp, bytes.NewReader(newBytes)); err != nil {
log.Errorf("Unable to copy data: %v\n", err)
}
// if we don't call fp.Close(), windows won't let us move the new executable
// because the file will still be "in use"
if err := fp.Close(); err != nil {
log.Errorf("Unable to close file: %v\n", err)
}
// this is where we'll move the executable to so that we can swap in the updated replacement
oldPath := filepath.Join(updateDir, fmt.Sprintf(".%s.old", filename))
// delete any existing old exec file - this is necessary on Windows for two reasons:
// 1. after a successful update, Windows can't remove the .old file because the process is still running
// 2. windows rename operations fail if the destination file already exists
_ = os.Remove(oldPath)
// move the existing executable to a new file in the same directory
err = os.Rename(updatePath, oldPath)
if err != nil {
return
}
// move the new executable in to become the new program
err = os.Rename(newPath, updatePath)
if err != nil {
// copy unsuccessful
errRecover = os.Rename(oldPath, updatePath)
} else {
// copy successful, remove the old binary
_ = os.Remove(oldPath)
}
return
}

165
global/log_hook.go Normal file
View File

@ -0,0 +1,165 @@
package global
import (
"fmt"
"io"
"os"
"path/filepath"
"reflect"
"sync"
"github.com/sirupsen/logrus"
)
// LocalHook logrus本地钩子
type LocalHook struct {
lock *sync.Mutex
levels []logrus.Level // hook级别
formatter logrus.Formatter // 格式
path string // 写入path
writer io.Writer // io
}
// Levels ref: logrus/hooks.go impl Hook interface
func (hook *LocalHook) Levels() []logrus.Level {
if len(hook.levels) == 0 {
return logrus.AllLevels
}
return hook.levels
}
func (hook *LocalHook) ioWrite(entry *logrus.Entry) error {
log, err := hook.formatter.Format(entry)
if err != nil {
return err
}
_, err = hook.writer.Write(log)
if err != nil {
return err
}
return nil
}
func (hook *LocalHook) pathWrite(entry *logrus.Entry) error {
dir := filepath.Dir(hook.path)
if err := os.MkdirAll(dir, os.ModePerm); err != nil {
return err
}
fd, err := os.OpenFile(hook.path, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0666)
if err != nil {
return err
}
defer fd.Close()
log, err := hook.formatter.Format(entry)
if err != nil {
return err
}
_, err = fd.Write(log)
return err
}
// Fire ref: logrus/hooks.go impl Hook interface
func (hook *LocalHook) Fire(entry *logrus.Entry) error {
hook.lock.Lock()
defer hook.lock.Unlock()
if hook.writer != nil {
return hook.ioWrite(entry)
}
if hook.path != "" {
return hook.pathWrite(entry)
}
return nil
}
// SetFormatter 设置日志格式
func (hook *LocalHook) SetFormatter(formatter logrus.Formatter) {
hook.lock.Lock()
defer hook.lock.Unlock()
if formatter == nil {
// 用默认的
formatter = &logrus.TextFormatter{DisableColors: true}
} else {
switch f := formatter.(type) {
case *logrus.TextFormatter:
textFormatter := f
textFormatter.DisableColors = true
default:
// todo
}
}
logrus.SetFormatter(formatter)
hook.formatter = formatter
}
// SetWriter 设置Writer
func (hook *LocalHook) SetWriter(writer io.Writer) {
hook.lock.Lock()
defer hook.lock.Unlock()
hook.writer = writer
}
// SetPath 设置日志写入路径
func (hook *LocalHook) SetPath(path string) {
hook.lock.Lock()
defer hook.lock.Unlock()
hook.path = path
}
// NewLocalHook 初始化本地日志钩子实现
func NewLocalHook(args interface{}, formatter logrus.Formatter, levels ...logrus.Level) *LocalHook {
hook := &LocalHook{
lock: new(sync.Mutex),
}
hook.SetFormatter(formatter)
hook.levels = append(hook.levels, levels...)
switch arg := args.(type) {
case string:
hook.SetPath(arg)
case io.Writer:
hook.SetWriter(arg)
default:
panic(fmt.Sprintf("unsupported type: %v", reflect.TypeOf(args)))
}
return hook
}
// GetLogLevel 获取日志等级
//
// 可能的值有
//
// "trace","debug","info","warn","warn","error"
func GetLogLevel(level string) []logrus.Level {
switch level {
case "trace":
return []logrus.Level{logrus.TraceLevel, logrus.DebugLevel,
logrus.InfoLevel, logrus.WarnLevel, logrus.ErrorLevel,
logrus.FatalLevel, logrus.PanicLevel}
case "debug":
return []logrus.Level{logrus.DebugLevel, logrus.InfoLevel,
logrus.WarnLevel, logrus.ErrorLevel,
logrus.FatalLevel, logrus.PanicLevel}
case "info":
return []logrus.Level{logrus.InfoLevel, logrus.WarnLevel,
logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel}
case "warn":
return []logrus.Level{logrus.WarnLevel, logrus.ErrorLevel,
logrus.FatalLevel, logrus.PanicLevel}
case "error":
return []logrus.Level{logrus.ErrorLevel, logrus.FatalLevel,
logrus.PanicLevel}
default:
return []logrus.Level{logrus.InfoLevel, logrus.WarnLevel,
logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel}
}
}

View File

@ -1,20 +1,60 @@
package global package global
import ( import (
"bufio"
"bytes" "bytes"
"compress/gzip" "compress/gzip"
"fmt"
"io"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/url"
"os"
"strconv"
"strings" "strings"
"sync"
"time"
"github.com/guonaihong/gout"
"github.com/pkg/errors"
"github.com/tidwall/gjson"
) )
var (
client = &http.Client{
Transport: &http.Transport{
Proxy: func(request *http.Request) (u *url.URL, e error) {
if Proxy == "" {
return http.ProxyFromEnvironment(request)
}
return url.Parse(Proxy)
},
ForceAttemptHTTP2: true,
MaxConnsPerHost: 0,
MaxIdleConns: 0,
MaxIdleConnsPerHost: 999,
},
}
// Proxy 存储Config.proxy_rewrite,用于设置代理
Proxy string
// ErrOverSize 响应主体过大时返回此错误
ErrOverSize = errors.New("oversize")
// UserAgent HTTP请求时使用的UA
UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.66"
)
// GetBytes 对给定URL发送Get请求返回响应主体
func GetBytes(url string) ([]byte, error) { func GetBytes(url string) ([]byte, error) {
req, err := http.NewRequest("GET", url, nil) req, err := http.NewRequest("GET", url, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
req.Header["User-Agent"] = []string{"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36 Edg/83.0.478.61"} req.Header["User-Agent"] = []string{UserAgent}
resp, err := http.DefaultClient.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -32,3 +72,228 @@ func GetBytes(url string) ([]byte, error) {
} }
return body, nil return body, nil
} }
// DownloadFile 将给定URL对应的文件下载至给定Path
func DownloadFile(url, path string, limit int64, headers map[string]string) error {
file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666)
if err != nil {
return err
}
defer file.Close()
req, err := http.NewRequest("GET", url, nil)
if err != nil {
return err
}
for k, v := range headers {
req.Header.Set(k, v)
}
if _, ok := headers["User-Agent"]; !ok {
req.Header["User-Agent"] = []string{UserAgent}
}
resp, err := client.Do(req)
if err != nil {
return err
}
defer resp.Body.Close()
if limit > 0 && resp.ContentLength > limit {
return ErrOverSize
}
_, err = io.Copy(file, resp.Body)
if err != nil {
return err
}
return nil
}
// DownloadFileMultiThreading 使用threadCount个线程将给定URL对应的文件下载至给定Path
func DownloadFileMultiThreading(url, path string, limit int64, threadCount int, headers map[string]string) error {
if threadCount < 2 {
return DownloadFile(url, path, limit, headers)
}
type BlockMetaData struct {
BeginOffset int64
EndOffset int64
DownloadedSize int64
}
var blocks []*BlockMetaData
var contentLength int64
errUnsupportedMultiThreading := errors.New("unsupported multi-threading")
// 初始化分块或直接下载
initOrDownload := func() error {
copyStream := func(s io.ReadCloser) error {
file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666)
if err != nil {
return err
}
defer file.Close()
if _, err = io.Copy(file, s); err != nil {
return err
}
return errUnsupportedMultiThreading
}
req, err := http.NewRequest("GET", url, nil)
if err != nil {
return err
}
for k, v := range headers {
req.Header.Set(k, v)
}
if _, ok := headers["User-Agent"]; !ok {
req.Header["User-Agent"] = []string{UserAgent}
}
req.Header.Set("range", "bytes=0-")
resp, err := client.Do(req)
if err != nil {
return err
}
defer resp.Body.Close()
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
return errors.New("response status unsuccessful: " + strconv.FormatInt(int64(resp.StatusCode), 10))
}
if resp.StatusCode == 200 {
if limit > 0 && resp.ContentLength > limit {
return ErrOverSize
}
return copyStream(resp.Body)
}
if resp.StatusCode == 206 {
contentLength = resp.ContentLength
if limit > 0 && resp.ContentLength > limit {
return ErrOverSize
}
blockSize := func() int64 {
if contentLength > 1024*1024 {
return (contentLength / int64(threadCount)) - 10
}
return contentLength
}()
if blockSize == contentLength {
return copyStream(resp.Body)
}
var tmp int64
for tmp+blockSize < contentLength {
blocks = append(blocks, &BlockMetaData{
BeginOffset: tmp,
EndOffset: tmp + blockSize - 1,
})
tmp += blockSize
}
blocks = append(blocks, &BlockMetaData{
BeginOffset: tmp,
EndOffset: contentLength - 1,
})
return nil
}
return errors.New("unknown status code")
}
// 下载分块
downloadBlock := func(block *BlockMetaData) error {
req, _ := http.NewRequest("GET", url, nil)
file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666)
if err != nil {
return err
}
defer file.Close()
_, _ = file.Seek(block.BeginOffset, io.SeekStart)
writer := bufio.NewWriter(file)
defer writer.Flush()
for k, v := range headers {
req.Header.Set(k, v)
}
if _, ok := headers["User-Agent"]; ok {
req.Header["User-Agent"] = []string{UserAgent}
}
req.Header.Set("range", "bytes="+strconv.FormatInt(block.BeginOffset, 10)+"-"+strconv.FormatInt(block.EndOffset, 10))
resp, err := client.Do(req)
if err != nil {
return err
}
defer resp.Body.Close()
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
return errors.New("response status unsuccessful: " + strconv.FormatInt(int64(resp.StatusCode), 10))
}
var buffer = make([]byte, 1024)
i, err := resp.Body.Read(buffer)
for {
if err != nil && err != io.EOF {
return err
}
i64 := int64(len(buffer[:i]))
needSize := block.EndOffset + 1 - block.BeginOffset
if i64 > needSize {
i64 = needSize
err = io.EOF
}
_, e := writer.Write(buffer[:i64])
if e != nil {
return e
}
block.BeginOffset += i64
block.DownloadedSize += i64
if err == io.EOF || block.BeginOffset > block.EndOffset {
break
}
i, err = resp.Body.Read(buffer)
}
return nil
}
if err := initOrDownload(); err != nil {
if err == errUnsupportedMultiThreading {
return nil
}
return err
}
wg := sync.WaitGroup{}
wg.Add(len(blocks))
var lastErr error
for i := range blocks {
go func(b *BlockMetaData) {
defer wg.Done()
if err := downloadBlock(b); err != nil {
lastErr = err
}
}(blocks[i])
}
wg.Wait()
return lastErr
}
// GetSliderTicket 通过给定的验证链接raw和id,获取验证结果Ticket
func GetSliderTicket(raw, id string) (string, error) {
var rsp string
if err := gout.POST("https://api.shkong.com/gocqhttpapi/task").SetJSON(gout.H{
"id": id,
"url": raw,
}).SetTimeout(time.Second * 35).BindBody(&rsp).Do(); err != nil {
return "", err
}
g := gjson.Parse(rsp)
if g.Get("error").Str != "" {
return "", errors.New(g.Get("error").Str)
}
return g.Get("ticket").Str, nil
}
// QQMusicSongInfo 通过给定id在QQ音乐上查找曲目信息
func QQMusicSongInfo(id string) (gjson.Result, error) {
d, err := GetBytes(`https://u.y.qq.com/cgi-bin/musicu.fcg?format=json&inCharset=utf8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0&data={%22comm%22:{%22ct%22:24,%22cv%22:0},%22songinfo%22:{%22method%22:%22get_song_detail_yqq%22,%22param%22:{%22song_type%22:0,%22song_mid%22:%22%22,%22song_id%22:` + id + `},%22module%22:%22music.pf_song_detail_svr%22}}`)
if err != nil {
return gjson.Result{}, err
}
return gjson.ParseBytes(d).Get("songinfo.data"), nil
}
// NeteaseMusicSongInfo 通过给定id在wdd音乐上查找曲目信息
func NeteaseMusicSongInfo(id string) (gjson.Result, error) {
d, err := GetBytes(fmt.Sprintf("http://music.163.com/api/song/detail/?id=%s&ids=%%5B%s%%5D", id, id))
if err != nil {
return gjson.Result{}, err
}
return gjson.ParseBytes(d).Get("songs.0"), nil
}

107
global/param.go Normal file
View File

@ -0,0 +1,107 @@
package global
import (
"math"
"regexp"
"strconv"
"strings"
"github.com/tidwall/gjson"
)
var trueSet = map[string]struct{}{
"true": {},
"yes": {},
"1": {},
}
var falseSet = map[string]struct{}{
"false": {},
"no": {},
"0": {},
}
// EnsureBool 判断给定的p是否可表示为合法Bool类型,否则返回defaultVal
//
// 支持的合法类型有
//
// type bool
//
// type gjson.True or gjson.False
//
// type string "true","yes","1" or "false","no","0" (case insensitive)
func EnsureBool(p interface{}, defaultVal bool) bool {
var str string
if b, ok := p.(bool); ok {
return b
}
if j, ok := p.(gjson.Result); ok {
if !j.Exists() {
return defaultVal
}
if j.Type == gjson.True {
return true
}
if j.Type == gjson.False {
return false
}
if j.Type != gjson.String {
return defaultVal
}
str = j.Str
} else if s, ok := p.(string); ok {
str = s
}
str = strings.ToLower(str)
if _, ok := trueSet[str]; ok {
return true
}
if _, ok := falseSet[str]; ok {
return false
}
return defaultVal
}
// VersionNameCompare 检查版本名是否需要更新, 仅适用于 go-cqhttp 的版本命名规则
//
// 例: v0.9.29-fix2 == v0.9.29-fix2 -> false
//
// v0.9.29-fix1 < v0.9.29-fix2 -> true
//
// v0.9.29-fix2 > v0.9.29-fix1 -> false
//
// v0.9.29-fix2 < v0.9.30 -> true
func VersionNameCompare(current, remote string) bool {
sp := regexp.MustCompile(`[0-9]\d*`)
cur := sp.FindAllStringSubmatch(current, -1)
re := sp.FindAllStringSubmatch(remote, -1)
for i := 0; i < int(math.Min(float64(len(cur)), float64(len(re)))); i++ {
curSub, _ := strconv.Atoi(cur[i][0])
reSub, _ := strconv.Atoi(re[i][0])
if curSub < reSub {
return true
}
}
return len(cur) < len(re)
}
// SplitURL 将给定URL字符串分割为两部分用于URL预处理防止风控
func SplitURL(s string) []string {
reg := regexp.MustCompile(`(?i)[a-z\d][-a-z\d]{0,62}(\.[a-z\d][-a-z\d]{0,62})+\.?`)
idx := reg.FindAllStringIndex(s, -1)
if len(idx) == 0 {
return []string{s}
}
var result []string
last := 0
for i := 0; i < len(idx); i++ {
if len(idx[i]) != 2 {
continue
}
m := int(math.Abs(float64(idx[i][0]-idx[i][1]))/1.5) + idx[i][0]
result = append(result, s[last:m])
last = m
}
result = append(result, s[last:])
return result
}

23
global/ratelimit.go Normal file
View File

@ -0,0 +1,23 @@
package global
import (
"context"
"golang.org/x/time/rate"
)
var limiter *rate.Limiter
var limitEnable = false
// RateLimit 执行API调用速率限制
func RateLimit(ctx context.Context) {
if limitEnable {
_ = limiter.Wait(ctx)
}
}
// InitLimiter 初始化速率限制器
func InitLimiter(frequency float64, bucketSize int) {
limitEnable = true
limiter = rate.NewLimiter(rate.Limit(frequency), bucketSize)
}

View File

@ -0,0 +1,7 @@
// +build !windows
package terminal
func RunningByDoubleClick() bool {
return false
}

View File

@ -0,0 +1,23 @@
// +build windows
package terminal
import (
"syscall"
"unsafe"
)
// RunningByDoubleClick 检查是否通过双击直接运行
func RunningByDoubleClick() bool {
kernel32 := syscall.NewLazyDLL("kernel32.dll")
lp := kernel32.NewProc("GetConsoleProcessList")
if lp != nil {
var ids [2]uint32
var maxCount uint32 = 2
ret, _, _ := lp.Call(uintptr(unsafe.Pointer(&ids)), uintptr(maxCount))
if ret > 1 {
return false
}
}
return true
}

35
go.mod
View File

@ -1,20 +1,31 @@
module github.com/Mrs4s/go-cqhttp module github.com/Mrs4s/go-cqhttp
go 1.14 go 1.16
require ( require (
github.com/Mrs4s/MiraiGo v0.0.0-20200804064012-e1e00ed0683b github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f
github.com/Mrs4s/MiraiGo v0.0.0-20210323143736-d233c90d5083
github.com/dustin/go-humanize v1.0.0
github.com/gin-gonic/gin v1.6.3 github.com/gin-gonic/gin v1.6.3
github.com/gorilla/websocket v1.4.2 github.com/gorilla/websocket v1.4.2
github.com/guonaihong/gout v0.1.1 github.com/guonaihong/gout v0.1.5
github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible github.com/hjson/hjson-go v3.1.0+incompatible
github.com/lestrrat-go/strftime v1.0.1 // indirect github.com/jonboulle/clockwork v0.2.2 // indirect
github.com/pkg/errors v0.9.1 // indirect github.com/json-iterator/go v1.1.10
github.com/sirupsen/logrus v1.6.0 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
github.com/lestrrat-go/strftime v1.0.4 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
github.com/syndtr/goleveldb v1.0.0
github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
github.com/tidwall/gjson v1.6.0 github.com/tidwall/gjson v1.6.8
github.com/xujiajun/nutsdb v0.5.0 github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2
github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189 github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa github.com/willf/bitset v1.1.11 // indirect
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
) )

149
go.sum
View File

@ -1,25 +1,28 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f h1:2dk3eOnYllh+wUOuDhOoC2vUVoJF/5z478ryJ+wzEII=
github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/go.mod h1:4a58ifQTEe2uwwsaqbh3i2un5/CBPg+At/qHpt18Tmk=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/Mrs4s/MiraiGo v0.0.0-20200804064012-e1e00ed0683b h1:HBZgam4cS+6/XFVXVcEv3YINozw2qUjnZIhj6EQXLbU= github.com/Mrs4s/MiraiGo v0.0.0-20210323143736-d233c90d5083 h1:ELaNvv80OTwHTYhKwoQpgV4dneKPM1qE5Geu3A1kM/8=
github.com/Mrs4s/MiraiGo v0.0.0-20200804064012-e1e00ed0683b/go.mod h1:M9wh1hjd0rie3+wm27tjPZkYMbD+MBV76CGqp2G7WSU= github.com/Mrs4s/MiraiGo v0.0.0-20210323143736-d233c90d5083/go.mod h1:NjiWhlvGxwv1ftOWIoiFa/OzklnAYI4YqNexFOKSZKw=
github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do= github.com/gin-gonic/gin v1.6.0/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY= github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
@ -34,103 +37,145 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0=
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/guonaihong/gout v0.1.1 h1:2i3eqQ1KUhTlj7AFeIHqVUFku5QwUhwE2wNgYTVpbxQ= github.com/guonaihong/gout v0.1.5 h1:1FeFFJWWdWYApBW9d6vzMDB4eR4Zr8T/gaVrjDVcl5U=
github.com/guonaihong/gout v0.1.1/go.mod h1:vXvv5Kxr70eM5wrp4F0+t9lnLWmq+YPW2GByll2f/EA= github.com/guonaihong/gout v0.1.5/go.mod h1:0rFYAYyzbcxEg11eY2qUbffJs7hHRPeugAnlVYSp8Ic=
github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/hjson/hjson-go v3.1.0+incompatible h1:DY/9yE8ey8Zv22bY+mHV1uk2yRy0h8tKhZ77hEdi0Aw=
github.com/hjson/hjson-go v3.1.0+incompatible/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio=
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8=
github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is= github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible h1:4mNlp+/SvALIPFpbXV3kxNJJno9iKFWGxSDE13Kl66Q= github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4=
github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA= github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
github.com/lestrrat-go/strftime v1.0.1 h1:o7qz5pmLzPDLyGW4lG6JvTKPUfTFXwe+vOamIYWtnVU= github.com/lestrrat-go/strftime v1.0.4 h1:T1Rb9EPkAhgxKqbcMIPguPq8glqXTA1koF8n9BHElA8=
github.com/lestrrat-go/strftime v1.0.1/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g= github.com/lestrrat-go/strftime v1.0.4/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4 h1:u9jwvcKbQpghIXgNl/EOL8hzhAFXh4ePrEP493W3tNA=
github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4/go.mod h1:kcRFpEzolcEklV6rD7W95mG49/sbdX/PlFmd7ni3RvA=
github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk= github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk=
github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA= github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
github.com/tidwall/gjson v1.6.0 h1:9VEQWz6LLMUsUl6PueE49ir4Ka6CzLymOAZDxpFsTDc= github.com/tidwall/gjson v1.6.8 h1:CTmXMClGYPAmln7652e69B7OLXfTi5ABcPPwjIWUv7w=
github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls= github.com/tidwall/gjson v1.6.8/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI=
github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc= github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E= github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2 h1:BWVtt2VBY+lmVDu9MGKqLGKl04B+iRHcrW1Ptyi/8tg=
github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2/go.mod h1:lPnW9HVS0vJdeYyQtOvIvlXgZPNhUAhwz+z5r8AJk0Y=
github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
github.com/xujiajun/gorouter v1.2.0/go.mod h1:yJrIta+bTNpBM/2UT8hLOaEAFckO+m/qmR3luMIQygM= github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60 h1:lRKf10iIOW0VsH5WDF621ihzR+R2wEBZVtNRHuLLCb4=
github.com/xujiajun/mmap-go v1.0.1 h1:7Se7ss1fLPPRW+ePgqGpCkfGIZzJV6JPq9Wq9iv/WHc= github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60/go.mod h1:ecFKZPX81BaB70I6ruUgEwYcDOtuNgJGnjdK+MIl5ko=
github.com/xujiajun/mmap-go v1.0.1/go.mod h1:CNN6Sw4SL69Sui00p0zEzcZKbt+5HtEnYUsc6BKKRMg= github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE=
github.com/xujiajun/nutsdb v0.5.0 h1:j/jM3Zw7Chg8WK7bAcKR0Xr7Mal47U1oJAMgySfDn9E= github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
github.com/xujiajun/nutsdb v0.5.0/go.mod h1:owdwN0tW084RxEodABLbO7h4Z2s9WiAjZGZFhRh0/1Q=
github.com/xujiajun/utils v0.0.0-20190123093513-8bf096c4f53b h1:jKG9OiL4T4xQN3IUrhUpc1tG+HfDXppkgVcrAiiaI/0=
github.com/xujiajun/utils v0.0.0-20190123093513-8bf096c4f53b/go.mod h1:AZd87GYJlUzl82Yab2kTjx1EyXSQCAfZDhpTo1SQC4k=
github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189 h1:4UJw9if55Fu3HOwbfcaQlJ27p3oeJU2JZqoeT3ITJQk=
github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189/go.mod h1:rIrm5geMiBhPQkdfUm8gDFi/WiHneOp1i9KjmJqc+9I=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b h1:wSOdpTq0/eI46Ez/LkDwIsAKA71YP2SRKBODiRWM0as=
golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201126233918-771906719818 h1:f1CIuDlJhwANEC2MM87MBEVMr3jl5bifgsfj90XAF9c=
golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@ -146,14 +191,28 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
modernc.org/libc v1.8.1 h1:y9oPIhwcaFXxX7kMp6Qb2ZLKzr0mDkikWN3CV5GS63o=
modernc.org/libc v1.8.1/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
modernc.org/mathutil v1.2.2 h1:+yFk8hBprV+4c0U9GjFtL+dV3N8hOJ8JCituQcMShFY=
modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
modernc.org/memory v1.0.4 h1:utMBrFcpnQDdNsmM6asmyH/FM9TqLPS7XF7otpJmrwM=
modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=

164
login.go Normal file
View File

@ -0,0 +1,164 @@
package main
import (
"bufio"
"bytes"
"io/ioutil"
"os"
"strings"
"time"
qrcodeTerminal "github.com/Baozisoftware/qrcode-terminal-go"
"github.com/Mrs4s/MiraiGo/client"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
"github.com/tuotoo/qrcode"
"github.com/Mrs4s/go-cqhttp/global"
)
var console = bufio.NewReader(os.Stdin)
var readLine = func() (str string) {
str, _ = console.ReadString('\n')
str = strings.TrimSpace(str)
return
}
var cli *client.QQClient
// ErrSMSRequestError SMS请求出错
var ErrSMSRequestError = errors.New("sms request error")
func commonLogin() error {
res, err := cli.Login()
if err != nil {
return err
}
return loginResponseProcessor(res)
}
func qrcodeLogin() error {
rsp, err := cli.FetchQRCode()
if err != nil {
return err
}
fi, err := qrcode.Decode(bytes.NewReader(rsp.ImageData))
if err != nil {
return err
}
_ = ioutil.WriteFile("qrcode.png", rsp.ImageData, 0644)
log.Infof("请使用手机QQ扫描二维码 (qrcode.png) : ")
time.Sleep(time.Second)
qrcodeTerminal.New().Get(fi.Content).Print()
s, err := cli.QueryQRCodeStatus(rsp.Sig)
if err != nil {
return err
}
prevState := s.State
for {
time.Sleep(time.Second)
s, _ = cli.QueryQRCodeStatus(rsp.Sig)
if s == nil {
continue
}
if prevState == s.State {
continue
}
prevState = s.State
if s.State == client.QRCodeCanceled {
log.Fatalf("扫码被用户取消.")
}
if s.State == client.QRCodeTimeout {
log.Fatalf("二维码过期")
}
if s.State == client.QRCodeWaitingForConfirm {
log.Infof("扫码成功, 请在手机端确认登录.")
}
if s.State == client.QRCodeConfirmed {
res, err := cli.QRCodeLogin(s.LoginInfo)
if err != nil {
return nil
}
return loginResponseProcessor(res)
}
}
}
func loginResponseProcessor(res *client.LoginResponse) error {
var err error
for {
if err != nil {
return err
}
if res.Success {
return nil
}
var text string
switch res.Error {
case client.SliderNeededError:
log.Warnf("登录需要滑条验证码. ")
log.Warnf("请参考文档 -> https://github.com/Mrs4s/go-cqhttp/blob/master/docs/slider.md <- 抓包获取 Ticket")
println()
log.Warnf("请用浏览器打开 -> %v <- 并获取Ticket.", res.VerifyUrl)
println()
log.Warn("请输入Ticket (Enter 提交)")
text = readLine()
res, err = cli.SubmitTicket(text)
continue
case client.NeedCaptcha:
log.Warnf("登录需要滑条验证码.")
_ = ioutil.WriteFile("captcha.jpg", res.CaptchaImage, 0644)
log.Warnf("请输入验证码 (captcha.jpg) (Enter 提交)")
text = readLine()
global.DelFile("captcha.jpg")
res, err = cli.SubmitCaptcha(text, res.CaptchaSign)
continue
case client.SMSNeededError:
log.Warnf("账号已开启设备锁, 按 Enter 向手机 %v 发送短信验证码.", res.SMSPhone)
readLine()
if !cli.RequestSMS() {
log.Warnf("发送验证码失败,可能是请求过于频繁.")
return errors.WithStack(ErrSMSRequestError)
}
log.Warn("请输入短信验证码: (Enter 提交)")
text = readLine()
res, err = cli.SubmitSMS(text)
continue
case client.SMSOrVerifyNeededError:
log.Warnf("账号已开启设备锁,请选择验证方式:")
log.Warnf("1. 向手机 %v 发送短信验证码", res.SMSPhone)
log.Warnf("2. 使用手机QQ扫码验证.")
log.Warn("请输入(1 - 2)")
text = readLine()
if strings.Contains(text, "1") {
if !cli.RequestSMS() {
log.Warnf("发送验证码失败,可能是请求过于频繁.")
return errors.WithStack(ErrSMSRequestError)
}
log.Warn("请输入短信验证码: (Enter 提交)")
text = readLine()
res, err = cli.SubmitSMS(text)
continue
}
fallthrough
case client.UnsafeDeviceError:
log.Warnf("账号已开启设备锁,请前往 -> %v <- 验证后重启Bot.", res.VerifyUrl)
log.Infof("按 Enter 继续....")
readLine()
os.Exit(0)
case client.OtherLoginError, client.UnknownLoginError, client.TooManySMSRequestError:
msg := res.ErrorMessage
if strings.Contains(msg, "版本") {
msg = "密码错误或账号被冻结"
}
if strings.Contains(msg, "冻结") {
log.Fatalf("账号被冻结")
}
log.Warnf("登录失败: %v", msg)
log.Infof("按 Enter 继续....")
readLine()
os.Exit(0)
}
}
}

662
main.go
View File

@ -2,129 +2,195 @@ package main
import ( import (
"bufio" "bufio"
"bytes" "crypto/aes"
"encoding/json" "crypto/md5"
"crypto/sha1"
"encoding/base64"
"encoding/hex"
"flag"
"fmt" "fmt"
"github.com/Mrs4s/MiraiGo/client"
"github.com/Mrs4s/go-cqhttp/coolq"
"github.com/Mrs4s/go-cqhttp/global"
"github.com/Mrs4s/go-cqhttp/server"
rotatelogs "github.com/lestrrat-go/file-rotatelogs"
log "github.com/sirupsen/logrus"
easy "github.com/t-tomalak/logrus-easy-formatter"
asciiart "github.com/yinghau76/go-ascii-art"
"image"
"io" "io"
"io/ioutil" "io/ioutil"
"net/http"
"os" "os"
"os/signal" "os/signal"
"path" "path"
"runtime"
"strconv" "strconv"
"strings" "strings"
"sync"
"syscall"
"time" "time"
"github.com/Mrs4s/go-cqhttp/coolq"
"github.com/Mrs4s/go-cqhttp/global"
"github.com/Mrs4s/go-cqhttp/global/terminal"
"github.com/Mrs4s/go-cqhttp/server"
"github.com/Mrs4s/MiraiGo/binary"
"github.com/Mrs4s/MiraiGo/client"
"github.com/guonaihong/gout"
jsoniter "github.com/json-iterator/go"
rotatelogs "github.com/lestrrat-go/file-rotatelogs"
log "github.com/sirupsen/logrus"
easy "github.com/t-tomalak/logrus-easy-formatter"
"github.com/tidwall/gjson"
"golang.org/x/crypto/pbkdf2"
"golang.org/x/term"
) )
var json = jsoniter.ConfigCompatibleWithStandardLibrary
var conf *global.JSONConfig
var isFastStart = false
var c string
var d bool
var h bool
func init() { func init() {
log.SetFormatter(&easy.Formatter{ var debug bool
flag.StringVar(&c, "c", global.DefaultConfFile, "configuration filename default is config.hjson")
flag.BoolVar(&d, "d", false, "running as a daemon")
flag.BoolVar(&debug, "D", false, "debug mode")
flag.BoolVar(&h, "h", false, "this help")
flag.Parse()
// 通过-c 参数替换 配置文件路径
global.DefaultConfFile = c
logFormatter := &easy.Formatter{
TimestampFormat: "2006-01-02 15:04:05", TimestampFormat: "2006-01-02 15:04:05",
LogFormat: "[%time%] [%lvl%]: %msg% \n", LogFormat: "[%time%] [%lvl%]: %msg% \n",
}) }
w, err := rotatelogs.New(path.Join("logs", "%Y-%m-%d.log"), rotatelogs.WithRotationTime(time.Hour*24)) w, err := rotatelogs.New(path.Join("logs", "%Y-%m-%d.log"), rotatelogs.WithRotationTime(time.Hour*24))
if err == nil { if err != nil {
log.SetOutput(io.MultiWriter(os.Stderr, w)) log.Errorf("rotatelogs init err: %v", err)
panic(err)
} }
if !global.PathExists("data") {
if err := os.Mkdir("data", 0777); err != nil { conf = getConfig()
log.Fatalf("创建数据文件夹失败: %v", err) if conf == nil {
os.Exit(1)
} }
if err := os.Mkdir(path.Join("data", "images"), 0777); err != nil {
log.Fatalf("创建图片缓存文件夹失败: %v", err) if debug {
conf.Debug = true
} }
// 在debug模式下,将在标准输出中打印当前执行行数
if conf.Debug {
log.SetReportCaller(true)
} }
log.AddHook(global.NewLocalHook(w, logFormatter, global.GetLogLevel(conf.LogLevel)...))
if global.PathExists("cqhttp.json") { if global.PathExists("cqhttp.json") {
log.Info("发现 cqhttp.json 将在五秒后尝试导入配置,按 Ctrl+C 取消.") log.Info("发现 cqhttp.json 将在五秒后尝试导入配置,按 Ctrl+C 取消.")
log.Warn("警告: 该操作会删除 cqhttp.json 并覆盖 config.json 文件.") log.Warn("警告: 该操作会删除 cqhttp.json 并覆盖 config.hjson 文件.")
time.Sleep(time.Second * 5) time.Sleep(time.Second * 5)
conf := global.CQHttpApiConfig{} conf := global.CQHTTPAPIConfig{}
if err := json.Unmarshal([]byte(global.ReadAllText("cqhttp.json")), &conf); err != nil { if err := json.Unmarshal([]byte(global.ReadAllText("cqhttp.json")), &conf); err != nil {
log.Fatalf("读取文件 cqhttp.json 失败: %v", err) log.Fatalf("读取文件 cqhttp.json 失败: %v", err)
} }
goConf := global.DefaultConfig() goConf := global.DefaultConfig()
goConf.AccessToken = conf.AccessToken goConf.AccessToken = conf.AccessToken
goConf.HttpConfig.Host = conf.Host goConf.HTTPConfig.Host = conf.Host
goConf.HttpConfig.Port = conf.Port goConf.HTTPConfig.Port = conf.Port
goConf.WSConfig.Host = conf.WSHost goConf.WSConfig.Host = conf.WSHost
goConf.WSConfig.Port = conf.WSPort goConf.WSConfig.Port = conf.WSPort
if conf.PostUrl != "" { if conf.PostURL != "" {
goConf.HttpConfig.PostUrls[conf.PostUrl] = conf.Secret goConf.HTTPConfig.PostUrls[conf.PostURL] = conf.Secret
} }
if conf.UseWsReverse { if conf.UseWsReverse {
goConf.ReverseServers[0].Enabled = true goConf.ReverseServers[0].Enabled = true
goConf.ReverseServers[0].ReverseUrl = conf.WSReverseUrl goConf.ReverseServers[0].ReverseURL = conf.WSReverseURL
goConf.ReverseServers[0].ReverseApiUrl = conf.WSReverseApiUrl goConf.ReverseServers[0].ReverseAPIURL = conf.WSReverseAPIURL
goConf.ReverseServers[0].ReverseEventUrl = conf.WSReverseEventUrl goConf.ReverseServers[0].ReverseEventURL = conf.WSReverseEventURL
goConf.ReverseServers[0].ReverseReconnectInterval = conf.WSReverseReconnectInterval goConf.ReverseServers[0].ReverseReconnectInterval = conf.WSReverseReconnectInterval
} }
if err := goConf.Save("config.json"); err != nil { if err := goConf.Save(global.DefaultConfFile); err != nil {
log.Fatalf("保存 config.json 时出现错误: %v", err) log.Fatalf("保存 %s 时出现错误: %v", global.DefaultConfFile, err)
} }
_ = os.Remove("cqhttp.json") _ = os.Remove("cqhttp.json")
} }
if !global.PathExists(global.ImagePath) {
if err := os.MkdirAll(global.ImagePath, 0755); err != nil {
log.Fatalf("创建图片缓存文件夹失败: %v", err)
}
}
if !global.PathExists(global.VoicePath) {
if err := os.MkdirAll(global.VoicePath, 0755); err != nil {
log.Fatalf("创建语音缓存文件夹失败: %v", err)
}
}
if !global.PathExists(global.VideoPath) {
if err := os.MkdirAll(global.VideoPath, 0755); err != nil {
log.Fatalf("创建视频缓存文件夹失败: %v", err)
}
}
if !global.PathExists(global.CachePath) {
if err := os.MkdirAll(global.CachePath, 0755); err != nil {
log.Fatalf("创建发送图片缓存文件夹失败: %v", err)
}
}
} }
func main() { func main() {
console := bufio.NewReader(os.Stdin) if h {
var conf *global.JsonConfig help()
if global.PathExists("config.json") || os.Getenv("UIN") == "" {
conf = global.Load("config.json")
} else if os.Getenv("UIN") != "" {
log.Infof("将从环境变量加载配置.")
uin, _ := strconv.ParseInt(os.Getenv("UIN"), 10, 64)
pwd := os.Getenv("PASS")
post := os.Getenv("HTTP_POST")
conf = &global.JsonConfig{
Uin: uin,
Password: pwd,
HttpConfig: &global.GoCQHttpConfig{
Enabled: true,
Host: "0.0.0.0",
Port: 5700,
PostUrls: map[string]string{},
},
WSConfig: &global.GoCQWebsocketConfig{
Enabled: true,
Host: "0.0.0.0",
Port: 6700,
},
Debug: os.Getenv("DEBUG") == "true",
} }
if post != "" { if d {
conf.HttpConfig.PostUrls[post] = os.Getenv("HTTP_SECRET") server.Daemon()
}
var byteKey []byte
arg := os.Args
if len(arg) > 1 {
for i := range arg {
switch arg[i] {
case "update":
if len(arg) > i+1 {
selfUpdate(arg[i+1])
} else {
selfUpdate("")
}
case "key":
if len(arg) > i+1 {
b := []byte(arg[i+1])
byteKey = b
}
case "faststart":
isFastStart = true
} }
} }
if conf == nil {
err := global.DefaultConfig().Save("config.json")
if err != nil {
log.Fatalf("创建默认配置文件时出现错误: %v", err)
return
} }
log.Infof("默认配置文件已生成, 请编辑 config.json 后重启程序.") if terminal.RunningByDoubleClick() && !isFastStart {
log.Warning("警告: 强烈不推荐通过双击直接运行本程序, 这将导致一些非预料的后果.")
log.Warning("将等待10s后启动")
time.Sleep(time.Second * 10)
}
if conf.Uin == 0 || (conf.Password == "" && conf.PasswordEncrypted == "") {
log.Warn("账号密码未配置, 将使用二维码登录.")
if !isFastStart {
log.Warn("将在 5秒 后继续.")
time.Sleep(time.Second * 5) time.Sleep(time.Second * 5)
return
} }
if conf.Uin == 0 || conf.Password == "" {
log.Warnf("请修改 config.json 以添加账号密码.")
time.Sleep(time.Second * 5)
return
} }
log.Info("当前版本:", coolq.Version)
if conf.Debug { if conf.Debug {
log.SetLevel(log.DebugLevel) log.SetLevel(log.DebugLevel)
log.Warnf("已开启Debug模式.") log.Warnf("已开启Debug模式.")
log.Debugf("开发交流群: 192548878")
server.Debug = true
/*
if conf.WebUI == nil || !conf.WebUI.Enabled {
log.Warnf("警告: 在Debug模式下未启用WebUi服务, 将无法进行性能分析.")
} }
*/
}
log.Info("用户交流群: 721829413")
if !global.PathExists("device.json") { if !global.PathExists("device.json") {
log.Warn("虚拟设备信息不存在, 将自动生成随机设备.") log.Warn("虚拟设备信息不存在, 将自动生成随机设备.")
client.GenRandomDevice() client.GenRandomDevice()
_ = ioutil.WriteFile("device.json", client.SystemDeviceInfo.ToJson(), 0777) _ = ioutil.WriteFile("device.json", client.SystemDeviceInfo.ToJson(), 0644)
log.Info("已生成设备信息并保存到 device.json 文件.") log.Info("已生成设备信息并保存到 device.json 文件.")
} else { } else {
log.Info("将使用 device.json 内的设备信息运行Bot.") log.Info("将使用 device.json 内的设备信息运行Bot.")
@ -132,81 +198,439 @@ func main() {
log.Fatalf("加载设备信息失败: %v", err) log.Fatalf("加载设备信息失败: %v", err)
} }
} }
if conf.EncryptPassword && conf.PasswordEncrypted == "" {
log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
global.PasswordHash = md5.Sum([]byte(conf.Password))
conf.Password = ""
conf.PasswordEncrypted = "AES:" + PasswordHashEncrypt(global.PasswordHash[:], byteKey)
_ = conf.Save(global.DefaultConfFile)
}
if conf.PasswordEncrypted != "" {
if len(byteKey) == 0 {
log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
cancel := make(chan struct{}, 1)
go func() {
select {
case <-cancel:
return
case <-time.After(time.Second * 45):
log.Infof("解密key输入超时")
time.Sleep(3 * time.Second)
os.Exit(0)
}
}()
byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
cancel <- struct{}{}
} else {
log.Infof("密码加密已启用, 使用运行时传递的参数进行解密,按 Ctrl+C 取消.")
}
// 升级客户端密码加密方案MD5+TEA 加密密码 -> PBKDF2+AES 加密 MD5
// 升级后的 PasswordEncrypted 字符串以"AES:"开始,其后为 Hex 编码的16字节加密 MD5
if !strings.HasPrefix(conf.PasswordEncrypted, "AES:") {
password := OldPasswordDecrypt(conf.PasswordEncrypted, byteKey)
passwordHash := md5.Sum([]byte(password))
newPasswordHash := PasswordHashEncrypt(passwordHash[:], byteKey)
conf.PasswordEncrypted = "AES:" + newPasswordHash
_ = conf.Save(global.DefaultConfFile)
log.Debug("密码加密方案升级完成")
}
ph, err := PasswordHashDecrypt(conf.PasswordEncrypted[4:], byteKey)
if err != nil {
log.Fatalf("加密存储的密码损坏,请尝试重新配置密码")
}
copy(global.PasswordHash[:], ph)
} else if conf.Password != "" {
global.PasswordHash = md5.Sum([]byte(conf.Password))
}
if !isFastStart {
log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.") log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
time.Sleep(time.Second * 5) time.Sleep(time.Second * 5)
}
log.Info("开始尝试登录并同步消息...") log.Info("开始尝试登录并同步消息...")
cli := client.NewClient(conf.Uin, conf.Password) log.Infof("使用协议: %v", func() string {
rsp, err := cli.Login() switch client.SystemDeviceInfo.Protocol {
for { case client.IPad:
global.Check(err) return "iPad"
if !rsp.Success { case client.AndroidPhone:
switch rsp.Error { return "Android Phone"
case client.NeedCaptcha: case client.AndroidWatch:
img, _, _ := image.Decode(bytes.NewReader(rsp.CaptchaImage)) return "Android Watch"
fmt.Println(asciiart.New("image", img).Art) case client.MacOS:
log.Warn("请输入验证码: (Enter 提交)") return "MacOS"
text, _ := console.ReadString('\n') }
rsp, err = cli.SubmitCaptcha(strings.ReplaceAll(text, "\n", ""), rsp.CaptchaSign) return "未知"
continue }())
case client.UnsafeDeviceError: cli = client.NewClientEmpty()
log.Warnf("账号已开启设备锁,请前往 -> %v <- 验证并重启Bot.", rsp.VerifyUrl) if conf.Uin != 0 && global.PasswordHash != [16]byte{} {
log.Infof(" 按 Enter 继续....") cli.Uin = conf.Uin
_, _ = console.ReadString('\n') cli.PasswordMd5 = global.PasswordHash
}
cli.OnLog(func(c *client.QQClient, e *client.LogEvent) {
switch e.Type {
case "INFO":
log.Info("Protocol -> " + e.Message)
case "ERROR":
log.Error("Protocol -> " + e.Message)
case "DEBUG":
log.Debug("Protocol -> " + e.Message)
}
})
if global.PathExists("address.txt") {
log.Infof("检测到 address.txt 文件. 将覆盖目标IP.")
addr := global.ReadAddrFile("address.txt")
if len(addr) > 0 {
cli.SetCustomServer(addr)
}
log.Infof("读取到 %v 个自定义地址.", len(addr))
}
cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
if !conf.UseSSOAddress {
log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
return false
}
log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
return true
})
/*
if conf.WebUI == nil {
conf.WebUI = &global.GoCQWebUI{
Enabled: true,
WebInput: false,
Host: "0.0.0.0",
WebUIPort: 9999,
}
}
if conf.WebUI.WebUIPort <= 0 {
conf.WebUI.WebUIPort = 9999
}
if conf.WebUI.Host == "" {
conf.WebUI.Host = "127.0.0.1"
}
*/
global.Proxy = conf.ProxyRewrite
// b := server.WebServer.Run(fmt.Sprintf("%s:%d", conf.WebUI.Host, conf.WebUI.WebUIPort), cli)
// c := server.Console
isQRCodeLogin := (conf.Uin == 0 || len(conf.Password) == 0) && len(conf.PasswordEncrypted) == 0
if !isQRCodeLogin {
if err := commonLogin(); err != nil {
log.Fatalf("登录时发生致命错误: %v", err)
}
} else {
if err := qrcodeLogin(); err != nil {
log.Fatalf("登录时发生致命错误: %v", err)
}
}
var times uint = 1 // 重试次数
var reLoginLock sync.Mutex
cli.OnDisconnected(func(q *client.QQClient, e *client.ClientDisconnectedEvent) {
reLoginLock.Lock()
defer reLoginLock.Unlock()
log.Warnf("Bot已离线: %v", e.Message)
if !conf.ReLogin.Enabled {
os.Exit(1)
}
if isQRCodeLogin {
log.Fatalf("二维码登录暂不支持重连.")
}
if times > conf.ReLogin.MaxReloginTimes && conf.ReLogin.MaxReloginTimes != 0 {
log.Fatalf("Bot重连次数超过限制, 停止")
}
if conf.ReLogin.ReLoginDelay > 0 {
log.Warnf("将在 %v 秒后尝试重连. 重连次数:%v/%v", conf.ReLogin.ReLoginDelay, times, conf.ReLogin.MaxReloginTimes)
}
log.Warnf("尝试重连...")
if cli.Online {
return return
case client.OtherLoginError, client.UnknownLoginError:
log.Fatalf("登录失败: %v", rsp.ErrorMessage)
} }
if err := commonLogin(); err != nil {
log.Fatalf("登录时发生致命错误: %v", err)
} }
break })
} cli.AllowSlider = true
log.Infof("登录成功 欢迎使用: %v", cli.Nickname) log.Infof("登录成功 欢迎使用: %v", cli.Nickname)
time.Sleep(time.Second)
log.Info("开始加载好友列表...") log.Info("开始加载好友列表...")
global.Check(cli.ReloadFriendList()) global.Check(cli.ReloadFriendList())
log.Infof("共加载 %v 个好友.", len(cli.FriendList)) log.Infof("共加载 %v 个好友.", len(cli.FriendList))
log.Infof("开始加载群列表...") log.Infof("开始加载群列表...")
global.Check(cli.ReloadGroupList()) global.Check(cli.ReloadGroupList())
log.Infof("共加载 %v 个群.", len(cli.GroupList)) log.Infof("共加载 %v 个群.", len(cli.GroupList))
b := coolq.NewQQBot(cli, conf) bot := coolq.NewQQBot(cli, conf)
if conf.HttpConfig != nil && conf.HttpConfig.Enabled { if conf.PostMessageFormat != "string" && conf.PostMessageFormat != "array" {
server.HttpServer.Run(fmt.Sprintf("%s:%d", conf.HttpConfig.Host, conf.HttpConfig.Port), conf.AccessToken, b) log.Warnf("post_message_format 配置错误, 将自动使用 string")
for k, v := range conf.HttpConfig.PostUrls { coolq.SetMessageFormat("string")
server.NewHttpClient().Run(k, v, b) } else {
coolq.SetMessageFormat(conf.PostMessageFormat)
}
if conf.RateLimit.Enabled {
global.InitLimiter(conf.RateLimit.Frequency, conf.RateLimit.BucketSize)
}
log.Info("正在加载事件过滤器.")
global.BootFilter()
coolq.IgnoreInvalidCQCode = conf.IgnoreInvalidCQCode
coolq.SplitURL = conf.FixURL
coolq.ForceFragmented = conf.ForceFragmented
if conf.HTTPConfig != nil && conf.HTTPConfig.Enabled {
go server.CQHTTPApiServer.Run(fmt.Sprintf("%s:%d", conf.HTTPConfig.Host, conf.HTTPConfig.Port), conf.AccessToken, bot)
for k, v := range conf.HTTPConfig.PostUrls {
server.NewHTTPClient().Run(k, v, conf.HTTPConfig.Timeout, bot)
} }
} }
if conf.WSConfig != nil && conf.WSConfig.Enabled { if conf.WSConfig != nil && conf.WSConfig.Enabled {
server.WebsocketServer.Run(fmt.Sprintf("%s:%d", conf.WSConfig.Host, conf.WSConfig.Port), conf.AccessToken, b) go server.WebSocketServer.Run(fmt.Sprintf("%s:%d", conf.WSConfig.Host, conf.WSConfig.Port), conf.AccessToken, bot)
} }
for _, rc := range conf.ReverseServers { for _, rc := range conf.ReverseServers {
server.NewWebsocketClient(rc, conf.AccessToken, b).Run() go server.NewWebSocketClient(rc, conf.AccessToken, bot).Run()
} }
log.Info("资源初始化完成, 开始处理信息.") log.Info("资源初始化完成, 开始处理信息.")
log.Info("アトリは、高性能ですから!") log.Info("アトリは、高性能ですから!")
cli.OnDisconnected(func(bot *client.QQClient, e *client.ClientDisconnectedEvent) { c := make(chan os.Signal, 1)
if conf.ReLogin { go checkUpdate()
log.Warnf("Bot已离线将在 %v 秒后尝试重连.", conf.ReLoginDelay) signal.Notify(c, os.Interrupt, syscall.SIGTERM)
time.Sleep(time.Second * time.Duration(conf.ReLoginDelay)) <-c
rsp, err := cli.Login() }
// PasswordHashEncrypt 使用key加密给定passwordHash
func PasswordHashEncrypt(passwordHash []byte, key []byte) string {
if len(passwordHash) != 16 {
panic("密码加密参数错误")
}
key = pbkdf2.Key(key, key, 114514, 32, sha1.New)
cipher, _ := aes.NewCipher(key)
result := make([]byte, 16)
cipher.Encrypt(result, passwordHash)
return hex.EncodeToString(result)
}
// PasswordHashDecrypt 使用key解密给定passwordHash
func PasswordHashDecrypt(encryptedPasswordHash string, key []byte) ([]byte, error) {
ciphertext, err := hex.DecodeString(encryptedPasswordHash)
if err != nil { if err != nil {
log.Fatalf("重连失败: %v", err) return nil, err
} }
if !rsp.Success {
switch rsp.Error { key = pbkdf2.Key(key, key, 114514, 32, sha1.New)
case client.NeedCaptcha:
log.Fatalf("重连失败: 需要验证码. (验证码处理正在开发中)") cipher, _ := aes.NewCipher(key)
case client.UnsafeDeviceError: result := make([]byte, 16)
log.Fatalf("重连失败: 设备锁") cipher.Decrypt(result, ciphertext)
default:
log.Fatalf("重连失败: %v", rsp.ErrorMessage) return result, nil
}
// OldPasswordDecrypt 使用key解密老password仅供兼容使用
func OldPasswordDecrypt(encryptedPassword string, key []byte) string {
defer func() {
if pan := recover(); pan != nil {
log.Fatalf("密码解密失败: %v", pan)
} }
}()
encKey := md5.Sum(key)
encrypted, err := base64.StdEncoding.DecodeString(encryptedPassword)
if err != nil {
panic(err)
} }
tea := binary.NewTeaCipher(encKey[:])
if tea == nil {
panic("密钥错误")
}
return string(tea.Decrypt(encrypted))
}
func checkUpdate() {
log.Infof("正在检查更新.")
if coolq.Version == "(devel)" {
log.Warnf("检查更新失败: 使用的 Actions 测试版或自编译版本.")
return return
} }
b.Release() var res string
log.Fatalf("Bot已离线%v", e.Message) if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases").BindBody(&res).Do(); err != nil {
}) log.Warnf("检查更新失败: %v", err)
c := make(chan os.Signal, 1) return
signal.Notify(c, os.Interrupt, os.Kill) }
<-c detail := gjson.Parse(res)
b.Release() if len(detail.Array()) < 1 {
return
}
info := detail.Array()[0]
if global.VersionNameCompare(coolq.Version, info.Get("tag_name").Str) {
log.Infof("当前有更新的 go-cqhttp 可供更新, 请前往 https://github.com/Mrs4s/go-cqhttp/releases 下载.")
log.Infof("当前版本: %v 最新版本: %v", coolq.Version, info.Get("tag_name").Str)
return
}
log.Infof("检查更新完成. 当前已运行最新版本.")
}
func selfUpdate(imageURL string) {
console := bufio.NewReader(os.Stdin)
readLine := func() (str string) {
str, _ = console.ReadString('\n')
return
}
log.Infof("正在检查更新.")
var res string
if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases").BindBody(&res).Do(); err != nil {
log.Warnf("检查更新失败: %v", err)
return
}
detail := gjson.Parse(res)
if len(detail.Array()) < 1 {
return
}
info := detail.Array()[0]
version := info.Get("tag_name").Str
if coolq.Version != version {
log.Info("当前最新版本为 ", version)
log.Warn("是否更新(y/N): ")
r := strings.TrimSpace(readLine())
doUpdate := func() {
log.Info("正在更新,请稍等...")
url := fmt.Sprintf(
"%v/Mrs4s/go-cqhttp/releases/download/%v/go-cqhttp-%v-%v-%v",
func() string {
if imageURL != "" {
return imageURL
}
return "https://github.com"
}(),
version,
version,
runtime.GOOS,
runtime.GOARCH,
)
if runtime.GOOS == "windows" {
url += ".exe"
}
resp, err := http.Get(url)
if err != nil {
log.Error("更新失败: ", err)
return
}
defer func() { _ = resp.Body.Close() }()
wc := global.WriteCounter{}
err, _ = global.UpdateFromStream(io.TeeReader(resp.Body, &wc))
fmt.Println()
if err != nil {
log.Error("更新失败!")
return
}
log.Info("更新完成!")
}
if r == "y" || r == "Y" {
doUpdate()
} else {
log.Warn("已取消更新!")
}
} else {
log.Info("当前版本已经是最新版本!")
}
log.Info("按 Enter 继续....")
readLine()
os.Exit(0)
}
/*
func restart(args []string) {
var cmd *exec.Cmd
if runtime.GOOS == "windows" {
file, err := exec.LookPath(args[0])
if err != nil {
log.Errorf("重启失败:%s", err.Error())
return
}
path, err := filepath.Abs(file)
if err != nil {
log.Errorf("重启失败:%s", err.Error())
}
args = append([]string{"/c", "start ", path, "faststart"}, args[1:]...)
cmd = &exec.Cmd{
Path: "cmd.exe",
Args: args,
Stderr: os.Stderr,
Stdout: os.Stdout,
}
} else {
args = append(args, "faststart")
cmd = &exec.Cmd{
Path: args[0],
Args: args,
Stderr: os.Stderr,
Stdout: os.Stdout,
}
}
_ = cmd.Start()
}
*/
func getConfig() *global.JSONConfig {
var conf *global.JSONConfig
switch {
case global.PathExists("config.json"):
conf = global.LoadConfig("config.json")
_ = conf.Save("config.hjson")
_ = os.Remove("config.json")
case os.Getenv("UIN") != "":
log.Infof("将从环境变量加载配置.")
uin, _ := strconv.ParseInt(os.Getenv("UIN"), 10, 64)
pwd := os.Getenv("PASS")
post := os.Getenv("HTTP_POST")
conf = &global.JSONConfig{
Uin: uin,
Password: pwd,
HTTPConfig: &global.GoCQHTTPConfig{
Enabled: true,
Host: "0.0.0.0",
Port: 5700,
PostUrls: map[string]string{},
},
WSConfig: &global.GoCQWebSocketConfig{
Enabled: true,
Host: "0.0.0.0",
Port: 6700,
},
PostMessageFormat: "string",
Debug: os.Getenv("DEBUG") == "true",
}
if post != "" {
conf.HTTPConfig.PostUrls[post] = os.Getenv("HTTP_SECRET")
}
default:
conf = global.LoadConfig(global.DefaultConfFile)
}
if conf == nil {
err := global.WriteAllText(global.DefaultConfFile, global.DefaultConfigWithComments)
if err != nil {
log.Fatalf("创建默认配置文件时出现错误: %v", err)
return nil
}
log.Infof("默认配置文件已生成, 请编辑 %s 后重启程序.", global.DefaultConfFile)
if !isFastStart {
time.Sleep(time.Second * 5)
}
return nil
}
return conf
}
// help cli命令行-h的帮助提示
func help() {
fmt.Printf(`go-cqhttp service
version: %s
Usage:
server [OPTIONS]
Options:
`, coolq.Version)
flag.PrintDefaults()
os.Exit(0)
} }

382
server/api.go Normal file
View File

@ -0,0 +1,382 @@
package server
import (
"strings"
"github.com/Mrs4s/go-cqhttp/coolq"
"github.com/Mrs4s/go-cqhttp/global"
"github.com/tidwall/gjson"
)
type resultGetter interface {
Get(string) gjson.Result
}
type apiCaller struct {
bot *coolq.CQBot
}
func getLoginInfo(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
return bot.CQGetLoginInfo()
}
func getFriendList(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
return bot.CQGetFriendList()
}
func getGroupList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetGroupList(p.Get("no_cache").Bool())
}
func getGroupInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetGroupInfo(p.Get("group_id").Int(), p.Get("no_cache").Bool())
}
func getGroupMemberList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetGroupMemberList(p.Get("group_id").Int(), p.Get("no_cache").Bool())
}
func getGroupMemberInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetGroupMemberInfo(
p.Get("group_id").Int(), p.Get("user_id").Int(),
)
}
func sendMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
autoEscape := global.EnsureBool(p.Get("auto_escape"), false)
if p.Get("message_type").Str == "private" {
return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("group_id").Int(), p.Get("message"), autoEscape)
}
if p.Get("message_type").Str == "group" {
return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), autoEscape)
}
if p.Get("user_id").Int() != 0 {
return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("group_id").Int(), p.Get("message"), autoEscape)
}
if p.Get("group_id").Int() != 0 {
return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), autoEscape)
}
return coolq.MSG{}
}
func sendGroupMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"),
global.EnsureBool(p.Get("auto_escape"), false))
}
func sendGroupForwardMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQSendGroupForwardMessage(p.Get("group_id").Int(), p.Get("messages"))
}
func sendPrivateMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("group_id").Int(), p.Get("message"),
global.EnsureBool(p.Get("auto_escape"), false))
}
func deleteMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQDeleteMessage(int32(p.Get("message_id").Int()))
}
func setFriendAddRequest(bot *coolq.CQBot, p resultGetter) coolq.MSG {
apr := true
if p.Get("approve").Exists() {
apr = p.Get("approve").Bool()
}
return bot.CQProcessFriendRequest(p.Get("flag").Str, apr)
}
func setGroupAddRequest(bot *coolq.CQBot, p resultGetter) coolq.MSG {
subType := p.Get("sub_type").Str
apr := true
if subType == "" {
subType = p.Get("type").Str
}
if p.Get("approve").Exists() {
apr = p.Get("approve").Bool()
}
return bot.CQProcessGroupRequest(p.Get("flag").Str, subType, p.Get("reason").Str, apr)
}
func setGroupCard(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQSetGroupCard(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("card").Str)
}
func setGroupSpecialTitle(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQSetGroupSpecialTitle(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("special_title").Str)
}
func setGroupKick(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQSetGroupKick(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("message").Str, p.Get("reject_add_request").Bool())
}
func setGroupBan(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQSetGroupBan(p.Get("group_id").Int(), p.Get("user_id").Int(), func() uint32 {
if p.Get("duration").Exists() {
return uint32(p.Get("duration").Int())
}
return 1800
}())
}
func setGroupWholeBan(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQSetGroupWholeBan(p.Get("group_id").Int(), func() bool {
if p.Get("enable").Exists() {
return p.Get("enable").Bool()
}
return true
}())
}
func setGroupName(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQSetGroupName(p.Get("group_id").Int(), p.Get("group_name").Str)
}
func setGroupAdmin(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQSetGroupAdmin(p.Get("group_id").Int(), p.Get("user_id").Int(), func() bool {
if p.Get("enable").Exists() {
return p.Get("enable").Bool()
}
return true
}())
}
func sendGroupNotice(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQSetGroupMemo(p.Get("group_id").Int(), p.Get("content").Str)
}
func setGroupLeave(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQSetGroupLeave(p.Get("group_id").Int())
}
func getImage(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetImage(p.Get("file").Str)
}
func getForwardMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
id := p.Get("message_id").Str
if id == "" {
id = p.Get("id").Str
}
return bot.CQGetForwardMessage(id)
}
func getMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetMessage(int32(p.Get("message_id").Int()))
}
func downloadFile(bot *coolq.CQBot, p resultGetter) coolq.MSG {
headers := map[string]string{}
headersToken := p.Get("headers")
if headersToken.IsArray() {
for _, sub := range headersToken.Array() {
str := strings.SplitN(sub.String(), "=", 2)
if len(str) == 2 {
headers[str[0]] = str[1]
}
}
}
if headersToken.Type == gjson.String {
lines := strings.Split(headersToken.String(), "\r\n")
for _, sub := range lines {
str := strings.SplitN(sub, "=", 2)
if len(str) == 2 {
headers[str[0]] = str[1]
}
}
}
return bot.CQDownloadFile(p.Get("url").Str, headers, int(p.Get("thread_count").Int()))
}
func getGroupHonorInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetGroupHonorInfo(p.Get("group_id").Int(), p.Get("type").Str)
}
func setRestart(_ *coolq.CQBot, _ resultGetter) coolq.MSG {
/*
var delay int64
delay = p.Get("delay").Int()
if delay < 0 {
delay = 0
}
defer func(delay int64) {
time.Sleep(time.Duration(delay) * time.Millisecond)
Restart <- struct{}{}
}(delay)
*/
return coolq.MSG{"data": nil, "retcode": 99, "msg": "restart un-supported now", "wording": "restart函数暂不兼容", "status": "failed"}
}
func canSendImage(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
return bot.CQCanSendImage()
}
func canSendRecord(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
return bot.CQCanSendRecord()
}
func getStrangerInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetStrangerInfo(p.Get("user_id").Int())
}
func getStatus(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
return bot.CQGetStatus()
}
func getVersionInfo(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
return bot.CQGetVersionInfo()
}
func getGroupSystemMSG(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
return bot.CQGetGroupSystemMessages()
}
func getGroupFileSystemInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetGroupFileSystemInfo(p.Get("group_id").Int())
}
func getGroupRootFiles(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetGroupRootFiles(p.Get("group_id").Int())
}
func getGroupFilesByFolder(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetGroupFilesByFolderID(p.Get("group_id").Int(), p.Get("folder_id").Str)
}
func getGroupFileURL(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetGroupFileURL(p.Get("group_id").Int(), p.Get("file_id").Str, int32(p.Get("busid").Int()))
}
func uploadGroupFile(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQUploadGroupFile(p.Get("group_id").Int(), p.Get("file").Str, p.Get("name").Str, p.Get("folder").Str)
}
func getGroupMsgHistory(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetGroupMessageHistory(p.Get("group_id").Int(), p.Get("message_seq").Int())
}
func getVipInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetVipInfo(p.Get("user_id").Int())
}
func reloadEventFilter(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
return bot.CQReloadEventFilter()
}
func getGroupAtAllRemain(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetAtAllRemain(p.Get("group_id").Int())
}
func ocrImage(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQOcrImage(p.Get("image").Str)
}
func getOnlineClients(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetOnlineClients(p.Get("no_cache").Bool())
}
func getWordSlices(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetWordSlices(p.Get("content").Str)
}
func setGroupPortrait(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQSetGroupPortrait(p.Get("group_id").Int(), p.Get("file").String(), p.Get("cache").String())
}
func setEssenceMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQSetEssenceMessage(int32(p.Get("message_id").Int()))
}
func deleteEssenceMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQDeleteEssenceMessage(int32(p.Get("message_id").Int()))
}
func getEssenceMsgList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQGetEssenceMessageList(p.Get("group_id").Int())
}
func checkURLSafely(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQCheckURLSafely(p.Get("url").String())
}
func setGroupAnonymousBan(bot *coolq.CQBot, p resultGetter) coolq.MSG {
obj := p.Get("anonymous")
flag := p.Get("anonymous_flag")
if !flag.Exists() {
flag = p.Get("flag")
}
if !flag.Exists() && !obj.Exists() {
return coolq.Failed(100, "FLAG_NOT_FOUND", "flag未找到")
}
if !flag.Exists() {
flag = obj.Get("flag")
}
return bot.CQSetGroupAnonymousBan(p.Get("group_id").Int(), flag.String(), int32(p.Get("duration").Int()))
}
func handleQuickOperation(bot *coolq.CQBot, p resultGetter) coolq.MSG {
return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
}
var API = map[string]func(*coolq.CQBot, resultGetter) coolq.MSG{
"get_login_info": getLoginInfo,
"get_friend_list": getFriendList,
"get_group_list": getGroupList,
"get_group_info": getGroupInfo,
"get_group_member_list": getGroupMemberList,
"get_group_member_info": getGroupMemberInfo,
"send_msg": sendMSG,
"send_group_msg": sendGroupMSG,
"send_group_forward_msg": sendGroupForwardMSG,
"send_private_msg": sendPrivateMSG,
"delete_msg": deleteMSG,
"set_friend_add_request": setFriendAddRequest,
"set_group_add_request": setGroupAddRequest,
"set_group_card": setGroupCard,
"set_group_special_title": setGroupSpecialTitle,
"set_group_kick": setGroupKick,
"set_group_ban": setGroupBan,
"set_group_whole_ban": setGroupWholeBan,
"set_group_name": setGroupName,
"set_group_admin": setGroupAdmin,
"_send_group_notice": sendGroupNotice,
"set_group_leave": setGroupLeave,
"get_image": getImage,
"get_forward_msg": getForwardMSG,
"get_msg": getMSG,
"download_file": downloadFile,
"get_group_honor_info": getGroupHonorInfo,
"set_restart": setRestart,
"can_send_image": canSendImage,
"can_send_record": canSendRecord,
"get_stranger_info": getStrangerInfo,
"get_status": getStatus,
"get_version_info": getVersionInfo,
"get_group_system_msg": getGroupSystemMSG,
"get_group_file_system_info": getGroupFileSystemInfo,
"get_group_root_files": getGroupRootFiles,
"get_group_files_by_folder": getGroupFilesByFolder,
"get_group_file_url": getGroupFileURL,
"upload_group_file": uploadGroupFile,
"get_group_msg_history": getGroupMsgHistory,
"_get_vip_info": getVipInfo,
"reload_event_filter": reloadEventFilter,
".ocr_image": ocrImage,
"ocr_image": ocrImage,
"get_group_at_all_remain": getGroupAtAllRemain,
"get_online_clients": getOnlineClients,
".get_word_slices": getWordSlices,
"set_group_portrait": setGroupPortrait,
"set_essence_msg": setEssenceMSG,
"delete_essence_msg": deleteEssenceMSG,
"get_essence_msg_list": getEssenceMsgList,
"check_url_safely": checkURLSafely,
"set_group_anonymous_ban": setGroupAnonymousBan,
".handle_quick_operation": handleQuickOperation,
}
func (api *apiCaller) callAPI(action string, p resultGetter) coolq.MSG {
if f, ok := API[action]; ok {
return f(api.bot, p)
}
return coolq.Failed(404, "API_NOT_FOUND", "API不存在")
}

51
server/daemon.go Normal file
View File

@ -0,0 +1,51 @@
package server
// daemon 功能写在这,目前仅支持了-d 作为后台运行参数stopstartrestart这些功能目前看起来并不需要可以通过api控制后续需要的话再补全。
import (
"fmt"
"os"
"os/exec"
"strings"
"github.com/Mrs4s/go-cqhttp/global"
log "github.com/sirupsen/logrus"
)
// Daemon go-cqhttp server 的 daemon的实现函数
func Daemon() {
args := os.Args[1:]
execArgs := make([]string, 0)
l := len(args)
for i := 0; i < l; i++ {
if strings.Index(args[i], "-d") == 0 {
continue
}
execArgs = append(execArgs, args[i])
}
proc := exec.Command(os.Args[0], execArgs...)
err := proc.Start()
if err != nil {
panic(err)
}
log.Info("[PID] ", proc.Process.Pid)
// pid写入到pid文件中方便后续stop的时候kill
pidErr := savePid("go-cqhttp.pid", fmt.Sprintf("%d", proc.Process.Pid))
if pidErr != nil {
log.Errorf("save pid file error: %v", pidErr)
}
os.Exit(0)
}
// savePid 保存pid到文件中便于后续restart/stop的时候kill pid用。
func savePid(path string, data string) error {
return global.WriteAllText(path, data)
}

2
server/doc.go Normal file
View File

@ -0,0 +1,2 @@
// Package server 包含Admin子站,HTTP,WebSocket,反向WebSocket请求处理的相关函数与结构体
package server

View File

@ -1,16 +1,23 @@
package server package server
import ( import (
"bytes"
"context"
"crypto/hmac" "crypto/hmac"
"crypto/sha1" "crypto/sha1"
"encoding/hex" "encoding/hex"
"strconv" "net/http"
"os"
"strings" "strings"
"time" "time"
"github.com/Mrs4s/go-cqhttp/coolq" "github.com/Mrs4s/go-cqhttp/coolq"
"github.com/Mrs4s/go-cqhttp/global"
"github.com/Mrs4s/MiraiGo/utils"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/guonaihong/gout" "github.com/guonaihong/gout"
"github.com/guonaihong/gout/dataflow"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )
@ -18,27 +25,40 @@ import (
type httpServer struct { type httpServer struct {
engine *gin.Engine engine *gin.Engine
bot *coolq.CQBot bot *coolq.CQBot
HTTP *http.Server
api apiCaller
} }
type httpClient struct { // HTTPClient 反向HTTP上报客户端
type HTTPClient struct {
bot *coolq.CQBot bot *coolq.CQBot
secret string secret string
addr string addr string
timeout int32
} }
var HttpServer = &httpServer{} type httpContext struct {
ctx *gin.Context
}
// CQHTTPApiServer CQHTTPApiServer实例
var CQHTTPApiServer = &httpServer{}
// Debug 是否启用Debug模式
var Debug = false
func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) { func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
gin.SetMode(gin.ReleaseMode) gin.SetMode(gin.ReleaseMode)
s.engine = gin.New() s.engine = gin.New()
s.bot = bot s.bot = bot
s.api = apiCaller{s.bot}
s.engine.Use(func(c *gin.Context) { s.engine.Use(func(c *gin.Context) {
if c.Request.Method != "GET" && c.Request.Method != "POST" { if c.Request.Method != "GET" && c.Request.Method != "POST" {
log.Warnf("已拒绝客户端 %v 的请求: 方法错误", c.Request.RemoteAddr) log.Warnf("已拒绝客户端 %v 的请求: 方法错误", c.Request.RemoteAddr)
c.Status(404) c.Status(404)
return return
} }
if c.Request.Method == "POST" && c.Request.Header.Get("Content-Type") == "application/json" { if c.Request.Method == "POST" && strings.Contains(c.Request.Header.Get("Content-Type"), "application/json") {
d, err := c.GetRawData() d, err := c.GetRawData()
if err != nil { if err != nil {
log.Warnf("获取请求 %v 的Body时出现错误: %v", c.Request.RequestURI, err) log.Warnf("获取请求 %v 的Body时出现错误: %v", c.Request.RequestURI, err)
@ -57,351 +77,128 @@ func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
if authToken != "" { if authToken != "" {
s.engine.Use(func(c *gin.Context) { s.engine.Use(func(c *gin.Context) {
if auth := c.Request.Header.Get("Authorization"); auth != "" { auth := c.Request.Header.Get("Authorization")
if strings.SplitN(auth, " ", 2)[1] != authToken { switch {
case auth != "" && strings.SplitN(auth, " ", 2)[1] != authToken:
c.AbortWithStatus(401) c.AbortWithStatus(401)
return return
} case c.Query("access_token") != authToken:
} else if c.Query("access_token") != authToken {
c.AbortWithStatus(401) c.AbortWithStatus(401)
return return
} else { default:
c.Next() c.Next()
} }
}) })
} }
s.engine.Any("/get_login_info", s.GetLoginInfo) s.engine.Any("/:action", s.HandleActions)
s.engine.Any("/get_login_info_async", s.GetLoginInfo)
s.engine.Any("/get_friend_list", s.GetFriendList)
s.engine.Any("/get_friend_list_async", s.GetFriendList)
s.engine.Any("/get_group_list", s.GetGroupList)
s.engine.Any("/get_group_list_async", s.GetGroupList)
s.engine.Any("/get_group_info", s.GetGroupInfo)
s.engine.Any("/get_group_info_async", s.GetGroupInfo)
s.engine.Any("/get_group_member_list", s.GetGroupMemberList)
s.engine.Any("/get_group_member_list_async", s.GetGroupMemberList)
s.engine.Any("/get_group_member_info", s.GetGroupMemberInfo)
s.engine.Any("/get_group_member_info_async", s.GetGroupMemberInfo)
s.engine.Any("/send_msg", s.SendMessage)
s.engine.Any("/send_msg_async", s.SendMessage)
s.engine.Any("/send_private_msg", s.SendPrivateMessage)
s.engine.Any("/send_private_msg_async", s.SendPrivateMessage)
s.engine.Any("/send_group_msg", s.SendGroupMessage)
s.engine.Any("/send_group_msg_async", s.SendGroupMessage)
s.engine.Any("/send_group_forward_msg", s.SendGroupForwardMessage)
s.engine.Any("/send_group_forward_msg_async", s.SendGroupForwardMessage)
s.engine.Any("/delete_msg", s.DeleteMessage)
s.engine.Any("/delete_msg_async", s.DeleteMessage)
s.engine.Any("/set_friend_add_request", s.ProcessFriendRequest)
s.engine.Any("/set_friend_add_request_async", s.ProcessFriendRequest)
s.engine.Any("/set_group_add_request", s.ProcessGroupRequest)
s.engine.Any("/set_group_add_request_async", s.ProcessGroupRequest)
s.engine.Any("/set_group_card", s.SetGroupCard)
s.engine.Any("/set_group_card_async", s.SetGroupCard)
s.engine.Any("/set_group_special_title", s.SetSpecialTitle)
s.engine.Any("/set_group_special_title_async", s.SetSpecialTitle)
s.engine.Any("/set_group_kick", s.SetGroupKick)
s.engine.Any("/set_group_kick_async", s.SetGroupKick)
s.engine.Any("/set_group_ban", s.SetGroupBan)
s.engine.Any("/set_group_ban_async", s.SetGroupBan)
s.engine.Any("/set_group_whole_ban", s.SetWholeBan)
s.engine.Any("/set_group_whole_ban_async", s.SetWholeBan)
s.engine.Any("/set_group_name", s.SetGroupName)
s.engine.Any("/set_group_name_async", s.SetGroupName)
s.engine.Any("/set_group_leave", s.SetGroupLeave)
s.engine.Any("/set_group_leave_async", s.SetGroupLeave)
s.engine.Any("/get_image", s.GetImage)
s.engine.Any("/get_image_async", s.GetImage)
s.engine.Any("/get_forward_msg", s.GetForwardMessage)
s.engine.Any("/get_group_msg", s.GetGroupMessage)
s.engine.Any("/get_group_msg_async", s.GetGroupMessage)
s.engine.Any("/can_send_image", s.CanSendImage)
s.engine.Any("/can_send_image_async", s.CanSendImage)
s.engine.Any("/can_send_record", s.CanSendRecord)
s.engine.Any("/can_send_record_async", s.CanSendRecord)
s.engine.Any("/get_status", s.GetStatus)
s.engine.Any("/get_status_async", s.GetStatus)
s.engine.Any("/get_version_info", s.GetVersionInfo)
s.engine.Any("/get_version_info_async", s.GetVersionInfo)
s.engine.Any("/.handle_quick_operation", s.HandleQuickOperation)
go func() { go func() {
log.Infof("CQ HTTP 服务器已启动: %v", addr) log.Infof("CQ HTTP 服务器已启动: %v", addr)
log.Fatal(s.engine.Run(addr)) s.HTTP = &http.Server{
Addr: addr,
Handler: s.engine,
}
if err := s.HTTP.ListenAndServe(); err != nil && err != http.ErrServerClosed {
log.Error(err)
log.Infof("HTTP 服务启动失败, 请检查端口是否被占用.")
log.Warnf("将在五秒后退出.")
time.Sleep(time.Second * 5)
os.Exit(1)
}
}() }()
} }
func NewHttpClient() *httpClient { // NewHTTPClient 返回反向HTTP客户端
return &httpClient{} func NewHTTPClient() *HTTPClient {
return &HTTPClient{}
} }
func (c *httpClient) Run(addr, secret string, bot *coolq.CQBot) { // Run 运行反向HTTP服务
func (c *HTTPClient) Run(addr, secret string, timeout int32, bot *coolq.CQBot) {
c.bot = bot c.bot = bot
c.secret = secret c.secret = secret
c.addr = addr c.addr = addr
c.timeout = timeout
if c.timeout < 5 {
c.timeout = 5
}
bot.OnEventPush(c.onBotPushEvent) bot.OnEventPush(c.onBotPushEvent)
log.Infof("HTTP POST上报器已启动: %v", addr) log.Infof("HTTP POST上报器已启动: %v", addr)
} }
func (c *httpClient) onBotPushEvent(m coolq.MSG) { func (c *HTTPClient) onBotPushEvent(m *bytes.Buffer) {
var res string var res string
err := gout.POST(c.addr).SetJSON(m).BindBody(&res).SetHeader(func() gout.H { err := gout.POST(c.addr).SetJSON(m.Bytes()).BindBody(&res).SetHeader(func() gout.H {
h := gout.H{ h := gout.H{
"X-Self-ID": c.bot.Client.Uin, "X-Self-ID": c.bot.Client.Uin,
"User-Agent": "CQHttp/4.15.0", "User-Agent": "CQHttp/4.15.0",
} }
if c.secret != "" { if c.secret != "" {
mac := hmac.New(sha1.New, []byte(c.secret)) mac := hmac.New(sha1.New, []byte(c.secret))
mac.Write([]byte(m.ToJson())) _, err := mac.Write(m.Bytes())
if err != nil {
log.Error(err)
return nil
}
h["X-Signature"] = "sha1=" + hex.EncodeToString(mac.Sum(nil)) h["X-Signature"] = "sha1=" + hex.EncodeToString(mac.Sum(nil))
} }
return h return h
}()).SetTimeout(time.Second * 5).Do() }()).SetTimeout(time.Second * time.Duration(c.timeout)).F().Retry().Attempt(5).
WaitTime(time.Millisecond * 500).MaxWaitTime(time.Second * 5).
Func(func(con *dataflow.Context) error {
if con.Error != nil {
log.Warnf("上报Event到 HTTP 服务器 %v 时出现错误: %v 将重试.", c.addr, con.Error)
return con.Error
}
return nil
}).Do()
if err != nil { if err != nil {
log.Warnf("上报Event数据到 %v 失败: %v", c.addr, err) log.Warnf("上报Event数据 %v 到 %v 失败: %v", utils.B2S(m.Bytes()), c.addr, err)
return return
} }
log.Debugf("上报Event数据 %v 到 %v", utils.B2S(m.Bytes()), c.addr)
if gjson.Valid(res) { if gjson.Valid(res) {
c.bot.CQHandleQuickOperation(gjson.Parse(m.ToJson()), gjson.Parse(res)) c.bot.CQHandleQuickOperation(gjson.Parse(utils.B2S(m.Bytes())), gjson.Parse(res))
} }
} }
func (s *httpServer) GetLoginInfo(c *gin.Context) { func (s *httpServer) HandleActions(c *gin.Context) {
c.JSON(200, s.bot.CQGetLoginInfo()) global.RateLimit(context.Background())
action := strings.ReplaceAll(c.Param("action"), "_async", "")
log.Debugf("HTTPServer接收到API调用: %v", action)
c.JSON(200, s.api.callAPI(action, httpContext{ctx: c}))
} }
func (s *httpServer) GetFriendList(c *gin.Context) { func (h httpContext) Get(k string) gjson.Result {
c.JSON(200, s.bot.CQGetFriendList()) c := h.ctx
}
func (s *httpServer) GetGroupList(c *gin.Context) {
c.JSON(200, s.bot.CQGetGroupList())
}
func (s *httpServer) GetGroupInfo(c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
c.JSON(200, s.bot.CQGetGroupInfo(gid))
}
func (s *httpServer) GetGroupMemberList(c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
c.JSON(200, s.bot.CQGetGroupMemberList(gid))
}
func (s *httpServer) GetGroupMemberInfo(c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
nc := getParamOrDefault(c, "no_cache", "false")
c.JSON(200, s.bot.CQGetGroupMemberInfo(gid, uid, nc == "true"))
}
func (s *httpServer) SendMessage(c *gin.Context) {
if getParam(c, "group_id") != "" {
s.SendGroupMessage(c)
return
}
if getParam(c, "user_id") != "" {
s.SendPrivateMessage(c)
}
}
func (s *httpServer) SendPrivateMessage(c *gin.Context) {
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
msg := getParam(c, "message")
if gjson.Valid(msg) {
c.JSON(200, s.bot.CQSendPrivateMessage(uid, gjson.Parse(msg)))
return
}
c.JSON(200, s.bot.CQSendPrivateMessage(uid, msg))
}
func (s *httpServer) SendGroupMessage(c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
msg := getParam(c, "message")
if gjson.Valid(msg) {
c.JSON(200, s.bot.CQSendGroupMessage(gid, gjson.Parse(msg)))
return
}
c.JSON(200, s.bot.CQSendGroupMessage(gid, msg))
}
func (s *httpServer) SendGroupForwardMessage(c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
msg := getParam(c, "messages")
c.JSON(200, s.bot.CQSendGroupForwardMessage(gid, gjson.Parse(msg)))
}
func (s *httpServer) GetImage(c *gin.Context) {
file := getParam(c, "file")
c.JSON(200, s.bot.CQGetImage(file))
}
func (s *httpServer) GetGroupMessage(c *gin.Context) {
mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32)
c.JSON(200, s.bot.CQGetGroupMessage(int32(mid)))
}
func (s *httpServer) ProcessFriendRequest(c *gin.Context) {
flag := getParam(c, "flag")
approve := getParamOrDefault(c, "approve", "true")
c.JSON(200, s.bot.CQProcessFriendRequest(flag, approve == "true"))
}
func (s *httpServer) ProcessGroupRequest(c *gin.Context) {
flag := getParam(c, "flag")
subType := getParam(c, "sub_type")
if subType == "" {
subType = getParam(c, "type")
}
approve := getParamOrDefault(c, "approve", "true")
c.JSON(200, s.bot.CQProcessGroupRequest(flag, subType, approve == "true"))
}
func (s *httpServer) SetGroupCard(c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
c.JSON(200, s.bot.CQSetGroupCard(gid, uid, getParam(c, "card")))
}
func (s *httpServer) SetSpecialTitle(c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
c.JSON(200, s.bot.CQSetGroupSpecialTitle(gid, uid, getParam(c, "special_title")))
}
func (s *httpServer) SetGroupKick(c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
msg := getParam(c, "message")
c.JSON(200, s.bot.CQSetGroupKick(gid, uid, msg))
}
func (s *httpServer) SetGroupBan(c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
i, _ := strconv.ParseInt(getParamOrDefault(c, "duration", "1800"), 10, 64)
c.JSON(200, s.bot.CQSetGroupBan(gid, uid, uint32(i)))
}
func (s *httpServer) SetWholeBan(c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
c.JSON(200, s.bot.CQSetGroupWholeBan(gid, getParamOrDefault(c, "enable", "true") == "true"))
}
func (s *httpServer) SetGroupName(c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
c.JSON(200, s.bot.CQSetGroupName(gid, getParam(c, "name")))
}
func (s *httpServer) SetGroupLeave(c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
c.JSON(200, s.bot.CQSetGroupLeave(gid))
}
func (s *httpServer) GetForwardMessage(c *gin.Context) {
resId := getParam(c, "message_id")
c.JSON(200, s.bot.CQGetForwardMessage(resId))
}
func (s *httpServer) DeleteMessage(c *gin.Context) {
mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32)
c.JSON(200, s.bot.CQDeleteMessage(int32(mid)))
}
func (s *httpServer) CanSendImage(c *gin.Context) {
c.JSON(200, s.bot.CQCanSendImage())
}
func (s *httpServer) CanSendRecord(c *gin.Context) {
c.JSON(200, s.bot.CQCanSendRecord())
}
func (s *httpServer) GetStatus(c *gin.Context) {
c.JSON(200, s.bot.CQGetStatus())
}
func (s *httpServer) GetVersionInfo(c *gin.Context) {
c.JSON(200, s.bot.CQGetVersionInfo())
}
func (s *httpServer) HandleQuickOperation(c *gin.Context) {
if c.Request.Method != "POST" {
c.AbortWithStatus(404)
return
}
if i, ok := c.Get("json_body"); ok {
body := i.(gjson.Result)
c.JSON(200, s.bot.CQHandleQuickOperation(body.Get("context"), body.Get("operation")))
}
}
func getParamOrDefault(c *gin.Context, k, def string) string {
r := getParam(c, k)
if r != "" {
return r
}
return def
}
func getParam(c *gin.Context, k string) string {
if q := c.Query(k); q != "" { if q := c.Query(k); q != "" {
return q return gjson.Result{Type: gjson.String, Str: q}
} }
if c.Request.Method == "POST" { if c.Request.Method == "POST" {
if h := c.Request.Header.Get("Content-Type"); h != "" { if h := c.Request.Header.Get("Content-Type"); h != "" {
if h == "application/x-www-form-urlencoded" { if strings.Contains(h, "application/x-www-form-urlencoded") {
if p, ok := c.GetPostForm(k); ok { if p, ok := c.GetPostForm(k); ok {
return p return gjson.Result{Type: gjson.String, Str: p}
} }
} }
if h == "application/json" { if strings.Contains(h, "application/json") {
if obj, ok := c.Get("json_body"); ok { if obj, ok := c.Get("json_body"); ok {
res := obj.(gjson.Result).Get(k) return obj.(gjson.Result).Get(k)
if res.Exists() {
switch res.Type {
case gjson.JSON:
return res.Raw
case gjson.String:
return res.Str
case gjson.Number:
return strconv.FormatInt(res.Int(), 10) // 似乎没有需要接受 float 类型的api
case gjson.True:
return "true"
case gjson.False:
return "false"
} }
} }
} }
} }
} return gjson.Result{Type: gjson.Null, Str: ""}
} }
return ""
func (s *httpServer) ShutDown() {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
if err := s.HTTP.Shutdown(ctx); err != nil {
log.Fatal("http Server Shutdown:", err)
}
<-ctx.Done()
log.Println("timeout of 5 seconds.")
log.Println("http Server exiting")
} }

View File

@ -1,48 +1,59 @@
package server package server
import ( import (
"bytes"
"context"
"fmt" "fmt"
"github.com/Mrs4s/go-cqhttp/coolq"
"github.com/Mrs4s/go-cqhttp/global"
"github.com/gorilla/websocket"
log "github.com/sirupsen/logrus"
"github.com/tidwall/gjson"
wsc "golang.org/x/net/websocket"
"net/http" "net/http"
"runtime/debug"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
"time" "time"
"github.com/Mrs4s/go-cqhttp/coolq"
"github.com/Mrs4s/go-cqhttp/global"
"github.com/Mrs4s/MiraiGo/utils"
"github.com/gorilla/websocket"
log "github.com/sirupsen/logrus"
"github.com/tidwall/gjson"
) )
type websocketServer struct { type webSocketServer struct {
bot *coolq.CQBot bot *coolq.CQBot
token string token string
eventConn []*websocket.Conn eventConn []*webSocketConn
pushLock *sync.Mutex eventConnMutex sync.Mutex
handshake string handshake string
} }
type websocketClient struct { // WebSocketClient WebSocket客户端实例
conf *global.GoCQReverseWebsocketConfig type WebSocketClient struct {
conf *global.GoCQReverseWebSocketConfig
token string token string
bot *coolq.CQBot bot *coolq.CQBot
pushLock *sync.Mutex universalConn *webSocketConn
universalConn *wsc.Conn eventConn *webSocketConn
eventConn *wsc.Conn
} }
var WebsocketServer = &websocketServer{} type webSocketConn struct {
*websocket.Conn
sync.Mutex
apiCaller apiCaller
}
// WebSocketServer 初始化一个WebSocketServer实例
var WebSocketServer = &webSocketServer{}
var upgrader = websocket.Upgrader{ var upgrader = websocket.Upgrader{
CheckOrigin: func(r *http.Request) bool { CheckOrigin: func(r *http.Request) bool {
return true return true
}, },
} }
func (s *websocketServer) Run(addr, authToken string, b *coolq.CQBot) { func (s *webSocketServer) Run(addr, authToken string, b *coolq.CQBot) {
s.token = authToken s.token = authToken
s.pushLock = new(sync.Mutex)
s.bot = b s.bot = b
s.handshake = fmt.Sprintf(`{"_post_method":2,"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`, s.handshake = fmt.Sprintf(`{"_post_method":2,"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
s.bot.Client.Uin, time.Now().Unix()) s.bot.Client.Uin, time.Now().Unix())
@ -51,146 +62,160 @@ func (s *websocketServer) Run(addr, authToken string, b *coolq.CQBot) {
http.HandleFunc("/api", s.api) http.HandleFunc("/api", s.api)
http.HandleFunc("/", s.any) http.HandleFunc("/", s.any)
go func() { go func() {
log.Infof("CQ Websocket 服务器已启动: %v", addr) log.Infof("CQ WebSocket 服务器已启动: %v", addr)
log.Fatal(http.ListenAndServe(addr, nil)) log.Fatal(http.ListenAndServe(addr, nil))
}() }()
} }
func NewWebsocketClient(conf *global.GoCQReverseWebsocketConfig, authToken string, b *coolq.CQBot) *websocketClient { // NewWebSocketClient 初始化一个NWebSocket客户端
return &websocketClient{conf: conf, token: authToken, bot: b, pushLock: new(sync.Mutex)} func NewWebSocketClient(conf *global.GoCQReverseWebSocketConfig, authToken string, b *coolq.CQBot) *WebSocketClient {
return &WebSocketClient{conf: conf, token: authToken, bot: b}
} }
func (c *websocketClient) Run() { // Run 运行实例
func (c *WebSocketClient) Run() {
if !c.conf.Enabled { if !c.conf.Enabled {
return return
} }
if c.conf.ReverseApiUrl != "" { if c.conf.ReverseURL != "" {
c.connectApi() c.connectUniversal()
} else {
if c.conf.ReverseAPIURL != "" {
c.connectAPI()
} }
if c.conf.ReverseEventUrl != "" { if c.conf.ReverseEventURL != "" {
c.connectEvent() c.connectEvent()
} }
if c.conf.ReverseUrl != "" {
c.connectUniversal()
} }
c.bot.OnEventPush(c.onBotPushEvent) c.bot.OnEventPush(c.onBotPushEvent)
} }
func (c *websocketClient) connectApi() { func (c *WebSocketClient) connectAPI() {
log.Infof("开始尝试连接到反向Websocket API服务器: %v", c.conf.ReverseApiUrl) log.Infof("开始尝试连接到反向WebSocket API服务器: %v", c.conf.ReverseAPIURL)
wsConf, err := wsc.NewConfig(c.conf.ReverseApiUrl, c.conf.ReverseApiUrl) header := http.Header{
if err != nil { "X-Client-Role": []string{"API"},
log.Warnf("连接到反向Websocket API服务器 %v 时出现致命错误: %v", c.conf.ReverseApiUrl, err) "X-Self-ID": []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
return "User-Agent": []string{"CQHttp/4.15.0"},
} }
wsConf.Header["X-Client-Role"] = []string{"API"}
wsConf.Header["X-Self-ID"] = []string{strconv.FormatInt(c.bot.Client.Uin, 10)}
wsConf.Header["User-Agent"] = []string{"CQHttp/4.15.0"}
if c.token != "" { if c.token != "" {
wsConf.Header["Authorization"] = []string{"Token " + c.token} header["Authorization"] = []string{"Token " + c.token}
} }
conn, err := wsc.DialConfig(wsConf) conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseAPIURL, header) // nolint
if err != nil { if err != nil {
log.Warnf("连接到反向Websocket API服务器 %v 时出现错误: %v", c.conf.ReverseApiUrl, err) log.Warnf("连接到反向WebSocket API服务器 %v 时出现错误: %v", c.conf.ReverseAPIURL, err)
if c.conf.ReverseReconnectInterval != 0 { if c.conf.ReverseReconnectInterval != 0 {
time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval)) time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
c.connectApi() c.connectAPI()
} }
return return
} }
log.Infof("已连接到反向Websocket API服务器 %v", c.conf.ReverseApiUrl) log.Infof("已连接到反向WebSocket API服务器 %v", c.conf.ReverseAPIURL)
go c.listenApi(conn, false) wrappedConn := &webSocketConn{Conn: conn, apiCaller: apiCaller{c.bot}}
go c.listenAPI(wrappedConn, false)
} }
func (c *websocketClient) connectEvent() { func (c *WebSocketClient) connectEvent() {
log.Infof("开始尝试连接到反向Websocket Event服务器: %v", c.conf.ReverseEventUrl) log.Infof("开始尝试连接到反向WebSocket Event服务器: %v", c.conf.ReverseEventURL)
wsConf, err := wsc.NewConfig(c.conf.ReverseEventUrl, c.conf.ReverseEventUrl) header := http.Header{
if err != nil { "X-Client-Role": []string{"Event"},
log.Warnf("连接到反向Websocket Event服务器 %v 时出现致命错误: %v", c.conf.ReverseApiUrl, err) "X-Self-ID": []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
return "User-Agent": []string{"CQHttp/4.15.0"},
} }
wsConf.Header["X-Client-Role"] = []string{"Event"}
wsConf.Header["X-Self-ID"] = []string{strconv.FormatInt(c.bot.Client.Uin, 10)}
wsConf.Header["User-Agent"] = []string{"CQHttp/4.15.0"}
if c.token != "" { if c.token != "" {
wsConf.Header["Authorization"] = []string{"Token " + c.token} header["Authorization"] = []string{"Token " + c.token}
} }
conn, err := wsc.DialConfig(wsConf) conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseEventURL, header) // nolint
if err != nil { if err != nil {
log.Warnf("连接到反向Websocket API服务器 %v 时出现错误: %v", c.conf.ReverseApiUrl, err) log.Warnf("连接到反向WebSocket Event服务器 %v 时出现错误: %v", c.conf.ReverseEventURL, err)
if c.conf.ReverseReconnectInterval != 0 { if c.conf.ReverseReconnectInterval != 0 {
time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval)) time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
c.connectApi() c.connectEvent()
} }
return return
} }
log.Infof("已连接到反向Websocket Event服务器 %v", c.conf.ReverseEventUrl)
c.eventConn = conn handshake := fmt.Sprintf(`{"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
c.bot.Client.Uin, time.Now().Unix())
err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
if err != nil {
log.Warnf("反向WebSocket 握手时出现错误: %v", err)
}
log.Infof("已连接到反向WebSocket Event服务器 %v", c.conf.ReverseEventURL)
c.eventConn = &webSocketConn{Conn: conn, apiCaller: apiCaller{c.bot}}
} }
func (c *websocketClient) connectUniversal() { func (c *WebSocketClient) connectUniversal() {
log.Infof("开始尝试连接到反向Websocket Universal服务器: %v", c.conf.ReverseUrl) log.Infof("开始尝试连接到反向WebSocket Universal服务器: %v", c.conf.ReverseURL)
wsConf, err := wsc.NewConfig(c.conf.ReverseUrl, c.conf.ReverseUrl) header := http.Header{
if err != nil { "X-Client-Role": []string{"Universal"},
log.Warnf("连接到反向Websocket Universal服务器 %v 时出现致命错误: %v", c.conf.ReverseUrl, err) "X-Self-ID": []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
return "User-Agent": []string{"CQHttp/4.15.0"},
} }
wsConf.Header["X-Client-Role"] = []string{"Universal"}
wsConf.Header["X-Self-ID"] = []string{strconv.FormatInt(c.bot.Client.Uin, 10)}
wsConf.Header["User-Agent"] = []string{"CQHttp/4.15.0"}
if c.token != "" { if c.token != "" {
wsConf.Header["Authorization"] = []string{"Token " + c.token} header["Authorization"] = []string{"Token " + c.token}
} }
conn, err := wsc.DialConfig(wsConf) conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseURL, header) // nolint
if err != nil { if err != nil {
log.Warnf("连接到反向Websocket Universal服务器 %v 时出现错误: %v", c.conf.ReverseUrl, err) log.Warnf("连接到反向WebSocket Universal服务器 %v 时出现错误: %v", c.conf.ReverseURL, err)
if c.conf.ReverseReconnectInterval != 0 { if c.conf.ReverseReconnectInterval != 0 {
time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval)) time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
c.connectUniversal() c.connectUniversal()
} }
return return
} }
go c.listenApi(conn, true) handshake := fmt.Sprintf(`{"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
c.universalConn = conn c.bot.Client.Uin, time.Now().Unix())
err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
if err != nil {
log.Warnf("反向WebSocket 握手时出现错误: %v", err)
}
wrappedConn := &webSocketConn{Conn: conn, apiCaller: apiCaller{c.bot}}
go c.listenAPI(wrappedConn, true)
c.universalConn = wrappedConn
} }
func (c *websocketClient) listenApi(conn *wsc.Conn, u bool) { func (c *WebSocketClient) listenAPI(conn *webSocketConn, u bool) {
defer conn.Close() defer func() { _ = conn.Close() }()
for { for {
var buf []byte buffer := global.NewBuffer()
err := wsc.Message.Receive(conn, &buf) t, reader, err := conn.NextReader()
if err != nil { if err != nil {
log.Warnf("监听反向WS API时出现错误: %v", err)
break break
} }
j := gjson.ParseBytes(buf) _, err = buffer.ReadFrom(reader)
t := strings.ReplaceAll(j.Get("action").Str, "_async", "") if err != nil {
log.Debugf("反向WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw) log.Warnf("监听反向WS API时出现错误: %v", err)
if f, ok := wsApi[t]; ok { break
ret := f(c.bot, j.Get("params"))
if j.Get("echo").Exists() {
ret["echo"] = j.Get("echo").Value()
} }
c.pushLock.Lock() if t == websocket.TextMessage {
_, _ = conn.Write([]byte(ret.ToJson())) go func(buffer *bytes.Buffer) {
c.pushLock.Unlock() defer global.PutBuffer(buffer)
conn.handleRequest(c.bot, buffer.Bytes())
}(buffer)
} else {
global.PutBuffer(buffer)
} }
} }
if c.conf.ReverseReconnectInterval != 0 { if c.conf.ReverseReconnectInterval != 0 {
time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval)) time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
if u { if !u {
c.connectUniversal() go c.connectAPI()
return
} }
c.connectApi()
} }
} }
func (c *websocketClient) onBotPushEvent(m coolq.MSG) { func (c *WebSocketClient) onBotPushEvent(m *bytes.Buffer) {
c.pushLock.Lock()
defer c.pushLock.Unlock()
if c.eventConn != nil { if c.eventConn != nil {
log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), m.ToJson()) log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), utils.B2S(m.Bytes()))
if _, err := c.eventConn.Write([]byte(m.ToJson())); err != nil { conn := c.eventConn
conn.Lock()
defer conn.Unlock()
_ = c.eventConn.SetWriteDeadline(time.Now().Add(time.Second * 15))
if err := c.eventConn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", c.eventConn.RemoteAddr().String(), err)
_ = c.eventConn.Close() _ = c.eventConn.Close()
if c.conf.ReverseReconnectInterval != 0 { if c.conf.ReverseReconnectInterval != 0 {
time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval)) time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
@ -199,225 +224,166 @@ func (c *websocketClient) onBotPushEvent(m coolq.MSG) {
} }
} }
if c.universalConn != nil { if c.universalConn != nil {
log.Debugf("向WS服务器 %v 推送Event: %v", c.universalConn.RemoteAddr().String(), m.ToJson()) log.Debugf("向WS服务器 %v 推送Event: %v", c.universalConn.RemoteAddr().String(), utils.B2S(m.Bytes()))
_, _ = c.universalConn.Write([]byte(m.ToJson())) conn := c.universalConn
conn.Lock()
defer conn.Unlock()
_ = c.universalConn.SetWriteDeadline(time.Now().Add(time.Second * 15))
if err := c.universalConn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", c.universalConn.RemoteAddr().String(), err)
_ = c.universalConn.Close()
if c.conf.ReverseReconnectInterval != 0 {
time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
c.connectUniversal()
}
}
} }
} }
func (s *websocketServer) event(w http.ResponseWriter, r *http.Request) { func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
if s.token != "" { if s.token != "" {
if r.URL.Query().Get("access_token") != s.token && strings.SplitN(r.Header.Get("Authorization"), " ", 2)[1] != s.token { if auth := r.URL.Query().Get("access_token"); auth != s.token {
log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr) if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
w.WriteHeader(401) w.WriteHeader(401)
return return
} }
} }
}
c, err := upgrader.Upgrade(w, r, nil) c, err := upgrader.Upgrade(w, r, nil)
if err != nil { if err != nil {
log.Warnf("处理 Websocket 请求时出现错误: %v", err) log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
return return
} }
err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake)) err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
if err == nil { if err != nil {
log.Infof("接受 Websocket 连接: %v (/event)", r.RemoteAddr) log.Warnf("WebSocket 握手时出现错误: %v", err)
s.eventConn = append(s.eventConn, c) _ = c.Close()
return
} }
log.Infof("接受 WebSocket 连接: %v (/event)", r.RemoteAddr)
conn := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
s.eventConnMutex.Lock()
s.eventConn = append(s.eventConn, conn)
s.eventConnMutex.Unlock()
} }
func (s *websocketServer) api(w http.ResponseWriter, r *http.Request) { func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
if s.token != "" { if s.token != "" {
if r.URL.Query().Get("access_token") != s.token && strings.SplitN(r.Header.Get("Authorization"), " ", 2)[1] != s.token { if auth := r.URL.Query().Get("access_token"); auth != s.token {
log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr) if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
w.WriteHeader(401) w.WriteHeader(401)
return return
} }
} }
}
c, err := upgrader.Upgrade(w, r, nil) c, err := upgrader.Upgrade(w, r, nil)
if err != nil { if err != nil {
log.Warnf("处理 Websocket 请求时出现错误: %v", err) log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
return return
} }
log.Infof("接受 Websocket 连接: %v (/api)", r.RemoteAddr) log.Infof("接受 WebSocket 连接: %v (/api)", r.RemoteAddr)
go s.listenApi(c) conn := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
go s.listenAPI(conn)
} }
func (s *websocketServer) any(w http.ResponseWriter, r *http.Request) { func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
if s.token != "" { if s.token != "" {
if r.URL.Query().Get("access_token") != s.token && strings.SplitN(r.Header.Get("Authorization"), " ", 2)[1] != s.token { if auth := r.URL.Query().Get("access_token"); auth != s.token {
log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr) if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
w.WriteHeader(401) w.WriteHeader(401)
return return
} }
} }
}
c, err := upgrader.Upgrade(w, r, nil) c, err := upgrader.Upgrade(w, r, nil)
if err != nil { if err != nil {
log.Warnf("处理 Websocket 请求时出现错误: %v", err) log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
return return
} }
err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake)) err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
if err == nil { if err != nil {
log.Infof("接受 Websocket 连接: %v (/)", r.RemoteAddr) log.Warnf("WebSocket 握手时出现错误: %v", err)
s.eventConn = append(s.eventConn, c) _ = c.Close()
s.listenApi(c) return
} }
log.Infof("接受 WebSocket 连接: %v (/)", r.RemoteAddr)
conn := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
s.eventConnMutex.Lock()
s.eventConn = append(s.eventConn, conn)
s.eventConnMutex.Unlock()
s.listenAPI(conn)
} }
func (s *websocketServer) listenApi(c *websocket.Conn) { func (s *webSocketServer) listenAPI(c *webSocketConn) {
defer c.Close() defer func() { _ = c.Close() }()
for { for {
t, payload, err := c.ReadMessage() buffer := global.NewBuffer()
t, reader, err := c.NextReader()
if err != nil { if err != nil {
break break
} }
_, err = buffer.ReadFrom(reader)
if err != nil {
break
}
if t == websocket.TextMessage { if t == websocket.TextMessage {
go func(buffer *bytes.Buffer) {
defer global.PutBuffer(buffer)
c.handleRequest(s.bot, buffer.Bytes())
}(buffer)
} else {
global.PutBuffer(buffer)
}
}
}
func (c *webSocketConn) handleRequest(_ *coolq.CQBot, payload []byte) {
defer func() {
if err := recover(); err != nil {
log.Printf("处置WS命令时发生无法恢复的异常%v\n%s", err, debug.Stack())
_ = c.Close()
}
}()
global.RateLimit(context.Background())
j := gjson.ParseBytes(payload) j := gjson.ParseBytes(payload)
t := strings.ReplaceAll(j.Get("action").Str, "_async", "") //TODO: async support t := strings.ReplaceAll(j.Get("action").Str, "_async", "")
log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw) log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
if f, ok := wsApi[t]; ok { ret := c.apiCaller.callAPI(t, j.Get("params"))
ret := f(s.bot, j.Get("params"))
if j.Get("echo").Exists() { if j.Get("echo").Exists() {
ret["echo"] = j.Get("echo").Value() ret["echo"] = j.Get("echo").Value()
} }
s.pushLock.Lock() c.Lock()
defer c.Unlock()
_ = c.WriteJSON(ret) _ = c.WriteJSON(ret)
s.pushLock.Unlock()
}
}
}
} }
func (s *websocketServer) onBotPushEvent(m coolq.MSG) { func (s *webSocketServer) onBotPushEvent(m *bytes.Buffer) {
s.pushLock.Lock() s.eventConnMutex.Lock()
defer s.pushLock.Unlock() defer s.eventConnMutex.Unlock()
pos := 0 for i, l := 0, len(s.eventConn); i < l; i++ {
for _, conn := range s.eventConn { conn := s.eventConn[i]
log.Debugf("向WS客户端 %v 推送Event: %v", conn.RemoteAddr().String(), m.ToJson()) log.Debugf("向WS客户端 %v 推送Event: %v", conn.RemoteAddr().String(), utils.B2S(m.Bytes()))
err := conn.WriteMessage(websocket.TextMessage, []byte(m.ToJson())) conn.Lock()
if err != nil { if err := conn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
_ = conn.Close() _ = conn.Close()
s.eventConn = append(s.eventConn[:pos], s.eventConn[pos+1:]...) next := i + 1
if pos > 0 { if next >= l {
pos++ next = l - 1
} }
s.eventConn[i], s.eventConn[next] = s.eventConn[next], s.eventConn[i]
s.eventConn = append(s.eventConn[:next], s.eventConn[next+1:]...)
i--
l--
conn = nil
continue
} }
pos++ conn.Unlock()
} }
} }
var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
"get_login_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQGetLoginInfo()
},
"get_friend_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQGetFriendList()
},
"get_group_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQGetGroupList()
},
"get_group_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQGetGroupInfo(p.Get("group_id").Int())
},
"get_group_member_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQGetGroupMemberList(p.Get("group_id").Int())
},
"get_group_member_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQGetGroupMemberInfo(
p.Get("group_id").Int(), p.Get("user_id").Int(),
p.Get("no_cache").Bool(),
)
},
"send_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
if p.Get("group_id").Int() != 0 {
return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"))
}
if p.Get("user_id").Int() != 0 {
return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"))
}
return coolq.MSG{}
},
"send_group_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"))
},
"send_group_forward_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQSendGroupForwardMessage(p.Get("group_id").Int(), p.Get("messages"))
},
"send_private_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"))
},
"delete_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQDeleteMessage(int32(p.Get("message_id").Int()))
},
"set_friend_add_request": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
apr := true
if p.Get("approve").Exists() {
apr = p.Get("approve").Bool()
}
return bot.CQProcessFriendRequest(p.Get("flag").Str, apr)
},
"set_group_add_request": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
subType := p.Get("sub_type").Str
apr := true
if subType == "" {
subType = p.Get("type").Str
}
if p.Get("approve").Exists() {
apr = p.Get("approve").Bool()
}
return bot.CQProcessGroupRequest(p.Get("flag").Str, subType, apr)
},
"set_group_card": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQSetGroupCard(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("card").Str)
},
"set_group_special_title": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQSetGroupSpecialTitle(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("special_title").Str)
},
"set_group_kick": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQSetGroupKick(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("message").Str)
},
"set_group_ban": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQSetGroupBan(p.Get("group_id").Int(), p.Get("user_id").Int(), func() uint32 {
if p.Get("duration").Exists() {
return uint32(p.Get("duration").Int())
}
return 1800
}())
},
"set_group_whole_ban": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQSetGroupWholeBan(p.Get("group_id").Int(), func() bool {
if p.Get("enable").Exists() {
return p.Get("enable").Bool()
}
return true
}())
},
"set_group_name": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQSetGroupName(p.Get("group_id").Int(), p.Get("name").Str)
},
"set_group_leave": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQSetGroupLeave(p.Get("group_id").Int())
},
"get_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQGetImage(p.Get("file").Str)
},
"get_forward_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQGetForwardMessage(p.Get("message_id").Str)
},
"get_group_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQGetGroupMessage(int32(p.Get("message_id").Int()))
},
"can_send_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQCanSendImage()
},
"can_send_record": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQCanSendRecord()
},
"get_status": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQGetStatus()
},
"get_version_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQGetVersionInfo()
},
".handle_quick_operation": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
},
}