1
0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-05 03:23:49 +08:00

Compare commits

...

102 Commits

Author SHA1 Message Date
源文雨
a5923f179b
Merge pull request #2526 from Mrs4s/dev
sync
2024-05-09 16:12:21 +09:00
源文雨
730d01c648 chore: make lint happy 2024-02-26 21:59:17 +09:00
dependabot[bot]
12e0cb4afb
chore(deps): bump golang.org/x/image from 0.9.0 to 0.10.0 (#2484)
* feat(actions): add Check and Close Invalid PR

* Update README.md

* Update README.md

* chore(deps): bump golang.org/x/image from 0.9.0 to 0.10.0

Bumps [golang.org/x/image](https://github.com/golang/image) from 0.9.0 to 0.10.0.
- [Commits](https://github.com/golang/image/compare/v0.9.0...v0.10.0)

---
updated-dependencies:
- dependency-name: golang.org/x/image
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>
Co-authored-by: Mrs4s <mrs4sxiaoshi@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-26 21:56:53 +09:00
dependabot[bot]
e06edd2412
chore(deps): bump golang.org/x/crypto from 0.11.0 to 0.17.0 (#2502)
* feat(actions): add Check and Close Invalid PR

* Update README.md

* Update README.md

* chore(deps): bump golang.org/x/crypto from 0.11.0 to 0.17.0

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.11.0 to 0.17.0.
- [Commits](https://github.com/golang/crypto/compare/v0.11.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>
Co-authored-by: Mrs4s <mrs4sxiaoshi@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-26 21:54:34 +09:00
源文雨
5aca1f4500 chore: make lint happy 2024-02-26 21:54:11 +09:00
源文雨
75635739ba
Merge pull request #2504 from Akegarasu/fix-2494
fix #2494
2024-01-07 12:55:24 +08:00
秋葉杏
d25e320238
fix: log error when reading version file. (#2503) 2024-01-04 17:54:12 +08:00
Akegarasu
b8d622bb90
fix #2494 2024-01-04 00:55:22 +08:00
源文雨
9cccd0e39b
Merge pull request #2492 from zhullyb/master
fix: switch ghproxy.com to mirror.ghproxy.com
2023-11-22 23:08:58 +08:00
zhullyb
e1a4293ee6 fix: switch ghproxy.com to mirror.ghproxy.com
ghproxy.com 已经被墙,根据其网页上的通知应当更换为二级域名 mirror.ghproxy.com,或考虑使用别的反代服务
2023-11-14 11:28:48 +08:00
Mrs4s
8607542f1e
Update README.md 2023-10-10 01:38:55 +08:00
Mrs4s
5cbbcda2c2
Update README.md 2023-10-10 00:44:55 +08:00
源文雨
fcf79ded58 fix(cmd/main): -update-protocol 不保存新文件 2023-10-10 00:20:35 +09:00
源文雨
6ac7a8f0ae
Merge pull request #2470 from Mrs4s/dev
chore: sync dev to master
2023-10-09 22:04:43 +09:00
Lumine
bd785d3894
尝试修复首次登录时容易出现 code -10005 和 packet timed out 的问题 (#2463)
* try to fix: code -10005 and packet timed out (first login)
* 此问题猜测可能是成功登录前无法向服务器发送sso packet并获取结果。
  在有callback之前似乎没有出现这个问题,怀疑是这里的问题。
  等待 100s 后(以等待完成过滑块)再提交初始化包以尝试解决
* sign submit 内容改为仅在debug模式下打印

* impl #2455
* 在“群消息发送失败: 账号可能被风控”的时候提供group_id

* optimize: sign callback wait until online
* 等待至 bot 在线再发包,而不是简单地等待 100s
2023-10-09 22:03:26 +09:00
源文雨
642c74688c feat(actions): add Check and Close Invalid PR 2023-10-01 13:31:05 +09:00
github-actions[bot]
517d323953 ci(chore): Fix stylings 2023-10-01 04:29:02 +00:00
xiangxiangxiong9
07214e396e
尝试实现 #2421 (#2422) 2023-10-01 13:27:06 +09:00
Lumine
1c34643f4f
fix nil pointer dereference caused by nil 'cs' (#2440)
* fix: nil pointer dereference caused by nil 'cs'
修复刷新 token 时若当前签名服务不可用而主签名服务可用会导致panic的问题。
btw, energy 出现decode error时打印出导致错误的数据内容

* optimize: 只配置了一个签名服务时不进行检查和切换操作

* fix(qsign): 刷新token提示未初始化

修复在qsign崩溃重启前请求了签名服务器导致当前签名服务器被标记为不可用(`ss.set(nil)`),
从而不会再执行sign请求(除非有其他请求签名服务器的操作)
这可能导致下一次刷新token提示uin is not registered或者提示未初始化

* update qsign.go
2023-10-01 13:26:09 +09:00
YumeMichi
f16d72f0ca
!fixup: optimize(qisgn): async operations (#2415)
Add missing wg.Wait()

Fixes: fd6ef4a2b8ed ("optimize(qisgn): async operations")

Signed-off-by: Yuan Si <do4suki@gmail.com>
2023-08-31 19:01:53 +08:00
源文雨
9e6d7b7650 fix: nil pointer 2023-08-29 22:56:28 +08:00
源文雨
417a0f256a fix: nil pointer 2023-08-29 22:50:02 +08:00
源文雨
77b54fca20 fix: nil pointer 2023-08-29 13:05:48 +08:00
源文雨
fd6ef4a2b8 optimize(qisgn): async operations
FYI: @1umine
2023-08-28 16:56:19 +08:00
github-actions[bot]
79a194fbb0 ci(chore): Fix stylings 2023-08-27 05:21:40 +00:00
Lumine
f8354ec082
修复TCP缓冲区不足问题;重构 qsign 签名服务对接部分;支持配置多个签名服务器 (#2389)
* fix: skip callback error

* update: update comment

* change the logic of callback and auto-register

* add token update prompt.

* fix log buffer string

* fix #2368

增加对 client 的利用,避免创建过多 clients

* refactor: wrap sign request

* feat: impl additional sign servers configuration

* fix error in using configurations.

* fix lint error

* 支持切换回主签名服务器

* feat: support different key and auth

* optimize: find avaliable sign-server

* fix: register instance after server is changed

* fix lint error

* update: add config 'sync-check-servers'

* update: first check master sign-server, or wait 3s

* add checking log & optimize wait for checking done

* fix wrong judge

* add config: rule for changing sign server

* optimize registration logic after changing server

* add some log

* fix #2390

* resolve requested changes in #2389

* update dependency

* fix lint error 'idx is unused'

* refactor: extract sync check and async check logic

* delete async check sign-server
2023-08-27 13:19:38 +08:00
xiwangly
d85d697fc2
Fix: SignServer TCP ping for custom port (#2353) 2023-08-23 13:02:42 +08:00
Komei_DiSanXian
da9f03fa47
fix #2368, which causes system lacked sufficient buffer space (#2372)
* fix #2368

* add CloseIdleConnections at WriteToFileMultiThreading
2023-08-23 12:59:53 +08:00
xiangxiangxiong9
977030e814
Revert #2207 (#2397) 2023-08-23 12:39:28 +08:00
源文雨
5db03c7092 fix #2347: This mutex is not locked 2023-08-04 16:33:29 +08:00
源文雨
3b99a825eb optimize(login): log打印 2023-08-03 11:56:19 +08:00
源文雨
94a3ff5dae dowgrade mongo-driver to latest static 2023-08-02 00:29:23 +08:00
源文雨
0714aac1f0 fix: panic after -10005 2023-08-01 16:44:15 +08:00
源文雨
ca20a3d6bf update deps 2023-08-01 16:42:49 +08:00
源文雨
ce119b7ddf Merge branch 'master' of https://github.com/Mrs4s/go-cqhttp into dev 2023-08-01 12:36:04 +08:00
源文雨
a6fd7de65a
sync: master to dev (#2340) (#2341)
* fix: group not found report (#2312)

解决以下问题:
当群组踢人时,该人不在群内,返回“群聊不存在”的BUG

https://github.com/Mrs4s/go-cqhttp/issues/1774#issue-1459854639

* Update bug-report.yaml (#2234)

* 更新docker action, 支持更多的平台 (#2217)

* Update build_docker_image.yml

* Update docker-entrypoint.sh

* Update build_docker_image.yml

*  update docker action, more platforms are supported

---------




* 🐛 修复时区不是东八区的 BUG (#2212)

设置 TZ 环境变量需要先装`tzdata`这个包才会生效

* Update bug-report.yaml (#2126)



* Docker: support continuous params on CMD option (#1829)

now it supports usage like `docker run -it --rm go-cqhttp -faststart`



* make lint happy

---------

Co-authored-by: PSoul <psoul1@163.com>
Co-authored-by: 简律纯 <i@jyunko.cn>
Co-authored-by: LY <1334850101@qq.com>
Co-authored-by: xiwangly2 <1334850101@qq.om>
Co-authored-by: Antonia Adams <10476982+li-xunhuan@users.noreply.github.com>
Co-authored-by: Akirami <66513481+A-kirami@users.noreply.github.com>
Co-authored-by: Nanahira <78877@qq.com>
2023-08-01 12:34:59 +08:00
源文雨
8ea182a4c3
sync: master to dev (#2340)
* fix: group not found report (#2312)

解决以下问题:
当群组踢人时,该人不在群内,返回“群聊不存在”的BUG

https://github.com/Mrs4s/go-cqhttp/issues/1774#issue-1459854639

* Update bug-report.yaml (#2234)

* 更新docker action, 支持更多的平台 (#2217)

* Update build_docker_image.yml

* Update docker-entrypoint.sh

* Update build_docker_image.yml

*  update docker action, more platforms are supported

---------

Co-authored-by: xiwangly2 <1334850101@qq.om>
Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>

* 🐛 修复时区不是东八区的 BUG (#2212)

设置 TZ 环境变量需要先装`tzdata`这个包才会生效

* Update bug-report.yaml (#2126)

Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>

* Docker: support continuous params on CMD option (#1829)

now it supports usage like `docker run -it --rm go-cqhttp -faststart`

Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>

* make lint happy

---------

Co-authored-by: PSoul <psoul1@163.com>
Co-authored-by: 简律纯 <i@jyunko.cn>
Co-authored-by: LY <1334850101@qq.com>
Co-authored-by: xiwangly2 <1334850101@qq.om>
Co-authored-by: Antonia Adams <10476982+li-xunhuan@users.noreply.github.com>
Co-authored-by: Akirami <66513481+A-kirami@users.noreply.github.com>
Co-authored-by: Nanahira <78877@qq.com>
2023-08-01 12:32:51 +08:00
源文雨
99cdf9247a
make lint happy 2023-08-01 12:32:29 +08:00
源文雨
837e163ef6
Merge branch 'dev' into master 2023-08-01 12:29:47 +08:00
PSoul
fe92bb54df
api: rename kick message type (#1775)
踢人时进行判断,当该人不在群内时返回人员不存在的错误

Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>
2023-08-01 11:47:11 +08:00
脆饼干
7cae9829a8
api: _send_group_notice return noticeId (#1834)
Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>
2023-08-01 11:45:05 +08:00
Nanahira
3992dd40c5
Docker: support continuous params on CMD option (#1829)
now it supports usage like `docker run -it --rm go-cqhttp -faststart`

Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>
2023-08-01 11:44:49 +08:00
A lucky guy
1bd0bb9ae2
fix: 修复release 的 action 只拉主仓库,修复 checkout 可能的问题 (#1999) 2023-08-01 11:35:22 +08:00
源文雨
b8527721c2 make lint happy 2023-08-01 11:34:34 +08:00
Lu7fer
14539adcb8
fix: #2112 add CQ code reply to db and solve recursive reply resolve (#2115)
Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>
2023-08-01 11:32:32 +08:00
Akirami
1911b5d245
Update bug-report.yaml (#2126)
Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>
2023-08-01 11:26:58 +08:00
虞灪
75ad7aa45c
fix: 修复和文档不一致的数据 (#2189)
* fix: 修复获取群荣誉列表群聊之火键名错误问题

* fix: 修复获取版本信息,错误的go-cqhttp字段
2023-08-01 11:25:44 +08:00
xiangxiangxiong9
cffdfd8181
尝试使 get_msg 获取消息中的回复信息 (#2207) 2023-08-01 11:24:59 +08:00
Antonia Adams
99e5cb6c6b
🐛 修复时区不是东八区的 BUG (#2212)
设置 TZ 环境变量需要先装`tzdata`这个包才会生效
2023-08-01 11:22:12 +08:00
LY
09ab2169d9
更新docker action, 支持更多的平台 (#2217)
* Update build_docker_image.yml

* Update docker-entrypoint.sh

* Update build_docker_image.yml

*  update docker action, more platforms are supported

---------

Co-authored-by: xiwangly2 <1334850101@qq.om>
Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>
2023-08-01 11:21:49 +08:00
xiangxiangxiong9
2b1d9c21cb
Fix #2226 - 修改 coolq/cqcode.go#L54 安卓端私聊回复时r.GroupID似乎为0 (#2230) 2023-08-01 11:20:02 +08:00
简律纯
998fda54a2
Update bug-report.yaml (#2234) 2023-08-01 11:17:29 +08:00
源文雨
5cb8548487 resolve conflicts 2023-08-01 11:16:58 +08:00
Bluefissure
88f5db89a8
feat: add Bearer authentication to sign server requests (#2247)
* feat: add sign-server-bearer

* fix: golint

* fix: golint

* fix: remove trimprefix

---------

Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>
2023-08-01 11:15:31 +08:00
源文雨
7c813f8579 feat: add config sign-server-timeout 2023-08-01 11:09:04 +08:00
SuperKenVery
7adbbd6f81
增加签名服务器请求超时时间 (#2302)
* Increase timeout in download

* 直接改一分钟好了

---------

Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>
2023-08-01 10:48:14 +08:00
源文雨
04cbf7b5d7 优化命名 2023-08-01 10:44:55 +08:00
源文雨
dae03784cc make lint happy 2023-08-01 10:38:53 +08:00
Lumine
f466ca7a72
feat: 提供 1.1.6 版本以上 qsign 的对接支持 (#2307)
* 增加签名服务超时设置

* 获取签名和err为空时尝试重新注册实例

* 可配置自动刷新token以及自动注册

* fix lint

* wrap callback

* add config: refresh-interval

* support qsign's `auto-register`

* fix: add registerLock to avoid repeat registraion.

* update: Enable disabling auto token refresh

* fix: use string android_id (not hexadecimal

* update default_config.yml

* fix: compatible with older  qsign (bellow 1.1.0

* fix: refresh token

* update dependency

* update go.sum

* fix: fix warnings on old version sign server

---------

Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>
2023-08-01 10:33:32 +08:00
Komei_DiSanXian
13215f23c5
feat: add waitSignServer (#2311)
* add: 等待签名服务器启动以后再进行注册

* add: 支持签名服务器自动注册实例

* fix

* fix: 修复获取sign 时报错

* 调整代码结构

* Update login.go

* Update main.go

* Update login.go

---------

Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>
2023-08-01 09:36:57 +08:00
源文雨
19dd37a938
fix(lint): if-block 2023-08-01 09:36:21 +08:00
源文雨
a3ad233cd9
fix: group not found report (#2312) (#2337)
解决以下问题:
当群组踢人时,该人不在群内,返回“群聊不存在”的BUG

https://github.com/Mrs4s/go-cqhttp/issues/1774#issue-1459854639

Co-authored-by: PSoul <psoul1@163.com>
2023-08-01 08:55:59 +08:00
PSoul
06461960a9
fix: group not found report (#2312)
解决以下问题:
当群组踢人时,该人不在群内,返回“群聊不存在”的BUG

https://github.com/Mrs4s/go-cqhttp/issues/1774#issue-1459854639
2023-08-01 08:53:37 +08:00
achieve
aa3a5d28da
optimize: increase http client timeout (#2315) 2023-08-01 08:51:58 +08:00
赵怡然
a4c131e04a
fix: cancel hex encoding of android_id field (#2318) 2023-08-01 08:47:59 +08:00
github-actions[bot]
526391e613 ci(chore): Fix stylings 2023-07-10 06:44:28 +00:00
Mrs4s
2901fd14bb
Merge pull request #2283 from KomeiDiSanXian/dev
update: support sign sever up to v1.1.3
2023-07-10 14:42:26 +08:00
KomeiDiSanXian
16a2ff050e fix lint warning: unused-parameter 2023-07-10 07:22:50 +08:00
KomeiDiSanXian
6cf8030d3c update: 兼容签名服务器到v1.1.3 2023-07-10 07:15:43 +08:00
Mrs4s
9c1390c75c
feat: support sign server 2023-06-27 18:11:06 +08:00
Mrs4s
b958046a27
Merge branch 'master' into dev 2023-06-27 17:16:14 +08:00
xiangxiangxiong9
19906eba36
修复群匿名消息事件中的重复的sub_type #2216 (#2219) 2023-06-20 21:54:07 +08:00
敖律风
8e6e79f734
bootstrap改进 (#2192)
* 保证云函数能直接调用启动脚本

* 添加末尾空格

以免某些shell无法正确执行。

* 还原 .gitignore

还原因为粗心提交上去的本地文件忽略

---------

Signed-off-by: BuildTools <x123456789fy@outlook.com>
2023-06-08 15:17:12 +08:00
felinae98
9b9ecd6a41
chore(docker): adjust dockerfile and entrypoint (#2194)
* chore(docker): adjust dockerfile and entrypoint
2023-06-04 10:23:45 +08:00
yuanyan3060
c8e480d12f
Update default_config.yml (#2151) 2023-06-04 09:59:46 +08:00
Janet-Baker
5bf64ee743
Fix #2119 (#2186)
* fix: 尝试修复 #2070 (#2071)

* Close file after uploading it to private chat

fix #2119
上传文件到私聊后,释放文件。
2023-06-04 09:56:40 +08:00
Azusa
bad3c86912
修改网易云音乐url格式 (#2146)
* 修改网易云音乐url格式
2023-05-30 17:26:22 +08:00
Mrs4s
2af55d6a67
Merge branch 'dev' 2023-04-13 00:19:43 +08:00
wdvxdr
42606a825d internal/download: disable http when not visiting go-cqhttp.org 2023-04-09 17:51:32 +08:00
wdvxdr
1ed675d5bf internal/t544: add //go:noescape 2023-04-09 17:37:12 +08:00
源文雨
91b4394d9b
optimize(t544): drop unsafe (#2076)
Updates #2075 #2072 #2051
2023-04-09 17:25:57 +08:00
Mrs4s
0b90074a48
feat: http timeout setting 2023-04-08 17:08:53 +08:00
wdvxdr
55cb80dccc onebot: pick Attr, Value from log/slog
[wip]
2023-04-08 12:11:20 +08:00
源文雨
54995fc101 fix: 尝试修复 #2070 (#2071) 2023-04-08 12:11:20 +08:00
源文雨
8acc9f39c2
fix: 尝试修复 #2070 (#2071) 2023-04-08 12:05:45 +08:00
wdvxdr
13325634c0 make lint happy 2023-04-08 11:34:19 +08:00
Mrs4s
7b2d1fd573
rf: remove sse2 check 2023-04-05 01:35:05 +08:00
Mrs4s
637d46f282
rf: remove useless code 2023-04-03 20:28:25 +08:00
Mrs4s
1e42b2c450
feat: login error message 2023-04-03 20:26:43 +08:00
Mrs4s
749cde2a6d
fix #1782 2023-04-02 18:32:49 +08:00
Mrs4s
0f0e711111
fix comment 2023-04-02 18:09:37 +08:00
Mrs4s
233e276d6a
feat: t544 support 8.9.38.10545 2023-04-02 18:06:25 +08:00
Mrs4s
1ab1cba84c
rf: change protocol auto-update to manual update 2023-04-02 18:04:13 +08:00
Mrs4s
268ac07271
ci: make lint happy 2023-04-01 22:31:57 +08:00
Mrs4s
c486c254d8
rf: move gocq/encryption -> internal/encryption 2023-04-01 22:29:20 +08:00
Mrs4s
6ad62a2642
impl: t544 sign algorithm 2023-04-01 22:02:21 +08:00
Mrs4s
9762a66ba2
Merge branch 'dev' of github.com:/Mrs4s/go-cqhttp into dev 2023-04-01 21:51:05 +08:00
Janet-Baker
43c6e3dcf5
fix https://github.com/Mrs4s/go-cqhttp/issues/2036 (#2040)
https://pkg.go.dev/os/exec#hdr-Executables_in_the_current_directory
2023-04-01 21:46:04 +08:00
Mrs4s
6a17c70689
update dep 2023-04-01 16:41:16 +08:00
Mrs4s
d70d66d6d7
fix #2010 2023-03-27 09:51:47 +08:00
Mrs4s
43ff36e3e8
update dep. fix #2017 2023-03-27 09:40:02 +08:00
EnderFx
008d546f1a
Update cqcode.go (#2001)
fix #1998
2023-03-20 10:34:05 +08:00
31 changed files with 1432 additions and 321 deletions

View File

@ -101,11 +101,13 @@ body:
label: 使用协议 label: 使用协议
description: 选择使用的协议 description: 选择使用的协议
options: options:
- 0 | iPad - 0 | Default
- 1 | Android Phone - 1 | Android Phone
- 2 | Android Watch - 2 | Android Watch
- 3 | MacOS - 3 | MacOS
- 4 | 企点 - 4 | 企点
- 5 | iPad
- 6 | aPad
validations: validations:
required: true required: true

View File

@ -77,3 +77,4 @@ jobs:
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha cache-from: type=gha
cache-to: type=gha,mode=max cache-to: type=gha,mode=max
platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/ppc64le,linux/s390x

21
.github/workflows/close_pr.yml vendored Normal file
View File

@ -0,0 +1,21 @@
name: Check and Close Invalid PR
on:
pull_request_target:
types: [opened, reopened]
jobs:
# This workflow closes invalid PR
close_pr:
# The type of runner that the job will run on
runs-on: ubuntu-latest
permissions: write-all
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Close PR if it is not pointed to dev branch
if: github.event.pull_request.base.ref != 'dev'
uses: superbrothers/close-pull-request@v3
with:
# Optional. Post a issue comment just before closing a pull request.
comment: "Invalid PR to `non-dev` branch `${{ github.event.pull_request.base.ref }}`."

View File

@ -1,4 +1,4 @@
name: release name: Release
on: on:
push: push:
@ -12,7 +12,8 @@ jobs:
- name: Checkout - name: Checkout
run: | run: |
git version git version
git clone https://github.com/Mrs4s/go-cqhttp.git /home/runner/work/go-cqhttp/go-cqhttp git clone "${{ github.event.repository.html_url }}" /home/runner/work/go-cqhttp/go-cqhttp
git checkout "${{ github.ref }}"
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v3 uses: actions/setup-go@v3

View File

@ -56,6 +56,7 @@ run:
skip-dirs: skip-dirs:
- db - db
- cmd/api-generator - cmd/api-generator
- internal/encryption
tests: true tests: true
# output configuration options # output configuration options

View File

@ -21,7 +21,8 @@ RUN chmod +x /docker-entrypoint.sh && \
ffmpeg \ ffmpeg \
coreutils \ coreutils \
shadow \ shadow \
su-exec && \ su-exec \
tzdata && \
rm -rf /var/cache/apk/* && \ rm -rf /var/cache/apk/* && \
mkdir -p /app && \ mkdir -p /app && \
mkdir -p /data && \ mkdir -p /data && \
@ -42,3 +43,4 @@ WORKDIR /data
VOLUME [ "/data" ] VOLUME [ "/data" ]
ENTRYPOINT [ "/docker-entrypoint.sh" ] ENTRYPOINT [ "/docker-entrypoint.sh" ]
CMD [ "/app/cqhttp" ]

View File

@ -42,6 +42,9 @@ _✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://git
<a href="https://github.com/Mrs4s/go-cqhttp/blob/master/CONTRIBUTING.md">参与贡献</a> <a href="https://github.com/Mrs4s/go-cqhttp/blob/master/CONTRIBUTING.md">参与贡献</a>
</p> </p>
## 重要信息
由于QQ官方针对协议库的围追堵截, 不断更新加密方案, 我们已无力继续维护此项目.
建议Bot开发者尽快迁移至无头NTQQ项目 -> https://github.com/Mrs4s/go-cqhttp/issues/2471
## 兼容性 ## 兼容性
go-cqhttp 兼容 [OneBot-v11](https://github.com/botuniverse/onebot-11) 绝大多数内容,并在其基础上做了一些扩展,详情请看 go-cqhttp 的文档。 go-cqhttp 兼容 [OneBot-v11](https://github.com/botuniverse/onebot-11) 绝大多数内容,并在其基础上做了一些扩展,详情请看 go-cqhttp 的文档。

View File

@ -3,36 +3,26 @@ package gocq
import ( import (
"bufio" "bufio"
"bytes" "bytes"
"encoding/hex"
"fmt" "fmt"
"image" "image"
"image/png" "image/png"
"net/http"
"os" "os"
"strings" "strings"
"time" "time"
"github.com/Mrs4s/MiraiGo/client" "github.com/Mrs4s/MiraiGo/client"
"github.com/Mrs4s/MiraiGo/utils" "github.com/Mrs4s/MiraiGo/utils"
"github.com/Mrs4s/MiraiGo/wrapper"
"github.com/mattn/go-colorable" "github.com/mattn/go-colorable"
"github.com/pkg/errors" "github.com/pkg/errors"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/tidwall/gjson"
"gopkg.ilharper.com/x/isatty" "gopkg.ilharper.com/x/isatty"
"github.com/Mrs4s/go-cqhttp/internal/base"
"github.com/Mrs4s/go-cqhttp/global" "github.com/Mrs4s/go-cqhttp/global"
"github.com/Mrs4s/go-cqhttp/internal/download" "github.com/Mrs4s/go-cqhttp/internal/download"
) )
var console = bufio.NewReader(os.Stdin) var console = bufio.NewReader(os.Stdin)
func init() {
wrapper.DandelionEnergy = energy
}
func readLine() (str string) { func readLine() (str string) {
str, _ = console.ReadString('\n') str, _ = console.ReadString('\n')
str = strings.TrimSpace(str) str = strings.TrimSpace(str)
@ -216,8 +206,13 @@ func loginResponseProcessor(res *client.LoginResponse) error {
case client.OtherLoginError, client.UnknownLoginError, client.TooManySMSRequestError: case client.OtherLoginError, client.UnknownLoginError, client.TooManySMSRequestError:
msg := res.ErrorMessage msg := res.ErrorMessage
log.Warnf("登录失败: %v Code: %v", msg, res.Code) log.Warnf("登录失败: %v Code: %v", msg, res.Code)
if res.Code == 235 { switch res.Code {
log.Warnf("请删除 device.json 后重试.") case 235:
log.Warnf("设备信息被封禁, 请删除 device.json 后重试.")
case 237:
log.Warnf("登录过于频繁, 请在手机QQ登录并根据提示完成认证后等一段时间重试")
case 45:
log.Warnf("你的账号被限制登录, 请配置 SignServer 后重试")
} }
log.Infof("按 Enter 继续....") log.Infof("按 Enter 继续....")
readLine() readLine()
@ -265,27 +260,3 @@ func fetchCaptcha(id string) string {
} }
return "" return ""
} }
func energy(uin uint64, id string, salt []byte) ([]byte, error) {
// temporary solution
signServer := "https://captcha.go-cqhttp.org/sdk/dandelion/energy"
if base.SignServerOverwrite != "" {
signServer = base.SignServerOverwrite
}
response, err := download.Request{
Method: http.MethodPost,
URL: signServer,
Header: map[string]string{"Content-Type": "application/x-www-form-urlencoded"},
Body: bytes.NewReader([]byte(fmt.Sprintf("uin=%v&id=%s&salt=%s", uin, id, hex.EncodeToString(salt)))),
}.Bytes()
if err != nil {
log.Errorf("获取T544时出现问题: %v", err)
return nil, err
}
sign, err := hex.DecodeString(gjson.GetBytes(response, "result").String())
if err != nil {
log.Errorf("获取T544时出现问题: %v", err)
return nil, err
}
return sign, nil
}

View File

@ -14,21 +14,22 @@ import (
"github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/binary"
"github.com/Mrs4s/MiraiGo/client" "github.com/Mrs4s/MiraiGo/client"
"github.com/Mrs4s/MiraiGo/wrapper"
para "github.com/fumiama/go-hide-param" para "github.com/fumiama/go-hide-param"
rotatelogs "github.com/lestrrat-go/file-rotatelogs" rotatelogs "github.com/lestrrat-go/file-rotatelogs"
"github.com/pkg/errors" "github.com/pkg/errors"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/tidwall/gjson"
"golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/pbkdf2"
"golang.org/x/term" "golang.org/x/term"
"github.com/Mrs4s/go-cqhttp/internal/download"
"github.com/Mrs4s/go-cqhttp/coolq" "github.com/Mrs4s/go-cqhttp/coolq"
"github.com/Mrs4s/go-cqhttp/db" "github.com/Mrs4s/go-cqhttp/db"
"github.com/Mrs4s/go-cqhttp/global" "github.com/Mrs4s/go-cqhttp/global"
"github.com/Mrs4s/go-cqhttp/global/terminal" "github.com/Mrs4s/go-cqhttp/global/terminal"
"github.com/Mrs4s/go-cqhttp/internal/base" "github.com/Mrs4s/go-cqhttp/internal/base"
"github.com/Mrs4s/go-cqhttp/internal/cache" "github.com/Mrs4s/go-cqhttp/internal/cache"
"github.com/Mrs4s/go-cqhttp/internal/download"
"github.com/Mrs4s/go-cqhttp/internal/selfdiagnosis" "github.com/Mrs4s/go-cqhttp/internal/selfdiagnosis"
"github.com/Mrs4s/go-cqhttp/internal/selfupdate" "github.com/Mrs4s/go-cqhttp/internal/selfupdate"
"github.com/Mrs4s/go-cqhttp/modules/servers" "github.com/Mrs4s/go-cqhttp/modules/servers"
@ -162,56 +163,75 @@ func LoginInteract() {
log.Fatalf("加载设备信息失败: %v", err) log.Fatalf("加载设备信息失败: %v", err)
} }
} }
signServer, err := getAvaliableSignServer() // 获取可用签名服务器
if err != nil {
log.Warn(err)
}
if signServer != nil && len(signServer.URL) > 1 {
log.Infof("使用签名服务器:%v", signServer.URL)
go signStartRefreshToken(base.Account.RefreshInterval) // 定时刷新 token
wrapper.DandelionEnergy = energy
wrapper.FekitGetSign = sign
if !base.IsBelow110 {
if !base.Account.AutoRegister {
log.Warn("自动注册实例已关闭,请配置 sign-server 端自动注册实例以保持正常签名")
}
if !base.Account.AutoRefreshToken {
log.Info("自动刷新 token 已关闭token 过期后获取签名时将不会立即尝试刷新获取新 token")
}
} else {
log.Warn("签名服务器版本 <= 1.1.0 ,无法使用刷新 token 等操作,建议使用 1.1.6 版本及以上签名服务器")
}
} else {
log.Warnf("警告: 未配置签名服务器或签名服务器不可用, 这可能会导致登录 45 错误码或发送消息被风控")
}
if base.Account.Encrypt { if base.Account.Encrypt {
if !global.PathExists("password.encrypt") { if !global.PathExists("password.encrypt") {
if base.Account.Password == "" { if base.Account.Password == "" {
log.Error("无法进行加密,请在配置文件中的添加密码后重新启动.") log.Error("无法进行加密,请在配置文件中的添加密码后重新启动.")
readLine() } else {
os.Exit(0) log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
base.PasswordHash = md5.Sum([]byte(base.Account.Password))
_ = os.WriteFile("password.encrypt", []byte(PasswordHashEncrypt(base.PasswordHash[:], byteKey)), 0o644)
log.Info("密码已加密,为了您的账号安全,请删除配置文件中的密码后重新启动.")
} }
log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
base.PasswordHash = md5.Sum([]byte(base.Account.Password))
_ = os.WriteFile("password.encrypt", []byte(PasswordHashEncrypt(base.PasswordHash[:], byteKey)), 0o644)
log.Info("密码已加密,为了您的账号安全,请删除配置文件中的密码后重新启动.")
readLine() readLine()
os.Exit(0) os.Exit(0)
} else {
if base.Account.Password != "" {
log.Error("密码已加密,为了您的账号安全,请删除配置文件中的密码后重新启动.")
readLine()
os.Exit(0)
}
if len(byteKey) == 0 {
log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
cancel := make(chan struct{}, 1)
state, _ := term.GetState(int(os.Stdin.Fd()))
go func() {
select {
case <-cancel:
return
case <-time.After(time.Second * 45):
log.Infof("解密key输入超时")
time.Sleep(3 * time.Second)
_ = term.Restore(int(os.Stdin.Fd()), state)
os.Exit(0)
}
}()
byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
cancel <- struct{}{}
} else {
log.Infof("密码加密已启用, 使用运行时传递的参数进行解密,按 Ctrl+C 取消.")
}
encrypt, _ := os.ReadFile("password.encrypt")
ph, err := PasswordHashDecrypt(string(encrypt), byteKey)
if err != nil {
log.Fatalf("加密存储的密码损坏,请尝试重新配置密码")
}
copy(base.PasswordHash[:], ph)
} }
if base.Account.Password != "" {
log.Error("密码已加密,为了您的账号安全,请删除配置文件中的密码后重新启动.")
readLine()
os.Exit(0)
}
if len(byteKey) == 0 {
log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
cancel := make(chan struct{}, 1)
state, _ := term.GetState(int(os.Stdin.Fd()))
go func() {
select {
case <-cancel:
return
case <-time.After(time.Second * 45):
log.Infof("解密key输入超时")
time.Sleep(3 * time.Second)
_ = term.Restore(int(os.Stdin.Fd()), state)
os.Exit(0)
}
}()
byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
cancel <- struct{}{}
} else {
log.Infof("密码加密已启用, 使用运行时传递的参数进行解密,按 Ctrl+C 取消.")
}
encrypt, _ := os.ReadFile("password.encrypt")
ph, err := PasswordHashDecrypt(string(encrypt), byteKey)
if err != nil {
log.Fatalf("加密存储的密码损坏,请尝试重新配置密码")
}
copy(base.PasswordHash[:], ph)
} else if len(base.Account.Password) > 0 { } else if len(base.Account.Password) > 0 {
base.PasswordHash = md5.Sum([]byte(base.Account.Password)) base.PasswordHash = md5.Sum([]byte(base.Account.Password))
} }
@ -235,8 +255,14 @@ func LoginInteract() {
versionFile := path.Join(global.VersionsPath, fmt.Sprint(int(cli.Device().Protocol))+".json") versionFile := path.Join(global.VersionsPath, fmt.Sprint(int(cli.Device().Protocol))+".json")
if global.PathExists(versionFile) { if global.PathExists(versionFile) {
b, err := os.ReadFile(versionFile) b, err := os.ReadFile(versionFile)
if err == nil { if err != nil {
_ = cli.Device().Protocol.Version().UpdateFromJson(b) log.Warnf("从文件 %s 读取本地版本信息文件出错.", versionFile)
os.Exit(0)
}
err = cli.Device().Protocol.Version().UpdateFromJson(b)
if err != nil {
log.Warnf("从文件 %s 解析本地版本信息出错: %v", versionFile, err)
os.Exit(0)
} }
log.Infof("从文件 %s 读取协议版本 %v.", versionFile, cli.Device().Protocol.Version()) log.Infof("从文件 %s 读取协议版本 %v.", versionFile, cli.Device().Protocol.Version())
} }
@ -281,24 +307,35 @@ func LoginInteract() {
cli.Uin = base.Account.Uin cli.Uin = base.Account.Uin
cli.PasswordMd5 = base.PasswordHash cli.PasswordMd5 = base.PasswordHash
} }
if !isTokenLogin { download.SetTimeout(time.Duration(base.HTTPTimeout) * time.Second)
if !base.Account.DisableProtocolUpdate { if !base.FastStart {
log.Infof("正在检查协议更新...") log.Infof("正在检查协议更新...")
oldVersionName := device.Protocol.Version().String() currentVersionName := device.Protocol.Version().SortVersionName
remoteVersion, err := getRemoteLatestProtocolVersion(int(device.Protocol.Version().Protocol)) remoteVersion, err := getRemoteLatestProtocolVersion(int(device.Protocol.Version().Protocol))
if err == nil { if err == nil {
if err = device.Protocol.Version().UpdateFromJson(remoteVersion); err == nil { remoteVersionName := gjson.GetBytes(remoteVersion, "sort_version_name").String()
if device.Protocol.Version().String() != oldVersionName { if remoteVersionName != currentVersionName {
log.Infof("已自动更新协议版本: %s -> %s", oldVersionName, device.Protocol.Version().String()) switch {
} else { case !base.UpdateProtocol:
log.Infof("协议已经是最新版本") log.Infof("检测到协议更新: %s -> %s", currentVersionName, remoteVersionName)
log.Infof("如果登录时出现版本过低错误, 可尝试使用 -update-protocol 参数启动")
case !isTokenLogin:
_ = device.Protocol.Version().UpdateFromJson(remoteVersion)
err := os.WriteFile(versionFile, remoteVersion, 0644)
log.Infof("协议版本已更新: %s -> %s", currentVersionName, remoteVersionName)
if err != nil {
log.Warnln("更新协议版本缓存文件", versionFile, "失败:", err)
} }
_ = os.WriteFile(versionFile, remoteVersion, 0o644) default:
log.Infof("检测到协议更新: %s -> %s", currentVersionName, remoteVersionName)
log.Infof("由于使用了会话缓存, 无法自动更新协议, 请删除缓存后重试")
} }
} else if err.Error() != "remote version unavailable" {
log.Warnf("检查协议更新失败: %v", err)
} }
} else if err.Error() != "remote version unavailable" {
log.Warnf("检查协议更新失败: %v", err)
} }
}
if !isTokenLogin {
if !isQRCodeLogin { if !isQRCodeLogin {
if err := commonLogin(); err != nil { if err := commonLogin(); err != nil {
log.Fatalf("登录时发生致命错误: %v", err) log.Fatalf("登录时发生致命错误: %v", err)
@ -311,7 +348,7 @@ func LoginInteract() {
} }
var times uint = 1 // 重试次数 var times uint = 1 // 重试次数
var reLoginLock sync.Mutex var reLoginLock sync.Mutex
cli.DisconnectedEvent.Subscribe(func(q *client.QQClient, e *client.ClientDisconnectedEvent) { cli.DisconnectedEvent.Subscribe(func(_ *client.QQClient, e *client.ClientDisconnectedEvent) {
reLoginLock.Lock() reLoginLock.Lock()
defer reLoginLock.Unlock() defer reLoginLock.Unlock()
times = 1 times = 1
@ -372,7 +409,6 @@ func LoginInteract() {
base.Account.Status = 0 base.Account.Status = 0
} }
cli.SetOnlineStatus(allowStatus[base.Account.Status]) cli.SetOnlineStatus(allowStatus[base.Account.Status])
servers.Run(coolq.NewQQBot(cli)) servers.Run(coolq.NewQQBot(cli))
log.Info("资源初始化完成, 开始处理信息.") log.Info("资源初始化完成, 开始处理信息.")
log.Info("アトリは、高性能ですから!") log.Info("アトリは、高性能ですから!")
@ -425,7 +461,7 @@ func PasswordHashDecrypt(encryptedPasswordHash string, key []byte) ([]byte, erro
func newClient() *client.QQClient { func newClient() *client.QQClient {
c := client.NewClientEmpty() c := client.NewClientEmpty()
c.UseFragmentMessage = base.ForceFragmented c.UseFragmentMessage = base.ForceFragmented
c.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool { c.OnServerUpdated(func(_ *client.QQClient, _ *client.ServerUpdatedEvent) bool {
if !base.UseSSOAddress { if !base.UseSSOAddress {
log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.") log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
return false return false
@ -457,7 +493,7 @@ func getRemoteLatestProtocolVersion(protocolType int) ([]byte, error) {
} }
response, err := download.Request{URL: url}.Bytes() response, err := download.Request{URL: url}.Bytes()
if err != nil { if err != nil {
return download.Request{URL: "https://ghproxy.com/" + url}.Bytes() return download.Request{URL: "https://mirror.ghproxy.com/" + url}.Bytes()
} }
return response, nil return response, nil
} }

427
cmd/gocq/qsign.go Normal file
View File

@ -0,0 +1,427 @@
package gocq
import (
"bytes"
"encoding/hex"
"fmt"
"io"
"net/http"
"strconv"
"strings"
"sync"
"sync/atomic"
"time"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
"github.com/tidwall/gjson"
"github.com/Mrs4s/MiraiGo/utils"
"github.com/Mrs4s/go-cqhttp/global"
"github.com/Mrs4s/go-cqhttp/internal/base"
"github.com/Mrs4s/go-cqhttp/internal/download"
"github.com/Mrs4s/go-cqhttp/modules/config"
)
type currentSignServer atomic.Pointer[config.SignServer]
func (c *currentSignServer) get() *config.SignServer {
if len(base.SignServers) == 1 {
// 只配置了一个签名服务时不检查以及切换, 在get阶段返回防止返回nil导致其他bug可能
return &base.SignServers[0]
}
return (*atomic.Pointer[config.SignServer])(c).Load()
}
func (c *currentSignServer) set(server *config.SignServer) {
(*atomic.Pointer[config.SignServer])(c).Store(server)
}
// 当前签名服务器
var ss currentSignServer
// 失败计数
type errconut atomic.Uintptr
func (ec *errconut) hasOver(count uintptr) bool {
return (*atomic.Uintptr)(ec).Load() > count
}
func (ec *errconut) inc() {
(*atomic.Uintptr)(ec).Add(1)
}
var errn errconut
// getAvaliableSignServer 获取可用的签名服务器,没有则返回空和相应错误
func getAvaliableSignServer() (*config.SignServer, error) {
cs := ss.get()
if cs != nil {
return cs, nil
}
if len(base.SignServers) == 0 {
return nil, errors.New("no sign server configured")
}
maxCount := base.Account.MaxCheckCount
if maxCount == 0 {
if errn.hasOver(3) {
log.Warn("已连续 3 次获取不到可用签名服务器,将固定使用主签名服务器")
ss.set(&base.SignServers[0])
return ss.get(), nil
}
} else if errn.hasOver(uintptr(maxCount)) {
log.Fatalf("获取可用签名服务器失败次数超过 %v 次, 正在离线", maxCount)
}
if cs != nil && len(cs.URL) > 0 {
log.Warnf("当前签名服务器 %v 不可用,正在查找可用服务器", cs.URL)
}
cs = asyncCheckServer(base.SignServers)
if cs == nil {
return nil, errors.New("no usable sign server")
}
return cs, nil
}
func isServerAvaliable(signServer string) bool {
resp, err := download.Request{
Method: http.MethodGet,
URL: signServer,
}.WithTimeout(3 * time.Second).Bytes()
if err == nil && gjson.GetBytes(resp, "code").Int() == 0 {
return true
}
log.Warnf("签名服务器 %v 可能不可用,请求出现错误:%v", signServer, err)
return false
}
// asyncCheckServer 按同步顺序检查所有签名服务器直到找到可用的
func asyncCheckServer(servers []config.SignServer) *config.SignServer {
doRegister := sync.Once{}
wg := sync.WaitGroup{}
wg.Add(len(servers))
for i, s := range servers {
go func(i int, server config.SignServer) {
defer wg.Done()
log.Infof("检查签名服务器:%v (%v/%v)", server.URL, i+1, len(servers))
if len(server.URL) < 4 {
return
}
if isServerAvaliable(server.URL) {
doRegister.Do(func() {
ss.set(&server)
log.Infof("使用签名服务器 url=%v, key=%v, auth=%v", server.URL, server.Key, server.Authorization)
if base.Account.AutoRegister {
// 若配置了自动注册实例则在切换后注册实例否则不需要注册签名时由qsign自动注册
signRegister(base.Account.Uin, device.AndroidId, device.Guid, device.QImei36, server.Key)
}
})
}
}(i, s)
}
wg.Wait()
return ss.get()
}
/*
请求签名服务器
url: api + params 组合的字符串无须包含签名服务器地址
return: signServer, response, error
*/
func requestSignServer(method string, url string, headers map[string]string, body io.Reader) (string, []byte, error) {
signServer, e := getAvaliableSignServer()
if e != nil && len(signServer.URL) == 0 { // 没有可用的
log.Warnf("获取可用签名服务器出错:%v, 将使用主签名服务器进行签名", e)
errn.inc()
signServer = &base.SignServers[0] // 没有获取到时使用第一个
}
if !strings.HasPrefix(url, signServer.URL) {
url = strings.TrimSuffix(signServer.URL, "/") + "/" + strings.TrimPrefix(url, "/")
}
if headers == nil {
headers = map[string]string{}
}
auth := signServer.Authorization
if auth != "-" && auth != "" {
headers["Authorization"] = auth
}
req := download.Request{
Method: method,
Header: headers,
URL: url,
Body: body,
}.WithTimeout(time.Duration(base.SignServerTimeout) * time.Second)
resp, err := req.Bytes()
if err != nil {
ss.set(nil) // 标记为不可用
}
return signServer.URL, resp, err
}
func energy(uin uint64, id string, _ string, salt []byte) ([]byte, error) {
url := "custom_energy" + fmt.Sprintf("?data=%v&salt=%v&uin=%v&android_id=%v&guid=%v",
id, hex.EncodeToString(salt), uin, utils.B2S(device.AndroidId), hex.EncodeToString(device.Guid))
if base.IsBelow110 {
url = "custom_energy" + fmt.Sprintf("?data=%v&salt=%v", id, hex.EncodeToString(salt))
}
signServer, response, err := requestSignServer(http.MethodGet, url, nil, nil)
if err != nil {
log.Warnf("获取T544 sign时出现错误: %v. server: %v", err, signServer)
return nil, err
}
data, err := hex.DecodeString(gjson.GetBytes(response, "data").String())
if err != nil {
log.Warnf("获取T544 sign时出现错误: %v (data: %v)", err, gjson.GetBytes(response, "data").String())
return nil, err
}
if len(data) == 0 {
log.Warnf("获取T544 sign时出现错误: %v.", "data is empty")
return nil, errors.New("data is empty")
}
return data, nil
}
// signSubmit
// 提交回调 buffer
func signSubmit(uin string, cmd string, callbackID int64, buffer []byte, t string) {
buffStr := hex.EncodeToString(buffer)
if base.Debug {
tail := 64
endl := "..."
if len(buffStr) < tail {
tail = len(buffStr)
endl = "."
}
log.Debugf("submit (%v): uin=%v, cmd=%v, callbackID=%v, buffer=%v%s", t, uin, cmd, callbackID, buffStr[:tail], endl)
}
signServer, _, err := requestSignServer(
http.MethodGet,
"submit"+fmt.Sprintf("?uin=%v&cmd=%v&callback_id=%v&buffer=%v",
uin, cmd, callbackID, buffStr),
nil, nil,
)
if err != nil {
log.Warnf("提交 callback 时出现错误: %v. server: %v", err, signServer)
}
}
// signCallback
// 刷新 token 和签名的回调
func signCallback(uin string, results []gjson.Result, t string) {
for { // 等待至在线
if cli.Online.Load() {
break
}
time.Sleep(1 * time.Second)
}
for _, result := range results {
cmd := result.Get("cmd").String()
callbackID := result.Get("callbackId").Int()
body, _ := hex.DecodeString(result.Get("body").String())
ret, err := cli.SendSsoPacket(cmd, body)
if err != nil || len(ret) == 0 {
log.Warnf("Callback error: %v, or response data is empty", err)
continue // 发送 SsoPacket 出错或返回数据为空时跳过
}
signSubmit(uin, cmd, callbackID, ret, t)
}
}
func signRequset(seq uint64, uin string, cmd string, qua string, buff []byte) (sign []byte, extra []byte, token []byte, err error) {
headers := map[string]string{"Content-Type": "application/x-www-form-urlencoded"}
_, response, err := requestSignServer(
http.MethodPost,
"sign",
headers,
bytes.NewReader([]byte(fmt.Sprintf("uin=%v&qua=%s&cmd=%s&seq=%v&buffer=%v&android_id=%v&guid=%v",
uin, qua, cmd, seq, hex.EncodeToString(buff), utils.B2S(device.AndroidId), hex.EncodeToString(device.Guid)))),
)
if err != nil {
return nil, nil, nil, err
}
sign, _ = hex.DecodeString(gjson.GetBytes(response, "data.sign").String())
extra, _ = hex.DecodeString(gjson.GetBytes(response, "data.extra").String())
token, _ = hex.DecodeString(gjson.GetBytes(response, "data.token").String())
if !base.IsBelow110 {
go signCallback(uin, gjson.GetBytes(response, "data.requestCallback").Array(), "sign")
}
return sign, extra, token, nil
}
var registerLock sync.Mutex
func signRegister(uin int64, androidID, guid []byte, qimei36, key string) {
if base.IsBelow110 {
log.Warn("签名服务器版本低于1.1.0, 跳过实例注册")
return
}
signServer, resp, err := requestSignServer(
http.MethodGet,
"register"+fmt.Sprintf("?uin=%v&android_id=%v&guid=%v&qimei36=%v&key=%s",
uin, utils.B2S(androidID), hex.EncodeToString(guid), qimei36, key),
nil, nil,
)
if err != nil {
log.Warnf("注册QQ实例时出现错误: %v. server: %v", err, signServer)
return
}
msg := gjson.GetBytes(resp, "msg")
if gjson.GetBytes(resp, "code").Int() != 0 {
log.Warnf("注册QQ实例时出现错误: %v. server: %v", msg, signServer)
return
}
log.Infof("注册QQ实例 %v 成功: %v", uin, msg)
}
func signRefreshToken(uin string) error {
log.Info("正在刷新 token")
_, resp, err := requestSignServer(
http.MethodGet,
"request_token?uin="+uin,
nil, nil,
)
if err != nil {
return err
}
msg := gjson.GetBytes(resp, "msg")
code := gjson.GetBytes(resp, "code")
if code.Int() != 0 {
return errors.New("code=" + code.String() + ", msg: " + msg.String())
}
go signCallback(uin, gjson.GetBytes(resp, "data").Array(), "request token")
return nil
}
var missTokenCount = uint64(0)
var lastToken = ""
func sign(seq uint64, uin string, cmd string, qua string, buff []byte) (sign []byte, extra []byte, token []byte, err error) {
i := 0
for {
sign, extra, token, err = signRequset(seq, uin, cmd, qua, buff)
cs := ss.get()
if cs == nil {
// 最好在请求后判断否则若被设置为nil后不会再请求签名
// 导致在下一次有请求签名服务操作之前ss无法更新
err = errors.New("nil signserver")
log.Warn("nil sign-server") // 返回的err并不会log出来加条日志
return
}
if err != nil {
log.Warnf("获取sso sign时出现错误: %v. server: %v", err, cs.URL)
}
if i > 0 {
break
}
i++
if (!base.IsBelow110) && base.Account.AutoRegister && err == nil && len(sign) == 0 {
if registerLock.TryLock() { // 避免并发时多处同时销毁并重新注册
log.Debugf("请求签名cmd=%v, qua=%v, buff=%v", seq, cmd, hex.EncodeToString(buff))
log.Debugf("返回结果sign=%v, extra=%v, token=%v",
hex.EncodeToString(sign), hex.EncodeToString(extra), hex.EncodeToString(token))
log.Warn("获取签名为空,实例可能丢失,正在尝试重新注册")
defer registerLock.Unlock()
err := signServerDestroy(uin)
if err != nil {
log.Warnln(err) // 实例真的丢失时则必出错,或许应该不 return , 以重新获取本次签名
// return nil, nil, nil, err
}
signRegister(base.Account.Uin, device.AndroidId, device.Guid, device.QImei36, cs.Key)
}
continue
}
if (!base.IsBelow110) && base.Account.AutoRefreshToken && len(token) == 0 {
log.Warnf("token 已过期, 总丢失 token 次数为 %v", atomic.AddUint64(&missTokenCount, 1))
if registerLock.TryLock() {
defer registerLock.Unlock()
if err := signRefreshToken(uin); err != nil {
log.Warnf("刷新 token 出现错误: %v. server: %v", err, cs.URL)
} else {
log.Info("刷新 token 成功")
}
}
continue
}
break
}
if tokenString := hex.EncodeToString(token); lastToken != tokenString {
log.Infof("token 已更新:%v -> %v", lastToken, tokenString)
lastToken = tokenString
}
rule := base.Account.RuleChangeSignServer
if (len(sign) == 0 && rule >= 1) || (len(token) == 0 && rule >= 2) {
ss.set(nil)
}
return sign, extra, token, err
}
func signServerDestroy(uin string) error {
signServer, signVersion, err := signVersion()
if err != nil {
return errors.Wrapf(err, "获取签名服务版本出现错误, server: %v", signServer)
}
if global.VersionNameCompare("v"+signVersion, "v1.1.6") {
return errors.Errorf("当前签名服务器版本 %v 低于 1.1.6,无法使用 destroy 接口", signVersion)
}
cs := ss.get()
if cs == nil {
return errors.New("nil signserver")
}
signServer, resp, err := requestSignServer(
http.MethodGet,
"destroy"+fmt.Sprintf("?uin=%v&key=%v", uin, cs.Key),
nil, nil,
)
if err != nil || gjson.GetBytes(resp, "code").Int() != 0 {
return errors.Wrapf(err, "destroy 实例出现错误, server: %v", signServer)
}
return nil
}
func signVersion() (signServer string, version string, err error) {
signServer, resp, err := requestSignServer(http.MethodGet, "", nil, nil)
if err != nil {
return signServer, "", err
}
if gjson.GetBytes(resp, "code").Int() == 0 {
return signServer, gjson.GetBytes(resp, "data.version").String(), nil
}
return signServer, "", errors.New("empty version")
}
// 定时刷新 token, interval 为间隔时间(分钟)
func signStartRefreshToken(interval int64) {
if interval <= 0 {
log.Warn("定时刷新 token 已关闭")
return
}
log.Infof("每 %v 分钟将刷新一次签名 token", interval)
if interval < 10 {
log.Warnf("间隔时间 %v 分钟较短,推荐 30~40 分钟", interval)
}
if interval > 60 {
log.Warn("间隔时间不能超过 60 分钟,已自动设置为 60 分钟")
interval = 60
}
t := time.NewTicker(time.Duration(interval) * time.Minute)
qqstr := strconv.FormatInt(base.Account.Uin, 10)
defer t.Stop()
for range t.C {
cs, master := ss.get(), &base.SignServers[0]
if (cs == nil || cs.URL != master.URL) && isServerAvaliable(master.URL) {
ss.set(master)
log.Infof("主签名服务器可用,已切换至主签名服务器 %v", master.URL)
}
cs = ss.get()
if cs == nil {
log.Warn("无法获得可用签名服务器,停止 token 定时刷新")
return
}
err := signRefreshToken(qqstr)
if err != nil {
log.Warnf("刷新 token 出现错误: %v. server: %v", err, cs.URL)
}
}
}

View File

@ -617,6 +617,7 @@ func (bot *CQBot) CQUploadPrivateFile(userID int64, file, name string) global.MS
log.Warnf("上传私聊文件 %v 失败: %+v", file, err) log.Warnf("上传私聊文件 %v 失败: %+v", file, err)
return Failed(100, "OPEN_FILE_ERROR", "打开文件失败") return Failed(100, "OPEN_FILE_ERROR", "打开文件失败")
} }
defer func() { _ = fileBody.Close() }()
localFile := &client.LocalFile{ localFile := &client.LocalFile{
FileName: name, FileName: name,
Body: fileBody, Body: fileBody,
@ -758,7 +759,7 @@ func (bot *CQBot) CQSendGroupMessage(groupID int64, m gjson.Result, autoEscape b
} else { } else {
str := m.String() str := m.String()
if str == "" { if str == "" {
log.Warn("群消息发送失败: 信息为空.") log.Warnf("群 %v 消息发送失败: 信息为空.", groupID)
return Failed(100, "EMPTY_MSG_ERROR", "消息为空") return Failed(100, "EMPTY_MSG_ERROR", "消息为空")
} }
if autoEscape { if autoEscape {
@ -895,7 +896,7 @@ func (bot *CQBot) uploadForwardElement(m gjson.Result, target int64, sourceType
SenderId: m.GetAttribute().SenderUin, SenderId: m.GetAttribute().SenderUin,
SenderName: m.GetAttribute().SenderName, SenderName: m.GetAttribute().SenderName,
Time: int32(msgTime), Time: int32(msgTime),
Message: resolveElement(bot.ConvertContentMessage(m.GetContent(), mSource)), Message: resolveElement(bot.ConvertContentMessage(m.GetContent(), mSource, false)),
} }
} }
log.Warnf("警告: 引用消息 %v 错误或数据库未开启.", e.Get("data.id").Str) log.Warnf("警告: 引用消息 %v 错误或数据库未开启.", e.Get("data.id").Str)
@ -970,17 +971,20 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) globa
if m.Type != gjson.JSON { if m.Type != gjson.JSON {
return Failed(100) return Failed(100)
} }
source := message.Source{
SourceType: message.SourcePrivate,
PrimaryID: 0,
}
fe := bot.uploadForwardElement(m, groupID, message.SourceGroup) fe := bot.uploadForwardElement(m, groupID, message.SourceGroup)
if fe == nil { if fe == nil {
return Failed(100, "EMPTY_NODES", "未找到任何可发送的合并转发信息") return Failed(100, "EMPTY_NODES", "未找到任何可发送的合并转发信息")
} }
ret := bot.Client.SendGroupForwardMessage(groupID, fe) ret := bot.Client.SendGroupForwardMessage(groupID, fe)
if ret == nil || ret.Id == -1 { if ret == nil || ret.Id == -1 {
log.Warnf("合并转发(群)消息发送失败: 账号可能被风控.") log.Warnf("合并转发(群 %v)消息发送失败: 账号可能被风控.", groupID)
return Failed(100, "SEND_MSG_API_ERROR", "请参考 go-cqhttp 端输出") return Failed(100, "SEND_MSG_API_ERROR", "请参考 go-cqhttp 端输出")
} }
mid := bot.InsertGroupMessage(ret) mid := bot.InsertGroupMessage(ret, source)
log.Infof("发送群 %v(%v) 的合并转发消息: %v (%v)", groupID, groupID, limitedString(m.String()), mid) log.Infof("发送群 %v(%v) 的合并转发消息: %v (%v)", groupID, groupID, limitedString(m.String()), mid)
return OK(global.MSG{ return OK(global.MSG{
"message_id": mid, "message_id": mid,
@ -1003,7 +1007,7 @@ func (bot *CQBot) CQSendPrivateForwardMessage(userID int64, m gjson.Result) glob
} }
mid := bot.SendPrivateMessage(userID, 0, &message.SendingMessage{Elements: []message.IMessageElement{fe}}) mid := bot.SendPrivateMessage(userID, 0, &message.SendingMessage{Elements: []message.IMessageElement{fe}})
if mid == -1 { if mid == -1 {
log.Warnf("合并转发(好友)消息发送失败: 账号可能被风控.") log.Warnf("合并转发(好友 %v)消息发送失败: 账号可能被风控.", userID)
return Failed(100, "SEND_MSG_API_ERROR", "请参考 go-cqhttp 端输出") return Failed(100, "SEND_MSG_API_ERROR", "请参考 go-cqhttp 端输出")
} }
log.Infof("发送好友 %v(%v) 的合并转发消息: %v (%v)", userID, userID, limitedString(m.String()), mid) log.Infof("发送好友 %v(%v) 的合并转发消息: %v (%v)", userID, userID, limitedString(m.String()), mid)
@ -1109,17 +1113,17 @@ func (bot *CQBot) CQSetGroupMemo(groupID int64, msg, img string) global.MSG {
if err != nil { if err != nil {
return Failed(100, "IMAGE_NOT_FOUND", "图片未找到") return Failed(100, "IMAGE_NOT_FOUND", "图片未找到")
} }
_, err = bot.Client.AddGroupNoticeWithPic(groupID, msg, data) noticeID, err := bot.Client.AddGroupNoticeWithPic(groupID, msg, data)
if err != nil {
return Failed(100, "SEND_NOTICE_ERROR", err.Error())
}
} else {
_, err := bot.Client.AddGroupNoticeSimple(groupID, msg)
if err != nil { if err != nil {
return Failed(100, "SEND_NOTICE_ERROR", err.Error()) return Failed(100, "SEND_NOTICE_ERROR", err.Error())
} }
return OK(global.MSG{"notice_id": noticeID})
} }
return OK(nil) noticeID, err := bot.Client.AddGroupNoticeSimple(groupID, msg)
if err != nil {
return Failed(100, "SEND_NOTICE_ERROR", err.Error())
}
return OK(global.MSG{"notice_id": noticeID})
} }
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }
@ -1148,13 +1152,15 @@ func (bot *CQBot) CQDelGroupMemo(groupID int64, fid string) global.MSG {
// @rename(msg->message, block->reject_add_request) // @rename(msg->message, block->reject_add_request)
func (bot *CQBot) CQSetGroupKick(groupID int64, userID int64, msg string, block bool) global.MSG { func (bot *CQBot) CQSetGroupKick(groupID int64, userID int64, msg string, block bool) global.MSG {
if g := bot.Client.FindGroup(groupID); g != nil { if g := bot.Client.FindGroup(groupID); g != nil {
if m := g.FindMember(userID); m != nil { m := g.FindMember(userID)
err := m.Kick(msg, block) if m == nil {
if err != nil { return Failed(100, "MEMBER_NOT_FOUND", "人员不存在")
return Failed(100, "NOT_MANAGEABLE", "机器人权限不足")
}
return OK(nil)
} }
err := m.Kick(msg, block)
if err != nil {
return Failed(100, "NOT_MANAGEABLE", "机器人权限不足")
}
return OK(nil)
} }
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }
@ -1382,33 +1388,42 @@ func (bot *CQBot) CQGetGroupHonorInfo(groupID int64, t string) global.MSG {
} }
} }
msg["talkative_list"] = convertMem(honor.TalkativeList) msg["talkative_list"] = convertMem(honor.TalkativeList)
} else {
log.Infof("获取群龙王出错:%v", err)
} }
} }
if t == "performer" || t == "all" { if t == "performer" || t == "all" {
if honor, err := bot.Client.GetGroupHonorInfo(groupID, client.Performer); err == nil { if honor, err := bot.Client.GetGroupHonorInfo(groupID, client.Performer); err == nil {
msg["performer_lis"] = convertMem(honor.ActorList) msg["performer_list"] = convertMem(honor.ActorList)
} else {
log.Infof("获取群聊之火出错:%v", err)
} }
} }
if t == "legend" || t == "all" { if t == "legend" || t == "all" {
if honor, err := bot.Client.GetGroupHonorInfo(groupID, client.Legend); err == nil { if honor, err := bot.Client.GetGroupHonorInfo(groupID, client.Legend); err == nil {
msg["legend_list"] = convertMem(honor.LegendList) msg["legend_list"] = convertMem(honor.LegendList)
} else {
log.Infof("获取群聊炽焰出错:%v", err)
} }
} }
if t == "strong_newbie" || t == "all" { if t == "strong_newbie" || t == "all" {
if honor, err := bot.Client.GetGroupHonorInfo(groupID, client.StrongNewbie); err == nil { if honor, err := bot.Client.GetGroupHonorInfo(groupID, client.StrongNewbie); err == nil {
msg["strong_newbie_list"] = convertMem(honor.StrongNewbieList) msg["strong_newbie_list"] = convertMem(honor.StrongNewbieList)
} else {
log.Infof("获取冒尖小春笋出错:%v", err)
} }
} }
if t == "emotion" || t == "all" { if t == "emotion" || t == "all" {
if honor, err := bot.Client.GetGroupHonorInfo(groupID, client.Emotion); err == nil { if honor, err := bot.Client.GetGroupHonorInfo(groupID, client.Emotion); err == nil {
msg["emotion_list"] = convertMem(honor.EmotionList) msg["emotion_list"] = convertMem(honor.EmotionList)
} else {
log.Infof("获取快乐之源出错:%v", err)
} }
} }
return OK(msg) return OK(msg)
} }
@ -1683,9 +1698,9 @@ func (bot *CQBot) CQGetMessage(messageID int32) global.MSG {
switch o := msg.(type) { switch o := msg.(type) {
case *db.StoredGroupMessage: case *db.StoredGroupMessage:
m["group_id"] = o.GroupCode m["group_id"] = o.GroupCode
m["message"] = ToFormattedMessage(bot.ConvertContentMessage(o.Content, message.SourceGroup), message.Source{SourceType: message.SourceGroup, PrimaryID: o.GroupCode}) m["message"] = ToFormattedMessage(bot.ConvertContentMessage(o.Content, message.SourceGroup, false), message.Source{SourceType: message.SourceGroup, PrimaryID: o.GroupCode})
case *db.StoredPrivateMessage: case *db.StoredPrivateMessage:
m["message"] = ToFormattedMessage(bot.ConvertContentMessage(o.Content, message.SourcePrivate), message.Source{SourceType: message.SourcePrivate}) m["message"] = ToFormattedMessage(bot.ConvertContentMessage(o.Content, message.SourcePrivate, false), message.Source{SourceType: message.SourcePrivate})
} }
return OK(m) return OK(m)
} }
@ -1745,7 +1760,7 @@ func (bot *CQBot) CQGetGuildMessage(messageID string, noCache bool) global.MSG {
"tiny_id": fU64(channelMsgByDB.Attribute.SenderTinyID), "tiny_id": fU64(channelMsgByDB.Attribute.SenderTinyID),
"nickname": channelMsgByDB.Attribute.SenderName, "nickname": channelMsgByDB.Attribute.SenderName,
} }
m["message"] = ToFormattedMessage(bot.ConvertContentMessage(channelMsgByDB.Content, message.SourceGuildChannel), source) m["message"] = ToFormattedMessage(bot.ConvertContentMessage(channelMsgByDB.Content, message.SourceGuildChannel, false), source)
} }
case message.SourceGuildDirect: case message.SourceGuildDirect:
// todo(mrs4s): 支持 direct 消息 // todo(mrs4s): 支持 direct 消息
@ -1788,10 +1803,14 @@ func (bot *CQBot) CQGetGroupMessageHistory(groupID int64, seq int64) global.MSG
log.Warnf("获取群历史消息失败: %v", err) log.Warnf("获取群历史消息失败: %v", err)
return Failed(100, "MESSAGES_API_ERROR", err.Error()) return Failed(100, "MESSAGES_API_ERROR", err.Error())
} }
source := message.Source{
SourceType: message.SourcePrivate,
PrimaryID: 0,
}
ms := make([]*event, 0, len(msg)) ms := make([]*event, 0, len(msg))
for _, m := range msg { for _, m := range msg {
bot.checkMedia(m.Elements, groupID) bot.checkMedia(m.Elements, groupID)
id := bot.InsertGroupMessage(m) id := bot.InsertGroupMessage(m, source)
t := bot.formatGroupMessage(m) t := bot.formatGroupMessage(m)
t.Others["message_id"] = id t.Others["message_id"] = id
ms = append(ms, t) ms = append(ms, t)
@ -2011,7 +2030,7 @@ func (bot *CQBot) CQGetVersionInfo() global.MSG {
"protocol_version": "v11", "protocol_version": "v11",
"coolq_directory": wd, "coolq_directory": wd,
"coolq_edition": "pro", "coolq_edition": "pro",
"go-cqhttp": true, "go_cqhttp": true,
"plugin_version": "4.15.0", "plugin_version": "4.15.0",
"plugin_build_number": 99, "plugin_build_number": 99,
"plugin_build_configuration": "release", "plugin_build_configuration": "release",

View File

@ -28,7 +28,7 @@ func (bot *CQBot) CQGetVersion() global.MSG {
// //
// @route12(send_message) // @route12(send_message)
// @rename(m->message) // @rename(m->message)
func (bot *CQBot) CQSendMessageV12(groupID, userID, detailType string, m gjson.Result) global.MSG { func (bot *CQBot) CQSendMessageV12(groupID, userID, detailType string, m gjson.Result) global.MSG { // nolint
// TODO: implement // TODO: implement
return OK(nil) return OK(nil)
} }

View File

@ -288,7 +288,7 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) (in
log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupID, err) log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupID, err)
return -1, errors.Wrap(err, "send group music share error") return -1, errors.Wrap(err, "send group music share error")
} }
return bot.InsertGroupMessage(ret), nil return bot.InsertGroupMessage(ret, source), nil
case *message.AtElement: case *message.AtElement:
if i.Target == 0 && group.SelfPermission() == client.Member { if i.Target == 0 && group.SelfPermission() == client.Member {
e = message.NewText("@全体成员") e = message.NewText("@全体成员")
@ -297,17 +297,17 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) (in
newElem = append(newElem, e) newElem = append(newElem, e)
} }
if len(newElem) == 0 { if len(newElem) == 0 {
log.Warnf("群消息发送失败: 消息为空.") log.Warnf("群 %v 消息发送失败: 消息为空.", groupID)
return -1, errors.New("empty message") return -1, errors.New("empty message")
} }
m.Elements = newElem m.Elements = newElem
bot.checkMedia(newElem, groupID) bot.checkMedia(newElem, groupID)
ret := bot.Client.SendGroupMessage(groupID, m) ret := bot.Client.SendGroupMessage(groupID, m)
if ret == nil || ret.Id == -1 { if ret == nil || ret.Id == -1 {
log.Warnf("群消息发送失败: 账号可能被风控.") log.Warnf("群 %v 发送消息失败: 账号可能被风控.", groupID)
return -1, errors.New("send group message failed: blocked by server") return -1, errors.New("send group message failed: blocked by server")
} }
return bot.InsertGroupMessage(ret), nil return bot.InsertGroupMessage(ret, source), nil
} }
// SendPrivateMessage 发送私聊消息 // SendPrivateMessage 发送私聊消息
@ -357,7 +357,7 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
case bot.Client.FindFriend(target) != nil: // 双向好友 case bot.Client.FindFriend(target) != nil: // 双向好友
msg := bot.Client.SendPrivateMessage(target, m) msg := bot.Client.SendPrivateMessage(target, m)
if msg != nil { if msg != nil {
id = bot.InsertPrivateMessage(msg) id = bot.InsertPrivateMessage(msg, source)
} }
case ok || groupID != 0: // 临时会话 case ok || groupID != 0: // 临时会话
if !base.AllowTempSession { if !base.AllowTempSession {
@ -395,7 +395,7 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
case unidirectionalFriendExists(): // 单向好友 case unidirectionalFriendExists(): // 单向好友
msg := bot.Client.SendPrivateMessage(target, m) msg := bot.Client.SendPrivateMessage(target, m)
if msg != nil { if msg != nil {
id = bot.InsertPrivateMessage(msg) id = bot.InsertPrivateMessage(msg, source)
} }
default: default:
nickname := "Unknown" nickname := "Unknown"
@ -444,7 +444,7 @@ func (bot *CQBot) SendGuildChannelMessage(guildID, channelID uint64, m *message.
} }
// InsertGroupMessage 群聊消息入数据库 // InsertGroupMessage 群聊消息入数据库
func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 { func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage, source message.Source) int32 {
t := &message.SendingMessage{Elements: m.Elements} t := &message.SendingMessage{Elements: m.Elements}
replyElem := t.FirstOrNil(func(e message.IMessageElement) bool { replyElem := t.FirstOrNil(func(e message.IMessageElement) bool {
_, ok := e.(*message.ReplyElement) _, ok := e.(*message.ReplyElement)
@ -468,7 +468,7 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
} }
return "" return ""
}(), }(),
Content: ToMessageContent(m.Elements), Content: ToMessageContent(m.Elements, source),
} }
if replyElem != nil { if replyElem != nil {
reply := replyElem.(*message.ReplyElement) reply := replyElem.(*message.ReplyElement)
@ -476,7 +476,7 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
msg.QuotedInfo = &db.QuotedInfo{ msg.QuotedInfo = &db.QuotedInfo{
PrevID: encodeMessageID(m.GroupCode, reply.ReplySeq), PrevID: encodeMessageID(m.GroupCode, reply.ReplySeq),
PrevGlobalID: db.ToGlobalID(m.GroupCode, reply.ReplySeq), PrevGlobalID: db.ToGlobalID(m.GroupCode, reply.ReplySeq),
QuotedContent: ToMessageContent(reply.Elements), QuotedContent: ToMessageContent(reply.Elements, source),
} }
} }
if err := db.InsertGroupMessage(msg); err != nil { if err := db.InsertGroupMessage(msg); err != nil {
@ -487,7 +487,7 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
} }
// InsertPrivateMessage 私聊消息入数据库 // InsertPrivateMessage 私聊消息入数据库
func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 { func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage, source message.Source) int32 {
t := &message.SendingMessage{Elements: m.Elements} t := &message.SendingMessage{Elements: m.Elements}
replyElem := t.FirstOrNil(func(e message.IMessageElement) bool { replyElem := t.FirstOrNil(func(e message.IMessageElement) bool {
_, ok := e.(*message.ReplyElement) _, ok := e.(*message.ReplyElement)
@ -511,7 +511,7 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
return m.Sender.Uin return m.Sender.Uin
}(), }(),
TargetUin: m.Target, TargetUin: m.Target,
Content: ToMessageContent(m.Elements), Content: ToMessageContent(m.Elements, source),
} }
if replyElem != nil { if replyElem != nil {
reply := replyElem.(*message.ReplyElement) reply := replyElem.(*message.ReplyElement)
@ -519,7 +519,7 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
msg.QuotedInfo = &db.QuotedInfo{ msg.QuotedInfo = &db.QuotedInfo{
PrevID: encodeMessageID(reply.Sender, reply.ReplySeq), PrevID: encodeMessageID(reply.Sender, reply.ReplySeq),
PrevGlobalID: db.ToGlobalID(reply.Sender, reply.ReplySeq), PrevGlobalID: db.ToGlobalID(reply.Sender, reply.ReplySeq),
QuotedContent: ToMessageContent(reply.Elements), QuotedContent: ToMessageContent(reply.Elements, source),
} }
} }
if err := db.InsertPrivateMessage(msg); err != nil { if err := db.InsertPrivateMessage(msg); err != nil {
@ -562,6 +562,10 @@ func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32
// InsertGuildChannelMessage 频道消息入数据库 // InsertGuildChannelMessage 频道消息入数据库
func (bot *CQBot) InsertGuildChannelMessage(m *message.GuildChannelMessage) string { func (bot *CQBot) InsertGuildChannelMessage(m *message.GuildChannelMessage) string {
id := encodeGuildMessageID(m.GuildId, m.ChannelId, m.Id, message.SourceGuildChannel) id := encodeGuildMessageID(m.GuildId, m.ChannelId, m.Id, message.SourceGuildChannel)
source := message.Source{
SourceType: message.SourceGuildChannel,
PrimaryID: int64(m.Sender.TinyId),
}
msg := &db.StoredGuildChannelMessage{ msg := &db.StoredGuildChannelMessage{
ID: id, ID: id,
Attribute: &db.StoredGuildMessageAttribute{ Attribute: &db.StoredGuildMessageAttribute{
@ -573,7 +577,7 @@ func (bot *CQBot) InsertGuildChannelMessage(m *message.GuildChannelMessage) stri
}, },
GuildID: m.GuildId, GuildID: m.GuildId,
ChannelID: m.ChannelId, ChannelID: m.ChannelId,
Content: ToMessageContent(m.Elements), Content: ToMessageContent(m.Elements, source),
} }
if err := db.InsertGuildChannelMessage(msg); err != nil { if err := db.InsertGuildChannelMessage(msg); err != nil {
log.Warnf("记录聊天数据时出现错误: %v", err) log.Warnf("记录聊天数据时出现错误: %v", err)

View File

@ -92,7 +92,7 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) *event {
"name": m.Sender.AnonymousInfo.AnonymousNick, "name": m.Sender.AnonymousInfo.AnonymousNick,
} }
gm["sender"].(global.MSG)["nickname"] = "匿名消息" gm["sender"].(global.MSG)["nickname"] = "匿名消息"
gm["sub_type"] = "anonymous" typ = "message/group/anonymous"
} else { } else {
group := bot.Client.FindGroup(m.GroupCode) group := bot.Client.FindGroup(m.GroupCode)
mem := group.FindMember(m.Sender.Uin) mem := group.FindMember(m.Sender.Uin)

View File

@ -51,7 +51,7 @@ func replyID(r *message.ReplyElement, source message.Source) int32 {
} }
// 私聊时,部分(不确定)的账号会在 ReplyElement 中带有 GroupID 字段。 // 私聊时,部分(不确定)的账号会在 ReplyElement 中带有 GroupID 字段。
// 这里需要判断是由于 “直接回复” 功能GroupID 为触发直接回复的来源那个群。 // 这里需要判断是由于 “直接回复” 功能GroupID 为触发直接回复的来源那个群。
if source.SourceType == message.SourcePrivate && (r.Sender == source.PrimaryID || r.GroupID == source.PrimaryID) { if source.SourceType == message.SourcePrivate && (r.Sender == source.PrimaryID || r.GroupID == source.PrimaryID || r.GroupID == 0) {
// 私聊似乎腾讯服务器有bug? // 私聊似乎腾讯服务器有bug?
seq = int32(uint16(seq)) seq = int32(uint16(seq))
id = r.Sender id = r.Sender
@ -243,6 +243,16 @@ func toElements(e []message.IMessageElement, source message.Source) (r []msg.Ele
{K: "type", V: "sticker"}, {K: "type", V: "sticker"},
}, },
} }
case *message.GroupFileElement:
m = msg.Element{
Type: "file",
Data: pairs{
{K: "path", V: o.Path},
{K: "name", V: o.Name},
{K: "size", V: strconv.FormatInt(o.Size, 10)},
{K: "busid", V: strconv.FormatInt(int64(o.Busid), 10)},
},
}
case *msg.LocalImage: case *msg.LocalImage:
data := pairs{ data := pairs{
{K: "file", V: o.File}, {K: "file", V: o.File},
@ -266,10 +276,15 @@ func toElements(e []message.IMessageElement, source message.Source) (r []msg.Ele
// ToMessageContent 将消息转换成 Content. 忽略 Reply // ToMessageContent 将消息转换成 Content. 忽略 Reply
// 不同于 onebot 的 Array Message, 此函数转换出来的 Content 的 data 段为实际类型 // 不同于 onebot 的 Array Message, 此函数转换出来的 Content 的 data 段为实际类型
// 方便数据库查询 // 方便数据库查询
func ToMessageContent(e []message.IMessageElement) (r []global.MSG) { func ToMessageContent(e []message.IMessageElement, source message.Source) (r []global.MSG) {
for _, elem := range e { for _, elem := range e {
var m global.MSG var m global.MSG
switch o := elem.(type) { switch o := elem.(type) {
case *message.ReplyElement:
m = global.MSG{
"type": "reply",
"data": global.MSG{"id": replyID(o, source)},
}
case *message.TextElement: case *message.TextElement:
m = global.MSG{ m = global.MSG{
"type": "text", "type": "text",
@ -373,6 +388,11 @@ func ToMessageContent(e []message.IMessageElement) (r []global.MSG) {
"type": "face", "type": "face",
"data": global.MSG{"id": o.ID, "type": "sticker"}, "data": global.MSG{"id": o.ID, "type": "sticker"},
} }
case *message.GroupFileElement:
m = global.MSG{
"type": "file",
"data": global.MSG{"path": o.Path, "name": o.Name, "size": strconv.FormatInt(o.Size, 10), "busid": strconv.FormatInt(int64(o.Busid), 10)},
}
default: default:
continue continue
} }
@ -384,7 +404,7 @@ func ToMessageContent(e []message.IMessageElement) (r []global.MSG) {
// ConvertStringMessage 将消息字符串转为消息元素数组 // ConvertStringMessage 将消息字符串转为消息元素数组
func (bot *CQBot) ConvertStringMessage(spec *onebot.Spec, raw string, sourceType message.SourceType) (r []message.IMessageElement) { func (bot *CQBot) ConvertStringMessage(spec *onebot.Spec, raw string, sourceType message.SourceType) (r []message.IMessageElement) {
elems := msg.ParseString(raw) elems := msg.ParseString(raw)
return bot.ConvertElements(spec, elems, sourceType) return bot.ConvertElements(spec, elems, sourceType, false)
} }
// ConvertObjectMessage 将消息JSON对象转为消息元素数组 // ConvertObjectMessage 将消息JSON对象转为消息元素数组
@ -393,11 +413,11 @@ func (bot *CQBot) ConvertObjectMessage(spec *onebot.Spec, m gjson.Result, source
return bot.ConvertStringMessage(spec, m.Str, sourceType) return bot.ConvertStringMessage(spec, m.Str, sourceType)
} }
elems := msg.ParseObject(m) elems := msg.ParseObject(m)
return bot.ConvertElements(spec, elems, sourceType) return bot.ConvertElements(spec, elems, sourceType, false)
} }
// ConvertContentMessage 将数据库用的 content 转换为消息元素数组 // ConvertContentMessage 将数据库用的 content 转换为消息元素数组
func (bot *CQBot) ConvertContentMessage(content []global.MSG, sourceType message.SourceType) (r []message.IMessageElement) { func (bot *CQBot) ConvertContentMessage(content []global.MSG, sourceType message.SourceType, noReply bool) (r []message.IMessageElement) {
elems := make([]msg.Element, len(content)) elems := make([]msg.Element, len(content))
for i, v := range content { for i, v := range content {
elem := msg.Element{Type: v["type"].(string)} elem := msg.Element{Type: v["type"].(string)}
@ -407,13 +427,16 @@ func (bot *CQBot) ConvertContentMessage(content []global.MSG, sourceType message
} }
elems[i] = elem elems[i] = elem
} }
return bot.ConvertElements(onebot.V11, elems, sourceType) return bot.ConvertElements(onebot.V11, elems, sourceType, noReply)
} }
// ConvertElements 将解码后的消息数组转换为MiraiGo表示 // ConvertElements 将解码后的消息数组转换为MiraiGo表示
func (bot *CQBot) ConvertElements(spec *onebot.Spec, elems []msg.Element, sourceType message.SourceType) (r []message.IMessageElement) { func (bot *CQBot) ConvertElements(spec *onebot.Spec, elems []msg.Element, sourceType message.SourceType, noReply bool) (r []message.IMessageElement) {
var replyCount int var replyCount int
for _, elem := range elems { for _, elem := range elems {
if noReply && elem.Type == "reply" {
continue
}
me, err := bot.ConvertElement(spec, elem, sourceType) me, err := bot.ConvertElement(spec, elem, sourceType)
if err != nil { if err != nil {
// TODO: don't use cqcode format // TODO: don't use cqcode format
@ -497,7 +520,7 @@ func (bot *CQBot) reply(spec *onebot.Spec, elem msg.Element, sourceType message.
ReplySeq: org.GetAttribute().MessageSeq, ReplySeq: org.GetAttribute().MessageSeq,
Sender: org.GetAttribute().SenderUin, Sender: org.GetAttribute().SenderUin,
Time: int32(org.GetAttribute().Timestamp), Time: int32(org.GetAttribute().Timestamp),
Elements: bot.ConvertContentMessage(org.GetContent(), sourceType), Elements: bot.ConvertContentMessage(org.GetContent(), sourceType, true),
} }
default: default:
@ -642,7 +665,7 @@ func (bot *CQBot) ConvertElement(spec *onebot.Spec, elem msg.Element, sourceType
return bot.reply(spec, elem, sourceType) return bot.reply(spec, elem, sourceType)
case "forward": case "forward":
id := elem.Get("id") id := elem.Get("id")
if id != "" { if id == "" {
return nil, errors.New("forward 消息中必须包含 id") return nil, errors.New("forward 消息中必须包含 id")
} }
fwdMsg := bot.Client.DownloadForwardMessage(id) fwdMsg := bot.Client.DownloadForwardMessage(id)
@ -713,7 +736,7 @@ func (bot *CQBot) ConvertElement(spec *onebot.Spec, elem msg.Element, sourceType
MusicType: message.CloudMusic, MusicType: message.CloudMusic,
Title: info.Get("name").String(), Title: info.Get("name").String(),
Summary: artistName, Summary: artistName,
Url: "https://y.music.163.com/m/song/" + id, Url: "https://music.163.com/song/?id=" + id,
PictureUrl: info.Get("album.picUrl").String(), PictureUrl: info.Get("album.picUrl").String(),
MusicUrl: "https://music.163.com/song/media/outer/url?id=" + id, MusicUrl: "https://music.163.com/song/media/outer/url?id=" + id,
}, nil }, nil
@ -841,6 +864,17 @@ func (bot *CQBot) ConvertElement(spec *onebot.Spec, elem msg.Element, sourceType
v.File = cacheFile v.File = cacheFile
} }
return v, nil return v, nil
case "file":
path := elem.Get("path")
name := elem.Get("name")
size, _ := strconv.ParseInt(elem.Get("size"), 10, 64)
busid, _ := strconv.ParseInt(elem.Get("busid"), 10, 64)
return &message.GroupFileElement{
Name: name,
Size: size,
Path: path,
Busid: int32(busid),
}, nil
default: default:
return nil, errors.New("unsupported message type: " + elem.Type) return nil, errors.New("unsupported message type: " + elem.Type)
} }

View File

@ -79,7 +79,7 @@ func (bot *CQBot) privateMessageEvent(_ *client.QQClient, m *message.PrivateMess
PrimaryID: m.Sender.Uin, PrimaryID: m.Sender.Uin,
} }
cqm := toStringMessage(m.Elements, source) cqm := toStringMessage(m.Elements, source)
id := bot.InsertPrivateMessage(m) id := bot.InsertPrivateMessage(m, source)
log.Infof("收到好友 %v(%v) 的消息: %v (%v)", m.Sender.DisplayName(), m.Sender.Uin, cqm, id) log.Infof("收到好友 %v(%v) 的消息: %v (%v)", m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
typ := "message/private/friend" typ := "message/private/friend"
if m.Sender.Uin == bot.Client.Uin { if m.Sender.Uin == bot.Client.Uin {
@ -118,7 +118,7 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
"url": c.GetGroupFileUrl(m.GroupCode, file.Path, file.Busid), "url": c.GetGroupFileUrl(m.GroupCode, file.Path, file.Busid),
}, },
}) })
return // return
} }
} }
source := message.Source{ source := message.Source{
@ -126,7 +126,7 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
PrimaryID: m.GroupCode, PrimaryID: m.GroupCode,
} }
cqm := toStringMessage(m.Elements, source) cqm := toStringMessage(m.Elements, source)
id := bot.InsertGroupMessage(m) id := bot.InsertGroupMessage(m, source)
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 := bot.formatGroupMessage(m) gm := bot.formatGroupMessage(m)
if gm == nil { if gm == nil {
@ -136,7 +136,7 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
bot.dispatch(gm) bot.dispatch(gm)
} }
func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEvent) { func (bot *CQBot) tempMessageEvent(_ *client.QQClient, e *client.TempMessageEvent) {
m := e.Message m := e.Message
bot.checkMedia(m.Elements, m.Sender.Uin) bot.checkMedia(m.Elements, m.Sender.Uin)
source := message.Source{ source := message.Source{
@ -475,6 +475,9 @@ func (bot *CQBot) offlineFileEvent(c *client.QQClient, e *client.OfflineFileEven
} }
func (bot *CQBot) joinGroupEvent(c *client.QQClient, group *client.GroupInfo) { func (bot *CQBot) joinGroupEvent(c *client.QQClient, group *client.GroupInfo) {
if group == nil {
return
}
log.Infof("Bot进入了群 %v.", formatGroupName(group)) log.Infof("Bot进入了群 %v.", formatGroupName(group))
bot.dispatch(bot.groupIncrease(group.Code, 0, c.Uin)) bot.dispatch(bot.groupIncrease(group.Code, 0, c.Uin))
} }
@ -488,7 +491,7 @@ func (bot *CQBot) leaveGroupEvent(c *client.QQClient, e *client.GroupLeaveEvent)
bot.dispatch(bot.groupDecrease(e.Group.Code, c.Uin, e.Operator)) bot.dispatch(bot.groupDecrease(e.Group.Code, c.Uin, e.Operator))
} }
func (bot *CQBot) memberPermissionChangedEvent(c *client.QQClient, e *client.MemberPermissionChangedEvent) { func (bot *CQBot) memberPermissionChangedEvent(_ *client.QQClient, e *client.MemberPermissionChangedEvent) {
st := "unset" st := "unset"
if e.NewPermission == client.Administrator { if e.NewPermission == client.Administrator {
st = "set" st = "set"
@ -499,7 +502,7 @@ func (bot *CQBot) memberPermissionChangedEvent(c *client.QQClient, e *client.Mem
}) })
} }
func (bot *CQBot) memberCardUpdatedEvent(c *client.QQClient, e *client.MemberCardUpdatedEvent) { func (bot *CQBot) memberCardUpdatedEvent(_ *client.QQClient, e *client.MemberCardUpdatedEvent) {
log.Infof("群 %v 的 %v 更新了名片 %v -> %v", formatGroupName(e.Group), formatMemberName(e.Member), e.OldCard, e.Member.CardName) log.Infof("群 %v 的 %v 更新了名片 %v -> %v", formatGroupName(e.Group), formatMemberName(e.Member), e.OldCard, e.Member.CardName)
bot.dispatchEvent("notice/group_card", global.MSG{ bot.dispatchEvent("notice/group_card", global.MSG{
"group_id": e.Group.Code, "group_id": e.Group.Code,
@ -523,7 +526,7 @@ func (bot *CQBot) memberLeaveEvent(_ *client.QQClient, e *client.MemberLeaveGrou
bot.dispatch(bot.groupDecrease(e.Group.Code, e.Member.Uin, e.Operator)) bot.dispatch(bot.groupDecrease(e.Group.Code, e.Member.Uin, e.Operator))
} }
func (bot *CQBot) friendRequestEvent(c *client.QQClient, e *client.NewFriendRequest) { func (bot *CQBot) friendRequestEvent(_ *client.QQClient, e *client.NewFriendRequest) {
log.Infof("收到来自 %v(%v) 的好友请求: %v", e.RequesterNick, e.RequesterUin, e.Message) log.Infof("收到来自 %v(%v) 的好友请求: %v", e.RequesterNick, e.RequesterUin, e.Message)
flag := strconv.FormatInt(e.RequestId, 10) flag := strconv.FormatInt(e.RequestId, 10)
bot.friendReqCache.Store(flag, e) bot.friendReqCache.Store(flag, e)
@ -534,7 +537,7 @@ func (bot *CQBot) friendRequestEvent(c *client.QQClient, e *client.NewFriendRequ
}) })
} }
func (bot *CQBot) friendAddedEvent(c *client.QQClient, e *client.NewFriendEvent) { func (bot *CQBot) friendAddedEvent(_ *client.QQClient, e *client.NewFriendEvent) {
log.Infof("添加了新好友: %v(%v)", e.Friend.Nickname, e.Friend.Uin) log.Infof("添加了新好友: %v(%v)", e.Friend.Nickname, e.Friend.Uin)
bot.tempSessionCache.Delete(e.Friend.Uin) bot.tempSessionCache.Delete(e.Friend.Uin)
bot.dispatchEvent("notice/friend_add", global.MSG{ bot.dispatchEvent("notice/friend_add", global.MSG{
@ -542,7 +545,7 @@ func (bot *CQBot) friendAddedEvent(c *client.QQClient, e *client.NewFriendEvent)
}) })
} }
func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRequest) { func (bot *CQBot) groupInvitedEvent(_ *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.dispatchEvent("request/group/invite", global.MSG{ bot.dispatchEvent("request/group/invite", global.MSG{
@ -554,7 +557,7 @@ func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRe
}) })
} }
func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *client.UserJoinGroupRequest) { func (bot *CQBot) groupJoinReqEvent(_ *client.QQClient, e *client.UserJoinGroupRequest) {
log.Infof("群 %v(%v) 收到来自用户 %v(%v) 的加群请求.", e.GroupName, e.GroupCode, 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.dispatchEvent("request/group/add", global.MSG{ bot.dispatchEvent("request/group/add", global.MSG{
@ -566,7 +569,7 @@ func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *client.UserJoinGroupR
}) })
} }
func (bot *CQBot) otherClientStatusChangedEvent(c *client.QQClient, e *client.OtherClientStatusChangedEvent) { func (bot *CQBot) otherClientStatusChangedEvent(_ *client.QQClient, e *client.OtherClientStatusChangedEvent) {
if e.Online { if e.Online {
log.Infof("Bot 账号在客户端 %v (%v) 登录.", e.Client.DeviceName, e.Client.DeviceKind) log.Infof("Bot 账号在客户端 %v (%v) 登录.", e.Client.DeviceName, e.Client.DeviceKind)
} else { } else {

View File

@ -17,4 +17,4 @@ chown -R ${UID}:${GID} /app /data
chmod +x /app/cqhttp chmod +x /app/cqhttp
echo "Starting..." echo "Starting..."
su-exec ${USER} /app/cqhttp su-exec ${USER} /app/cqhttp "$@"

View File

@ -33,9 +33,15 @@ func EncoderSilk(data []byte) ([]byte, error) {
// EncodeMP4 将给定视频文件编码为MP4 // EncodeMP4 将给定视频文件编码为MP4
func EncodeMP4(src string, dst string) error { // -y 覆盖文件 func EncodeMP4(src string, dst string) error { // -y 覆盖文件
cmd1 := exec.Command("ffmpeg", "-i", src, "-y", "-c", "copy", "-map", "0", dst) cmd1 := exec.Command("ffmpeg", "-i", src, "-y", "-c", "copy", "-map", "0", dst)
if errors.Is(cmd1.Err, exec.ErrDot) {
cmd1.Err = nil
}
err := cmd1.Run() err := cmd1.Run()
if err != nil { if err != nil {
cmd2 := exec.Command("ffmpeg", "-i", src, "-y", "-c:v", "h264", "-c:a", "mp3", dst) cmd2 := exec.Command("ffmpeg", "-i", src, "-y", "-c:v", "h264", "-c:a", "mp3", dst)
if errors.Is(cmd2.Err, exec.ErrDot) {
cmd2.Err = nil
}
return errors.Wrap(cmd2.Run(), "convert mp4 failed") return errors.Wrap(cmd2.Run(), "convert mp4 failed")
} }
return err return err
@ -44,5 +50,8 @@ func EncodeMP4(src string, dst string) error { // -y 覆盖文件
// ExtractCover 获取给定视频文件的Cover // ExtractCover 获取给定视频文件的Cover
func ExtractCover(src string, target string) error { func ExtractCover(src string, target string) error {
cmd := exec.Command("ffmpeg", "-i", src, "-y", "-ss", "0", "-frames:v", "1", target) cmd := exec.Command("ffmpeg", "-i", src, "-y", "-ss", "0", "-frames:v", "1", target)
if errors.Is(cmd.Err, exec.ErrDot) {
cmd.Err = nil
}
return errors.Wrap(cmd.Run(), "extract video cover failed") return errors.Wrap(cmd.Run(), "extract video cover failed")
} }

41
go.mod
View File

@ -3,28 +3,28 @@ module github.com/Mrs4s/go-cqhttp
go 1.20 go 1.20
require ( require (
github.com/FloatTech/sqlite v1.5.7 github.com/FloatTech/sqlite v1.6.3
github.com/Microsoft/go-winio v0.6.0 github.com/Microsoft/go-winio v0.6.2-0.20230724192519-b29bbd58a65a
github.com/Mrs4s/MiraiGo v0.0.0-20230317162854-fd83d24f6794 github.com/Mrs4s/MiraiGo v0.0.0-20230823050531-a8213e127b2b
github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e
github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5
github.com/fumiama/go-base16384 v1.6.1 github.com/fumiama/go-base16384 v1.7.0
github.com/fumiama/go-hide-param v0.1.4 github.com/fumiama/go-hide-param v0.1.4
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
github.com/mattn/go-colorable v0.1.13 github.com/mattn/go-colorable v0.1.13
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
github.com/segmentio/asm v1.2.0 github.com/segmentio/asm v1.2.0
github.com/sirupsen/logrus v1.9.0 github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.8.1 github.com/stretchr/testify v1.8.1
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/syndtr/goleveldb v1.0.0
github.com/tidwall/gjson v1.14.4 github.com/tidwall/gjson v1.15.0
github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60 github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60
go.mongodb.org/mongo-driver v1.11.0 go.mongodb.org/mongo-driver v1.12.0
golang.org/x/crypto v0.3.0 golang.org/x/crypto v0.17.0
golang.org/x/image v0.5.0 golang.org/x/image v0.10.0
golang.org/x/sys v0.2.0 golang.org/x/sys v0.15.0
golang.org/x/term v0.2.0 golang.org/x/term v0.15.0
golang.org/x/time v0.2.0 golang.org/x/time v0.3.0
gopkg.ilharper.com/x/isatty v1.1.1 gopkg.ilharper.com/x/isatty v1.1.1
gopkg.in/yaml.v3 v3.0.1 gopkg.in/yaml.v3 v3.0.1
) )
@ -39,6 +39,7 @@ require (
github.com/jonboulle/clockwork v0.3.0 // indirect github.com/jonboulle/clockwork v0.3.0 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/klauspost/compress v1.13.6 // indirect github.com/klauspost/compress v1.13.6 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/lestrrat-go/strftime v1.0.6 // indirect github.com/lestrrat-go/strftime v1.0.6 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect github.com/mattn/go-isatty v0.0.16 // indirect
github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
@ -48,13 +49,13 @@ require (
github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/pretty v1.2.0 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.3 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect golang.org/x/mod v0.12.0 // indirect
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect golang.org/x/sync v0.3.0 // indirect
golang.org/x/text v0.7.0 // indirect golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.1.12 // indirect golang.org/x/tools v0.11.0 // indirect
lukechampine.com/uint128 v1.2.0 // indirect lukechampine.com/uint128 v1.2.0 // indirect
modernc.org/cc/v3 v3.40.0 // indirect modernc.org/cc/v3 v3.40.0 // indirect
modernc.org/ccgo/v3 v3.16.13 // indirect modernc.org/ccgo/v3 v3.16.13 // indirect

155
go.sum
View File

@ -1,48 +1,40 @@
github.com/FloatTech/sqlite v1.5.7 h1:Bvo4LSojcZ6dVtbHrkqvt6z4v8e+sj0G5PSUIvdawsk= github.com/FloatTech/sqlite v1.6.3 h1:MQkqBNlkPuCoKQQgoNLuTL/2Ci3tBTFAnVYBdD0Wy4M=
github.com/FloatTech/sqlite v1.5.7/go.mod h1:zFbHzRfB+CJ+VidfjuVbrcin3DAz283F7hF1hIeHzpY= github.com/FloatTech/sqlite v1.6.3/go.mod h1:zFbHzRfB+CJ+VidfjuVbrcin3DAz283F7hF1hIeHzpY=
github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJGLDNIdRX3BI546D3O7k7vrVueZw= github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJGLDNIdRX3BI546D3O7k7vrVueZw=
github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs= github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs=
github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= github.com/Microsoft/go-winio v0.6.2-0.20230724192519-b29bbd58a65a h1:aU1703IHxupjzipvhu16qYKLMR03e+8WuNR+JMsKfGU=
github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= github.com/Microsoft/go-winio v0.6.2-0.20230724192519-b29bbd58a65a/go.mod h1:OZqLNXdYJHmx7aqq/T6wAdFEdoGm5nmIfC4kU7M8P8o=
github.com/Mrs4s/MiraiGo v0.0.0-20230317162854-fd83d24f6794 h1:V2hkbdJhTGX6tfwEsCg53rUCx/skTGBfwRMHB5/hy7E= github.com/Mrs4s/MiraiGo v0.0.0-20230823050531-a8213e127b2b h1:0GG6kDFgzie0HNdlkrgPwyX4WqUjckTP1xTM4cYaC2g=
github.com/Mrs4s/MiraiGo v0.0.0-20230317162854-fd83d24f6794/go.mod h1:mU3fBFU+7eO0kaGes7YRKtzIDtwIU84nSSwTV7NK2b0= github.com/Mrs4s/MiraiGo v0.0.0-20230823050531-a8213e127b2b/go.mod h1:mU3fBFU+7eO0kaGes7YRKtzIDtwIU84nSSwTV7NK2b0=
github.com/RomiChan/protobuf v0.1.1-0.20230204044148-2ed269a2e54d h1:/Xuj3fIiMY2ls1TwvPKmaqQrtJsPY+c9s+0lOScVHd8= github.com/RomiChan/protobuf v0.1.1-0.20230204044148-2ed269a2e54d h1:/Xuj3fIiMY2ls1TwvPKmaqQrtJsPY+c9s+0lOScVHd8=
github.com/RomiChan/protobuf v0.1.1-0.20230204044148-2ed269a2e54d/go.mod h1:2Ie+hdBFQpQFDHfeklgxoFmQRCE7O+KwFpISeXq7OwA= github.com/RomiChan/protobuf v0.1.1-0.20230204044148-2ed269a2e54d/go.mod h1:2Ie+hdBFQpQFDHfeklgxoFmQRCE7O+KwFpISeXq7OwA=
github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e h1:wR3MXQ3VbUlPKOOUwLOYgh/QaJThBTYtsl673O3lqSA= github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e h1:wR3MXQ3VbUlPKOOUwLOYgh/QaJThBTYtsl673O3lqSA=
github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w= github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w=
github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc h1:AAx50/fb/xS4lvsdQg+bFbGvqSDhyV1MF+p2PLCamZ0= github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5 h1:bBmmB7he0iVN4m5mcehfheeRUEer/Avo4ujnxI3uCqs=
github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc/go.mod h1:OMmITAib6POA37xCichWM0aRnoVpSMZO1rB/G01wrr0= github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5/go.mod h1:0UcFaCkhp6vZw6l5Dpq0Dp673CoF9GdvA8lTfst0GiU=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
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 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 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fumiama/go-base16384 v1.7.0 h1:6fep7XPQWxRlh4Hu+KsdH+6+YdUp+w6CwRXtMWSsXCA=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fumiama/go-base16384 v1.7.0/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
github.com/fumiama/go-base16384 v1.6.1 h1:4yb4JgmBJDnQtq3XGXXdLrVwEnRpjhMUt4eAcsNeA30=
github.com/fumiama/go-base16384 v1.6.1/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
github.com/fumiama/go-hide-param v0.1.4 h1:y7TRTzZMdCH9GOXnIzU3B+1BSkcmvejVGmGsz4t0DGU= github.com/fumiama/go-hide-param v0.1.4 h1:y7TRTzZMdCH9GOXnIzU3B+1BSkcmvejVGmGsz4t0DGU=
github.com/fumiama/go-hide-param v0.1.4/go.mod h1:vJkQlJIEI56nIyp7tCQu1/2QOyKtZpudsnJkGk9U1aY= github.com/fumiama/go-hide-param v0.1.4/go.mod h1:vJkQlJIEI56nIyp7tCQu1/2QOyKtZpudsnJkGk9U1aY=
github.com/fumiama/imgsz v0.0.2 h1:fAkC0FnIscdKOXwAxlyw3EUba5NzxZdSxGaq3Uyfxak= github.com/fumiama/imgsz v0.0.2 h1:fAkC0FnIscdKOXwAxlyw3EUba5NzxZdSxGaq3Uyfxak=
github.com/fumiama/imgsz v0.0.2/go.mod h1:dR71mI3I2O5u6+PCpd47M9TZptzP+39tRBcbdIkoqM4= github.com/fumiama/imgsz v0.0.2/go.mod h1:dR71mI3I2O5u6+PCpd47M9TZptzP+39tRBcbdIkoqM4=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
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/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
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.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/jonboulle/clockwork v0.3.0 h1:9BSCMi8C+0qdApAp4auwX0RkLGUjs956h0EkuQymUhg= github.com/jonboulle/clockwork v0.3.0 h1:9BSCMi8C+0qdApAp4auwX0RkLGUjs956h0EkuQymUhg=
github.com/jonboulle/clockwork v0.3.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/jonboulle/clockwork v0.3.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
@ -50,11 +42,10 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNU
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc= github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8= 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.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4= github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4=
@ -69,17 +60,14 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI= github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0=
github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0= github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0=
github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
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 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@ -87,126 +75,115 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
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.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
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.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM= github.com/tidwall/gjson v1.15.0 h1:5n/pM+v3r5ujuNl4YLZLsQ+UE5jlkLVm7jMzT5Mpolw=
github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.15.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60 h1:lRKf10iIOW0VsH5WDF621ihzR+R2wEBZVtNRHuLLCb4= github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60 h1:lRKf10iIOW0VsH5WDF621ihzR+R2wEBZVtNRHuLLCb4=
github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60/go.mod h1:ecFKZPX81BaB70I6ruUgEwYcDOtuNgJGnjdK+MIl5ko= github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60/go.mod h1:ecFKZPX81BaB70I6ruUgEwYcDOtuNgJGnjdK+MIl5ko=
github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E= github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs= github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
go.mongodb.org/mongo-driver v1.11.0 h1:FZKhBSTydeuffHj9CBjXlR8vQLee1cQyTWYPA6/tqiE= go.mongodb.org/mongo-driver v1.12.0 h1:aPx33jmn/rQuJXPQLZQ8NtfPQG8CaqgLThFtqRb0PiE=
go.mongodb.org/mongo-driver v1.11.0/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8= go.mongodb.org/mongo-driver v1.12.0/go.mod h1:AZkxhPnFJUoH7kZlFkVKucV20K387miPfm7oimrSmK0=
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-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI= golang.org/x/image v0.10.0 h1:gXjUUtwtx5yOE0VKWq1CH4IJAClq4UGgUA3i+rpON9M=
golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4= golang.org/x/image v0.10.0/go.mod h1:jtrku+n79PfroUbvDdeUWMAI+heR786BofxrbiSF+J0=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/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-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
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-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/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/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-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/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-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
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.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/time v0.2.0 h1:52I/1L54xyEQAYdtcSuxtiT84KGYTBGXwayxmIpNJhE= golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/time v0.2.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
golang.org/x/time v0.3.0/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-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8=
golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
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=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
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.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
gopkg.ilharper.com/x/isatty v1.1.1 h1:RAg32Pxq/nIK4AVtdm9RBqxsxZZX1uRKRSS21E5SHMk= gopkg.ilharper.com/x/isatty v1.1.1 h1:RAg32Pxq/nIK4AVtdm9RBqxsxZZX1uRKRSS21E5SHMk=
gopkg.ilharper.com/x/isatty v1.1.1/go.mod h1:ofpv77Td5qQO6R1dmDd3oNt8TZdRo+l5gYAMxopRyS0= gopkg.ilharper.com/x/isatty v1.1.1/go.mod h1:ofpv77Td5qQO6R1dmDd3oNt8TZdRo+l5gYAMxopRyS0=
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/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= 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 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

View File

@ -23,21 +23,25 @@ var (
// config file flags // config file flags
var ( var (
Debug bool // 是否开启 debug 模式 Debug bool // 是否开启 debug 模式
RemoveReplyAt bool // 是否删除reply后的at RemoveReplyAt bool // 是否删除reply后的at
ExtraReplyData bool // 是否上报额外reply信息 ExtraReplyData bool // 是否上报额外reply信息
IgnoreInvalidCQCode bool // 是否忽略无效CQ码 IgnoreInvalidCQCode bool // 是否忽略无效CQ码
SplitURL bool // 是否分割URL SplitURL bool // 是否分割URL
ForceFragmented bool // 是否启用强制分片 ForceFragmented bool // 是否启用强制分片
SkipMimeScan bool // 是否跳过Mime扫描 SkipMimeScan bool // 是否跳过Mime扫描
ConvertWebpImage bool // 是否转换Webp图片 ConvertWebpImage bool // 是否转换Webp图片
ReportSelfMessage bool // 是否上报自身消息 ReportSelfMessage bool // 是否上报自身消息
UseSSOAddress bool // 是否使用服务器下发的新地址进行重连 UseSSOAddress bool // 是否使用服务器下发的新地址进行重连
LogForceNew bool // 是否在每次启动时强制创建全新的文件储存日志 LogForceNew bool // 是否在每次启动时强制创建全新的文件储存日志
LogColorful bool // 是否启用日志颜色 LogColorful bool // 是否启用日志颜色
FastStart bool // 是否为快速启动 FastStart bool // 是否为快速启动
AllowTempSession bool // 是否允许发送临时会话信息 AllowTempSession bool // 是否允许发送临时会话信息
SignServerOverwrite string // 使用特定的服务器进行签名 UpdateProtocol bool // 是否更新协议
SignServers []config.SignServer // 使用特定的服务器进行签名
IsBelow110 bool // 签名服务器版本是否低于1.1.0及以下
HTTPTimeout int // download 超时时间
SignServerTimeout int // 签名服务器超时时间
PostFormat string // 上报格式 string or array PostFormat string // 上报格式 string or array
Proxy string // 存储 proxy_rewrite,用于设置代理 Proxy string // 存储 proxy_rewrite,用于设置代理
@ -61,7 +65,7 @@ func Parse() {
flag.StringVar(&LittleWD, "w", "", "cover the working directory") flag.StringVar(&LittleWD, "w", "", "cover the working directory")
d := flag.Bool("D", false, "debug mode") d := flag.Bool("D", false, "debug mode")
flag.BoolVar(&FastStart, "faststart", false, "skip waiting 5 seconds") flag.BoolVar(&FastStart, "faststart", false, "skip waiting 5 seconds")
flag.StringVar(&SignServerOverwrite, "sign-server", "", "use special server to sign tlv") flag.BoolVar(&UpdateProtocol, "update-protocol", false, "update protocol")
flag.Parse() flag.Parse()
if *d { if *d {
@ -86,6 +90,10 @@ func Init() {
ReportSelfMessage = conf.Message.ReportSelfMessage ReportSelfMessage = conf.Message.ReportSelfMessage
UseSSOAddress = conf.Account.UseSSOAddress UseSSOAddress = conf.Account.UseSSOAddress
AllowTempSession = conf.Account.AllowTempSession AllowTempSession = conf.Account.AllowTempSession
SignServers = conf.Account.SignServers
IsBelow110 = conf.Account.IsBelow110
HTTPTimeout = conf.Message.HTTPTimeout
SignServerTimeout = int(conf.Account.SignServerTimeout)
} }
{ // others { // others
Proxy = conf.Message.ProxyRewrite Proxy = conf.Message.ProxyRewrite

View File

@ -4,6 +4,7 @@ package download
import ( import (
"bufio" "bufio"
"compress/gzip" "compress/gzip"
"crypto/tls"
"fmt" "fmt"
"io" "io"
"net/http" "net/http"
@ -14,26 +15,45 @@ import (
"sync" "sync"
"time" "time"
"github.com/RomiChan/syncx"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
"github.com/Mrs4s/go-cqhttp/internal/base" "github.com/Mrs4s/go-cqhttp/internal/base"
) )
var client = &http.Client{ var client = newClient(time.Second * 15)
var clients syncx.Map[time.Duration, *http.Client]
var clienth2 = &http.Client{
Transport: &http.Transport{ Transport: &http.Transport{
Proxy: func(request *http.Request) (u *url.URL, e error) { Proxy: func(request *http.Request) (*url.URL, error) {
if base.Proxy == "" { if base.Proxy == "" {
return http.ProxyFromEnvironment(request) return http.ProxyFromEnvironment(request)
} }
return url.Parse(base.Proxy) return url.Parse(base.Proxy)
}, },
ForceAttemptHTTP2: false, ForceAttemptHTTP2: true,
MaxConnsPerHost: 0,
MaxIdleConns: 0,
MaxIdleConnsPerHost: 999, MaxIdleConnsPerHost: 999,
}, },
Timeout: time.Second * 5, Timeout: time.Second * 15,
}
func newClient(t time.Duration) *http.Client {
return &http.Client{
Transport: &http.Transport{
Proxy: func(request *http.Request) (*url.URL, error) {
if base.Proxy == "" {
return http.ProxyFromEnvironment(request)
}
return url.Parse(base.Proxy)
},
// Disable http2
TLSNextProto: map[string]func(authority string, c *tls.Conn) http.RoundTripper{},
MaxIdleConnsPerHost: 999,
},
Timeout: t,
}
} }
// ErrOverSize 响应主体过大时返回此错误 // ErrOverSize 响应主体过大时返回此错误
@ -42,13 +62,45 @@ var ErrOverSize = errors.New("oversize")
// UserAgent HTTP请求时使用的UA // UserAgent HTTP请求时使用的UA
const 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" const 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"
// WithTimeout get a download instance with timeout t
func (r Request) WithTimeout(t time.Duration) *Request {
if c, ok := clients.Load(t); ok {
r.custcli = c
} else {
c := newClient(t)
clients.Store(t, c)
r.custcli = c
}
return &r
}
// SetTimeout set internal/download client timeout
func SetTimeout(t time.Duration) {
if t == 0 {
t = time.Second * 10
}
client.Timeout = t
clienth2.Timeout = t
}
// Request is a file download request // Request is a file download request
type Request struct { type Request struct {
Method string Method string
URL string URL string
Header map[string]string Header map[string]string
Limit int64 Limit int64
Body io.Reader Body io.Reader
custcli *http.Client
}
func (r Request) client() *http.Client {
if r.custcli != nil {
return r.custcli
}
if strings.Contains(r.URL, "go-cqhttp.org") {
return clienth2
}
return client
} }
func (r Request) do() (*http.Response, error) { func (r Request) do() (*http.Response, error) {
@ -65,7 +117,7 @@ func (r Request) do() (*http.Response, error) {
req.Header.Set(k, v) req.Header.Set(k, v)
} }
return client.Do(req) return r.client().Do(req)
} }
func (r Request) body() (io.ReadCloser, error) { func (r Request) body() (io.ReadCloser, error) {
@ -93,6 +145,7 @@ func (r Request) Bytes() ([]byte, error) {
return nil, err return nil, err
} }
defer rd.Close() defer rd.Close()
defer r.client().CloseIdleConnections()
return io.ReadAll(rd) return io.ReadAll(rd)
} }
@ -103,6 +156,7 @@ func (r Request) JSON() (gjson.Result, error) {
return gjson.Result{}, err return gjson.Result{}, err
} }
defer rd.Close() defer rd.Close()
defer r.client().CloseIdleConnections()
var sb strings.Builder var sb strings.Builder
_, err = io.Copy(&sb, rd) _, err = io.Copy(&sb, rd)
@ -130,6 +184,7 @@ func (r Request) WriteToFile(path string) error {
return err return err
} }
defer rd.Close() defer rd.Close()
defer r.client().CloseIdleConnections()
return writeToFile(rd, path) return writeToFile(rd, path)
} }
@ -139,6 +194,7 @@ func (r Request) WriteToFileMultiThreading(path string, thread int) error {
return r.WriteToFile(path) return r.WriteToFile(path)
} }
defer r.client().CloseIdleConnections()
limit := r.Limit limit := r.Limit
type BlockMetaData struct { type BlockMetaData struct {
BeginOffset int64 BeginOffset int64

View File

@ -10,7 +10,7 @@ import (
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )
func TestParseString(t *testing.T) { func TestParseString(_ *testing.T) {
// TODO: add more text // TODO: add more text
for _, v := range ParseString(`[CQ:face,id=115,text=111][CQ:face,id=217]] [CQ:text,text=123] [`) { for _, v := range ParseString(`[CQ:face,id=115,text=111][CQ:face,id=217]] [CQ:text,text=123] [`) {
fmt.Println(v) fmt.Println(v)

View File

@ -28,14 +28,28 @@ type Reconnect struct {
// Account 账号配置 // Account 账号配置
type Account struct { type Account struct {
Uin int64 `yaml:"uin"` Uin int64 `yaml:"uin"`
Password string `yaml:"password"` Password string `yaml:"password"`
Encrypt bool `yaml:"encrypt"` Encrypt bool `yaml:"encrypt"`
Status int `yaml:"status"` Status int `yaml:"status"`
ReLogin *Reconnect `yaml:"relogin"` ReLogin *Reconnect `yaml:"relogin"`
UseSSOAddress bool `yaml:"use-sso-address"` UseSSOAddress bool `yaml:"use-sso-address"`
AllowTempSession bool `yaml:"allow-temp-session"` AllowTempSession bool `yaml:"allow-temp-session"`
DisableProtocolUpdate bool `yaml:"disable-protocol-update"` SignServers []SignServer `yaml:"sign-servers"`
RuleChangeSignServer int `yaml:"rule-change-sign-server"`
MaxCheckCount uint `yaml:"max-check-count"`
SignServerTimeout uint `yaml:"sign-server-timeout"`
IsBelow110 bool `yaml:"is-below-110"`
AutoRegister bool `yaml:"auto-register"`
AutoRefreshToken bool `yaml:"auto-refresh-token"`
RefreshInterval int64 `yaml:"refresh-interval"`
}
// SignServer 签名服务器
type SignServer struct {
URL string `yaml:"url"`
Key string `yaml:"key"`
Authorization string `yaml:"authorization"`
} }
// Config 总配置文件 // Config 总配置文件
@ -57,6 +71,7 @@ type Config struct {
ExtraReplyData bool `yaml:"extra-reply-data"` ExtraReplyData bool `yaml:"extra-reply-data"`
SkipMimeScan bool `yaml:"skip-mime-scan"` SkipMimeScan bool `yaml:"skip-mime-scan"`
ConvertWebpImage bool `yaml:"convert-webp-image"` ConvertWebpImage bool `yaml:"convert-webp-image"`
HTTPTimeout int `yaml:"http-timeout"`
} `yaml:"message"` } `yaml:"message"`
Output struct { Output struct {

View File

@ -15,8 +15,57 @@ account: # 账号相关
use-sso-address: true use-sso-address: true
# 是否允许发送临时会话消息 # 是否允许发送临时会话消息
allow-temp-session: false allow-temp-session: false
# 是否禁用协议更新
disable-protocol-update: false # 数据包的签名服务器列表,第一个作为主签名服务器,后续作为备用
# 兼容 https://github.com/fuqiuluo/unidbg-fetch-qsign
# 如果遇到 登录 45 错误, 或者发送信息风控的话需要填入一个或多个服务器
# 不建议设置过多,设置主备各一个即可,超过 5 个只会取前五个
# 示例:
# sign-servers:
# - url: 'http://127.0.0.1:8080' # 本地签名服务器
# key: "114514" # 相应 key
# authorization: "-" # authorization 内容, 依服务端设置
# - url: 'https://signserver.example.com' # 线上签名服务器
# key: "114514"
# authorization: "-"
# ...
#
# 服务器可使用docker在本地搭建或者使用他人开放的服务
sign-servers:
- url: '-' # 主签名服务器地址, 必填
key: '114514' # 签名服务器所需要的apikey, 如果签名服务器的版本在1.1.0及以下则此项无效
authorization: '-' # authorization 内容, 依服务端设置,如 'Bearer xxxx'
- url: '-' # 备用
key: '114514'
authorization: '-'
# 判断签名服务不可用(需要切换)的额外规则
# 0: 不设置 (此时仅在请求无法返回结果时判定为不可用)
# 1: 在获取到的 sign 为空 (若选此建议关闭 auto-register一般为实例未注册但是请求签名的情况
# 2: 在获取到的 sign 或 token 为空(若选此建议关闭 auto-refresh-token
rule-change-sign-server: 1
# 连续寻找可用签名服务器最大尝试次数
# 为 0 时会在连续 3 次没有找到可用签名服务器后保持使用主签名服务器,不再尝试进行切换备用
# 否则会在达到指定次数后 **退出** 主程序
max-check-count: 0
# 签名服务请求超时时间(s)
sign-server-timeout: 60
# 如果签名服务器的版本在1.1.0及以下, 请将下面的参数改成true
# 建议使用 1.1.6 以上版本,低版本普遍半个月冻结一次
is-below-110: false
# 在实例可能丢失(获取到的签名为空)时是否尝试重新注册
# 为 true 时,在签名服务不可用时可能每次发消息都会尝试重新注册并签名。
# 为 false 时,将不会自动注册实例,在签名服务器重启或实例被销毁后需要重启 go-cqhttp 以获取实例
# 否则后续消息将不会正常签名。关闭此项后可以考虑开启签名服务器端 auto_register 避免需要重启
# 由于实现问题,当前建议关闭此项,推荐开启签名服务器的自动注册实例
auto-register: false
# 是否在 token 过期后立即自动刷新签名 token在需要签名时才会检测到主要防止 token 意外丢失)
# 独立于定时刷新
auto-refresh-token: false
# 定时刷新 token 间隔时间,单位为分钟, 建议 30~40 分钟, 不可超过 60 分钟
# 目前丢失token也不会有太大影响可设置为 0 以关闭,推荐开启
refresh-interval: 40
heartbeat: heartbeat:
# 心跳频率, 单位秒 # 心跳频率, 单位秒
@ -47,6 +96,8 @@ message:
skip-mime-scan: false skip-mime-scan: false
# 是否自动转换 WebP 图片 # 是否自动转换 WebP 图片
convert-webp-image: false convert-webp-image: false
# download 超时时间(s)
http-timeout: 15
output: output:
# 日志等级 trace,debug,info,warn,error # 日志等级 trace,debug,info,warn,error

View File

@ -32,6 +32,9 @@ func encode(record []byte, tempName string) (silkWav []byte, err error) {
// 2.转换pcm // 2.转换pcm
pcmPath := path.Join(silkCachePath, tempName+".pcm") pcmPath := path.Join(silkCachePath, tempName+".pcm")
cmd := exec.Command("ffmpeg", "-i", rawPath, "-f", "s16le", "-ar", "24000", "-ac", "1", pcmPath) cmd := exec.Command("ffmpeg", "-i", rawPath, "-f", "s16le", "-ar", "24000", "-ac", "1", pcmPath)
if errors.Is(cmd.Err, exec.ErrDot) {
cmd.Err = nil
}
if base.Debug { if base.Debug {
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr

78
pkg/onebot/attr.go Normal file
View File

@ -0,0 +1,78 @@
// Copyright 2022 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package onebot
import (
"time"
)
// An Attr is a key-value pair.
type Attr struct {
Key string
Value Value
}
// String returns an Attr for a string value.
func String(key, value string) Attr {
return Attr{key, StringValue(value)}
}
// Int64 returns an Attr for an int64.
func Int64(key string, value int64) Attr {
return Attr{key, Int64Value(value)}
}
// Int converts an int to an int64 and returns
// an Attr with that value.
func Int(key string, value int) Attr {
return Int64(key, int64(value))
}
// Uint64 returns an Attr for a uint64.
func Uint64(key string, v uint64) Attr {
return Attr{key, Uint64Value(v)}
}
// Float64 returns an Attr for a floating-point number.
func Float64(key string, v float64) Attr {
return Attr{key, Float64Value(v)}
}
// Bool returns an Attr for a bool.
func Bool(key string, v bool) Attr {
return Attr{key, BoolValue(v)}
}
// Time returns an Attr for a time.Time.
// It discards the monotonic portion.
func Time(key string, v time.Time) Attr {
return Attr{key, TimeValue(v)}
}
// Duration returns an Attr for a time.Duration.
func Duration(key string, v time.Duration) Attr {
return Attr{key, DurationValue(v)}
}
// Group returns an Attr for a Group Value.
// The caller must not subsequently mutate the
// argument slice.
//
// Use Group to collect several Attrs under a single
// key on a log line, or as the result of LogValue
// in order to log a single value as multiple Attrs.
func Group(key string, as ...Attr) Attr {
return Attr{key, GroupValue(as...)}
}
// Any returns an Attr for the supplied value.
// See [Value.AnyValue] for how values are treated.
func Any(key string, value any) Attr {
return Attr{key, AnyValue(value)}
}
func (a Attr) String() string {
return a.Key + "=" + a.Value.String()
}

31
pkg/onebot/kind_string.go Normal file
View File

@ -0,0 +1,31 @@
// Code generated by "stringer -type=Kind -trimprefix=Kind"; DO NOT EDIT.
package onebot
import "strconv"
func _() {
// An "invalid array index" compiler error signifies that the constant values have changed.
// Re-run the stringer command to generate them again.
var x [1]struct{}
_ = x[KindAny-0]
_ = x[KindBool-1]
_ = x[KindDuration-2]
_ = x[KindFloat64-3]
_ = x[KindInt64-4]
_ = x[KindString-5]
_ = x[KindTime-6]
_ = x[KindUint64-7]
_ = x[KindGroup-8]
}
const _Kind_name = "AnyBoolDurationFloat64Int64StringTimeUint64Group"
var _Kind_index = [...]uint8{0, 3, 7, 15, 22, 27, 33, 37, 43, 48}
func (i Kind) String() string {
if i < 0 || i >= Kind(len(_Kind_index)-1) {
return "Kind(" + strconv.FormatInt(int64(i), 10) + ")"
}
return _Kind_name[_Kind_index[i]:_Kind_index[i+1]]
}

355
pkg/onebot/value.go Normal file
View File

@ -0,0 +1,355 @@
// Copyright 2022 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package onebot
import (
"fmt"
"math"
"strconv"
"time"
"unsafe"
)
// A Value can represent any Go value, but unlike type any,
// it can represent most small values without an allocation.
// The zero Value corresponds to nil.
type Value struct {
_ [0]func() // disallow ==
num uint64 // hold number value
any any // hold Kind or other value
}
type (
stringptr *byte // used in Value.any when the Value is a string
groupptr *Attr // used in Value.any when the Value is a []Attr
)
//go:generate stringer -type=Kind -trimprefix=Kind
// Kind is the kind of Value.
type Kind int
// Kind
const (
KindAny Kind = iota
KindBool
KindDuration
KindFloat64
KindInt64
KindString
KindTime
KindUint64
KindGroup
)
// Unexported version of Kind, just so we can store Kinds in Values.
// (No user-provided value has this type.)
type kind Kind
// Kind returns v's Kind.
func (v Value) Kind() Kind {
switch x := v.any.(type) {
case Kind:
return x
case stringptr:
return KindString
case timeLocation:
return KindTime
case groupptr:
return KindGroup
case kind: // a kind is just a wrapper for a Kind
return KindAny
default:
return KindAny
}
}
//////////////// Constructors
// StringValue returns a new Value for a string.
func StringValue(value string) Value {
return Value{num: uint64(len(value)), any: stringptr(unsafe.StringData(value))}
}
// IntValue returns a Value for an int.
func IntValue(v int) Value {
return Int64Value(int64(v))
}
// Int64Value returns a Value for an int64.
func Int64Value(v int64) Value {
return Value{num: uint64(v), any: KindInt64}
}
// Uint64Value returns a Value for a uint64.
func Uint64Value(v uint64) Value {
return Value{num: v, any: KindUint64}
}
// Float64Value returns a Value for a floating-point number.
func Float64Value(v float64) Value {
return Value{num: math.Float64bits(v), any: KindFloat64}
}
// BoolValue returns a Value for a bool.
func BoolValue(v bool) Value {
u := uint64(0)
if v {
u = 1
}
return Value{num: u, any: KindBool}
}
// Unexported version of *time.Location, just so we can store *time.Locations in
// Values. (No user-provided value has this type.)
type timeLocation *time.Location
// TimeValue returns a Value for a time.Time.
// It discards the monotonic portion.
func TimeValue(v time.Time) Value {
if v.IsZero() {
// UnixNano on the zero time is undefined, so represent the zero time
// with a nil *time.Location instead. time.Time.Location method never
// returns nil, so a Value with any == timeLocation(nil) cannot be
// mistaken for any other Value, time.Time or otherwise.
return Value{any: timeLocation(nil)}
}
return Value{num: uint64(v.UnixNano()), any: timeLocation(v.Location())}
}
// DurationValue returns a Value for a time.Duration.
func DurationValue(v time.Duration) Value {
return Value{num: uint64(v.Nanoseconds()), any: KindDuration}
}
// GroupValue returns a new Value for a list of Attrs.
// The caller must not subsequently mutate the argument slice.
func GroupValue(as ...Attr) Value {
return Value{num: uint64(len(as)), any: groupptr(unsafe.SliceData(as))}
}
// AnyValue returns a Value for the supplied value.
//
// If the supplied value is of type Value, it is returned
// unmodified.
//
// Given a value of one of Go's predeclared string, bool, or
// (non-complex) numeric types, AnyValue returns a Value of kind
// String, Bool, Uint64, Int64, or Float64. The width of the
// original numeric type is not preserved.
//
// Given a time.Time or time.Duration value, AnyValue returns a Value of kind
// KindTime or KindDuration. The monotonic time is not preserved.
//
// For nil, or values of all other types, including named types whose
// underlying type is numeric, AnyValue returns a value of kind KindAny.
func AnyValue(v any) Value {
switch v := v.(type) {
case string:
return StringValue(v)
case int:
return Int64Value(int64(v))
case uint:
return Uint64Value(uint64(v))
case int64:
return Int64Value(v)
case uint64:
return Uint64Value(v)
case bool:
return BoolValue(v)
case time.Duration:
return DurationValue(v)
case time.Time:
return TimeValue(v)
case uint8:
return Uint64Value(uint64(v))
case uint16:
return Uint64Value(uint64(v))
case uint32:
return Uint64Value(uint64(v))
case uintptr:
return Uint64Value(uint64(v))
case int8:
return Int64Value(int64(v))
case int16:
return Int64Value(int64(v))
case int32:
return Int64Value(int64(v))
case float64:
return Float64Value(v)
case float32:
return Float64Value(float64(v))
case []Attr:
return GroupValue(v...)
case Kind:
return Value{any: kind(v)}
case Value:
return v
default:
return Value{any: v}
}
}
//////////////// Accessors
// Any returns v's value as an any.
func (v Value) Any() any {
switch v.Kind() {
case KindAny:
if k, ok := v.any.(kind); ok {
return Kind(k)
}
return v.any
case KindGroup:
return v.group()
case KindInt64:
return int64(v.num)
case KindUint64:
return v.num
case KindFloat64:
return v.float()
case KindString:
return v.str()
case KindBool:
return v.bool()
case KindDuration:
return v.duration()
case KindTime:
return v.time()
default:
panic(fmt.Sprintf("bad kind: %s", v.Kind()))
}
}
// String returns Value's value as a string, formatted like fmt.Sprint. Unlike
// the methods Int64, Float64, and so on, which panic if v is of the
// wrong kind, String never panics.
func (v Value) String() string {
if sp, ok := v.any.(stringptr); ok {
return unsafe.String(sp, v.num)
}
var buf []byte
return string(v.append(buf))
}
func (v Value) str() string {
return unsafe.String(v.any.(stringptr), v.num)
}
// Int64 returns v's value as an int64. It panics
// if v is not a signed integer.
func (v Value) Int64() int64 {
if g, w := v.Kind(), KindInt64; g != w {
panic(fmt.Sprintf("Value kind is %s, not %s", g, w))
}
return int64(v.num)
}
// Uint64 returns v's value as a uint64. It panics
// if v is not an unsigned integer.
func (v Value) Uint64() uint64 {
if g, w := v.Kind(), KindUint64; g != w {
panic(fmt.Sprintf("Value kind is %s, not %s", g, w))
}
return v.num
}
// Bool returns v's value as a bool. It panics
// if v is not a bool.
func (v Value) Bool() bool {
if g, w := v.Kind(), KindBool; g != w {
panic(fmt.Sprintf("Value kind is %s, not %s", g, w))
}
return v.bool()
}
func (v Value) bool() bool {
return v.num == 1
}
// Duration returns v's value as a time.Duration. It panics
// if v is not a time.Duration.
func (v Value) Duration() time.Duration {
if g, w := v.Kind(), KindDuration; g != w {
panic(fmt.Sprintf("Value kind is %s, not %s", g, w))
}
return v.duration()
}
func (v Value) duration() time.Duration {
return time.Duration(int64(v.num))
}
// Float64 returns v's value as a float64. It panics
// if v is not a float64.
func (v Value) Float64() float64 {
if g, w := v.Kind(), KindFloat64; g != w {
panic(fmt.Sprintf("Value kind is %s, not %s", g, w))
}
return v.float()
}
func (v Value) float() float64 {
return math.Float64frombits(v.num)
}
// Time returns v's value as a time.Time. It panics
// if v is not a time.Time.
func (v Value) Time() time.Time {
if g, w := v.Kind(), KindTime; g != w {
panic(fmt.Sprintf("Value kind is %s, not %s", g, w))
}
return v.time()
}
func (v Value) time() time.Time {
loc := v.any.(timeLocation)
if loc == nil {
return time.Time{}
}
return time.Unix(0, int64(v.num)).In(loc)
}
// Group returns v's value as a []Attr.
// It panics if v's Kind is not KindGroup.
func (v Value) Group() []Attr {
if sp, ok := v.any.(groupptr); ok {
return unsafe.Slice(sp, v.num)
}
panic("Group: bad kind")
}
func (v Value) group() []Attr {
return unsafe.Slice((*Attr)(v.any.(groupptr)), v.num)
}
// append appends a text representation of v to dst.
// v is formatted as with fmt.Sprint.
func (v Value) append(dst []byte) []byte {
switch v.Kind() {
case KindString:
return append(dst, v.str()...)
case KindInt64:
return strconv.AppendInt(dst, int64(v.num), 10)
case KindUint64:
return strconv.AppendUint(dst, v.num, 10)
case KindFloat64:
return strconv.AppendFloat(dst, v.float(), 'g', -1, 64)
case KindBool:
return strconv.AppendBool(dst, v.bool())
case KindDuration:
return append(dst, v.duration().String()...)
case KindTime:
return append(dst, v.time().String()...)
case KindGroup:
return fmt.Append(dst, v.group())
case KindAny:
return fmt.Append(dst, v.any)
default:
panic(fmt.Sprintf("bad kind: %s", v.Kind()))
}
}

View File

@ -1,6 +1,8 @@
#!/bin/sh #!/usr/bin/env bash
echo "Start GOCQHTTP~~~" function index.main_handler() {
echo "Start GOCQHTTP~~~"
cp -f config.yml /tmp/config.yml cp -f config.yml /tmp/config.yml
cp -f device.json /tmp/device.json cp -f device.json /tmp/device.json
./go-cqhttp -w="/tmp/" faststart ./go-cqhttp -w="/tmp/" faststart
}
index.main_handler

View File

@ -71,7 +71,7 @@ func (c *wsConn) Close() error {
} }
var upgrader = websocket.Upgrader{ var upgrader = websocket.Upgrader{
CheckOrigin: func(r *http.Request) bool { CheckOrigin: func(_ *http.Request) bool {
return true return true
}, },
} }