shkong/go-cqhttp
1
0
Fork 0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-05 19:43:49 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #592 from Ink-33/dev

Browse Source 
fix golint
This commit is contained in:
Mrs4s 2021-02-11 10:11:30 +08:00 committed by GitHub
commit 337b7fd134
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 997 additions and 609 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
.github/workflows/ci.yml vendored
View File

@ -17,7 +17,7 @@ jobs:
# build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/amd64 # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/amd64
goos: [linux, windows, darwin] goos: [linux, windows, darwin]
goarch: ["386", amd64, arm, arm64] goarch: ["386", amd64, arm, arm64]
exclude: exclude:
- goos: darwin - goos: darwin
goarch: arm goarch: arm
- goos: darwin - goos: darwin
@ -27,32 +27,36 @@ jobs:
- goos: windows - goos: windows
goarch: arm64 goarch: arm64
fail-fast: true fail-fast: true
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Setup Go environment
uses: actions/setup-go@v2.1.3
with:
go-version: 1.15
- name: Build binary file
env:
GOOS: ${{ matrix.goos }}
GOARCH: ${{ matrix.goarch }}
IS_PR: ${{ !!github.head_ref }}
run: |
if [ $GOOS = "windows" ]; then export BINARY_SUFFIX="$BINARY_SUFFIX.exe"; fi
if $IS_PR ; then echo $PR_PROMPT; fi
export BINARY_NAME="$BINARY_PREFIX$GOOS_$GOARCH$BINARY_SUFFIX"
export CGO_ENABLED=0
go build -o "output/$BINARY_NAME" -ldflags "$LD_FLAGS" .
- name: Upload artifact
uses: actions/upload-artifact@v2
if: ${{ !github.head_ref }}
with:
name: ${{ matrix.goos }}_${{ matrix.goarch }}
path: output/
- name: Setup Go environment golangci:
uses: actions/setup-go@v2.1.3 name: lint
with: runs-on: ubuntu-latest
go-version: 1.15 steps:
- uses: actions/checkout@v2
- name: Build binary file - name: golangci-lint
env: uses: golangci/golangci-lint-action@v2
GOOS: ${{ matrix.goos }} with:
GOARCH: ${{ matrix.goarch }} version: v1.29
IS_PR: ${{ !!github.head_ref }}
run: |
if [ $GOOS = "windows" ]; then export BINARY_SUFFIX="$BINARY_SUFFIX.exe"; fi
if $IS_PR ; then echo $PR_PROMPT; fi
export BINARY_NAME="$BINARY_PREFIX$GOOS_$GOARCH$BINARY_SUFFIX"
export CGO_ENABLED=0
go build -o "output/$BINARY_NAME" -ldflags "$LD_FLAGS" .
- name: Upload artifact
uses: actions/upload-artifact@v2
if: ${{ !github.head_ref }}
with:
name: ${{ matrix.goos }}_${{ matrix.goarch }}
path: output/

17
README.md
View File

