mirror of
https://github.com/Mrs4s/go-cqhttp.git
synced 2025-06-30 03:43:25 +00:00
Compare commits
36 Commits
v0.9.24
...
v0.9.25-fi
| Author | SHA1 | Date | |
|---|---|---|---|
| c31169b99b | |||
| b5b6117487 | |||
| 4662f1e170 | |||
| ea65e545ad | |||
| d67621487d | |||
| c4e54446c5 | |||
| 1d1925208b | |||
| 741a91cf70 | |||
| fef9395890 | |||
| 50bfc08974 | |||
| 2005cbccb0 | |||
| 69cadad155 | |||
| a4c6c6d7f3 | |||
| 6f251e3dec | |||
| 6101c4d8a9 | |||
| e9db10c9b7 | |||
| e87de2f6b3 | |||
| a1a3e26b0b | |||
| 92c224be5b | |||
| c691aa70ea | |||
| 30c4d508bc | |||
| b0e00fe052 | |||
| 09aa852308 | |||
| 0cfaa4c7ad | |||
| faba3e042f | |||
| b33bb37da9 | |||
| 50ebfe4766 | |||
| e4a458e7c8 | |||
| 8c63a420a3 | |||
| b1fccbc0a3 | |||
| 1a2fa65347 | |||
| 5ddb246ab2 | |||
| 86da65771d | |||
| eca396afb3 | |||
| e5718fc47c | |||
| 4b12bbc1e4 |
@ -80,13 +80,14 @@
|
||||
| ------------------------------------------------------------ |
|
||||
| [私聊信息](https://cqhttp.cc/docs/4.15/#/Post?id=私聊消息) |
|
||||
| [群消息](https://cqhttp.cc/docs/4.15/#/Post?id=群消息) |
|
||||
| [群消息撤回(拓展Event)](docs/cqhttp.md#群消息撤回) |
|
||||
| [好友消息撤回(拓展Event)](docs/cqhttp.md#好友消息撤回) |
|
||||
| [群消息撤回(拓展Event)](docs/cqhttp.md#群消息撤回) |
|
||||
| [好友消息撤回(拓展Event)](docs/cqhttp.md#好友消息撤回) |
|
||||
| [群内提示事件(拓展Event)(龙王等事件)](docs/cqhttp.md#群内戳一戳) |
|
||||
| [群管理员变动](https://cqhttp.cc/docs/4.15/#/Post?id=群管理员变动) |
|
||||
| [群成员减少](https://cqhttp.cc/docs/4.15/#/Post?id=群成员减少) |
|
||||
| [群成员增加](https://cqhttp.cc/docs/4.15/#/Post?id=群成员增加) |
|
||||
| [群禁言](https://cqhttp.cc/docs/4.15/#/Post?id=群禁言) |
|
||||
| [群文件上传](https://cqhttp.cc/docs/4.15/#/Post?id=群文件上传)|
|
||||
| [群文件上传](https://cqhttp.cc/docs/4.15/#/Post?id=群文件上传) |
|
||||
| [加好友请求](https://cqhttp.cc/docs/4.15/#/Post?id=加好友请求) |
|
||||
| [加群请求/邀请](https://cqhttp.cc/docs/4.15/#/Post?id=加群请求／邀请) |
|
||||
|
||||
|
||||
100
coolq/api.go
100
coolq/api.go
@ -68,20 +68,7 @@ func (bot *CQBot) CQGetGroupInfo(groupId int64) 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
|
||||
func (bot *CQBot) CQGetGroupMemberList(groupId int64) MSG {
|
||||
group := bot.Client.FindGroup(groupId)
|
||||
if group == nil {
|
||||
return Failed(100)
|
||||
}
|
||||
members := make([]MSG, 0)
|
||||
for _, m := range group.Members {
|
||||
members = append(members, convertGroupMemberInfo(groupId, m))
|
||||
}
|
||||
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
|
||||
func (bot *CQBot) CQGetGroupMemberInfo(groupId, userId int64, noCache bool) MSG {
|
||||
func (bot *CQBot) CQGetGroupMemberList(groupId int64, noCache bool) MSG {
|
||||
group := bot.Client.FindGroup(groupId)
|
||||
if group == nil {
|
||||
return Failed(100)
|
||||
@ -94,6 +81,19 @@ func (bot *CQBot) CQGetGroupMemberInfo(groupId, userId int64, noCache bool) MSG
|
||||
}
|
||||
group.Members = t
|
||||
}
|
||||
members := make([]MSG, 0)
|
||||
for _, m := range group.Members {
|
||||
members = append(members, convertGroupMemberInfo(groupId, m))
|
||||
}
|
||||
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
|
||||
func (bot *CQBot) CQGetGroupMemberInfo(groupId, userId int64) MSG {
|
||||
group := bot.Client.FindGroup(groupId)
|
||||
if group == nil {
|
||||
return Failed(100)
|
||||
}
|
||||
member := group.FindMember(userId)
|
||||
if member == nil {
|
||||
return Failed(102)
|
||||
@ -404,6 +404,26 @@ func (bot *CQBot) CQDeleteMessage(messageId int32) MSG {
|
||||
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
|
||||
func (bot *CQBot) CQSetGroupAdmin(groupId, userId int64, enable bool) MSG {
|
||||
group := bot.Client.FindGroup(groupId)
|
||||
if group == nil || group.OwnerUin != bot.Client.Uin {
|
||||
return Failed(100)
|
||||
}
|
||||
mem := group.FindMember(userId)
|
||||
if mem == nil {
|
||||
return Failed(100)
|
||||
}
|
||||
mem.SetAdmin(enable)
|
||||
t, err := bot.Client.GetGroupMembers(group)
|
||||
if err != nil {
|
||||
log.Warnf("刷新群 %v 成员列表失败: %v", groupId, err)
|
||||
return Failed(100)
|
||||
}
|
||||
group.Members = t
|
||||
return OK(nil)
|
||||
}
|
||||
|
||||
func (bot *CQBot) CQGetVipInfo(userId int64) MSG {
|
||||
msg := MSG{}
|
||||
vip, err := bot.Client.GetVipInfo(userId)
|
||||
@ -411,13 +431,13 @@ func (bot *CQBot) CQGetVipInfo(userId int64) MSG {
|
||||
return Failed(100)
|
||||
}
|
||||
msg = MSG{
|
||||
"user_id": vip.Uin,
|
||||
"nickname": vip.Name,
|
||||
"level": vip.Level,
|
||||
"level_speed": vip.LevelSpeed,
|
||||
"vip_level": vip.VipLevel,
|
||||
"vip_growth_speed": vip.VipGrowthSpeed,
|
||||
"vip_growth_total": vip.VipGrowthTotal,
|
||||
"user_id": vip.Uin,
|
||||
"nickname": vip.Name,
|
||||
"level": vip.Level,
|
||||
"level_speed": vip.LevelSpeed,
|
||||
"vip_level": vip.VipLevel,
|
||||
"vip_growth_speed": vip.VipGrowthSpeed,
|
||||
"vip_growth_total": vip.VipGrowthTotal,
|
||||
}
|
||||
return OK(msg)
|
||||
}
|
||||
@ -477,6 +497,27 @@ func (bot *CQBot) CQGetGroupHonorInfo(groupId int64, t string) 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
|
||||
func (bot *CQBot) CQGetStrangerInfo(userId int64) MSG {
|
||||
info, err := bot.Client.GetSummaryInfo(userId)
|
||||
if err != nil {
|
||||
return Failed(100)
|
||||
}
|
||||
return OK(MSG{
|
||||
"user_id": info.Uin,
|
||||
"nickname": info.Nickname,
|
||||
"sex": func() string {
|
||||
if info.Sex == 1 {
|
||||
return "female"
|
||||
}
|
||||
return "male"
|
||||
}(),
|
||||
"age": info.Age,
|
||||
"level": info.Level,
|
||||
"login_days": info.LoginDays,
|
||||
})
|
||||
}
|
||||
|
||||
// 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
|
||||
// https://github.com/richardchien/coolq-http-api/blob/master/src/cqhttp/plugins/web/http.cpp#L376
|
||||
func (bot *CQBot) CQHandleQuickOperation(context, operation gjson.Result) MSG {
|
||||
@ -607,6 +648,11 @@ func (bot *CQBot) CQCanSendRecord() MSG {
|
||||
return OK(MSG{"yes": true})
|
||||
}
|
||||
|
||||
func (bot *CQBot) CQReloadEventFilter() MSG {
|
||||
global.BootFilter()
|
||||
return OK(nil)
|
||||
}
|
||||
|
||||
func (bot *CQBot) CQGetStatus() MSG {
|
||||
return OK(MSG{
|
||||
"app_initialized": true,
|
||||
@ -630,6 +676,18 @@ func (bot *CQBot) CQGetVersionInfo() MSG {
|
||||
"runtime_version": runtime.Version(),
|
||||
"runtime_os": runtime.GOOS,
|
||||
"version": Version,
|
||||
"protocol": func() int {
|
||||
switch client.SystemDeviceInfo.Protocol {
|
||||
case client.AndroidPad:
|
||||
return 0
|
||||
case client.AndroidPhone:
|
||||
return 1
|
||||
case client.AndroidWatch:
|
||||
return 2
|
||||
default:
|
||||
return -1
|
||||
}
|
||||
}(),
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
11
coolq/bot.go
11
coolq/bot.go
@ -59,6 +59,7 @@ func NewQQBot(cli *client.QQClient, conf *global.JsonConfig) *CQBot {
|
||||
bot.Client.OnTempMessage(bot.tempMessageEvent)
|
||||
bot.Client.OnGroupMuted(bot.groupMutedEvent)
|
||||
bot.Client.OnGroupMessageRecalled(bot.groupRecallEvent)
|
||||
bot.Client.OnGroupNotify(bot.groupNotifyEvent)
|
||||
bot.Client.OnFriendMessageRecalled(bot.friendRecallEvent)
|
||||
bot.Client.OnJoinGroup(bot.joinGroupEvent)
|
||||
bot.Client.OnLeaveGroup(bot.leaveGroupEvent)
|
||||
@ -138,6 +139,14 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
|
||||
newElem = append(newElem, gv)
|
||||
continue
|
||||
}
|
||||
if i, ok := elem.(*PokeElement); ok {
|
||||
if group := bot.Client.FindGroup(groupId); group != nil {
|
||||
if mem := group.FindMember(i.Target); mem != nil {
|
||||
mem.Poke()
|
||||
return 0
|
||||
}
|
||||
}
|
||||
}
|
||||
newElem = append(newElem, elem)
|
||||
}
|
||||
m.Elements = newElem
|
||||
@ -226,7 +235,7 @@ func (bot *CQBot) Release() {
|
||||
|
||||
func (bot *CQBot) dispatchEventMessage(m MSG) {
|
||||
payload := gjson.Parse(m.ToJson())
|
||||
filter := global.GetFilter()
|
||||
filter := global.EventFilter
|
||||
if filter != nil && (*filter).Eval(payload) == false {
|
||||
log.Debug("Event filtered!")
|
||||
return
|
||||
|
||||
@ -26,6 +26,14 @@ var paramReg = regexp.MustCompile(`,([\w\-.]+?)=([^,\]]+)`)
|
||||
|
||||
var IgnoreInvalidCQCode = false
|
||||
|
||||
type PokeElement struct {
|
||||
Target int64
|
||||
}
|
||||
|
||||
func (e *PokeElement) Type() message.ElementType {
|
||||
return message.At
|
||||
}
|
||||
|
||||
func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []MSG) {
|
||||
ur := false
|
||||
if len(raw) != 0 {
|
||||
@ -50,6 +58,8 @@ func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []M
|
||||
"type": "text",
|
||||
"data": map[string]string{"text": o.Content},
|
||||
}
|
||||
case *message.ReplyElement:
|
||||
continue
|
||||
case *message.LightAppElement:
|
||||
//m = MSG{
|
||||
// "type": "text",
|
||||
@ -71,6 +81,11 @@ func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []M
|
||||
"data": map[string]string{"qq": fmt.Sprint(o.Target)},
|
||||
}
|
||||
}
|
||||
case *message.RedBagElement:
|
||||
m = MSG{
|
||||
"type": "redbag",
|
||||
"data": map[string]string{"title": o.Title},
|
||||
}
|
||||
case *message.ForwardElement:
|
||||
m = MSG{
|
||||
"type": "forward",
|
||||
@ -159,6 +174,8 @@ func ToStringMessage(e []message.IMessageElement, code int64, raw ...bool) (r st
|
||||
continue
|
||||
}
|
||||
r += fmt.Sprintf("[CQ:at,qq=%d]", o.Target)
|
||||
case *message.RedBagElement:
|
||||
r += fmt.Sprintf("[CQ:redbag,title=%s]", o.Title)
|
||||
case *message.ForwardElement:
|
||||
r += fmt.Sprintf("[CQ:forward,id=%s]", o.ResId)
|
||||
case *message.FaceElement:
|
||||
@ -310,6 +327,12 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (message.
|
||||
return message.NewText(d["text"]), nil
|
||||
case "image":
|
||||
return bot.makeImageElem(t, d, group)
|
||||
case "poke":
|
||||
if !group {
|
||||
return nil, errors.New("todo") // TODO: private poke
|
||||
}
|
||||
t, _ := strconv.ParseInt(d["qq"], 10, 64)
|
||||
return &PokeElement{Target: t}, nil
|
||||
case "record":
|
||||
if !group {
|
||||
return nil, errors.New("private voice unsupported now")
|
||||
|
||||
@ -205,6 +205,65 @@ func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRec
|
||||
})
|
||||
}
|
||||
|
||||
func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.IGroupNotifyEvent) {
|
||||
group := c.FindGroup(e.From())
|
||||
switch notify := e.(type) {
|
||||
case *client.GroupPokeNotifyEvent:
|
||||
sender := group.FindMember(notify.Sender)
|
||||
receiver := group.FindMember(notify.Receiver)
|
||||
log.Infof("群 %v 内 %v 戳了戳 %v", formatGroupName(group), formatMemberName(sender), formatMemberName(receiver))
|
||||
bot.dispatchEventMessage(MSG{
|
||||
"post_type": "notice",
|
||||
"group_id": group.Code,
|
||||
"notice_type": "notify",
|
||||
"sub_type": "poke",
|
||||
"self_id": c.Uin,
|
||||
"user_id": notify.Sender,
|
||||
"sender_id": notify.Sender,
|
||||
"target_id": notify.Receiver,
|
||||
"time": time.Now().Unix(),
|
||||
})
|
||||
case *client.GroupRedBagLuckyKingNotifyEvent:
|
||||
sender := group.FindMember(notify.Sender)
|
||||
luckyKing := group.FindMember(notify.LuckyKing)
|
||||
log.Infof("群 %v 内 %v 的红包被抢完, %v 是运气王", formatGroupName(group), formatMemberName(sender), formatMemberName(luckyKing))
|
||||
bot.dispatchEventMessage(MSG{
|
||||
"post_type": "notice",
|
||||
"group_id": group.Code,
|
||||
"notice_type": "notify",
|
||||
"sub_type": "lucky_king",
|
||||
"self_id": c.Uin,
|
||||
"user_id": notify.Sender,
|
||||
"sender_id": notify.Sender,
|
||||
"target_id": notify.LuckyKing,
|
||||
"time": time.Now().Unix(),
|
||||
})
|
||||
case *client.MemberHonorChangedNotifyEvent:
|
||||
log.Info(notify.Content())
|
||||
bot.dispatchEventMessage(MSG{
|
||||
"post_type": "notice",
|
||||
"group_id": group.Code,
|
||||
"notice_type": "notify",
|
||||
"sub_type": "honor",
|
||||
"self_id": c.Uin,
|
||||
"user_id": notify.Uin,
|
||||
"time": time.Now().Unix(),
|
||||
"honor_type": func() string {
|
||||
switch notify.Honor {
|
||||
case client.Talkative:
|
||||
return "talkative"
|
||||
case client.Performer:
|
||||
return "performer"
|
||||
case client.Emotion:
|
||||
return "emotion"
|
||||
default:
|
||||
return "ERROR"
|
||||
}
|
||||
}(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageRecalledEvent) {
|
||||
f := c.FindFriend(e.FriendUin)
|
||||
gid := ToGlobalId(e.FriendUin, e.MessageId)
|
||||
|
||||
@ -22,10 +22,15 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
|
||||
"password_encrypted": "",
|
||||
"enable_db": true,
|
||||
"access_token": "",
|
||||
"relogin": {
|
||||
"enabled": true,
|
||||
"relogin_delay": 3,
|
||||
"max_relogin_times": 0
|
||||
"relogin": {
|
||||
"enabled": true,
|
||||
"relogin_delay": 3,
|
||||
"max_relogin_times": 0
|
||||
},
|
||||
"_rate_limit": {
|
||||
"enabled": false,
|
||||
"frequency": 1,
|
||||
"bucket_size": 1
|
||||
},
|
||||
"post_message_format": "string",
|
||||
"ignore_invalid_cqcode": false,
|
||||
@ -66,10 +71,13 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
|
||||
| relogin | bool | 是否自动重新登录 |
|
||||
| relogin_delay | int | 重登录延时（秒） |
|
||||
| max_relogin_times | uint | 最大重登录次数，若0则不设置上限 |
|
||||
| _rate_limit | bool | 是否启用API调用限速 |
|
||||
| frequency | float64 | 1s内能调用API的次数 |
|
||||
| bucket_size | int | 令牌桶的大小，默认为1，修改此值可允许一定程度内连续调用api |
|
||||
| post_message_format | string | 上报信息类型 |
|
||||
| ignore_invalid_cqcode| bool | 是否忽略错误的CQ码 |
|
||||
| force_fragmented | bool | 是否强制分片发送群长消息 |
|
||||
| heartbeat_interval | int64 | 心跳间隔时间，单位秒，若0则关闭心跳 |
|
||||
| heartbeat_interval | int64 | 心跳间隔时间，单位秒。小于0则关闭心跳，等于0使用默认值(5秒) |
|
||||
| http_config | object | HTTP API配置 |
|
||||
| ws_config | object | Websocket API 配置 |
|
||||
| ws_reverse_servers | object[] | 反向 Websocket API 配置 |
|
||||
@ -82,3 +90,28 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
|
||||
> 注2: 分片发送为原酷Q发送长消息的老方案, 发送速度更优/兼容性更好，但在有发言频率限制的群里，可能无法发送。关闭后将优先使用新方案, 能发送更长的消息, 但发送速度更慢，在部分老客户端将无法解析.
|
||||
|
||||
> 注3：关闭心跳服务可能引起断线，请谨慎关闭
|
||||
|
||||
## 设备信息
|
||||
|
||||
默认生成的设备信息如下所示:
|
||||
|
||||
``` json
|
||||
{
|
||||
"protocol": 0,
|
||||
"display": "xxx",
|
||||
"finger_print": "xxx",
|
||||
"boot_id": "xxx",
|
||||
"proc_version": "xxx",
|
||||
"imei": "xxx"
|
||||
}
|
||||
```
|
||||
|
||||
在大部分情况下 我们只需要关心 `protocol` 字段:
|
||||
|
||||
| 值 | 类型 | 限制 |
|
||||
| ---- | ------------- | ----------------------------------------------------- |
|
||||
| 0 | Android Pad | 无法接收 `group_notify` 事件、无法接收口令红包 |
|
||||
| 1 | Android Phone | 无 |
|
||||
| 2 | Android Watch | 除了 `Android Pad` 有的限制外还包括: 无法接收撤回消息 |
|
||||
|
||||
> 注意, 根据协议的不同, 各类消息有所限制
|
||||
@ -18,6 +18,36 @@ Type : `reply`
|
||||
|
||||
示例: `[CQ:reply,id=123456]`
|
||||
|
||||
### 红包
|
||||
|
||||
Type: `redbag`
|
||||
|
||||
范围: **接收**
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ----------- |
|
||||
| title | string | 祝福语/口令 |
|
||||
|
||||
示例: `[CQ:redbag,title=恭喜发财]`
|
||||
|
||||
### 戳一戳
|
||||
|
||||
> 注意：发送戳一戳消息无法撤回，返回的 `message id` 恒定为 `0`
|
||||
|
||||
Type: `poke`
|
||||
|
||||
范围: **发送(仅群聊)**
|
||||
|
||||
参数:
|
||||
|
||||
| 参数名 | 类型 | 说明 |
|
||||
| ------ | ------ | ----------- |
|
||||
| qq | int64 | 需要戳的成员 |
|
||||
|
||||
示例: `[CQ:poke,qq=123456]`
|
||||
|
||||
### 合并转发
|
||||
|
||||
Type: `forward`
|
||||
@ -362,3 +392,47 @@ Type: `cardimage`
|
||||
| `user_id` | int64 | | 好友id |
|
||||
| `message_id` | int64 | | 被撤回的消息id |
|
||||
|
||||
#### 群内戳一戳
|
||||
|
||||
> 注意：此事件无法在平板和手表协议上触发
|
||||
|
||||
**上报数据**
|
||||
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------------- | ------ | -------------- | -------------- |
|
||||
| `post_type` | string | `notice` | 上报类型 |
|
||||
| `notice_type` | string | `notify` | 消息类型 |
|
||||
| `group_id` | int64 | | 群号 |
|
||||
| `sub_type` | string | `poke` | 提示类型 |
|
||||
| `user_id` | int64 | | 发送者id |
|
||||
| `target_id` | int64 | | 被戳者id |
|
||||
|
||||
#### 群红包运气王提示
|
||||
|
||||
> 注意：此事件无法在平板和手表协议上触发
|
||||
|
||||
**上报数据**
|
||||
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------------- | ------ | -------------- | -------------- |
|
||||
| `post_type` | string | `notice` | 上报类型 |
|
||||
| `notice_type` | string | `notify` | 消息类型 |
|
||||
| `group_id` | int64 | | 群号 |
|
||||
| `sub_type` | string | `lucky_king` | 提示类型 |
|
||||
| `user_id` | int64 | | 红包发送者id |
|
||||
| `target_id` | int64 | | 运气王id |
|
||||
|
||||
#### 群成员荣誉变更提示
|
||||
|
||||
> 注意：此事件无法在平板和手表协议上触发
|
||||
|
||||
**上报数据**
|
||||
|
||||
| 字段 | 类型 | 可能的值 | 说明 |
|
||||
| ------------- | ------ | -------------- | -------------- |
|
||||
| `post_type` | string | `notice` | 上报类型 |
|
||||
| `notice_type` | string | `notify` | 消息类型 |
|
||||
| `group_id` | int64 | | 群号 |
|
||||
| `sub_type` | string | `honor` | 提示类型 |
|
||||
| `user_id` | int64 | | 成员id |
|
||||
| `honor_type` | string | `talkative:龙王` `performer:群聊之火` `emotion:快乐源泉` | 荣誉类型 |
|
||||
@ -7,6 +7,7 @@ go-cqhttp 默认生成的文件树如下所示:
|
||||
├── go-cqhttp
|
||||
├── config.json
|
||||
├── device.json
|
||||
├── servers.bin
|
||||
├── logs
|
||||
│ └── xx-xx-xx.log
|
||||
└── data
|
||||
@ -20,6 +21,7 @@ go-cqhttp 默认生成的文件树如下所示:
|
||||
| go-cqhttp | go-cqhttp可执行文件 |
|
||||
| config.json | 运行配置文件 |
|
||||
| device.json | 虚拟设备配置文件 |
|
||||
| servers.bin | 储存QQ服务器地址 |
|
||||
| logs | 日志存放目录 |
|
||||
| data | 数据目录 |
|
||||
| data/images | 图片缓存目录 |
|
||||
|
||||
@ -21,6 +21,11 @@ type JsonConfig struct {
|
||||
ReLoginDelay int `json:"relogin_delay"`
|
||||
MaxReloginTimes uint `json:"max_relogin_times"`
|
||||
} `json:"relogin"`
|
||||
RateLimit struct {
|
||||
Enabled bool `json:"enabled"`
|
||||
Frequency float64 `json:"frequency"`
|
||||
BucketSize int `json:"bucket_size"`
|
||||
} `json:"_rate_limit"`
|
||||
IgnoreInvalidCQCode bool `json:"ignore_invalid_cqcode"`
|
||||
ForceFragmented bool `json:"force_fragmented"`
|
||||
HeartbeatInterval time.Duration `json:"heartbeat_interval"`
|
||||
@ -85,6 +90,15 @@ func DefaultConfig() *JsonConfig {
|
||||
ReLoginDelay: 3,
|
||||
MaxReloginTimes: 0,
|
||||
},
|
||||
RateLimit: struct {
|
||||
Enabled bool `json:"enabled"`
|
||||
Frequency float64 `json:"frequency"`
|
||||
BucketSize int `json:"bucket_size"`
|
||||
}{
|
||||
Enabled: false,
|
||||
Frequency: 1,
|
||||
BucketSize: 1,
|
||||
},
|
||||
PostMessageFormat: "string",
|
||||
ForceFragmented: true,
|
||||
HttpConfig: &GoCQHttpConfig{
|
||||
|
||||
@ -6,7 +6,6 @@ import (
|
||||
"io/ioutil"
|
||||
"regexp"
|
||||
"strings"
|
||||
"sync"
|
||||
)
|
||||
|
||||
type Filter interface {
|
||||
@ -14,7 +13,7 @@ type Filter interface {
|
||||
}
|
||||
|
||||
type OperationNode struct {
|
||||
key string
|
||||
key string
|
||||
filter Filter
|
||||
}
|
||||
|
||||
@ -24,15 +23,14 @@ type NotOperator struct {
|
||||
|
||||
func notOperatorConstruct(argument gjson.Result) *NotOperator {
|
||||
if !argument.IsObject() {
|
||||
log.Error("the argument of 'not' operator must be an object")
|
||||
panic("the argument of 'not' operator must be an object")
|
||||
}
|
||||
op := new(NotOperator)
|
||||
op.operand_ = GetOperatorFactory().Generate("and", argument)
|
||||
op.operand_ = Generate("and", argument)
|
||||
return op
|
||||
}
|
||||
|
||||
func (notOperator NotOperator) Eval(payload gjson.Result) bool {
|
||||
log.Debug("not " + payload.Str)
|
||||
return !(notOperator.operand_).Eval(payload)
|
||||
}
|
||||
|
||||
@ -42,7 +40,7 @@ type AndOperator struct {
|
||||
|
||||
func andOperatorConstruct(argument gjson.Result) *AndOperator {
|
||||
if !argument.IsObject() {
|
||||
log.Error("the argument of 'and' operator must be an object")
|
||||
panic("the argument of 'and' operator must be an object")
|
||||
}
|
||||
op := new(AndOperator)
|
||||
argument.ForEach(func(key, value gjson.Result) bool {
|
||||
@ -52,19 +50,19 @@ func andOperatorConstruct(argument gjson.Result) *AndOperator {
|
||||
// "bar": "baz"
|
||||
// }
|
||||
opKey := key.Str[1:]
|
||||
op.operands = append(op.operands, OperationNode{"", GetOperatorFactory().Generate(opKey, value)})
|
||||
op.operands = append(op.operands, OperationNode{"", Generate(opKey, value)})
|
||||
} else if value.IsObject() {
|
||||
// is an normal key with an object as the value
|
||||
// "foo": {
|
||||
// ".bar": "baz"
|
||||
// }
|
||||
opKey := key.Str
|
||||
op.operands = append(op.operands, OperationNode{opKey, GetOperatorFactory().Generate("and", value)})
|
||||
opKey := key.String()
|
||||
op.operands = append(op.operands, OperationNode{opKey, Generate("and", value)})
|
||||
} else {
|
||||
// is an normal key with a non-object as the value
|
||||
// "foo": "bar"
|
||||
opKey := key.Str
|
||||
op.operands = append(op.operands, OperationNode{opKey, GetOperatorFactory().Generate("eq", value)})
|
||||
opKey := key.String()
|
||||
op.operands = append(op.operands, OperationNode{opKey, Generate("eq", value)})
|
||||
}
|
||||
return true
|
||||
})
|
||||
@ -72,7 +70,6 @@ func andOperatorConstruct(argument gjson.Result) *AndOperator {
|
||||
}
|
||||
|
||||
func (andOperator *AndOperator) Eval(payload gjson.Result) bool {
|
||||
log.Debug("and " + payload.Str)
|
||||
res := true
|
||||
for _, operand := range andOperator.operands {
|
||||
|
||||
@ -98,19 +95,18 @@ type OrOperator struct {
|
||||
|
||||
func orOperatorConstruct(argument gjson.Result) *OrOperator {
|
||||
if !argument.IsArray() {
|
||||
log.Error("the argument of 'or' operator must be an array")
|
||||
panic("the argument of 'or' operator must be an array")
|
||||
}
|
||||
op := new(OrOperator)
|
||||
argument.ForEach(func(_, value gjson.Result) bool {
|
||||
op.operands = append(op.operands, GetOperatorFactory().Generate("and", value))
|
||||
op.operands = append(op.operands, Generate("and", value))
|
||||
return true
|
||||
})
|
||||
return op
|
||||
}
|
||||
|
||||
func (orOperator OrOperator) Eval(payload gjson.Result) bool {
|
||||
log.Debug("or "+ payload.Str)
|
||||
res:= false
|
||||
res := false
|
||||
for _, operand := range orOperator.operands {
|
||||
res = res || operand.Eval(payload)
|
||||
|
||||
@ -132,8 +128,7 @@ func equalOperatorConstruct(argument gjson.Result) *EqualOperator {
|
||||
}
|
||||
|
||||
func (equalOperator EqualOperator) Eval(payload gjson.Result) bool {
|
||||
log.Debug("eq "+ payload.Str + "==" + equalOperator.value.Str)
|
||||
return payload.Str == equalOperator.value.Str
|
||||
return payload.String() == equalOperator.value.String()
|
||||
}
|
||||
|
||||
type NotEqualOperator struct {
|
||||
@ -147,18 +142,16 @@ func notEqualOperatorConstruct(argument gjson.Result) *NotEqualOperator {
|
||||
}
|
||||
|
||||
func (notEqualOperator NotEqualOperator) Eval(payload gjson.Result) bool {
|
||||
log.Debug("neq " + payload.Str)
|
||||
return !(payload.Str == notEqualOperator.value.Str)
|
||||
return !(payload.String() == notEqualOperator.value.String())
|
||||
}
|
||||
|
||||
|
||||
type InOperator struct {
|
||||
operand gjson.Result
|
||||
}
|
||||
|
||||
func inOperatorConstruct(argument gjson.Result) *InOperator {
|
||||
if argument.IsObject() {
|
||||
log.Error("the argument of 'in' operator must be an array or a string")
|
||||
panic("the argument of 'in' operator must be an array or a string")
|
||||
}
|
||||
op := new(InOperator)
|
||||
op.operand = argument
|
||||
@ -166,16 +159,15 @@ func inOperatorConstruct(argument gjson.Result) *InOperator {
|
||||
}
|
||||
|
||||
func (inOperator InOperator) Eval(payload gjson.Result) bool {
|
||||
log.Debug("in " + payload.Str)
|
||||
if inOperator.operand.IsArray() {
|
||||
res := false
|
||||
inOperator.operand.ForEach(func(key, value gjson.Result) bool {
|
||||
res = res || value.Str == payload.Str
|
||||
res = res || value.String() == payload.String()
|
||||
return true
|
||||
})
|
||||
return res
|
||||
}
|
||||
return strings.Contains(inOperator.operand.Str, payload.Str)
|
||||
return strings.Contains(inOperator.operand.String(), payload.String())
|
||||
}
|
||||
|
||||
type ContainsOperator struct {
|
||||
@ -184,15 +176,14 @@ type ContainsOperator struct {
|
||||
|
||||
func containsOperatorConstruct(argument gjson.Result) *ContainsOperator {
|
||||
if argument.IsArray() || argument.IsObject() {
|
||||
log.Error("the argument of 'contains' operator must be a string")
|
||||
panic("the argument of 'contains' operator must be a string")
|
||||
}
|
||||
op := new(ContainsOperator)
|
||||
op.operand = argument.Str
|
||||
op.operand = argument.String()
|
||||
return op
|
||||
}
|
||||
|
||||
func (containsOperator ContainsOperator) Eval(payload gjson.Result) bool {
|
||||
log.Debug("contains "+ payload.Str)
|
||||
if payload.IsObject() || payload.IsArray() {
|
||||
return false
|
||||
}
|
||||
@ -205,29 +196,19 @@ type RegexOperator struct {
|
||||
|
||||
func regexOperatorConstruct(argument gjson.Result) *RegexOperator {
|
||||
if argument.IsArray() || argument.IsObject() {
|
||||
log.Error("the argument of 'regex' operator must be a string")
|
||||
panic("the argument of 'regex' operator must be a string")
|
||||
}
|
||||
op := new(RegexOperator)
|
||||
op.regex = argument.Str
|
||||
op.regex = argument.String()
|
||||
return op
|
||||
}
|
||||
|
||||
func (containsOperator RegexOperator) Eval(payload gjson.Result) bool {
|
||||
log.Debug("regex " + payload.Str)
|
||||
matched, _ := regexp.MatchString(containsOperator.regex, payload.Str)
|
||||
matched, _ := regexp.MatchString(containsOperator.regex, payload.String())
|
||||
return matched
|
||||
}
|
||||
// 单例工厂
|
||||
type operatorFactory struct{
|
||||
}
|
||||
|
||||
var instance *operatorFactory = &operatorFactory{}
|
||||
|
||||
func GetOperatorFactory() *operatorFactory {
|
||||
return instance
|
||||
}
|
||||
|
||||
func (o operatorFactory) Generate(opName string, argument gjson.Result) Filter {
|
||||
func Generate(opName string, argument gjson.Result) Filter {
|
||||
switch opName {
|
||||
case "not":
|
||||
return notOperatorConstruct(argument)
|
||||
@ -246,22 +227,25 @@ func (o operatorFactory) Generate(opName string, argument gjson.Result) Filter {
|
||||
case "regex":
|
||||
return regexOperatorConstruct(argument)
|
||||
default:
|
||||
log.Warnf("the operator '%s' is not supported", opName)
|
||||
return nil
|
||||
panic("the operator " + opName + " is not supported")
|
||||
}
|
||||
}
|
||||
|
||||
var filter = new(Filter)
|
||||
var once sync.Once // 过滤器单例模式
|
||||
var EventFilter = new(Filter)
|
||||
|
||||
func GetFilter() *Filter {
|
||||
once.Do(func() {
|
||||
f, err := ioutil.ReadFile("filter.json")
|
||||
if err != nil {
|
||||
filter = nil
|
||||
func BootFilter() {
|
||||
defer func() {
|
||||
if e := recover(); e != nil {
|
||||
log.Warnf("事件过滤器启动失败: %v", e)
|
||||
EventFilter = nil
|
||||
} else {
|
||||
*filter = GetOperatorFactory().Generate("and", gjson.ParseBytes(f))
|
||||
log.Info("事件过滤器启动成功.")
|
||||
}
|
||||
})
|
||||
return filter
|
||||
}
|
||||
}()
|
||||
f, err := ioutil.ReadFile("filter.json")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
} else {
|
||||
*EventFilter = Generate("and", gjson.ParseBytes(f))
|
||||
}
|
||||
}
|
||||
|
||||
20
global/ratelimit.go
Normal file
20
global/ratelimit.go
Normal file
@ -0,0 +1,20 @@
|
||||
package global
|
||||
|
||||
import (
|
||||
"context"
|
||||
"golang.org/x/time/rate"
|
||||
)
|
||||
|
||||
var limiter *rate.Limiter
|
||||
var limitEnable = false
|
||||
|
||||
func RateLimit(ctx context.Context) {
|
||||
if limitEnable {
|
||||
_ = limiter.Wait(ctx)
|
||||
}
|
||||
}
|
||||
|
||||
func InitLimiter(r float64, b int) {
|
||||
limitEnable = true
|
||||
limiter = rate.NewLimiter(rate.Limit(r), b)
|
||||
}
|
||||
7
go.mod
7
go.mod
@ -3,7 +3,7 @@ module github.com/Mrs4s/go-cqhttp
|
||||
go 1.14
|
||||
|
||||
require (
|
||||
github.com/Mrs4s/MiraiGo v0.0.0-20200906025848-23750bb59124
|
||||
github.com/Mrs4s/MiraiGo v0.0.0-20200919153352-249af274638d
|
||||
github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
|
||||
github.com/gin-gonic/gin v1.6.3
|
||||
github.com/go-playground/validator/v10 v10.3.0 // indirect
|
||||
@ -12,7 +12,7 @@ require (
|
||||
github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
|
||||
github.com/jonboulle/clockwork v0.2.0 // indirect
|
||||
github.com/json-iterator/go v1.1.10 // indirect
|
||||
github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
|
||||
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
|
||||
github.com/lestrrat-go/strftime v1.0.3 // indirect
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||
github.com/modern-go/reflect2 v1.0.1 // indirect
|
||||
@ -25,6 +25,7 @@ require (
|
||||
github.com/xujiajun/nutsdb v0.5.0
|
||||
github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189
|
||||
golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect
|
||||
golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f // indirect
|
||||
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 // indirect
|
||||
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
|
||||
gopkg.in/yaml.v2 v2.3.0 // indirect
|
||||
)
|
||||
|
||||
36
go.sum
36
go.sum
@ -1,24 +1,23 @@
|
||||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/Mrs4s/MiraiGo v0.0.0-20200906025848-23750bb59124 h1:qqwuCK/U9wzVf4ZmlvXI2BC1+gBESNSUD5yNjTfoExQ=
|
||||
github.com/Mrs4s/MiraiGo v0.0.0-20200906025848-23750bb59124/go.mod h1:TVEPCV9iayaBPTDLNGO9kc734jXNT/sxbhqo4IYkvko=
|
||||
github.com/Mrs4s/MiraiGo v0.0.0-20200919083021-4013c077186d h1:LZ1pjJJ7sD/AOL8tvkTB9bPc0DiOErCNN+wWXUMyvX0=
|
||||
github.com/Mrs4s/MiraiGo v0.0.0-20200919083021-4013c077186d/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
|
||||
github.com/Mrs4s/MiraiGo v0.0.0-20200919153352-249af274638d h1:nGJSE9xQBeDiugBKKX0vUOq51MqlUEm/y2FMfZFH/w4=
|
||||
github.com/Mrs4s/MiraiGo v0.0.0-20200919153352-249af274638d/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
|
||||
github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
|
||||
github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
|
||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
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/fastly/go-utils v0.0.0-20180712184237-d95a45783239 h1:Ghm4eQYC0nEPnSJdVkTrXpu9KtoVCSo1hg7mtI7G9KU=
|
||||
github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239/go.mod h1:Gdwt2ce0yfBxPvZrHkprdPPTTS3N5rwmLE8T22KBXlw=
|
||||
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
|
||||
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
|
||||
github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
|
||||
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/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/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
|
||||
github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
|
||||
@ -26,7 +25,6 @@ github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTM
|
||||
github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
|
||||
github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
|
||||
github.com/go-playground/universal-translator v0.17.0/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.3.0 h1:nZU+7q+yJoFmwvNgv/LnPUkwPal62+b2xXj0AU1Es7o=
|
||||
github.com/go-playground/validator/v10 v10.3.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
|
||||
@ -34,7 +32,6 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU
|
||||
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.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
|
||||
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
|
||||
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
|
||||
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
|
||||
@ -48,22 +45,17 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
|
||||
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
|
||||
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
|
||||
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
|
||||
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||
github.com/guonaihong/gout v0.1.2 h1:TR2XCRopGgJdj231IayEoeavgbznFXzzzcZVdT/hG10=
|
||||
github.com/guonaihong/gout v0.1.2/go.mod h1:vXvv5Kxr70eM5wrp4F0+t9lnLWmq+YPW2GByll2f/EA=
|
||||
github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 h1:IPJ3dvxmJ4uczJe5YQdrYB16oTJlGSC/OyZDqUk9xX4=
|
||||
github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag=
|
||||
github.com/jonboulle/clockwork v0.2.0 h1:J2SLSdy7HgElq8ekSl2Mxh6vrRNFxqbXGenYH2I02Vs=
|
||||
github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
|
||||
github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||
github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
|
||||
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
|
||||
@ -71,27 +63,23 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv
|
||||
github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
|
||||
github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
|
||||
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
|
||||
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/file-rotatelogs v2.3.0+incompatible h1:4mNlp+/SvALIPFpbXV3kxNJJno9iKFWGxSDE13Kl66Q=
|
||||
github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
|
||||
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/strftime v1.0.3 h1:qqOPU7y+TM8Y803I8fG9c/DyKG3xH/xkng6keC1015Q=
|
||||
github.com/lestrrat-go/strftime v1.0.3/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
|
||||
github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
|
||||
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
|
||||
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
|
||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
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 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/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
|
||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
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/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo=
|
||||
@ -103,11 +91,9 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
|
||||
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
|
||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||
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/tebeka/strftime v0.1.5 h1:1NQKN1NiQgkqd/2moD6ySP/5CoZQsKa1d3ZhJ44Jpmg=
|
||||
github.com/tebeka/strftime v0.1.5/go.mod h1:29/OidkoWHdEKZqzyDLUyC+LmgDgdHo4WAFCDT7D/Ig=
|
||||
github.com/tidwall/gjson v1.6.1 h1:LRbvNuNuvAiISWg6gxLEFuCe72UKy5hDqhxW/8183ws=
|
||||
github.com/tidwall/gjson v1.6.1/go.mod h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0=
|
||||
@ -139,7 +125,6 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r
|
||||
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-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
|
||||
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200904194848-62affa334b73 h1:MXfv8rhZWmFeqX3GNZRsd6vOLoaCHjYEX3qkRo3YBUA=
|
||||
golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||
@ -155,16 +140,17 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
|
||||
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f h1:Fqb3ao1hUmOR3GkUOg/Y+BadLwykBIzs5q8Ez2SbHyc=
|
||||
golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 h1:W0lCpv29Hv0UaM1LXb9QlBHLNP8UFfcKjblhVCWftOM=
|
||||
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
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/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s=
|
||||
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/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-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
|
||||
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
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=
|
||||
@ -184,12 +170,10 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
|
||||
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||
google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
|
||||
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
|
||||
gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
|
||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
|
||||
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
|
||||
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
|
||||
59
main.go
59
main.go
@ -10,6 +10,7 @@ import (
|
||||
"image"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"net"
|
||||
"os"
|
||||
"os/signal"
|
||||
"path"
|
||||
@ -213,6 +214,17 @@ func main() {
|
||||
log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
|
||||
time.Sleep(time.Second * 5)
|
||||
log.Info("开始尝试登录并同步消息...")
|
||||
log.Infof("使用协议: %v", func() string {
|
||||
switch client.SystemDeviceInfo.Protocol {
|
||||
case client.AndroidPad:
|
||||
return "Android Pad"
|
||||
case client.AndroidPhone:
|
||||
return "Android Phone"
|
||||
case client.AndroidWatch:
|
||||
return "Android Watch"
|
||||
}
|
||||
return "未知"
|
||||
}())
|
||||
cli := client.NewClient(conf.Uin, conf.Password)
|
||||
cli.OnLog(func(c *client.QQClient, e *client.LogEvent) {
|
||||
switch e.Type {
|
||||
@ -224,6 +236,48 @@ func main() {
|
||||
log.Debug("Protocol -> " + e.Message)
|
||||
}
|
||||
})
|
||||
cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) {
|
||||
log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. 地址信息已储存到 servers.bin 文件")
|
||||
_ = ioutil.WriteFile("servers.bin", binary.NewWriterF(func(w *binary.Writer) {
|
||||
w.WriteUInt16(func() (c uint16) {
|
||||
for _, s := range e.Servers {
|
||||
if !strings.Contains(s.Server, "com") {
|
||||
c++
|
||||
}
|
||||
}
|
||||
return
|
||||
}())
|
||||
for _, s := range e.Servers {
|
||||
if !strings.Contains(s.Server, "com") {
|
||||
w.WriteString(s.Server)
|
||||
w.WriteUInt16(uint16(s.Port))
|
||||
}
|
||||
}
|
||||
}), 0644)
|
||||
})
|
||||
if global.PathExists("servers.bin") {
|
||||
if data, err := ioutil.ReadFile("servers.bin"); err == nil {
|
||||
func() {
|
||||
defer func() {
|
||||
if pan := recover(); pan != nil {
|
||||
log.Error("读取服务器地址时出现错误: %v", pan)
|
||||
}
|
||||
}()
|
||||
r := binary.NewReader(data)
|
||||
var addr []*net.TCPAddr
|
||||
l := r.ReadUInt16()
|
||||
for i := 0; i < int(l); i++ {
|
||||
addr = append(addr, &net.TCPAddr{
|
||||
IP: net.ParseIP(r.ReadString()),
|
||||
Port: int(r.ReadUInt16()),
|
||||
})
|
||||
}
|
||||
if len(addr) > 0 {
|
||||
cli.SetCustomServer(addr)
|
||||
}
|
||||
}()
|
||||
}
|
||||
}
|
||||
rsp, err := cli.Login()
|
||||
for {
|
||||
global.Check(err)
|
||||
@ -263,6 +317,11 @@ func main() {
|
||||
} else {
|
||||
coolq.SetMessageFormat(conf.PostMessageFormat)
|
||||
}
|
||||
if conf.RateLimit.Enabled {
|
||||
global.InitLimiter(conf.RateLimit.Frequency, conf.RateLimit.BucketSize)
|
||||
}
|
||||
log.Info("正在加载事件过滤器.")
|
||||
global.BootFilter()
|
||||
coolq.IgnoreInvalidCQCode = conf.IgnoreInvalidCQCode
|
||||
coolq.ForceFragmented = conf.ForceFragmented
|
||||
if conf.HttpConfig != nil && conf.HttpConfig.Enabled {
|
||||
|
||||
226
server/http.go
226
server/http.go
@ -1,6 +1,7 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/hmac"
|
||||
"crypto/sha1"
|
||||
"encoding/hex"
|
||||
@ -74,93 +75,7 @@ func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
|
||||
})
|
||||
}
|
||||
|
||||
s.engine.Any("/get_login_info", s.GetLoginInfo)
|
||||
s.engine.Any("/get_login_info_async", s.GetLoginInfo)
|
||||
|
||||
s.engine.Any("/get_friend_list", s.GetFriendList)
|
||||
s.engine.Any("/get_friend_list_async", s.GetFriendList)
|
||||
|
||||
s.engine.Any("/get_group_list", s.GetGroupList)
|
||||
s.engine.Any("/get_group_list_async", s.GetGroupList)
|
||||
|
||||
s.engine.Any("/get_group_info", s.GetGroupInfo)
|
||||
s.engine.Any("/get_group_info_async", s.GetGroupInfo)
|
||||
|
||||
s.engine.Any("/get_group_member_list", s.GetGroupMemberList)
|
||||
s.engine.Any("/get_group_member_list_async", s.GetGroupMemberList)
|
||||
|
||||
s.engine.Any("/get_group_member_info", s.GetGroupMemberInfo)
|
||||
s.engine.Any("/get_group_member_info_async", s.GetGroupMemberInfo)
|
||||
|
||||
s.engine.Any("/send_msg", s.SendMessage)
|
||||
s.engine.Any("/send_msg_async", s.SendMessage)
|
||||
|
||||
s.engine.Any("/send_private_msg", s.SendPrivateMessage)
|
||||
s.engine.Any("/send_private_msg_async", s.SendPrivateMessage)
|
||||
|
||||
s.engine.Any("/send_group_msg", s.SendGroupMessage)
|
||||
s.engine.Any("/send_group_msg_async", s.SendGroupMessage)
|
||||
|
||||
s.engine.Any("/send_group_forward_msg", s.SendGroupForwardMessage)
|
||||
s.engine.Any("/send_group_forward_msg_async", s.SendGroupForwardMessage)
|
||||
|
||||
s.engine.Any("/delete_msg", s.DeleteMessage)
|
||||
s.engine.Any("/delete_msg_async", s.DeleteMessage)
|
||||
|
||||
s.engine.Any("/set_friend_add_request", s.ProcessFriendRequest)
|
||||
s.engine.Any("/set_friend_add_request_async", s.ProcessFriendRequest)
|
||||
|
||||
s.engine.Any("/set_group_add_request", s.ProcessGroupRequest)
|
||||
s.engine.Any("/set_group_add_request_async", s.ProcessGroupRequest)
|
||||
|
||||
s.engine.Any("/set_group_card", s.SetGroupCard)
|
||||
s.engine.Any("/set_group_card_async", s.SetGroupCard)
|
||||
|
||||
s.engine.Any("/set_group_special_title", s.SetSpecialTitle)
|
||||
s.engine.Any("/set_group_special_title_async", s.SetSpecialTitle)
|
||||
|
||||
s.engine.Any("/set_group_kick", s.SetGroupKick)
|
||||
s.engine.Any("/set_group_kick_async", s.SetGroupKick)
|
||||
|
||||
s.engine.Any("/set_group_ban", s.SetGroupBan)
|
||||
s.engine.Any("/set_group_ban_async", s.SetGroupBan)
|
||||
|
||||
s.engine.Any("/set_group_whole_ban", s.SetWholeBan)
|
||||
s.engine.Any("/set_group_whole_ban_async", s.SetWholeBan)
|
||||
|
||||
s.engine.Any("/set_group_name", s.SetGroupName)
|
||||
s.engine.Any("/set_group_name_async", s.SetGroupName)
|
||||
|
||||
s.engine.Any("/_send_group_notice", s.SendGroupNotice)
|
||||
s.engine.Any("/_send_group_notice_async", s.SendGroupNotice)
|
||||
|
||||
s.engine.Any("/set_group_leave", s.SetGroupLeave)
|
||||
s.engine.Any("/set_group_leave_async", s.SetGroupLeave)
|
||||
|
||||
s.engine.Any("/get_image", s.GetImage)
|
||||
|
||||
s.engine.Any("/get_forward_msg", s.GetForwardMessage)
|
||||
|
||||
s.engine.Any("/get_group_msg", s.GetGroupMessage)
|
||||
|
||||
s.engine.Any("/get_group_honor_info", s.GetGroupHonorInfo)
|
||||
|
||||
s.engine.Any("/can_send_image", s.CanSendImage)
|
||||
s.engine.Any("/can_send_image_async", s.CanSendImage)
|
||||
|
||||
s.engine.Any("/can_send_record", s.CanSendRecord)
|
||||
s.engine.Any("/can_send_record_async", s.CanSendRecord)
|
||||
|
||||
s.engine.Any("/get_status", s.GetStatus)
|
||||
s.engine.Any("/get_status_async", s.GetStatus)
|
||||
|
||||
s.engine.Any("/get_version_info", s.GetVersionInfo)
|
||||
s.engine.Any("/get_version_info_async", s.GetVersionInfo)
|
||||
|
||||
s.engine.Any("/_get_vip_info", s.GetVipInfo)
|
||||
s.engine.Any("/_get_vip_info_async", s.GetVipInfo)
|
||||
|
||||
s.engine.Any("/.handle_quick_operation", s.HandleQuickOperation)
|
||||
s.engine.Any("/:action", s.HandleActions)
|
||||
|
||||
go func() {
|
||||
log.Infof("CQ HTTP 服务器已启动: %v", addr)
|
||||
@ -213,6 +128,17 @@ func (c *httpClient) onBotPushEvent(m coolq.MSG) {
|
||||
}
|
||||
}
|
||||
|
||||
func (s *httpServer) HandleActions(c *gin.Context) {
|
||||
global.RateLimit(context.Background())
|
||||
action := strings.ReplaceAll(c.Param("action"), "_async", "")
|
||||
log.Debugf("HTTPServer接收到API调用: %v", action)
|
||||
if f, ok := httpApi[action]; ok {
|
||||
f(s, c)
|
||||
} else {
|
||||
c.JSON(200, coolq.Failed(404))
|
||||
}
|
||||
}
|
||||
|
||||
func (s *httpServer) GetLoginInfo(c *gin.Context) {
|
||||
c.JSON(200, s.bot.CQGetLoginInfo())
|
||||
}
|
||||
@ -233,14 +159,14 @@ func (s *httpServer) GetGroupInfo(c *gin.Context) {
|
||||
|
||||
func (s *httpServer) GetGroupMemberList(c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQGetGroupMemberList(gid))
|
||||
nc := getParamOrDefault(c, "no_cache", "false")
|
||||
c.JSON(200, s.bot.CQGetGroupMemberList(gid, nc == "true"))
|
||||
}
|
||||
|
||||
func (s *httpServer) GetGroupMemberInfo(c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
|
||||
nc := getParamOrDefault(c, "no_cache", "false")
|
||||
c.JSON(200, s.bot.CQGetGroupMemberInfo(gid, uid, nc == "true"))
|
||||
c.JSON(200, s.bot.CQGetGroupMemberInfo(gid, uid))
|
||||
}
|
||||
|
||||
func (s *httpServer) SendMessage(c *gin.Context) {
|
||||
@ -356,6 +282,12 @@ func (s *httpServer) SetGroupName(c *gin.Context) {
|
||||
c.JSON(200, s.bot.CQSetGroupName(gid, getParam(c, "group_name")))
|
||||
}
|
||||
|
||||
func (s *httpServer) SetGroupAdmin(c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQSetGroupAdmin(gid, uid, getParamOrDefault(c, "enable", "true") == "true"))
|
||||
}
|
||||
|
||||
func (s *httpServer) SendGroupNotice(c *gin.Context) {
|
||||
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQSetGroupMemo(gid, getParam(c, "content")))
|
||||
@ -392,11 +324,20 @@ func (s *httpServer) GetVersionInfo(c *gin.Context) {
|
||||
c.JSON(200, s.bot.CQGetVersionInfo())
|
||||
}
|
||||
|
||||
func (s *httpServer) ReloadEventFilter(c *gin.Context) {
|
||||
c.JSON(200, s.bot.CQReloadEventFilter())
|
||||
}
|
||||
|
||||
func (s *httpServer) GetVipInfo(c *gin.Context) {
|
||||
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQGetVipInfo(uid))
|
||||
}
|
||||
|
||||
func (s *httpServer) GetStrangerInfo(c *gin.Context) {
|
||||
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
|
||||
c.JSON(200, s.bot.CQGetStrangerInfo(uid))
|
||||
}
|
||||
|
||||
func (s *httpServer) HandleQuickOperation(c *gin.Context) {
|
||||
if c.Request.Method != "POST" {
|
||||
c.AbortWithStatus(404)
|
||||
@ -455,3 +396,108 @@ func getParamWithType(c *gin.Context, k string) (string, gjson.Type) {
|
||||
}
|
||||
return "", gjson.Null
|
||||
}
|
||||
|
||||
var httpApi = map[string]func(s *httpServer, c *gin.Context){
|
||||
"get_login_info": func(s *httpServer, c *gin.Context) {
|
||||
s.GetLoginInfo(c)
|
||||
},
|
||||
"get_friend_list": func(s *httpServer, c *gin.Context) {
|
||||
s.GetFriendList(c)
|
||||
},
|
||||
"get_group_list": func(s *httpServer, c *gin.Context) {
|
||||
s.GetGroupList(c)
|
||||
},
|
||||
"get_group_info": func(s *httpServer, c *gin.Context) {
|
||||
s.GetGroupInfo(c)
|
||||
},
|
||||
"get_group_member_list": func(s *httpServer, c *gin.Context) {
|
||||
s.GetGroupMemberList(c)
|
||||
},
|
||||
"get_group_member_info": func(s *httpServer, c *gin.Context) {
|
||||
s.GetGroupMemberInfo(c)
|
||||
},
|
||||
"send_msg": func(s *httpServer, c *gin.Context) {
|
||||
s.SendMessage(c)
|
||||
},
|
||||
"send_group_msg": func(s *httpServer, c *gin.Context) {
|
||||
s.SendGroupMessage(c)
|
||||
},
|
||||
"send_group_forward_msg": func(s *httpServer, c *gin.Context) {
|
||||
s.SendGroupForwardMessage(c)
|
||||
},
|
||||
"send_private_msg": func(s *httpServer, c *gin.Context) {
|
||||
s.SendPrivateMessage(c)
|
||||
},
|
||||
"delete_msg": func(s *httpServer, c *gin.Context) {
|
||||
s.DeleteMessage(c)
|
||||
},
|
||||
"set_friend_add_request": func(s *httpServer, c *gin.Context) {
|
||||
s.ProcessFriendRequest(c)
|
||||
},
|
||||
"set_group_add_request": func(s *httpServer, c *gin.Context) {
|
||||
s.ProcessGroupRequest(c)
|
||||
},
|
||||
"set_group_card": func(s *httpServer, c *gin.Context) {
|
||||
s.SetGroupCard(c)
|
||||
},
|
||||
"set_group_special_title": func(s *httpServer, c *gin.Context) {
|
||||
s.SetSpecialTitle(c)
|
||||
},
|
||||
"set_group_kick": func(s *httpServer, c *gin.Context) {
|
||||
s.SetGroupKick(c)
|
||||
},
|
||||
"set_group_ban": func(s *httpServer, c *gin.Context) {
|
||||
s.SetGroupBan(c)
|
||||
},
|
||||
"set_group_whole_ban": func(s *httpServer, c *gin.Context) {
|
||||
s.SetWholeBan(c)
|
||||
},
|
||||
"set_group_name": func(s *httpServer, c *gin.Context) {
|
||||
s.SetGroupName(c)
|
||||
},
|
||||
"set_group_admin": func(s *httpServer, c *gin.Context) {
|
||||
s.SetGroupAdmin(c)
|
||||
},
|
||||
"_send_group_notice": func(s *httpServer, c *gin.Context) {
|
||||
s.SendGroupNotice(c)
|
||||
},
|
||||
"set_group_leave": func(s *httpServer, c *gin.Context) {
|
||||
s.SetGroupLeave(c)
|
||||
},
|
||||
"get_image": func(s *httpServer, c *gin.Context) {
|
||||
s.GetImage(c)
|
||||
},
|
||||
"get_forward_msg": func(s *httpServer, c *gin.Context) {
|
||||
s.GetForwardMessage(c)
|
||||
},
|
||||
"get_group_msg": func(s *httpServer, c *gin.Context) {
|
||||
s.GetGroupMessage(c)
|
||||
},
|
||||
"get_group_honor_info": func(s *httpServer, c *gin.Context) {
|
||||
s.GetGroupHonorInfo(c)
|
||||
},
|
||||
"can_send_image": func(s *httpServer, c *gin.Context) {
|
||||
s.CanSendImage(c)
|
||||
},
|
||||
"can_send_record": func(s *httpServer, c *gin.Context) {
|
||||
s.CanSendRecord(c)
|
||||
},
|
||||
"get_status": func(s *httpServer, c *gin.Context) {
|
||||
s.GetStatus(c)
|
||||
},
|
||||
"get_version_info": func(s *httpServer, c *gin.Context) {
|
||||
s.GetVersionInfo(c)
|
||||
},
|
||||
"_get_vip_info": func(s *httpServer, c *gin.Context) {
|
||||
s.GetVipInfo(c)
|
||||
},
|
||||
"get_stranger_info": func(s *httpServer, c *gin.Context) {
|
||||
s.GetStrangerInfo(c)
|
||||
},
|
||||
"reload_event_filter": func(s *httpServer, c *gin.Context) {
|
||||
s.ReloadEventFilter(c)
|
||||
},
|
||||
".handle_quick_operation": func(s *httpServer, c *gin.Context) {
|
||||
s.HandleQuickOperation(c)
|
||||
},
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strconv"
|
||||
@ -222,20 +223,12 @@ func (c *websocketClient) onBotPushEvent(m coolq.MSG) {
|
||||
|
||||
func (s *websocketServer) event(w http.ResponseWriter, r *http.Request) {
|
||||
if s.token != "" {
|
||||
if auth := r.URL.Query().Get("access_token"); auth != s.token && auth != "" {
|
||||
log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
|
||||
w.WriteHeader(401)
|
||||
return
|
||||
} else if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) == 2 {
|
||||
if auth[1] != s.token {
|
||||
log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
|
||||
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 {
|
||||
log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr)
|
||||
w.WriteHeader(401)
|
||||
return
|
||||
}
|
||||
} else {
|
||||
log.Warnf("已拒绝 %v 的 Websocket 请求: 空Token或传入格式错误", r.RemoteAddr)
|
||||
w.WriteHeader(401)
|
||||
return
|
||||
}
|
||||
}
|
||||
c, err := upgrader.Upgrade(w, r, nil)
|
||||
@ -261,20 +254,12 @@ func (s *websocketServer) event(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
func (s *websocketServer) api(w http.ResponseWriter, r *http.Request) {
|
||||
if s.token != "" {
|
||||
if auth := r.URL.Query().Get("access_token"); auth != s.token && auth != "" {
|
||||
log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
|
||||
w.WriteHeader(401)
|
||||
return
|
||||
} else if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) == 2 {
|
||||
if auth[1] != s.token {
|
||||
log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
|
||||
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 {
|
||||
log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr)
|
||||
w.WriteHeader(401)
|
||||
return
|
||||
}
|
||||
} else {
|
||||
log.Warnf("已拒绝 %v 的 Websocket 请求: 空Token或传入格式错误", r.RemoteAddr)
|
||||
w.WriteHeader(401)
|
||||
return
|
||||
}
|
||||
}
|
||||
c, err := upgrader.Upgrade(w, r, nil)
|
||||
@ -289,20 +274,12 @@ func (s *websocketServer) api(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
func (s *websocketServer) any(w http.ResponseWriter, r *http.Request) {
|
||||
if s.token != "" {
|
||||
if auth := r.URL.Query().Get("access_token"); auth != s.token && auth != "" {
|
||||
log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
|
||||
w.WriteHeader(401)
|
||||
return
|
||||
} else if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) == 2 {
|
||||
if auth[1] != s.token {
|
||||
log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
|
||||
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 {
|
||||
log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr)
|
||||
w.WriteHeader(401)
|
||||
return
|
||||
}
|
||||
} else {
|
||||
log.Warnf("已拒绝 %v 的 Websocket 请求: 空Token或传入格式错误", r.RemoteAddr)
|
||||
w.WriteHeader(401)
|
||||
return
|
||||
}
|
||||
}
|
||||
c, err := upgrader.Upgrade(w, r, nil)
|
||||
@ -316,7 +293,6 @@ func (s *websocketServer) any(w http.ResponseWriter, r *http.Request) {
|
||||
c.Close()
|
||||
return
|
||||
}
|
||||
|
||||
log.Infof("接受 Websocket 连接: %v (/)", r.RemoteAddr)
|
||||
conn := &websocketConn{Conn: c}
|
||||
s.eventConn = append(s.eventConn, conn)
|
||||
@ -344,7 +320,7 @@ func (c *websocketConn) handleRequest(bot *coolq.CQBot, payload []byte) {
|
||||
c.Close()
|
||||
}
|
||||
}()
|
||||
|
||||
global.RateLimit(context.Background())
|
||||
j := gjson.ParseBytes(payload)
|
||||
t := strings.ReplaceAll(j.Get("action").Str, "_async", "")
|
||||
log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
|
||||
@ -397,12 +373,11 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
|
||||
return bot.CQGetGroupInfo(p.Get("group_id").Int())
|
||||
},
|
||||
"get_group_member_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQGetGroupMemberList(p.Get("group_id").Int())
|
||||
return bot.CQGetGroupMemberList(p.Get("group_id").Int(), p.Get("no_cache").Bool())
|
||||
},
|
||||
"get_group_member_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQGetGroupMemberInfo(
|
||||
p.Get("group_id").Int(), p.Get("user_id").Int(),
|
||||
p.Get("no_cache").Bool(),
|
||||
)
|
||||
},
|
||||
"send_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
@ -479,6 +454,14 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
|
||||
"set_group_name": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQSetGroupName(p.Get("group_id").Int(), p.Get("group_name").Str)
|
||||
},
|
||||
"set_group_admin": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQSetGroupAdmin(p.Get("group_id").Int(), p.Get("user_id").Int(), func() bool {
|
||||
if p.Get("enable").Exists() {
|
||||
return p.Get("enable").Bool()
|
||||
}
|
||||
return true
|
||||
}())
|
||||
},
|
||||
"_send_group_notice": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQSetGroupMemo(p.Get("group_id").Int(), p.Get("content").Str)
|
||||
},
|
||||
@ -503,6 +486,9 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
|
||||
"can_send_record": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQCanSendRecord()
|
||||
},
|
||||
"get_stranger_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQGetStrangerInfo(p.Get("user_id").Int())
|
||||
},
|
||||
"get_status": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQGetStatus()
|
||||
},
|
||||
@ -512,6 +498,9 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
|
||||
"_get_vip_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQGetVipInfo(p.Get("user_id").Int())
|
||||
},
|
||||
"reload_event_filter": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQReloadEventFilter()
|
||||
},
|
||||
".handle_quick_operation": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
|
||||
return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user