mirror of
https://github.com/Mrs4s/go-cqhttp.git
synced 2025-06-30 11:53:25 +00:00
Compare commits
74 Commits
v0.9.29-fi
...
v0.9.31-fi
| Author | SHA1 | Date | |
|---|---|---|---|
| 8f76558317 | |||
| d94d389843 | |||
| df0d5af07a | |||
| 277629e784 | |||
| d66a99c5a3 | |||
| 55895e0de1 | |||
| 39da163641 | |||
| 1dbd72c138 | |||
| 31756e9e1d | |||
| 5ab713e7d3 | |||
| b6eb559172 | |||
| da2e34aaa5 | |||
| beb1a2883a | |||
| 8f34003c6f | |||
| 7f3e58f97a | |||
| 0fc004077b | |||
| e9a03b68b5 | |||
| e9b39f3379 | |||
| e053da62e1 | |||
| f87b5c8215 | |||
| 28f1594539 | |||
| 990e7744a3 | |||
| 8900839018 | |||
| 4a3288cb8d | |||
| 0f0f74ece8 | |||
| 79ba9474a3 | |||
| cb9d872071 | |||
| 4c3105fa24 | |||
| a8176e69e6 | |||
| afa356e551 | |||
| a52ae1c828 | |||
| b8ec05e1c1 | |||
| 2cbf23bceb | |||
| 3e5c2bc8e3 | |||
| 69a2360d02 | |||
| 5b0ede5346 | |||
| 80af002668 | |||
| b3152bb514 | |||
| 9a018e2a47 | |||
| 998b8cb146 | |||
| 7e3f94ad2e | |||
| f9dc22f2e5 | |||
| 0ce54ac21b | |||
| 06ac2fcb0c | |||
| 30f1f3199a | |||
| 535b4ee641 | |||
| 0ed6522535 | |||
| 3326660880 | |||
| 171aba527e | |||
| d2bdf47bf8 | |||
| 4c2b56457e | |||
| 8b5d63e02c | |||
| 7dd0001dc8 | |||
| 7f9e4e6a20 | |||
| f59ce1480e | |||
| c2c7b96f1b | |||
| c49c68891b | |||
| 5b394b7a78 | |||
| 0cc3d90581 | |||
| d906bbf0ff | |||
| e2d2461595 | |||
| 6bb1f1603e | |||
| 5e02883028 | |||
| 1f5c9acefb | |||
| 36b235871f | |||
| f675a70af3 | |||
| 26afca1555 | |||
| 76b793f119 | |||
| 491bd2276e | |||
| 3d81777ed1 | |||
| 7b1f0d72eb | |||
| a0219d76ea | |||
| f9c0b94af6 | |||
| 4c9f60da09 |
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -28,7 +28,7 @@ jobs:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
- name: Setup Go environment
|
||||
uses: actions/setup-go@v2.1.1
|
||||
uses: actions/setup-go@v2.1.3
|
||||
with:
|
||||
go-version: 1.15
|
||||
|
||||
|
||||
4
.github/workflows/release.yml
vendored
4
.github/workflows/release.yml
vendored
@ -20,8 +20,8 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Set RELEASE_VERSION env
|
||||
run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF:10}
|
||||
- uses: wangyoucao577/go-release-action@master
|
||||
run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
|
||||
- uses: pcrbot/go-release-action@master
|
||||
env:
|
||||
CGO_ENABLED: 0
|
||||
with:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM golang:1.14.7-alpine AS builder
|
||||
FROM golang:1.15.5-alpine AS builder
|
||||
|
||||
RUN go env -w GO111MODULE=auto \
|
||||
&& go env -w CGO_ENABLED=0 \
|
||||
|
||||
83
README.md
83
README.md
@ -46,33 +46,34 @@
|
||||
<summary>已实现API</summary>
|
||||
|
||||
##### 注意: 部分API实现与CQHTTP原版略有差异，请参考文档
|
||||
| API | 功能 |
|
||||
| ------------------------ | ------------------------------------------------------------ |
|
||||
| /get_login_info | [获取登录号信息](https://cqhttp.cc/docs/4.15/#/API?id=get_login_info-获取登录号信息) |
|
||||
| /get_friend_list | [获取好友列表](https://cqhttp.cc/docs/4.15/#/API?id=get_friend_list-获取好友列表) |
|
||||
| /get_group_list | [获取群列表](https://cqhttp.cc/docs/4.15/#/API?id=get_group_list-获取群列表) |
|
||||
| /get_group_info | [获取群信息](https://cqhttp.cc/docs/4.15/#/API?id=get_group_info-获取群信息) |
|
||||
| /get_group_member_list | [获取群成员列表](https://cqhttp.cc/docs/4.15/#/API?id=get_group_member_list-获取群成员列表) |
|
||||
| /get_group_member_info | [获取群成员信息](https://cqhttp.cc/docs/4.15/#/API?id=get_group_member_info-获取群成员信息) |
|
||||
| /send_msg | [发送消息](https://cqhttp.cc/docs/4.15/#/API?id=send_msg-发送消息) |
|
||||
| /send_group_msg | [发送群消息](https://cqhttp.cc/docs/4.15/#/API?id=send_group_msg-发送群消息) |
|
||||
| /send_private_msg | [发送私聊消息](https://cqhttp.cc/docs/4.15/#/API?id=send_private_msg-发送私聊消息) |
|
||||
| /delete_msg | [撤回信息](https://cqhttp.cc/docs/4.15/#/API?id=delete_msg-撤回消息) |
|
||||
| /set_friend_add_request | [处理加好友请求](https://cqhttp.cc/docs/4.15/#/API?id=set_friend_add_request-处理加好友请求) |
|
||||
| /set_group_add_request | [处理加群请求/邀请](https://cqhttp.cc/docs/4.15/#/API?id=set_group_add_request-处理加群请求／邀请) |
|
||||
| /set_group_card | [设置群名片(群备注)](https://cqhttp.cc/docs/4.15/#/API?id=set_group_card-设置群名片（群备注）) |
|
||||
| /set_group_special_title | [设置群组专属头衔](https://cqhttp.cc/docs/4.15/#/API?id=set_group_special_title-设置群组专属头衔) |
|
||||
| /set_group_kick | [群组T人](https://cqhttp.cc/docs/4.15/#/API?id=set_group_kick-群组踢人) |
|
||||
| /set_group_ban | [群组单人禁言](https://cqhttp.cc/docs/4.15/#/API?id=set_group_ban-群组单人禁言) |
|
||||
| /set_group_whole_ban | [群组全员禁言](https://cqhttp.cc/docs/4.15/#/API?id=set_group_whole_ban-群组全员禁言) |
|
||||
| /set_group_leave | [退出群组](https://cqhttp.cc/docs/4.15/#/API?id=set_group_leave-退出群组) |
|
||||
| /set_group_name | 设置群组名(拓展API) |
|
||||
| /get_image | 获取图片信息(拓展API) |
|
||||
| /get_group_msg | 获取群组消息(拓展API) |
|
||||
| /can_send_image | [检查是否可以发送图片](https://cqhttp.cc/docs/4.15/#/API?id=can_send_image-检查是否可以发送图片) |
|
||||
| /can_send_record | [检查是否可以发送语音](https://cqhttp.cc/docs/4.15/#/API?id=can_send_record-检查是否可以发送语音) |
|
||||
| /get_status | [获取插件运行状态](https://cqhttp.cc/docs/4.15/#/API?id=get_status-获取插件运行状态) |
|
||||
| /get_version_info | [获取 酷Q 及 CQHTTP插件的版本信息](https://cqhttp.cc/docs/4.15/#/API?id=get_version_info-获取-酷q-及-cqhttp-插件的版本信息) |
|
||||
| API | 功能 |
|
||||
| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
|
||||
| /get_login_info | [获取登录号信息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_login_info-%E8%8E%B7%E5%8F%96%E7%99%BB%E5%BD%95%E5%8F%B7%E4%BF%A1%E6%81%AF) |
|
||||
| /get_friend_list | [获取好友列表](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_friend_list-%E8%8E%B7%E5%8F%96%E5%A5%BD%E5%8F%8B%E5%88%97%E8%A1%A8) |
|
||||
| /get_group_list | [获取群列表](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%88%97%E8%A1%A8) |
|
||||
| /get_group_info | [获取群信息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E4%BF%A1%E6%81%AF) |
|
||||
| /get_group_member_list | [获取群成员列表](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8) |
|
||||
| /get_group_member_info | [获取群成员信息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E4%BF%A1%E6%81%AF) |
|
||||
| /send_msg | [发送消息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_msg-%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF) |
|
||||
| /send_group_msg | [发送群消息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_group_msg-%E5%8F%91%E9%80%81%E7%BE%A4%E6%B6%88%E6%81%AF) |
|
||||
| /send_private_msg | [发送私聊消息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_private_msg-%E5%8F%91%E9%80%81%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF) |
|
||||
| /delete_msg | [撤回信息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#delete_msg-%E6%92%A4%E5%9B%9E%E6%B6%88%E6%81%AF) |
|
||||
| /set_friend_add_request | [处理加好友请求](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_friend_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82) |
|
||||
| /set_group_add_request | [处理加群请求/邀请](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7) |
|
||||
| /set_group_card | [设置群名片(群备注)](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_card-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D%E7%89%87%E7%BE%A4%E5%A4%87%E6%B3%A8) |
|
||||
| /set_group_special_title | [设置群组专属头衔](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_special_title-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E7%BB%84%E4%B8%93%E5%B1%9E%E5%A4%B4%E8%A1%94) |
|
||||
| /set_group_kick | [群组T人](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_kick-%E7%BE%A4%E7%BB%84%E8%B8%A2%E4%BA%BA) |
|
||||
| /set_group_ban | [群组单人禁言](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_ban-%E7%BE%A4%E7%BB%84%E5%8D%95%E4%BA%BA%E7%A6%81%E8%A8%80) |
|
||||
| /set_group_whole_ban | [群组全员禁言](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_whole_ban-%E7%BE%A4%E7%BB%84%E5%85%A8%E5%91%98%E7%A6%81%E8%A8%80) |
|
||||
| /set_group_leave | [退出群组](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_leave-%E9%80%80%E5%87%BA%E7%BE%A4%E7%BB%84) |
|
||||
| /set_group_name | [设置群组名](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_name-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D) |
|
||||
| /set_restart | [重启go-cqhttp](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_restart-%E9%87%8D%E5%90%AF-onebot-%E5%AE%9E%E7%8E%B0) |
|
||||
| /get_image | [获取图片信息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_image-%E8%8E%B7%E5%8F%96%E5%9B%BE%E7%89%87) |
|
||||
| /get_msg | [获取消息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_msg-%E8%8E%B7%E5%8F%96%E6%B6%88%E6%81%AF) |
|
||||
| /can_send_image | [检查是否可以发送图片](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_image-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E5%9B%BE%E7%89%87) |
|
||||
| /can_send_record | [检查是否可以发送语音](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_record-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E8%AF%AD%E9%9F%B3) |
|
||||
| /get_status | [获取插件运行状态](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_status-%E8%8E%B7%E5%8F%96%E8%BF%90%E8%A1%8C%E7%8A%B6%E6%80%81) |
|
||||
| /get_version_info | [获取 酷Q 及 CQHTTP插件的版本信息](https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_version_info-%E8%8E%B7%E5%8F%96%E7%89%88%E6%9C%AC%E4%BF%A1%E6%81%AF) |
|
||||
|
||||
</details>
|
||||
|
||||
@ -80,20 +81,20 @@
|
||||
<summary>已实现Event</summary>
|
||||
|
||||
##### 注意: 部分Event数据与CQHTTP原版略有差异，请参考文档
|
||||
| Event |
|
||||
| ------------------------------------------------------------ |
|
||||
| [私聊信息](https://cqhttp.cc/docs/4.15/#/Post?id=私聊消息) |
|
||||
| [群消息](https://cqhttp.cc/docs/4.15/#/Post?id=群消息) |
|
||||
| [群消息撤回(拓展Event)](docs/cqhttp.md#群消息撤回) |
|
||||
| [好友消息撤回(拓展Event)](docs/cqhttp.md#好友消息撤回) |
|
||||
| [群内提示事件(拓展Event)(龙王等事件)](docs/cqhttp.md#群内戳一戳) |
|
||||
| [群管理员变动](https://cqhttp.cc/docs/4.15/#/Post?id=群管理员变动) |
|
||||
| [群成员减少](https://cqhttp.cc/docs/4.15/#/Post?id=群成员减少) |
|
||||
| [群成员增加](https://cqhttp.cc/docs/4.15/#/Post?id=群成员增加) |
|
||||
| [群禁言](https://cqhttp.cc/docs/4.15/#/Post?id=群禁言) |
|
||||
| [群文件上传](https://cqhttp.cc/docs/4.15/#/Post?id=群文件上传) |
|
||||
| [加好友请求](https://cqhttp.cc/docs/4.15/#/Post?id=加好友请求) |
|
||||
| [加群请求/邀请](https://cqhttp.cc/docs/4.15/#/Post?id=加群请求／邀请) |
|
||||
| Event |
|
||||
| ---------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| [私聊信息](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/message.md#%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF) |
|
||||
| [群消息](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/message.md#%E7%BE%A4%E6%B6%88%E6%81%AF) |
|
||||
| [群消息撤回(拓展Event)](docs/cqhttp.md#群消息撤回) |
|
||||
| [好友消息撤回(拓展Event)](docs/cqhttp.md#好友消息撤回) |
|
||||
| [群内提示事件(拓展Event)(龙王等事件)](docs/cqhttp.md#群内戳一戳) |
|
||||
| [群管理员变动](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%AE%A1%E7%90%86%E5%91%98%E5%8F%98%E5%8A%A8) |
|
||||
| [群成员减少](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%87%8F%E5%B0%91) |
|
||||
| [群成员增加](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%A2%9E%E5%8A%A0) |
|
||||
| [群禁言](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%A6%81%E8%A8%80) |
|
||||
| [群文件上传](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%96%87%E4%BB%B6%E4%B8%8A%E4%BC%A0) |
|
||||
| [加好友请求](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/request.md#%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82) |
|
||||
| [加群请求/邀请](https://github.com/howmanybots/onebot/blob/master/v11/specs/event/request.md#%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7) |
|
||||
|
||||
</details>
|
||||
|
||||
|
||||
58
coolq/api.go
58
coolq/api.go
@ -102,6 +102,59 @@ func (bot *CQBot) CQGetGroupMemberInfo(groupId, userId int64) MSG {
|
||||
return OK(convertGroupMemberInfo(groupId, member))
|
||||
}
|
||||
|
||||
func (bot *CQBot) CQGetGroupFileSystemInfo(groupId int64) MSG {
|
||||
fs, err := bot.Client.GetGroupFileSystem(groupId)
|
||||
if err != nil {
|
||||
log.Errorf("获取群 %v 文件系统信息失败: %v", groupId, err)
|
||||
return Failed(100)
|
||||
}
|
||||
return OK(fs)
|
||||
}
|
||||
|
||||
func (bot *CQBot) CQGetGroupRootFiles(groupId int64) MSG {
|
||||
fs, err := bot.Client.GetGroupFileSystem(groupId)
|
||||
if err != nil {
|
||||
log.Errorf("获取群 %v 文件系统信息失败: %v", groupId, err)
|
||||
return Failed(100)
|
||||
}
|
||||
files, folders, err := fs.Root()
|
||||
if err != nil {
|
||||
log.Errorf("获取群 %v 根目录文件失败: %v", groupId, err)
|
||||
return Failed(100)
|
||||
}
|
||||
return OK(MSG{
|
||||
"files": files,
|
||||
"folders": folders,
|
||||
})
|
||||
}
|
||||
|
||||
func (bot *CQBot) CQGetGroupFilesByFolderId(groupId int64, folderId string) MSG {
|
||||
fs, err := bot.Client.GetGroupFileSystem(groupId)
|
||||
if err != nil {
|
||||
log.Errorf("获取群 %v 文件系统信息失败: %v", groupId, err)
|
||||
return Failed(100)
|
||||
}
|
||||
files, folders, err := fs.GetFilesByFolder(folderId)
|
||||
if err != nil {
|
||||
log.Errorf("获取群 %v 根目录 %v 子文件失败: %v", groupId, folderId, err)
|
||||
return Failed(100)
|
||||
}
|
||||
return OK(MSG{
|
||||
"files": files,
|
||||
"folders": folders,
|
||||
})
|
||||
}
|
||||
|
||||
func (bot *CQBot) CQGetGroupFileUrl(groupId int64, fileId string, busId int32) MSG {
|
||||
url := bot.Client.GetGroupFileUrl(groupId, fileId, busId)
|
||||
if url == "" {
|
||||
return Failed(100)
|
||||
}
|
||||
return OK(MSG{
|
||||
"url": url,
|
||||
})
|
||||
}
|
||||
|
||||
func (bot *CQBot) CQGetWordSlices(content string) MSG {
|
||||
slices, err := bot.Client.GetWordSegmentation(content)
|
||||
if err != nil {
|
||||
@ -463,12 +516,11 @@ func (bot *CQBot) CQSetGroupAdmin(groupId, userId int64, enable bool) MSG {
|
||||
}
|
||||
|
||||
func (bot *CQBot) CQGetVipInfo(userId int64) MSG {
|
||||
msg := MSG{}
|
||||
vip, err := bot.Client.GetVipInfo(userId)
|
||||
if err != nil {
|
||||
return Failed(100)
|
||||
}
|
||||
msg = MSG{
|
||||
msg := MSG{
|
||||
"user_id": vip.Uin,
|
||||
"nickname": vip.Name,
|
||||
"level": vip.Level,
|
||||
@ -754,7 +806,7 @@ func (bot *CQBot) CQGetVersionInfo() MSG {
|
||||
"version": Version,
|
||||
"protocol": func() int {
|
||||
switch client.SystemDeviceInfo.Protocol {
|
||||
case client.AndroidPad:
|
||||
case client.IPad:
|
||||
return 0
|
||||
case client.AndroidPhone:
|
||||
return 1
|
||||
|
||||
16
coolq/bot.go
16
coolq/bot.go
@ -5,12 +5,13 @@ import (
|
||||
"encoding/gob"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"github.com/syndtr/goleveldb/leveldb"
|
||||
"hash/crc32"
|
||||
"path"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/syndtr/goleveldb/leveldb"
|
||||
|
||||
"github.com/Mrs4s/MiraiGo/binary"
|
||||
"github.com/Mrs4s/MiraiGo/client"
|
||||
"github.com/Mrs4s/MiraiGo/message"
|
||||
@ -42,7 +43,7 @@ func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot {
|
||||
p := path.Join("data", "leveldb")
|
||||
db, err := leveldb.OpenFile(p, nil)
|
||||
if err != nil {
|
||||
log.Fatalf("打开数据库失败, 如果频繁遇到此问题请清理 data/db 文件夹或关闭数据库功能。")
|
||||
log.Fatalf("打开数据库失败, 如果频繁遇到此问题请清理 data/leveldb 文件夹或关闭数据库功能。")
|
||||
}
|
||||
bot.db = db
|
||||
gob.Register(message.Sender{})
|
||||
@ -56,6 +57,7 @@ func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot {
|
||||
bot.Client.OnGroupMuted(bot.groupMutedEvent)
|
||||
bot.Client.OnGroupMessageRecalled(bot.groupRecallEvent)
|
||||
bot.Client.OnGroupNotify(bot.groupNotifyEvent)
|
||||
bot.Client.OnFriendNotify(bot.friendNotifyEvent)
|
||||
bot.Client.OnFriendMessageRecalled(bot.friendRecallEvent)
|
||||
bot.Client.OnReceivedOfflineFile(bot.offlineFileEvent)
|
||||
bot.Client.OnJoinGroup(bot.joinGroupEvent)
|
||||
@ -214,6 +216,7 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
|
||||
return -1
|
||||
}
|
||||
m.Elements = newElem
|
||||
bot.checkMedia(newElem)
|
||||
ret := bot.Client.SendGroupMessage(groupId, m, ForceFragmented)
|
||||
if ret == nil || ret.Id == -1 {
|
||||
log.Warnf("群消息发送失败: 账号可能被风控.")
|
||||
@ -234,6 +237,10 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in
|
||||
newElem = append(newElem, fm)
|
||||
continue
|
||||
}
|
||||
if i, ok := elem.(*PokeElement); ok {
|
||||
bot.Client.SendFriendPoke(i.Target)
|
||||
return 0
|
||||
}
|
||||
if i, ok := elem.(*message.VoiceElement); ok {
|
||||
fv, err := bot.Client.UploadPrivatePtt(target, i.Data)
|
||||
if err != nil {
|
||||
@ -294,7 +301,12 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in
|
||||
}
|
||||
newElem = append(newElem, elem)
|
||||
}
|
||||
if len(newElem) == 0 {
|
||||
log.Warnf("好友消息发送失败: 消息为空.")
|
||||
return -1
|
||||
}
|
||||
m.Elements = newElem
|
||||
bot.checkMedia(newElem)
|
||||
var id int32 = -1
|
||||
if bot.Client.FindFriend(target) != nil { // 双向好友
|
||||
msg := bot.Client.SendPrivateMessage(target, m)
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
package coolq
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/md5"
|
||||
"encoding/base64"
|
||||
"encoding/hex"
|
||||
xml2 "encoding/xml"
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/Mrs4s/MiraiGo/binary"
|
||||
"github.com/Mrs4s/MiraiGo/message"
|
||||
"github.com/Mrs4s/go-cqhttp/global"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/tidwall/gjson"
|
||||
"io/ioutil"
|
||||
"net/url"
|
||||
"path"
|
||||
@ -18,6 +15,12 @@ import (
|
||||
"runtime"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/Mrs4s/MiraiGo/binary"
|
||||
"github.com/Mrs4s/MiraiGo/message"
|
||||
"github.com/Mrs4s/go-cqhttp/global"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/tidwall/gjson"
|
||||
)
|
||||
|
||||
var matchReg = regexp.MustCompile(`\[CQ:\w+?.*?]`)
|
||||
@ -63,7 +66,7 @@ func (e *MusicElement) Type() message.ElementType {
|
||||
return message.Service
|
||||
}
|
||||
|
||||
var GiftId = []message.GroupGift{
|
||||
var GiftId = [...]message.GroupGift{
|
||||
message.SweetWink,
|
||||
message.HappyCola,
|
||||
message.LuckyBracelet,
|
||||
@ -73,6 +76,11 @@ var GiftId = []message.GroupGift{
|
||||
message.RainbowCandy,
|
||||
message.Stronger,
|
||||
message.LoveMicrophone,
|
||||
message.HoldingYourHand,
|
||||
message.CuteCat,
|
||||
message.MysteryMask,
|
||||
message.ImBusy,
|
||||
message.LoveMask,
|
||||
}
|
||||
|
||||
func (e *PokeElement) Type() message.ElementType {
|
||||
@ -175,6 +183,16 @@ func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []M
|
||||
"data": map[string]string{"file": o.Filename, "url": o.Url},
|
||||
}
|
||||
}
|
||||
case *message.GroupFlashImgElement:
|
||||
return []MSG{MSG{
|
||||
"type": "image",
|
||||
"data": map[string]string{"file": o.Filename, "type": "flash"},
|
||||
}}
|
||||
case *message.FriendFlashImgElement:
|
||||
return []MSG{MSG{
|
||||
"type": "image",
|
||||
"data": map[string]string{"file": o.Filename, "type": "flash"},
|
||||
}}
|
||||
case *message.ServiceElement:
|
||||
if isOk := strings.Contains(o.Content, "<?xml"); isOk {
|
||||
m = MSG{
|
||||
@ -243,6 +261,14 @@ func ToStringMessage(e []message.IMessageElement, code int64, raw ...bool) (r st
|
||||
} else {
|
||||
r += fmt.Sprintf(`[CQ:image,file=%s,url=%s]`, o.Filename, CQCodeEscapeValue(o.Url))
|
||||
}
|
||||
case *message.GroupImageElement:
|
||||
r += fmt.Sprintf("[CQ:image,file=%s]", hex.EncodeToString(o.Md5)+".image")
|
||||
case *message.FriendImageElement:
|
||||
r += fmt.Sprintf("[CQ:image,file=%s]", hex.EncodeToString(o.Md5)+".image")
|
||||
case *message.GroupFlashImgElement:
|
||||
return fmt.Sprintf("[CQ:image,type=flash,file=%s]", o.Filename)
|
||||
case *message.FriendFlashImgElement:
|
||||
return fmt.Sprintf("[CQ:image,type=flash,file=%s]", o.Filename)
|
||||
case *message.ServiceElement:
|
||||
if isOk := strings.Contains(o.Content, "<?xml"); isOk {
|
||||
r += fmt.Sprintf(`[CQ:xml,data=%s,resid=%d]`, CQCodeEscapeValue(o.Content), o.Id)
|
||||
@ -306,7 +332,12 @@ func (bot *CQBot) ConvertStringMessage(m string, group bool) (r []message.IMessa
|
||||
}
|
||||
continue
|
||||
}
|
||||
r = append(r, elem)
|
||||
switch i := elem.(type) {
|
||||
case message.IMessageElement:
|
||||
r = append(r, i)
|
||||
case []message.IMessageElement:
|
||||
r = append(r, i...)
|
||||
}
|
||||
}
|
||||
if si != len(m) {
|
||||
r = append(r, message.NewText(CQCodeUnescapeText(m[si:])))
|
||||
@ -350,7 +381,13 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
|
||||
log.Warnf("转换CQ码到MiraiGo Element时出现错误: %v 将忽略本段CQ码.", err)
|
||||
return
|
||||
}
|
||||
r = append(r, elem)
|
||||
switch i := elem.(type) {
|
||||
case message.IMessageElement:
|
||||
r = append(r, i)
|
||||
case []message.IMessageElement:
|
||||
r = append(r, i...)
|
||||
}
|
||||
|
||||
}
|
||||
if m.Type == gjson.String {
|
||||
return bot.ConvertStringMessage(m.Str, group)
|
||||
@ -366,7 +403,10 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
|
||||
return
|
||||
}
|
||||
|
||||
func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m message.IMessageElement, err error) {
|
||||
// ToElement 将解码后的CQCode转换为Element.
|
||||
// 返回 interface{} 存在三种类型
|
||||
// message.IMessageElement []message.IMessageElement nil
|
||||
func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interface{}, err error) {
|
||||
switch t {
|
||||
case "text":
|
||||
return message.NewText(d["text"]), nil
|
||||
@ -409,9 +449,6 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m messag
|
||||
}
|
||||
|
||||
case "poke":
|
||||
if !group {
|
||||
return nil, errors.New("todo") // TODO: private poke
|
||||
}
|
||||
t, _ := strconv.ParseInt(d["qq"], 10, 64)
|
||||
return &PokeElement{Target: t}, nil
|
||||
case "gift":
|
||||
@ -420,7 +457,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m messag
|
||||
}
|
||||
t, _ := strconv.ParseInt(d["qq"], 10, 64)
|
||||
id, _ := strconv.Atoi(d["id"])
|
||||
if id < 0 || id >= 9 {
|
||||
if id < 0 || id >= 14 {
|
||||
return nil, errors.New("invalid gift id")
|
||||
}
|
||||
return &GiftElement{Target: t, GiftId: GiftId[id]}, nil
|
||||
@ -550,7 +587,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m messag
|
||||
}}, nil
|
||||
}
|
||||
xml := fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="2" templateID="1" action="web" brief="[分享] %s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="2"><audio cover="%s" src="%s"/><title>%s</title><summary>%s</summary></item><source name="音乐" icon="https://i.gtimg.cn/open/app_icon/01/07/98/56/1101079856_100_m.png" url="http://web.p.qq.com/qqmpmobile/aio/app.html?id=1101079856" action="app" a_actionData="com.tencent.qqmusic" i_actionData="tencent1101079856://" appid="1101079856" /></msg>`,
|
||||
d["title"], d["url"], d["image"], d["audio"], d["title"], d["content"])
|
||||
XmlEscape(d["title"]), d["url"], d["image"], d["audio"], XmlEscape(d["title"]), XmlEscape(d["content"]))
|
||||
return &message.ServiceElement{
|
||||
Id: 60,
|
||||
Content: xml,
|
||||
@ -600,13 +637,19 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m messag
|
||||
if err != nil {
|
||||
return nil, errors.New("send cardimage faild")
|
||||
}
|
||||
return bot.SendNewPic(img, source, icon, minWidth, minHeight, maxWidth, maxHeight, group)
|
||||
return bot.makeShowPic(img, source, icon, minWidth, minHeight, maxWidth, maxHeight, group)
|
||||
default:
|
||||
return nil, errors.New("unsupported cq code: " + t)
|
||||
}
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func XmlEscape(c string) string {
|
||||
buf := new(bytes.Buffer)
|
||||
_ = xml2.EscapeText(buf, []byte(c))
|
||||
return buf.String()
|
||||
}
|
||||
|
||||
func CQCodeEscapeText(raw string) string {
|
||||
ret := raw
|
||||
ret = strings.ReplaceAll(ret, "&", "&")
|
||||
@ -749,10 +792,10 @@ func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessa
|
||||
return nil, errors.New("invalid image")
|
||||
}
|
||||
|
||||
//SendNewPic 一种xml 方式发送的群消息图片
|
||||
func (bot *CQBot) SendNewPic(elem message.IMessageElement, source string, icon string, minWidth int64, minHeight int64, maxWidth int64, maxHeight int64, group bool) (*message.ServiceElement, error) {
|
||||
var xml string
|
||||
xml = ""
|
||||
//makeShowPic 一种xml 方式发送的群消息图片
|
||||
func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon string, minWidth int64, minHeight int64, maxWidth int64, maxHeight int64, group bool) ([]message.IMessageElement, error) {
|
||||
xml := ""
|
||||
var suf message.IMessageElement
|
||||
if i, ok := elem.(*message.ImageElement); ok {
|
||||
if group == false {
|
||||
gm, err := bot.Client.UploadPrivateImage(1, i.Data)
|
||||
@ -760,27 +803,32 @@ func (bot *CQBot) SendNewPic(elem message.IMessageElement, source string, icon s
|
||||
log.Warnf("警告: 好友消息 %v 消息图片上传失败: %v", 1, err)
|
||||
return nil, err
|
||||
}
|
||||
suf = gm
|
||||
xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="[分享]我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", gm.Md5, gm.Md5, len(i.Data), "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
|
||||
|
||||
} else {
|
||||
gm, err := bot.Client.UploadGroupImage(1, i.Data)
|
||||
if err != nil {
|
||||
log.Warnf("警告: 群 %v 消息图片上传失败: %v", 1, err)
|
||||
return nil, err
|
||||
}
|
||||
suf = gm
|
||||
xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="[分享]我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", gm.Md5, gm.Md5, len(i.Data), "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
|
||||
}
|
||||
}
|
||||
|
||||
if i, ok := elem.(*message.GroupImageElement); ok {
|
||||
xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="[分享]我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", i.Md5, i.Md5, 0, "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
|
||||
suf = i
|
||||
}
|
||||
if i, ok := elem.(*message.FriendImageElement); ok {
|
||||
xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="[分享]我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", i.Md5, i.Md5, 0, "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
|
||||
suf = i
|
||||
}
|
||||
if xml != "" {
|
||||
log.Warn(xml)
|
||||
XmlMsg := message.NewRichXml(xml, 5)
|
||||
return XmlMsg, nil
|
||||
//log.Warn(xml)
|
||||
ret := []message.IMessageElement{suf}
|
||||
ret = append(ret, message.NewRichXml(xml, 5))
|
||||
return ret, nil
|
||||
}
|
||||
return nil, errors.New("发送xml图片消息失败")
|
||||
return nil, errors.New("生成xml图片消息失败")
|
||||
}
|
||||
|
||||
100
coolq/event.go
100
coolq/event.go
@ -2,16 +2,17 @@ package coolq
|
||||
|
||||
import (
|
||||
"encoding/hex"
|
||||
"github.com/Mrs4s/MiraiGo/binary"
|
||||
"github.com/Mrs4s/MiraiGo/client"
|
||||
"github.com/Mrs4s/MiraiGo/message"
|
||||
"github.com/Mrs4s/go-cqhttp/global"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"io/ioutil"
|
||||
"path"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/Mrs4s/MiraiGo/binary"
|
||||
"github.com/Mrs4s/MiraiGo/client"
|
||||
"github.com/Mrs4s/MiraiGo/message"
|
||||
"github.com/Mrs4s/go-cqhttp/global"
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
var format = "string"
|
||||
@ -167,13 +168,24 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, m *message.TempMessage) {
|
||||
|
||||
func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent) {
|
||||
g := c.FindGroup(e.GroupCode)
|
||||
if e.Time > 0 {
|
||||
log.Infof("群 %v 内 %v 被 %v 禁言了 %v秒.",
|
||||
formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)), e.Time)
|
||||
if e.TargetUin == 0 {
|
||||
if e.Time != 0 {
|
||||
log.Infof("群 %v 被 %v 开启全员禁言.",
|
||||
formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)))
|
||||
} else {
|
||||
log.Infof("群 %v 被 %v 解除全员禁言.",
|
||||
formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)))
|
||||
}
|
||||
} else {
|
||||
log.Infof("群 %v 内 %v 被 %v 解除禁言.",
|
||||
formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)))
|
||||
if e.Time > 0 {
|
||||
log.Infof("群 %v 内 %v 被 %v 禁言了 %v 秒.",
|
||||
formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)), e.Time)
|
||||
} else {
|
||||
log.Infof("群 %v 内 %v 被 %v 解除禁言.",
|
||||
formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)))
|
||||
}
|
||||
}
|
||||
|
||||
bot.dispatchEventMessage(MSG{
|
||||
"post_type": "notice",
|
||||
"duration": e.Time,
|
||||
@ -184,10 +196,10 @@ func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent)
|
||||
"user_id": e.TargetUin,
|
||||
"time": time.Now().Unix(),
|
||||
"sub_type": func() string {
|
||||
if e.Time > 0 {
|
||||
return "ban"
|
||||
if e.Time == 0 {
|
||||
return "lift_ban"
|
||||
}
|
||||
return "lift_ban"
|
||||
return "ban"
|
||||
}(),
|
||||
})
|
||||
}
|
||||
@ -209,7 +221,7 @@ func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRec
|
||||
})
|
||||
}
|
||||
|
||||
func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.IGroupNotifyEvent) {
|
||||
func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
|
||||
group := c.FindGroup(e.From())
|
||||
switch notify := e.(type) {
|
||||
case *client.GroupPokeNotifyEvent:
|
||||
@ -268,6 +280,24 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.IGroupNotifyEven
|
||||
}
|
||||
}
|
||||
|
||||
func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
|
||||
friend := c.FindFriend(e.From())
|
||||
switch notify := e.(type) {
|
||||
case *client.FriendPokeNotifyEvent:
|
||||
log.Infof("好友 %v 戳了戳你.", friend.Nickname)
|
||||
bot.dispatchEventMessage(MSG{
|
||||
"post_type": "notice",
|
||||
"notice_type": "notify",
|
||||
"sub_type": "poke",
|
||||
"self_id": c.Uin,
|
||||
"user_id": notify.Sender,
|
||||
"sender_id": notify.Sender,
|
||||
"target_id": notify.Receiver,
|
||||
"time": time.Now().Unix(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageRecalledEvent) {
|
||||
f := c.FindFriend(e.FriendUin)
|
||||
gid := ToGlobalId(e.FriendUin, e.MessageId)
|
||||
@ -478,6 +508,48 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement) {
|
||||
}), 0644)
|
||||
}
|
||||
i.Filename = filename
|
||||
case *message.GroupImageElement:
|
||||
filename := hex.EncodeToString(i.Md5) + ".image"
|
||||
if !global.PathExists(path.Join(global.IMAGE_PATH, filename)) {
|
||||
_ = ioutil.WriteFile(path.Join(global.IMAGE_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
|
||||
w.Write(i.Md5)
|
||||
w.WriteUInt32(uint32(i.Size))
|
||||
w.WriteString(filename)
|
||||
w.WriteString(i.Url)
|
||||
}), 0644)
|
||||
}
|
||||
case *message.FriendImageElement:
|
||||
filename := hex.EncodeToString(i.Md5) + ".image"
|
||||
if !global.PathExists(path.Join(global.IMAGE_PATH, filename)) {
|
||||
_ = ioutil.WriteFile(path.Join(global.IMAGE_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
|
||||
w.Write(i.Md5)
|
||||
w.WriteUInt32(uint32(0)) // 发送时会调用url, 大概没事
|
||||
w.WriteString(filename)
|
||||
w.WriteString(i.Url)
|
||||
}), 0644)
|
||||
}
|
||||
case *message.GroupFlashImgElement:
|
||||
filename := hex.EncodeToString(i.Md5) + ".image"
|
||||
if !global.PathExists(path.Join(global.IMAGE_PATH, filename)) {
|
||||
_ = ioutil.WriteFile(path.Join(global.IMAGE_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
|
||||
w.Write(i.Md5)
|
||||
w.WriteUInt32(uint32(i.Size))
|
||||
w.WriteString(i.Filename)
|
||||
w.WriteString("")
|
||||
}), 0644)
|
||||
}
|
||||
i.Filename = filename
|
||||
case *message.FriendFlashImgElement:
|
||||
filename := hex.EncodeToString(i.Md5) + ".image"
|
||||
if !global.PathExists(path.Join(global.IMAGE_PATH, filename)) {
|
||||
_ = ioutil.WriteFile(path.Join(global.IMAGE_PATH, filename), binary.NewWriterF(func(w *binary.Writer) {
|
||||
w.Write(i.Md5)
|
||||
w.WriteUInt32(uint32(i.Size))
|
||||
w.WriteString(i.Filename)
|
||||
w.WriteString("")
|
||||
}), 0644)
|
||||
}
|
||||
i.Filename = filename
|
||||
case *message.VoiceElement:
|
||||
i.Name = strings.ReplaceAll(i.Name, "{", "")
|
||||
i.Name = strings.ReplaceAll(i.Name, "}", "")
|
||||
|
||||
@ -110,16 +110,16 @@
|
||||
|
||||
下面列出所有运算符（「要求的参数类型」是指运算符的键所对应的值的类型，「可作用于的类型」是指在过滤时事件对象相应值的类型）：
|
||||
|
||||
| 运算符 | 要求的参数类型 | 可作用于的类型 |
|
||||
| ----- | ------------ | ----------- |
|
||||
| `.not` | object | 任何 |
|
||||
| `.and` | object | 若参数中全为运算符，则任何；若不全为运算符，则 object |
|
||||
| `.or` | array（数组元素为 object） | 任何 |
|
||||
| `.eq` | 任何 | 任何 |
|
||||
| `.neq` | 任何 | 任何 |
|
||||
| `.in` | string/array | 若参数为 string，则 string；若参数为 array，则任何 |
|
||||
| `.contains` | string | string |
|
||||
| `.regex` | string | string |
|
||||
| 运算符 | 要求的参数类型 | 可作用于的类型 |
|
||||
| ----------- | -------------------------- | ----------------------------------------------------- |
|
||||
| `.not` | object | 任何 |
|
||||
| `.and` | object | 若参数中全为运算符，则任何；若不全为运算符，则 object |
|
||||
| `.or` | array（数组元素为 object） | 任何 |
|
||||
| `.eq` | 任何 | 任何 |
|
||||
| `.neq` | 任何 | 任何 |
|
||||
| `.in` | string/array | 若参数为 string，则 string；若参数为 array，则任何 |
|
||||
| `.contains` | string | string |
|
||||
| `.regex` | string | string |
|
||||
|
||||
|
||||
## 过滤时的事件数据对象
|
||||
|
||||
123
docs/adminApi.md
123
docs/adminApi.md
@ -6,9 +6,9 @@
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ----------- |
|
||||
| access_token | string | 校验口令，config.json中配置 |
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------------ | ------ | --------------------------- |
|
||||
| access_token | string | 校验口令，config.json中配置 |
|
||||
|
||||
|
||||
|
||||
@ -24,9 +24,9 @@ method：`POST/GET`
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ---- | ------------------------------------- |
|
||||
| 无|||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ---- | ---- |
|
||||
| 无 | | |
|
||||
|
||||
返回：
|
||||
|
||||
@ -44,19 +44,19 @@ method: `GET`
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ----------- |
|
||||
| 无|||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ---- | ---- |
|
||||
| 无 | | |
|
||||
|
||||
返回：
|
||||
|
||||
```json
|
||||
{"data": {"ispic": true,"picbase64":"xxxxx"}, "retcode": 0, "status": "ok"}
|
||||
```
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ----------- |
|
||||
| ispic| bool| 是否是验证码类型 true是，false为不是（比如设备锁|
|
||||
|picbas64| string| 验证码的base64编码内容，加上头，放入img标签即可显示|
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| -------- | ------ | --------------------------------------------------- |
|
||||
| ispic | bool | 是否是验证码类型 true是，false为不是（比如设备锁 |
|
||||
| picbas64 | string | 验证码的base64编码内容，加上头，放入img标签即可显示 |
|
||||
|
||||
### admin/do_web_write
|
||||
|
||||
@ -67,9 +67,9 @@ method: `POST` formdata
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ----------- |
|
||||
| input | string | 输入的类容 |
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ---------- |
|
||||
| input | string | 输入的内容 |
|
||||
|
||||
返回：
|
||||
|
||||
@ -89,9 +89,28 @@ method: `POST`
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 |类型 | 说明 |
|
||||
| ------ | ------ | -----------|
|
||||
| 无 | | |
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ---- | ---- |
|
||||
| 无 | | |
|
||||
|
||||
返回：
|
||||
|
||||
```json
|
||||
{"data": {}, "retcode": 0, "status": "ok"}
|
||||
```
|
||||
|
||||
### admin/do_process_restart
|
||||
|
||||
> 冷重启
|
||||
|
||||
method: `POST`
|
||||
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ---- | ---- |
|
||||
| 无 | | |
|
||||
|
||||
返回：
|
||||
|
||||
@ -108,12 +127,12 @@ method: `POST` formdata
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ------------------------------------------------------------ |
|
||||
| uin | string | qq号 |
|
||||
| password | string | qq密码 |
|
||||
| enable_db | string | 是否启动数据库,填 'true' 或者 'false' |
|
||||
| access_token | string | 授权 token |
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------------ | ------ | ------------------------------------- |
|
||||
| uin | string | qq号 |
|
||||
| password | string | qq密码 |
|
||||
| enable_db | string | 是否启动数据库,填 'true' 或者 'false' |
|
||||
| access_token | string | 授权 token |
|
||||
|
||||
返回：
|
||||
|
||||
@ -130,14 +149,14 @@ method: `POST` formdata
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ------------------------------------------------------------ |
|
||||
| port | string | 服务端口 |
|
||||
| host | string | 服务监听地址 |
|
||||
| enable | string | 是否启用 ,填 'true' 或者 'false' |
|
||||
| timeout | string | http请求超时时间 |
|
||||
| post_url | string | post上报地址 不需要就填空字符串，或者不填|
|
||||
| post_secret | string | post上报的secret 不需要就填空字符串，或者不填 |
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ----------- | ------ | --------------------------------------------- |
|
||||
| port | string | 服务端口 |
|
||||
| host | string | 服务监听地址 |
|
||||
| enable | string | 是否启用 ,填 'true' 或者 'false' |
|
||||
| timeout | string | http请求超时时间 |
|
||||
| post_url | string | post上报地址 不需要就填空字符串，或者不填 |
|
||||
| post_secret | string | post上报的secret 不需要就填空字符串，或者不填 |
|
||||
|
||||
返回：
|
||||
|
||||
@ -154,11 +173,11 @@ method: `POST` formdata
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ------------------------------------------------------------ |
|
||||
| port | string | 服务端口 |
|
||||
| host | string | 服务监听地址 |
|
||||
| enable | string | 是否启用 ,填 'true' 或者 'false' |
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | -------------------------------- |
|
||||
| port | string | 服务端口 |
|
||||
| host | string | 服务监听地址 |
|
||||
| enable | string | 是否启用 ,填 'true' 或者 'false' |
|
||||
|
||||
|
||||
返回：
|
||||
@ -175,11 +194,11 @@ method: `POST` formdata
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ------------------------------------------------------------ |
|
||||
| port | string | 服务端口 |
|
||||
| host | string | 服务监听地址 |
|
||||
| enable | string | 是否启用 ,填 'true' 或者 'false' |
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | -------------------------------- |
|
||||
| port | string | 服务端口 |
|
||||
| host | string | 服务监听地址 |
|
||||
| enable | string | 是否启用 ,填 'true' 或者 'false' |
|
||||
|
||||
|
||||
返回：
|
||||
@ -196,9 +215,9 @@ method: `POST` formdata
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ------------------------------------------------------------ |
|
||||
| json | string | 完整的config.json的配合，json字符串 |
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ----------------------------------- |
|
||||
| json | string | 完整的config.json的配合，json字符串 |
|
||||
|
||||
|
||||
返回：
|
||||
@ -215,9 +234,9 @@ method: `GET`
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ------------------------------------------------------------ |
|
||||
| 无 | | |
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ---- | ---- |
|
||||
| 无 | | |
|
||||
|
||||
|
||||
返回：
|
||||
@ -226,7 +245,7 @@ method: `GET`
|
||||
{"data": {"config":"xxxx"}, "retcode": 0, "status": "ok"}
|
||||
```
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ------------------------------------------------------------ |
|
||||
| config | string | 完整的config.json的配合，json字符串 |
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ----------------------------------- |
|
||||
| config | string | 完整的config.json的配合，json字符串 |
|
||||
|
||||
|
||||
@ -36,6 +36,7 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
|
||||
"ignore_invalid_cqcode": false,
|
||||
"force_fragmented": true,
|
||||
"heartbeat_interval": 5,
|
||||
"use_sso_address": false,
|
||||
"http_config": {
|
||||
"enabled": true,
|
||||
"host": "0.0.0.0",
|
||||
@ -60,28 +61,29 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
|
||||
}
|
||||
````
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ------------------ | -------- | ------------------------------------------------------------------- |
|
||||
| uin | int64 | 登录用QQ号 |
|
||||
| password | string | 登录用密码 |
|
||||
| encrypt_password | bool | 是否对密码进行加密. |
|
||||
| password_encrypted | string | 加密后的密码(请勿修改) |
|
||||
| enable_db | bool | 是否开启内置数据库, 关闭后将无法使用 **回复/撤回** 等上下文相关接口 |
|
||||
| access_token | string | 同CQHTTP的 `access_token` 用于身份验证 |
|
||||
| relogin | bool | 是否自动重新登录 |
|
||||
| relogin_delay | int | 重登录延时（秒） |
|
||||
| max_relogin_times | uint | 最大重登录次数，若0则不设置上限 |
|
||||
| _rate_limit | bool | 是否启用API调用限速 |
|
||||
| frequency | float64 | 1s内能调用API的次数 |
|
||||
| bucket_size | int | 令牌桶的大小，默认为1，修改此值可允许一定程度内连续调用api |
|
||||
| post_message_format | string | 上报信息类型 |
|
||||
| ignore_invalid_cqcode| bool | 是否忽略错误的CQ码 |
|
||||
| force_fragmented | bool | 是否强制分片发送群长消息 |
|
||||
| heartbeat_interval | int64 | 心跳间隔时间，单位秒。小于0则关闭心跳，等于0使用默认值(5秒) |
|
||||
| http_config | object | HTTP API配置 |
|
||||
| ws_config | object | Websocket API 配置 |
|
||||
| ws_reverse_servers | object[] | 反向 Websocket API 配置 |
|
||||
| log_level | string | 指定日志收集级别，将收集的日志单独存放到固定文件中，便于查看日志线索 当前支持 warn,error|
|
||||
| 字段 | 类型 | 说明 |
|
||||
| --------------------- | -------- | ---------------------------------------------------------------------------------------- |
|
||||
| uin | int64 | 登录用QQ号 |
|
||||
| password | string | 登录用密码 |
|
||||
| encrypt_password | bool | 是否对密码进行加密. |
|
||||
| password_encrypted | string | 加密后的密码(请勿修改) |
|
||||
| enable_db | bool | 是否开启内置数据库, 关闭后将无法使用 **回复/撤回** 等上下文相关接口 |
|
||||
| access_token | string | 同CQHTTP的 `access_token` 用于身份验证 |
|
||||
| relogin | bool | 是否自动重新登录 |
|
||||
| relogin_delay | int | 重登录延时（秒） |
|
||||
| max_relogin_times | uint | 最大重登录次数，若0则不设置上限 |
|
||||
| _rate_limit | bool | 是否启用API调用限速 |
|
||||
| frequency | float64 | 1s内能调用API的次数 |
|
||||
| bucket_size | int | 令牌桶的大小，默认为1，修改此值可允许一定程度内连续调用api |
|
||||
| post_message_format | string | 上报信息类型 |
|
||||
| ignore_invalid_cqcode | bool | 是否忽略错误的CQ码 |
|
||||
| force_fragmented | bool | 是否强制分片发送群长消息 |
|
||||
| use_sso_address | bool | 是否使用服务器下发的地址 |
|
||||
| heartbeat_interval | int64 | 心跳间隔时间，单位秒。小于0则关闭心跳，等于0使用默认值(5秒) |
|
||||
| http_config | object | HTTP API配置 |
|
||||
| ws_config | object | Websocket API 配置 |
|
||||
| ws_reverse_servers | object[] | 反向 Websocket API 配置 |
|
||||
| log_level | string | 指定日志收集级别，将收集的日志单独存放到固定文件中，便于查看日志线索 当前支持 warn,error |
|
||||
|
||||
> 注: 开启密码加密后程序将在每次启动时要求输入解密密钥, 密钥错误会导致登录时提示密码错误.
|
||||
> 解密后密码将储存在内存中，用于自动重连等功能. 所以此加密并不能防止内存读取.
|
||||
@ -108,10 +110,23 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
|
||||
|
||||
在大部分情况下 我们只需要关心 `protocol` 字段:
|
||||
|
||||
| 值 | 类型 | 限制 |
|
||||
| ---- | ------------- | ----------------------------------------------------- |
|
||||
| 0 | Android Pad | 无法接收 `group_notify` 事件、无法接收口令红包 |
|
||||
| 1 | Android Phone | 无 |
|
||||
| 2 | Android Watch | 除了 `Android Pad` 有的限制外还包括: 无法接收撤回消息 |
|
||||
| 值 | 类型 | 限制 |
|
||||
| --- | ------------- | ---------------------------------------------------------------- |
|
||||
| 0 | iPad | 无 |
|
||||
| 1 | Android Phone | 无法接收新版表情如 `/吃瓜 /汪汪`, 会自动转换为字符串 |
|
||||
| 2 | Android Watch | 除`Android Phone`的限制外, 无法接收 `notify` 事件、无法接收口令红包、无法接收撤回消息 |
|
||||
| 3 | MacOS | 无 |
|
||||
|
||||
> 注意, 根据协议的不同, 各类消息有所限制
|
||||
> 注意, 根据协议的不同, 各类消息有所限制
|
||||
|
||||
## 自定义服务器IP
|
||||
|
||||
> 某些海外服务器使用默认地址可能会存在链路问题，此功能可以指定 go-cqhttp 连接哪些地址以达到最优化.
|
||||
|
||||
将文件 `address.txt` 创建到 `go-cqhttp` 工作目录, 并键入 `IP:PORT` 以换行符为分割即可.
|
||||
|
||||
示例:
|
||||
````
|
||||
1.1.1.1:53
|
||||
1.1.2.2:8899
|
||||
````
|
||||
422
docs/cqhttp.md
422
docs/cqhttp.md
@ -6,24 +6,24 @@
|
||||
|
||||
### 图片
|
||||
|
||||
| 参数名 | 可能的值 | 说明 |
|
||||
| --- | --- | --- |
|
||||
| `file` | - | 图片文件名 |
|
||||
| `type` | `flash`，`show` | 图片类型，`flash` 表示闪照，`show` 表示秀图，默认普通图片 |
|
||||
| `url` | - | 图片 URL |
|
||||
| `cache` | `0` `1` | 只在通过网络 URL 发送时有效，表示是否使用已缓存的文件，默认 `1` |
|
||||
| `id` | - | 发送秀图时的特效id，默认为40000 |
|
||||
| 参数名 | 可能的值 | 说明 |
|
||||
| ------- | --------------- | --------------------------------------------------------------- |
|
||||
| `file` | - | 图片文件名 |
|
||||
| `type` | `flash`，`show` | 图片类型，`flash` 表示闪照，`show` 表示秀图，默认普通图片 |
|
||||
| `url` | - | 图片 URL |
|
||||
| `cache` | `0` `1` | 只在通过网络 URL 发送时有效，表示是否使用已缓存的文件，默认 `1` |
|
||||
| `id` | - | 发送秀图时的特效id，默认为40000 |
|
||||
|
||||
可用的特效ID:
|
||||
|
||||
| id |类型 |
|
||||
| --- |-------|
|
||||
| 40000 | 普通 |
|
||||
| 40001 | 幻影 |
|
||||
| 40002 | 抖动 |
|
||||
| 40003 | 生日 |
|
||||
| 40004 | 爱你 |
|
||||
| 40005 | 征友 |
|
||||
| id | 类型 |
|
||||
| ----- | ---- |
|
||||
| 40000 | 普通 |
|
||||
| 40001 | 幻影 |
|
||||
| 40002 | 抖动 |
|
||||
| 40003 | 生日 |
|
||||
| 40004 | 爱你 |
|
||||
| 40005 | 征友 |
|
||||
|
||||
|
||||
### 回复
|
||||
@ -64,9 +64,9 @@ Type: `poke`
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ----------- |
|
||||
| qq | int64 | 需要戳的成员 |
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ----- | ------------ |
|
||||
| qq | int64 | 需要戳的成员 |
|
||||
|
||||
示例: `[CQ:poke,qq=123456]`
|
||||
|
||||
@ -80,24 +80,30 @@ Type: `gift`
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 |类型 | 说明 |
|
||||
| ------ | ------ | -----------|
|
||||
| qq | int64 | 接收礼物的成员 |
|
||||
| id | int | 礼物的类型 |
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ----- | -------------- |
|
||||
| qq | int64 | 接收礼物的成员 |
|
||||
| id | int | 礼物的类型 |
|
||||
|
||||
目前支持的礼物ID:
|
||||
|
||||
| id |类型 |
|
||||
| ---| ---------|
|
||||
| 0 | 甜Wink |
|
||||
| 1 | 快乐肥宅水|
|
||||
| 2 | 幸运手链 |
|
||||
| 3 | 卡布奇诺 |
|
||||
| 4 | 猫咪手表 |
|
||||
| 5 | 绒绒手套 |
|
||||
| 6 | 彩虹糖果 |
|
||||
| 7 | 坚强 |
|
||||
| 8 | 告白话筒 |
|
||||
| id | 类型 |
|
||||
| --- | ---------- |
|
||||
| 0 | 甜Wink |
|
||||
| 1 | 快乐肥宅水 |
|
||||
| 2 | 幸运手链 |
|
||||
| 3 | 卡布奇诺 |
|
||||
| 4 | 猫咪手表 |
|
||||
| 5 | 绒绒手套 |
|
||||
| 6 | 彩虹糖果 |
|
||||
| 7 | 坚强 |
|
||||
| 8 | 告白话筒 |
|
||||
| 9 | 牵你的手 |
|
||||
| 10 | 可爱猫咪 |
|
||||
| 11 | 神秘面具 |
|
||||
| 12 | 我超忙的 |
|
||||
| 13 | 爱心口罩 |
|
||||
|
||||
|
||||
|
||||
示例: `[CQ:gift,qq=123456,id=8]`
|
||||
@ -110,8 +116,8 @@ Type: `forward`
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ------------------------------------------------------------ |
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ------------------------------------------------------------- |
|
||||
| id | string | 合并转发ID, 需要通过 `/get_forward_msg` API获取转发的具体内容 |
|
||||
|
||||
示例: `[CQ:forward,id=xxxx]`
|
||||
@ -124,12 +130,12 @@ Type: `node`
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 | 特殊说明 |
|
||||
| ------- | ------- | -------------- | ------------------------------------------------------------ |
|
||||
| 参数名 | 类型 | 说明 | 特殊说明 |
|
||||
| ------- | ------- | -------------- | -------------------------------------------------------------------------------------- |
|
||||
| id | int32 | 转发消息id | 直接引用他人的消息合并转发, 实际查看顺序为原消息发送顺序 **与下面的自定义消息二选一** |
|
||||
| name | string | 发送者显示名字 | 用于自定义消息 (自定义消息并合并转发，实际查看顺序为自定义消息段顺序) |
|
||||
| uin | int64 | 发送者QQ号 | 用于自定义消息 |
|
||||
| content | message | 具体消息 | 用于自定义消息 **不支持转发套娃，不支持引用回复** |
|
||||
| name | string | 发送者显示名字 | 用于自定义消息 (自定义消息并合并转发，实际查看顺序为自定义消息段顺序) |
|
||||
| uin | int64 | 发送者QQ号 | 用于自定义消息 |
|
||||
| content | message | 具体消息 | 用于自定义消息 **不支持转发套娃，不支持引用回复** |
|
||||
|
||||
特殊说明: **需要使用单独的API `/send_group_forward_msg` 发送，并且由于消息段较为复杂，仅支持Array形式入参。 如果引用消息和自定义消息同时出现，实际查看顺序将取消息段顺序. 另外按 [CQHTTP](https://cqhttp.cc/docs/4.15/#/Message?id=格式) 文档说明, `data` 应全为字符串, 但由于需要接收`message` 类型的消息, 所以 *仅限此Type的content字段* 支持Array套娃**
|
||||
|
||||
@ -211,10 +217,10 @@ Type: `xml`
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ------------------------------------------------------------ |
|
||||
| data | string | xml内容，xml中的value部分，记得实体化处理|
|
||||
| resid | int32 | 可以不填|
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ----------------------------------------- |
|
||||
| data | string | xml内容，xml中的value部分，记得实体化处理 |
|
||||
| resid | int32 | 可以不填 |
|
||||
|
||||
示例: `[CQ:xml,data=xxxx]`
|
||||
|
||||
@ -260,10 +266,10 @@ Type: `json`
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ------------------------------------------------------------ |
|
||||
| data | string | json内容，json的所有字符串记得实体化处理|
|
||||
| resid | int32 | 默认不填为0，走小程序通道，填了走富文本通道发送|
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ----------------------------------------------- |
|
||||
| data | string | json内容，json的所有字符串记得实体化处理 |
|
||||
| resid | int32 | 默认不填为0，走小程序通道，填了走富文本通道发送 |
|
||||
|
||||
json中的字符串需要进行转义：
|
||||
|
||||
@ -293,15 +299,15 @@ Type: `cardimage`
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ------------------------------------------------------------ |
|
||||
| file | string | 和image的file字段对齐，支持也是一样的|
|
||||
| minwidth | int64 | 默认不填为400，最小width|
|
||||
| minheight | int64 | 默认不填为400，最小height|
|
||||
| maxwidth | int64 | 默认不填为500，最大width|
|
||||
| maxheight | int64 | 默认不填为1000，最大height|
|
||||
| source | string | 分享来源的名称，可以留空|
|
||||
| icon | string | 分享来源的icon图标url，可以留空|
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| --------- | ------ | ------------------------------------- |
|
||||
| file | string | 和image的file字段对齐，支持也是一样的 |
|
||||
| minwidth | int64 | 默认不填为400，最小width |
|
||||
| minheight | int64 | 默认不填为400，最小height |
|
||||
| maxwidth | int64 | 默认不填为500，最大width |
|
||||
| maxheight | int64 | 默认不填为1000，最大height |
|
||||
| source | string | 分享来源的名称，可以留空 |
|
||||
| icon | string | 分享来源的icon图标url，可以留空 |
|
||||
|
||||
|
||||
示例cardimage 的cq码：
|
||||
@ -319,9 +325,9 @@ Type: `tts`
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ----------- |
|
||||
| text | string | 内容 |
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ---- |
|
||||
| text | string | 内容 |
|
||||
|
||||
示例: `[CQ:tts,text=这是一条测试消息]`
|
||||
|
||||
@ -333,10 +339,10 @@ Type: `tts`
|
||||
|
||||
**参数**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| -------- | ------ | ---- |
|
||||
| group_id | int64 | 群号 |
|
||||
| group_name | string | 新名 |
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ---------- | ------ | ---- |
|
||||
| group_id | int64 | 群号 |
|
||||
| group_name | string | 新名 |
|
||||
|
||||
### 设置群头像
|
||||
|
||||
@ -344,11 +350,11 @@ Type: `tts`
|
||||
|
||||
**参数**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| -------- | ------ | ---- |
|
||||
| group_id | int64 | 群号 |
|
||||
| file | string | 图片文件名 |
|
||||
| cache | int | 表示是否使用已缓存的文件 |
|
||||
| 字段 | 类型 | 说明 |
|
||||
| -------- | ------ | ------------------------ |
|
||||
| group_id | int64 | 群号 |
|
||||
| file | string | 图片文件名 |
|
||||
| cache | int | 表示是否使用已缓存的文件 |
|
||||
|
||||
[1]`file` 参数支持以下几种格式：
|
||||
|
||||
@ -462,15 +468,15 @@ Type: `tts`
|
||||
|
||||
**参数**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ------------ | ------ | ------ |
|
||||
| 字段 | 类型 | 说明 |
|
||||
| --------- | ------ | ---- |
|
||||
| `content` | string | 内容 |
|
||||
|
||||
**响应数据**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ---------- | ----------------- | -------- |
|
||||
| `slices` | string[] | 词组 |
|
||||
| 字段 | 类型 | 说明 |
|
||||
| -------- | -------- | ---- |
|
||||
| `slices` | string[] | 词组 |
|
||||
|
||||
### 图片OCR
|
||||
|
||||
@ -480,24 +486,24 @@ Type: `tts`
|
||||
|
||||
**参数**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ------------ | ------ | ------ |
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ------- | ------ | ------ |
|
||||
| `image` | string | 图片ID |
|
||||
|
||||
**响应数据**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ---------- | ----------------- | -------- |
|
||||
| `texts` | TextDetection[] | OCR结果 |
|
||||
| `language` | string | 语言 |
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ---------- | --------------- | ------- |
|
||||
| `texts` | TextDetection[] | OCR结果 |
|
||||
| `language` | string | 语言 |
|
||||
|
||||
**TextDetection**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ---------- | ----------------- | -------- |
|
||||
| `text` | string | 文本 |
|
||||
| `confidence`| int32 | 置信度 |
|
||||
| `coordinates` | vector2 | 坐标 |
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ------------- | ------- | ------ |
|
||||
| `text` | string | 文本 |
|
||||
| `confidence` | int32 | 置信度 |
|
||||
| `coordinates` | vector2 | 坐标 |
|
||||
|
||||
|
||||
### 获取群系统消息
|
||||
@ -506,39 +512,141 @@ Type: `tts`
|
||||
|
||||
**响应数据**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ---------- | ----------------- | -------- |
|
||||
| `invited_requests` | InvitedRequest[] | 邀请消息列表 |
|
||||
| `join_requests` | JoinRequest[] | 进群消息列表 |
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ------------------ | ---------------- | ------------ |
|
||||
| `invited_requests` | InvitedRequest[] | 邀请消息列表 |
|
||||
| `join_requests` | JoinRequest[] | 进群消息列表 |
|
||||
|
||||
> 注意: 如果列表不存在任何消息, 将返回 `null`
|
||||
|
||||
**InvitedRequest**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ---------- | ----------------- | -------- |
|
||||
| `request_id` | int64 | 请求ID |
|
||||
| `invitor_uin` | int64 | 邀请者 |
|
||||
| `invitor_nick` | string | 邀请者昵称 |
|
||||
| `group_id` | int64 | 群号 |
|
||||
| `group_name` | string | 群名 |
|
||||
| `checked` | bool | 是否已被处理|
|
||||
| `actor` | int64 | 处理者, 未处理为0 |
|
||||
| 字段 | 类型 | 说明 |
|
||||
| -------------- | ------ | ----------------- |
|
||||
| `request_id` | int64 | 请求ID |
|
||||
| `invitor_uin` | int64 | 邀请者 |
|
||||
| `invitor_nick` | string | 邀请者昵称 |
|
||||
| `group_id` | int64 | 群号 |
|
||||
| `group_name` | string | 群名 |
|
||||
| `checked` | bool | 是否已被处理 |
|
||||
| `actor` | int64 | 处理者, 未处理为0 |
|
||||
|
||||
**JoinRequest**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ---------- | ----------------- | -------- |
|
||||
| `request_id` | int64 | 请求ID |
|
||||
| `requester_uin` | int64 | 请求者ID |
|
||||
| `requester_nick` | string | 请求者昵称 |
|
||||
| `message` | string | 验证消息 |
|
||||
| `group_id` | int64 | 群号 |
|
||||
| `group_name` | string | 群名 |
|
||||
| `checked` | bool | 是否已被处理|
|
||||
| `actor` | int64 | 处理者, 未处理为0 |
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ---------------- | ------ | ----------------- |
|
||||
| `request_id` | int64 | 请求ID |
|
||||
| `requester_uin` | int64 | 请求者ID |
|
||||
| `requester_nick` | string | 请求者昵称 |
|
||||
| `message` | string | 验证消息 |
|
||||
| `group_id` | int64 | 群号 |
|
||||
| `group_name` | string | 群名 |
|
||||
| `checked` | bool | 是否已被处理 |
|
||||
| `actor` | int64 | 处理者, 未处理为0 |
|
||||
|
||||
### 获取群文件系统信息
|
||||
|
||||
终结点: `/get_group_file_system_info`
|
||||
|
||||
**参数**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ---------- | ----- | ---- |
|
||||
| `group_id` | int64 | 群号 |
|
||||
|
||||
**响应数据**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ------------- | ----- | ---------- |
|
||||
| `file_count` | int32 | 文件总数 |
|
||||
| `limit_count` | int32 | 文件上限 |
|
||||
| `used_space` | int64 | 已使用空间 |
|
||||
| `total_space` | int64 | 空间上限 |
|
||||
|
||||
### 获取群根目录文件列表
|
||||
|
||||
> `File` 和 `Folder` 对象信息请参考最下方
|
||||
|
||||
终结点: `/get_group_root_files`
|
||||
|
||||
**参数**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ---------- | ----- | ---- |
|
||||
| `group_id` | int64 | 群号 |
|
||||
|
||||
**响应数据**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| --------- | -------- | ---------- |
|
||||
| `files` | File[] | 文件列表 |
|
||||
| `folders` | Folder[] | 文件夹列表 |
|
||||
|
||||
### 获取群子目录文件列表
|
||||
|
||||
> `File` 和 `Folder` 对象信息请参考最下方
|
||||
|
||||
终结点: `/get_group_files_by_folder`
|
||||
|
||||
**参数**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ----------- | ------ | --------------------------- |
|
||||
| `group_id` | int64 | 群号 |
|
||||
| `folder_id` | string | 文件夹ID 参考 `Folder` 对象 |
|
||||
|
||||
**响应数据**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| --------- | -------- | ---------- |
|
||||
| `files` | File[] | 文件列表 |
|
||||
| `folders` | Folder[] | 文件夹列表 |
|
||||
|
||||
### 获取群文件资源链接
|
||||
|
||||
> `File` 和 `Folder` 对象信息请参考最下方
|
||||
|
||||
终结点: `/get_group_file_url`
|
||||
|
||||
**参数**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ---------- | ------ | ------------------------- |
|
||||
| `group_id` | int64 | 群号 |
|
||||
| `file_id` | string | 文件ID 参考 `File` 对象 |
|
||||
| `busid` | int32 | 文件类型 参考 `File` 对象 |
|
||||
|
||||
**响应数据**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ----- | ------ | ------------ |
|
||||
| `url` | string | 文件下载链接 |
|
||||
|
||||
**File**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ---------------- | ------ | ---------------------- |
|
||||
| `file_id` | string | 文件ID |
|
||||
| `file_name` | string | 文件名 |
|
||||
| `busid` | int32 | 文件类型 |
|
||||
| `file_size` | int64 | 文件大小 |
|
||||
| `upload_time` | int64 | 上传时间 |
|
||||
| `dead_time` | int64 | 过期时间,永久文件恒为0 |
|
||||
| `modify_time` | int64 | 最后修改时间 |
|
||||
| `download_times` | int32 | 下载次数 |
|
||||
| `uploader` | int64 | 上传者ID |
|
||||
| `uploader_name` | string | 上传者名字 |
|
||||
|
||||
**Folder**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
| ------------------ | ------ | ---------- |
|
||||
| `folder_id` | string | 文件夹ID |
|
||||
| `folder_name` | string | 文件名 |
|
||||
| `create_time` | int64 | 创建时间 |
|
||||
| `creator` | int64 | 创建者 |
|
||||
| `creator_name` | string | 创建者名字 |
|
||||
| `total_file_count` | int32 | 子文件数量 |
|
||||
|
||||
## 事件
|
||||
|
||||
@ -559,12 +667,12 @@ Type: `tts`
|
||||
|
||||
**上报数据**
|
||||
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------------- | ------ | -------------- | -------------- |
|
||||
| `post_type` | string | `notice` | 上报类型 |
|
||||
| `notice_type` | string | `friend_recall`| 消息类型 |
|
||||
| `user_id` | int64 | | 好友id |
|
||||
| `message_id` | int64 | | 被撤回的消息id |
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------------- | ------ | --------------- | -------------- |
|
||||
| `post_type` | string | `notice` | 上报类型 |
|
||||
| `notice_type` | string | `friend_recall` | 消息类型 |
|
||||
| `user_id` | int64 | | 好友id |
|
||||
| `message_id` | int64 | | 被撤回的消息id |
|
||||
|
||||
#### 群内戳一戳
|
||||
|
||||
@ -572,14 +680,14 @@ Type: `tts`
|
||||
|
||||
**上报数据**
|
||||
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------------- | ------ | -------------- | -------------- |
|
||||
| `post_type` | string | `notice` | 上报类型 |
|
||||
| `notice_type` | string | `notify` | 消息类型 |
|
||||
| `group_id` | int64 | | 群号 |
|
||||
| `sub_type` | string | `poke` | 提示类型 |
|
||||
| `user_id` | int64 | | 发送者id |
|
||||
| `target_id` | int64 | | 被戳者id |
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------------- | ------ | -------- | -------- |
|
||||
| `post_type` | string | `notice` | 上报类型 |
|
||||
| `notice_type` | string | `notify` | 消息类型 |
|
||||
| `group_id` | int64 | | 群号 |
|
||||
| `sub_type` | string | `poke` | 提示类型 |
|
||||
| `user_id` | int64 | | 发送者id |
|
||||
| `target_id` | int64 | | 被戳者id |
|
||||
|
||||
#### 群红包运气王提示
|
||||
|
||||
@ -587,14 +695,14 @@ Type: `tts`
|
||||
|
||||
**上报数据**
|
||||
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------------- | ------ | -------------- | -------------- |
|
||||
| `post_type` | string | `notice` | 上报类型 |
|
||||
| `notice_type` | string | `notify` | 消息类型 |
|
||||
| `group_id` | int64 | | 群号 |
|
||||
| `sub_type` | string | `lucky_king` | 提示类型 |
|
||||
| `user_id` | int64 | | 红包发送者id |
|
||||
| `target_id` | int64 | | 运气王id |
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------------- | ------ | ------------ | ------------ |
|
||||
| `post_type` | string | `notice` | 上报类型 |
|
||||
| `notice_type` | string | `notify` | 消息类型 |
|
||||
| `group_id` | int64 | | 群号 |
|
||||
| `sub_type` | string | `lucky_king` | 提示类型 |
|
||||
| `user_id` | int64 | | 红包发送者id |
|
||||
| `target_id` | int64 | | 运气王id |
|
||||
|
||||
#### 群成员荣誉变更提示
|
||||
|
||||
@ -602,14 +710,14 @@ Type: `tts`
|
||||
|
||||
**上报数据**
|
||||
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------------- | ------ | -------------- | -------------- |
|
||||
| `post_type` | string | `notice` | 上报类型 |
|
||||
| `notice_type` | string | `notify` | 消息类型 |
|
||||
| `group_id` | int64 | | 群号 |
|
||||
| `sub_type` | string | `honor` | 提示类型 |
|
||||
| `user_id` | int64 | | 成员id |
|
||||
| `honor_type` | string | `talkative:龙王` `performer:群聊之火` `emotion:快乐源泉` | 荣誉类型 |
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------------- | ------ | -------------------------------------------------------- | -------- |
|
||||
| `post_type` | string | `notice` | 上报类型 |
|
||||
| `notice_type` | string | `notify` | 消息类型 |
|
||||
| `group_id` | int64 | | 群号 |
|
||||
| `sub_type` | string | `honor` | 提示类型 |
|
||||
| `user_id` | int64 | | 成员id |
|
||||
| `honor_type` | string | `talkative:龙王` `performer:群聊之火` `emotion:快乐源泉` | 荣誉类型 |
|
||||
|
||||
#### 群成员名片更新
|
||||
|
||||
@ -617,14 +725,14 @@ Type: `tts`
|
||||
|
||||
**上报数据**
|
||||
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------------- | ------ | -------------- | -------------- |
|
||||
| `post_type` | string | `notice` | 上报类型 |
|
||||
| `notice_type` | string | `group_card` | 消息类型 |
|
||||
| `group_id` | int64 | | 群号 |
|
||||
| `user_id` | int64 | | 成员id |
|
||||
| `card_new` | int64 | | 新名片 |
|
||||
| `card_old` | int64 | | 旧名片 |
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------------- | ------ | ------------ | -------- |
|
||||
| `post_type` | string | `notice` | 上报类型 |
|
||||
| `notice_type` | string | `group_card` | 消息类型 |
|
||||
| `group_id` | int64 | | 群号 |
|
||||
| `user_id` | int64 | | 成员id |
|
||||
| `card_new` | int64 | | 新名片 |
|
||||
| `card_old` | int64 | | 旧名片 |
|
||||
|
||||
> PS: 当名片为空时 `card_xx` 字段为空字符串, 并不是昵称
|
||||
|
||||
@ -632,17 +740,17 @@ Type: `tts`
|
||||
|
||||
**上报数据**
|
||||
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------------- | ------ | -------------- | -------------- |
|
||||
| `post_type` | string | `notice` | 上报类型 |
|
||||
| `notice_type` | string | `offline_file` | 消息类型 |
|
||||
| `user_id` | int64 | | 发送者id |
|
||||
| `file` | object | | 文件数据 |
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------------- | ------ | -------------- | -------- |
|
||||
| `post_type` | string | `notice` | 上报类型 |
|
||||
| `notice_type` | string | `offline_file` | 消息类型 |
|
||||
| `user_id` | int64 | | 发送者id |
|
||||
| `file` | object | | 文件数据 |
|
||||
|
||||
**file object**
|
||||
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------------- | ------ | -------------- | -------------- |
|
||||
| `name` | string | | 文件名 |
|
||||
| `size` | int64 | | 文件大小 |
|
||||
| `url` | string | | 下载链接 |
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------ | ------ | -------- | -------- |
|
||||
| `name` | string | | 文件名 |
|
||||
| `size` | int64 | | 文件大小 |
|
||||
| `url` | string | | 下载链接 |
|
||||
@ -117,7 +117,31 @@ enable ws?(Y/n)
|
||||
|
||||
*注：可以使用*`go env -w GOPROXY=https://goproxy.cn,direct`*来加速国内依赖安装速度*
|
||||
|
||||
*注：此时构建后的文件名为*`main`(Linux)或`main.exe`(Windows)
|
||||
*注：此时构建后的文件名为*`go-cqhttp`(Linux)或`go-cqhttp.exe`(Windows)
|
||||
|
||||
## 更新
|
||||
|
||||
### 方法一
|
||||
|
||||
从[release] (https://github.com/Mrs4s/go-cqhttp/releases)界面下载最新版本的go-cqhttp
|
||||
并替换之前的版本
|
||||
|
||||
### 方法二
|
||||
|
||||
使用更新参数，在命令行中打开go-cqhttp所在目录
|
||||
#### windows
|
||||
输入指令
|
||||
`go-cqhttp.exe update`
|
||||
|
||||
如果在国内连接github下载速度可能很慢，可以使用镜像源下载
|
||||
|
||||
`go-cqhttp.exe update https://github.rc1844.workers.dev`
|
||||
|
||||
几个可用的镜像源
|
||||
- `https://hub.fastgit.org`
|
||||
- `https://github.com.cnpmjs.org`
|
||||
- `https://github.bajins.com`
|
||||
- `https://github.rc1844.workers.dev`
|
||||
|
||||
#### linux
|
||||
方法与windows基本一致，将 `go-cqhttp.exe` 替换为 `./go-cqhttp`即可
|
||||
@ -4,11 +4,12 @@ import (
|
||||
"crypto/md5"
|
||||
"errors"
|
||||
"fmt"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/wdvxdr1123/go-silk/silk"
|
||||
"io/ioutil"
|
||||
"path"
|
||||
"sync"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/wdvxdr1123/go-silk/silk"
|
||||
)
|
||||
|
||||
var codec silk.Encoder
|
||||
|
||||
@ -33,6 +33,7 @@ type JsonConfig struct {
|
||||
WSConfig *GoCQWebsocketConfig `json:"ws_config"`
|
||||
ReverseServers []*GoCQReverseWebsocketConfig `json:"ws_reverse_servers"`
|
||||
PostMessageFormat string `json:"post_message_format"`
|
||||
UseSSOAddress bool `json:"use_sso_address"`
|
||||
Debug bool `json:"debug"`
|
||||
LogLevel string `json:"log_level"`
|
||||
WebUi *GoCqWebUi `json:"web_ui"`
|
||||
@ -131,7 +132,7 @@ func DefaultConfig() *JsonConfig {
|
||||
},
|
||||
WebUi: &GoCqWebUi{
|
||||
Enabled: true,
|
||||
Host: "0.0.0.0",
|
||||
Host: "127.0.0.1",
|
||||
WebInput: false,
|
||||
WebUiPort: 9999,
|
||||
},
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
package global
|
||||
|
||||
import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/tidwall/gjson"
|
||||
"io/ioutil"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/tidwall/gjson"
|
||||
)
|
||||
|
||||
type Filter interface {
|
||||
|
||||
41
global/fs.go
41
global/fs.go
@ -6,13 +6,18 @@ import (
|
||||
"encoding/base64"
|
||||
"encoding/hex"
|
||||
"errors"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"net"
|
||||
"net/url"
|
||||
"os"
|
||||
"path"
|
||||
"runtime"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/dustin/go-humanize"
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
var (
|
||||
@ -107,3 +112,37 @@ func DelFile(path string) bool {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
func ReadAddrFile(path string) []*net.TCPAddr {
|
||||
d, err := ioutil.ReadFile(path)
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
str := string(d)
|
||||
lines := strings.Split(str, "\n")
|
||||
var ret []*net.TCPAddr
|
||||
for _, l := range lines {
|
||||
ip := strings.Split(strings.TrimSpace(l), ":")
|
||||
if len(ip) == 2 {
|
||||
port, _ := strconv.Atoi(ip[1])
|
||||
ret = append(ret, &net.TCPAddr{IP: net.ParseIP(ip[0]), Port: port})
|
||||
}
|
||||
}
|
||||
return ret
|
||||
}
|
||||
|
||||
type WriteCounter struct {
|
||||
Total uint64
|
||||
}
|
||||
|
||||
func (wc *WriteCounter) Write(p []byte) (int, error) {
|
||||
n := len(p)
|
||||
wc.Total += uint64(n)
|
||||
wc.PrintProgress()
|
||||
return n, nil
|
||||
}
|
||||
|
||||
func (wc WriteCounter) PrintProgress() {
|
||||
fmt.Printf("\r%s", strings.Repeat(" ", 35))
|
||||
fmt.Printf("\rDownloading... %s complete", humanize.Bytes(wc.Total))
|
||||
}
|
||||
|
||||
@ -4,11 +4,12 @@ import (
|
||||
"bytes"
|
||||
"compress/gzip"
|
||||
"fmt"
|
||||
"github.com/tidwall/gjson"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/tidwall/gjson"
|
||||
)
|
||||
|
||||
var client = &http.Client{
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
package global
|
||||
|
||||
import (
|
||||
"github.com/tidwall/gjson"
|
||||
"math"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/tidwall/gjson"
|
||||
)
|
||||
|
||||
var trueSet = map[string]struct{}{
|
||||
@ -48,3 +52,22 @@ func EnsureBool(p interface{}, defaultVal bool) bool {
|
||||
}
|
||||
return defaultVal
|
||||
}
|
||||
|
||||
// VersionNameCompare 检查版本名是否需要更新, 仅适用于 go-cqhttp 的版本命名规则
|
||||
// 例: v0.9.29-fix2 == v0.9.29-fix2 -> false
|
||||
// v0.9.29-fix1 < v0.9.29-fix2 -> true
|
||||
// v0.9.29-fix2 > v0.9.29-fix1 -> false
|
||||
// v0.9.29-fix2 < v0.9.30 -> true
|
||||
func VersionNameCompare(current, remote string) bool {
|
||||
sp := regexp.MustCompile(`[0-9]\d*`)
|
||||
cur := sp.FindAllStringSubmatch(current, -1)
|
||||
re := sp.FindAllStringSubmatch(remote, -1)
|
||||
for i := 0; i < int(math.Min(float64(len(cur)), float64(len(re)))); i++ {
|
||||
curSub, _ := strconv.Atoi(cur[i][0])
|
||||
reSub, _ := strconv.Atoi(re[i][0])
|
||||
if curSub < reSub {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return len(cur) < len(re)
|
||||
}
|
||||
|
||||
@ -2,6 +2,7 @@ package global
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"golang.org/x/time/rate"
|
||||
)
|
||||
|
||||
|
||||
9
go.mod
9
go.mod
@ -3,10 +3,15 @@ module github.com/Mrs4s/go-cqhttp
|
||||
go 1.14
|
||||
|
||||
require (
|
||||
github.com/Mrs4s/MiraiGo v0.0.0-20201027102621-5fa25a7f7434
|
||||
github.com/Mrs4s/MiraiGo v0.0.0-20201117154121-989187125900
|
||||
github.com/dustin/go-humanize v1.0.0
|
||||
github.com/getlantern/go-update v0.0.0-20190510022740-79c495ab728c
|
||||
github.com/getlantern/golog v0.0.0-20201105130739-9586b8bde3a9 // indirect
|
||||
github.com/gin-gonic/gin v1.6.3
|
||||
github.com/gorilla/websocket v1.4.2
|
||||
github.com/guonaihong/gout v0.1.3
|
||||
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
|
||||
github.com/kr/binarydist v0.1.0 // indirect
|
||||
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
|
||||
github.com/lestrrat-go/strftime v1.0.3 // indirect
|
||||
github.com/pkg/errors v0.9.1 // indirect
|
||||
@ -14,7 +19,7 @@ require (
|
||||
github.com/sirupsen/logrus v1.7.0
|
||||
github.com/syndtr/goleveldb v1.0.0
|
||||
github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
|
||||
github.com/tidwall/gjson v1.6.1
|
||||
github.com/tidwall/gjson v1.6.3
|
||||
github.com/wdvxdr1123/go-silk v0.0.0-20201007123416-b982fd3d91d6
|
||||
github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189
|
||||
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
|
||||
|
||||
37
go.sum
37
go.sum
@ -1,16 +1,30 @@
|
||||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/Mrs4s/MiraiGo v0.0.0-20201025234014-8ece3a9dd803 h1:tRXLslHbNt4bd2wV+MIU2sqQME6UJfMYolYufhSRdg0=
|
||||
github.com/Mrs4s/MiraiGo v0.0.0-20201025234014-8ece3a9dd803/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
|
||||
github.com/Mrs4s/MiraiGo v0.0.0-20201027102621-5fa25a7f7434 h1:wb5EoWBj/ulZ30fBQA2KJ0IwVXcesu9aynCFdpRwS8M=
|
||||
github.com/Mrs4s/MiraiGo v0.0.0-20201027102621-5fa25a7f7434/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
|
||||
github.com/Mrs4s/MiraiGo v0.0.0-20201117154121-989187125900 h1:xnx3dH7hgZ/Z4k33EhKzBmQhwASJ5bvsorqPhO0DWbc=
|
||||
github.com/Mrs4s/MiraiGo v0.0.0-20201117154121-989187125900/go.mod h1:pAsWtMIwqkBXr5DkUpTIHoWQJNduVnX9WSBPmPvkuCs=
|
||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
|
||||
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
|
||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
||||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||
github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 h1:NRUJuo3v3WGC/g5YiyF790gut6oQr5f3FBI88Wv0dx4=
|
||||
github.com/getlantern/context v0.0.0-20190109183933-c447772a6520/go.mod h1:L+mq6/vvYHKjCX2oez0CgEAJmbq1fbb/oNJIWQkBybY=
|
||||
github.com/getlantern/errors v1.0.1 h1:XukU2whlh7OdpxnkXhNH9VTLVz0EVPGKDV5K0oWhvzw=
|
||||
github.com/getlantern/errors v1.0.1/go.mod h1:l+xpFBrCtDLpK9qNjxs+cHU6+BAdlBaxHqikB6Lku3A=
|
||||
github.com/getlantern/go-update v0.0.0-20190510022740-79c495ab728c h1:mP9bsvdddRSMwqO+lmNuSrsH7nD2nBIz7af+e/4je4c=
|
||||
github.com/getlantern/go-update v0.0.0-20190510022740-79c495ab728c/go.mod h1:goroSTghTcnjKaR2C8ovKWy1lEvRNfqHrW/kRJNMek0=
|
||||
github.com/getlantern/golog v0.0.0-20201105130739-9586b8bde3a9 h1:8MYJU90rB1bsavemKSAuDKBjtAKo5xq95bEPOnzV7CE=
|
||||
github.com/getlantern/golog v0.0.0-20201105130739-9586b8bde3a9/go.mod h1:ZyIjgH/1wTCl+B+7yH1DqrWp6MPJqESmwmEQ89ZfhvA=
|
||||
github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7 h1:micT5vkcr9tOVk1FiH8SWKID8ultN44Z+yzd2y/Vyb0=
|
||||
github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7/go.mod h1:dD3CgOrwlzca8ed61CsZouQS5h5jIzkK9ZWrTcf0s+o=
|
||||
github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55 h1:XYzSdCbkzOC0FDNrgJqGRo8PCMFOBFL9py72DRs7bmc=
|
||||
github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55/go.mod h1:6mmzY2kW1TOOrVy+r41Za2MxXM+hhqTtY3oBKd2AgFA=
|
||||
github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f h1:wrYrQttPS8FHIRSlsrcuKazukx/xqO/PpLZzZXsF+EA=
|
||||
github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA=
|
||||
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
|
||||
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
|
||||
github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
|
||||
@ -25,6 +39,8 @@ github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD87
|
||||
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
|
||||
github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
|
||||
github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
|
||||
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
|
||||
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
||||
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
@ -36,8 +52,8 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
|
||||
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.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
|
||||
github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
|
||||
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
||||
github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
|
||||
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
||||
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
|
||||
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
|
||||
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
||||
@ -54,7 +70,11 @@ github.com/guonaihong/gout v0.1.3/go.mod h1:vXvv5Kxr70eM5wrp4F0+t9lnLWmq+YPW2GBy
|
||||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
||||
github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
|
||||
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||
github.com/kr/binarydist v0.1.0 h1:6kAoLA9FMMnNGSehX0s1PdjbEaACznAv/W219j2uvyo=
|
||||
github.com/kr/binarydist v0.1.0/go.mod h1:DY7S//GCoz1BCd0B0EVrinCKAZN3pXe+MDaIZbXQVgM=
|
||||
github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
|
||||
github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
|
||||
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
|
||||
@ -73,6 +93,8 @@ github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S
|
||||
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
|
||||
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
|
||||
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
|
||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
@ -92,8 +114,9 @@ github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFd
|
||||
github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
|
||||
github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk=
|
||||
github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
|
||||
github.com/tidwall/gjson v1.6.1 h1:LRbvNuNuvAiISWg6gxLEFuCe72UKy5hDqhxW/8183ws=
|
||||
github.com/tidwall/gjson v1.6.1/go.mod h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0=
|
||||
github.com/tidwall/gjson v1.6.3 h1:aHoiiem0dr7GHkW001T1SMTJ7X5PvyekH5WX0whWGnI=
|
||||
github.com/tidwall/gjson v1.6.3/go.mod h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0=
|
||||
github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
|
||||
github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
|
||||
github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
|
||||
|
||||
225
main.go
225
main.go
@ -2,27 +2,37 @@ package main
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"context"
|
||||
"crypto/md5"
|
||||
"encoding/base64"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"github.com/Mrs4s/go-cqhttp/server"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"os"
|
||||
"os/exec"
|
||||
"os/signal"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/Mrs4s/go-cqhttp/server"
|
||||
"github.com/guonaihong/gout"
|
||||
"github.com/tidwall/gjson"
|
||||
|
||||
"github.com/Mrs4s/MiraiGo/binary"
|
||||
"github.com/Mrs4s/MiraiGo/client"
|
||||
"github.com/Mrs4s/go-cqhttp/coolq"
|
||||
"github.com/Mrs4s/go-cqhttp/global"
|
||||
"github.com/lestrrat-go/file-rotatelogs"
|
||||
"github.com/getlantern/go-update"
|
||||
rotatelogs "github.com/lestrrat-go/file-rotatelogs"
|
||||
"github.com/rifflock/lfshook"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/t-tomalak/logrus-easy-formatter"
|
||||
easy "github.com/t-tomalak/logrus-easy-formatter"
|
||||
)
|
||||
|
||||
func init() {
|
||||
@ -87,6 +97,30 @@ func init() {
|
||||
|
||||
func main() {
|
||||
console := bufio.NewReader(os.Stdin)
|
||||
var strKey string
|
||||
var isFastStart bool = false
|
||||
arg := os.Args
|
||||
if len(arg) > 1 {
|
||||
for i := range arg {
|
||||
switch arg[i] {
|
||||
case "update":
|
||||
if len(arg) > i+1 {
|
||||
selfUpdate(arg[i+1])
|
||||
} else {
|
||||
selfUpdate("")
|
||||
}
|
||||
case "key":
|
||||
if len(arg) > i+1 {
|
||||
b := []byte(arg[i+1])
|
||||
b = append(b, 13, 10)
|
||||
strKey = string(b[:])
|
||||
}
|
||||
case "faststart":
|
||||
isFastStart = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var conf *global.JsonConfig
|
||||
if global.PathExists("config.json") || os.Getenv("UIN") == "" {
|
||||
conf = global.Load("config.json")
|
||||
@ -200,22 +234,42 @@ func main() {
|
||||
}
|
||||
}
|
||||
if conf.PasswordEncrypted != "" {
|
||||
log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
|
||||
strKey, _ := console.ReadString('\n')
|
||||
if strKey == "" {
|
||||
log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
|
||||
ctx := context.Background()
|
||||
go func(ctx context.Context) {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case <-time.After(time.Second * 45):
|
||||
log.Infof("解密key输入超时")
|
||||
time.Sleep(3 * time.Second)
|
||||
os.Exit(0)
|
||||
}
|
||||
}(ctx)
|
||||
strKey, _ = console.ReadString('\n')
|
||||
ctx.Done()
|
||||
} else {
|
||||
log.Infof("密码加密已启用, 使用运行时传递的参数进行解密，按 Ctrl+C 取消.")
|
||||
}
|
||||
key := md5.Sum([]byte(strKey))
|
||||
conf.Password = DecryptPwd(conf.PasswordEncrypted, key[:])
|
||||
}
|
||||
log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
|
||||
time.Sleep(time.Second * 5)
|
||||
if !isFastStart {
|
||||
log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
|
||||
time.Sleep(time.Second * 5)
|
||||
}
|
||||
log.Info("开始尝试登录并同步消息...")
|
||||
log.Infof("使用协议: %v", func() string {
|
||||
switch client.SystemDeviceInfo.Protocol {
|
||||
case client.AndroidPad:
|
||||
return "Android Pad"
|
||||
case client.IPad:
|
||||
return "iPad"
|
||||
case client.AndroidPhone:
|
||||
return "Android Phone"
|
||||
case client.AndroidWatch:
|
||||
return "Android Watch"
|
||||
case client.MacOS:
|
||||
return "MacOS"
|
||||
}
|
||||
return "未知"
|
||||
}())
|
||||
@ -230,8 +284,21 @@ func main() {
|
||||
log.Debug("Protocol -> " + e.Message)
|
||||
}
|
||||
})
|
||||
cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) {
|
||||
if global.PathExists("address.txt") {
|
||||
log.Infof("检测到 address.txt 文件. 将覆盖目标IP.")
|
||||
addr := global.ReadAddrFile("address.txt")
|
||||
if len(addr) > 0 {
|
||||
cli.SetCustomServer(addr)
|
||||
}
|
||||
log.Infof("读取到 %v 个自定义地址.", len(addr))
|
||||
}
|
||||
cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
|
||||
if !conf.UseSSOAddress {
|
||||
log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
|
||||
return false
|
||||
}
|
||||
log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
|
||||
return true
|
||||
})
|
||||
if conf.WebUi == nil {
|
||||
conf.WebUi = &global.GoCqWebUi{
|
||||
@ -245,7 +312,7 @@ func main() {
|
||||
conf.WebUi.WebUiPort = 9999
|
||||
}
|
||||
if conf.WebUi.Host == "" {
|
||||
conf.WebUi.Host = "0.0.0.0"
|
||||
conf.WebUi.Host = "127.0.0.1"
|
||||
}
|
||||
confErr := conf.Save("config.json")
|
||||
if confErr != nil {
|
||||
@ -253,9 +320,18 @@ func main() {
|
||||
}
|
||||
b := server.WebServer.Run(fmt.Sprintf("%s:%d", conf.WebUi.Host, conf.WebUi.WebUiPort), cli)
|
||||
c := server.Console
|
||||
r := server.Restart
|
||||
go checkUpdate()
|
||||
signal.Notify(c, os.Interrupt, os.Kill)
|
||||
<-c
|
||||
b.Release()
|
||||
select {
|
||||
case <-c:
|
||||
b.Release()
|
||||
case <-r:
|
||||
log.Info("正在重启中...")
|
||||
server.HttpServer.ShutDown()
|
||||
defer b.Release()
|
||||
restart(arg)
|
||||
}
|
||||
}
|
||||
|
||||
func EncryptPwd(pwd string, key []byte) string {
|
||||
@ -282,3 +358,126 @@ func DecryptPwd(ePwd string, key []byte) string {
|
||||
}
|
||||
return string(tea.Decrypt(encrypted))
|
||||
}
|
||||
|
||||
func checkUpdate() {
|
||||
log.Infof("正在检查更新.")
|
||||
if coolq.Version == "unknown" {
|
||||
log.Warnf("检查更新失败: 使用的 Actions 测试版或自编译版本.")
|
||||
return
|
||||
}
|
||||
var res string
|
||||
if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases").BindBody(&res).Do(); err != nil {
|
||||
log.Warnf("检查更新失败: %v", err)
|
||||
return
|
||||
}
|
||||
detail := gjson.Parse(res)
|
||||
if len(detail.Array()) < 1 {
|
||||
return
|
||||
}
|
||||
info := detail.Array()[0]
|
||||
if global.VersionNameCompare(coolq.Version, info.Get("tag_name").Str) {
|
||||
log.Infof("当前有更新的 go-cqhttp 可供更新, 请前往 https://github.com/Mrs4s/go-cqhttp/releases 下载.")
|
||||
log.Infof("当前版本: %v 最新版本: %v", coolq.Version, info.Get("tag_name").Str)
|
||||
return
|
||||
}
|
||||
log.Infof("检查更新完成. 当前已运行最新版本.")
|
||||
}
|
||||
|
||||
func selfUpdate(imageUrl string) {
|
||||
console := bufio.NewReader(os.Stdin)
|
||||
readLine := func() (str string) {
|
||||
str, _ = console.ReadString('\n')
|
||||
return
|
||||
}
|
||||
log.Infof("正在检查更新.")
|
||||
var res string
|
||||
if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases").BindBody(&res).Do(); err != nil {
|
||||
log.Warnf("检查更新失败: %v", err)
|
||||
return
|
||||
}
|
||||
detail := gjson.Parse(res)
|
||||
if len(detail.Array()) < 1 {
|
||||
return
|
||||
}
|
||||
info := detail.Array()[0]
|
||||
version := info.Get("tag_name").Str
|
||||
if coolq.Version != version {
|
||||
log.Info("当前最新版本为 ", version)
|
||||
log.Warn("是否更新(y/N): ")
|
||||
r := strings.TrimSpace(readLine())
|
||||
|
||||
doUpdate := func() {
|
||||
log.Info("正在更新,请稍等...")
|
||||
url := fmt.Sprintf(
|
||||
"%v/Mrs4s/go-cqhttp/releases/download/%v/go-cqhttp-%v-%v-%v",
|
||||
func() string {
|
||||
if imageUrl != "" {
|
||||
return imageUrl
|
||||
}
|
||||
return "https://github.com"
|
||||
}(),
|
||||
version,
|
||||
version,
|
||||
runtime.GOOS,
|
||||
runtime.GOARCH,
|
||||
)
|
||||
if runtime.GOOS == "windows" {
|
||||
url = url + ".exe"
|
||||
}
|
||||
resp, err := http.Get(url)
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
log.Error("更新失败!")
|
||||
return
|
||||
}
|
||||
wc := global.WriteCounter{}
|
||||
err, _ = update.New().FromStream(io.TeeReader(resp.Body, &wc))
|
||||
fmt.Println()
|
||||
if err != nil {
|
||||
log.Error("更新失败!")
|
||||
return
|
||||
}
|
||||
log.Info("更新完成！")
|
||||
}
|
||||
|
||||
if r == "y" || r == "Y" {
|
||||
doUpdate()
|
||||
} else {
|
||||
log.Warn("已取消更新！")
|
||||
}
|
||||
}
|
||||
log.Info("按 Enter 继续....")
|
||||
readLine()
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
func restart(Args []string) {
|
||||
cmd := &exec.Cmd{}
|
||||
if runtime.GOOS == "windows" {
|
||||
file, err := exec.LookPath(Args[0])
|
||||
if err != nil {
|
||||
log.Errorf("重启失败:%s", err.Error())
|
||||
return
|
||||
}
|
||||
path, err := filepath.Abs(file)
|
||||
if err != nil {
|
||||
log.Errorf("重启失败:%s", err.Error())
|
||||
}
|
||||
Args = append([]string{"/c", "start ", path, "faststart"}, Args[1:]...)
|
||||
cmd = &exec.Cmd{
|
||||
Path: "cmd.exe",
|
||||
Args: Args,
|
||||
Stderr: os.Stderr,
|
||||
Stdout: os.Stdout,
|
||||
}
|
||||
} else {
|
||||
Args = append(Args, "faststart")
|
||||
cmd = &exec.Cmd{
|
||||
Path: Args[0],
|
||||
Args: Args,
|
||||
Stderr: os.Stderr,
|
||||
Stdout: os.Stdout,
|
||||
}
|
||||
}
|
||||
cmd.Start()
|
||||
}
|
||||
|
||||
@ -6,13 +6,6 @@ import (
|
||||
"encoding/base64"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"github.com/Mrs4s/MiraiGo/client"
|
||||
"github.com/Mrs4s/go-cqhttp/coolq"
|
||||
"github.com/Mrs4s/go-cqhttp/global"
|
||||
"github.com/gin-gonic/gin"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/tidwall/gjson"
|
||||
"github.com/yinghau76/go-ascii-art"
|
||||
"image"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
@ -21,12 +14,22 @@ import (
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/Mrs4s/MiraiGo/client"
|
||||
"github.com/Mrs4s/go-cqhttp/coolq"
|
||||
"github.com/Mrs4s/go-cqhttp/global"
|
||||
"github.com/gin-gonic/gin"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/tidwall/gjson"
|
||||
asciiart "github.com/yinghau76/go-ascii-art"
|
||||
)
|
||||
|
||||
var WebInput = make(chan string, 1) //长度1，用于阻塞
|
||||
|
||||
var Console = make(chan os.Signal, 1)
|
||||
|
||||
var Restart = make(chan struct{}, 1)
|
||||
|
||||
var JsonConfig *global.JsonConfig
|
||||
|
||||
type webServer struct {
|
||||
@ -41,16 +44,17 @@ var WebServer = &webServer{}
|
||||
|
||||
// admin 子站的 路由映射
|
||||
var HttpuriAdmin = map[string]func(s *webServer, c *gin.Context){
|
||||
"do_restart": AdminDoRestart, //热重启
|
||||
"get_web_write": AdminWebWrite, //获取是否验证码输入
|
||||
"do_web_write": AdminDoWebWrite, //web上进行输入操作
|
||||
"do_restart_docker": AdminDoRestartDocker, //直接停止（依赖supervisord/docker）重新拉起
|
||||
"do_config_base": AdminDoConfigBase, //修改config.json中的基础部分
|
||||
"do_config_http": AdminDoConfigHttp, //修改config.json的http部分
|
||||
"do_config_ws": AdminDoConfigWs, //修改config.json的正向ws部分
|
||||
"do_config_reverse": AdminDoConfigReverse, //修改config.json 中的反向ws部分
|
||||
"do_config_json": AdminDoConfigJson, //直接修改 config.json配置
|
||||
"get_config_json": AdminGetConfigJson, //拉取 当前的config.json配置
|
||||
"do_restart": AdminDoRestart, //热重启
|
||||
"do_process_restart": AdminProcessRestart, //进程重启
|
||||
"get_web_write": AdminWebWrite, //获取是否验证码输入
|
||||
"do_web_write": AdminDoWebWrite, //web上进行输入操作
|
||||
"do_restart_docker": AdminDoRestartDocker, //直接停止（依赖supervisord/docker）重新拉起
|
||||
"do_config_base": AdminDoConfigBase, //修改config.json中的基础部分
|
||||
"do_config_http": AdminDoConfigHttp, //修改config.json的http部分
|
||||
"do_config_ws": AdminDoConfigWs, //修改config.json的正向ws部分
|
||||
"do_config_reverse": AdminDoConfigReverse, //修改config.json 中的反向ws部分
|
||||
"do_config_json": AdminDoConfigJson, //直接修改 config.json配置
|
||||
"get_config_json": AdminGetConfigJson, //拉取 当前的config.json配置
|
||||
}
|
||||
|
||||
func Failed(code int, msg string) coolq.MSG {
|
||||
@ -183,7 +187,11 @@ func (s *webServer) Dologin() {
|
||||
os.Exit(0)
|
||||
return
|
||||
case client.OtherLoginError, client.UnknownLoginError:
|
||||
log.Warnf("登录失败: %v", rsp.ErrorMessage)
|
||||
msg := rsp.ErrorMessage
|
||||
if strings.Contains(msg, "版本") {
|
||||
msg = "密码错误或账号被冻结"
|
||||
}
|
||||
log.Warnf("登录失败: %v", msg)
|
||||
log.Infof("按 Enter 继续....")
|
||||
readLine()
|
||||
os.Exit(0)
|
||||
@ -225,8 +233,7 @@ func (s *webServer) Dologin() {
|
||||
log.Warn("Bot已登录")
|
||||
return
|
||||
}
|
||||
if conf.ReLogin.MaxReloginTimes == 0 {
|
||||
} else if times > conf.ReLogin.MaxReloginTimes {
|
||||
if times > conf.ReLogin.MaxReloginTimes && conf.ReLogin.MaxReloginTimes != 0 {
|
||||
break
|
||||
}
|
||||
log.Warnf("Bot已离线 (%v)，将在 %v 秒后尝试重连. 重连次数：%v",
|
||||
@ -236,6 +243,7 @@ func (s *webServer) Dologin() {
|
||||
rsp, err := cli.Login()
|
||||
if err != nil {
|
||||
log.Errorf("重连失败: %v", err)
|
||||
cli.Disconnect()
|
||||
continue
|
||||
}
|
||||
if !rsp.Success {
|
||||
@ -246,6 +254,7 @@ func (s *webServer) Dologin() {
|
||||
log.Fatalf("重连失败: 设备锁")
|
||||
default:
|
||||
log.Errorf("重连失败: %v", rsp.ErrorMessage)
|
||||
cli.Disconnect()
|
||||
continue
|
||||
}
|
||||
}
|
||||
@ -335,12 +344,14 @@ func (s *webServer) DoReLogin() { // TODO: 协议层的 ReLogin
|
||||
log.Info("开始尝试登录并同步消息...")
|
||||
log.Infof("使用协议: %v", func() string {
|
||||
switch client.SystemDeviceInfo.Protocol {
|
||||
case client.AndroidPad:
|
||||
return "Android Pad"
|
||||
case client.IPad:
|
||||
return "iPad"
|
||||
case client.AndroidPhone:
|
||||
return "Android Phone"
|
||||
case client.AndroidWatch:
|
||||
return "Android Watch"
|
||||
case client.MacOS:
|
||||
return "MacOS"
|
||||
}
|
||||
return "未知"
|
||||
}())
|
||||
@ -354,8 +365,13 @@ func (s *webServer) DoReLogin() { // TODO: 协议层的 ReLogin
|
||||
log.Debug("Protocol -> " + e.Message)
|
||||
}
|
||||
})
|
||||
cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) {
|
||||
cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
|
||||
if !conf.UseSSOAddress {
|
||||
log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
|
||||
return false
|
||||
}
|
||||
log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
|
||||
return true
|
||||
})
|
||||
s.Cli = cli
|
||||
s.Dologin()
|
||||
@ -403,6 +419,7 @@ func (s *webServer) ReloadServer() {
|
||||
|
||||
// 热重启
|
||||
func AdminDoRestart(s *webServer, c *gin.Context) {
|
||||
s.bot.Release()
|
||||
s.bot = nil
|
||||
s.Cli = nil
|
||||
s.DoReLogin()
|
||||
@ -410,6 +427,12 @@ func AdminDoRestart(s *webServer, c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
// 进程重启
|
||||
func AdminProcessRestart(s *webServer, c *gin.Context) {
|
||||
Restart <- struct{}{}
|
||||
c.JSON(200, coolq.OK(coolq.MSG{}))
|
||||
}
|
||||
|
||||
// 冷重启
|
||||
func AdminDoRestartDocker(s *webServer, c *gin.Context) {
|
||||
Console <- os.Kill
|
||||
|
||||
284
server/http.go
284
server/http.go
@ -11,6 +11,8 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/guonaihong/gout/dataflow"
|
||||
|
||||
"github.com/Mrs4s/go-cqhttp/coolq"
|
||||
"github.com/Mrs4s/go-cqhttp/global"
|
||||
"github.com/gin-gonic/gin"
|
||||
@ -132,7 +134,13 @@ func (c *httpClient) onBotPushEvent(m coolq.MSG) {
|
||||
return h
|
||||
}()).SetTimeout(time.Second * time.Duration(c.timeout)).F().Retry().Attempt(5).
|
||||
WaitTime(time.Millisecond * 500).MaxWaitTime(time.Second * 5).
|
||||
Do()
|
||||
Func(func(con *dataflow.Context) error {
|
||||
if con.Error != nil {
|
||||
log.Warnf("上报Event到 HTTP 服务器 %v 时出现错误: %v 将重试.", c.addr, con.Error)
|
||||
return con.Error
|
||||
}
|
||||
return nil
|
||||
}).Do()
|
||||
if err != nil {
|
||||
log.Warnf("上报Event数据 %v 到 %v 失败: %v", m.ToJson(), c.addr, err)
|
||||
return
|
||||
@ -154,55 +162,78 @@ func (s *httpServer) HandleActions(c *gin.Context) {
|
||||
}
|
||||
}
|
||||
|
||||
func (s *httpServer) GetLoginInfo(c *gin.Context) {
|
||||
func GetLoginInfo(s *httpServer, c *gin.Context) {
|
||||
c.JSON(200, s.bot.CQGetLoginInfo())
|
||||
}
|
||||
|
||||
func (s *httpServer) GetFriendList(c *gin.Context) {
|
||||
func GetFriendList(s *httpServer, c *gin.Context) {
|
||||
c.JSON(200, s.bot.CQGetFriendList())
|
||||
}
|
||||
|
||||
func (s *httpServer) GetGroupList(c *gin.Context) {
|
||||
func GetGroupList(s *httpServer, c *gin.Context) {
|
||||
nc := getParamOrDefault(c, "no_cache", "false")
|
||||
c.JSON(200, s.bot.CQGetGroupList(nc == "true"))
|
||||
}
|
||||
|
||||
func (s *httpServer) GetGroupInfo(c *gin.Context) {
|
||||
func GetGroupInfo(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQGetGroupInfo(gid))
|
||||
}
|
||||
|
||||
func (s *httpServer) GetGroupMemberList(c *gin.Context) {
|
||||
func GetGroupMemberList(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
nc := getParamOrDefault(c, "no_cache", "false")
|
||||
c.JSON(200, s.bot.CQGetGroupMemberList(gid, nc == "true"))
|
||||
}
|
||||
|
||||
func (s *httpServer) GetGroupMemberInfo(c *gin.Context) {
|
||||
func GetGroupMemberInfo(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQGetGroupMemberInfo(gid, uid))
|
||||
}
|
||||
|
||||
func (s *httpServer) SendMessage(c *gin.Context) {
|
||||
func GetGroupFileSystemInfo(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQGetGroupFileSystemInfo(gid))
|
||||
}
|
||||
|
||||
func GetGroupRootFiles(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQGetGroupRootFiles(gid))
|
||||
}
|
||||
|
||||
func GetGroupFilesByFolderId(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
folderId := getParam(c, "folder_id")
|
||||
c.JSON(200, s.bot.CQGetGroupFilesByFolderId(gid, folderId))
|
||||
}
|
||||
|
||||
func GetGroupFileUrl(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
fid := getParam(c, "file_id")
|
||||
busid, _ := strconv.ParseInt(getParam(c, "busid"), 10, 32)
|
||||
c.JSON(200, s.bot.CQGetGroupFileUrl(gid, fid, int32(busid)))
|
||||
}
|
||||
|
||||
func SendMessage(s *httpServer, c *gin.Context) {
|
||||
if getParam(c, "message_type") == "private" {
|
||||
s.SendPrivateMessage(c)
|
||||
SendPrivateMessage(s, c)
|
||||
return
|
||||
}
|
||||
if getParam(c, "message_type") == "group" {
|
||||
s.SendGroupMessage(c)
|
||||
SendGroupMessage(s, c)
|
||||
return
|
||||
}
|
||||
if getParam(c, "group_id") != "" {
|
||||
s.SendGroupMessage(c)
|
||||
SendGroupMessage(s, c)
|
||||
return
|
||||
}
|
||||
if getParam(c, "user_id") != "" {
|
||||
s.SendPrivateMessage(c)
|
||||
SendPrivateMessage(s, c)
|
||||
}
|
||||
}
|
||||
|
||||
func (s *httpServer) SendPrivateMessage(c *gin.Context) {
|
||||
func SendPrivateMessage(s *httpServer, c *gin.Context) {
|
||||
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
|
||||
msg, t := getParamWithType(c, "message")
|
||||
autoEscape := global.EnsureBool(getParam(c, "auto_escape"), false)
|
||||
@ -213,7 +244,7 @@ func (s *httpServer) SendPrivateMessage(c *gin.Context) {
|
||||
c.JSON(200, s.bot.CQSendPrivateMessage(uid, msg, autoEscape))
|
||||
}
|
||||
|
||||
func (s *httpServer) SendGroupMessage(c *gin.Context) {
|
||||
func SendGroupMessage(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
msg, t := getParamWithType(c, "message")
|
||||
autoEscape := global.EnsureBool(getParam(c, "auto_escape"), false)
|
||||
@ -224,34 +255,34 @@ func (s *httpServer) SendGroupMessage(c *gin.Context) {
|
||||
c.JSON(200, s.bot.CQSendGroupMessage(gid, msg, autoEscape))
|
||||
}
|
||||
|
||||
func (s *httpServer) SendGroupForwardMessage(c *gin.Context) {
|
||||
func SendGroupForwardMessage(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
msg := getParam(c, "messages")
|
||||
c.JSON(200, s.bot.CQSendGroupForwardMessage(gid, gjson.Parse(msg)))
|
||||
}
|
||||
|
||||
func (s *httpServer) GetImage(c *gin.Context) {
|
||||
func GetImage(s *httpServer, c *gin.Context) {
|
||||
file := getParam(c, "file")
|
||||
c.JSON(200, s.bot.CQGetImage(file))
|
||||
}
|
||||
|
||||
func (s *httpServer) GetMessage(c *gin.Context) {
|
||||
func GetMessage(s *httpServer, c *gin.Context) {
|
||||
mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32)
|
||||
c.JSON(200, s.bot.CQGetMessage(int32(mid)))
|
||||
}
|
||||
|
||||
func (s *httpServer) GetGroupHonorInfo(c *gin.Context) {
|
||||
func GetGroupHonorInfo(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQGetGroupHonorInfo(gid, getParam(c, "type")))
|
||||
}
|
||||
|
||||
func (s *httpServer) ProcessFriendRequest(c *gin.Context) {
|
||||
func ProcessFriendRequest(s *httpServer, c *gin.Context) {
|
||||
flag := getParam(c, "flag")
|
||||
approve := getParamOrDefault(c, "approve", "true")
|
||||
c.JSON(200, s.bot.CQProcessFriendRequest(flag, approve == "true"))
|
||||
}
|
||||
|
||||
func (s *httpServer) ProcessGroupRequest(c *gin.Context) {
|
||||
func ProcessGroupRequest(s *httpServer, c *gin.Context) {
|
||||
flag := getParam(c, "flag")
|
||||
subType := getParam(c, "sub_type")
|
||||
if subType == "" {
|
||||
@ -261,103 +292,113 @@ func (s *httpServer) ProcessGroupRequest(c *gin.Context) {
|
||||
c.JSON(200, s.bot.CQProcessGroupRequest(flag, subType, getParam(c, "reason"), approve == "true"))
|
||||
}
|
||||
|
||||
func (s *httpServer) SetGroupCard(c *gin.Context) {
|
||||
func SetGroupCard(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQSetGroupCard(gid, uid, getParam(c, "card")))
|
||||
}
|
||||
|
||||
func (s *httpServer) SetSpecialTitle(c *gin.Context) {
|
||||
func SetSpecialTitle(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQSetGroupSpecialTitle(gid, uid, getParam(c, "special_title")))
|
||||
}
|
||||
|
||||
func (s *httpServer) SetGroupKick(c *gin.Context) {
|
||||
func SetGroupKick(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
|
||||
msg := getParam(c, "message")
|
||||
c.JSON(200, s.bot.CQSetGroupKick(gid, uid, msg))
|
||||
}
|
||||
|
||||
func (s *httpServer) SetGroupBan(c *gin.Context) {
|
||||
func SetGroupBan(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
|
||||
i, _ := strconv.ParseInt(getParamOrDefault(c, "duration", "1800"), 10, 64)
|
||||
c.JSON(200, s.bot.CQSetGroupBan(gid, uid, uint32(i)))
|
||||
}
|
||||
|
||||
func (s *httpServer) SetWholeBan(c *gin.Context) {
|
||||
func SetWholeBan(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQSetGroupWholeBan(gid, getParamOrDefault(c, "enable", "true") == "true"))
|
||||
}
|
||||
|
||||
func (s *httpServer) SetGroupName(c *gin.Context) {
|
||||
func SetGroupName(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQSetGroupName(gid, getParam(c, "group_name")))
|
||||
}
|
||||
|
||||
func (s *httpServer) SetGroupAdmin(c *gin.Context) {
|
||||
func SetGroupAdmin(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQSetGroupAdmin(gid, uid, getParamOrDefault(c, "enable", "true") == "true"))
|
||||
}
|
||||
|
||||
func (s *httpServer) SendGroupNotice(c *gin.Context) {
|
||||
func SendGroupNotice(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQSetGroupMemo(gid, getParam(c, "content")))
|
||||
}
|
||||
|
||||
func (s *httpServer) SetGroupLeave(c *gin.Context) {
|
||||
func SetGroupLeave(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQSetGroupLeave(gid))
|
||||
}
|
||||
|
||||
func (s *httpServer) GetForwardMessage(c *gin.Context) {
|
||||
func SetRestart(s *httpServer, c *gin.Context) {
|
||||
delay, _ := strconv.ParseInt(getParam(c, "delay"), 10, 64)
|
||||
c.JSON(200, coolq.MSG{"data": nil, "retcode": 0, "status": "async"})
|
||||
go func(delay int64) {
|
||||
time.Sleep(time.Duration(delay) * time.Millisecond)
|
||||
Restart <- struct{}{}
|
||||
}(delay)
|
||||
|
||||
}
|
||||
|
||||
func GetForwardMessage(s *httpServer, c *gin.Context) {
|
||||
resId := getParam(c, "message_id")
|
||||
c.JSON(200, s.bot.CQGetForwardMessage(resId))
|
||||
}
|
||||
|
||||
func (s *httpServer) GetGroupSystemMessage(c *gin.Context) {
|
||||
func GetGroupSystemMessage(s *httpServer, c *gin.Context) {
|
||||
c.JSON(200, s.bot.CQGetGroupSystemMessages())
|
||||
}
|
||||
|
||||
func (s *httpServer) DeleteMessage(c *gin.Context) {
|
||||
func DeleteMessage(s *httpServer, c *gin.Context) {
|
||||
mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32)
|
||||
c.JSON(200, s.bot.CQDeleteMessage(int32(mid)))
|
||||
}
|
||||
|
||||
func (s *httpServer) CanSendImage(c *gin.Context) {
|
||||
func CanSendImage(s *httpServer, c *gin.Context) {
|
||||
c.JSON(200, s.bot.CQCanSendImage())
|
||||
}
|
||||
|
||||
func (s *httpServer) CanSendRecord(c *gin.Context) {
|
||||
func CanSendRecord(s *httpServer, c *gin.Context) {
|
||||
c.JSON(200, s.bot.CQCanSendRecord())
|
||||
}
|
||||
|
||||
func (s *httpServer) GetStatus(c *gin.Context) {
|
||||
func GetStatus(s *httpServer, c *gin.Context) {
|
||||
c.JSON(200, s.bot.CQGetStatus())
|
||||
}
|
||||
|
||||
func (s *httpServer) GetVersionInfo(c *gin.Context) {
|
||||
func GetVersionInfo(s *httpServer, c *gin.Context) {
|
||||
c.JSON(200, s.bot.CQGetVersionInfo())
|
||||
}
|
||||
|
||||
func (s *httpServer) ReloadEventFilter(c *gin.Context) {
|
||||
func ReloadEventFilter(s *httpServer, c *gin.Context) {
|
||||
c.JSON(200, s.bot.CQReloadEventFilter())
|
||||
}
|
||||
|
||||
func (s *httpServer) GetVipInfo(c *gin.Context) {
|
||||
func GetVipInfo(s *httpServer, c *gin.Context) {
|
||||
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQGetVipInfo(uid))
|
||||
}
|
||||
|
||||
func (s *httpServer) GetStrangerInfo(c *gin.Context) {
|
||||
func GetStrangerInfo(s *httpServer, c *gin.Context) {
|
||||
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQGetStrangerInfo(uid))
|
||||
}
|
||||
|
||||
func (s *httpServer) HandleQuickOperation(c *gin.Context) {
|
||||
func HandleQuickOperation(s *httpServer, c *gin.Context) {
|
||||
if c.Request.Method != "POST" {
|
||||
c.AbortWithStatus(404)
|
||||
return
|
||||
@ -368,17 +409,17 @@ func (s *httpServer) HandleQuickOperation(c *gin.Context) {
|
||||
}
|
||||
}
|
||||
|
||||
func (s *httpServer) OcrImage(c *gin.Context) {
|
||||
func OcrImage(s *httpServer, c *gin.Context) {
|
||||
img := getParam(c, "image")
|
||||
c.JSON(200, s.bot.CQOcrImage(img))
|
||||
}
|
||||
|
||||
func (s *httpServer) GetWordSlices(c *gin.Context) {
|
||||
func GetWordSlices(s *httpServer, c *gin.Context) {
|
||||
content := getParam(c, "content")
|
||||
c.JSON(200, s.bot.CQGetWordSlices(content))
|
||||
}
|
||||
|
||||
func (s *httpServer) SetGroupPortrait(c *gin.Context) {
|
||||
func SetGroupPortrait(s *httpServer, c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
file := getParam(c, "file")
|
||||
cache := getParam(c, "cache")
|
||||
@ -434,120 +475,49 @@ func getParamWithType(c *gin.Context, k string) (string, gjson.Type) {
|
||||
}
|
||||
|
||||
var httpApi = map[string]func(s *httpServer, c *gin.Context){
|
||||
"get_login_info": func(s *httpServer, c *gin.Context) {
|
||||
s.GetLoginInfo(c)
|
||||
},
|
||||
"get_friend_list": func(s *httpServer, c *gin.Context) {
|
||||
s.GetFriendList(c)
|
||||
},
|
||||
"get_group_list": func(s *httpServer, c *gin.Context) {
|
||||
s.GetGroupList(c)
|
||||
},
|
||||
"get_group_info": func(s *httpServer, c *gin.Context) {
|
||||
s.GetGroupInfo(c)
|
||||
},
|
||||
"get_group_member_list": func(s *httpServer, c *gin.Context) {
|
||||
s.GetGroupMemberList(c)
|
||||
},
|
||||
"get_group_member_info": func(s *httpServer, c *gin.Context) {
|
||||
s.GetGroupMemberInfo(c)
|
||||
},
|
||||
"send_msg": func(s *httpServer, c *gin.Context) {
|
||||
s.SendMessage(c)
|
||||
},
|
||||
"send_group_msg": func(s *httpServer, c *gin.Context) {
|
||||
s.SendGroupMessage(c)
|
||||
},
|
||||
"send_group_forward_msg": func(s *httpServer, c *gin.Context) {
|
||||
s.SendGroupForwardMessage(c)
|
||||
},
|
||||
"send_private_msg": func(s *httpServer, c *gin.Context) {
|
||||
s.SendPrivateMessage(c)
|
||||
},
|
||||
"delete_msg": func(s *httpServer, c *gin.Context) {
|
||||
s.DeleteMessage(c)
|
||||
},
|
||||
"set_friend_add_request": func(s *httpServer, c *gin.Context) {
|
||||
s.ProcessFriendRequest(c)
|
||||
},
|
||||
"set_group_add_request": func(s *httpServer, c *gin.Context) {
|
||||
s.ProcessGroupRequest(c)
|
||||
},
|
||||
"set_group_card": func(s *httpServer, c *gin.Context) {
|
||||
s.SetGroupCard(c)
|
||||
},
|
||||
"set_group_special_title": func(s *httpServer, c *gin.Context) {
|
||||
s.SetSpecialTitle(c)
|
||||
},
|
||||
"set_group_kick": func(s *httpServer, c *gin.Context) {
|
||||
s.SetGroupKick(c)
|
||||
},
|
||||
"set_group_ban": func(s *httpServer, c *gin.Context) {
|
||||
s.SetGroupBan(c)
|
||||
},
|
||||
"set_group_whole_ban": func(s *httpServer, c *gin.Context) {
|
||||
s.SetWholeBan(c)
|
||||
},
|
||||
"set_group_name": func(s *httpServer, c *gin.Context) {
|
||||
s.SetGroupName(c)
|
||||
},
|
||||
"set_group_admin": func(s *httpServer, c *gin.Context) {
|
||||
s.SetGroupAdmin(c)
|
||||
},
|
||||
"_send_group_notice": func(s *httpServer, c *gin.Context) {
|
||||
s.SendGroupNotice(c)
|
||||
},
|
||||
"set_group_leave": func(s *httpServer, c *gin.Context) {
|
||||
s.SetGroupLeave(c)
|
||||
},
|
||||
"get_image": func(s *httpServer, c *gin.Context) {
|
||||
s.GetImage(c)
|
||||
},
|
||||
"get_forward_msg": func(s *httpServer, c *gin.Context) {
|
||||
s.GetForwardMessage(c)
|
||||
},
|
||||
"get_msg": func(s *httpServer, c *gin.Context) {
|
||||
s.GetMessage(c)
|
||||
},
|
||||
"get_group_system_msg": func(s *httpServer, c *gin.Context) {
|
||||
s.GetGroupSystemMessage(c)
|
||||
},
|
||||
"get_group_honor_info": func(s *httpServer, c *gin.Context) {
|
||||
s.GetGroupHonorInfo(c)
|
||||
},
|
||||
"can_send_image": func(s *httpServer, c *gin.Context) {
|
||||
s.CanSendImage(c)
|
||||
},
|
||||
"can_send_record": func(s *httpServer, c *gin.Context) {
|
||||
s.CanSendRecord(c)
|
||||
},
|
||||
"get_status": func(s *httpServer, c *gin.Context) {
|
||||
s.GetStatus(c)
|
||||
},
|
||||
"get_version_info": func(s *httpServer, c *gin.Context) {
|
||||
s.GetVersionInfo(c)
|
||||
},
|
||||
"_get_vip_info": func(s *httpServer, c *gin.Context) {
|
||||
s.GetVipInfo(c)
|
||||
},
|
||||
"get_stranger_info": func(s *httpServer, c *gin.Context) {
|
||||
s.GetStrangerInfo(c)
|
||||
},
|
||||
"reload_event_filter": func(s *httpServer, c *gin.Context) {
|
||||
s.ReloadEventFilter(c)
|
||||
},
|
||||
"set_group_portrait": func(s *httpServer, c *gin.Context) {
|
||||
s.SetGroupPortrait(c)
|
||||
},
|
||||
".handle_quick_operation": func(s *httpServer, c *gin.Context) {
|
||||
s.HandleQuickOperation(c)
|
||||
},
|
||||
".ocr_image": func(s *httpServer, c *gin.Context) {
|
||||
s.OcrImage(c)
|
||||
},
|
||||
".get_word_slices": func(s *httpServer, c *gin.Context) {
|
||||
s.GetWordSlices(c)
|
||||
},
|
||||
"get_login_info": GetLoginInfo,
|
||||
"get_friend_list": GetFriendList,
|
||||
"get_group_list": GetGroupList,
|
||||
"get_group_info": GetGroupInfo,
|
||||
"get_group_member_list": GetGroupMemberList,
|
||||
"get_group_member_info": GetGroupMemberInfo,
|
||||
"get_group_file_system_info": GetGroupFileSystemInfo,
|
||||
"get_group_root_files": GetGroupRootFiles,
|
||||
"get_group_files_by_folder": GetGroupFilesByFolderId,
|
||||
"get_group_file_url": GetGroupFileUrl,
|
||||
"send_msg": SendMessage,
|
||||
"send_group_msg": SendGroupMessage,
|
||||
"send_group_forward_msg": SendGroupForwardMessage,
|
||||
"send_private_msg": SendPrivateMessage,
|
||||
"delete_msg": DeleteMessage,
|
||||
"set_friend_add_request": ProcessFriendRequest,
|
||||
"set_group_add_request": ProcessGroupRequest,
|
||||
"set_group_card": SetGroupCard,
|
||||
"set_group_special_title": SetSpecialTitle,
|
||||
"set_group_kick": SetGroupKick,
|
||||
"set_group_ban": SetGroupBan,
|
||||
"set_group_whole_ban": SetWholeBan,
|
||||
"set_group_name": SetGroupName,
|
||||
"set_group_admin": SetGroupAdmin,
|
||||
"set_restart": SetRestart,
|
||||
"_send_group_notice": SendGroupNotice,
|
||||
"set_group_leave": SetGroupLeave,
|
||||
"get_image": GetImage,
|
||||
"get_forward_msg": GetForwardMessage,
|
||||
"get_msg": GetMessage,
|
||||
"get_group_system_msg": GetGroupSystemMessage,
|
||||
"get_group_honor_info": GetGroupHonorInfo,
|
||||
"can_send_image": CanSendImage,
|
||||
"can_send_record": CanSendRecord,
|
||||
"get_status": GetStatus,
|
||||
"get_version_info": GetVersionInfo,
|
||||
"_get_vip_info": GetVipInfo,
|
||||
"get_stranger_info": GetStrangerInfo,
|
||||
"reload_event_filter": ReloadEventFilter,
|
||||
"set_group_portrait": SetGroupPortrait,
|
||||
".handle_quick_operation": HandleQuickOperation,
|
||||
".ocr_image": OcrImage,
|
||||
".get_word_slices": GetWordSlices,
|
||||
}
|
||||
|
||||
func (s *httpServer) ShutDown() {
|
||||
|
||||
@ -480,6 +480,19 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
|
||||
"get_group_honor_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQGetGroupHonorInfo(p.Get("group_id").Int(), p.Get("type").Str)
|
||||
},
|
||||
"set_restart": func(c *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
var delay int64 = 0
|
||||
delay = p.Get("delay").Int()
|
||||
if delay < 0 {
|
||||
delay = 0
|
||||
}
|
||||
defer func(delay int64) {
|
||||
time.Sleep(time.Duration(delay) * time.Millisecond)
|
||||
Restart <- struct{}{}
|
||||
}(delay)
|
||||
return coolq.MSG{"data": nil, "retcode": 0, "status": "async"}
|
||||
|
||||
},
|
||||
"can_send_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQCanSendImage()
|
||||
},
|
||||
@ -498,6 +511,18 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
|
||||
"get_group_system_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQGetGroupSystemMessages()
|
||||
},
|
||||
"get_group_file_system_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQGetGroupFileSystemInfo(p.Get("group_id").Int())
|
||||
},
|
||||
"get_group_root_files": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQGetGroupRootFiles(p.Get("group_id").Int())
|
||||
},
|
||||
"get_group_files_by_folder": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQGetGroupFilesByFolderId(p.Get("group_id").Int(), p.Get("folder_id").Str)
|
||||
},
|
||||
"get_group_file_url": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQGetGroupFileUrl(p.Get("group_id").Int(), p.Get("file_id").Str, int32(p.Get("busid").Int()))
|
||||
},
|
||||
"_get_vip_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQGetVipInfo(p.Get("user_id").Int())
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user