@ -6,7 +6,8 @@
# go-cqhttp # go-cqhttp
_✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://github.com/Mrs4s/MiraiGo) 的 [cqhttp](https://github.com/howmanybots/onebot/blob/master/README.md) golang 原生实现 ✨_ _✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://github.com/Mrs4s/MiraiGo) 的 [OneBot](https://github.com/howmanybots/onebot/blob/master/README.md) Golang 原生实现 ✨_
</div> </div>
@ -23,23 +24,21 @@ _✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://git
<a href="https://github.com/Mrs4s/go-cqhttp/actions"> <a href="https://github.com/Mrs4s/go-cqhttp/actions">
<img src="https://github.com/Mrs4s/go-cqhttp/workflows/CI/badge.svg" alt="action"> <img src="https://github.com/Mrs4s/go-cqhttp/workflows/CI/badge.svg" alt="action">
</a> </a>
<a href="https://goreportcard.com/report/github.com/Mrs4s/go-cqhttp">
<img src="https://goreportcard.com/badge/github.com/Mrs4s/go-cqhttp" alt="GoReportCard">
</a>
</p> </p>
<p align="center"> <p align="center">
<a href="http://ishkong.github.io/go-cqhttp-docs">文档</a> <a href="https://docs.go-cqhttp.org/">文档</a>
· ·
<a href="https://github.com/Mrs4s/go-cqhttp/releases">下载</a> <a href="https://github.com/Mrs4s/go-cqhttp/releases">下载</a>
· ·
<a href="https://ishkong.github.io/go-cqhttp-docs/guide/quick_start.html">开始使用</a> <a href="https://docs.go-cqhttp.org/guide/quick_start.html">开始使用</a>
</p> </p>
---
go-cqhttp 在[原版 cqhttp](https://github.com/richardchien/coolq-http-api)的基础上做了部分修改和拓展.
---
## 兼容性 ## 兼容性
go-cqhttp兼容[OneBot-v11](https://github.com/howmanybots/onebot/tree/master/v11/specs)绝大多数内容，并在其基础上做了一些扩展，详情请看go-cqhttp的文档
### 接口 ### 接口

423
coolq/api.go
View File

@ -21,14 +21,19 @@ import (
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )
// Version go-cqhttp的版本信息，在编译时使用ldfalgs进行覆盖
var Version = "unknown" var Version = "unknown"
// https://cqhttp.cc/docs/4.15/#/API?id=get_login_info-%E8%8E%B7%E5%8F%96%E7%99%BB%E5%BD%95%E5%8F%B7%E4%BF%A1%E6%81%AF // CQGetLoginInfo 获取登录号信息
//
// https://git.io/Jtz1I
func (bot *CQBot) CQGetLoginInfo() MSG { func (bot *CQBot) CQGetLoginInfo() MSG {
return OK(MSG{"user_id": bot.Client.Uin, "nickname": bot.Client.Nickname}) return OK(MSG{"user_id": bot.Client.Uin, "nickname": bot.Client.Nickname})
} }
// https://cqhttp.cc/docs/4.15/#/API?id=get_friend_list-%E8%8E%B7%E5%8F%96%E5%A5%BD%E5%8F%8B%E5%88%97%E8%A1%A8 // CQGetFriendList 获取好友列表
//
// https://git.io/Jtz1L
func (bot *CQBot) CQGetFriendList() MSG { func (bot *CQBot) CQGetFriendList() MSG {
fs := make([]MSG, 0) fs := make([]MSG, 0)
for _, f := range bot.Client.FriendList { for _, f := range bot.Client.FriendList {
@ -41,7 +46,9 @@ func (bot *CQBot) CQGetFriendList() MSG {
return OK(fs) return OK(fs)
} }
// https://cqhttp.cc/docs/4.15/#/API?id=get_group_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%88%97%E8%A1%A8 // CQGetGroupList 获取群列表
//
// https://git.io/Jtz1t
func (bot *CQBot) CQGetGroupList(noCache bool) MSG { func (bot *CQBot) CQGetGroupList(noCache bool) MSG {
gs := make([]MSG, 0) gs := make([]MSG, 0)
if noCache { if noCache {
@ -58,17 +65,19 @@ func (bot *CQBot) CQGetGroupList(noCache bool) MSG {
return OK(gs) return OK(gs)
} }
// https://cqhttp.cc/docs/4.15/#/API?id=get_group_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E4%BF%A1%E6%81%AF // CQGetGroupInfo 获取群信息
func (bot *CQBot) CQGetGroupInfo(groupId int64, noCache bool) MSG { //
group := bot.Client.FindGroup(groupId) // https://git.io/Jtz1O
func (bot *CQBot) CQGetGroupInfo(groupID int64, noCache bool) MSG {
group := bot.Client.FindGroup(groupID)
if group == nil { if group == nil {
gid := strconv.FormatInt(groupId, 10) gid := strconv.FormatInt(groupID, 10)
info, err := bot.Client.SearchGroupByKeyword(gid) info, err := bot.Client.SearchGroupByKeyword(gid)
if err != nil { if err != nil {
return Failed(100, "GROUP_SEARCH_ERROR", "群聊搜索失败") return Failed(100, "GROUP_SEARCH_ERROR", "群聊搜索失败")
} }
for _, g := range info { for _, g := range info {
if g.Code == groupId { if g.Code == groupID {
return OK(MSG{ return OK(MSG{
"group_id": g.Code, "group_id": g.Code,
"group_name": g.Name, "group_name": g.Name,
@ -81,7 +90,7 @@ func (bot *CQBot) CQGetGroupInfo(groupId int64, noCache bool) MSG {
} }
if noCache { if noCache {
var err error var err error
group, err = bot.Client.GetGroupInfo(groupId) group, err = bot.Client.GetGroupInfo(groupID)
if err != nil { if err != nil {
return Failed(100, "GET_GROUP_INFO_API_ERROR", err.Error()) return Failed(100, "GET_GROUP_INFO_API_ERROR", err.Error())
} }
@ -94,58 +103,68 @@ func (bot *CQBot) CQGetGroupInfo(groupId int64, noCache bool) MSG {
}) })
} }
// https://cqhttp.cc/docs/4.15/#/API?id=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 // CQGetGroupMemberList 获取群成员列表
func (bot *CQBot) CQGetGroupMemberList(groupId int64, noCache bool) MSG { //
group := bot.Client.FindGroup(groupId) // https://git.io/Jtz13
func (bot *CQBot) CQGetGroupMemberList(groupID int64, noCache bool) MSG {
group := bot.Client.FindGroup(groupID)
if group == nil { if group == nil {
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }
if noCache { if noCache {
t, err := bot.Client.GetGroupMembers(group) t, err := bot.Client.GetGroupMembers(group)
if err != nil { if err != nil {
log.Warnf("刷新群 %v 成员列表失败: %v", groupId, err) log.Warnf("刷新群 %v 成员列表失败: %v", groupID, err)
return Failed(100, "GET_MEMBERS_API_ERROR", err.Error()) return Failed(100, "GET_MEMBERS_API_ERROR", err.Error())
} }
group.Members = t group.Members = t
} }
members := make([]MSG, 0) members := make([]MSG, 0)
for _, m := range group.Members { for _, m := range group.Members {
members = append(members, convertGroupMemberInfo(groupId, m)) members = append(members, convertGroupMemberInfo(groupID, m))
} }
return OK(members) return OK(members)
} }
// https://cqhttp.cc/docs/4.15/#/API?id=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 // CQGetGroupMemberInfo 获取群成员信息
func (bot *CQBot) CQGetGroupMemberInfo(groupId, userId int64) MSG { //
group := bot.Client.FindGroup(groupId) // https://git.io/Jtz1s
func (bot *CQBot) CQGetGroupMemberInfo(groupID, userID int64) MSG {
group := bot.Client.FindGroup(groupID)
if group == nil { if group == nil {
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }
member := group.FindMember(userId) member := group.FindMember(userID)
if member == nil { if member == nil {
return Failed(100, "MEMBER_NOT_FOUND", "群员不存在") return Failed(100, "MEMBER_NOT_FOUND", "群员不存在")
} }
return OK(convertGroupMemberInfo(groupId, member)) return OK(convertGroupMemberInfo(groupID, member))
} }
func (bot *CQBot) CQGetGroupFileSystemInfo(groupId int64) MSG { // CQGetGroupFileSystemInfo 扩展API-获取群文件系统信息
fs, err := bot.Client.GetGroupFileSystem(groupId) //
// https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%96%87%E4%BB%B6%E7%B3%BB%E7%BB%9F%E4%BF%A1%E6%81%AF
func (bot *CQBot) CQGetGroupFileSystemInfo(groupID int64) MSG {
fs, err := bot.Client.GetGroupFileSystem(groupID)
if err != nil { if err != nil {
log.Errorf("获取群 %v 文件系统信息失败: %v", groupId, err) log.Errorf("获取群 %v 文件系统信息失败: %v", groupID, err)
return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error()) return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
} }
return OK(fs) return OK(fs)
} }
func (bot *CQBot) CQGetGroupRootFiles(groupId int64) MSG { // CQGetGroupRootFiles 扩展API-获取群根目录文件列表
fs, err := bot.Client.GetGroupFileSystem(groupId) //
// https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%A0%B9%E7%9B%AE%E5%BD%95%E6%96%87%E4%BB%B6%E5%88%97%E8%A1%A8
func (bot *CQBot) CQGetGroupRootFiles(groupID int64) MSG {
fs, err := bot.Client.GetGroupFileSystem(groupID)
if err != nil { if err != nil {
log.Errorf("获取群 %v 文件系统信息失败: %v", groupId, err) log.Errorf("获取群 %v 文件系统信息失败: %v", groupID, err)
return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error()) return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
} }
files, folders, err := fs.Root() files, folders, err := fs.Root()
if err != nil { if err != nil {
log.Errorf("获取群 %v 根目录文件失败: %v", groupId, err) log.Errorf("获取群 %v 根目录文件失败: %v", groupID, err)
return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error()) return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
} }
return OK(MSG{ return OK(MSG{
@ -154,15 +173,18 @@ func (bot *CQBot) CQGetGroupRootFiles(groupId int64) MSG {
}) })
} }
func (bot *CQBot) CQGetGroupFilesByFolderId(groupId int64, folderId string) MSG { // CQGetGroupFilesByFolderID 扩展API-获取群子目录文件列表
fs, err := bot.Client.GetGroupFileSystem(groupId) //
// https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%AD%90%E7%9B%AE%E5%BD%95%E6%96%87%E4%BB%B6%E5%88%97%E8%A1%A8
func (bot *CQBot) CQGetGroupFilesByFolderID(groupID int64, folderID string) MSG {
fs, err := bot.Client.GetGroupFileSystem(groupID)
if err != nil { if err != nil {
log.Errorf("获取群 %v 文件系统信息失败: %v", groupId, err) log.Errorf("获取群 %v 文件系统信息失败: %v", groupID, err)
return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error()) return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
} }
files, folders, err := fs.GetFilesByFolder(folderId) files, folders, err := fs.GetFilesByFolder(folderID)
if err != nil { if err != nil {
log.Errorf("获取群 %v 根目录 %v 子文件失败: %v", groupId, folderId, err) log.Errorf("获取群 %v 根目录 %v 子文件失败: %v", groupID, folderID, err)
return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error()) return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
} }
return OK(MSG{ return OK(MSG{
@ -171,8 +193,11 @@ func (bot *CQBot) CQGetGroupFilesByFolderId(groupId int64, folderId string) MSG
}) })
} }
func (bot *CQBot) CQGetGroupFileUrl(groupId int64, fileId string, busId int32) MSG { // CQGetGroupFileURL 扩展API-获取群文件资源链接
url := bot.Client.GetGroupFileUrl(groupId, fileId, busId) //
// https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%96%87%E4%BB%B6%E8%B5%84%E6%BA%90%E9%93%BE%E6%8E%A5
func (bot *CQBot) CQGetGroupFileURL(groupID int64, fileID string, busID int32) MSG {
url := bot.Client.GetGroupFileUrl(groupID, fileID, busID)
if url == "" { if url == "" {
return Failed(100, "FILE_SYSTEM_API_ERROR") return Failed(100, "FILE_SYSTEM_API_ERROR")
} }
@ -181,26 +206,32 @@ func (bot *CQBot) CQGetGroupFileUrl(groupId int64, fileId string, busId int32) M
}) })
} }
func (bot *CQBot) CQUploadGroupFile(groupId int64, file, name, folder string) MSG { // CQUploadGroupFile 扩展API-上传群文件
//
// https://docs.go-cqhttp.org/api/#%E4%B8%8A%E4%BC%A0%E7%BE%A4%E6%96%87%E4%BB%B6
func (bot *CQBot) CQUploadGroupFile(groupID int64, file, name, folder string) MSG {
if !global.PathExists(file) { if !global.PathExists(file) {
log.Errorf("上传群文件 %v 失败: 文件不存在", file) log.Errorf("上传群文件 %v 失败: 文件不存在", file)
return Failed(100, "FILE_NOT_FOUND", "文件不存在") return Failed(100, "FILE_NOT_FOUND", "文件不存在")
} }
fs, err := bot.Client.GetGroupFileSystem(groupId) fs, err := bot.Client.GetGroupFileSystem(groupID)
if err != nil { if err != nil {
log.Errorf("获取群 %v 文件系统信息失败: %v", groupId, err) log.Errorf("获取群 %v 文件系统信息失败: %v", groupID, err)
return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error()) return Failed(100, "FILE_SYSTEM_API_ERROR", err.Error())
} }
if folder == "" { if folder == "" {
folder = "/" folder = "/"
} }
if err = fs.UploadFile(file, name, folder); err != nil { if err = fs.UploadFile(file, name, folder); err != nil {
log.Errorf("上传群 %v 文件 %v 失败: %v", groupId, file, err) log.Errorf("上传群 %v 文件 %v 失败: %v", groupID, file, err)
return Failed(100, "FILE_SYSTEM_UPLOAD_API_ERROR", err.Error()) return Failed(100, "FILE_SYSTEM_UPLOAD_API_ERROR", err.Error())
} }
return OK(nil) return OK(nil)
} }
// CQGetWordSlices 隐藏API-获取中文分词
//
// https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E4%B8%AD%E6%96%87%E5%88%86%E8%AF%8D-%E9%9A%90%E8%97%8F-api
func (bot *CQBot) CQGetWordSlices(content string) MSG { func (bot *CQBot) CQGetWordSlices(content string) MSG {
slices, err := bot.Client.GetWordSegmentation(content) slices, err := bot.Client.GetWordSegmentation(content)
if err != nil { if err != nil {
@ -212,14 +243,16 @@ func (bot *CQBot) CQGetWordSlices(content string) MSG {
return OK(MSG{"slices": slices}) return OK(MSG{"slices": slices})
} }
// https://cqhttp.cc/docs/4.15/#/API?id=send_group_msg-%E5%8F%91%E9%80%81%E7%BE%A4%E6%B6%88%E6%81%AF // CQSendGroupMessage 发送群消息
func (bot *CQBot) CQSendGroupMessage(groupId int64, i interface{}, autoEscape bool) MSG { //
// https://git.io/Jtz1c
func (bot *CQBot) CQSendGroupMessage(groupID int64, i interface{}, autoEscape bool) MSG {
var str string var str string
fixAt := func(elem []message.IMessageElement) { fixAt := func(elem []message.IMessageElement) {
for _, e := range elem { for _, e := range elem {
if at, ok := e.(*message.AtElement); ok && at.Target != 0 { if at, ok := e.(*message.AtElement); ok && at.Target != 0 {
at.Display = "@" + func() string { at.Display = "@" + func() string {
mem := bot.Client.FindGroup(groupId).FindMember(at.Target) mem := bot.Client.FindGroup(groupID).FindMember(at.Target)
if mem != nil { if mem != nil {
return mem.DisplayName() return mem.DisplayName()
} }
@ -232,11 +265,11 @@ func (bot *CQBot) CQSendGroupMessage(groupId int64, i interface{}, autoEscape bo
if m.Type == gjson.JSON { if m.Type == gjson.JSON {
elem := bot.ConvertObjectMessage(m, true) elem := bot.ConvertObjectMessage(m, true)
fixAt(elem) fixAt(elem)
mid := bot.SendGroupMessage(groupId, &message.SendingMessage{Elements: elem}) mid := bot.SendGroupMessage(groupID, &message.SendingMessage{Elements: elem})
if mid == -1 { if mid == -1 {
return Failed(100, "SEND_MSG_API_ERROR", "请参考输出") return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
} }
log.Infof("发送群 %v(%v) 的消息: %v (%v)", groupId, groupId, limitedString(m.String()), mid) log.Infof("发送群 %v(%v) 的消息: %v (%v)", groupID, groupID, limitedString(m.String()), mid)
return OK(MSG{"message_id": mid}) return OK(MSG{"message_id": mid})
} }
str = func() string { str = func() string {
@ -259,15 +292,18 @@ func (bot *CQBot) CQSendGroupMessage(groupId int64, i interface{}, autoEscape bo
elem = bot.ConvertStringMessage(str, true) elem = bot.ConvertStringMessage(str, true)
} }
fixAt(elem) fixAt(elem)
mid := bot.SendGroupMessage(groupId, &message.SendingMessage{Elements: elem}) mid := bot.SendGroupMessage(groupID, &message.SendingMessage{Elements: elem})
if mid == -1 { if mid == -1 {
return Failed(100, "SEND_MSG_API_ERROR", "请参考输出") return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
} }
log.Infof("发送群 %v(%v) 的消息: %v (%v)", groupId, groupId, limitedString(str), mid) log.Infof("发送群 %v(%v) 的消息: %v (%v)", groupID, groupID, limitedString(str), mid)
return OK(MSG{"message_id": mid}) return OK(MSG{"message_id": mid})
} }
func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG { // CQSendGroupForwardMessage 扩展API-发送合并转发(群)
//
// https://docs.go-cqhttp.org/api/#%E5%8F%91%E9%80%81%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91-%E7%BE%A4
func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) MSG {
if m.Type != gjson.JSON { if m.Type != gjson.JSON {
return Failed(100) return Failed(100)
} }
@ -334,7 +370,7 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
SenderId: uin, SenderId: uin,
SenderName: name, SenderName: name,
Time: int32(msgTime), Time: int32(msgTime),
Message: []message.IMessageElement{bot.Client.UploadGroupForwardMessage(groupId, &message.ForwardMessage{Nodes: taowa})}, Message: []message.IMessageElement{bot.Client.UploadGroupForwardMessage(groupID, &message.ForwardMessage{Nodes: taowa})},
}) })
return return
} }
@ -344,18 +380,18 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
var newElem []message.IMessageElement var newElem []message.IMessageElement
for _, elem := range content { for _, elem := range content {
if img, ok := elem.(*LocalImageElement); ok { if img, ok := elem.(*LocalImageElement); ok {
gm, err := bot.UploadLocalImageAsGroup(groupId, img) gm, err := bot.UploadLocalImageAsGroup(groupID, img)
if err != nil { if err != nil {
log.Warnf("警告：群 %v 图片上传失败: %v", groupId, err) log.Warnf("警告：群 %v 图片上传失败: %v", groupID, err)
continue continue
} }
newElem = append(newElem, gm) newElem = append(newElem, gm)
continue continue
} }
if video, ok := elem.(*LocalVideoElement); ok { if video, ok := elem.(*LocalVideoElement); ok {
gm, err := bot.UploadLocalVideo(groupId, video) gm, err := bot.UploadLocalVideo(groupID, video)
if err != nil { if err != nil {
log.Warnf("警告：群 %v 视频上传失败: %v", groupId, err) log.Warnf("警告：群 %v 视频上传失败: %v", groupID, err)
continue continue
} }
newElem = append(newElem, gm) newElem = append(newElem, gm)
@ -382,7 +418,7 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
sendNodes = convert(m) sendNodes = convert(m)
} }
if len(sendNodes) > 0 { if len(sendNodes) > 0 {
gm := bot.Client.SendGroupForwardMessage(groupId, &message.ForwardMessage{Nodes: sendNodes}) gm := bot.Client.SendGroupForwardMessage(groupID, &message.ForwardMessage{Nodes: sendNodes})
return OK(MSG{ return OK(MSG{
"message_id": bot.InsertGroupMessage(gm), "message_id": bot.InsertGroupMessage(gm),
}) })
@ -390,17 +426,19 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
return Failed(100) return Failed(100)
} }
// https://cqhttp.cc/docs/4.15/#/API?id=send_private_msg-%E5%8F%91%E9%80%81%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF // CQSendPrivateMessage 发送私聊消息
func (bot *CQBot) CQSendPrivateMessage(userId int64, i interface{}, autoEscape bool) MSG { //
// https://git.io/Jtz1l
func (bot *CQBot) CQSendPrivateMessage(userID int64, i interface{}, autoEscape bool) MSG {
var str string var str string
if m, ok := i.(gjson.Result); ok { if m, ok := i.(gjson.Result); ok {
if m.Type == gjson.JSON { if m.Type == gjson.JSON {
elem := bot.ConvertObjectMessage(m, false) elem := bot.ConvertObjectMessage(m, false)
mid := bot.SendPrivateMessage(userId, &message.SendingMessage{Elements: elem}) mid := bot.SendPrivateMessage(userID, &message.SendingMessage{Elements: elem})
if mid == -1 { if mid == -1 {
return Failed(100, "SEND_MSG_API_ERROR", "请参考输出") return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
} }
log.Infof("发送好友 %v(%v) 的消息: %v (%v)", userId, userId, limitedString(m.String()), mid) log.Infof("发送好友 %v(%v) 的消息: %v (%v)", userID, userID, limitedString(m.String()), mid)
return OK(MSG{"message_id": mid}) return OK(MSG{"message_id": mid})
} }
str = func() string { str = func() string {
@ -421,18 +459,20 @@ func (bot *CQBot) CQSendPrivateMessage(userId int64, i interface{}, autoEscape b
} else { } else {
elem = bot.ConvertStringMessage(str, false) elem = bot.ConvertStringMessage(str, false)
} }
mid := bot.SendPrivateMessage(userId, &message.SendingMessage{Elements: elem}) mid := bot.SendPrivateMessage(userID, &message.SendingMessage{Elements: elem})
if mid == -1 { if mid == -1 {
return Failed(100, "SEND_MSG_API_ERROR", "请参考输出") return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
} }
log.Infof("发送好友 %v(%v) 的消息: %v (%v)", userId, userId, limitedString(str), mid) log.Infof("发送好友 %v(%v) 的消息: %v (%v)", userID, userID, limitedString(str), mid)
return OK(MSG{"message_id": mid}) return OK(MSG{"message_id": mid})
} }
// https://cqhttp.cc/docs/4.15/#/API?id=set_group_card-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D%E7%89%87%EF%BC%88%E7%BE%A4%E5%A4%87%E6%B3%A8%EF%BC%89 // CQSetGroupCard 设置群名片(群备注)
func (bot *CQBot) CQSetGroupCard(groupId, userId int64, card string) MSG { //
if g := bot.Client.FindGroup(groupId); g != nil { // https://git.io/Jtz1B
if m := g.FindMember(userId); m != nil { func (bot *CQBot) CQSetGroupCard(groupID, userID int64, card string) MSG {
if g := bot.Client.FindGroup(groupID); g != nil {
if m := g.FindMember(userID); m != nil {
m.EditCard(card) m.EditCard(card)
return OK(nil) return OK(nil)
} }
@ -440,10 +480,12 @@ func (bot *CQBot) CQSetGroupCard(groupId, userId int64, card string) MSG {
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }
// https://cqhttp.cc/docs/4.15/#/API?id=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 // CQSetGroupSpecialTitle 设置群组专属头衔
func (bot *CQBot) CQSetGroupSpecialTitle(groupId, userId int64, title string) MSG { //
if g := bot.Client.FindGroup(groupId); g != nil { // https://git.io/Jtz10
if m := g.FindMember(userId); m != nil { func (bot *CQBot) CQSetGroupSpecialTitle(groupID, userID int64, title string) MSG {
if g := bot.Client.FindGroup(groupID); g != nil {
if m := g.FindMember(userID); m != nil {
m.EditSpecialTitle(title) m.EditSpecialTitle(title)
return OK(nil) return OK(nil)
} }
@ -451,65 +493,91 @@ func (bot *CQBot) CQSetGroupSpecialTitle(groupId, userId int64, title string) MS
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }
func (bot *CQBot) CQSetGroupName(groupId int64, name string) MSG { // CQSetGroupName 设置群名
if g := bot.Client.FindGroup(groupId); g != nil { //
// https://git.io/Jtz12
func (bot *CQBot) CQSetGroupName(groupID int64, name string) MSG {
if g := bot.Client.FindGroup(groupID); g != nil {
g.UpdateName(name) g.UpdateName(name)
return OK(nil) return OK(nil)
} }
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }
func (bot *CQBot) CQSetGroupMemo(groupId int64, msg string) MSG { // CQSetGroupMemo 扩展API-发送群公告
if g := bot.Client.FindGroup(groupId); g != nil { //
// https://docs.go-cqhttp.org/api/#%E5%8F%91%E9%80%81%E7%BE%A4%E5%85%AC%E5%91%8A
func (bot *CQBot) CQSetGroupMemo(groupID int64, msg string) MSG {
if g := bot.Client.FindGroup(groupID); g != nil {
g.UpdateMemo(msg) g.UpdateMemo(msg)
return OK(nil) return OK(nil)
} }
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }
// https://cqhttp.cc/docs/4.15/#/API?id=set_group_kick-%E7%BE%A4%E7%BB%84%E8%B8%A2%E4%BA%BA // CQSetGroupKick 群组踢人
func (bot *CQBot) CQSetGroupKick(groupId, userId int64, msg string, block bool) MSG { //
if g := bot.Client.FindGroup(groupId); g != nil { // https://git.io/Jtz1V
if m := g.FindMember(userId); m != nil { func (bot *CQBot) CQSetGroupKick(groupID, userID int64, msg string, block bool) MSG {
m.Kick(msg, block) if g := bot.Client.FindGroup(groupID); g != nil {
if m := g.FindMember(userID); m != nil {
err := m.Kick(msg, block)
if err != nil {
return Failed(100, "NOT_MANAGEABLE", "机器人权限不足")
}
return OK(nil) return OK(nil)
} }
} }
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }
// https://cqhttp.cc/docs/4.15/#/API?id=set_group_ban-%E7%BE%A4%E7%BB%84%E5%8D%95%E4%BA%BA%E7%A6%81%E8%A8%80 // CQSetGroupBan 群组单人禁言
func (bot *CQBot) CQSetGroupBan(groupId, userId int64, duration uint32) MSG { //
if g := bot.Client.FindGroup(groupId); g != nil { // https://git.io/Jtz1w
if m := g.FindMember(userId); m != nil { func (bot *CQBot) CQSetGroupBan(groupID, userID int64, duration uint32) MSG {
m.Mute(duration) if g := bot.Client.FindGroup(groupID); g != nil {
if m := g.FindMember(userID); m != nil {
err := m.Mute(duration)
if err != nil {
if duration >= 2592000 {
return Failed(100, "DURATION_IS_NOT_IN_RANGE", "非法的禁言时长")
}
return Failed(100, "NOT_MANAGEABLE", "机器人权限不足")
}
return OK(nil) return OK(nil)
} }
} }
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }
// https://cqhttp.cc/docs/4.15/#/API?id=set_group_whole_ban-%E7%BE%A4%E7%BB%84%E5%85%A8%E5%91%98%E7%A6%81%E8%A8%80 // CQSetGroupWholeBan 群组全员禁言
func (bot *CQBot) CQSetGroupWholeBan(groupId int64, enable bool) MSG { //
if g := bot.Client.FindGroup(groupId); g != nil { // https://git.io/Jtz1o
func (bot *CQBot) CQSetGroupWholeBan(groupID int64, enable bool) MSG {
if g := bot.Client.FindGroup(groupID); g != nil {
g.MuteAll(enable) g.MuteAll(enable)
return OK(nil) return OK(nil)
} }
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }
// https://cqhttp.cc/docs/4.15/#/API?id=set_group_leave-%E9%80%80%E5%87%BA%E7%BE%A4%E7%BB%84 // CQSetGroupLeave 退出群组
func (bot *CQBot) CQSetGroupLeave(groupId int64) MSG { //
if g := bot.Client.FindGroup(groupId); g != nil { // https://git.io/Jtz1K
func (bot *CQBot) CQSetGroupLeave(groupID int64) MSG {
if g := bot.Client.FindGroup(groupID); g != nil {
g.Quit() g.Quit()
return OK(nil) return OK(nil)
} }
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }
func (bot *CQBot) CQGetAtAllRemain(groupId int64) MSG { // CQGetAtAllRemain 扩展API-获取群 @全体成员 剩余次数
if g := bot.Client.FindGroup(groupId); g != nil { //
i, err := bot.Client.GetAtAllRemain(groupId) // https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4-%E5%85%A8%E4%BD%93%E6%88%90%E5%91%98-%E5%89%A9%E4%BD%99%E6%AC%A1%E6%95%B0
func (bot *CQBot) CQGetAtAllRemain(groupID int64) MSG {
if g := bot.Client.FindGroup(groupID); g != nil {
i, err := bot.Client.GetAtAllRemain(groupID)
if err != nil { if err != nil {
return Failed(100, "GROUP_REMAIN_API_ERROR", err.Error()) return Failed(100, "GROUP_REMAIN_API_ERROR", err.Error())
} }
@ -518,7 +586,9 @@ func (bot *CQBot) CQGetAtAllRemain(groupId int64) MSG {
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }
// https://cqhttp.cc/docs/4.15/#/API?id=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 // CQProcessFriendRequest 处理加好友请求
//
// https://git.io/Jtz11
func (bot *CQBot) CQProcessFriendRequest(flag string, approve bool) MSG { func (bot *CQBot) CQProcessFriendRequest(flag string, approve bool) MSG {
req, ok := bot.friendReqCache.Load(flag) req, ok := bot.friendReqCache.Load(flag)
if !ok { if !ok {
@ -532,7 +602,9 @@ func (bot *CQBot) CQProcessFriendRequest(flag string, approve bool) MSG {
return OK(nil) return OK(nil)
} }
// https://cqhttp.cc/docs/4.15/#/API?id=set_group_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%EF%BC%8F%E9%82%80%E8%AF%B7 // CQProcessGroupRequest 处理加群请求／邀请
//
// https://git.io/Jtz1D
func (bot *CQBot) CQProcessGroupRequest(flag, subType, reason string, approve bool) MSG { func (bot *CQBot) CQProcessGroupRequest(flag, subType, reason string, approve bool) MSG {
msgs, err := bot.Client.GetGroupSystemMessages() msgs, err := bot.Client.GetGroupSystemMessages()
if err != nil { if err != nil {
@ -574,52 +646,59 @@ func (bot *CQBot) CQProcessGroupRequest(flag, subType, reason string, approve bo
return Failed(100, "FLAG_NOT_FOUND", "FLAG不存在") return Failed(100, "FLAG_NOT_FOUND", "FLAG不存在")
} }
// https://cqhttp.cc/docs/4.15/#/API?id=delete_msg-%E6%92%A4%E5%9B%9E%E6%B6%88%E6%81%AF // CQDeleteMessage 撤回消息
func (bot *CQBot) CQDeleteMessage(messageId int32) MSG { //
msg := bot.GetMessage(messageId) // https:// git.io/Jtz1y
func (bot *CQBot) CQDeleteMessage(messageID int32) MSG {
msg := bot.GetMessage(messageID)
if msg == nil { if msg == nil {
return Failed(100, "MESSAGE_NOT_FOUND", "消息不存在") return Failed(100, "MESSAGE_NOT_FOUND", "消息不存在")
} }
if _, ok := msg["group"]; ok { if _, ok := msg["group"]; ok {
if err := bot.Client.RecallGroupMessage(msg["group"].(int64), msg["message-id"].(int32), msg["internal-id"].(int32)); err != nil { if err := bot.Client.RecallGroupMessage(msg["group"].(int64), msg["message-id"].(int32), msg["internal-id"].(int32)); err != nil {
log.Warnf("撤回 %v 失败: %v", messageId, err) log.Warnf("撤回 %v 失败: %v", messageID, err)
return Failed(100, "RECALL_API_ERROR", err.Error()) return Failed(100, "RECALL_API_ERROR", err.Error())
} }
} else { } else {
if msg["sender"].(message.Sender).Uin != bot.Client.Uin { if msg["sender"].(message.Sender).Uin != bot.Client.Uin {
log.Warnf("撤回 %v 失败: 好友会话无法撤回对方消息.", messageId) log.Warnf("撤回 %v 失败: 好友会话无法撤回对方消息.", messageID)
return Failed(100, "CANNOT_RECALL_FRIEND_MSG", "无法撤回对方消息") return Failed(100, "CANNOT_RECALL_FRIEND_MSG", "无法撤回对方消息")
} }
if err := bot.Client.RecallPrivateMessage(msg["target"].(int64), int64(msg["time"].(int32)), msg["message-id"].(int32), msg["internal-id"].(int32)); err != nil { if err := bot.Client.RecallPrivateMessage(msg["target"].(int64), int64(msg["time"].(int32)), msg["message-id"].(int32), msg["internal-id"].(int32)); err != nil {
log.Warnf("撤回 %v 失败: %v", messageId, err) log.Warnf("撤回 %v 失败: %v", messageID, err)
return Failed(100, "RECALL_API_ERROR", err.Error()) return Failed(100, "RECALL_API_ERROR", err.Error())
} }
} }
return OK(nil) return OK(nil)
} }
// https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_admin-%E7%BE%A4%E7%BB%84%E8%AE%BE%E7%BD%AE%E7%AE%A1%E7%90%86%E5%91%98 // CQSetGroupAdmin 群组设置管理员
func (bot *CQBot) CQSetGroupAdmin(groupId, userId int64, enable bool) MSG { //
group := bot.Client.FindGroup(groupId) // https://git.io/Jtz1S
func (bot *CQBot) CQSetGroupAdmin(groupID, userID int64, enable bool) MSG {
group := bot.Client.FindGroup(groupID)
if group == nil || group.OwnerUin != bot.Client.Uin { if group == nil || group.OwnerUin != bot.Client.Uin {
return Failed(100, "PERMISSION_DENIED", "群不存在或权限不足") return Failed(100, "PERMISSION_DENIED", "群不存在或权限不足")
} }
mem := group.FindMember(userId) mem := group.FindMember(userID)
if mem == nil { if mem == nil {
return Failed(100, "GROUP_MEMBER_NOT_FOUND", "群成员不存在") return Failed(100, "GROUP_MEMBER_NOT_FOUND", "群成员不存在")
} }
mem.SetAdmin(enable) mem.SetAdmin(enable)
t, err := bot.Client.GetGroupMembers(group) t, err := bot.Client.GetGroupMembers(group)
if err != nil { if err != nil {
log.Warnf("刷新群 %v 成员列表失败: %v", groupId, err) log.Warnf("刷新群 %v 成员列表失败: %v", groupID, err)
return Failed(100, "GET_MEMBERS_API_ERROR", err.Error()) return Failed(100, "GET_MEMBERS_API_ERROR", err.Error())
} }
group.Members = t group.Members = t
return OK(nil) return OK(nil)
} }
func (bot *CQBot) CQGetVipInfo(userId int64) MSG { // CQGetVipInfo 扩展API-获取VIP信息
vip, err := bot.Client.GetVipInfo(userId) //
// https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96vip%E4%BF%A1%E6%81%AF
func (bot *CQBot) CQGetVipInfo(userID int64) MSG {
vip, err := bot.Client.GetVipInfo(userID)
if err != nil { if err != nil {
return Failed(100, "VIP_API_ERROR", err.Error()) return Failed(100, "VIP_API_ERROR", err.Error())
} }
@ -635,9 +714,11 @@ func (bot *CQBot) CQGetVipInfo(userId int64) MSG {
return OK(msg) return OK(msg)
} }
// https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_honor_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E8%8D%A3%E8%AA%89%E4%BF%A1%E6%81%AF // CQGetGroupHonorInfo 获取群荣誉信息
func (bot *CQBot) CQGetGroupHonorInfo(groupId int64, t string) MSG { //
msg := MSG{"group_id": groupId} // https://git.io/Jtz1H
func (bot *CQBot) CQGetGroupHonorInfo(groupID int64, t string) MSG {
msg := MSG{"group_id": groupID}
convertMem := func(memList []client.HonorMemberInfo) (ret []MSG) { convertMem := func(memList []client.HonorMemberInfo) (ret []MSG) {
for _, mem := range memList { for _, mem := range memList {
ret = append(ret, MSG{ ret = append(ret, MSG{
@ -650,7 +731,7 @@ func (bot *CQBot) CQGetGroupHonorInfo(groupId int64, t string) MSG {
return return
} }
if t == "talkative" || t == "all" { if t == "talkative" || t == "all" {
if honor, err := bot.Client.GetGroupHonorInfo(groupId, client.Talkative); err == nil { if honor, err := bot.Client.GetGroupHonorInfo(groupID, client.Talkative); err == nil {
if honor.CurrentTalkative.Uin != 0 { if honor.CurrentTalkative.Uin != 0 {
msg["current_talkative"] = MSG{ msg["current_talkative"] = MSG{
"user_id": honor.CurrentTalkative.Uin, "user_id": honor.CurrentTalkative.Uin,
@ -664,25 +745,25 @@ func (bot *CQBot) CQGetGroupHonorInfo(groupId int64, t string) MSG {
} }
if t == "performer" || t == "all" { if t == "performer" || t == "all" {
if honor, err := bot.Client.GetGroupHonorInfo(groupId, client.Performer); err == nil { if honor, err := bot.Client.GetGroupHonorInfo(groupID, client.Performer); err == nil {
msg["performer_lis"] = convertMem(honor.ActorList) msg["performer_lis"] = convertMem(honor.ActorList)
} }
} }
if t == "legend" || t == "all" { if t == "legend" || t == "all" {
if honor, err := bot.Client.GetGroupHonorInfo(groupId, client.Legend); err == nil { if honor, err := bot.Client.GetGroupHonorInfo(groupID, client.Legend); err == nil {
msg["legend_list"] = convertMem(honor.LegendList) msg["legend_list"] = convertMem(honor.LegendList)
} }
} }
if t == "strong_newbie" || t == "all" { if t == "strong_newbie" || t == "all" {
if honor, err := bot.Client.GetGroupHonorInfo(groupId, client.StrongNewbie); err == nil { if honor, err := bot.Client.GetGroupHonorInfo(groupID, client.StrongNewbie); err == nil {
msg["strong_newbie_list"] = convertMem(honor.StrongNewbieList) msg["strong_newbie_list"] = convertMem(honor.StrongNewbieList)
} }
} }
if t == "emotion" || t == "all" { if t == "emotion" || t == "all" {
if honor, err := bot.Client.GetGroupHonorInfo(groupId, client.Emotion); err == nil { if honor, err := bot.Client.GetGroupHonorInfo(groupID, client.Emotion); err == nil {
msg["emotion_list"] = convertMem(honor.EmotionList) msg["emotion_list"] = convertMem(honor.EmotionList)
} }
} }
@ -690,9 +771,11 @@ func (bot *CQBot) CQGetGroupHonorInfo(groupId int64, t string) MSG {
return OK(msg) return OK(msg)
} }
// https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_stranger_info-%E8%8E%B7%E5%8F%96%E9%99%8C%E7%94%9F%E4%BA%BA%E4%BF%A1%E6%81%AF // CQGetStrangerInfo 获取陌生人信息
func (bot *CQBot) CQGetStrangerInfo(userId int64) MSG { //
info, err := bot.Client.GetSummaryInfo(userId) // https://git.io/Jtz17
func (bot *CQBot) CQGetStrangerInfo(userID int64) MSG {
info, err := bot.Client.GetSummaryInfo(userID)
if err != nil { if err != nil {
return Failed(100, "SUMMARY_API_ERROR", err.Error()) return Failed(100, "SUMMARY_API_ERROR", err.Error())
} }
@ -715,8 +798,9 @@ func (bot *CQBot) CQGetStrangerInfo(userId int64) MSG {
}) })
} }
// https://cqhttp.cc/docs/4.15/#/API?id=-handle_quick_operation-%E5%AF%B9%E4%BA%8B%E4%BB%B6%E6%89%A7%E8%A1%8C%E5%BF%AB%E9%80%9F%E6%93%8D%E4%BD%9C // CQHandleQuickOperation 隐藏API-对事件执行快速操作
// https://github.com/richardchien/coolq-http-api/blob/master/src/cqhttp/plugins/web/http.cpp#L376 //
// https://git.io/Jtz15
func (bot *CQBot) CQHandleQuickOperation(context, operation gjson.Result) MSG { func (bot *CQBot) CQHandleQuickOperation(context, operation gjson.Result) MSG {
postType := context.Get("post_type").Str postType := context.Get("post_type").Str
switch postType { switch postType {
@ -773,11 +857,15 @@ func (bot *CQBot) CQHandleQuickOperation(context, operation gjson.Result) MSG {
return OK(nil) return OK(nil)
} }
// CQGetImage 获取图片(修改自OneBot)
//
// https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E5%9B%BE%E7%89%87%E4%BF%A1%E6%81%AF
func (bot *CQBot) CQGetImage(file string) MSG { func (bot *CQBot) CQGetImage(file string) MSG {
if !global.PathExists(path.Join(global.ImagePath, file)) { if !global.PathExists(path.Join(global.ImagePath, file)) {
return Failed(100) return Failed(100)
} }
if b, err := ioutil.ReadFile(path.Join(global.ImagePath, file)); err == nil { b, err := ioutil.ReadFile(path.Join(global.ImagePath, file))
if err == nil {
r := binary.NewReader(b) r := binary.NewReader(b)
r.ReadBytes(16) r.ReadBytes(16)
msg := MSG{ msg := MSG{
@ -793,11 +881,13 @@ func (bot *CQBot) CQGetImage(file string) MSG {
} }
msg["file"] = local msg["file"] = local
return OK(msg) return OK(msg)
} else {
return Failed(100, "LOAD_FILE_ERROR", err.Error())
} }
return Failed(100, "LOAD_FILE_ERROR", err.Error())
} }
// CQDownloadFile 扩展API-下载文件到缓存目录
//
// https://docs.go-cqhttp.org/api/#%E4%B8%8B%E8%BD%BD%E6%96%87%E4%BB%B6%E5%88%B0%E7%BC%93%E5%AD%98%E7%9B%AE%E5%BD%95
func (bot *CQBot) CQDownloadFile(url string, headers map[string]string, threadCount int) MSG { func (bot *CQBot) CQDownloadFile(url string, headers map[string]string, threadCount int) MSG {
hash := md5.Sum([]byte(url)) hash := md5.Sum([]byte(url))
file := path.Join(global.CachePath, hex.EncodeToString(hash[:])+".cache") file := path.Join(global.CachePath, hex.EncodeToString(hash[:])+".cache")
@ -817,8 +907,11 @@ func (bot *CQBot) CQDownloadFile(url string, headers map[string]string, threadCo
}) })
} }
func (bot *CQBot) CQGetForwardMessage(resId string) MSG { // CQGetForwardMessage 获取合并转发消息
m := bot.Client.GetForwardMessage(resId) //
// https://git.io/Jtz1F
func (bot *CQBot) CQGetForwardMessage(resID string) MSG {
m := bot.Client.GetForwardMessage(resID)
if m == nil { if m == nil {
return Failed(100, "MSG_NOT_FOUND", "消息不存在") return Failed(100, "MSG_NOT_FOUND", "消息不存在")
} }
@ -839,8 +932,11 @@ func (bot *CQBot) CQGetForwardMessage(resId string) MSG {
}) })
} }
func (bot *CQBot) CQGetMessage(messageId int32) MSG { // CQGetMessage 获取消息
msg := bot.GetMessage(messageId) //
// https://git.io/Jtz1b
func (bot *CQBot) CQGetMessage(messageID int32) MSG {
msg := bot.GetMessage(messageID)
if msg == nil { if msg == nil {
return Failed(100, "MSG_NOT_FOUND", "消息不存在") return Failed(100, "MSG_NOT_FOUND", "消息不存在")
} }
@ -848,7 +944,7 @@ func (bot *CQBot) CQGetMessage(messageId int32) MSG {
gid, isGroup := msg["group"] gid, isGroup := msg["group"]
raw := msg["message"].(string) raw := msg["message"].(string)
return OK(MSG{ return OK(MSG{
"message_id": messageId, "message_id": messageID,
"real_id": msg["message-id"], "real_id": msg["message-id"],
"message_seq": msg["message-id"], "message_seq": msg["message-id"],
"group": isGroup, "group": isGroup,
@ -874,6 +970,9 @@ func (bot *CQBot) CQGetMessage(messageId int32) MSG {
}) })
} }
// CQGetGroupSystemMessages 扩展API-获取群文件系统消息
//
// https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E7%B3%BB%E7%BB%9F%E6%B6%88%E6%81%AF
func (bot *CQBot) CQGetGroupSystemMessages() MSG { func (bot *CQBot) CQGetGroupSystemMessages() MSG {
msg, err := bot.Client.GetGroupSystemMessages() msg, err := bot.Client.GetGroupSystemMessages()
if err != nil { if err != nil {
@ -883,18 +982,21 @@ func (bot *CQBot) CQGetGroupSystemMessages() MSG {
return OK(msg) return OK(msg)
} }
func (bot *CQBot) CQGetGroupMessageHistory(groupId int64, seq int64) MSG { // CQGetGroupMessageHistory 获取群消息历史记录
if g := bot.Client.FindGroup(groupId); g == nil { //
// https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%B6%88%E6%81%AF%E5%8E%86%E5%8F%B2%E8%AE%B0%E5%BD%95
func (bot *CQBot) CQGetGroupMessageHistory(groupID int64, seq int64) MSG {
if g := bot.Client.FindGroup(groupID); g == nil {
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }
if seq == 0 { if seq == 0 {
g, err := bot.Client.GetGroupInfo(groupId) g, err := bot.Client.GetGroupInfo(groupID)
if err != nil { if err != nil {
return Failed(100, "GROUP_INFO_API_ERROR", err.Error()) return Failed(100, "GROUP_INFO_API_ERROR", err.Error())
} }
seq = g.LastMsgSeq seq = g.LastMsgSeq
} }
msg, err := bot.Client.GetGroupMessages(groupId, int64(math.Max(float64(seq-19), 1)), seq) msg, err := bot.Client.GetGroupMessages(groupID, int64(math.Max(float64(seq-19), 1)), seq)
if err != nil { if err != nil {
log.Warnf("获取群历史消息失败: %v", err) log.Warnf("获取群历史消息失败: %v", err)
return Failed(100, "MESSAGES_API_ERROR", err.Error()) return Failed(100, "MESSAGES_API_ERROR", err.Error())
@ -915,6 +1017,9 @@ func (bot *CQBot) CQGetGroupMessageHistory(groupId int64, seq int64) MSG {
}) })
} }
// CQGetOnlineClients 扩展API-获取当前账号在线客户端列表
//
// https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E5%BD%93%E5%89%8D%E8%B4%A6%E5%8F%B7%E5%9C%A8%E7%BA%BF%E5%AE%A2%E6%88%B7%E7%AB%AF%E5%88%97%E8%A1%A8
func (bot *CQBot) CQGetOnlineClients(noCache bool) MSG { func (bot *CQBot) CQGetOnlineClients(noCache bool) MSG {
if noCache { if noCache {
if err := bot.Client.RefreshStatus(); err != nil { if err := bot.Client.RefreshStatus(); err != nil {
@ -935,16 +1040,25 @@ func (bot *CQBot) CQGetOnlineClients(noCache bool) MSG {
}) })
} }
// CQCanSendImage 检查是否可以发送图片(此处永远返回true)
//
// https://git.io/Jtz1N
func (bot *CQBot) CQCanSendImage() MSG { func (bot *CQBot) CQCanSendImage() MSG {
return OK(MSG{"yes": true}) return OK(MSG{"yes": true})
} }
// CQCanSendRecord 检查是否可以发送语音(此处永远返回true)
//
// https://git.io/Jtz1x
func (bot *CQBot) CQCanSendRecord() MSG { func (bot *CQBot) CQCanSendRecord() MSG {
return OK(MSG{"yes": true}) return OK(MSG{"yes": true})
} }
func (bot *CQBot) CQOcrImage(imageId string) MSG { // CQOcrImage 扩展API-图片OCR
img, err := bot.makeImageOrVideoElem(map[string]string{"file": imageId}, false, true) //
// https://docs.go-cqhttp.org/api/#%E5%9B%BE%E7%89%87-ocr
func (bot *CQBot) CQOcrImage(imageID string) MSG {
img, err := bot.makeImageOrVideoElem(map[string]string{"file": imageID}, false, true)
if err != nil { if err != nil {
log.Warnf("load image error: %v", err) log.Warnf("load image error: %v", err)
return Failed(100, "LOAD_FILE_ERROR", err.Error()) return Failed(100, "LOAD_FILE_ERROR", err.Error())
@ -957,13 +1071,19 @@ func (bot *CQBot) CQOcrImage(imageId string) MSG {
return OK(rsp) return OK(rsp)
} }
// CQReloadEventFilter 扩展API-重载事件过滤器
//
// https://docs.go-cqhttp.org/api/#%E9%87%8D%E8%BD%BD%E4%BA%8B%E4%BB%B6%E8%BF%87%E6%BB%A4%E5%99%A8
func (bot *CQBot) CQReloadEventFilter() MSG { func (bot *CQBot) CQReloadEventFilter() MSG {
global.BootFilter() global.BootFilter()
return OK(nil) return OK(nil)
} }
func (bot *CQBot) CQSetGroupPortrait(groupId int64, file, cache string) MSG { // CQSetGroupPortrait 扩展API-设置群头像
if g := bot.Client.FindGroup(groupId); g != nil { //
// https://docs.go-cqhttp.org/api/#%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%A4%B4%E5%83%8F
func (bot *CQBot) CQSetGroupPortrait(groupID int64, file, cache string) MSG {
if g := bot.Client.FindGroup(groupID); g != nil {
img, err := global.FindFile(file, cache, global.ImagePath) img, err := global.FindFile(file, cache, global.ImagePath)
if err != nil { if err != nil {
log.Warnf("set group portrait error: %v", err) log.Warnf("set group portrait error: %v", err)
@ -975,11 +1095,14 @@ func (bot *CQBot) CQSetGroupPortrait(groupId int64, file, cache string) MSG {
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }
func (bot *CQBot) CQSetGroupAnonymousBan(groupId int64, flag string, duration int32) MSG { // CQSetGroupAnonymousBan 群组匿名用户禁言
//
// https://git.io/Jtz1p
func (bot *CQBot) CQSetGroupAnonymousBan(groupID int64, flag string, duration int32) MSG {
if flag == "" { if flag == "" {
return Failed(100, "INVALID_FLAG", "无效的flag") return Failed(100, "INVALID_FLAG", "无效的flag")
} }
if g := bot.Client.FindGroup(groupId); g != nil { if g := bot.Client.FindGroup(groupID); g != nil {
s := strings.SplitN(flag, "|", 2) s := strings.SplitN(flag, "|", 2)
if len(s) != 2 { if len(s) != 2 {
return Failed(100, "INVALID_FLAG", "无效的flag") return Failed(100, "INVALID_FLAG", "无效的flag")
@ -995,7 +1118,9 @@ func (bot *CQBot) CQSetGroupAnonymousBan(groupId int64, flag string, duration in
return Failed(100, "GROUP_NOT_FOUND", "群聊不存在") return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
} }
// 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 // CQGetStatus 获取运行状态
//
// https://git.io/JtzMe
func (bot *CQBot) CQGetStatus() MSG { func (bot *CQBot) CQGetStatus() MSG {
return OK(MSG{ return OK(MSG{
"app_initialized": true, "app_initialized": true,
@ -1008,7 +1133,9 @@ func (bot *CQBot) CQGetStatus() MSG {
}) })
} }
// CQSetEssenceMessage 设置精华消息 // CQSetEssenceMessage 扩展API-设置精华消息
//
// https://docs.go-cqhttp.org/api/#%E8%AE%BE%E7%BD%AE%E7%B2%BE%E5%8D%8E%E6%B6%88%E6%81%AF
func (bot *CQBot) CQSetEssenceMessage(messageID int32) MSG { func (bot *CQBot) CQSetEssenceMessage(messageID int32) MSG {
msg := bot.GetMessage(messageID) msg := bot.GetMessage(messageID)
if msg == nil { if msg == nil {
@ -1026,7 +1153,9 @@ func (bot *CQBot) CQSetEssenceMessage(messageID int32) MSG {
return OK(nil) return OK(nil)
} }
// CQDeleteEssenceMessage 移出精华消息 // CQDeleteEssenceMessage 扩展API-移出精华消息
//
// https://docs.go-cqhttp.org/api/#%E7%A7%BB%E5%87%BA%E7%B2%BE%E5%8D%8E%E6%B6%88%E6%81%AF
func (bot *CQBot) CQDeleteEssenceMessage(messageID int32) MSG { func (bot *CQBot) CQDeleteEssenceMessage(messageID int32) MSG {
msg := bot.GetMessage(messageID) msg := bot.GetMessage(messageID)
if msg == nil { if msg == nil {
@ -1044,7 +1173,9 @@ func (bot *CQBot) CQDeleteEssenceMessage(messageID int32) MSG {
return OK(nil) return OK(nil)
} }
// CQGetEssenceMessageList 获取精华消息列表 // CQGetEssenceMessageList 扩展API-获取精华消息列表
//
// https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%B2%BE%E5%8D%8E%E6%B6%88%E6%81%AF%E5%88%97%E8%A1%A8
func (bot *CQBot) CQGetEssenceMessageList(groupCode int64) MSG { func (bot *CQBot) CQGetEssenceMessageList(groupCode int64) MSG {
g := bot.Client.FindGroup(groupCode) g := bot.Client.FindGroup(groupCode)
if g == nil { if g == nil {
@ -1064,18 +1195,24 @@ func (bot *CQBot) CQGetEssenceMessageList(groupCode int64) MSG {
} }
msg["sender_id"], _ = strconv.ParseUint(m.SenderUin, 10, 64) msg["sender_id"], _ = strconv.ParseUint(m.SenderUin, 10, 64)
msg["operator_id"], _ = strconv.ParseUint(m.AddDigestUin, 10, 64) msg["operator_id"], _ = strconv.ParseUint(m.AddDigestUin, 10, 64)
msg["message_id"] = ToGlobalId(groupCode, int32(m.MessageID)) msg["message_id"] = toGlobalID(groupCode, int32(m.MessageID))
list = append(list, msg) list = append(list, msg)
} }
return OK(list) return OK(list)
} }
func (bot *CQBot) CQCheckUrlSafely(url string) MSG { // CQCheckURLSafely 扩展API-检查链接安全性
//
// https://docs.go-cqhttp.org/api/#%E6%A3%80%E6%9F%A5%E9%93%BE%E6%8E%A5%E5%AE%89%E5%85%A8%E6%80%A7
func (bot *CQBot) CQCheckURLSafely(url string) MSG {
return OK(MSG{ return OK(MSG{
"level": bot.Client.CheckUrlSafely(url), "level": bot.Client.CheckUrlSafely(url),
}) })
} }
// CQGetVersionInfo 获取版本信息
//
// https://git.io/JtwUs
func (bot *CQBot) CQGetVersionInfo() MSG { func (bot *CQBot) CQGetVersionInfo() MSG {
wd, _ := os.Getwd() wd, _ := os.Getwd()
return OK(MSG{ return OK(MSG{
@ -1105,10 +1242,12 @@ func (bot *CQBot) CQGetVersionInfo() MSG {
}) })
} }
// OK 生成成功返回值
func OK(data interface{}) MSG { func OK(data interface{}) MSG {
return MSG{"data": data, "retcode": 0, "status": "ok"} return MSG{"data": data, "retcode": 0, "status": "ok"}
} }
// Failed 生成失败返回值
func Failed(code int, msg ...string) MSG { func Failed(code int, msg ...string) MSG {
m := "" m := ""
w := "" w := ""
@ -1121,9 +1260,9 @@ func Failed(code int, msg ...string) MSG {
return MSG{"data": nil, "retcode": code, "msg": m, "wording": w, "status": "failed"} return MSG{"data": nil, "retcode": code, "msg": m, "wording": w, "status": "failed"}
} }
func convertGroupMemberInfo(groupId int64, m *client.GroupMemberInfo) MSG { func convertGroupMemberInfo(groupID int64, m *client.GroupMemberInfo) MSG {
return MSG{ return MSG{
"group_id": groupId, "group_id": groupID,
"user_id": m.Uin, "user_id": m.Uin,
"nickname": m.Nickname, "nickname": m.Nickname,
"card": m.CardName, "card": m.CardName,

56
coolq/bot.go
View File

@ -28,6 +28,7 @@ import (
var json = jsoniter.ConfigCompatibleWithStandardLibrary var json = jsoniter.ConfigCompatibleWithStandardLibrary
// CQBot CQBot结构体,存储Bot实例相关配置
type CQBot struct { type CQBot struct {
Client *client.QQClient Client *client.QQClient
@ -38,10 +39,13 @@ type CQBot struct {
oneWayMsgCache sync.Map oneWayMsgCache sync.Map
} }
// MSG 消息Map
type MSG map[string]interface{} type MSG map[string]interface{}
// ForceFragmented 是否启用强制分片
var ForceFragmented = false var ForceFragmented = false
// NewQQBot 初始化一个QQBot实例
func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot { func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
bot := &CQBot{ bot := &CQBot{
Client: cli, Client: cli,
@ -103,10 +107,12 @@ func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
return bot return bot
} }
// OnEventPush 注册事件上报函数
func (bot *CQBot) OnEventPush(f func(m MSG)) { func (bot *CQBot) OnEventPush(f func(m MSG)) {
bot.events = append(bot.events, f) bot.events = append(bot.events, f)
} }
// GetMessage 获取给定消息id对应的消息
func (bot *CQBot) GetMessage(mid int32) MSG { func (bot *CQBot) GetMessage(mid int32) MSG {
if bot.db != nil { if bot.db != nil {
m := MSG{} m := MSG{}
@ -124,6 +130,7 @@ func (bot *CQBot) GetMessage(mid int32) MSG {
return nil return nil
} }
// UploadLocalImageAsGroup 上传本地图片至群聊
func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (*message.GroupImageElement, error) { func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (*message.GroupImageElement, error) {
if img.Stream != nil { if img.Stream != nil {
return bot.Client.UploadGroupImage(groupCode, img.Stream) return bot.Client.UploadGroupImage(groupCode, img.Stream)
@ -131,6 +138,7 @@ func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElemen
return bot.Client.UploadGroupImageByFile(groupCode, img.File) return bot.Client.UploadGroupImageByFile(groupCode, img.File)
} }
// UploadLocalVideo 上传本地短视频至群聊
func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message.ShortVideoElement, error) { func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message.ShortVideoElement, error) {
if v.File != "" { if v.File != "" {
video, err := os.Open(v.File) video, err := os.Open(v.File)
@ -147,9 +155,10 @@ func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message
return &v.ShortVideoElement, nil return &v.ShortVideoElement, nil
} }
func (bot *CQBot) UploadLocalImageAsPrivate(userId int64, img *LocalImageElement) (*message.FriendImageElement, error) { // UploadLocalImageAsPrivate 上传本地图片至私聊
func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement) (*message.FriendImageElement, error) {
if img.Stream != nil { if img.Stream != nil {
return bot.Client.UploadPrivateImage(userId, img.Stream) return bot.Client.UploadPrivateImage(userID, img.Stream)
} }
// need update. // need update.
f, err := os.Open(img.File) f, err := os.Open(img.File)
@ -157,41 +166,42 @@ func (bot *CQBot) UploadLocalImageAsPrivate(userId int64, img *LocalImageElement
return nil, err return nil, err
} }
defer f.Close() defer f.Close()
return bot.Client.UploadPrivateImage(userId, f) return bot.Client.UploadPrivateImage(userID, f)
} }
func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int32 { // SendGroupMessage 发送群消息
func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int32 {
var newElem []message.IMessageElement var newElem []message.IMessageElement
for _, elem := range m.Elements { for _, elem := range m.Elements {
if i, ok := elem.(*LocalImageElement); ok { if i, ok := elem.(*LocalImageElement); ok {
gm, err := bot.UploadLocalImageAsGroup(groupId, i) gm, err := bot.UploadLocalImageAsGroup(groupID, i)
if err != nil { if err != nil {
log.Warnf("警告: 群 %v 消息图片上传失败: %v", groupId, err) log.Warnf("警告: 群 %v 消息图片上传失败: %v", groupID, err)
continue continue
} }
newElem = append(newElem, gm) newElem = append(newElem, gm)
continue continue
} }
if i, ok := elem.(*message.VoiceElement); ok { if i, ok := elem.(*message.VoiceElement); ok {
gv, err := bot.Client.UploadGroupPtt(groupId, bytes.NewReader(i.Data)) gv, err := bot.Client.UploadGroupPtt(groupID, bytes.NewReader(i.Data))
if err != nil { if err != nil {
log.Warnf("警告: 群 %v 消息语音上传失败: %v", groupId, err) log.Warnf("警告: 群 %v 消息语音上传失败: %v", groupID, err)
continue continue
} }
newElem = append(newElem, gv) newElem = append(newElem, gv)
continue continue
} }
if i, ok := elem.(*LocalVideoElement); ok { if i, ok := elem.(*LocalVideoElement); ok {
gv, err := bot.UploadLocalVideo(groupId, i) gv, err := bot.UploadLocalVideo(groupID, i)
if err != nil { if err != nil {
log.Warnf("警告: 群 %v 消息短视频上传失败: %v", groupId, err) log.Warnf("警告: 群 %v 消息短视频上传失败: %v", groupID, err)
continue continue
} }
newElem = append(newElem, gv) newElem = append(newElem, gv)
continue continue
} }
if i, ok := elem.(*PokeElement); ok { if i, ok := elem.(*PokeElement); ok {
if group := bot.Client.FindGroup(groupId); group != nil { if group := bot.Client.FindGroup(groupID); group != nil {
if mem := group.FindMember(i.Target); mem != nil { if mem := group.FindMember(i.Target); mem != nil {
mem.Poke() mem.Poke()
return 0 return 0
@ -199,13 +209,13 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
} }
} }
if i, ok := elem.(*GiftElement); ok { if i, ok := elem.(*GiftElement); ok {
bot.Client.SendGroupGift(uint64(groupId), uint64(i.Target), i.GiftId) bot.Client.SendGroupGift(uint64(groupID), uint64(i.Target), i.GiftID)
return 0 return 0
} }
if i, ok := elem.(*message.MusicShareElement); ok { if i, ok := elem.(*message.MusicShareElement); ok {
ret, err := bot.Client.SendGroupMusicShare(groupId, i) ret, err := bot.Client.SendGroupMusicShare(groupID, i)
if err != nil { if err != nil {
log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupId, err) log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupID, err)
return -1 return -1
} }
return bot.InsertGroupMessage(ret) return bot.InsertGroupMessage(ret)
@ -218,7 +228,7 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
} }
m.Elements = newElem m.Elements = newElem
bot.checkMedia(newElem) bot.checkMedia(newElem)
ret := bot.Client.SendGroupMessage(groupId, m, ForceFragmented) ret := bot.Client.SendGroupMessage(groupID, m, ForceFragmented)
if ret == nil || ret.Id == -1 { if ret == nil || ret.Id == -1 {
log.Warnf("群消息发送失败: 账号可能被风控.") log.Warnf("群消息发送失败: 账号可能被风控.")
return -1 return -1
@ -226,6 +236,7 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
return bot.InsertGroupMessage(ret) return bot.InsertGroupMessage(ret)
} }
// SendPrivateMessage 发送私聊消息
func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) int32 { func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) int32 {
var newElem []message.IMessageElement var newElem []message.IMessageElement
for _, elem := range m.Elements { for _, elem := range m.Elements {
@ -295,6 +306,7 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in
return id return id
} }
// InsertGroupMessage 群聊消息入数据库
func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 { func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
val := MSG{ val := MSG{
"message-id": m.Id, "message-id": m.Id,
@ -305,7 +317,7 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
"time": m.Time, "time": m.Time,
"message": ToStringMessage(m.Elements, m.GroupCode, true), "message": ToStringMessage(m.Elements, m.GroupCode, true),
} }
id := ToGlobalId(m.GroupCode, m.Id) id := toGlobalID(m.GroupCode, m.Id)
if bot.db != nil { if bot.db != nil {
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
if err := gob.NewEncoder(buf).Encode(val); err != nil { if err := gob.NewEncoder(buf).Encode(val); err != nil {
@ -320,6 +332,7 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
return id return id
} }
// InsertPrivateMessage 私聊消息入数据库
func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 { func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
val := MSG{ val := MSG{
"message-id": m.Id, "message-id": m.Id,
@ -329,7 +342,7 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
"time": m.Time, "time": m.Time,
"message": ToStringMessage(m.Elements, m.Sender.Uin, true), "message": ToStringMessage(m.Elements, m.Sender.Uin, true),
} }
id := ToGlobalId(m.Sender.Uin, m.Id) id := toGlobalID(m.Sender.Uin, m.Id)
if bot.db != nil { if bot.db != nil {
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
if err := gob.NewEncoder(buf).Encode(val); err != nil { if err := gob.NewEncoder(buf).Encode(val); err != nil {
@ -344,10 +357,12 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
return id return id
} }
func ToGlobalId(code int64, msgId int32) int32 { // toGlobalID 构建`code`-`msgID`的字符串并返回其CRC32 Checksum的值
return int32(crc32.ChecksumIEEE([]byte(fmt.Sprintf("%d-%d", code, msgId)))) func toGlobalID(code int64, msgID int32) int32 {
return int32(crc32.ChecksumIEEE([]byte(fmt.Sprintf("%d-%d", code, msgID))))
} }
// Release 释放Bot实例
func (bot *CQBot) Release() { func (bot *CQBot) Release() {
if bot.db != nil { if bot.db != nil {
_ = bot.db.Close() _ = bot.db.Close()
@ -438,7 +453,8 @@ func formatMemberName(mem *client.GroupMemberInfo) string {
return fmt.Sprintf("%s(%d)", mem.DisplayName(), mem.Uin) return fmt.Sprintf("%s(%d)", mem.DisplayName(), mem.Uin)
} }
func (m MSG) ToJson() string { // ToJSON 生成JSON字符串
func (m MSG) ToJSON() string {
b, _ := json.Marshal(m) b, _ := json.Marshal(m)
return string(b) return string(b)
} }

162
coolq/cqcode.go
View File

@ -34,43 +34,53 @@ var typeReg = regexp.MustCompile(`\[CQ:(\w+)`)
var paramReg = regexp.MustCompile(`,([\w\-.]+?)=([^,\]]+)`) var paramReg = regexp.MustCompile(`,([\w\-.]+?)=([^,\]]+)`)
*/ */
// IgnoreInvalidCQCode 是否忽略无效CQ码
var IgnoreInvalidCQCode = false var IgnoreInvalidCQCode = false
var SplitUrl = false
// SplitURL 是否分割URL
var SplitURL = false
const maxImageSize = 1024 * 1024 * 30 // 30MB const maxImageSize = 1024 * 1024 * 30 // 30MB
const maxVideoSize = 1024 * 1024 * 100 // 100MB const maxVideoSize = 1024 * 1024 * 100 // 100MB
// PokeElement 拍一拍
type PokeElement struct { type PokeElement struct {
Target int64 Target int64
} }
// GiftElement 礼物
type GiftElement struct { type GiftElement struct {
Target int64 Target int64
GiftId message.GroupGift GiftID message.GroupGift
} }
// LocalImageElement 本地图片
type LocalImageElement struct { type LocalImageElement struct {
message.ImageElement message.ImageElement
Stream io.ReadSeeker Stream io.ReadSeeker
File string File string
} }
// LocalVoiceElement 本地语音
type LocalVoiceElement struct { type LocalVoiceElement struct {
message.VoiceElement message.VoiceElement
Stream io.ReadSeeker Stream io.ReadSeeker
} }
// LocalVideoElement 本地视频
type LocalVideoElement struct { type LocalVideoElement struct {
message.ShortVideoElement message.ShortVideoElement
File string File string
thumb io.ReadSeeker thumb io.ReadSeeker
} }
// Type 获取元素类型ID
func (e *GiftElement) Type() message.ElementType { func (e *GiftElement) Type() message.ElementType {
// Make message.IMessageElement Happy
return message.At return message.At
} }
var GiftId = [...]message.GroupGift{ // GiftID 礼物ID数组
var GiftID = [...]message.GroupGift{
message.SweetWink, message.SweetWink,
message.HappyCola, message.HappyCola,
message.LuckyBracelet, message.LuckyBracelet,
@ -87,15 +97,18 @@ var GiftId = [...]message.GroupGift{
message.LoveMask, message.LoveMask,
} }
// Type 获取元素类型ID
func (e *PokeElement) Type() message.ElementType { func (e *PokeElement) Type() message.ElementType {
// Make message.IMessageElement Happy
return message.At return message.At
} }
func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []MSG) { // ToArrayMessage 将消息元素数组转为MSG数组以用于消息上报
func ToArrayMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r []MSG) {
r = []MSG{} r = []MSG{}
ur := false ur := false
if len(raw) != 0 { if len(isRaw) != 0 {
ur = raw[0] ur = isRaw[0]
} }
m := &message.SendingMessage{Elements: e} m := &message.SendingMessage{Elements: e}
reply := m.FirstOrNil(func(e message.IMessageElement) bool { reply := m.FirstOrNil(func(e message.IMessageElement) bool {
@ -105,7 +118,7 @@ func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []M
if reply != nil { if reply != nil {
r = append(r, MSG{ r = append(r, MSG{
"type": "reply", "type": "reply",
"data": map[string]string{"id": fmt.Sprint(ToGlobalId(code, reply.(*message.ReplyElement).ReplySeq))}, "data": map[string]string{"id": fmt.Sprint(toGlobalID(id, reply.(*message.ReplyElement).ReplySeq))},
}) })
} }
for _, elem := range e { for _, elem := range e {
@ -117,10 +130,10 @@ func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []M
"data": map[string]string{"text": o.Content}, "data": map[string]string{"text": o.Content},
} }
case *message.LightAppElement: case *message.LightAppElement:
//m = MSG{ // m = MSG{
// "type": "text", // "type": "text",
// "data": map[string]string{"text": o.Content}, // "data": map[string]string{"text": o.Content},
//} // }
m = MSG{ m = MSG{
"type": "json", "type": "json",
"data": map[string]string{"data": o.Content}, "data": map[string]string{"data": o.Content},
@ -242,10 +255,11 @@ func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []M
return return
} }
func ToStringMessage(e []message.IMessageElement, code int64, raw ...bool) (r string) { // ToStringMessage 将消息元素数组转为字符串以用于消息上报
func ToStringMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r string) {
ur := false ur := false
if len(raw) != 0 { if len(isRaw) != 0 {
ur = raw[0] ur = isRaw[0]
} }
// 方便 // 方便
m := &message.SendingMessage{Elements: e} m := &message.SendingMessage{Elements: e}
@ -254,7 +268,7 @@ func ToStringMessage(e []message.IMessageElement, code int64, raw ...bool) (r st
return ok return ok
}) })
if reply != nil { if reply != nil {
r += fmt.Sprintf("[CQ:reply,id=%d]", ToGlobalId(code, reply.(*message.ReplyElement).ReplySeq)) r += fmt.Sprintf("[CQ:reply,id=%d]", toGlobalID(id, reply.(*message.ReplyElement).ReplySeq))
} }
for _, elem := range e { for _, elem := range e {
switch o := elem.(type) { switch o := elem.(type) {
@ -314,13 +328,14 @@ func ToStringMessage(e []message.IMessageElement, code int64, raw ...bool) (r st
} }
case *message.LightAppElement: case *message.LightAppElement:
r += fmt.Sprintf(`[CQ:json,data=%s]`, CQCodeEscapeValue(o.Content)) r += fmt.Sprintf(`[CQ:json,data=%s]`, CQCodeEscapeValue(o.Content))
//r += CQCodeEscapeText(o.Content) // r += CQCodeEscapeText(o.Content)
} }
} }
return return
} }
func (bot *CQBot) ConvertStringMessage(msg string, group bool) (r []message.IMessageElement) { // ConvertStringMessage 将消息字符串转为消息元素数组
func (bot *CQBot) ConvertStringMessage(msg string, isGroup bool) (r []message.IMessageElement) {
index := 0 index := 0
stat := 0 stat := 0
rMsg := []rune(msg) rMsg := []rune(msg)
@ -345,7 +360,7 @@ func (bot *CQBot) ConvertStringMessage(msg string, group bool) (r []message.IMes
} }
saveTempText := func() { saveTempText := func() {
if len(tempText) != 0 { if len(tempText) != 0 {
if SplitUrl { if SplitURL {
for _, t := range global.SplitURL(CQCodeUnescapeValue(string(tempText))) { for _, t := range global.SplitURL(CQCodeUnescapeValue(string(tempText))) {
r = append(r, message.NewText(t)) r = append(r, message.NewText(t))
} }
@ -397,7 +412,7 @@ func (bot *CQBot) ConvertStringMessage(msg string, group bool) (r []message.IMes
ReplySeq: org["message-id"].(int32), ReplySeq: org["message-id"].(int32),
Sender: org["sender"].(message.Sender).Uin, Sender: org["sender"].(message.Sender).Uin,
Time: org["time"].(int32), Time: org["time"].(int32),
Elements: bot.ConvertStringMessage(org["message"].(string), group), Elements: bot.ConvertStringMessage(org["message"].(string), isGroup),
}, },
}, r...) }, r...)
return return
@ -417,7 +432,7 @@ func (bot *CQBot) ConvertStringMessage(msg string, group bool) (r []message.IMes
ReplySeq: int32(0), ReplySeq: int32(0),
Sender: sender, Sender: sender,
Time: int32(msgTime), Time: int32(msgTime),
Elements: bot.ConvertStringMessage(customText, group), Elements: bot.ConvertStringMessage(customText, isGroup),
}, },
}, r...) }, r...)
return return
@ -429,7 +444,7 @@ func (bot *CQBot) ConvertStringMessage(msg string, group bool) (r []message.IMes
return return
} }
} }
elem, err := bot.ToElement(t, params, group) elem, err := bot.ToElement(t, params, isGroup)
if err != nil { if err != nil {
org := "[CQ:" + string(cqCode) + "]" org := "[CQ:" + string(cqCode) + "]"
if !IgnoreInvalidCQCode { if !IgnoreInvalidCQCode {
@ -476,10 +491,11 @@ func (bot *CQBot) ConvertStringMessage(msg string, group bool) (r []message.IMes
return return
} }
func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.IMessageElement) { // ConvertObjectMessage 将消息JSON对象转为消息元素数组
func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []message.IMessageElement) {
convertElem := func(e gjson.Result) { convertElem := func(e gjson.Result) {
t := e.Get("type").Str t := e.Get("type").Str
if t == "reply" && group { if t == "reply" && isGroup {
if len(r) > 0 { if len(r) > 0 {
if _, ok := r[0].(*message.ReplyElement); ok { if _, ok := r[0].(*message.ReplyElement); ok {
log.Warnf("警告: 一条信息只能包含一个 Reply 元素.") log.Warnf("警告: 一条信息只能包含一个 Reply 元素.")
@ -496,7 +512,7 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
ReplySeq: org["message-id"].(int32), ReplySeq: org["message-id"].(int32),
Sender: org["sender"].(message.Sender).Uin, Sender: org["sender"].(message.Sender).Uin,
Time: org["time"].(int32), Time: org["time"].(int32),
Elements: bot.ConvertStringMessage(org["message"].(string), group), Elements: bot.ConvertStringMessage(org["message"].(string), isGroup),
}, },
}, r...) }, r...)
return return
@ -516,7 +532,7 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
ReplySeq: int32(0), ReplySeq: int32(0),
Sender: sender, Sender: sender,
Time: int32(msgTime), Time: int32(msgTime),
Elements: bot.ConvertStringMessage(customText, group), Elements: bot.ConvertStringMessage(customText, isGroup),
}, },
}, r...) }, r...)
return return
@ -531,7 +547,7 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
d[key.Str] = value.String() d[key.Str] = value.String()
return true return true
}) })
elem, err := bot.ToElement(t, d, group) elem, err := bot.ToElement(t, d, isGroup)
if err != nil { if err != nil {
log.Warnf("转换CQ码到MiraiGo Element时出现错误: %v 将忽略本段CQ码.", err) log.Warnf("转换CQ码到MiraiGo Element时出现错误: %v 将忽略本段CQ码.", err)
return return
@ -544,7 +560,7 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
} }
} }
if m.Type == gjson.String { if m.Type == gjson.String {
return bot.ConvertStringMessage(m.Str, group) return bot.ConvertStringMessage(m.Str, isGroup)
} }
if m.IsArray() { if m.IsArray() {
for _, e := range m.Array() { for _, e := range m.Array() {
@ -558,12 +574,14 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
} }
// ToElement 将解码后的CQCode转换为Element. // ToElement 将解码后的CQCode转换为Element.
//
// 返回 interface{} 存在三种类型 // 返回 interface{} 存在三种类型
//
// message.IMessageElement []message.IMessageElement nil // message.IMessageElement []message.IMessageElement nil
func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interface{}, err error) { func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m interface{}, err error) {
switch t { switch t {
case "text": case "text":
if SplitUrl { if SplitURL {
var ret []message.IMessageElement var ret []message.IMessageElement
for _, text := range global.SplitURL(d["text"]) { for _, text := range global.SplitURL(d["text"]) {
ret = append(ret, message.NewText(text)) ret = append(ret, message.NewText(text))
@ -572,7 +590,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
} }
return message.NewText(d["text"]), nil return message.NewText(d["text"]), nil
case "image": case "image":
img, err := bot.makeImageOrVideoElem(d, false, group) img, err := bot.makeImageOrVideoElem(d, false, isGroup)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -581,7 +599,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
return img, nil return img, nil
} }
if i, ok := img.(*LocalImageElement); ok { // 秀图，闪照什么的就直接传了吧 if i, ok := img.(*LocalImageElement); ok { // 秀图，闪照什么的就直接传了吧
if group { if isGroup {
img, err = bot.UploadLocalImageAsGroup(1, i) img, err = bot.UploadLocalImageAsGroup(1, i)
} else { } else {
img, err = bot.UploadLocalImageAsPrivate(1, i) img, err = bot.UploadLocalImageAsPrivate(1, i)
@ -613,7 +631,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
t, _ := strconv.ParseInt(d["qq"], 10, 64) t, _ := strconv.ParseInt(d["qq"], 10, 64)
return &PokeElement{Target: t}, nil return &PokeElement{Target: t}, nil
case "gift": case "gift":
if !group { if !isGroup {
return nil, errors.New("private gift unsupported") // no free private gift return nil, errors.New("private gift unsupported") // no free private gift
} }
t, _ := strconv.ParseInt(d["qq"], 10, 64) t, _ := strconv.ParseInt(d["qq"], 10, 64)
@ -621,7 +639,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
if id < 0 || id >= 14 { if id < 0 || id >= 14 {
return nil, errors.New("invalid gift id") return nil, errors.New("invalid gift id")
} }
return &GiftElement{Target: t, GiftId: GiftId[id]}, nil return &GiftElement{Target: t, GiftID: GiftID[id]}, nil
case "tts": case "tts":
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
@ -679,7 +697,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
mid := info.Get("track_info.mid").Str mid := info.Get("track_info.mid").Str
albumMid := info.Get("track_info.album.mid").Str albumMid := info.Get("track_info.album.mid").Str
pinfo, _ := global.GetBytes("http://u.y.qq.com/cgi-bin/musicu.fcg?g_tk=2034008533&uin=0&format=json&data={\"comm\":{\"ct\":23,\"cv\":0},\"url_mid\":{\"module\":\"vkey.GetVkeyServer\",\"method\":\"CgiGetVkey\",\"param\":{\"guid\":\"4311206557\",\"songmid\":[\"" + mid + "\"],\"songtype\":[0],\"uin\":\"0\",\"loginflag\":1,\"platform\":\"23\"}}}&_=1599039471576") pinfo, _ := global.GetBytes("http://u.y.qq.com/cgi-bin/musicu.fcg?g_tk=2034008533&uin=0&format=json&data={\"comm\":{\"ct\":23,\"cv\":0},\"url_mid\":{\"module\":\"vkey.GetVkeyServer\",\"method\":\"CgiGetVkey\",\"param\":{\"guid\":\"4311206557\",\"songmid\":[\"" + mid + "\"],\"songtype\":[0],\"uin\":\"0\",\"loginflag\":1,\"platform\":\"23\"}}}&_=1599039471576")
jumpUrl := "https://i.y.qq.com/v8/playsong.html?platform=11&appshare=android_qq&appversion=10030010&hosteuin=oKnlNenz7i-s7c**&songmid=" + mid + "&type=0&appsongtype=1&_wv=1&source=qq&ADTAG=qfshare" jumpURL := "https://i.y.qq.com/v8/playsong.html?platform=11&appshare=android_qq&appversion=10030010&hosteuin=oKnlNenz7i-s7c**&songmid=" + mid + "&type=0&appsongtype=1&_wv=1&source=qq&ADTAG=qfshare"
purl := gjson.ParseBytes(pinfo).Get("url_mid.data.midurlinfo.0.purl").Str purl := gjson.ParseBytes(pinfo).Get("url_mid.data.midurlinfo.0.purl").Str
preview := "http://y.gtimg.cn/music/photo_new/T002R180x180M000" + albumMid + ".jpg" preview := "http://y.gtimg.cn/music/photo_new/T002R180x180M000" + albumMid + ".jpg"
if len(aid) < 2 { if len(aid) < 2 {
@ -693,7 +711,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
MusicType: message.QQMusic, MusicType: message.QQMusic,
Title: name, Title: name,
Summary: content, Summary: content,
Url: jumpUrl, Url: jumpURL,
PictureUrl: preview, PictureUrl: preview,
MusicUrl: purl, MusicUrl: purl,
}, nil }, nil
@ -707,9 +725,9 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
return nil, errors.New("song not found") return nil, errors.New("song not found")
} }
name := info.Get("name").Str name := info.Get("name").Str
jumpUrl := "https://y.music.163.com/m/song/" + d["id"] jumpURL := "https://y.music.163.com/m/song/" + d["id"]
musicUrl := "http://music.163.com/song/media/outer/url?id=" + d["id"] musicURL := "http://music.163.com/song/media/outer/url?id=" + d["id"]
picUrl := info.Get("album.picUrl").Str picURL := info.Get("album.picUrl").Str
artistName := "" artistName := ""
if info.Get("artists.0").Exists() { if info.Get("artists.0").Exists() {
artistName = info.Get("artists.0.name").Str artistName = info.Get("artists.0.name").Str
@ -718,9 +736,9 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
MusicType: message.CloudMusic, MusicType: message.CloudMusic,
Title: name, Title: name,
Summary: artistName, Summary: artistName,
Url: jumpUrl, Url: jumpURL,
PictureUrl: picUrl, PictureUrl: picURL,
MusicUrl: musicUrl, MusicUrl: musicURL,
}, nil }, nil
} }
if d["type"] == "custom" { if d["type"] == "custom" {
@ -746,7 +764,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
}, nil }, 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>`, 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>`,
XmlEscape(d["title"]), d["url"], d["image"], d["audio"], XmlEscape(d["title"]), XmlEscape(d["content"])) XMLEscape(d["title"]), d["url"], d["image"], d["audio"], XMLEscape(d["title"]), XMLEscape(d["content"]))
return &message.ServiceElement{ return &message.ServiceElement{
Id: 60, Id: 60,
Content: xml, Content: xml,
@ -755,20 +773,20 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
} }
return nil, errors.New("unsupported music type: " + d["type"]) return nil, errors.New("unsupported music type: " + d["type"])
case "xml": case "xml":
resId := d["resid"] resID := d["resid"]
template := CQCodeEscapeValue(d["data"]) template := CQCodeEscapeValue(d["data"])
i, _ := strconv.ParseInt(resId, 10, 64) i, _ := strconv.ParseInt(resID, 10, 64)
msg := message.NewRichXml(template, i) msg := message.NewRichXml(template, i)
return msg, nil return msg, nil
case "json": case "json":
resId := d["resid"] resID := d["resid"]
i, _ := strconv.ParseInt(resId, 10, 64) i, _ := strconv.ParseInt(resID, 10, 64)
if i == 0 { if i == 0 {
//默认情况下走小程序通道 // 默认情况下走小程序通道
msg := message.NewLightApp(CQCodeUnescapeValue(d["data"])) msg := message.NewLightApp(CQCodeUnescapeValue(d["data"]))
return msg, nil return msg, nil
} }
//resid不为0的情况下走富文本通道，后续补全透传service Id，此处暂时不处理 TODO // resid不为0的情况下走富文本通道，后续补全透传service Id，此处暂时不处理 TODO
msg := message.NewRichJson(CQCodeUnescapeValue(d["data"])) msg := message.NewRichJson(CQCodeUnescapeValue(d["data"]))
return msg, nil return msg, nil
case "cardimage": case "cardimage":
@ -790,17 +808,17 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
if maxHeight == 0 { if maxHeight == 0 {
maxHeight = 1000 maxHeight = 1000
} }
img, err := bot.makeImageOrVideoElem(d, false, group) img, err := bot.makeImageOrVideoElem(d, false, isGroup)
if err != nil { if err != nil {
return nil, errors.New("send cardimage faild") return nil, errors.New("send cardimage faild")
} }
return bot.makeShowPic(img, source, icon, minWidth, minHeight, maxWidth, maxHeight, group) return bot.makeShowPic(img, source, icon, minWidth, minHeight, maxWidth, maxHeight, isGroup)
case "video": case "video":
cache := d["cache"] cache := d["cache"]
if cache == "" { if cache == "" {
cache = "1" cache = "1"
} }
file, err := bot.makeImageOrVideoElem(d, true, group) file, err := bot.makeImageOrVideoElem(d, true, isGroup)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -848,12 +866,22 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
return nil, nil return nil, nil
} }
func XmlEscape(c string) string { // XMLEscape 将字符串c转义为XML字符串
func XMLEscape(c string) string {
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
_ = xml2.EscapeText(buf, []byte(c)) _ = xml2.EscapeText(buf, []byte(c))
return buf.String() return buf.String()
} }
/*CQCodeEscapeText 将字符串raw中部分字符转义
& -> &amp;
[ -> &#91;
] -> &#93;
*/
func CQCodeEscapeText(raw string) string { func CQCodeEscapeText(raw string) string {
ret := raw ret := raw
ret = strings.ReplaceAll(ret, "&", "&amp;") ret = strings.ReplaceAll(ret, "&", "&amp;")
@ -862,12 +890,26 @@ func CQCodeEscapeText(raw string) string {
return ret return ret
} }
/*CQCodeEscapeValue 将字符串value中部分字符转义
, -> &#44;
*/
func CQCodeEscapeValue(value string) string { func CQCodeEscapeValue(value string) string {
ret := CQCodeEscapeText(value) ret := CQCodeEscapeText(value)
ret = strings.ReplaceAll(ret, ",", "&#44;") ret = strings.ReplaceAll(ret, ",", "&#44;")
return ret return ret
} }
/*CQCodeUnescapeText 将字符串content中部分字符反转义
&amp; -> &
&#91; -> [
&#93; -> ]
*/
func CQCodeUnescapeText(content string) string { func CQCodeUnescapeText(content string) string {
ret := content ret := content
ret = strings.ReplaceAll(ret, "&#91;", "[") ret = strings.ReplaceAll(ret, "&#91;", "[")
@ -876,13 +918,18 @@ func CQCodeUnescapeText(content string) string {
return ret return ret
} }
/*CQCodeUnescapeValue 将字符串content中部分字符反转义
, -> &#44;
*/
func CQCodeUnescapeValue(content string) string { func CQCodeUnescapeValue(content string) string {
ret := strings.ReplaceAll(content, "&#44;", ",") ret := strings.ReplaceAll(content, "&#44;", ",")
ret = CQCodeUnescapeText(ret) ret = CQCodeUnescapeText(ret)
return ret return ret
} }
// 图片 elem 生成器，单独拎出来，用于公用 // makeImageOrVideoElem 图片 elem 生成器，单独拎出来，用于公用
func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (message.IMessageElement, error) { func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (message.IMessageElement, error) {
f := d["file"] f := d["file"]
if strings.HasPrefix(f, "http") || strings.HasPrefix(f, "https") { if strings.HasPrefix(f, "http") || strings.HasPrefix(f, "https") {
@ -958,9 +1005,8 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
Name: r.ReadString(), Name: r.ReadString(),
Uuid: r.ReadAvailable(), Uuid: r.ReadAvailable(),
}}, nil }}, nil
} else {
return &LocalVideoElement{File: rawPath}, nil
} }
return &LocalVideoElement{File: rawPath}, nil
} }
if strings.HasPrefix(f, "base64") { if strings.HasPrefix(f, "base64") {
b, err := base64.StdEncoding.DecodeString(strings.ReplaceAll(f, "base64://", "")) b, err := base64.StdEncoding.DecodeString(strings.ReplaceAll(f, "base64://", ""))
@ -1043,7 +1089,7 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
return nil, errors.New("invalid image") return nil, errors.New("invalid image")
} }
//makeShowPic 一种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) { 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 := "" xml := ""
var suf message.IMessageElement var suf message.IMessageElement
@ -1076,7 +1122,7 @@ func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon
suf = i suf = i
} }
if xml != "" { if xml != "" {
//log.Warn(xml) // log.Warn(xml)
ret := []message.IMessageElement{suf} ret := []message.IMessageElement{suf}
ret = append(ret, message.NewRichXml(xml, 5)) ret = append(ret, message.NewRichXml(xml, 5))
return ret, nil return ret, nil

2
coolq/doc.go Normal file
View File

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

16
coolq/event.go
View File

@ -17,17 +17,17 @@ import (
var format = "string" var format = "string"
//SetMessageFormat 设置消息上报格式，默认为string // SetMessageFormat 设置消息上报格式，默认为string
func SetMessageFormat(f string) { func SetMessageFormat(f string) {
format = f format = f
} }
//ToFormattedMessage 将给定[]message.IMessageElement转换为通过coolq.SetMessageFormat所定义的消息上报格式 // ToFormattedMessage 将给定[]message.IMessageElement转换为通过coolq.SetMessageFormat所定义的消息上报格式
func ToFormattedMessage(e []message.IMessageElement, id int64, raw ...bool) (r interface{}) { func ToFormattedMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r interface{}) {
if format == "string" { if format == "string" {
r = ToStringMessage(e, id, raw...) r = ToStringMessage(e, id, isRaw...)
} else if format == "array" { } else if format == "array" {
r = ToArrayMessage(e, id, raw...) r = ToArrayMessage(e, id, isRaw...)
} }
return return
} }
@ -164,7 +164,7 @@ func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent)
func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRecalledEvent) { func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRecalledEvent) {
g := c.FindGroup(e.GroupCode) g := c.FindGroup(e.GroupCode)
gid := ToGlobalId(e.GroupCode, e.MessageId) gid := toGlobalID(e.GroupCode, e.MessageId)
log.Infof("群 %v 内 %v 撤回了 %v 的消息: %v.", log.Infof("群 %v 内 %v 撤回了 %v 的消息: %v.",
formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)), formatMemberName(g.FindMember(e.AuthorUin)), gid) formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)), formatMemberName(g.FindMember(e.AuthorUin)), gid)
bot.dispatchEventMessage(MSG{ bot.dispatchEventMessage(MSG{
@ -258,7 +258,7 @@ func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageRecalledEvent) { func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageRecalledEvent) {
f := c.FindFriend(e.FriendUin) f := c.FindFriend(e.FriendUin)
gid := ToGlobalId(e.FriendUin, e.MessageId) gid := toGlobalID(e.FriendUin, e.MessageId)
if f != nil { if f != nil {
log.Infof("好友 %v(%v) 撤回了消息: %v", f.Nickname, f.Uin, gid) log.Infof("好友 %v(%v) 撤回了消息: %v", f.Nickname, f.Uin, gid)
} else { } else {
@ -435,7 +435,7 @@ func (bot *CQBot) otherClientStatusChangedEvent(c *client.QQClient, e *client.Ot
func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent) { func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent) {
g := c.FindGroup(e.GroupCode) g := c.FindGroup(e.GroupCode)
gid := ToGlobalId(e.GroupCode, e.MessageID) gid := toGlobalID(e.GroupCode, e.MessageID)
if e.OperationType == 1 { if e.OperationType == 1 {
log.Infof( log.Infof(
"群 %v 内 %v 将 %v 的消息(%v)设为了精华消息.", "群 %v 内 %v 将 %v 的消息(%v)设为了精华消息.",

252
docs/cqhttp.md
View File

@ -68,14 +68,14 @@ Type : `image`
参数: 参数:
| 参数名 | 可能的值 | 说明 | | 参数名 | 可能的值 | 说明 |
| ------- | --------------- | --------------------------------------------------------------- | | ------- | --------------- | ---------------------------------------------------------------------- |
| `file` | - | 图片文件名 | | `file` | - | 图片文件名 |
| `type` | `flash`，`show` | 图片类型，`flash` 表示闪照，`show` 表示秀图，默认普通图片 | | `type` | `flash`，`show` | 图片类型，`flash` 表示闪照，`show` 表示秀图，默认普通图片 |
| `url` | - | 图片 URL | | `url` | - | 图片 URL |
| `cache` | `0` `1` | 只在通过网络 URL 发送时有效，表示是否使用已缓存的文件，默认 `1` | | `cache` | `0` `1` | 只在通过网络 URL 发送时有效，表示是否使用已缓存的文件，默认 `1` |
| `id` | - | 发送秀图时的特效id，默认为40000 | | `id` | - | 发送秀图时的特效id，默认为40000 |
| `c` | `2` `3` | 通过网络下载图片时的线程数, 默认单线程. (在资源不支持并发时会自动处理)| | `c` | `2` `3` | 通过网络下载图片时的线程数, 默认单线程. (在资源不支持并发时会自动处理) |
可用的特效ID: 可用的特效ID:
@ -102,12 +102,12 @@ Type : `reply`
参数: 参数:
| 参数名 | 类型 | 说明 | | 参数名 | 类型 | 说明 |
| ------ | ---- | ------------------------------------- | | ------ | ------ | --------------------------------------------------- |
| `id` | int | 回复时所引用的消息id, 必须为本群消息. | | `id` | int | 回复时所引用的消息id, 必须为本群消息. |
| `text` | string | 自定义回复的信息 | | `text` | string | 自定义回复的信息 |
| `qq` | int64 | 自定义回复时的自定义QQ, 如果使用自定义信息必须指定. | | `qq` | int64 | 自定义回复时的自定义QQ, 如果使用自定义信息必须指定. |
| `time` | int64 | 自定义回复时的时间, 格式为Unix时间 | | `time` | int64 | 自定义回复时的时间, 格式为Unix时间 |
@ -131,10 +131,10 @@ Type : `reply`
[CQ:music,type=163,id=28949129] [CQ:music,type=163,id=28949129]
``` ```
| 参数名 | 收 | 发 | 可能的值 | 说明 | | 参数名 | 收 | 发 | 可能的值 | 说明 |
| --- | --- | --- | --- | --- | | ------ | --- | --- | ---------- | -------------------------------- |
| `type` | | ✓ | `qq` `163` | 分别表示使用 QQ 音乐、网易云音乐 | | `type` | | ✓ | `qq` `163` | 分别表示使用 QQ 音乐、网易云音乐 |
| `id` | | ✓ | - | 歌曲 ID | | `id` | | ✓ | - | 歌曲 ID |
### 音乐自定义分享 <Badge text="发"/> ### 音乐自定义分享 <Badge text="发"/>
@ -154,15 +154,15 @@ Type : `reply`
[CQ:music,type=custom,url=http://baidu.com,audio=http://baidu.com/1.mp3,title=音乐标题] [CQ:music,type=custom,url=http://baidu.com,audio=http://baidu.com/1.mp3,title=音乐标题]
``` ```
| 参数名 | 收 | 发 | 可能的值 | 说明 | | 参数名 | 收 | 发 | 可能的值 | 说明 |
| --- | --- | --- | --- | --- | | --------- | --- | --- | ------------------------ | ----------------------------------------------------- |
| `type` | | ✓ | `custom` | 表示音乐自定义分享 | | `type` | | ✓ | `custom` | 表示音乐自定义分享 |
| `subtype` | | ✓ | `qq,163,migu,kugou,kuwo` | 表示分享类型，不填写发送为xml卡片，推荐填写提高稳定性 | | `subtype` | | ✓ | `qq,163,migu,kugou,kuwo` | 表示分享类型，不填写发送为xml卡片，推荐填写提高稳定性 |
| `url` | | ✓ | - | 点击后跳转目标 URL | | `url` | | ✓ | - | 点击后跳转目标 URL |
| `audio` | | ✓ | - | 音乐 URL | | `audio` | | ✓ | - | 音乐 URL |
| `title` | | ✓ | - | 标题 | | `title` | | ✓ | - | 标题 |
| `content` | | ✓ | - | 内容描述 | | `content` | | ✓ | - | 内容描述 |
| `image` | | ✓ | - | 图片 URL | | `image` | | ✓ | - | 图片 URL |
### 红包 ### 红包
@ -240,8 +240,8 @@ Type: `forward`
参数: 参数:
| 参数名 | 类型 | 说明 | | 参数名 | 类型 | 说明 |
| ------ | ------ | ------------------------------------------------------------ | | ------ | ------ | ------------------------------------------------------------- |
| `id` | string | 合并转发ID, 需要通过 `/get_forward_msg` API获取转发的具体内容 | | `id` | string | 合并转发ID, 需要通过 `/get_forward_msg` API获取转发的具体内容 |
示例: `[CQ:forward,id=xxxx]` 示例: `[CQ:forward,id=xxxx]`
@ -254,12 +254,12 @@ Type: `node`
参数: 参数:
| 参数名 | 类型 | 说明 | 特殊说明 | | 参数名 | 类型 | 说明 | 特殊说明 |
| --------- | ------- | -------------- | ------------------------------------------------------------ | | --------- | ------- | -------------- | -------------------------------------------------------------------------------------- |
| `id` | int32 | 转发消息id | 直接引用他人的消息合并转发, 实际查看顺序为原消息发送顺序 **与下面的自定义消息二选一** | | `id` | int32 | 转发消息id | 直接引用他人的消息合并转发, 实际查看顺序为原消息发送顺序 **与下面的自定义消息二选一** |
| `name` | string | 发送者显示名字 | 用于自定义消息 (自定义消息并合并转发，实际查看顺序为自定义消息段顺序) | | `name` | string | 发送者显示名字 | 用于自定义消息 (自定义消息并合并转发，实际查看顺序为自定义消息段顺序) |
| `uin` | int64 | 发送者QQ号 | 用于自定义消息 | | `uin` | int64 | 发送者QQ号 | 用于自定义消息 |
| `content` | message | 具体消息 | 用于自定义消息 | | `content` | message | 具体消息 | 用于自定义消息 |
特殊说明: **需要使用单独的API `/send_group_forward_msg` 发送，并且由于消息段较为复杂，仅支持Array形式入参。 如果引用消息和自定义消息同时出现，实际查看顺序将取消息段顺序. 另外按 [CQHTTP](https://cqhttp.cc/docs/4.15/#/Message?id=格式) 文档说明, `data` 应全为字符串, 但由于需要接收`message` 类型的消息, 所以 *仅限此Type的content字段* 支持Array套娃** 特殊说明: **需要使用单独的API `/send_group_forward_msg` 发送，并且由于消息段较为复杂，仅支持Array形式入参。 如果引用消息和自定义消息同时出现，实际查看顺序将取消息段顺序. 另外按 [CQHTTP](https://cqhttp.cc/docs/4.15/#/Message?id=格式) 文档说明, `data` 应全为字符串, 但由于需要接收`message` 类型的消息, 所以 *仅限此Type的content字段* 支持Array套娃**
@ -341,11 +341,11 @@ Type: `video`
参数: 参数:
| 参数名 | 类型 | 说明 | | 参数名 | 类型 | 说明 |
| ------- | ------ | ------------------------------------------------| | ------- | ------- | ---------------------------------------------------------------------- |
| `file` | string | 支持http和file发送 | | `file` | string | 支持http和file发送 |
| `cover` | string | 视频封面，支持http，file和base64发送，格式必须为jpg | | `cover` | string | 视频封面，支持http，file和base64发送，格式必须为jpg |
| `c` | `2` `3`| 通过网络下载视频时的线程数, 默认单线程. (在资源不支持并发时会自动处理)| | `c` | `2` `3` | 通过网络下载视频时的线程数, 默认单线程. (在资源不支持并发时会自动处理) |
示例: `[CQ:image,file=file:///C:\\Users\Richard\Pictures\1.mp4]` 示例: `[CQ:image,file=file:///C:\\Users\Richard\Pictures\1.mp4]`
### XML 消息 ### XML 消息
@ -630,8 +630,8 @@ Type: `tts`
**参数** **参数**
| 字段 | 类型 | 说明 | | 字段 | 类型 | 说明 |
| --------- | ------ | ---- | | ------------ | ----- | ------ |
| `message_id` | int32 | 消息ID | | `message_id` | int32 | 消息ID |
**响应数据** **响应数据**
@ -644,8 +644,8 @@ Type: `tts`
**参数** **参数**
| 字段 | 类型 | 说明 | | 字段 | 类型 | 说明 |
| --------- | ------ | ---- | | ------------ | ----- | ------ |
| `message_id` | int32 | 消息ID | | `message_id` | int32 | 消息ID |
**响应数据** **响应数据**
@ -658,23 +658,23 @@ Type: `tts`
**参数** **参数**
| 字段 | 类型 | 说明 | | 字段 | 类型 | 说明 |
| --------- | ------ | ---- | | ---------- | ----- | ---- |
| `group_id` | int64 | 群号 | | `group_id` | int64 | 群号 |
**响应数据** **响应数据**
响应内容为 JSON 数组，每个元素如下： 响应内容为 JSON 数组，每个元素如下：
| 字段名 | 数据类型 | 说明 | | 字段名 | 数据类型 | 说明 |
| ----- | ------- | --- | | --------------- | -------- | ------------ |
| `sender_id` |int64 | 发送者QQ 号 | | `sender_id` | int64 | 发送者QQ 号 |
| `sender_nick` | string | 发送者昵称 | | `sender_nick` | string | 发送者昵称 |
| `sender_time` | int64 | 消息发送时间 | | `sender_time` | int64 | 消息发送时间 |
| `operator_id` |int64 | 发送者QQ 号 | | `operator_id` | int64 | 发送者QQ 号 |
| `operator_nick` | string | 发送者昵称 | | `operator_nick` | string | 发送者昵称 |
| `operator_time` | int64 | 消息发送时间| | `operator_time` | int64 | 消息发送时间 |
| `message_id` | int32 | 消息ID | | `message_id` | int32 | 消息ID |
### 图片OCR ### 图片OCR
@ -875,7 +875,7 @@ Type: `tts`
| `plugins_good` | bool | 原 `CQHTTP` 字段, 恒定为 `true` | | `plugins_good` | bool | 原 `CQHTTP` 字段, 恒定为 `true` |
| `app_good` | bool | 原 `CQHTTP` 字段, 恒定为 `true` | | `app_good` | bool | 原 `CQHTTP` 字段, 恒定为 `true` |
| `online` | bool | 表示BOT是否在线 | | `online` | bool | 表示BOT是否在线 |
| `good` | bool | 同 `online` | | `good` | bool | 同 `online` |
| `stat` | Statistics | 运行统计 | | `stat` | Statistics | 运行统计 |
**Statistics** **Statistics**
@ -899,17 +899,17 @@ Type: `tts`
**参数** **参数**
| 字段 | 类型 | 说明 | | 字段 | 类型 | 说明 |
| ---------- | ------ | ------------------------- | | ---------- | ----- | ---- |
| `group_id` | int64 | 群号 | | `group_id` | int64 | 群号 |
**响应数据** **响应数据**
| 字段 | 类型 | 说明 | | 字段 | 类型 | 说明 |
| ------------------------------- | ---------- | ------------------------------- | | ------------------------------- | ----- | --------------------------------- |
| `can_at_all` | bool | 是否可以@全体成员 | | `can_at_all` | bool | 是否可以@全体成员 |
| `remain_at_all_count_for_group` | int16 | 群内所有管理当天剩余@全体成员次数 | | `remain_at_all_count_for_group` | int16 | 群内所有管理当天剩余@全体成员次数 |
| `remain_at_all_count_for_uin` | int16 | BOT当天剩余@全体成员次数 | | `remain_at_all_count_for_uin` | int16 | BOT当天剩余@全体成员次数 |
### 下载文件到缓存目录 ### 下载文件到缓存目录
@ -917,11 +917,11 @@ Type: `tts`
**参数** **参数**
| 字段 | 类型 | 说明 | | 字段 | 类型 | 说明 |
| ---------- | ------ | ------------------------- | | -------------- | --------------- | ------------ |
| `url` | string | 链接地址 | | `url` | string | 链接地址 |
| `thread_count` | int32 | 下载线程数 | | `thread_count` | int32 | 下载线程数 |
| `headers` | string or array | 自定义请求头 | | `headers` | string or array | 自定义请求头 |
**`headers`格式:** **`headers`格式:**
@ -944,9 +944,9 @@ JSON数组:
**响应数据** **响应数据**
| 字段 | 类型 | 说明 | | 字段 | 类型 | 说明 |
| ---------- | ---------- | ------------ | | ------ | ------ | -------------------- |
| `file` | string | 下载文件的*绝对路径* | | `file` | string | 下载文件的*绝对路径* |
> 通过这个API下载的文件能直接放入CQ码作为图片或语音发送 > 通过这个API下载的文件能直接放入CQ码作为图片或语音发送
> 调用后会阻塞直到下载完成后才会返回数据，请注意下载大文件时的超时 > 调用后会阻塞直到下载完成后才会返回数据，请注意下载大文件时的超时
@ -957,16 +957,16 @@ JSON数组:
**参数** **参数**
| 字段 | 类型 | 说明 | | 字段 | 类型 | 说明 |
| ---------- | ------ | ------------------------- | | ------------- | ----- | ----------------------------------- |
| `message_seq` | int64 | 起始消息序号, 可通过 `get_msg` 获得 | | `message_seq` | int64 | 起始消息序号, 可通过 `get_msg` 获得 |
| `group_id` | int64 | 群号 | | `group_id` | int64 | 群号 |
**响应数据** **响应数据**
| 字段 | 类型 | 说明 | | 字段 | 类型 | 说明 |
| ---------- | ---------- | ------------ | | ---------- | --------- | -------------------------- |
| `messages` | []Message | 从起始序号开始的前19条消息 | | `messages` | []Message | 从起始序号开始的前19条消息 |
> 不提供起始序号将默认获取最新的消息 > 不提供起始序号将默认获取最新的消息
@ -976,23 +976,23 @@ JSON数组:
**参数** **参数**
| 字段 | 类型 | 说明 | | 字段 | 类型 | 说明 |
| ---------- | ------ | ------------------------- | | ---------- | ---- | ------------ |
| `no_cache` | bool | 是否无视缓存 | | `no_cache` | bool | 是否无视缓存 |
**响应数据** **响应数据**
| 字段 | 类型 | 说明 | | 字段 | 类型 | 说明 |
| ---------- | ---------- | ------------ | | --------- | -------- | -------------- |
| `clients` | []Device | 在线客户端列表 | | `clients` | []Device | 在线客户端列表 |
**Device** **Device**
| 字段 | 类型 | 说明 | | 字段 | 类型 | 说明 |
| ---------- | ---------- | ------------ | | ------------- | ------ | -------- |
| `app_id` | int64 | 客户端ID | | `app_id` | int64 | 客户端ID |
| `device_name` | string | 设备名称 | | `device_name` | string | 设备名称 |
| `device_kind` | string | 设备类型 | | `device_kind` | string | 设备类型 |
### 检查链接安全性 ### 检查链接安全性
@ -1016,19 +1016,19 @@ JSON数组:
**参数** **参数**
| 字段名 | 数据类型 | 默认值 | 说明 | | 字段名 | 数据类型 | 默认值 | 说明 |
| ----- | ------- | ----- | --- | | --------- | -------- | ------ | ----- |
| `user_id` | int64 | | QQ 号 | | `user_id` | int64 | | QQ 号 |
**响应数据** **响应数据**
| 字段 | 类型 | 说明 | | 字段 | 类型 | 说明 |
| ------------------ | ------- | ---------- | | ------------------ | ------- | ------------ |
| `user_id` | int64 | QQ 号 | | `user_id` | int64 | QQ 号 |
| `nickname` | string | 用户昵称 | | `nickname` | string | 用户昵称 |
| `level` | int64 | QQ 等级 | | `level` | int64 | QQ 等级 |
| `level_speed` | float64 | 等级加速度 | | `level_speed` | float64 | 等级加速度 |
| `vip_level` | string | 会员等级 | | `vip_level` | string | 会员等级 |
| `vip_growth_speed` | int64 | 会员成长速度 | | `vip_growth_speed` | int64 | 会员成长速度 |
| `vip_growth_total` | int64 | 会员成长总值 | | `vip_growth_total` | int64 | 会员成长总值 |
@ -1038,10 +1038,10 @@ JSON数组:
**参数** **参数**
| 字段名 | 数据类型 | 默认值 | 说明 | | 字段名 | 数据类型 | 默认值 | 说明 |
| ---------- | ------- | ----- | ------ | | ---------- | -------- | ------ | -------- |
| `group_id` | int64 | | 群号 | | `group_id` | int64 | | 群号 |
| `content` | string | | 公告内容 | | `content` | string | | 公告内容 |
`该 API 没有响应数据` `该 API 没有响应数据`
@ -1082,16 +1082,16 @@ JSON数组:
**事件数据** **事件数据**
| 字段名 | 数据类型 | 可能的值 | 说明 | | 字段名 | 数据类型 | 可能的值 | 说明 |
| ------------- | ------ | -------- | --- | | ------------- | -------- | -------- | ------------ |
| `post_type` | string | `notice` | 上报类型 | | `post_type` | string | `notice` | 上报类型 |
| `notice_type` | string | `notify` | 消息类型 | | `notice_type` | string | `notify` | 消息类型 |
| `sub_type` | string | `poke` | 提示类型 | | `sub_type` | string | `poke` | 提示类型 |
| `self_id` | int64 | | BOT QQ 号 | | `self_id` | int64 | | BOT QQ 号 |
| `sender_id` | int64 | | 发送者 QQ 号 | | `sender_id` | int64 | | 发送者 QQ 号 |
| `user_id` | int64 | | 发送者 QQ 号 | | `user_id` | int64 | | 发送者 QQ 号 |
| `target_id` | int64 | | 被戳者 QQ 号 | | `target_id` | int64 | | 被戳者 QQ 号 |
| `time` | int64 | | 时间 | | `time` | int64 | | 时间 |
### 群内戳一戳 ### 群内戳一戳
@ -1178,22 +1178,22 @@ JSON数组:
**上报数据** **上报数据**
| 字段 | 类型 | 可能的值 | 说明 | | 字段 | 类型 | 可能的值 | 说明 |
| ------------- | ------ | -------------- | -------- | | ------------- | ------ | --------------- | ------------ |
| `post_type` | string | `notice` | 上报类型 | | `post_type` | string | `notice` | 上报类型 |
| `notice_type` | string | `client_status` | 消息类型 | | `notice_type` | string | `client_status` | 消息类型 |
| `client` | Device | | 客户端信息 | | `client` | Device | | 客户端信息 |
| `online` | bool | | 当前是否在线 | | `online` | bool | | 当前是否在线 |
### 精华消息 ### 精华消息
**上报数据** **上报数据**
| 字段 | 类型 | 可能的值 | 说明 | | 字段 | 类型 | 可能的值 | 说明 |
| ------------- | ------ | -------------- | -------- | | ------------- | ------ | -------------- | -------------------------- |
| `post_type` | string | `notice` | 上报类型 | | `post_type` | string | `notice` | 上报类型 |
| `notice_type` | string | `essence` | 消息类型 | | `notice_type` | string | `essence` | 消息类型 |
| `sub_type` | string | `add`,`delete` | 添加为`add`,移出为`delete` | | `sub_type` | string | `add`,`delete` | 添加为`add`,移出为`delete` |
| `sender_id` | int64 | | 消息发送者ID | | `sender_id` | int64 | | 消息发送者ID |
| `operator_id` | int64 | | 操作者ID | | `operator_id` | int64 | | 操作者ID |
| `message_id` | int32 | | 消息ID | | `message_id` | int32 | | 消息ID |

8
global/codec.go
View File

@ -14,7 +14,7 @@ import (
var useSilkCodec = true var useSilkCodec = true
//InitCodec 初始化Silk编码器 // InitCodec 初始化Silk编码器
func InitCodec() { func InitCodec() {
log.Info("正在加载silk编码器...") log.Info("正在加载silk编码器...")
err := codec.Init() err := codec.Init()
@ -24,7 +24,7 @@ func InitCodec() {
} }
} }
//EncoderSilk 将音频编码为Silk // EncoderSilk 将音频编码为Silk
func EncoderSilk(data []byte) ([]byte, error) { func EncoderSilk(data []byte) ([]byte, error) {
if !useSilkCodec { if !useSilkCodec {
return nil, errors.New("no silk encoder") return nil, errors.New("no silk encoder")
@ -45,7 +45,7 @@ func EncoderSilk(data []byte) ([]byte, error) {
return slk, nil return slk, nil
} }
//EncodeMP4 将给定视频文件编码为MP4 // EncodeMP4 将给定视频文件编码为MP4
func EncodeMP4(src string, dst string) error { // -y 覆盖文件 func EncodeMP4(src string, dst string) error { // -y 覆盖文件
cmd1 := exec.Command("ffmpeg", "-i", src, "-y", "-c", "copy", "-map", "0", dst) cmd1 := exec.Command("ffmpeg", "-i", src, "-y", "-c", "copy", "-map", "0", dst)
err := cmd1.Run() err := cmd1.Run()
@ -56,7 +56,7 @@ func EncodeMP4(src string, dst string) error { // -y 覆盖文件
return err return err
} }
//ExtractCover 获取给定视频文件的Cover // ExtractCover 获取给定视频文件的Cover
func ExtractCover(src string, target string) error { func ExtractCover(src string, target string) error {
cmd := exec.Command("ffmpeg", "-i", src, "-y", "-r", "1", "-f", "image2", target) cmd := exec.Command("ffmpeg", "-i", src, "-y", "-r", "1", "-f", "image2", target)
return errors.Wrap(cmd.Run(), "extract video cover failed") return errors.Wrap(cmd.Run(), "extract video cover failed")

8
global/codec/codec.go
View File

@ -1,16 +1,18 @@
// +build linux windows darwin // +build linux windows darwin
// +build 386 amd64 arm arm64 // +build 386 amd64 arm arm64
// Package codec Slik编码核心模块
package codec package codec
import ( import (
"github.com/pkg/errors"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"os" "os"
"os/exec" "os/exec"
"path" "path"
"runtime" "runtime"
"github.com/pkg/errors"
) )
const ( const (
@ -40,7 +42,7 @@ func getEncoderFilePath() string {
return encoderFile return encoderFile
} }
//Init 下载Silk编码器 // Init 下载Silk编码器
func Init() error { func Init() error {
if !fileExist(silkCachePath) { if !fileExist(silkCachePath) {
_ = os.MkdirAll(silkCachePath, os.ModePerm) _ = os.MkdirAll(silkCachePath, os.ModePerm)
@ -57,7 +59,7 @@ func Init() error {
return nil return nil
} }
//EncodeToSilk 将音频编码为Silk // EncodeToSilk 将音频编码为Silk
func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) { func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
// 1. 写入缓存文件 // 1. 写入缓存文件
rawPath := path.Join(silkCachePath, tempName+".wav") rawPath := path.Join(silkCachePath, tempName+".wav")

4
global/codec/codec_unsupportedarch.go
View File

@ -4,12 +4,12 @@ package codec
import "errors" import "errors"
//Init 下载silk编码器 // Init 下载silk编码器
func Init() error { func Init() error {
return errors.New("Unsupport arch now") return errors.New("Unsupport arch now")
} }
//EncodeToSilk 将音频编码为Silk // EncodeToSilk 将音频编码为Silk
func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) { func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
return nil, errors.New("Unsupport arch now") return nil, errors.New("Unsupport arch now")
} }

4
global/codec/codec_unsupportedos.go
View File

@ -4,12 +4,12 @@ package codec
import "errors" import "errors"
//Init 下载silk编码器 // Init 下载silk编码器
func Init() error { func Init() error {
return errors.New("not support now") return errors.New("not support now")
} }
//EncodeToSilk 将音频编码为Silk // EncodeToSilk 将音频编码为Silk
func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) { func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
return nil, errors.New("not support now") return nil, errors.New("not support now")
} }

22
global/config.go
View File

@ -12,7 +12,7 @@ import (
var json = jsoniter.ConfigCompatibleWithStandardLibrary var json = jsoniter.ConfigCompatibleWithStandardLibrary
//DefaultConfigWithComments 为go-cqhttp的默认配置文件 // DefaultConfigWithComments 为go-cqhttp的默认配置文件
var DefaultConfigWithComments = ` var DefaultConfigWithComments = `
/* /*
go-cqhttp 默认配置文件 go-cqhttp 默认配置文件
@ -135,10 +135,10 @@ var DefaultConfigWithComments = `
} }
` `
//PasswordHash 存储QQ密码哈希供登录使用 // PasswordHash 存储QQ密码哈希供登录使用
var PasswordHash [16]byte var PasswordHash [16]byte
//JSONConfig Config对应的结构体 // JSONConfig Config对应的结构体
type JSONConfig struct { type JSONConfig struct {
Uin int64 `json:"uin"` Uin int64 `json:"uin"`
Password string `json:"password"` Password string `json:"password"`
@ -171,7 +171,7 @@ type JSONConfig struct {
WebUI *GoCQWebUI `json:"web_ui"` WebUI *GoCQWebUI `json:"web_ui"`
} }
//CQHTTPAPIConfig HTTPAPI对应的Config结构体 // CQHTTPAPIConfig HTTPAPI对应的Config结构体
type CQHTTPAPIConfig struct { type CQHTTPAPIConfig struct {
Host string `json:"host"` Host string `json:"host"`
Port uint16 `json:"port"` Port uint16 `json:"port"`
@ -191,7 +191,7 @@ type CQHTTPAPIConfig struct {
PostMessageFormat string `json:"post_message_format"` PostMessageFormat string `json:"post_message_format"`
} }
//GoCQHTTPConfig 正向HTTP对应config结构体 // GoCQHTTPConfig 正向HTTP对应config结构体
type GoCQHTTPConfig struct { type GoCQHTTPConfig struct {
Enabled bool `json:"enabled"` Enabled bool `json:"enabled"`
Host string `json:"host"` Host string `json:"host"`
@ -200,14 +200,14 @@ type GoCQHTTPConfig struct {
PostUrls map[string]string `json:"post_urls"` PostUrls map[string]string `json:"post_urls"`
} }
//GoCQWebSocketConfig 正向WebSocket对应Config结构体 // GoCQWebSocketConfig 正向WebSocket对应Config结构体
type GoCQWebSocketConfig struct { type GoCQWebSocketConfig struct {
Enabled bool `json:"enabled"` Enabled bool `json:"enabled"`
Host string `json:"host"` Host string `json:"host"`
Port uint16 `json:"port"` Port uint16 `json:"port"`
} }
//GoCQReverseWebSocketConfig 反向WebSocket对应Config结构体 // GoCQReverseWebSocketConfig 反向WebSocket对应Config结构体
type GoCQReverseWebSocketConfig struct { type GoCQReverseWebSocketConfig struct {
Enabled bool `json:"enabled"` Enabled bool `json:"enabled"`
ReverseURL string `json:"reverse_url"` ReverseURL string `json:"reverse_url"`
@ -216,7 +216,7 @@ type GoCQReverseWebSocketConfig struct {
ReverseReconnectInterval uint16 `json:"reverse_reconnect_interval"` ReverseReconnectInterval uint16 `json:"reverse_reconnect_interval"`
} }
//GoCQWebUI WebUI对应Config结构体 // GoCQWebUI WebUI对应Config结构体
type GoCQWebUI struct { type GoCQWebUI struct {
Enabled bool `json:"enabled"` Enabled bool `json:"enabled"`
Host string `json:"host"` Host string `json:"host"`
@ -224,7 +224,7 @@ type GoCQWebUI struct {
WebInput bool `json:"web_input"` WebInput bool `json:"web_input"`
} }
//DefaultConfig 返回一份默认配置对应结构体 // DefaultConfig 返回一份默认配置对应结构体
func DefaultConfig() *JSONConfig { func DefaultConfig() *JSONConfig {
return &JSONConfig{ return &JSONConfig{
EnableDB: true, EnableDB: true,
@ -277,7 +277,7 @@ func DefaultConfig() *JSONConfig {
} }
} }
//LoadConfig 加载配置文件 // LoadConfig 加载配置文件
func LoadConfig(p string) *JSONConfig { func LoadConfig(p string) *JSONConfig {
if !PathExists(p) { if !PathExists(p) {
log.Warnf("尝试加载配置文件 %v 失败: 文件不存在", p) log.Warnf("尝试加载配置文件 %v 失败: 文件不存在", p)
@ -299,7 +299,7 @@ func LoadConfig(p string) *JSONConfig {
return &c return &c
} }
//Save 写入配置文件至path // Save 写入配置文件至path
func (c *JSONConfig) Save(path string) error { func (c *JSONConfig) Save(path string) error {
data, err := hjson.MarshalWithOptions(c, hjson.EncoderOptions{ data, err := hjson.MarshalWithOptions(c, hjson.EncoderOptions{
Eol: "\n", Eol: "\n",

2
global/doc.go Normal file
View File

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

52
global/filter.go
View File

@ -10,14 +10,14 @@ import (
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
) )
//MSG 消息Map // MSG 消息Map
type MSG map[string]interface{} type MSG map[string]interface{}
//Get 尝试从消息Map中取出key为s的值,若不存在则返回MSG{} // Get 尝试从消息Map中取出key为s的值,若不存在则返回MSG{}
// //
//若所给key对应的值的类型是global.MSG,则返回此值 // 若所给key对应的值的类型是global.MSG,则返回此值
// //
//若所给key对应值的类型不是global.MSG,则返回MSG{"__str__": Val} // 若所给key对应值的类型不是global.MSG,则返回MSG{"__str__": Val}
func (m MSG) Get(s string) MSG { func (m MSG) Get(s string) MSG {
if v, ok := m[s]; ok { if v, ok := m[s]; ok {
if msg, ok := v.(MSG); ok { if msg, ok := v.(MSG); ok {
@ -28,7 +28,7 @@ func (m MSG) Get(s string) MSG {
return nil // 不存在为空 return nil // 不存在为空
} }
//String 将消息Map转化为String。若Map存在key "__str__",则返回此key对应的值,否则将输出整张消息Map对应的JSON字符串 // String 将消息Map转化为String。若Map存在key "__str__",则返回此key对应的值,否则将输出整张消息Map对应的JSON字符串
func (m MSG) String() string { func (m MSG) String() string {
if m == nil { if m == nil {
return "" // 空 JSON return "" // 空 JSON
@ -43,7 +43,7 @@ func (m MSG) String() string {
return str return str
} }
//Filter 定义了一个消息上报过滤接口 // Filter 定义了一个消息上报过滤接口
type Filter interface { type Filter interface {
Eval(payload MSG) bool Eval(payload MSG) bool
} }
@ -53,7 +53,7 @@ type operationNode struct {
filter Filter filter Filter
} }
//NotOperator 定义了过滤器中Not操作符 // NotOperator 定义了过滤器中Not操作符
type NotOperator struct { type NotOperator struct {
operand Filter operand Filter
} }
@ -67,12 +67,12 @@ func notOperatorConstruct(argument gjson.Result) *NotOperator {
return op return op
} }
//Eval 对payload执行Not过滤 // Eval 对payload执行Not过滤
func (op *NotOperator) Eval(payload MSG) bool { func (op *NotOperator) Eval(payload MSG) bool {
return !op.operand.Eval(payload) return !op.operand.Eval(payload)
} }
//AndOperator 定义了过滤器中And操作符 // AndOperator 定义了过滤器中And操作符
type AndOperator struct { type AndOperator struct {
operands []operationNode operands []operationNode
} }
@ -108,7 +108,7 @@ func andOperatorConstruct(argument gjson.Result) *AndOperator {
return op return op
} }
//Eval 对payload执行And过滤 // Eval 对payload执行And过滤
func (andOperator *AndOperator) Eval(payload MSG) bool { func (andOperator *AndOperator) Eval(payload MSG) bool {
res := true res := true
for _, operand := range andOperator.operands { for _, operand := range andOperator.operands {
@ -129,7 +129,7 @@ func (andOperator *AndOperator) Eval(payload MSG) bool {
return res return res
} }
//OrOperator 定义了过滤器中Or操作符 // OrOperator 定义了过滤器中Or操作符
type OrOperator struct { type OrOperator struct {
operands []Filter operands []Filter
} }
@ -146,7 +146,7 @@ func orOperatorConstruct(argument gjson.Result) *OrOperator {
return op return op
} }
//Eval 对payload执行Or过滤 // Eval 对payload执行Or过滤
func (op *OrOperator) Eval(payload MSG) bool { func (op *OrOperator) Eval(payload MSG) bool {
res := false res := false
for _, operand := range op.operands { for _, operand := range op.operands {
@ -158,7 +158,7 @@ func (op *OrOperator) Eval(payload MSG) bool {
return res return res
} }
//EqualOperator 定义了过滤器中Equal操作符 // EqualOperator 定义了过滤器中Equal操作符
type EqualOperator struct { type EqualOperator struct {
operand string operand string
} }
@ -169,12 +169,12 @@ func equalOperatorConstruct(argument gjson.Result) *EqualOperator {
return op return op
} }
//Eval 对payload执行Equal过滤 // Eval 对payload执行Equal过滤
func (op *EqualOperator) Eval(payload MSG) bool { func (op *EqualOperator) Eval(payload MSG) bool {
return payload.String() == op.operand return payload.String() == op.operand
} }
//NotEqualOperator 定义了过滤器中NotEqual操作符 // NotEqualOperator 定义了过滤器中NotEqual操作符
type NotEqualOperator struct { type NotEqualOperator struct {
operand string operand string
} }
@ -185,12 +185,12 @@ func notEqualOperatorConstruct(argument gjson.Result) *NotEqualOperator {
return op return op
} }
//Eval 对payload执行NotEqual过滤 // Eval 对payload执行NotEqual过滤
func (op *NotEqualOperator) Eval(payload MSG) bool { func (op *NotEqualOperator) Eval(payload MSG) bool {
return !(payload.String() == op.operand) return !(payload.String() == op.operand)
} }
//InOperator 定义了过滤器中In操作符 // InOperator 定义了过滤器中In操作符
type InOperator struct { type InOperator struct {
operandString string operandString string
operandArray []string operandArray []string
@ -213,7 +213,7 @@ func inOperatorConstruct(argument gjson.Result) *InOperator {
return op return op
} }
//Eval 对payload执行In过滤 // Eval 对payload执行In过滤
func (op *InOperator) Eval(payload MSG) bool { func (op *InOperator) Eval(payload MSG) bool {
payloadStr := payload.String() payloadStr := payload.String()
if op.operandArray != nil { if op.operandArray != nil {
@ -227,7 +227,7 @@ func (op *InOperator) Eval(payload MSG) bool {
return strings.Contains(op.operandString, payloadStr) return strings.Contains(op.operandString, payloadStr)
} }
//ContainsOperator 定义了过滤器中Contains操作符 // ContainsOperator 定义了过滤器中Contains操作符
type ContainsOperator struct { type ContainsOperator struct {
operand string operand string
} }
@ -241,12 +241,12 @@ func containsOperatorConstruct(argument gjson.Result) *ContainsOperator {
return op return op
} }
//Eval 对payload执行Contains过滤 // Eval 对payload执行Contains过滤
func (op *ContainsOperator) Eval(payload MSG) bool { func (op *ContainsOperator) Eval(payload MSG) bool {
return strings.Contains(payload.String(), op.operand) return strings.Contains(payload.String(), op.operand)
} }
//RegexOperator 定义了过滤器中Regex操作符 // RegexOperator 定义了过滤器中Regex操作符
type RegexOperator struct { type RegexOperator struct {
regex *regexp.Regexp regex *regexp.Regexp
} }
@ -260,13 +260,13 @@ func regexOperatorConstruct(argument gjson.Result) *RegexOperator {
return op return op
} }
//Eval 对payload执行RegexO过滤 // Eval 对payload执行RegexO过滤
func (op *RegexOperator) Eval(payload MSG) bool { func (op *RegexOperator) Eval(payload MSG) bool {
matched := op.regex.MatchString(payload.String()) matched := op.regex.MatchString(payload.String())
return matched return matched
} }
//Generate 根据给定操作符名opName及操作符参数argument创建一个过滤器实例 // Generate 根据给定操作符名opName及操作符参数argument创建一个过滤器实例
func Generate(opName string, argument gjson.Result) Filter { func Generate(opName string, argument gjson.Result) Filter {
switch opName { switch opName {
case "not": case "not":
@ -290,10 +290,10 @@ func Generate(opName string, argument gjson.Result) Filter {
} }
} }
//EventFilter 初始化一个nil过滤器 // EventFilter 初始化一个nil过滤器
var EventFilter Filter = nil var EventFilter Filter
//BootFilter 启动事件过滤器 // BootFilter 启动事件过滤器
func BootFilter() { func BootFilter() {
defer func() { defer func() {
if e := recover(); e != nil { if e := recover(); e != nil {

44
global/fs.go
View File

@ -27,36 +27,36 @@ import (
) )
const ( const (
//ImagePath go-cqhttp使用的图片缓存目录 // ImagePath go-cqhttp使用的图片缓存目录
ImagePath = "data/images" ImagePath = "data/images"
//ImagePathOld 兼容旧版go-cqhtto使用的图片缓存目录 // ImagePathOld 兼容旧版go-cqhtto使用的图片缓存目录
ImagePathOld = "data/image" ImagePathOld = "data/image"
//VoicePath go-cqhttp使用的语音缓存目录 // VoicePath go-cqhttp使用的语音缓存目录
VoicePath = "data/voices" VoicePath = "data/voices"
//VoicePathOld 兼容旧版go-cqhtto使用的语音缓存目录 // VoicePathOld 兼容旧版go-cqhtto使用的语音缓存目录
VoicePathOld = "data/record" VoicePathOld = "data/record"
//VideoPath go-cqhttp使用的视频缓存目录 // VideoPath go-cqhttp使用的视频缓存目录
VideoPath = "data/videos" VideoPath = "data/videos"
//CachePath go-cqhttp使用的缓存目录 // CachePath go-cqhttp使用的缓存目录
CachePath = "data/cache" CachePath = "data/cache"
) )
var ( var (
//ErrSyntax Path语法错误时返回的错误 // ErrSyntax Path语法错误时返回的错误
ErrSyntax = errors.New("syntax error") ErrSyntax = errors.New("syntax error")
//HeaderAmr AMR文件头 // HeaderAmr AMR文件头
HeaderAmr = []byte("#!AMR") HeaderAmr = []byte("#!AMR")
//HeaderSilk Silkv3文件头 // HeaderSilk Silkv3文件头
HeaderSilk = []byte("\x02#!SILK_V3") HeaderSilk = []byte("\x02#!SILK_V3")
) )
//PathExists 判断给定path是否存在 // PathExists 判断给定path是否存在
func PathExists(path string) bool { func PathExists(path string) bool {
_, err := os.Stat(path) _, err := os.Stat(path)
return err == nil || os.IsExist(err) return err == nil || os.IsExist(err)
} }
//ReadAllText 读取给定path对应文件，无法读取时返回空值 // ReadAllText 读取给定path对应文件，无法读取时返回空值
func ReadAllText(path string) string { func ReadAllText(path string) string {
b, err := ioutil.ReadFile(path) b, err := ioutil.ReadFile(path)
if err != nil { if err != nil {
@ -66,25 +66,25 @@ func ReadAllText(path string) string {
return string(b) return string(b)
} }
//WriteAllText 将给定text写入给定path // WriteAllText 将给定text写入给定path
func WriteAllText(path, text string) error { func WriteAllText(path, text string) error {
return ioutil.WriteFile(path, []byte(text), 0644) return ioutil.WriteFile(path, []byte(text), 0644)
} }
//Check 检测err是否为nil // Check 检测err是否为nil
func Check(err error) { func Check(err error) {
if err != nil { if err != nil {
log.Fatalf("遇到错误: %v", err) log.Fatalf("遇到错误: %v", err)
} }
} }
//IsAMRorSILK 判断给定文件是否为Amr或Silk格式 // IsAMRorSILK 判断给定文件是否为Amr或Silk格式
func IsAMRorSILK(b []byte) bool { func IsAMRorSILK(b []byte) bool {
return bytes.HasPrefix(b, HeaderAmr) || bytes.HasPrefix(b, HeaderSilk) return bytes.HasPrefix(b, HeaderAmr) || bytes.HasPrefix(b, HeaderSilk)
} }
//FindFile 从给定的File寻找文件，并返回文件byte数组。File是一个合法的URL。Path为文件寻找位置。 // FindFile 从给定的File寻找文件，并返回文件byte数组。File是一个合法的URL。Path为文件寻找位置。
//对于HTTP/HTTPS形式的URL，Cache为"1"或空时表示启用缓存 // 对于HTTP/HTTPS形式的URL，Cache为"1"或空时表示启用缓存
func FindFile(file, cache, PATH string) (data []byte, err error) { func FindFile(file, cache, PATH string) (data []byte, err error) {
data, err = nil, ErrSyntax data, err = nil, ErrSyntax
if strings.HasPrefix(file, "http") || strings.HasPrefix(file, "https") { if strings.HasPrefix(file, "http") || strings.HasPrefix(file, "https") {
@ -128,7 +128,7 @@ func FindFile(file, cache, PATH string) (data []byte, err error) {
return return
} }
//DelFile 删除一个给定path，并返回删除结果 // DelFile 删除一个给定path，并返回删除结果
func DelFile(path string) bool { func DelFile(path string) bool {
err := os.Remove(path) err := os.Remove(path)
if err != nil { if err != nil {
@ -141,7 +141,7 @@ func DelFile(path string) bool {
return true return true
} }
//ReadAddrFile 从给定path中读取合法的IP地址与端口,每个IP地址以换行符"\n"作为分隔 // ReadAddrFile 从给定path中读取合法的IP地址与端口,每个IP地址以换行符"\n"作为分隔
func ReadAddrFile(path string) []*net.TCPAddr { func ReadAddrFile(path string) []*net.TCPAddr {
d, err := ioutil.ReadFile(path) d, err := ioutil.ReadFile(path)
if err != nil { if err != nil {
@ -160,12 +160,12 @@ func ReadAddrFile(path string) []*net.TCPAddr {
return ret return ret
} }
//WriteCounter 写入量计算实例 // WriteCounter 写入量计算实例
type WriteCounter struct { type WriteCounter struct {
Total uint64 Total uint64
} }
//Write 方法将写入的byte长度追加至写入的总长度Total中 // Write 方法将写入的byte长度追加至写入的总长度Total中
func (wc *WriteCounter) Write(p []byte) (int, error) { func (wc *WriteCounter) Write(p []byte) (int, error) {
n := len(p) n := len(p)
wc.Total += uint64(n) wc.Total += uint64(n)
@ -173,13 +173,13 @@ func (wc *WriteCounter) Write(p []byte) (int, error) {
return n, nil return n, nil
} }
//PrintProgress 方法将打印当前的总写入量 // PrintProgress 方法将打印当前的总写入量
func (wc *WriteCounter) PrintProgress() { func (wc *WriteCounter) PrintProgress() {
fmt.Printf("\r%s", strings.Repeat(" ", 35)) fmt.Printf("\r%s", strings.Repeat(" ", 35))
fmt.Printf("\rDownloading... %s complete", humanize.Bytes(wc.Total)) fmt.Printf("\rDownloading... %s complete", humanize.Bytes(wc.Total))
} }
//UpdateFromStream copy form getlantern/go-update // UpdateFromStream copy form getlantern/go-update
func UpdateFromStream(updateWith io.Reader) (err error, errRecover error) { func UpdateFromStream(updateWith io.Reader) (err error, errRecover error) {
updatePath, err := osext.Executable() updatePath, err := osext.Executable()
if err != nil { if err != nil {

16
global/log_hook.go
View File

@ -2,14 +2,16 @@ package global
import ( import (
"fmt" "fmt"
"github.com/sirupsen/logrus"
"io" "io"
"os" "os"
"path/filepath" "path/filepath"
"reflect" "reflect"
"sync" "sync"
"github.com/sirupsen/logrus"
) )
// LocalHook logrus本地钩子
type LocalHook struct { type LocalHook struct {
lock *sync.Mutex lock *sync.Mutex
levels []logrus.Level // hook级别 levels []logrus.Level // hook级别
@ -18,7 +20,7 @@ type LocalHook struct {
writer io.Writer // io writer io.Writer // io
} }
// ref: logrus/hooks.go. impl Hook interface // Levels ref: logrus/hooks.go impl Hook interface
func (hook *LocalHook) Levels() []logrus.Level { func (hook *LocalHook) Levels() []logrus.Level {
if len(hook.levels) == 0 { if len(hook.levels) == 0 {
return logrus.AllLevels return logrus.AllLevels
@ -61,6 +63,7 @@ func (hook *LocalHook) pathWrite(entry *logrus.Entry) error {
return err return err
} }
// Fire ref: logrus/hooks.go impl Hook interface
func (hook *LocalHook) Fire(entry *logrus.Entry) error { func (hook *LocalHook) Fire(entry *logrus.Entry) error {
hook.lock.Lock() hook.lock.Lock()
defer hook.lock.Unlock() defer hook.lock.Unlock()
@ -76,6 +79,7 @@ func (hook *LocalHook) Fire(entry *logrus.Entry) error {
return nil return nil
} }
// SetFormatter 设置日志格式
func (hook *LocalHook) SetFormatter(formatter logrus.Formatter) { func (hook *LocalHook) SetFormatter(formatter logrus.Formatter) {
hook.lock.Lock() hook.lock.Lock()
defer hook.lock.Unlock() defer hook.lock.Unlock()
@ -96,18 +100,21 @@ func (hook *LocalHook) SetFormatter(formatter logrus.Formatter) {
hook.formatter = formatter hook.formatter = formatter
} }
// SetWriter 设置Writer
func (hook *LocalHook) SetWriter(writer io.Writer) { func (hook *LocalHook) SetWriter(writer io.Writer) {
hook.lock.Lock() hook.lock.Lock()
defer hook.lock.Unlock() defer hook.lock.Unlock()
hook.writer = writer hook.writer = writer
} }
// SetPath 设置日志写入路径
func (hook *LocalHook) SetPath(path string) { func (hook *LocalHook) SetPath(path string) {
hook.lock.Lock() hook.lock.Lock()
defer hook.lock.Unlock() defer hook.lock.Unlock()
hook.path = path hook.path = path
} }
// NewLocalHook 初始化本地日志钩子实现
func NewLocalHook(args interface{}, formatter logrus.Formatter, levels ...logrus.Level) *LocalHook { func NewLocalHook(args interface{}, formatter logrus.Formatter, levels ...logrus.Level) *LocalHook {
hook := &LocalHook{ hook := &LocalHook{
lock: new(sync.Mutex), lock: new(sync.Mutex),
@ -127,6 +134,11 @@ func NewLocalHook(args interface{}, formatter logrus.Formatter, levels ...logrus
return hook return hook
} }
// GetLogLevel 获取日志等级
//
// 可能的值有
//
// "trace","debug","info","warn","warn","error"
func GetLogLevel(level string) []logrus.Level { func GetLogLevel(level string) []logrus.Level {
switch level { switch level {
case "trace": case "trace":

18
global/net.go
View File

@ -37,17 +37,17 @@ var (
}, },
} }
//Proxy 存储Config.proxy_rewrite,用于设置代理 // Proxy 存储Config.proxy_rewrite,用于设置代理
Proxy string Proxy string
//ErrOverSize 响应主体过大时返回此错误 // ErrOverSize 响应主体过大时返回此错误
ErrOverSize = errors.New("oversize") ErrOverSize = errors.New("oversize")
//UserAgent HTTP请求时使用的UA // UserAgent HTTP请求时使用的UA
UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.66" UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.66"
) )
//GetBytes 对给定URL发送Get请求，返回响应主体 // GetBytes 对给定URL发送Get请求，返回响应主体
func GetBytes(url string) ([]byte, error) { func GetBytes(url string) ([]byte, error) {
req, err := http.NewRequest("GET", url, nil) req, err := http.NewRequest("GET", url, nil)
if err != nil { if err != nil {
@ -73,7 +73,7 @@ func GetBytes(url string) ([]byte, error) {
return body, nil return body, nil
} }
//DownloadFile 将给定URL对应的文件下载至给定Path // DownloadFile 将给定URL对应的文件下载至给定Path
func DownloadFile(url, path string, limit int64, headers map[string]string) error { func DownloadFile(url, path string, limit int64, headers map[string]string) error {
file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666) file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666)
if err != nil { if err != nil {
@ -107,7 +107,7 @@ func DownloadFile(url, path string, limit int64, headers map[string]string) erro
return nil return nil
} }
//DownloadFileMultiThreading 使用threadCount个线程将给定URL对应的文件下载至给定Path // DownloadFileMultiThreading 使用threadCount个线程将给定URL对应的文件下载至给定Path
func DownloadFileMultiThreading(url, path string, limit int64, threadCount int, headers map[string]string) error { func DownloadFileMultiThreading(url, path string, limit int64, threadCount int, headers map[string]string) error {
if threadCount < 2 { if threadCount < 2 {
return DownloadFile(url, path, limit, headers) return DownloadFile(url, path, limit, headers)
@ -265,7 +265,7 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
return lastErr return lastErr
} }
//GetSliderTicket 通过给定的验证链接raw和id,获取验证结果Ticket // GetSliderTicket 通过给定的验证链接raw和id,获取验证结果Ticket
func GetSliderTicket(raw, id string) (string, error) { func GetSliderTicket(raw, id string) (string, error) {
var rsp string var rsp string
if err := gout.POST("https://api.shkong.com/gocqhttpapi/task").SetJSON(gout.H{ if err := gout.POST("https://api.shkong.com/gocqhttpapi/task").SetJSON(gout.H{
@ -281,7 +281,7 @@ func GetSliderTicket(raw, id string) (string, error) {
return g.Get("ticket").Str, nil return g.Get("ticket").Str, nil
} }
//QQMusicSongInfo 通过给定id在QQ音乐上查找曲目信息 // QQMusicSongInfo 通过给定id在QQ音乐上查找曲目信息
func QQMusicSongInfo(id string) (gjson.Result, error) { func QQMusicSongInfo(id string) (gjson.Result, error) {
d, err := GetBytes(`https://u.y.qq.com/cgi-bin/musicu.fcg?format=json&inCharset=utf8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0&data={%22comm%22:{%22ct%22:24,%22cv%22:0},%22songinfo%22:{%22method%22:%22get_song_detail_yqq%22,%22param%22:{%22song_type%22:0,%22song_mid%22:%22%22,%22song_id%22:` + id + `},%22module%22:%22music.pf_song_detail_svr%22}}`) d, err := GetBytes(`https://u.y.qq.com/cgi-bin/musicu.fcg?format=json&inCharset=utf8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0&data={%22comm%22:{%22ct%22:24,%22cv%22:0},%22songinfo%22:{%22method%22:%22get_song_detail_yqq%22,%22param%22:{%22song_type%22:0,%22song_mid%22:%22%22,%22song_id%22:` + id + `},%22module%22:%22music.pf_song_detail_svr%22}}`)
if err != nil { if err != nil {
@ -290,7 +290,7 @@ func QQMusicSongInfo(id string) (gjson.Result, error) {
return gjson.ParseBytes(d).Get("songinfo.data"), nil return gjson.ParseBytes(d).Get("songinfo.data"), nil
} }
//NeteaseMusicSongInfo 通过给定id在wdd音乐上查找曲目信息 // NeteaseMusicSongInfo 通过给定id在wdd音乐上查找曲目信息
func NeteaseMusicSongInfo(id string) (gjson.Result, error) { func NeteaseMusicSongInfo(id string) (gjson.Result, error) {
d, err := GetBytes(fmt.Sprintf("http://music.163.com/api/song/detail/?id=%s&ids=%%5B%s%%5D", id, id)) d, err := GetBytes(fmt.Sprintf("http://music.163.com/api/song/detail/?id=%s&ids=%%5B%s%%5D", id, id))
if err != nil { if err != nil {

12
global/param.go
View File

@ -21,15 +21,15 @@ var falseSet = map[string]struct{}{
"0": {}, "0": {},
} }
//EnsureBool 判断给定的p是否可表示为合法Bool类型,否则返回defaultVal // EnsureBool 判断给定的p是否可表示为合法Bool类型,否则返回defaultVal
// //
//支持的合法类型有 // 支持的合法类型有
// //
//type bool // type bool
// //
//type gjson.True or gjson.False // type gjson.True or gjson.False
// //
//type string "true","yes","1" or "false","no","0" (case insensitive) // type string "true","yes","1" or "false","no","0" (case insensitive)
func EnsureBool(p interface{}, defaultVal bool) bool { func EnsureBool(p interface{}, defaultVal bool) bool {
var str string var str string
if b, ok := p.(bool); ok { if b, ok := p.(bool); ok {
@ -85,7 +85,7 @@ func VersionNameCompare(current, remote string) bool {
return len(cur) < len(re) return len(cur) < len(re)
} }
//SplitURL 将给定URL字符串分割为两部分，用于URL预处理防止风控 // SplitURL 将给定URL字符串分割为两部分，用于URL预处理防止风控
func SplitURL(s string) []string { func SplitURL(s string) []string {
reg := regexp.MustCompile(`(?i)[a-z\d][-a-z\d]{0,62}(\.[a-z\d][-a-z\d]{0,62})+\.?`) reg := regexp.MustCompile(`(?i)[a-z\d][-a-z\d]{0,62}(\.[a-z\d][-a-z\d]{0,62})+\.?`)
idx := reg.FindAllStringIndex(s, -1) idx := reg.FindAllStringIndex(s, -1)

4
global/ratelimit.go
View File

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

25
go.mod
View File

@ -7,21 +7,40 @@ require (
github.com/dustin/go-humanize v1.0.0 github.com/dustin/go-humanize v1.0.0
github.com/gin-contrib/pprof v1.3.0 github.com/gin-contrib/pprof v1.3.0
github.com/gin-gonic/gin v1.6.3 github.com/gin-gonic/gin v1.6.3
github.com/go-playground/validator/v10 v10.4.1 // indirect
github.com/golang/snappy v0.0.2 // indirect
github.com/google/go-cmp v0.5.4 // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/gorilla/websocket v1.4.2 github.com/gorilla/websocket v1.4.2
github.com/guonaihong/gout v0.1.4 github.com/guonaihong/gout v0.1.5
github.com/hjson/hjson-go v3.1.0+incompatible github.com/hjson/hjson-go v3.1.0+incompatible
github.com/jonboulle/clockwork v0.2.2 // indirect github.com/jonboulle/clockwork v0.2.2 // indirect
github.com/json-iterator/go v1.1.10 github.com/json-iterator/go v1.1.10
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
github.com/kr/text v0.2.0 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
github.com/lestrrat-go/strftime v1.0.4 // indirect github.com/lestrrat-go/strftime v1.0.4 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo v1.15.0 // indirect
github.com/onsi/gomega v1.10.5 // indirect
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.7.0 github.com/sirupsen/logrus v1.7.0
github.com/stretchr/testify v1.7.0 // indirect
github.com/syndtr/goleveldb v1.0.0 github.com/syndtr/goleveldb v1.0.0
github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
github.com/tidwall/gjson v1.6.7 github.com/tidwall/gjson v1.6.8
github.com/ugorji/go v1.2.4 // indirect
github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189 github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf
golang.org/x/text v0.3.5 // indirect
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
) )

109
go.sum
View File

@ -4,13 +4,17 @@ github.com/Mrs4s/MiraiGo v0.0.0-20210206134348-800bf525ed0e h1:SnN+nyRdqN7sULnHU
github.com/Mrs4s/MiraiGo v0.0.0-20210206134348-800bf525ed0e/go.mod h1:yhqA0NyKxUf7I/0HR/1OMchveFggX8wde04gqdGrNfU= github.com/Mrs4s/MiraiGo v0.0.0-20210206134348-800bf525ed0e/go.mod h1:yhqA0NyKxUf7I/0HR/1OMchveFggX8wde04gqdGrNfU=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/gin-contrib/pprof v1.3.0 h1:G9eK6HnbkSqDZBYbzG4wrjCsA4e+cvYAHUZw6W+W9K0= github.com/gin-contrib/pprof v1.3.0 h1:G9eK6HnbkSqDZBYbzG4wrjCsA4e+cvYAHUZw6W+W9K0=
github.com/gin-contrib/pprof v1.3.0/go.mod h1:waMjT1H9b179t3CxuG1cV3DHpga6ybizwfBaM5OXaB0= github.com/gin-contrib/pprof v1.3.0/go.mod h1:waMjT1H9b179t3CxuG1cV3DHpga6ybizwfBaM5OXaB0=
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
@ -19,13 +23,15 @@ github.com/gin-gonic/gin v1.6.0/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwv
github.com/gin-gonic/gin v1.6.2/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= github.com/gin-gonic/gin v1.6.2/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= 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/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@ -37,24 +43,31 @@ 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-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
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 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= 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/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.2 h1:aeE13tS0IiQgFjYdoL8qN3K1N2bXXtI6Vi51/y7BpMw=
github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/guonaihong/gout v0.1.4 h1:uBBoyztMX9okC27OQxqhn6bZ0ROkGyvnEIHwtp3TM4g= github.com/guonaihong/gout v0.1.5 h1:1FeFFJWWdWYApBW9d6vzMDB4eR4Zr8T/gaVrjDVcl5U=
github.com/guonaihong/gout v0.1.4/go.mod h1:0rFYAYyzbcxEg11eY2qUbffJs7hHRPeugAnlVYSp8Ic= github.com/guonaihong/gout v0.1.5/go.mod h1:0rFYAYyzbcxEg11eY2qUbffJs7hHRPeugAnlVYSp8Ic=
github.com/hjson/hjson-go v3.1.0+incompatible h1:DY/9yE8ey8Zv22bY+mHV1uk2yRy0h8tKhZ77hEdi0Aw= github.com/hjson/hjson-go v3.1.0+incompatible h1:DY/9yE8ey8Zv22bY+mHV1uk2yRy0h8tKhZ77hEdi0Aw=
github.com/hjson/hjson-go v3.1.0+incompatible/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio= github.com/hjson/hjson-go v3.1.0+incompatible/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
@ -62,8 +75,16 @@ github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA= 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/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8=
github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is= github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4= github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4=
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA= github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
@ -71,18 +92,31 @@ github.com/lestrrat-go/strftime v1.0.4 h1:T1Rb9EPkAhgxKqbcMIPguPq8glqXTA1koF8n9B
github.com/lestrrat-go/strftime v1.0.4/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g= github.com/lestrrat-go/strftime v1.0.4/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
github.com/onsi/ginkgo v1.15.0 h1:1V1NfVQR87RtWAgp1lv9JZJ5Jap+XFGKPi00andXGi4=
github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.10.5 h1:7n6FEkpFmfCoo2t+YYqXH0evK+a9ICQz0xcAy9dYcaQ=
github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
@ -93,51 +127,81 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk= github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk=
github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA= github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
github.com/tidwall/gjson v1.6.7 h1:Mb1M9HZCRWEcXQ8ieJo7auYyyiSux6w9XN3AdTpxJrE= github.com/tidwall/gjson v1.6.8 h1:CTmXMClGYPAmln7652e69B7OLXfTi5ABcPPwjIWUv7w=
github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= github.com/tidwall/gjson v1.6.8/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI=
github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE= github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU= github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go v1.2.4 h1:cTciPbZ/VSOzCLKclmssnfQ/jyoVyOcJ3aoJyUV1Urc=
github.com/ugorji/go v1.2.4/go.mod h1:EuaSCk8iZMdIspsu6HXH7X2UGKw1ezO4wCfGszGmmo4=
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
github.com/ugorji/go/codec v1.2.4 h1:C5VurWRRCKjuENsbM6GYVw8W++WVW9rSxoACKIvxzz8=
github.com/ugorji/go/codec v1.2.4/go.mod h1:bWBu1+kIRWcF8uMklKaJrR6fTWQOwAlrIzX22pHwryA=
github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189 h1:4UJw9if55Fu3HOwbfcaQlJ27p3oeJU2JZqoeT3ITJQk= github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189 h1:4UJw9if55Fu3HOwbfcaQlJ27p3oeJU2JZqoeT3ITJQk=
github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189/go.mod h1:rIrm5geMiBhPQkdfUm8gDFi/WiHneOp1i9KjmJqc+9I= github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189/go.mod h1:rIrm5geMiBhPQkdfUm8gDFi/WiHneOp1i9KjmJqc+9I=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY=
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew=
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk=
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M= golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M=
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE=
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@ -145,7 +209,13 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@ -165,11 +235,20 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

4
main.go
View File

@ -199,8 +199,8 @@ func main() {
log.Infof("密码加密已启用, 使用运行时传递的参数进行解密，按 Ctrl+C 取消.") log.Infof("密码加密已启用, 使用运行时传递的参数进行解密，按 Ctrl+C 取消.")
} }
//升级客户端密码加密方案，MD5+TEA 加密密码 -> PBKDF2+AES 加密 MD5 // 升级客户端密码加密方案，MD5+TEA 加密密码 -> PBKDF2+AES 加密 MD5
//升级后的 PasswordEncrypted 字符串以"AES:"开始，其后为 Hex 编码的16字节加密 MD5 // 升级后的 PasswordEncrypted 字符串以"AES:"开始，其后为 Hex 编码的16字节加密 MD5
if !strings.HasPrefix(conf.PasswordEncrypted, "AES:") { if !strings.HasPrefix(conf.PasswordEncrypted, "AES:") {
password := OldPasswordDecrypt(conf.PasswordEncrypted, byteKey) password := OldPasswordDecrypt(conf.PasswordEncrypted, byteKey)
passwordHash := md5.Sum([]byte(password)) passwordHash := md5.Sum([]byte(password))

107
server/apiAdmin.go
View File

@ -30,12 +30,16 @@ import (
var json = jsoniter.ConfigCompatibleWithStandardLibrary var json = jsoniter.ConfigCompatibleWithStandardLibrary
// WebInput 网页输入channel
var WebInput = make(chan string, 1) //长度1，用于阻塞 var WebInput = make(chan string, 1) //长度1，用于阻塞
// Console 控制台channel
var Console = make(chan os.Signal, 1) var Console = make(chan os.Signal, 1)
// Restart 重启信号监听channel
var Restart = make(chan struct{}, 1) var Restart = make(chan struct{}, 1)
// JSONConfig go-cqhttp配置
var JSONConfig *global.JSONConfig var JSONConfig *global.JSONConfig
type webServer struct { type webServer struct {
@ -46,23 +50,25 @@ type webServer struct {
Console *bufio.Reader Console *bufio.Reader
} }
// WebServer Admin子站的Server
var WebServer = &webServer{} var WebServer = &webServer{}
// admin 子站的 路由映射 // APIAdminRoutingTable Admin子站的路由映射
var HttpuriAdmin = map[string]func(s *webServer, c *gin.Context){ var APIAdminRoutingTable = map[string]func(s *webServer, c *gin.Context){
"do_restart": AdminDoRestart, //热重启 "do_restart": AdminDoRestart, //热重启
"do_process_restart": AdminProcessRestart, //进程重启 "do_process_restart": AdminProcessRestart, //进程重启
"get_web_write": AdminWebWrite, //获取是否验证码输入 "get_web_write": AdminWebWrite, //获取是否验证码输入
"do_web_write": AdminDoWebWrite, //web上进行输入操作 "do_web_write": AdminDoWebWrite, //web上进行输入操作
"do_restart_docker": AdminDoRestartDocker, //直接停止（依赖supervisord/docker）重新拉起 "do_restart_docker": AdminDoRestartDocker, //直接停止（依赖supervisord/docker）重新拉起
"do_config_base": AdminDoConfigBase, //修改config.json中的基础部分 "do_config_base": AdminDoConfigBase, //修改config.json中的基础部分
"do_config_http": AdminDoConfigHttp, //修改config.json的http部分 "do_config_http": AdminDoConfigHTTP, //修改config.json的http部分
"do_config_ws": AdminDoConfigWs, //修改config.json的正向ws部分 "do_config_ws": AdminDoConfigWS, //修改config.json的正向ws部分
"do_config_reverse": AdminDoConfigReverse, //修改config.json 中的反向ws部分 "do_config_reverse": AdminDoConfigReverseWS, //修改config.json 中的反向ws部分
"do_config_json": AdminDoConfigJson, //直接修改 config.json配置 "do_config_json": AdminDoConfigJSON, //直接修改 config.json配置
"get_config_json": AdminGetConfigJson, //拉取 当前的config.json配置 "get_config_json": AdminGetConfigJSON, //拉取 当前的config.json配置
} }
// Failed 构建失败返回MSG
func Failed(code int, msg string) coolq.MSG { func Failed(code int, msg string) coolq.MSG {
return coolq.MSG{"data": nil, "retcode": code, "status": "failed", "msg": msg} return coolq.MSG{"data": nil, "retcode": code, "status": "failed", "msg": msg}
} }
@ -76,11 +82,11 @@ func (s *webServer) Run(addr string, cli *client.QQClient) *coolq.CQBot {
s.engine.Use(AuthMiddleWare()) s.engine.Use(AuthMiddleWare())
//通用路由 // 通用路由
s.engine.Any("/admin/:action", s.admin) s.engine.Any("/admin/:action", s.admin)
go func() { go func() {
//开启端口监听 // 开启端口监听
if s.Conf.WebUI != nil && s.Conf.WebUI.Enabled { if s.Conf.WebUI != nil && s.Conf.WebUI.Enabled {
if Debug { if Debug {
pprof.Register(s.engine) pprof.Register(s.engine)
@ -98,7 +104,7 @@ func (s *webServer) Run(addr string, cli *client.QQClient) *coolq.CQBot {
os.Exit(1) os.Exit(1)
} }
} else { } else {
//关闭端口监听 // 关闭端口监听
c := make(chan os.Signal, 1) c := make(chan os.Signal, 1)
signal.Notify(c, os.Interrupt, syscall.SIGTERM) signal.Notify(c, os.Interrupt, syscall.SIGTERM)
<-c <-c
@ -107,7 +113,7 @@ func (s *webServer) Run(addr string, cli *client.QQClient) *coolq.CQBot {
}() }()
s.Dologin() s.Dologin()
s.UpServer() s.UpServer()
b := s.bot //外部引入 bot对象，用于操作bot b := s.bot // 外部引入 bot对象，用于操作bot
return b return b
} }
@ -266,7 +272,7 @@ func (s *webServer) Dologin() {
global.BootFilter() global.BootFilter()
global.InitCodec() global.InitCodec()
coolq.IgnoreInvalidCQCode = conf.IgnoreInvalidCQCode coolq.IgnoreInvalidCQCode = conf.IgnoreInvalidCQCode
coolq.SplitUrl = conf.FixURL coolq.SplitURL = conf.FixURL
coolq.ForceFragmented = conf.ForceFragmented coolq.ForceFragmented = conf.ForceFragmented
log.Info("资源初始化完成, 开始处理信息.") log.Info("资源初始化完成, 开始处理信息.")
log.Info("アトリは、高性能ですから!") log.Info("アトリは、高性能ですから!")
@ -321,14 +327,14 @@ func (s *webServer) Dologin() {
func (s *webServer) admin(c *gin.Context) { func (s *webServer) admin(c *gin.Context) {
action := c.Param("action") action := c.Param("action")
log.Debugf("WebServer接收到cgi调用: %v", action) log.Debugf("WebServer接收到cgi调用: %v", action)
if f, ok := HttpuriAdmin[action]; ok { if f, ok := APIAdminRoutingTable[action]; ok {
f(s, c) f(s, c)
} else { } else {
c.JSON(200, coolq.Failed(404)) c.JSON(200, coolq.Failed(404))
} }
} }
// 获取当前配置文件信息 // GetConf 获取当前配置文件信息
func GetConf() *global.JSONConfig { func GetConf() *global.JSONConfig {
if JSONConfig != nil { if JSONConfig != nil {
return JSONConfig return JSONConfig
@ -337,11 +343,11 @@ func GetConf() *global.JSONConfig {
return conf return conf
} }
// admin 控制器 登录验证 // AuthMiddleWare Admin控制器登录验证
func AuthMiddleWare() gin.HandlerFunc { func AuthMiddleWare() gin.HandlerFunc {
return func(c *gin.Context) { return func(c *gin.Context) {
conf := GetConf() conf := GetConf()
//处理跨域问题 // 处理跨域问题
c.Header("Access-Control-Allow-Origin", "*") c.Header("Access-Control-Allow-Origin", "*")
c.Header("Access-Control-Allow-Headers", "Content-Type,AccessToken,X-CSRF-Token, Authorization, Token") c.Header("Access-Control-Allow-Headers", "Content-Type,AccessToken,X-CSRF-Token, Authorization, Token")
c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, PATCH, DELETE") c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, PATCH, DELETE")
@ -429,14 +435,15 @@ func (s *webServer) DoReLogin() { // TODO: 协议层的 ReLogin
}) })
s.Cli = cli s.Cli = cli
s.Dologin() s.Dologin()
//关闭之前的 server // 关闭之前的 server
if OldConf.HTTPConfig != nil && OldConf.HTTPConfig.Enabled { if OldConf.HTTPConfig != nil && OldConf.HTTPConfig.Enabled {
HttpServer.ShutDown() cqHTTPServer.ShutDown()
} }
//if OldConf.WSConfig != nil && OldConf.WSConfig.Enabled { // if OldConf.WSConfig != nil && OldConf.WSConfig.Enabled {
// server.WsShutdown() // server.WsShutdown()
//} // }
//s.UpServer() // s.UpServer()
s.ReloadServer() s.ReloadServer()
s.Conf = conf s.Conf = conf
} }
@ -444,9 +451,9 @@ func (s *webServer) DoReLogin() { // TODO: 协议层的 ReLogin
func (s *webServer) UpServer() { func (s *webServer) UpServer() {
conf := GetConf() conf := GetConf()
if conf.HTTPConfig != nil && conf.HTTPConfig.Enabled { if conf.HTTPConfig != nil && conf.HTTPConfig.Enabled {
go HttpServer.Run(fmt.Sprintf("%s:%d", conf.HTTPConfig.Host, conf.HTTPConfig.Port), conf.AccessToken, s.bot) go cqHTTPServer.Run(fmt.Sprintf("%s:%d", conf.HTTPConfig.Host, conf.HTTPConfig.Port), conf.AccessToken, s.bot)
for k, v := range conf.HTTPConfig.PostUrls { for k, v := range conf.HTTPConfig.PostUrls {
NewHttpClient().Run(k, v, conf.HTTPConfig.Timeout, s.bot) newHTTPClient().Run(k, v, conf.HTTPConfig.Timeout, s.bot)
} }
} }
if conf.WSConfig != nil && conf.WSConfig.Enabled { if conf.WSConfig != nil && conf.WSConfig.Enabled {
@ -461,9 +468,9 @@ func (s *webServer) UpServer() {
func (s *webServer) ReloadServer() { func (s *webServer) ReloadServer() {
conf := GetConf() conf := GetConf()
if conf.HTTPConfig != nil && conf.HTTPConfig.Enabled { if conf.HTTPConfig != nil && conf.HTTPConfig.Enabled {
go HttpServer.Run(fmt.Sprintf("%s:%d", conf.HTTPConfig.Host, conf.HTTPConfig.Port), conf.AccessToken, s.bot) go cqHTTPServer.Run(fmt.Sprintf("%s:%d", conf.HTTPConfig.Host, conf.HTTPConfig.Port), conf.AccessToken, s.bot)
for k, v := range conf.HTTPConfig.PostUrls { for k, v := range conf.HTTPConfig.PostUrls {
NewHttpClient().Run(k, v, conf.HTTPConfig.Timeout, s.bot) newHTTPClient().Run(k, v, conf.HTTPConfig.Timeout, s.bot)
} }
} }
for _, rc := range conf.ReverseServers { for _, rc := range conf.ReverseServers {
@ -471,7 +478,7 @@ func (s *webServer) ReloadServer() {
} }
} }
// 热重启 // AdminDoRestart 热重启
func AdminDoRestart(s *webServer, c *gin.Context) { func AdminDoRestart(s *webServer, c *gin.Context) {
s.bot.Release() s.bot.Release()
s.bot = nil s.bot = nil
@ -480,19 +487,19 @@ func AdminDoRestart(s *webServer, c *gin.Context) {
c.JSON(200, coolq.OK(coolq.MSG{})) c.JSON(200, coolq.OK(coolq.MSG{}))
} }
// 进程重启 // AdminProcessRestart 进程重启
func AdminProcessRestart(s *webServer, c *gin.Context) { func AdminProcessRestart(s *webServer, c *gin.Context) {
Restart <- struct{}{} Restart <- struct{}{}
c.JSON(200, coolq.OK(coolq.MSG{})) c.JSON(200, coolq.OK(coolq.MSG{}))
} }
// 冷重启 // AdminDoRestartDocker 冷重启
func AdminDoRestartDocker(s *webServer, c *gin.Context) { func AdminDoRestartDocker(s *webServer, c *gin.Context) {
Console <- os.Kill Console <- os.Kill
c.JSON(200, coolq.OK(coolq.MSG{})) c.JSON(200, coolq.OK(coolq.MSG{}))
} }
// web输入 html 页面 // AdminWebWrite web输入html页面
func AdminWebWrite(s *webServer, c *gin.Context) { func AdminWebWrite(s *webServer, c *gin.Context) {
pic := global.ReadAllText("captcha.jpg") pic := global.ReadAllText("captcha.jpg")
var picbase64 string var picbase64 string
@ -509,14 +516,14 @@ func AdminWebWrite(s *webServer, c *gin.Context) {
})) }))
} }
// web输入 处理 // AdminDoWebWrite web输入处理
func AdminDoWebWrite(s *webServer, c *gin.Context) { func AdminDoWebWrite(s *webServer, c *gin.Context) {
input := c.PostForm("input") input := c.PostForm("input")
WebInput <- input WebInput <- input
c.JSON(200, coolq.OK(coolq.MSG{})) c.JSON(200, coolq.OK(coolq.MSG{}))
} }
// 普通配置修改 // AdminDoConfigBase 普通配置修改
func AdminDoConfigBase(s *webServer, c *gin.Context) { func AdminDoConfigBase(s *webServer, c *gin.Context) {
conf := GetConf() conf := GetConf()
conf.Uin, _ = strconv.ParseInt(c.PostForm("uin"), 10, 64) conf.Uin, _ = strconv.ParseInt(c.PostForm("uin"), 10, 64)
@ -536,8 +543,8 @@ func AdminDoConfigBase(s *webServer, c *gin.Context) {
} }
} }
// http配置修改 // AdminDoConfigHTTP HTTP配置修改
func AdminDoConfigHttp(s *webServer, c *gin.Context) { func AdminDoConfigHTTP(s *webServer, c *gin.Context) {
conf := GetConf() conf := GetConf()
p, _ := strconv.ParseUint(c.PostForm("port"), 10, 16) p, _ := strconv.ParseUint(c.PostForm("port"), 10, 16)
conf.HTTPConfig.Port = uint16(p) conf.HTTPConfig.Port = uint16(p)
@ -561,8 +568,8 @@ func AdminDoConfigHttp(s *webServer, c *gin.Context) {
} }
} }
// ws配置修改 // AdminDoConfigWS ws配置修改
func AdminDoConfigWs(s *webServer, c *gin.Context) { func AdminDoConfigWS(s *webServer, c *gin.Context) {
conf := GetConf() conf := GetConf()
p, _ := strconv.ParseUint(c.PostForm("port"), 10, 16) p, _ := strconv.ParseUint(c.PostForm("port"), 10, 16)
conf.WSConfig.Port = uint16(p) conf.WSConfig.Port = uint16(p)
@ -581,8 +588,8 @@ func AdminDoConfigWs(s *webServer, c *gin.Context) {
} }
} }
// 反向ws配置修改 // AdminDoConfigReverseWS 反向ws配置修改
func AdminDoConfigReverse(s *webServer, c *gin.Context) { func AdminDoConfigReverseWS(s *webServer, c *gin.Context) {
conf := GetConf() conf := GetConf()
conf.ReverseServers[0].ReverseAPIURL = c.PostForm("reverse_api_url") conf.ReverseServers[0].ReverseAPIURL = c.PostForm("reverse_api_url")
conf.ReverseServers[0].ReverseURL = c.PostForm("reverse_url") conf.ReverseServers[0].ReverseURL = c.PostForm("reverse_url")
@ -603,11 +610,11 @@ func AdminDoConfigReverse(s *webServer, c *gin.Context) {
} }
} }
// config.json配置修改 // AdminDoConfigJSON config.hjson配置修改
func AdminDoConfigJson(s *webServer, c *gin.Context) { func AdminDoConfigJSON(s *webServer, c *gin.Context) {
conf := GetConf() conf := GetConf()
Json := c.PostForm("json") JSON := c.PostForm("json")
err := json.Unmarshal([]byte(Json), &conf) err := json.Unmarshal([]byte(JSON), &conf)
if err != nil { if err != nil {
log.Warnf("尝试加载配置文件 %v 时出现错误: %v", "config.hjson", err) log.Warnf("尝试加载配置文件 %v 时出现错误: %v", "config.hjson", err)
c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err))) c.JSON(200, Failed(502, "保存 config.hjson 时出现错误:"+fmt.Sprintf("%v", err)))
@ -622,8 +629,8 @@ func AdminDoConfigJson(s *webServer, c *gin.Context) {
} }
} }
// 拉取config.json配置 // AdminGetConfigJSON 拉取config.hjson配置
func AdminGetConfigJson(s *webServer, c *gin.Context) { func AdminGetConfigJSON(s *webServer, c *gin.Context) {
conf := GetConf() conf := GetConf()
c.JSON(200, coolq.OK(coolq.MSG{"config": conf})) c.JSON(200, coolq.OK(coolq.MSG{"config": conf}))

2
server/doc.go Normal file
View File

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

111
server/http.go
View File

@ -24,7 +24,7 @@ import (
type httpServer struct { type httpServer struct {
engine *gin.Engine engine *gin.Engine
bot *coolq.CQBot bot *coolq.CQBot
Http *http.Server HTTP *http.Server
} }
type httpClient struct { type httpClient struct {
@ -34,7 +34,9 @@ type httpClient struct {
timeout int32 timeout int32
} }
var HttpServer = &httpServer{} var cqHTTPServer = &httpServer{}
// Debug 是否启用Debug模式
var Debug = false var Debug = false
func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) { func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
@ -84,11 +86,11 @@ func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
go func() { go func() {
log.Infof("CQ HTTP 服务器已启动: %v", addr) log.Infof("CQ HTTP 服务器已启动: %v", addr)
s.Http = &http.Server{ s.HTTP = &http.Server{
Addr: addr, Addr: addr,
Handler: s.engine, Handler: s.engine,
} }
if err := s.Http.ListenAndServe(); err != nil && err != http.ErrServerClosed { if err := s.HTTP.ListenAndServe(); err != nil && err != http.ErrServerClosed {
log.Error(err) log.Error(err)
log.Infof("HTTP 服务启动失败, 请检查端口是否被占用.") log.Infof("HTTP 服务启动失败, 请检查端口是否被占用.")
log.Warnf("将在五秒后退出.") log.Warnf("将在五秒后退出.")
@ -98,7 +100,7 @@ func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
}() }()
} }
func NewHttpClient() *httpClient { func newHTTPClient() *httpClient {
return &httpClient{} return &httpClient{}
} }
@ -123,7 +125,7 @@ func (c *httpClient) onBotPushEvent(m coolq.MSG) {
} }
if c.secret != "" { if c.secret != "" {
mac := hmac.New(sha1.New, []byte(c.secret)) mac := hmac.New(sha1.New, []byte(c.secret))
_, err := mac.Write([]byte(m.ToJson())) _, err := mac.Write([]byte(m.ToJSON()))
if err != nil { if err != nil {
log.Error(err) log.Error(err)
return nil return nil
@ -141,12 +143,12 @@ func (c *httpClient) onBotPushEvent(m coolq.MSG) {
return nil return nil
}).Do() }).Do()
if err != nil { if err != nil {
log.Warnf("上报Event数据 %v 到 %v 失败: %v", m.ToJson(), c.addr, err) log.Warnf("上报Event数据 %v 到 %v 失败: %v", m.ToJSON(), c.addr, err)
return return
} }
log.Debugf("上报Event数据 %v 到 %v", m.ToJson(), c.addr) log.Debugf("上报Event数据 %v 到 %v", m.ToJSON(), c.addr)
if gjson.Valid(res) { if gjson.Valid(res) {
c.bot.CQHandleQuickOperation(gjson.Parse(m.ToJson()), gjson.Parse(res)) c.bot.CQHandleQuickOperation(gjson.Parse(m.ToJSON()), gjson.Parse(res))
} }
} }
@ -154,72 +156,86 @@ func (s *httpServer) HandleActions(c *gin.Context) {
global.RateLimit(context.Background()) global.RateLimit(context.Background())
action := strings.ReplaceAll(c.Param("action"), "_async", "") action := strings.ReplaceAll(c.Param("action"), "_async", "")
log.Debugf("HTTPServer接收到API调用: %v", action) log.Debugf("HTTPServer接收到API调用: %v", action)
if f, ok := httpApi[action]; ok { if f, ok := httpAPI[action]; ok {
f(s, c) f(s, c)
} else { } else {
c.JSON(200, coolq.Failed(404)) c.JSON(200, coolq.Failed(404))
} }
} }
// GetLoginInfo 获取登录号信息
func GetLoginInfo(s *httpServer, c *gin.Context) { func GetLoginInfo(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQGetLoginInfo()) c.JSON(200, s.bot.CQGetLoginInfo())
} }
// GetFriendList 获取好友列表
func GetFriendList(s *httpServer, c *gin.Context) { func GetFriendList(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQGetFriendList()) c.JSON(200, s.bot.CQGetFriendList())
} }
// GetGroupList 获取群列表
func GetGroupList(s *httpServer, c *gin.Context) { func GetGroupList(s *httpServer, c *gin.Context) {
nc := getParamOrDefault(c, "no_cache", "false") nc := getParamOrDefault(c, "no_cache", "false")
c.JSON(200, s.bot.CQGetGroupList(nc == "true")) c.JSON(200, s.bot.CQGetGroupList(nc == "true"))
} }
// GetGroupInfo 获取群信息
func GetGroupInfo(s *httpServer, c *gin.Context) { func GetGroupInfo(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
nc := getParamOrDefault(c, "no_cache", "false") nc := getParamOrDefault(c, "no_cache", "false")
c.JSON(200, s.bot.CQGetGroupInfo(gid, nc == "true")) c.JSON(200, s.bot.CQGetGroupInfo(gid, nc == "true"))
} }
// GetGroupMemberList 获取群成员列表
func GetGroupMemberList(s *httpServer, c *gin.Context) { func GetGroupMemberList(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
nc := getParamOrDefault(c, "no_cache", "false") nc := getParamOrDefault(c, "no_cache", "false")
c.JSON(200, s.bot.CQGetGroupMemberList(gid, nc == "true")) c.JSON(200, s.bot.CQGetGroupMemberList(gid, nc == "true"))
} }
// GetGroupMemberInfo 获取群成员信息
func GetGroupMemberInfo(s *httpServer, c *gin.Context) { func GetGroupMemberInfo(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64) uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
c.JSON(200, s.bot.CQGetGroupMemberInfo(gid, uid)) c.JSON(200, s.bot.CQGetGroupMemberInfo(gid, uid))
} }
// GetGroupFileSystemInfo 扩展API-获取群文件系统信息
func GetGroupFileSystemInfo(s *httpServer, c *gin.Context) { func GetGroupFileSystemInfo(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
c.JSON(200, s.bot.CQGetGroupFileSystemInfo(gid)) c.JSON(200, s.bot.CQGetGroupFileSystemInfo(gid))
} }
// GetGroupRootFiles 扩展API-获取群根目录文件列表
func GetGroupRootFiles(s *httpServer, c *gin.Context) { func GetGroupRootFiles(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
c.JSON(200, s.bot.CQGetGroupRootFiles(gid)) c.JSON(200, s.bot.CQGetGroupRootFiles(gid))
} }
func GetGroupFilesByFolderId(s *httpServer, c *gin.Context) { // GetGroupFilesByFolderID 扩展API-获取群子目录文件列表
func GetGroupFilesByFolderID(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
folderId := getParam(c, "folder_id") folderID := getParam(c, "folder_id")
c.JSON(200, s.bot.CQGetGroupFilesByFolderId(gid, folderId)) c.JSON(200, s.bot.CQGetGroupFilesByFolderID(gid, folderID))
} }
func GetGroupFileUrl(s *httpServer, c *gin.Context) { // GetGroupFileURL 扩展API-获取群文件资源链接
func GetGroupFileURL(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
fid := getParam(c, "file_id") fid := getParam(c, "file_id")
busid, _ := strconv.ParseInt(getParam(c, "busid"), 10, 32) busid, _ := strconv.ParseInt(getParam(c, "busid"), 10, 32)
c.JSON(200, s.bot.CQGetGroupFileUrl(gid, fid, int32(busid))) c.JSON(200, s.bot.CQGetGroupFileURL(gid, fid, int32(busid)))
} }
// UploadGroupFile 扩展API-上传群文件
func UploadGroupFile(s *httpServer, c *gin.Context) { func UploadGroupFile(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
c.JSON(200, s.bot.CQUploadGroupFile(gid, getParam(c, "file"), getParam(c, "name"), getParam(c, "folder"))) c.JSON(200, s.bot.CQUploadGroupFile(gid, getParam(c, "file"), getParam(c, "name"), getParam(c, "folder")))
} }
// SendMessage 发送消息
//
// https://git.io/JtwTQ
func SendMessage(s *httpServer, c *gin.Context) { func SendMessage(s *httpServer, c *gin.Context) {
if getParam(c, "message_type") == "private" { if getParam(c, "message_type") == "private" {
SendPrivateMessage(s, c) SendPrivateMessage(s, c)
@ -238,6 +254,7 @@ func SendMessage(s *httpServer, c *gin.Context) {
} }
} }
// SendPrivateMessage 发送私聊消息
func SendPrivateMessage(s *httpServer, c *gin.Context) { func SendPrivateMessage(s *httpServer, c *gin.Context) {
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64) uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
msg, t := getParamWithType(c, "message") msg, t := getParamWithType(c, "message")
@ -249,6 +266,7 @@ func SendPrivateMessage(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQSendPrivateMessage(uid, msg, autoEscape)) c.JSON(200, s.bot.CQSendPrivateMessage(uid, msg, autoEscape))
} }
// SendGroupMessage 发送群消息
func SendGroupMessage(s *httpServer, c *gin.Context) { func SendGroupMessage(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
msg, t := getParamWithType(c, "message") msg, t := getParamWithType(c, "message")
@ -260,33 +278,39 @@ func SendGroupMessage(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQSendGroupMessage(gid, msg, autoEscape)) c.JSON(200, s.bot.CQSendGroupMessage(gid, msg, autoEscape))
} }
// SendGroupForwardMessage 扩展API-发送合并转发(群)
func SendGroupForwardMessage(s *httpServer, c *gin.Context) { func SendGroupForwardMessage(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
msg := getParam(c, "messages") msg := getParam(c, "messages")
c.JSON(200, s.bot.CQSendGroupForwardMessage(gid, gjson.Parse(msg))) c.JSON(200, s.bot.CQSendGroupForwardMessage(gid, gjson.Parse(msg)))
} }
// GetImage 获取图片(修改自OneBot)
func GetImage(s *httpServer, c *gin.Context) { func GetImage(s *httpServer, c *gin.Context) {
file := getParam(c, "file") file := getParam(c, "file")
c.JSON(200, s.bot.CQGetImage(file)) c.JSON(200, s.bot.CQGetImage(file))
} }
// GetMessage 获取消息
func GetMessage(s *httpServer, c *gin.Context) { func GetMessage(s *httpServer, c *gin.Context) {
mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32) mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32)
c.JSON(200, s.bot.CQGetMessage(int32(mid))) c.JSON(200, s.bot.CQGetMessage(int32(mid)))
} }
// GetGroupHonorInfo 获取群荣誉信息
func GetGroupHonorInfo(s *httpServer, c *gin.Context) { func GetGroupHonorInfo(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
c.JSON(200, s.bot.CQGetGroupHonorInfo(gid, getParam(c, "type"))) c.JSON(200, s.bot.CQGetGroupHonorInfo(gid, getParam(c, "type")))
} }
// ProcessFriendRequest 处理加好友请求
func ProcessFriendRequest(s *httpServer, c *gin.Context) { func ProcessFriendRequest(s *httpServer, c *gin.Context) {
flag := getParam(c, "flag") flag := getParam(c, "flag")
approve := getParamOrDefault(c, "approve", "true") approve := getParamOrDefault(c, "approve", "true")
c.JSON(200, s.bot.CQProcessFriendRequest(flag, approve == "true")) c.JSON(200, s.bot.CQProcessFriendRequest(flag, approve == "true"))
} }
// ProcessGroupRequest 处理加群请求／邀请
func ProcessGroupRequest(s *httpServer, c *gin.Context) { func ProcessGroupRequest(s *httpServer, c *gin.Context) {
flag := getParam(c, "flag") flag := getParam(c, "flag")
subType := getParam(c, "sub_type") subType := getParam(c, "sub_type")
@ -297,18 +321,21 @@ func ProcessGroupRequest(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQProcessGroupRequest(flag, subType, getParam(c, "reason"), approve == "true")) c.JSON(200, s.bot.CQProcessGroupRequest(flag, subType, getParam(c, "reason"), approve == "true"))
} }
// SetGroupCard 设置群名片(群备注)
func SetGroupCard(s *httpServer, c *gin.Context) { func SetGroupCard(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64) uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
c.JSON(200, s.bot.CQSetGroupCard(gid, uid, getParam(c, "card"))) c.JSON(200, s.bot.CQSetGroupCard(gid, uid, getParam(c, "card")))
} }
// SetSpecialTitle 设置群组专属头衔
func SetSpecialTitle(s *httpServer, c *gin.Context) { func SetSpecialTitle(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64) uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
c.JSON(200, s.bot.CQSetGroupSpecialTitle(gid, uid, getParam(c, "special_title"))) c.JSON(200, s.bot.CQSetGroupSpecialTitle(gid, uid, getParam(c, "special_title")))
} }
// SetGroupKick 群组踢人
func SetGroupKick(s *httpServer, c *gin.Context) { func SetGroupKick(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64) uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
@ -317,6 +344,7 @@ func SetGroupKick(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQSetGroupKick(gid, uid, msg, block == "true")) c.JSON(200, s.bot.CQSetGroupKick(gid, uid, msg, block == "true"))
} }
// SetGroupBan 群组单人禁言
func SetGroupBan(s *httpServer, c *gin.Context) { func SetGroupBan(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64) uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
@ -324,32 +352,40 @@ func SetGroupBan(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQSetGroupBan(gid, uid, uint32(i))) c.JSON(200, s.bot.CQSetGroupBan(gid, uid, uint32(i)))
} }
// SetWholeBan 群组全员禁言
func SetWholeBan(s *httpServer, c *gin.Context) { func SetWholeBan(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
c.JSON(200, s.bot.CQSetGroupWholeBan(gid, getParamOrDefault(c, "enable", "true") == "true")) c.JSON(200, s.bot.CQSetGroupWholeBan(gid, getParamOrDefault(c, "enable", "true") == "true"))
} }
// SetGroupName 设置群名
func SetGroupName(s *httpServer, c *gin.Context) { func SetGroupName(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
c.JSON(200, s.bot.CQSetGroupName(gid, getParam(c, "group_name"))) c.JSON(200, s.bot.CQSetGroupName(gid, getParam(c, "group_name")))
} }
// SetGroupAdmin 群组设置管理员
func SetGroupAdmin(s *httpServer, c *gin.Context) { func SetGroupAdmin(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
uid, _ := strconv.ParseInt(getParam(c, "user_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")) c.JSON(200, s.bot.CQSetGroupAdmin(gid, uid, getParamOrDefault(c, "enable", "true") == "true"))
} }
// SendGroupNotice 扩展API-发送群公告
func SendGroupNotice(s *httpServer, c *gin.Context) { func SendGroupNotice(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
c.JSON(200, s.bot.CQSetGroupMemo(gid, getParam(c, "content"))) c.JSON(200, s.bot.CQSetGroupMemo(gid, getParam(c, "content")))
} }
// SetGroupLeave 退出群组
func SetGroupLeave(s *httpServer, c *gin.Context) { func SetGroupLeave(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
c.JSON(200, s.bot.CQSetGroupLeave(gid)) c.JSON(200, s.bot.CQSetGroupLeave(gid))
} }
// SetRestart 重启 OneBot 实现
//
// https://git.io/JtwkJ
func SetRestart(s *httpServer, c *gin.Context) { func SetRestart(s *httpServer, c *gin.Context) {
delay, _ := strconv.ParseInt(getParam(c, "delay"), 10, 64) delay, _ := strconv.ParseInt(getParam(c, "delay"), 10, 64)
c.JSON(200, coolq.MSG{"data": nil, "retcode": 0, "status": "async"}) c.JSON(200, coolq.MSG{"data": nil, "retcode": 0, "status": "async"})
@ -360,58 +396,70 @@ func SetRestart(s *httpServer, c *gin.Context) {
} }
// GetForwardMessage 获取合并转发消息
func GetForwardMessage(s *httpServer, c *gin.Context) { func GetForwardMessage(s *httpServer, c *gin.Context) {
resId := getParam(c, "message_id") resID := getParam(c, "message_id")
if resId == "" { if resID == "" {
resId = getParam(c, "id") resID = getParam(c, "id")
} }
c.JSON(200, s.bot.CQGetForwardMessage(resId)) c.JSON(200, s.bot.CQGetForwardMessage(resID))
} }
// GetGroupSystemMessage 扩展API-获取群文件系统消息
func GetGroupSystemMessage(s *httpServer, c *gin.Context) { func GetGroupSystemMessage(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQGetGroupSystemMessages()) c.JSON(200, s.bot.CQGetGroupSystemMessages())
} }
// DeleteMessage 撤回消息
func DeleteMessage(s *httpServer, c *gin.Context) { func DeleteMessage(s *httpServer, c *gin.Context) {
mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32) mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32)
c.JSON(200, s.bot.CQDeleteMessage(int32(mid))) c.JSON(200, s.bot.CQDeleteMessage(int32(mid)))
} }
// CanSendImage 检查是否可以发送图片(此处永远返回true)
func CanSendImage(s *httpServer, c *gin.Context) { func CanSendImage(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQCanSendImage()) c.JSON(200, s.bot.CQCanSendImage())
} }
// CanSendRecord 检查是否可以发送语音(此处永远返回true)
func CanSendRecord(s *httpServer, c *gin.Context) { func CanSendRecord(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQCanSendRecord()) c.JSON(200, s.bot.CQCanSendRecord())
} }
// GetStatus 获取运行状态
func GetStatus(s *httpServer, c *gin.Context) { func GetStatus(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQGetStatus()) c.JSON(200, s.bot.CQGetStatus())
} }
// GetVersionInfo 获取版本信息
func GetVersionInfo(s *httpServer, c *gin.Context) { func GetVersionInfo(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQGetVersionInfo()) c.JSON(200, s.bot.CQGetVersionInfo())
} }
// ReloadEventFilter 扩展API-重载事件过滤器
func ReloadEventFilter(s *httpServer, c *gin.Context) { func ReloadEventFilter(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQReloadEventFilter()) c.JSON(200, s.bot.CQReloadEventFilter())
} }
// GetVipInfo 扩展API-获取VIP信息
func GetVipInfo(s *httpServer, c *gin.Context) { func GetVipInfo(s *httpServer, c *gin.Context) {
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64) uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
c.JSON(200, s.bot.CQGetVipInfo(uid)) c.JSON(200, s.bot.CQGetVipInfo(uid))
} }
// GetStrangerInfo 获取陌生人信息
func GetStrangerInfo(s *httpServer, c *gin.Context) { func GetStrangerInfo(s *httpServer, c *gin.Context) {
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64) uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
c.JSON(200, s.bot.CQGetStrangerInfo(uid)) c.JSON(200, s.bot.CQGetStrangerInfo(uid))
} }
// GetGroupAtAllRemain 扩展API-获取群 @全体成员 剩余次数
func GetGroupAtAllRemain(s *httpServer, c *gin.Context) { func GetGroupAtAllRemain(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
c.JSON(200, s.bot.CQGetAtAllRemain(gid)) c.JSON(200, s.bot.CQGetAtAllRemain(gid))
} }
// SetGroupAnonymousBan 群组匿名用户禁言
func SetGroupAnonymousBan(s *httpServer, c *gin.Context) { func SetGroupAnonymousBan(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
d, _ := strconv.ParseInt(getParam(c, "duration"), 10, 64) d, _ := strconv.ParseInt(getParam(c, "duration"), 10, 64)
@ -426,16 +474,19 @@ func SetGroupAnonymousBan(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQSetGroupAnonymousBan(gid, flag, int32(d))) c.JSON(200, s.bot.CQSetGroupAnonymousBan(gid, flag, int32(d)))
} }
// GetGroupMessageHistory 获取群消息历史记录
func GetGroupMessageHistory(s *httpServer, c *gin.Context) { func GetGroupMessageHistory(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
seq, _ := strconv.ParseInt(getParam(c, "message_seq"), 10, 64) seq, _ := strconv.ParseInt(getParam(c, "message_seq"), 10, 64)
c.JSON(200, s.bot.CQGetGroupMessageHistory(gid, seq)) c.JSON(200, s.bot.CQGetGroupMessageHistory(gid, seq))
} }
// GetOnlineClients 扩展API-获取当前账号在线客户端列表
func GetOnlineClients(s *httpServer, c *gin.Context) { func GetOnlineClients(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQGetOnlineClients(getParamOrDefault(c, "no_cache", "false") == "true")) c.JSON(200, s.bot.CQGetOnlineClients(getParamOrDefault(c, "no_cache", "false") == "true"))
} }
// HandleQuickOperation 隐藏API-对事件执行快速操作
func HandleQuickOperation(s *httpServer, c *gin.Context) { func HandleQuickOperation(s *httpServer, c *gin.Context) {
if c.Request.Method != "POST" { if c.Request.Method != "POST" {
c.AbortWithStatus(404) c.AbortWithStatus(404)
@ -447,6 +498,7 @@ func HandleQuickOperation(s *httpServer, c *gin.Context) {
} }
} }
// DownloadFile 扩展API-下载文件到缓存目录
func DownloadFile(s *httpServer, c *gin.Context) { func DownloadFile(s *httpServer, c *gin.Context) {
url := getParam(c, "url") url := getParam(c, "url")
tc, _ := strconv.Atoi(getParam(c, "thread_count")) tc, _ := strconv.Atoi(getParam(c, "thread_count"))
@ -474,16 +526,19 @@ func DownloadFile(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQDownloadFile(url, headers, tc)) c.JSON(200, s.bot.CQDownloadFile(url, headers, tc))
} }
// OcrImage 扩展API-图片OCR
func OcrImage(s *httpServer, c *gin.Context) { func OcrImage(s *httpServer, c *gin.Context) {
img := getParam(c, "image") img := getParam(c, "image")
c.JSON(200, s.bot.CQOcrImage(img)) c.JSON(200, s.bot.CQOcrImage(img))
} }
// GetWordSlices 隐藏API-获取中文分词
func GetWordSlices(s *httpServer, c *gin.Context) { func GetWordSlices(s *httpServer, c *gin.Context) {
content := getParam(c, "content") content := getParam(c, "content")
c.JSON(200, s.bot.CQGetWordSlices(content)) c.JSON(200, s.bot.CQGetWordSlices(content))
} }
// SetGroupPortrait 扩展API-设置群头像
func SetGroupPortrait(s *httpServer, c *gin.Context) { func SetGroupPortrait(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
file := getParam(c, "file") file := getParam(c, "file")
@ -491,23 +546,27 @@ func SetGroupPortrait(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQSetGroupPortrait(gid, file, cache)) c.JSON(200, s.bot.CQSetGroupPortrait(gid, file, cache))
} }
// SetEssenceMsg 扩展API-设置精华消息
func SetEssenceMsg(s *httpServer, c *gin.Context) { func SetEssenceMsg(s *httpServer, c *gin.Context) {
mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 64) mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 64)
c.JSON(200, s.bot.CQSetEssenceMessage(int32(mid))) c.JSON(200, s.bot.CQSetEssenceMessage(int32(mid)))
} }
// DeleteEssenceMsg 扩展API-移出精华消息
func DeleteEssenceMsg(s *httpServer, c *gin.Context) { func DeleteEssenceMsg(s *httpServer, c *gin.Context) {
mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 64) mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 64)
c.JSON(200, s.bot.CQDeleteEssenceMessage(int32(mid))) c.JSON(200, s.bot.CQDeleteEssenceMessage(int32(mid)))
} }
// GetEssenceMsgList 扩展API-获取精华消息列表
func GetEssenceMsgList(s *httpServer, c *gin.Context) { func GetEssenceMsgList(s *httpServer, c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
c.JSON(200, s.bot.CQGetEssenceMessageList(gid)) c.JSON(200, s.bot.CQGetEssenceMessageList(gid))
} }
func CheckUrlSafely(s *httpServer, c *gin.Context) { // CheckURLSafely 扩展API-检查链接安全性
c.JSON(200, s.bot.CQCheckUrlSafely(getParam(c, "url"))) func CheckURLSafely(s *httpServer, c *gin.Context) {
c.JSON(200, s.bot.CQCheckURLSafely(getParam(c, "url")))
} }
func getParamOrDefault(c *gin.Context, k, def string) string { func getParamOrDefault(c *gin.Context, k, def string) string {
@ -558,7 +617,7 @@ func getParamWithType(c *gin.Context, k string) (string, gjson.Type) {
return "", gjson.Null return "", gjson.Null
} }
var httpApi = map[string]func(s *httpServer, c *gin.Context){ var httpAPI = map[string]func(s *httpServer, c *gin.Context){
"get_login_info": GetLoginInfo, "get_login_info": GetLoginInfo,
"get_friend_list": GetFriendList, "get_friend_list": GetFriendList,
"get_group_list": GetGroupList, "get_group_list": GetGroupList,
@ -567,8 +626,8 @@ var httpApi = map[string]func(s *httpServer, c *gin.Context){
"get_group_member_info": GetGroupMemberInfo, "get_group_member_info": GetGroupMemberInfo,
"get_group_file_system_info": GetGroupFileSystemInfo, "get_group_file_system_info": GetGroupFileSystemInfo,
"get_group_root_files": GetGroupRootFiles, "get_group_root_files": GetGroupRootFiles,
"get_group_files_by_folder": GetGroupFilesByFolderId, "get_group_files_by_folder": GetGroupFilesByFolderID,
"get_group_file_url": GetGroupFileUrl, "get_group_file_url": GetGroupFileURL,
"upload_group_file": UploadGroupFile, "upload_group_file": UploadGroupFile,
"get_essence_msg_list": GetEssenceMsgList, "get_essence_msg_list": GetEssenceMsgList,
"send_msg": SendMessage, "send_msg": SendMessage,
@ -605,7 +664,7 @@ var httpApi = map[string]func(s *httpServer, c *gin.Context){
"set_group_portrait": SetGroupPortrait, "set_group_portrait": SetGroupPortrait,
"set_group_anonymous_ban": SetGroupAnonymousBan, "set_group_anonymous_ban": SetGroupAnonymousBan,
"get_group_msg_history": GetGroupMessageHistory, "get_group_msg_history": GetGroupMessageHistory,
"check_url_safely": CheckUrlSafely, "check_url_safely": CheckURLSafely,
"download_file": DownloadFile, "download_file": DownloadFile,
".handle_quick_operation": HandleQuickOperation, ".handle_quick_operation": HandleQuickOperation,
".ocr_image": OcrImage, ".ocr_image": OcrImage,
@ -618,7 +677,7 @@ var httpApi = map[string]func(s *httpServer, c *gin.Context){
func (s *httpServer) ShutDown() { func (s *httpServer) ShutDown() {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel() defer cancel()
if err := s.Http.Shutdown(ctx); err != nil { if err := s.HTTP.Shutdown(ctx); err != nil {
log.Fatal("http Server Shutdown:", err) log.Fatal("http Server Shutdown:", err)
} }
<-ctx.Done() <-ctx.Done()

66
server/websocket.go
View File

@ -25,7 +25,7 @@ type webSocketServer struct {
handshake string handshake string
} }
//WebSocketClient Websocket客户端实例 // WebSocketClient WebSocket客户端实例
type WebSocketClient struct { type WebSocketClient struct {
conf *global.GoCQReverseWebSocketConfig conf *global.GoCQReverseWebSocketConfig
token string token string
@ -40,7 +40,7 @@ type webSocketConn struct {
sync.Mutex sync.Mutex
} }
//WebSocketServer 初始化一个WebSocketServer实例 // WebSocketServer 初始化一个WebSocketServer实例
var WebSocketServer = &webSocketServer{} var WebSocketServer = &webSocketServer{}
var upgrader = websocket.Upgrader{ var upgrader = websocket.Upgrader{
CheckOrigin: func(r *http.Request) bool { CheckOrigin: func(r *http.Request) bool {
@ -58,17 +58,17 @@ func (s *webSocketServer) Run(addr, authToken string, b *coolq.CQBot) {
http.HandleFunc("/api", s.api) http.HandleFunc("/api", s.api)
http.HandleFunc("/", s.any) http.HandleFunc("/", s.any)
go func() { go func() {
log.Infof("CQ Websocket 服务器已启动: %v", addr) log.Infof("CQ WebSocket 服务器已启动: %v", addr)
log.Fatal(http.ListenAndServe(addr, nil)) log.Fatal(http.ListenAndServe(addr, nil))
}() }()
} }
//NewWebSocketClient 初始化一个NWebSocket客户端 // NewWebSocketClient 初始化一个NWebSocket客户端
func NewWebSocketClient(conf *global.GoCQReverseWebSocketConfig, authToken string, b *coolq.CQBot) *WebSocketClient { func NewWebSocketClient(conf *global.GoCQReverseWebSocketConfig, authToken string, b *coolq.CQBot) *WebSocketClient {
return &WebSocketClient{conf: conf, token: authToken, bot: b} return &WebSocketClient{conf: conf, token: authToken, bot: b}
} }
//Run 运行实例 // Run 运行实例
func (c *WebSocketClient) Run() { func (c *WebSocketClient) Run() {
if !c.conf.Enabled { if !c.conf.Enabled {
return return
@ -87,7 +87,7 @@ func (c *WebSocketClient) Run() {
} }
func (c *WebSocketClient) connectAPI() { func (c *WebSocketClient) connectAPI() {
log.Infof("开始尝试连接到反向Websocket API服务器: %v", c.conf.ReverseAPIURL) log.Infof("开始尝试连接到反向WebSocket API服务器: %v", c.conf.ReverseAPIURL)
header := http.Header{ header := http.Header{
"X-Client-Role": []string{"API"}, "X-Client-Role": []string{"API"},
"X-Self-ID": []string{strconv.FormatInt(c.bot.Client.Uin, 10)}, "X-Self-ID": []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
@ -98,20 +98,20 @@ func (c *WebSocketClient) connectAPI() {
} }
conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseAPIURL, header) conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseAPIURL, header)
if err != nil { if err != nil {
log.Warnf("连接到反向Websocket API服务器 %v 时出现错误: %v", c.conf.ReverseAPIURL, err) log.Warnf("连接到反向WebSocket API服务器 %v 时出现错误: %v", c.conf.ReverseAPIURL, err)
if c.conf.ReverseReconnectInterval != 0 { if c.conf.ReverseReconnectInterval != 0 {
time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval)) time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
c.connectAPI() c.connectAPI()
} }
return return
} }
log.Infof("已连接到反向Websocket API服务器 %v", c.conf.ReverseAPIURL) log.Infof("已连接到反向WebSocket API服务器 %v", c.conf.ReverseAPIURL)
wrappedConn := &webSocketConn{Conn: conn} wrappedConn := &webSocketConn{Conn: conn}
go c.listenAPI(wrappedConn, false) go c.listenAPI(wrappedConn, false)
} }
func (c *WebSocketClient) connectEvent() { func (c *WebSocketClient) connectEvent() {
log.Infof("开始尝试连接到反向Websocket Event服务器: %v", c.conf.ReverseEventURL) log.Infof("开始尝试连接到反向WebSocket Event服务器: %v", c.conf.ReverseEventURL)
header := http.Header{ header := http.Header{
"X-Client-Role": []string{"Event"}, "X-Client-Role": []string{"Event"},
"X-Self-ID": []string{strconv.FormatInt(c.bot.Client.Uin, 10)}, "X-Self-ID": []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
@ -122,7 +122,7 @@ func (c *WebSocketClient) connectEvent() {
} }
conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseEventURL, header) conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseEventURL, header)
if err != nil { if err != nil {
log.Warnf("连接到反向Websocket Event服务器 %v 时出现错误: %v", c.conf.ReverseEventURL, err) log.Warnf("连接到反向WebSocket Event服务器 %v 时出现错误: %v", c.conf.ReverseEventURL, err)
if c.conf.ReverseReconnectInterval != 0 { if c.conf.ReverseReconnectInterval != 0 {
time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval)) time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
c.connectEvent() c.connectEvent()
@ -134,15 +134,15 @@ func (c *WebSocketClient) connectEvent() {
c.bot.Client.Uin, time.Now().Unix()) c.bot.Client.Uin, time.Now().Unix())
err = conn.WriteMessage(websocket.TextMessage, []byte(handshake)) err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
if err != nil { if err != nil {
log.Warnf("反向Websocket 握手时出现错误: %v", err) log.Warnf("反向WebSocket 握手时出现错误: %v", err)
} }
log.Infof("已连接到反向Websocket Event服务器 %v", c.conf.ReverseEventURL) log.Infof("已连接到反向WebSocket Event服务器 %v", c.conf.ReverseEventURL)
c.eventConn = &webSocketConn{Conn: conn} c.eventConn = &webSocketConn{Conn: conn}
} }
func (c *WebSocketClient) connectUniversal() { func (c *WebSocketClient) connectUniversal() {
log.Infof("开始尝试连接到反向Websocket Universal服务器: %v", c.conf.ReverseURL) log.Infof("开始尝试连接到反向WebSocket Universal服务器: %v", c.conf.ReverseURL)
header := http.Header{ header := http.Header{
"X-Client-Role": []string{"Universal"}, "X-Client-Role": []string{"Universal"},
"X-Self-ID": []string{strconv.FormatInt(c.bot.Client.Uin, 10)}, "X-Self-ID": []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
@ -153,7 +153,7 @@ func (c *WebSocketClient) connectUniversal() {
} }
conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseURL, header) conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseURL, header)
if err != nil { if err != nil {
log.Warnf("连接到反向Websocket Universal服务器 %v 时出现错误: %v", c.conf.ReverseURL, err) log.Warnf("连接到反向WebSocket Universal服务器 %v 时出现错误: %v", c.conf.ReverseURL, err)
if c.conf.ReverseReconnectInterval != 0 { if c.conf.ReverseReconnectInterval != 0 {
time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval)) time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
c.connectUniversal() c.connectUniversal()
@ -165,7 +165,7 @@ func (c *WebSocketClient) connectUniversal() {
c.bot.Client.Uin, time.Now().Unix()) c.bot.Client.Uin, time.Now().Unix())
err = conn.WriteMessage(websocket.TextMessage, []byte(handshake)) err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
if err != nil { if err != nil {
log.Warnf("反向Websocket 握手时出现错误: %v", err) log.Warnf("反向WebSocket 握手时出现错误: %v", err)
} }
wrappedConn := &webSocketConn{Conn: conn} wrappedConn := &webSocketConn{Conn: conn}
@ -195,7 +195,7 @@ func (c *WebSocketClient) listenAPI(conn *webSocketConn, u bool) {
func (c *WebSocketClient) onBotPushEvent(m coolq.MSG) { func (c *WebSocketClient) onBotPushEvent(m coolq.MSG) {
if c.eventConn != nil { if c.eventConn != nil {
log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), m.ToJson()) log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), m.ToJSON())
conn := c.eventConn conn := c.eventConn
conn.Lock() conn.Lock()
defer conn.Unlock() defer conn.Unlock()
@ -210,7 +210,7 @@ func (c *WebSocketClient) onBotPushEvent(m coolq.MSG) {
} }
} }
if c.universalConn != nil { if c.universalConn != nil {
log.Debugf("向WS服务器 %v 推送Event: %v", c.universalConn.RemoteAddr().String(), m.ToJson()) log.Debugf("向WS服务器 %v 推送Event: %v", c.universalConn.RemoteAddr().String(), m.ToJSON())
conn := c.universalConn conn := c.universalConn
conn.Lock() conn.Lock()
defer conn.Unlock() defer conn.Unlock()
@ -230,7 +230,7 @@ func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
if s.token != "" { if s.token != "" {
if auth := r.URL.Query().Get("access_token"); auth != s.token { if auth := r.URL.Query().Get("access_token"); auth != s.token {
if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token { if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr) log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
w.WriteHeader(401) w.WriteHeader(401)
return return
} }
@ -238,17 +238,17 @@ func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
} }
c, err := upgrader.Upgrade(w, r, nil) c, err := upgrader.Upgrade(w, r, nil)
if err != nil { if err != nil {
log.Warnf("处理 Websocket 请求时出现错误: %v", err) log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
return return
} }
err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake)) err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
if err != nil { if err != nil {
log.Warnf("Websocket 握手时出现错误: %v", err) log.Warnf("WebSocket 握手时出现错误: %v", err)
c.Close() c.Close()
return return
} }
log.Infof("接受 Websocket 连接: %v (/event)", r.RemoteAddr) log.Infof("接受 WebSocket 连接: %v (/event)", r.RemoteAddr)
conn := &webSocketConn{Conn: c} conn := &webSocketConn{Conn: c}
@ -261,7 +261,7 @@ func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
if s.token != "" { if s.token != "" {
if auth := r.URL.Query().Get("access_token"); auth != s.token { if auth := r.URL.Query().Get("access_token"); auth != s.token {
if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token { if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr) log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
w.WriteHeader(401) w.WriteHeader(401)
return return
} }
@ -269,10 +269,10 @@ func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
} }
c, err := upgrader.Upgrade(w, r, nil) c, err := upgrader.Upgrade(w, r, nil)
if err != nil { if err != nil {
log.Warnf("处理 Websocket 请求时出现错误: %v", err) log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
return return
} }
log.Infof("接受 Websocket 连接: %v (/api)", r.RemoteAddr) log.Infof("接受 WebSocket 连接: %v (/api)", r.RemoteAddr)
conn := &webSocketConn{Conn: c} conn := &webSocketConn{Conn: c}
go s.listenAPI(conn) go s.listenAPI(conn)
} }
@ -281,7 +281,7 @@ func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
if s.token != "" { if s.token != "" {
if auth := r.URL.Query().Get("access_token"); auth != s.token { if auth := r.URL.Query().Get("access_token"); auth != s.token {
if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token { if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr) log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
w.WriteHeader(401) w.WriteHeader(401)
return return
} }
@ -289,16 +289,16 @@ func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
} }
c, err := upgrader.Upgrade(w, r, nil) c, err := upgrader.Upgrade(w, r, nil)
if err != nil { if err != nil {
log.Warnf("处理 Websocket 请求时出现错误: %v", err) log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
return return
} }
err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake)) err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
if err != nil { if err != nil {
log.Warnf("Websocket 握手时出现错误: %v", err) log.Warnf("WebSocket 握手时出现错误: %v", err)
c.Close() c.Close()
return return
} }
log.Infof("接受 Websocket 连接: %v (/)", r.RemoteAddr) log.Infof("接受 WebSocket 连接: %v (/)", r.RemoteAddr)
conn := &webSocketConn{Conn: c} conn := &webSocketConn{Conn: c}
s.eventConn = append(s.eventConn, conn) s.eventConn = append(s.eventConn, conn)
s.listenAPI(conn) s.listenAPI(conn)
@ -353,9 +353,9 @@ func (s *webSocketServer) onBotPushEvent(m coolq.MSG) {
defer s.eventConnMutex.Unlock() defer s.eventConnMutex.Unlock()
for i, l := 0, len(s.eventConn); i < l; i++ { for i, l := 0, len(s.eventConn); i < l; i++ {
conn := s.eventConn[i] conn := s.eventConn[i]
log.Debugf("向WS客户端 %v 推送Event: %v", conn.RemoteAddr().String(), m.ToJson()) log.Debugf("向WS客户端 %v 推送Event: %v", conn.RemoteAddr().String(), m.ToJSON())
conn.Lock() conn.Lock()
if err := conn.WriteMessage(websocket.TextMessage, []byte(m.ToJson())); err != nil { if err := conn.WriteMessage(websocket.TextMessage, []byte(m.ToJSON())); err != nil {
_ = conn.Close() _ = conn.Close()
next := i + 1 next := i + 1
if next >= l { if next >= l {
@ -557,10 +557,10 @@ var wsAPI = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
return bot.CQGetGroupRootFiles(p.Get("group_id").Int()) return bot.CQGetGroupRootFiles(p.Get("group_id").Int())
}, },
"get_group_files_by_folder": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG { "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) 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 { "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())) return bot.CQGetGroupFileURL(p.Get("group_id").Int(), p.Get("file_id").Str, int32(p.Get("busid").Int()))
}, },
"upload_group_file": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG { "upload_group_file": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQUploadGroupFile(p.Get("group_id").Int(), p.Get("file").Str, p.Get("name").Str, p.Get("folder").Str) return bot.CQUploadGroupFile(p.Get("group_id").Int(), p.Get("file").Str, p.Get("name").Str, p.Get("folder").Str)
@ -602,7 +602,7 @@ var wsAPI = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
return bot.CQGetEssenceMessageList(p.Get("group_id").Int()) return bot.CQGetEssenceMessageList(p.Get("group_id").Int())
}, },
"check_url_safely": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG { "check_url_safely": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQCheckUrlSafely(p.Get("url").String()) return bot.CQCheckURLSafely(p.Get("url").String())
}, },
"set_group_anonymous_ban": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG { "set_group_anonymous_ban": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
obj := p.Get("anonymous") obj := p.Get("anonymous")