From 437a31a6b892eb125757ce95f810c008f4081959 Mon Sep 17 00:00:00 2001 From: cdle Date: Mon, 3 Jul 2023 19:12:43 +0800 Subject: [PATCH] x --- README.md | 6 +++ adapters/qq/main.go | 66 ++++++++++++------------- core/adapter.go | 112 +++++++++--------------------------------- core/node_response.go | 3 +- core/node_strings.go | 4 ++ 5 files changed, 69 insertions(+), 122 deletions(-) diff --git a/README.md b/README.md index fc6d9e2..afd6216 100644 --- a/README.md +++ b/README.md @@ -523,6 +523,12 @@ running(): boolean; //服务是否运行 uuid(): string; //生成uuid ``` +### 拓展 CQ 码命令 + +[CQ:delete,id=message_id] +[CQ:kick,user_id,chat_id,forever=true] +[CQ:ban,user_id,chat_id,duration=0] + ### 项目赞助 打开微信扫一扫，深入了解作者~ diff --git a/adapters/qq/main.go b/adapters/qq/main.go index e4b39d8..380ea54 100644 --- a/adapters/qq/main.go +++ b/adapters/qq/main.go @@ -152,39 +152,39 @@ func init() { adapter := &core.Factory{} adapter.Init("qq", botID, nil) defer adapter.Destroy() - adapter.SetGroupKick(func(uid string, gid string, reject_add_request bool) bool { - qqcon.WriteJSON(CallApi{ - Action: "set_group_kick", - Params: map[string]interface{}{ - "group_id": utils.Int(gid), - "user_id": utils.Int(uid), - "reject_add_request": reject_add_request, - }, - }) - return true - }) - adapter.SetGroupBan(func(uid string, gid string, duration int) bool { - qqcon.WriteJSON(CallApi{ - Action: "set_group_ban", - Params: map[string]interface{}{ - "group_id": utils.Int(gid), - "user_id": utils.Int(uid), - "duration": duration, - }, - }) - return true - }) - adapter.SetGroupUnban(func(uid string, gid string) bool { - qqcon.WriteJSON(CallApi{ - Action: "set_group_ban", - Params: map[string]interface{}{ - "group_id": utils.Int(gid), - "user_id": utils.Int(uid), - "duration": 1, - }, - }) - return true - }) + // adapter.SetGroupKick(func(uid string, gid string, reject_add_request bool) bool { + // qqcon.WriteJSON(CallApi{ + // Action: "set_group_kick", + // Params: map[string]interface{}{ + // "group_id": utils.Int(gid), + // "user_id": utils.Int(uid), + // "reject_add_request": reject_add_request, + // }, + // }) + // return true + // }) + // adapter.SetGroupBan(func(uid string, gid string, duration int) bool { + // qqcon.WriteJSON(CallApi{ + // Action: "set_group_ban", + // Params: map[string]interface{}{ + // "group_id": utils.Int(gid), + // "user_id": utils.Int(uid), + // "duration": duration, + // }, + // }) + // return true + // }) + // adapter.SetGroupUnban(func(uid string, gid string) bool { + // qqcon.WriteJSON(CallApi{ + // Action: "set_group_ban", + // Params: map[string]interface{}{ + // "group_id": utils.Int(gid), + // "user_id": utils.Int(uid), + // "duration": 1, + // }, + // }) + // return true + // }) adapter.SetReplyHandler(func(msg map[string]interface{}) string { if debug { logs.Debug("QQ发送消息：", string(utils.JsonMarshal(msg))) diff --git a/core/adapter.go b/core/adapter.go index 7f08f4b..446df95 100644 --- a/core/adapter.go +++ b/core/adapter.go @@ -47,27 +47,23 @@ type GMsgChan struct { } type Factory struct { - botid string - botplt string - uuid string - msgChan chan MsgChan - demo *CustomSender - reply func(map[string]interface{}) string - lm chan bool - nm int64 - recallMessage func(interface{}) bool - groupKick func(uid string, gid string, reject_add_request bool) bool - groupBan func(uid string, gid string, duration int) bool - groupUnban func(uid string, gid string) bool - isAdmin func(string) bool - vm *goja.Runtime - ctx context.Context - cancel context.CancelFunc - destroid bool - errorTimes int - Res *Response - umod bool //类似订阅号一对一被动消息模式 - gmsgChan sync.Map + botid string + botplt string + uuid string + msgChan chan MsgChan + demo *CustomSender + reply func(map[string]interface{}) string + lm chan bool + nm int64 + isAdmin func(string) bool + vm *goja.Runtime + ctx context.Context + cancel context.CancelFunc + destroid bool + errorTimes int + Res *Response + umod bool //类似订阅号一对一被动消息模式 + gmsgChan sync.Map } type Bot [2]string //botplt botid @@ -507,54 +503,6 @@ func (f *Factory) Send(function func(map[string]interface{}) string) { f.SetReplyHandler(function) } -func (f *Factory) SetRecallMessage(function func(interface{}) bool) { - f.recallMessage = func(i interface{}) bool { - defer func() { - err := recover() - if err != nil { - pluginConsole(f.uuid).Error("Sender(\""+f.botplt+"\").recall error:", err) - } - }() - return function(i) - } -} - -func (f *Factory) SetGroupKick(function func(uid string, gid string, reject_add_request bool) bool) { - f.groupKick = func(uid string, gid string, reject_add_request bool) bool { - defer func() { - err := recover() - if err != nil { - pluginConsole(f.uuid).Error("Sender(\""+f.botplt+"\").GroupKick error:", err) - } - }() - return function(uid, gid, reject_add_request) - } -} - -func (f *Factory) SetGroupBan(function func(uid string, gid string, duration int) bool) { - f.groupBan = func(uid string, gid string, duration int) bool { - defer func() { - err := recover() - if err != nil { - pluginConsole(f.uuid).Error("Sender(\""+f.botplt+"\").SetGroupBan error:", err) - } - }() - return function(uid, gid, duration) - } -} - -func (f *Factory) SetGroupUnban(function func(uid string, gid string) bool) { - f.groupUnban = func(uid string, gid string) bool { - defer func() { - err := recover() - if err != nil { - pluginConsole(f.uuid).Error("Sender(\""+f.botplt+"\").SetgroupUnban error:", err) - } - }() - return function(uid, gid) - } -} - func (f *Factory) SetIsAdmin(function func(string) bool) { f.isAdmin = func(uid string) bool { defer func() { @@ -576,7 +524,7 @@ func (f *Factory) Receive(wt interface{}) *CustomSender { h := false switch strings.ToLower(i) { case "content": - sender.details.Content = fmt.Sprint(props[i]) + sender.details.Content = strings.TrimSpace(fmt.Sprint(props[i])) h = true case "message_id", "messageId": sender.details.MessageID = utils.Itoa(props[i]) @@ -783,21 +731,18 @@ func (sender *CustomSender) Copy() common.Sender { } func (sender *CustomSender) RecallMessage(ps ...interface{}) error { - if sender.f.recallMessage == nil { - return nil - } for _, p := range ps { switch p := p.(type) { case string: - sender.f.recallMessage(p) + sender.Reply(mystr.BuildCQCode("delete", H{"id": p}, "")) case []string: for _, v := range p { - sender.f.recallMessage(v) + sender.Reply(mystr.BuildCQCode("delete", H{"id": v}, "")) } case [][]string: for _, v := range p { for _, v2 := range v { - sender.f.recallMessage(v2) + sender.Reply(mystr.BuildCQCode("delete", H{"id": v2}, "")) } } } @@ -806,24 +751,15 @@ func (sender *CustomSender) RecallMessage(ps ...interface{}) error { } func (sender *CustomSender) GroupKick(uid string, reject_add_request bool) { - if sender.f.groupKick == nil { - return - } - sender.f.groupKick(uid, sender.GetChatID(), reject_add_request) + sender.Reply(mystr.BuildCQCode("kick", H{"user_id": uid, "chat_id": sender.GetChatID(), "forever": reject_add_request}, "")) } func (sender *CustomSender) GroupBan(uid string, duration int) { - if sender.f.groupBan == nil { - return - } - sender.f.groupBan(uid, sender.GetChatID(), duration) + sender.Reply(mystr.BuildCQCode("ban", H{"user_id": uid, "chat_id": sender.GetChatID(), "duration": duration}, "")) } func (sender *CustomSender) GroupUnban(uid string) { - if sender.f.groupUnban == nil { - return - } - sender.f.groupUnban(uid, sender.GetChatID()) + sender.Reply(mystr.BuildCQCode("ban", H{"user_id": uid, "chat_id": sender.GetChatID(), "duration": 0}, "")) } func (sender *CustomSender) IsAdmin() bool { diff --git a/core/node_response.go b/core/node_response.go index 8e77b69..1b162bd 100644 --- a/core/node_response.go +++ b/core/node_response.go @@ -1,6 +1,7 @@ package core import ( + "errors" "io/ioutil" "net/http" "strings" @@ -26,7 +27,7 @@ func MakeResponseObject(vm *goja.Runtime, resp *http.Response, responseType stri var v interface{} err := json.Unmarshal(data, &v) if err != nil { ///// - return obj, err + return obj, errors.New("请求返回数据不是json格式：" + string(data)) } else { body = v } diff --git a/core/node_strings.go b/core/node_strings.go index 079391c..93b2d88 100644 --- a/core/node_strings.go +++ b/core/node_strings.go @@ -16,10 +16,14 @@ import ( "github.com/cdle/sillyplus/utils" ) +var mystr = &Strings{} + type Strings struct { UUID string } +type H map[string]interface{} + func (sender *Strings) Diff(a, b []interface{}) []interface{} { m := make(map[interface{}]bool) c := make([]interface{}, 0)