Merge pull request #697 from povsister/ldflags-typo

Fix a comment typo

.github/ISSUE_TEMPLATE/bug--.md

@@ -1,6 +1,6 @@
 ---
 name: Bug汇报
-about: Create a report to help us improve
+about: 遇到了bug? 你可以在这里开始汇报
 title: ''
 labels: ''
 assignees: ''
@@ -8,25 +8,34 @@ assignees: ''
 ---
 
 <!--
-在提出ISSUE前，希望您能花费一定的时间执行以下几个步骤以方便我们定位BUG.
+在您发布此Issue前, 请您花一点时间查看下面几条指引🔽
-1: 确定没有相同问题的ISSUE已被提出.
+
-2: 准确填写环境信息.
+1: ❗ | 确定没有相同问题的ISSUE已被提出. (教程: https://github.com/Mrs4s/go-cqhttp/issues/633)
-3: 最好能打开DEBUG模式并复现相关问题.
+2: 🌎| 请准确填写环境信息.
-4: 如果涉及内存泄漏/CPU占用异常请打开DEBUG模式并下载pprof性能分析.
+3: ❔ | 打开DEBUG模式复现，并提供出现问题前后至少 10 秒的完整日志内容。请自行删除日志内存在的个人信息及敏感内容。
-注: 如果您不知道如何有效、精准地表述，我们建议您先阅读《提问的智慧》 -> https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/main/README-zh_CN.md
+4: ⚠ | 如果涉及内存泄漏/CPU占用异常请打开DEBUG模式并下载pprof性能分析.
+
+注: 如果您不知道如何有效、精准地表述，我们建议您先阅读《提问的智慧》
+(链接: https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/main/README-zh_CN.md)
+
+请确保您已经仔细阅读此教程，并勾选下方的确认框。(将 [ ] 修改为 [x])
+--------
+- [ ] 我已经仔细阅读上述教程和"提问前需知 [图+文]": https://github.com/Mrs4s/go-cqhttp/issues/633
+- [ ] 我已知晓并同意，如果我不遵循以下格式提交 Issue，或者我使用的并非最新版本，或者我没有提供足够的环境信息，则我的 Issue 可能会被无条件自动关闭和锁定。
+- [ ] 我已知晓并同意，我仅需要把选项前的 [ ] 替换为 [x]。如果我删除、修改这些复选框的其他部分，或是在 x 之前或之后留了空格，则我的 Issue 可能会被无条件自动关闭和锁定。
+- [ ] 我已知晓并同意，此处仅用于汇报程序中存在的问题。若这个 Issue 是关于其他非程序本身问题或是新功能需求，则我的 Issue 可能会被无条件自动关闭和锁定。（这些问题应当在 Discussion 板块提出。）
+--------
 -->
 
-- [ ] 我已经阅读"提问前需知 [图+文]": `Mrs4s/go-cqhttp/issues/633`
-
 **环境信息**
-请根据实际使用环境修改以下信息
+<!-- 请根据实际使用环境修改以下信息。请勿留空。 -->
 go-cqhttp版本: 
 运行环境: 
 连接方式: 
 使用协议: 
 
 **bug内容**
-请在这里详细描述bug的内容
+<!-- 请在这里详细描述bug的内容 -->
 
 **复现方法**
-请在这里分步骤的描述如何复现这个bug
+<!-- 请在这里分步骤的描述如何复现这个bug -->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 提出新建议/功能
+    url: https://github.com/Mrs4s/go-cqhttp/discussions/new
+    about: 请在这里提出你的建议或功能

.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
           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" .
+          go build -o "output/$BINARY_NAME" -trimpath -ldflags "$LD_FLAGS" .
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         if: ${{ !github.head_ref }}

.github/workflows/issuebot.yml

@@ -0,0 +1,12 @@
+name: Issuebot
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  new_issue:
+    name: Run Issuebot on new Issue
+    runs-on: ubuntu-latest
+    steps:
+      - uses: wfjsw/actions-gocqhttp-issue-prefilter@master

.github/workflows/release.yml

@@ -31,5 +31,6 @@ jobs:
           goos: ${{ matrix.goos }}
           goarch: ${{ matrix.goarch }}
           goversion: "https://golang.org/dl/go1.16.linux-amd64.tar.gz"
+          build_flags: -trimpath
           ldflags: -w -s -X "github.com/Mrs4s/go-cqhttp/coolq.Version=${{ env.RELEASE_VERSION }}"
           

README.md

@@ -279,4 +279,4 @@ go-cqhttp兼容[OneBot-v11](https://github.com/howmanybots/onebot/tree/master/v1
 
 ## 性能
 
-在关闭数据库的情况下, 加载 25 个好友 128 个群运行 24 小时后内存使用为 10MB 左右. 开启数据库后内存使用将根据消息量增加 10-20MB, 如果系统内存小于 128M 建议关闭数据库使用.
+在关闭数据库的情况下, 加载 25 个好友 128 个群运行 24 小时后内存使用为 15MB 左右. 开启数据库后内存使用将根据消息量增加 10-20MB, 如果系统内存小于 128M 建议关闭数据库使用.

coolq/api.go

@@ -22,7 +22,7 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-// Version go-cqhttp的版本信息，在编译时使用ldfalgs进行覆盖
+// Version go-cqhttp的版本信息，在编译时使用ldflags进行覆盖
 var Version = "unknown"
 
 // CQGetLoginInfo 获取登录号信息
@@ -249,11 +249,15 @@ func (bot *CQBot) CQGetWordSlices(content string) MSG {
 // https://git.io/Jtz1c
 func (bot *CQBot) CQSendGroupMessage(groupID int64, i interface{}, autoEscape bool) MSG {
 	var str string
+	group := bot.Client.FindGroup(groupID)
+	if group == nil {
+		return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
+	}
 	fixAt := func(elem []message.IMessageElement) {
 		for _, e := range elem {
 			if at, ok := e.(*message.AtElement); ok && at.Target != 0 {
 				at.Display = "@" + func() string {
-					mem := bot.Client.FindGroup(groupID).FindMember(at.Target)
+					mem := group.FindMember(at.Target)
 					if mem != nil {
 						return mem.DisplayName()
 					}
@@ -419,9 +423,13 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) MSG {
 		sendNodes = convert(m)
 	}
 	if len(sendNodes) > 0 {
-		gm := bot.Client.SendGroupForwardMessage(groupID, &message.ForwardMessage{Nodes: sendNodes})
+		ret := bot.Client.SendGroupForwardMessage(groupID, &message.ForwardMessage{Nodes: sendNodes})
+		if ret == nil || ret.Id == -1 {
+			log.Warnf("合并转发(群)消息发送失败: 账号可能被风控.")
+			return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
+		}
 		return OK(MSG{
-			"message_id": bot.InsertGroupMessage(gm),
+			"message_id": bot.InsertGroupMessage(ret),
 		})
 	}
 	return Failed(100)
@@ -430,12 +438,12 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) MSG {
 // CQSendPrivateMessage 发送私聊消息
 //
 // https://git.io/Jtz1l
-func (bot *CQBot) CQSendPrivateMessage(userID int64, i interface{}, autoEscape bool) MSG {
+func (bot *CQBot) CQSendPrivateMessage(userID int64, groupId int64, i interface{}, autoEscape bool) MSG {
 	var str string
 	if m, ok := i.(gjson.Result); ok {
 		if m.Type == gjson.JSON {
 			elem := bot.ConvertObjectMessage(m, false)
-			mid := bot.SendPrivateMessage(userID, &message.SendingMessage{Elements: elem})
+			mid := bot.SendPrivateMessage(userID, groupId, &message.SendingMessage{Elements: elem})
 			if mid == -1 {
 				return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
 			}
@@ -460,7 +468,7 @@ func (bot *CQBot) CQSendPrivateMessage(userID int64, i interface{}, autoEscape b
 	} else {
 		elem = bot.ConvertStringMessage(str, false)
 	}
-	mid := bot.SendPrivateMessage(userID, &message.SendingMessage{Elements: elem})
+	mid := bot.SendPrivateMessage(userID, groupId, &message.SendingMessage{Elements: elem})
 	if mid == -1 {
 		return Failed(100, "SEND_MSG_API_ERROR", "请参考输出")
 	}
@@ -510,7 +518,10 @@ func (bot *CQBot) CQSetGroupName(groupID int64, name string) MSG {
 // 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)
+		if g.SelfPermission() == client.Member {
+			return Failed(100, "PERMISSION_DENIED", "权限不足")
+		}
+		_ = bot.Client.AddGroupNoticeSimple(groupID, msg)
 		return OK(nil)
 	}
 	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
@@ -540,7 +551,7 @@ func (bot *CQBot) CQSetGroupBan(groupID, userID int64, duration uint32) MSG {
 		if m := g.FindMember(userID); m != nil {
 			err := m.Mute(duration)
 			if err != nil {
-				if duration >= 2592000 {
+				if duration > 2592000 {
 					return Failed(100, "DURATION_IS_NOT_IN_RANGE", "非法的禁言时长")
 				}
 				return Failed(100, "NOT_MANAGEABLE", "机器人权限不足")
@@ -656,6 +667,11 @@ func (bot *CQBot) CQDeleteMessage(messageID int32) MSG {
 		return Failed(100, "MESSAGE_NOT_FOUND", "消息不存在")
 	}
 	if _, ok := msg["group"]; ok {
+		if msg["internal-id"] == nil {
+			// TODO 撤回临时对话消息
+			log.Warnf("撤回 %v 失败: 无法撤回临时对话消息", messageID)
+			return Failed(100, "CANNOT_RECALL_TEMP_MSG", "无法撤回临时对话消息")
+		}
 		if err := bot.Client.RecallGroupMessage(msg["group"].(int64), msg["message-id"].(int32), msg["internal-id"].(int32)); err != nil {
 			log.Warnf("撤回 %v 失败: %v", messageID, err)
 			return Failed(100, "RECALL_API_ERROR", err.Error())
@@ -815,9 +831,9 @@ func (bot *CQBot) CQHandleQuickOperation(context, operation gjson.Result) MSG {
 		if reply.Exists() {
 			autoEscape := global.EnsureBool(operation.Get("auto_escape"), false)
 
-			at := !isAnonymous // 除匿名消息场合外默认 true
+			at := !isAnonymous && msgType == "group" // 除匿名消息场合外默认 true
 			if operation.Get("at_sender").Exists() {
-				at = operation.Get("at_sender").Bool() && !isAnonymous
+				at = operation.Get("at_sender").Bool() && !isAnonymous && msgType == "group"
 			}
 
 			if at && reply.IsArray() {
@@ -858,7 +874,7 @@ func (bot *CQBot) CQHandleQuickOperation(context, operation gjson.Result) MSG {
 				bot.CQSendGroupMessage(context.Get("group_id").Int(), reply, autoEscape)
 			}
 			if msgType == "private" {
-				bot.CQSendPrivateMessage(context.Get("user_id").Int(), reply, autoEscape)
+				bot.CQSendPrivateMessage(context.Get("user_id").Int(), context.Get("group_id").Int(), reply, autoEscape)
 			}
 		}
 		if msgType == "group" {

coolq/bot.go

@@ -61,7 +61,9 @@ func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
 	}
 	bot.Client.OnPrivateMessage(bot.privateMessageEvent)
 	bot.Client.OnGroupMessage(bot.groupMessageEvent)
-	bot.Client.OnSelfGroupMessage(bot.groupMessageEvent)
+	if conf.EnableSelfMessage {
+		bot.Client.OnSelfGroupMessage(bot.groupMessageEvent)
+	}
 	bot.Client.OnTempMessage(bot.tempMessageEvent)
 	bot.Client.OnGroupMuted(bot.groupMutedEvent)
 	bot.Client.OnGroupMessageRecalled(bot.groupRecallEvent)
@@ -170,6 +172,7 @@ func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement
 // SendGroupMessage 发送群消息
 func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int32 {
 	var newElem []message.IMessageElement
+	group := bot.Client.FindGroup(groupID)
 	for _, elem := range m.Elements {
 		if i, ok := elem.(*LocalImageElement); ok {
 			gm, err := bot.UploadLocalImageAsGroup(groupID, i)
@@ -218,6 +221,10 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int
 			}
 			return bot.InsertGroupMessage(ret)
 		}
+		if i, ok := elem.(*message.AtElement); ok && i.Target == 0 && group.SelfPermission() == client.Member {
+			newElem = append(newElem, message.NewText("@全体成员"))
+			continue
+		}
 		newElem = append(newElem, elem)
 	}
 	if len(newElem) == 0 {
@@ -235,7 +242,7 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int
 }
 
 // SendPrivateMessage 发送私聊消息
-func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) int32 {
+func (bot *CQBot) SendPrivateMessage(target int64, groupId int64, m *message.SendingMessage) int32 {
 	var newElem []message.IMessageElement
 	for _, elem := range m.Elements {
 		if i, ok := elem.(*LocalImageElement); ok {
@@ -287,16 +294,33 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in
 		if msg != nil {
 			id = bot.InsertPrivateMessage(msg)
 		}
-	} else if code, ok := bot.tempMsgCache.Load(target); ok { // 临时会话
+	} else if code, ok := bot.tempMsgCache.Load(target); ok || groupId != 0 { // 临时会话
-		msg := bot.Client.SendTempMessage(code.(int64), target, m)
+		if groupId != 0 && !bot.Client.FindGroup(groupId).AdministratorOrOwner() {
-		if msg != nil {
+			log.Errorf("错误: 机器人在群(%v) 为非管理员或群主, 无法主动发起临时会话", groupId)
-			id = msg.Id
+			id = -1
+		} else if groupId != 0 && bot.Client.FindGroup(groupId).FindMember(target) == nil {
+			log.Errorf("错误: 群员(%v) 不在 群(%v), 无法发起临时会话", target, groupId)
+			id = -1
+		} else {
+			if code != nil {
+				groupId = code.(int64)
+			}
+			msg := bot.Client.SendTempMessage(groupId, target, m)
+			if msg != nil {
+				id = bot.InsertTempMessage(target, msg)
+			}
 		}
 	} else if _, ok := bot.oneWayMsgCache.Load(target); ok { // 单向好友
 		msg := bot.Client.SendPrivateMessage(target, m)
 		if msg != nil {
 			id = bot.InsertPrivateMessage(msg)
 		}
+	} else {
+		nickname := "Unknown"
+		if summaryInfo, _ := bot.Client.GetSummaryInfo(target); summaryInfo != nil {
+			nickname = summaryInfo.Nickname
+		}
+		log.Errorf("错误: 请先添加 %v(%v) 为好友", nickname, target)
 	}
 	if id == -1 {
 		return -1
@@ -355,6 +379,33 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
 	return id
 }
 
+// InsertTempMessage 临时消息入数据库
+func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32 {
+	val := MSG{
+		"message-id": m.Id,
+		// FIXME(InsertTempMessage) InternalId missing
+		"group":      m.GroupCode,
+		"group-name": m.GroupName,
+		"target":     target,
+		"sender":     m.Sender,
+		"time":       time.Now().Unix(),
+		"message":    ToStringMessage(m.Elements, m.Sender.Uin, true),
+	}
+	id := toGlobalID(m.Sender.Uin, m.Id)
+	if bot.db != nil {
+		buf := new(bytes.Buffer)
+		if err := gob.NewEncoder(buf).Encode(val); err != nil {
+			log.Warnf("记录聊天数据时出现错误: %v", err)
+			return -1
+		}
+		if err := bot.db.Put(binary.ToBytes(id), binary.GZipCompress(buf.Bytes()), nil); err != nil {
+			log.Warnf("记录聊天数据时出现错误: %v", err)
+			return -1
+		}
+	}
+	return id
+}
+
 // toGlobalID 构建`code`-`msgID`的字符串并返回其CRC32 Checksum的值
 func toGlobalID(code int64, msgID int32) int32 {
 	return int32(crc32.ChecksumIEEE([]byte(fmt.Sprintf("%d-%d", code, msgID))))
@@ -392,18 +443,18 @@ func (bot *CQBot) dispatchEventMessage(m MSG) {
 func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
 	cqm := ToStringMessage(m.Elements, m.GroupCode, true)
 	gm := MSG{
-		"anonymous": nil,
+		"anonymous":    nil,
-		"font":      0,
+		"font":         0,
-		"group_id":  m.GroupCode,
+		"group_id":     m.GroupCode,
-		"message":   ToFormattedMessage(m.Elements, m.GroupCode, false),
+		"message":      ToFormattedMessage(m.Elements, m.GroupCode, false),
-		"message_type": func() string {
+		"message_type": "group",
+		"message_seq":  m.Id,
+		"post_type": func() string {
 			if m.Sender.Uin == bot.Client.Uin {
-				return "group_self"
+				return "message_sent"
 			}
-			return "group"
+			return "message"
 		}(),
-		"message_seq": m.Id,
-		"post_type":   "message",
 		"raw_message": cqm,
 		"self_id":     bot.Client.Uin,
 		"sender": MSG{
@@ -433,12 +484,12 @@ func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
 			t, err := bot.Client.GetGroupMembers(group)
 			if err != nil {
 				log.Warnf("刷新群 %v 成员列表失败: %v", group.Uin, err)
-				return Failed(100, "GET_MEMBERS_API_ERROR", err.Error())
+				return nil
 			}
 			group.Members = t
 			mem = group.FindMember(m.Sender.Uin)
-			if mem != nil {
+			if mem == nil {
-				return Failed(100, "MEMBER_NOT_FOUND", "群员不存在")
+				return nil
 			}
 		}
 		ms := gm["sender"].(MSG)

coolq/cqcode.go

@@ -4,21 +4,23 @@ import (
 	"bytes"
 	"crypto/md5"
 	"encoding/base64"
+	goBinary "encoding/binary"
 	"encoding/hex"
 	xml2 "encoding/xml"
 	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
-	"math"
 	"math/rand"
 	"net/url"
 	"os"
 	"path"
+	"reflect"
 	"runtime"
 	"strconv"
 	"strings"
 	"time"
+	"unsafe"
 
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/message"
@@ -40,6 +42,26 @@ var IgnoreInvalidCQCode = false
 // SplitURL 是否分割URL
 var SplitURL = false
 
+// magicCQ 代表 uint32([]byte("[CQ:"))
+var magicCQ = uint32(0)
+
+func init() {
+	const sizeInt = int(unsafe.Sizeof(0))
+	x := 0x1234
+	p := unsafe.Pointer(&x)
+	p2 := (*[sizeInt]byte)(p)
+	if p2[0] == 0 {
+		magicCQ = goBinary.BigEndian.Uint32([]byte("[CQ:"))
+	} else {
+		magicCQ = goBinary.LittleEndian.Uint32([]byte("[CQ:"))
+	}
+}
+
+// add 指针运算
+func add(ptr unsafe.Pointer, offset uintptr) unsafe.Pointer {
+	return unsafe.Pointer(uintptr(ptr) + offset)
+}
+
 const maxImageSize = 1024 * 1024 * 30  // 30MB
 const maxVideoSize = 1024 * 1024 * 100 // 100MB
 // PokeElement 拍一拍
@@ -335,66 +357,14 @@ func ToStringMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r st
 }
 
 // ConvertStringMessage 将消息字符串转为消息元素数组
-func (bot *CQBot) ConvertStringMessage(msg string, isGroup bool) (r []message.IMessageElement) {
+func (bot *CQBot) ConvertStringMessage(s string, isGroup bool) (r []message.IMessageElement) {
-	index := 0
+	var t, key string
-	stat := 0
+	var d = map[string]string{}
-	rMsg := []rune(msg)
+	ptr := unsafe.Pointer((*reflect.StringHeader)(unsafe.Pointer(&s)).Data)
-	var tempText, cqCode []rune
+	l := len(s)
-	hasNext := func() bool {
+	i, j, CQBegin := 0, 0, 0
-		return index < len(rMsg)
+
-	}
-	next := func() rune {
-		r := rMsg[index]
-		index++
-		return r
-	}
-	move := func(steps int) {
-		index += steps
-	}
-	peekN := func(count int) string {
-		lastIdx := int(math.Min(float64(index+count), float64(len(rMsg))))
-		return string(rMsg[index:lastIdx])
-	}
-	isCQCodeBegin := func(r rune) bool {
-		return r == '[' && peekN(3) == "CQ:"
-	}
-	saveTempText := func() {
-		if len(tempText) != 0 {
-			if SplitURL {
-				for _, t := range global.SplitURL(CQCodeUnescapeText(string(tempText))) {
-					r = append(r, message.NewText(t))
-				}
-			} else {
-				r = append(r, message.NewText(CQCodeUnescapeText(string(tempText))))
-			}
-		}
-		tempText = []rune{}
-		cqCode = []rune{}
-	}
 	saveCQCode := func() {
-		defer func() {
-			cqCode = []rune{}
-			tempText = []rune{}
-		}()
-		s := strings.SplitN(string(cqCode), ",", -1)
-		if len(s) == 0 {
-			return
-		}
-		t := s[0]
-		params := make(map[string]string)
-		for i := 1; i < len(s); i++ {
-			p := s[i]
-			p = strings.TrimSpace(p)
-			if p == "" {
-				continue
-			}
-			data := strings.SplitN(p, "=", 2)
-			if len(data) == 2 {
-				params[data[0]] = CQCodeUnescapeValue(data[1])
-			} else {
-				params[p] = ""
-			}
-		}
 		if t == "reply" { // reply 特殊处理
 			if len(r) > 0 {
 				if _, ok := r[0].(*message.ReplyElement); ok {
@@ -402,8 +372,8 @@ func (bot *CQBot) ConvertStringMessage(msg string, isGroup bool) (r []message.IM
 					return
 				}
 			}
-			mid, err := strconv.Atoi(params["id"])
+			mid, err := strconv.Atoi(d["id"])
-			customText := params["text"]
+			customText := d["text"]
 			if err == nil {
 				org := bot.GetMessage(int32(mid))
 				if org != nil {
@@ -418,18 +388,22 @@ func (bot *CQBot) ConvertStringMessage(msg string, isGroup bool) (r []message.IM
 					return
 				}
 			} else if customText != "" {
-				sender, err := strconv.ParseInt(params["qq"], 10, 64)
+				sender, err := strconv.ParseInt(d["qq"], 10, 64)
 				if err != nil {
-					log.Warnf("警告:自定义 Reply 元素中必须包含Uin")
+					log.Warnf("警告:自定义 Reply 元素中必须包含 Uin")
 					return
 				}
-				msgTime, err := strconv.ParseInt(params["time"], 10, 64)
+				msgTime, err := strconv.ParseInt(d["time"], 10, 64)
 				if err != nil {
 					msgTime = time.Now().Unix()
 				}
+				messageSeq, err := strconv.ParseInt(d["seq"], 10, 64)
+				if err != nil {
+					messageSeq = 0
+				}
 				r = append([]message.IMessageElement{
 					&message.ReplyElement{
-						ReplySeq: int32(0),
+						ReplySeq: int32(messageSeq),
 						Sender:   sender,
 						Time:     int32(msgTime),
 						Elements: bot.ConvertStringMessage(customText, isGroup),
@@ -439,14 +413,14 @@ func (bot *CQBot) ConvertStringMessage(msg string, isGroup bool) (r []message.IM
 			}
 		}
 		if t == "forward" { // 单独处理转发
-			if id, ok := params["id"]; ok {
+			if id, ok := d["id"]; ok {
 				r = []message.IMessageElement{bot.Client.DownloadForwardMessage(id)}
 				return
 			}
 		}
-		elem, err := bot.ToElement(t, params, isGroup)
+		elem, err := bot.ToElement(t, d, isGroup)
 		if err != nil {
-			org := "[CQ:" + string(cqCode) + "]"
+			org := s[CQBegin:i]
 			if !IgnoreInvalidCQCode {
 				log.Warnf("转换CQ码 %v 时出现错误: %v 将原样发送.", org, err)
 				r = append(r, message.NewText(org))
@@ -462,32 +436,72 @@ func (bot *CQBot) ConvertStringMessage(msg string, isGroup bool) (r []message.IM
 			r = append(r, i...)
 		}
 	}
-	for hasNext() {
+
-		ch := next()
+S1: // Plain Text
-		switch stat {
+	for ; i < l; i++ {
-		case 0:
+		if *(*byte)(add(ptr, uintptr(i))) == '[' && i+4 < l &&
-			if isCQCodeBegin(ch) {
+			*(*uint32)(add(ptr, uintptr(i))) == magicCQ { // Magic :uint32([]byte("[CQ:"))
-				saveTempText()
+			if i > j {
-				tempText = append(tempText, []rune("[CQ:")...)
+				r = append(r, message.NewText(CQCodeUnescapeText(s[j:i])))
-				move(3)
-				stat = 1
-			} else {
-				tempText = append(tempText, ch)
-			}
-		case 1:
-			if isCQCodeBegin(ch) {
-				move(-1)
-				stat = 0
-			} else if ch == ']' {
-				saveCQCode()
-				stat = 0
-			} else {
-				cqCode = append(cqCode, ch)
-				tempText = append(tempText, ch)
 			}
+			CQBegin = i
+			i += 4
+			j = i
+			goto S2
 		}
 	}
-	saveTempText()
+	goto End
+S2: // CQCode Type
+	for k := range d { // 内存复用，减小GC压力
+		delete(d, k)
+	}
+	for ; i < l; i++ {
+		switch *(*byte)(add(ptr, uintptr(i))) {
+		case ',': // CQ Code with params
+			t = s[j:i]
+			i++
+			j = i
+			goto S3
+		case ']': // CQ Code without params
+			t = s[j:i]
+			i++
+			j = i
+			saveCQCode()
+			goto S1
+		}
+	}
+	goto End
+S3: // CQCode param key
+	for ; i < l; i++ {
+		if *(*byte)(add(ptr, uintptr(i))) == '=' {
+			key = s[j:i]
+			i++
+			j = i
+			goto S4
+		}
+	}
+	goto End
+S4: // CQCode param value
+	for ; i < l; i++ {
+		switch *(*byte)(add(ptr, uintptr(i))) {
+		case ',': // more param
+			d[key] = CQCodeUnescapeValue(s[j:i])
+			i++
+			j = i
+			goto S3
+		case ']':
+			d[key] = CQCodeUnescapeValue(s[j:i])
+			i++
+			j = i
+			saveCQCode()
+			goto S1
+		}
+	}
+	goto End
+End:
+	if i > j {
+		r = append(r, message.NewText(CQCodeUnescapeText(s[j:i])))
+	}
 	return
 }
 
@@ -520,16 +534,20 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
 			} else if customText != "" {
 				sender, err := strconv.ParseInt(e.Get("data").Get("qq").String(), 10, 64)
 				if err != nil {
-					log.Warnf("警告:自定义 Reply 元素中必须包含Uin")
+					log.Warnf("警告:自定义 Reply 元素中必须包含 Uin")
 					return
 				}
 				msgTime, err := strconv.ParseInt(e.Get("data").Get("time").String(), 10, 64)
 				if err != nil {
 					msgTime = time.Now().Unix()
 				}
+				messageSeq, err := strconv.ParseInt(e.Get("data").Get("seq").String(), 10, 64)
+				if err != nil {
+					messageSeq = 0
+				}
 				r = append([]message.IMessageElement{
 					&message.ReplyElement{
-						ReplySeq: int32(0),
+						ReplySeq: int32(messageSeq),
 						Sender:   sender,
 						Time:     int32(msgTime),
 						Elements: bot.ConvertStringMessage(customText, isGroup),
@@ -792,6 +810,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 	case "cardimage":
 		source := d["source"]
 		icon := d["icon"]
+		brief := d["brief"]
 		minWidth, _ := strconv.ParseInt(d["minwidth"], 10, 64)
 		if minWidth == 0 {
 			minWidth = 200
@@ -812,7 +831,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 		if err != nil {
 			return nil, errors.New("send cardimage faild")
 		}
-		return bot.makeShowPic(img, source, icon, minWidth, minHeight, maxWidth, maxHeight, isGroup)
+		return bot.makeShowPic(img, source, brief, icon, minWidth, minHeight, maxWidth, maxHeight, isGroup)
 	case "video":
 		cache := d["cache"]
 		if cache == "" {
@@ -1102,9 +1121,12 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
 }
 
 // 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, brief string, icon string, minWidth int64, minHeight int64, maxWidth int64, maxHeight int64, group bool) ([]message.IMessageElement, error) {
 	xml := ""
 	var suf message.IMessageElement
+	if brief == "" {
+		brief = "&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！"
+	}
 	if i, ok := elem.(*LocalImageElement); ok {
 		if !group {
 			gm, err := bot.UploadLocalImageAsPrivate(1, i)
@@ -1113,7 +1135,7 @@ func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon
 				return nil, err
 			}
 			suf = gm
-			xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", gm.Md5, gm.Md5, len(i.Data), "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
+			xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="%s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, brief, "", gm.Md5, gm.Md5, len(i.Data), "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
 		} else {
 			gm, err := bot.UploadLocalImageAsGroup(1, i)
 			if err != nil {
@@ -1121,16 +1143,16 @@ func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon
 				return nil, err
 			}
 			suf = gm
-			xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", gm.Md5, gm.Md5, len(i.Data), "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
+			xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="%s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, brief, "", gm.Md5, gm.Md5, len(i.Data), "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
 		}
 	}
 
 	if i, ok := elem.(*message.GroupImageElement); ok {
-		xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", i.Md5, i.Md5, 0, "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
+		xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="%s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, brief, "", i.Md5, i.Md5, 0, "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
 		suf = i
 	}
 	if i, ok := elem.(*message.FriendImageElement); ok {
-		xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="&#91;分享&#93;我看到一张很赞的图片，分享给你，快来看！" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, "", i.Md5, i.Md5, 0, "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
+		xml = fmt.Sprintf(`<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="5" templateID="12345" action="" brief="%s" sourceMsgId="0" url="%s" flag="0" adverSign="0" multiMsgFlag="0"><item layout="0" advertiser_id="0" aid="0"><image uuid="%x" md5="%x" GroupFiledid="0" filesize="%d" local_path="%s" minWidth="%d" minHeight="%d" maxWidth="%d" maxHeight="%d" /></item><source name="%s" icon="%s" action="" appid="-1" /></msg>`, brief, "", i.Md5, i.Md5, 0, "", minWidth, minHeight, maxWidth, maxHeight, source, icon)
 		suf = i
 	}
 	if xml != "" {

coolq/cqcode_test.go

@@ -0,0 +1,25 @@
+package coolq
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/Mrs4s/MiraiGo/client"
+	"github.com/Mrs4s/go-cqhttp/global"
+)
+
+var bot = NewQQBot(client.NewClient(1, ""), global.DefaultConfig())
+
+func TestCQBot_ConvertStringMessage(t *testing.T) {
+	for _, v := range bot.ConvertStringMessage(`[CQ:face,id=115,text=111][CQ:face,id=217]] [CQ:text,text=123] [`, false) {
+		fmt.Println(v)
+	}
+}
+
+var bench = `asdfqwerqwerqwer[CQ:face,id=115,text=111]asdfasdfasdfasdfasdfasdfasd[CQ:face,id=217]] [CQ:text,text=123] [`
+
+func BenchmarkCQBot_ConvertStringMessage(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		bot.ConvertStringMessage(bench, false)
+	}
+}

coolq/event.go

@@ -94,28 +94,36 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 	}
 	log.Infof("收到群 %v(%v) 内 %v(%v) 的消息: %v (%v)", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
 	gm := bot.formatGroupMessage(m)
+	if gm == nil {
+		return
+	}
 	gm["message_id"] = id
 	bot.dispatchEventMessage(gm)
 }
 
 func (bot *CQBot) tempMessageEvent(c *client.QQClient, m *message.TempMessage) {
 	bot.checkMedia(m.Elements)
-	cqm := ToStringMessage(m.Elements, 0, true)
+	cqm := ToStringMessage(m.Elements, m.Sender.Uin, true)
 	bot.tempMsgCache.Store(m.Sender.Uin, m.GroupCode)
+	id := m.Id
+	if bot.db != nil {
+		id = bot.InsertTempMessage(m.Sender.Uin, m)
+	}
 	log.Infof("收到来自群 %v(%v) 内 %v(%v) 的临时会话消息: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm)
 	tm := MSG{
 		"post_type":    "message",
 		"message_type": "private",
 		"sub_type":     "group",
-		"message_id":   m.Id,
+		"message_id":   id,
 		"user_id":      m.Sender.Uin,
-		"message":      ToFormattedMessage(m.Elements, 0, false),
+		"message":      ToFormattedMessage(m.Elements, m.Sender.Uin, false),
 		"raw_message":  cqm,
 		"font":         0,
 		"self_id":      c.Uin,
 		"time":         time.Now().Unix(),
 		"sender": MSG{
 			"user_id":  m.Sender.Uin,
+			"group_id": m.GroupCode,
 			"nickname": m.Sender.Nickname,
 			"sex":      "unknown",
 			"age":      0,

docs/config.md

@@ -16,48 +16,51 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 
 ````json
 {
-	"uin": 0,
+  "uin": 0,
-	"password": "",
+  "password": "",
-	"encrypt_password": false,
+  "encrypt_password": false,
-	"password_encrypted": "",
+  "password_encrypted": "",
-	"enable_db": true,
+  "enable_db": true,
-	"access_token": "",
+  "enable_self_message": false,
-	"relogin": {
+  "access_token": "",
-		"enabled": true,
+  "relogin": {
-		"relogin_delay": 3,
+    "enabled": true,
-		"max_relogin_times": 0
+    "relogin_delay": 3,
-	},
+    "max_relogin_times": 0
-    "_rate_limit": {
+  },
-		"enabled": false,
+  "_rate_limit": {
-		"frequency": 1,
+    "enabled": false,
-		"bucket_size": 1
+    "frequency": 1,
-    },
+    "bucket_size": 1
-	"post_message_format": "string",
+  },
-	"ignore_invalid_cqcode": false,
+  "post_message_format": "string",
-	"force_fragmented": true,
+  "ignore_invalid_cqcode": false,
-	"heartbeat_interval": 5,
+  "force_fragmented": true,
-    "use_sso_address": false,
+  "heartbeat_interval": 5,
-	"http_config": {
+  "use_sso_address": false,
-		"enabled": true,
+  "http_config": {
-		"host": "0.0.0.0",
+    "enabled": true,
-		"port": 5700,
+    "host": "0.0.0.0",
-		"timeout": 5,
+    "port": 5700,
-		"post_urls": {"url:port": "secret"}
+    "timeout": 5,
-	},
+    "post_urls": {
-	"ws_config": {
+      "url:port": "secret"
-		"enabled": true,
+    }
-		"host": "0.0.0.0",
+  },
-		"port": 6700
+  "ws_config": {
-	},
+    "enabled": true,
-	"ws_reverse_servers": [
+    "host": "0.0.0.0",
-		{
+    "port": 6700
-			"enabled": false,
+  },
-			"reverse_url": "ws://you_websocket_universal.server",
+  "ws_reverse_servers": [
-			"reverse_api_url": "ws://you_websocket_api.server",
+    {
-			"reverse_event_url": "ws://you_websocket_event.server",
+      "enabled": false,
-			"reverse_reconnect_interval": 3000
+      "reverse_url": "ws://you_websocket_universal.server",
-		}
+      "reverse_api_url": "ws://you_websocket_api.server",
-	]
+      "reverse_event_url": "ws://you_websocket_event.server",
+      "reverse_reconnect_interval": 3000
+    }
+  ]
 }
 ````
 
@@ -68,6 +71,7 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 | encrypt_password      | bool     | 是否对密码进行加密.                                                                      |
 | password_encrypted    | string   | 加密后的密码(请勿修改)                                                                   |
 | enable_db             | bool     | 是否开启内置数据库, 关闭后将无法使用 **回复/撤回** 等上下文相关接口                      |
+| enable_self_message   | bool     | 是否启用 `message_sent` 事件                                                       |
 | access_token          | string   | 同CQHTTP的 `access_token`  用于身份验证                                                  |
 | relogin               | bool     | 是否自动重新登录                                                                         |
 | relogin_delay         | int      | 重登录延时（秒）                                                                         |
@@ -127,6 +131,7 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 将文件 `address.txt` 创建到 `go-cqhttp` 工作目录, 并键入 `IP:PORT` 以换行符为分割即可.
 
 示例:
+
 ````
 1.1.1.1:53
 1.1.2.2:8899

docs/cqhttp.md

@@ -111,12 +111,13 @@ Type : `reply`
 | `text` | string | 自定义回复的信息                                    |
 | `qq`   | int64  | 自定义回复时的自定义QQ, 如果使用自定义信息必须指定. |
 | `time` | int64  | 可选. 自定义回复时的时间, 格式为Unix时间 |
+| `seq` | int64  | 起始消息序号, 可通过 `get_msg` 获得 |
 
 
 
 示例: `[CQ:reply,id=123456]` 
 \
-自定义回复示例: `[CQ:reply,text=Hello World,qq=10086,time=3376656000]`
+自定义回复示例: `[CQ:reply,text=Hello World,qq=10086,time=3376656000,seq=5123]`
 
 ### 音乐分享 <Badge text="发"/>
 
@@ -263,8 +264,9 @@ Type: `node`
 | `name`    | string  | 发送者显示名字 | 用于自定义消息 (自定义消息并合并转发，实际查看顺序为自定义消息段顺序)                  |
 | `uin`     | int64   | 发送者QQ号     | 用于自定义消息                                                                         |
 | `content` | message | 具体消息       | 用于自定义消息                                                                         |
+| `seq`     | 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://git.io/JtxtN) 文档说明, `data` 应全为字符串, 但由于需要接收`message` 类型的消息, 所以 *仅限此Type的content字段* 支持Array套娃**
 
 示例: 
 
@@ -325,6 +327,7 @@ Type: `node`
             "name": "自定义发送者",
             "uin": "10086",
             "content": "我是自定义消息",
+            "seq": "5123",
             "time": "3376656000"
         }
     },
@@ -603,7 +606,7 @@ Type: `tts`
 | 字段       | 类型           | 说明                         |
 | ---------- | -------------- | ---------------------------- |
 | `group_id` | int64          | 群号                         |
-| `messages` | forward node[] | 自定义转发消息, 具体看CQCode |
+| `messages` | forward node[] | 自定义转发消息, 具体看 [CQCode](https://github.com/Mrs4s/go-cqhttp/blob/master/docs/cqhttp.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E6%B6%88%E6%81%AF%E8%8A%82%E7%82%B9) |
 
 响应数据
     

global/config.go

@@ -145,6 +145,7 @@ type JSONConfig struct {
 	EncryptPassword   bool   `json:"encrypt_password"`
 	PasswordEncrypted string `json:"password_encrypted"`
 	EnableDB          bool   `json:"enable_db"`
+	EnableSelfMessage bool   `json:"enable_self_message"`
 	AccessToken       string `json:"access_token"`
 	ReLogin           struct {
 		Enabled         bool `json:"enabled"`

global/terminal/double_click.go

@@ -0,0 +1,7 @@
+// +build !windows
+
+package terminal
+
+func RunningByDoubleClick() bool {
+	return false
+}

global/terminal/double_click_windows.go

@@ -0,0 +1,23 @@
+// +build windows
+
+package terminal
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+// RunningByDoubleClick 检查是否通过双击直接运行
+func RunningByDoubleClick() bool {
+	kernel32 := syscall.NewLazyDLL("kernel32.dll")
+	lp := kernel32.NewProc("GetConsoleProcessList")
+	if lp != nil {
+		var ids [2]uint32
+		var maxCount uint32 = 2
+		ret, _, _ := lp.Call(uintptr(unsafe.Pointer(&ids)), uintptr(maxCount))
+		if ret > 1 {
+			return false
+		}
+	}
+	return true
+}

go.mod

@@ -3,14 +3,13 @@ module github.com/Mrs4s/go-cqhttp
 go 1.16
 
 require (
-	github.com/Mrs4s/MiraiGo v0.0.0-20210219090120-c4288bd213f3
+	github.com/Mrs4s/MiraiGo v0.0.0-20210308011115-8c89d62657af
 	github.com/dustin/go-humanize v1.0.0
 	github.com/gin-contrib/pprof v1.3.0
 	github.com/gin-gonic/gin v1.6.3
 	github.com/gorilla/websocket v1.4.2
 	github.com/guonaihong/gout v0.1.4
 	github.com/hjson/hjson-go v3.1.0+incompatible
-	github.com/jonboulle/clockwork v0.2.2 // indirect
 	github.com/json-iterator/go v1.1.10
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
@@ -26,5 +25,4 @@ require (
 	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
 	golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf
 	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 )

go.sum

@@ -1,19 +1,18 @@
 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-20210206134348-800bf525ed0e h1:SnN+nyRdqN7sULnHUWCofP+Jxs3VJN/y8AlMpcz0nbk=
+github.com/Mrs4s/MiraiGo v0.0.0-20210305105331-e11fa95c501f h1:jwejWu/frFn1yf/VS7ZBKt1LU9ASU70kXCysQsXl6Ns=
-github.com/Mrs4s/MiraiGo v0.0.0-20210206134348-800bf525ed0e/go.mod h1:yhqA0NyKxUf7I/0HR/1OMchveFggX8wde04gqdGrNfU=
+github.com/Mrs4s/MiraiGo v0.0.0-20210305105331-e11fa95c501f/go.mod h1:drSlh4LlYtjOMJxirScUCSnylBKi1NIRxUz7TKdSsNs=
-github.com/Mrs4s/MiraiGo v0.0.0-20210219090120-c4288bd213f3 h1:hsO/cT00Nxyi5FrnXImimBlcHKrdFh8yWEwp0OR88z8=
+github.com/Mrs4s/MiraiGo v0.0.0-20210308011115-8c89d62657af h1:PPjWwM/KwbHzOyaEwKm3W5JrK6TTxpOSf+Sd4JXxF9s=
-github.com/Mrs4s/MiraiGo v0.0.0-20210219090120-c4288bd213f3/go.mod h1:yhqA0NyKxUf7I/0HR/1OMchveFggX8wde04gqdGrNfU=
+github.com/Mrs4s/MiraiGo v0.0.0-20210308011115-8c89d62657af/go.mod h1:yhqA0NyKxUf7I/0HR/1OMchveFggX8wde04gqdGrNfU=
+github.com/a8m/syncmap v0.0.0-20200818084611-4bbbd178de97/go.mod h1:f3iF7/3t9i9hsYF8DPgT0XeIVyNzevhMCKf2445Q6pE=
 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/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/gin-contrib/pprof v1.3.0 h1:G9eK6HnbkSqDZBYbzG4wrjCsA4e+cvYAHUZw6W+W9K0=
 github.com/gin-contrib/pprof v1.3.0/go.mod h1:waMjT1H9b179t3CxuG1cV3DHpga6ybizwfBaM5OXaB0=
@@ -23,7 +22,6 @@ 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.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.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
@@ -50,10 +48,8 @@ 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=
@@ -61,10 +57,7 @@ github.com/guonaihong/gout v0.1.4 h1:uBBoyztMX9okC27OQxqhn6bZ0ROkGyvnEIHwtp3TM4g
 github.com/guonaihong/gout v0.1.4/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/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 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/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=
@@ -73,7 +66,6 @@ github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALr
 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/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.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4=
 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
@@ -88,14 +80,11 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 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/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 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/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
@@ -107,9 +96,7 @@ 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/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/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
@@ -129,7 +116,6 @@ github.com/wdvxdr1123/go-silk v0.0.0-20210207032612-169bbdf8861d h1:gJTKbjZtlMt/
 github.com/wdvxdr1123/go-silk v0.0.0-20210207032612-169bbdf8861d/go.mod h1:twOxzexmM2Il1ReUu1fB5tnUotOq/dp56xjk/ZHwb1I=
 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=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -143,7 +129,6 @@ golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/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-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
@@ -159,7 +144,6 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/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 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201126233918-771906719818 h1:f1CIuDlJhwANEC2MM87MBEVMr3jl5bifgsfj90XAF9c=
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -167,7 +151,6 @@ golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlp
 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.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/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/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -175,10 +158,9 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 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-20190501045030-23463209683d/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 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.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -197,17 +179,13 @@ 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/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 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/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.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/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-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

main.go

@@ -8,6 +8,9 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"fmt"
+	"github.com/Mrs4s/go-cqhttp/global/terminal"
+	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
+	easy "github.com/t-tomalak/logrus-easy-formatter"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -33,9 +36,7 @@ import (
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
 	jsoniter "github.com/json-iterator/go"
-	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
 	log "github.com/sirupsen/logrus"
-	easy "github.com/t-tomalak/logrus-easy-formatter"
 )
 
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
@@ -43,6 +44,28 @@ var conf *global.JSONConfig
 var isFastStart = false
 
 func init() {
+	logFormatter := &easy.Formatter{
+		TimestampFormat: "2006-01-02 15:04:05",
+		LogFormat:       "[%time%] [%lvl%]: %msg% \n",
+	}
+	w, err := rotatelogs.New(path.Join("logs", "%Y-%m-%d.log"), rotatelogs.WithRotationTime(time.Hour*24))
+	if err != nil {
+		log.Errorf("rotatelogs init err: %v", err)
+		panic(err)
+	}
+
+	conf = getConfig()
+	if conf == nil {
+		os.Exit(1)
+	}
+
+	// 在debug模式下,将在标准输出中打印当前执行行数
+	if conf.Debug {
+		log.SetReportCaller(true)
+	}
+
+	log.AddHook(global.NewLocalHook(w, logFormatter, global.GetLogLevel(conf.LogLevel)...))
+
 	if global.PathExists("cqhttp.json") {
 		log.Info("发现 cqhttp.json 将在五秒后尝试导入配置，按 Ctrl+C 取消.")
 		log.Warn("警告: 该操作会删除 cqhttp.json 并覆盖 config.hjson 文件.")
@@ -73,28 +96,6 @@ func init() {
 		_ = os.Remove("cqhttp.json")
 	}
 
-	conf = getConfig()
-	if conf == nil {
-		os.Exit(1)
-	}
-
-	logFormatter := &easy.Formatter{
-		TimestampFormat: "2006-01-02 15:04:05",
-		LogFormat:       "[%time%] [%lvl%]: %msg% \n",
-	}
-	w, err := rotatelogs.New(path.Join("logs", "%Y-%m-%d.log"), rotatelogs.WithRotationTime(time.Hour*24))
-	if err != nil {
-		log.Errorf("rotatelogs init err: %v", err)
-		panic(err)
-	}
-
-	// 在debug模式下,将在标准输出中打印当前执行行数
-	if conf.Debug {
-		log.SetReportCaller(true)
-	}
-
-	log.AddHook(global.NewLocalHook(w, logFormatter, global.GetLogLevel(conf.LogLevel)...))
-
 	if !global.PathExists(global.ImagePath) {
 		if err := os.MkdirAll(global.ImagePath, 0755); err != nil {
 			log.Fatalf("创建图片缓存文件夹失败: %v", err)
@@ -118,7 +119,6 @@ func init() {
 }
 
 func main() {
-
 	var byteKey []byte
 	arg := os.Args
 	if len(arg) > 1 {
@@ -140,7 +140,11 @@ func main() {
 			}
 		}
 	}
-
+	if terminal.RunningByDoubleClick() && !isFastStart {
+		log.Warning("警告: 强烈不推荐通过双击直接运行本程序, 这将导致一些非预料的后果.")
+		log.Warning("将等待10s后启动")
+		time.Sleep(time.Second * 10)
+	}
 	if conf.Uin == 0 || (conf.Password == "" && conf.PasswordEncrypted == "") {
 		log.Warnf("请修改 config.hjson 以添加账号密码.")
 		if !isFastStart {

server/api.go

@@ -0,0 +1,382 @@
+package server
+
+import (
+	"strings"
+	"time"
+
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/tidwall/gjson"
+)
+
+type resultGetter interface {
+	Get(string) gjson.Result
+}
+
+type apiCaller struct {
+	bot *coolq.CQBot
+}
+
+func getLoginInfo(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQGetLoginInfo()
+}
+
+func getFriendList(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQGetFriendList()
+}
+
+func getGroupList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupList(p.Get("no_cache").Bool())
+}
+
+func getGroupInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupInfo(p.Get("group_id").Int(), p.Get("no_cache").Bool())
+}
+
+func getGroupMemberList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupMemberList(p.Get("group_id").Int(), p.Get("no_cache").Bool())
+}
+
+func getGroupMemberInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupMemberInfo(
+		p.Get("group_id").Int(), p.Get("user_id").Int(),
+	)
+}
+func sendMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	autoEscape := global.EnsureBool(p.Get("auto_escape"), false)
+	if p.Get("message_type").Str == "private" {
+		return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("group_id").Int(), p.Get("message"), autoEscape)
+	}
+	if p.Get("message_type").Str == "group" {
+		return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), autoEscape)
+	}
+	if p.Get("user_id").Int() != 0 {
+		return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("group_id").Int(), p.Get("message"), autoEscape)
+	}
+	if p.Get("group_id").Int() != 0 {
+		return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), autoEscape)
+	}
+	return coolq.MSG{}
+}
+
+func sendGroupMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"),
+		global.EnsureBool(p.Get("auto_escape"), false))
+}
+
+func sendGroupForwardMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSendGroupForwardMessage(p.Get("group_id").Int(), p.Get("messages"))
+}
+
+func sendPrivateMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("group_id").Int(), p.Get("message"),
+		global.EnsureBool(p.Get("auto_escape"), false))
+}
+
+func deleteMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQDeleteMessage(int32(p.Get("message_id").Int()))
+}
+
+func setFriendAddRequest(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	apr := true
+	if p.Get("approve").Exists() {
+		apr = p.Get("approve").Bool()
+	}
+	return bot.CQProcessFriendRequest(p.Get("flag").Str, apr)
+}
+
+func setGroupAddRequest(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	subType := p.Get("sub_type").Str
+	apr := true
+	if subType == "" {
+		subType = p.Get("type").Str
+	}
+	if p.Get("approve").Exists() {
+		apr = p.Get("approve").Bool()
+	}
+	return bot.CQProcessGroupRequest(p.Get("flag").Str, subType, p.Get("reason").Str, apr)
+}
+
+func setGroupCard(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupCard(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("card").Str)
+}
+
+func setGroupSpecialTitle(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupSpecialTitle(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("special_title").Str)
+}
+
+func setGroupKick(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupKick(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("message").Str, p.Get("reject_add_request").Bool())
+}
+
+func setGroupBan(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupBan(p.Get("group_id").Int(), p.Get("user_id").Int(), func() uint32 {
+		if p.Get("duration").Exists() {
+			return uint32(p.Get("duration").Int())
+		}
+		return 1800
+	}())
+}
+
+func setGroupWholeBan(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupWholeBan(p.Get("group_id").Int(), func() bool {
+		if p.Get("enable").Exists() {
+			return p.Get("enable").Bool()
+		}
+		return true
+	}())
+}
+
+func setGroupName(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupName(p.Get("group_id").Int(), p.Get("group_name").Str)
+}
+
+func setGroupAdmin(bot *coolq.CQBot, p resultGetter) 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
+	}())
+}
+
+func sendGroupNotice(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupMemo(p.Get("group_id").Int(), p.Get("content").Str)
+}
+
+func setGroupLeave(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupLeave(p.Get("group_id").Int())
+}
+
+func getImage(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetImage(p.Get("file").Str)
+}
+
+func getForwardMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	id := p.Get("message_id").Str
+	if id == "" {
+		id = p.Get("id").Str
+	}
+	return bot.CQGetForwardMessage(id)
+}
+
+func getMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetMessage(int32(p.Get("message_id").Int()))
+}
+
+func downloadFile(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	headers := map[string]string{}
+	headersToken := p.Get("headers")
+	if headersToken.IsArray() {
+		for _, sub := range headersToken.Array() {
+			str := strings.SplitN(sub.String(), "=", 2)
+			if len(str) == 2 {
+				headers[str[0]] = str[1]
+			}
+		}
+	}
+	if headersToken.Type == gjson.String {
+		lines := strings.Split(headersToken.String(), "\r\n")
+		for _, sub := range lines {
+			str := strings.SplitN(sub, "=", 2)
+			if len(str) == 2 {
+				headers[str[0]] = str[1]
+			}
+		}
+	}
+	return bot.CQDownloadFile(p.Get("url").Str, headers, int(p.Get("thread_count").Int()))
+}
+
+func getGroupHonorInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupHonorInfo(p.Get("group_id").Int(), p.Get("type").Str)
+}
+
+func setRestart(_ *coolq.CQBot, p resultGetter) coolq.MSG {
+	var delay int64
+	delay = p.Get("delay").Int()
+	if delay < 0 {
+		delay = 0
+	}
+	defer func(delay int64) {
+		time.Sleep(time.Duration(delay) * time.Millisecond)
+		Restart <- struct{}{}
+	}(delay)
+	return coolq.MSG{"data": nil, "retcode": 0, "status": "async"}
+
+}
+
+func canSendImage(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQCanSendImage()
+}
+
+func canSendRecord(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQCanSendRecord()
+}
+
+func getStrangerInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetStrangerInfo(p.Get("user_id").Int())
+}
+
+func getStatus(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQGetStatus()
+}
+
+func getVersionInfo(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQGetVersionInfo()
+}
+
+func getGroupSystemMSG(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQGetGroupSystemMessages()
+}
+
+func getGroupFileSystemInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupFileSystemInfo(p.Get("group_id").Int())
+}
+
+func getGroupRootFiles(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupRootFiles(p.Get("group_id").Int())
+}
+
+func getGroupFilesByFolder(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupFilesByFolderID(p.Get("group_id").Int(), p.Get("folder_id").Str)
+}
+
+func getGroupFileURL(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupFileURL(p.Get("group_id").Int(), p.Get("file_id").Str, int32(p.Get("busid").Int()))
+}
+
+func uploadGroupFile(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQUploadGroupFile(p.Get("group_id").Int(), p.Get("file").Str, p.Get("name").Str, p.Get("folder").Str)
+}
+
+func getGroupMsgHistory(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupMessageHistory(p.Get("group_id").Int(), p.Get("message_seq").Int())
+}
+
+func getVipInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetVipInfo(p.Get("user_id").Int())
+}
+
+func reloadEventFilter(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQReloadEventFilter()
+}
+
+func getGroupAtAllRemain(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetAtAllRemain(p.Get("group_id").Int())
+}
+
+func ocrImage(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQOcrImage(p.Get("image").Str)
+}
+
+func getOnlineClients(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetOnlineClients(p.Get("no_cache").Bool())
+}
+
+func getWordSlices(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetWordSlices(p.Get("content").Str)
+}
+
+func setGroupPortrait(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupPortrait(p.Get("group_id").Int(), p.Get("file").String(), p.Get("cache").String())
+}
+
+func setEssenceMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetEssenceMessage(int32(p.Get("message_id").Int()))
+}
+
+func deleteEssenceMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQDeleteEssenceMessage(int32(p.Get("message_id").Int()))
+}
+
+func getEssenceMsgList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetEssenceMessageList(p.Get("group_id").Int())
+}
+
+func checkUrlSafely(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQCheckURLSafely(p.Get("url").String())
+}
+
+func setGroupAnonymousBan(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	obj := p.Get("anonymous")
+	flag := p.Get("anonymous_flag")
+	if !flag.Exists() {
+		flag = p.Get("flag")
+	}
+	if !flag.Exists() && !obj.Exists() {
+		return coolq.Failed(100, "FLAG_NOT_FOUND", "flag未找到")
+	}
+	if !flag.Exists() {
+		flag = obj.Get("flag")
+	}
+	return bot.CQSetGroupAnonymousBan(p.Get("group_id").Int(), flag.String(), int32(p.Get("duration").Int()))
+}
+
+func handleQuickOperation(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
+}
+
+var API = map[string]func(*coolq.CQBot, resultGetter) coolq.MSG{
+	"get_login_info":             getLoginInfo,
+	"get_friend_list":            getFriendList,
+	"get_group_list":             getGroupList,
+	"get_group_info":             getGroupInfo,
+	"get_group_member_list":      getGroupMemberList,
+	"get_group_member_info":      getGroupMemberInfo,
+	"send_msg":                   sendMSG,
+	"send_group_msg":             sendGroupMSG,
+	"send_group_forward_msg":     sendGroupForwardMSG,
+	"send_private_msg":           sendPrivateMSG,
+	"delete_msg":                 deleteMSG,
+	"set_friend_add_request":     setFriendAddRequest,
+	"set_group_add_request":      setGroupAddRequest,
+	"set_group_card":             setGroupCard,
+	"set_group_special_title":    setGroupSpecialTitle,
+	"set_group_kick":             setGroupKick,
+	"set_group_ban":              setGroupBan,
+	"set_group_whole_ban":        setGroupWholeBan,
+	"set_group_name":             setGroupName,
+	"set_group_admin":            setGroupAdmin,
+	"_send_group_notice":         sendGroupNotice,
+	"set_group_leave":            setGroupLeave,
+	"get_image":                  getImage,
+	"get_forward_msg":            getForwardMSG,
+	"get_msg":                    getMSG,
+	"download_file":              downloadFile,
+	"get_group_honor_info":       getGroupHonorInfo,
+	"set_restart":                setRestart,
+	"can_send_image":             canSendImage,
+	"can_send_record":            canSendRecord,
+	"get_stranger_info":          getStrangerInfo,
+	"get_status":                 getStatus,
+	"get_version_info":           getVersionInfo,
+	"get_group_system_msg":       getGroupSystemMSG,
+	"get_group_file_system_info": getGroupFileSystemInfo,
+	"get_group_root_files":       getGroupRootFiles,
+	"get_group_files_by_folder":  getGroupFilesByFolder,
+	"get_group_file_url":         getGroupFileURL,
+	"upload_group_file":          uploadGroupFile,
+	"get_group_msg_history":      getGroupMsgHistory,
+	"_get_vip_info":              getVipInfo,
+	"reload_event_filter":        reloadEventFilter,
+	".ocr_image":                 ocrImage,
+	"ocr_image":                  ocrImage,
+	"get_group_at_all_remain":    getGroupAtAllRemain,
+	"get_online_clients":         getOnlineClients,
+	".get_word_slices":           getWordSlices,
+	"set_group_portrait":         setGroupPortrait,
+	"set_essence_msg":            setEssenceMSG,
+	"delete_essence_msg":         deleteEssenceMSG,
+	"get_essence_msg_list":       getEssenceMsgList,
+	"check_url_safely":           checkUrlSafely,
+	"set_group_anonymous_ban":    setGroupAnonymousBan,
+	".handle_quick_operation":    handleQuickOperation,
+}
+
+func (api *apiCaller) callAPI(action string, p resultGetter) coolq.MSG {
+	if f, ok := API[action]; ok {
+		return f(api.bot, p)
+	} else {
+		return coolq.Failed(404, "API_NOT_FOUND", "API不存在")
+	}
+}

server/http.go

@@ -7,16 +7,14 @@ import (
 	"encoding/hex"
 	"net/http"
 	"os"
-	"strconv"
 	"strings"
 	"time"
 
-	"github.com/guonaihong/gout/dataflow"
-
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/gin-gonic/gin"
 	"github.com/guonaihong/gout"
+	"github.com/guonaihong/gout/dataflow"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 )
@@ -25,6 +23,7 @@ type httpServer struct {
 	engine *gin.Engine
 	bot    *coolq.CQBot
 	HTTP   *http.Server
+	api    apiCaller
 }
 
 type httpClient struct {
@@ -34,6 +33,10 @@ type httpClient struct {
 	timeout int32
 }
 
+type httpContext struct {
+	ctx *gin.Context
+}
+
 var cqHTTPServer = &httpServer{}
 
 // Debug 是否启用Debug模式
@@ -43,6 +46,7 @@ func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
 	gin.SetMode(gin.ReleaseMode)
 	s.engine = gin.New()
 	s.bot = bot
+	s.api = apiCaller{s.bot}
 	s.engine.Use(func(c *gin.Context) {
 		if c.Request.Method != "GET" && c.Request.Method != "POST" {
 			log.Warnf("已拒绝客户端 %v 的请求: 方法错误", c.Request.RemoteAddr)
@@ -156,522 +160,29 @@ 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 {
+	c.JSON(200, s.api.callAPI(action, httpContext{ctx: c}))
-		f(s, c)
-	} else {
-		c.JSON(200, coolq.Failed(404))
-	}
 }
 
-// GetLoginInfo 获取登录号信息
+func (h httpContext) Get(k string) gjson.Result {
-func GetLoginInfo(s *httpServer, c *gin.Context) {
+	c := h.ctx
-	c.JSON(200, s.bot.CQGetLoginInfo())
-}
-
-// GetFriendList 获取好友列表
-func GetFriendList(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQGetFriendList())
-}
-
-// GetGroupList 获取群列表
-func GetGroupList(s *httpServer, c *gin.Context) {
-	nc := getParamOrDefault(c, "no_cache", "false")
-	c.JSON(200, s.bot.CQGetGroupList(nc == "true"))
-}
-
-// GetGroupInfo 获取群信息
-func GetGroupInfo(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	nc := getParamOrDefault(c, "no_cache", "false")
-	c.JSON(200, s.bot.CQGetGroupInfo(gid, nc == "true"))
-}
-
-// GetGroupMemberList 获取群成员列表
-func GetGroupMemberList(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	nc := getParamOrDefault(c, "no_cache", "false")
-	c.JSON(200, s.bot.CQGetGroupMemberList(gid, nc == "true"))
-}
-
-// GetGroupMemberInfo 获取群成员信息
-func GetGroupMemberInfo(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupMemberInfo(gid, uid))
-}
-
-// GetGroupFileSystemInfo 扩展API-获取群文件系统信息
-func GetGroupFileSystemInfo(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupFileSystemInfo(gid))
-}
-
-// GetGroupRootFiles 扩展API-获取群根目录文件列表
-func GetGroupRootFiles(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupRootFiles(gid))
-}
-
-// GetGroupFilesByFolderID 扩展API-获取群子目录文件列表
-func GetGroupFilesByFolderID(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	folderID := getParam(c, "folder_id")
-	c.JSON(200, s.bot.CQGetGroupFilesByFolderID(gid, folderID))
-}
-
-// GetGroupFileURL 扩展API-获取群文件资源链接
-func GetGroupFileURL(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	fid := getParam(c, "file_id")
-	busid, _ := strconv.ParseInt(getParam(c, "busid"), 10, 32)
-	c.JSON(200, s.bot.CQGetGroupFileURL(gid, fid, int32(busid)))
-}
-
-// UploadGroupFile 扩展API-上传群文件
-func UploadGroupFile(s *httpServer, c *gin.Context) {
-	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")))
-}
-
-// SendMessage 发送消息
-//
-// https://git.io/JtwTQ
-func SendMessage(s *httpServer, c *gin.Context) {
-	if getParam(c, "message_type") == "private" {
-		SendPrivateMessage(s, c)
-		return
-	}
-	if getParam(c, "message_type") == "group" {
-		SendGroupMessage(s, c)
-		return
-	}
-	if getParam(c, "group_id") != "" {
-		SendGroupMessage(s, c)
-		return
-	}
-	if getParam(c, "user_id") != "" {
-		SendPrivateMessage(s, c)
-	}
-}
-
-// SendPrivateMessage 发送私聊消息
-func SendPrivateMessage(s *httpServer, c *gin.Context) {
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	msg, t := getParamWithType(c, "message")
-	autoEscape := global.EnsureBool(getParam(c, "auto_escape"), false)
-	if t == gjson.JSON {
-		c.JSON(200, s.bot.CQSendPrivateMessage(uid, gjson.Parse(msg), autoEscape))
-		return
-	}
-	c.JSON(200, s.bot.CQSendPrivateMessage(uid, msg, autoEscape))
-}
-
-// SendGroupMessage 发送群消息
-func SendGroupMessage(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	msg, t := getParamWithType(c, "message")
-	autoEscape := global.EnsureBool(getParam(c, "auto_escape"), false)
-	if t == gjson.JSON {
-		c.JSON(200, s.bot.CQSendGroupMessage(gid, gjson.Parse(msg), autoEscape))
-		return
-	}
-	c.JSON(200, s.bot.CQSendGroupMessage(gid, msg, autoEscape))
-}
-
-// SendGroupForwardMessage 扩展API-发送合并转发(群)
-func SendGroupForwardMessage(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	msg := getParam(c, "messages")
-	c.JSON(200, s.bot.CQSendGroupForwardMessage(gid, gjson.Parse(msg)))
-}
-
-// GetImage 获取图片(修改自OneBot)
-func GetImage(s *httpServer, c *gin.Context) {
-	file := getParam(c, "file")
-	c.JSON(200, s.bot.CQGetImage(file))
-}
-
-// GetMessage 获取消息
-func GetMessage(s *httpServer, c *gin.Context) {
-	mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32)
-	c.JSON(200, s.bot.CQGetMessage(int32(mid)))
-}
-
-// GetGroupHonorInfo 获取群荣誉信息
-func GetGroupHonorInfo(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupHonorInfo(gid, getParam(c, "type")))
-}
-
-// ProcessFriendRequest 处理加好友请求
-func ProcessFriendRequest(s *httpServer, c *gin.Context) {
-	flag := getParam(c, "flag")
-	approve := getParamOrDefault(c, "approve", "true")
-	c.JSON(200, s.bot.CQProcessFriendRequest(flag, approve == "true"))
-}
-
-// ProcessGroupRequest 处理加群请求／邀请
-func ProcessGroupRequest(s *httpServer, c *gin.Context) {
-	flag := getParam(c, "flag")
-	subType := getParam(c, "sub_type")
-	if subType == "" {
-		subType = getParam(c, "type")
-	}
-	approve := getParamOrDefault(c, "approve", "true")
-	c.JSON(200, s.bot.CQProcessGroupRequest(flag, subType, getParam(c, "reason"), approve == "true"))
-}
-
-// SetGroupCard 设置群名片(群备注)
-func SetGroupCard(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupCard(gid, uid, getParam(c, "card")))
-}
-
-// SetSpecialTitle 设置群组专属头衔
-func SetSpecialTitle(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupSpecialTitle(gid, uid, getParam(c, "special_title")))
-}
-
-// SetGroupKick 群组踢人
-func SetGroupKick(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	msg := getParam(c, "message")
-	block := getParamOrDefault(c, "reject_add_request", "false")
-	c.JSON(200, s.bot.CQSetGroupKick(gid, uid, msg, block == "true"))
-}
-
-// SetGroupBan 群组单人禁言
-func SetGroupBan(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	i, _ := strconv.ParseInt(getParamOrDefault(c, "duration", "1800"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupBan(gid, uid, uint32(i)))
-}
-
-// SetWholeBan 群组全员禁言
-func SetWholeBan(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupWholeBan(gid, getParamOrDefault(c, "enable", "true") == "true"))
-}
-
-// SetGroupName 设置群名
-func SetGroupName(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupName(gid, getParam(c, "group_name")))
-}
-
-// SetGroupAdmin 群组设置管理员
-func SetGroupAdmin(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupAdmin(gid, uid, getParamOrDefault(c, "enable", "true") == "true"))
-}
-
-// SendGroupNotice 扩展API-发送群公告
-func SendGroupNotice(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupMemo(gid, getParam(c, "content")))
-}
-
-// SetGroupLeave 退出群组
-func SetGroupLeave(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetGroupLeave(gid))
-}
-
-// SetRestart 重启 OneBot 实现
-//
-// https://git.io/JtwkJ
-func SetRestart(s *httpServer, c *gin.Context) {
-	delay, _ := strconv.ParseInt(getParam(c, "delay"), 10, 64)
-	c.JSON(200, coolq.MSG{"data": nil, "retcode": 0, "status": "async"})
-	go func(delay int64) {
-		time.Sleep(time.Duration(delay) * time.Millisecond)
-		Restart <- struct{}{}
-	}(delay)
-
-}
-
-// GetForwardMessage 获取合并转发消息
-func GetForwardMessage(s *httpServer, c *gin.Context) {
-	resID := getParam(c, "message_id")
-	if resID == "" {
-		resID = getParam(c, "id")
-	}
-	c.JSON(200, s.bot.CQGetForwardMessage(resID))
-}
-
-// GetGroupSystemMessage 扩展API-获取群文件系统消息
-func GetGroupSystemMessage(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQGetGroupSystemMessages())
-}
-
-// DeleteMessage 撤回消息
-func DeleteMessage(s *httpServer, c *gin.Context) {
-	mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 32)
-	c.JSON(200, s.bot.CQDeleteMessage(int32(mid)))
-}
-
-// CanSendImage 检查是否可以发送图片(此处永远返回true)
-func CanSendImage(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQCanSendImage())
-}
-
-// CanSendRecord 检查是否可以发送语音(此处永远返回true)
-func CanSendRecord(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQCanSendRecord())
-}
-
-// GetStatus 获取运行状态
-func GetStatus(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQGetStatus())
-}
-
-// GetVersionInfo 获取版本信息
-func GetVersionInfo(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQGetVersionInfo())
-}
-
-// ReloadEventFilter 扩展API-重载事件过滤器
-func ReloadEventFilter(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQReloadEventFilter())
-}
-
-// GetVipInfo 扩展API-获取VIP信息
-func GetVipInfo(s *httpServer, c *gin.Context) {
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetVipInfo(uid))
-}
-
-// GetStrangerInfo 获取陌生人信息
-func GetStrangerInfo(s *httpServer, c *gin.Context) {
-	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetStrangerInfo(uid))
-}
-
-// GetGroupAtAllRemain 扩展API-获取群 @全体成员 剩余次数
-func GetGroupAtAllRemain(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetAtAllRemain(gid))
-}
-
-// SetGroupAnonymousBan 群组匿名用户禁言
-func SetGroupAnonymousBan(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	d, _ := strconv.ParseInt(getParam(c, "duration"), 10, 64)
-	flag := getParam(c, "flag")
-	if flag == "" {
-		flag = getParam(c, "anonymous_flag")
-	}
-	if flag == "" {
-		o := gjson.Parse(getParam(c, "anonymous"))
-		flag = o.Get("flag").String()
-	}
-	c.JSON(200, s.bot.CQSetGroupAnonymousBan(gid, flag, int32(d)))
-}
-
-// GetGroupMessageHistory 获取群消息历史记录
-func GetGroupMessageHistory(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	seq, _ := strconv.ParseInt(getParam(c, "message_seq"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupMessageHistory(gid, seq))
-}
-
-// GetOnlineClients 扩展API-获取当前账号在线客户端列表
-func GetOnlineClients(s *httpServer, c *gin.Context) {
-	c.JSON(200, s.bot.CQGetOnlineClients(getParamOrDefault(c, "no_cache", "false") == "true"))
-}
-
-// HandleQuickOperation 隐藏API-对事件执行快速操作
-func HandleQuickOperation(s *httpServer, c *gin.Context) {
-	if c.Request.Method != "POST" {
-		c.AbortWithStatus(404)
-		return
-	}
-	if i, ok := c.Get("json_body"); ok {
-		body := i.(gjson.Result)
-		c.JSON(200, s.bot.CQHandleQuickOperation(body.Get("context"), body.Get("operation")))
-	}
-}
-
-// DownloadFile 扩展API-下载文件到缓存目录
-func DownloadFile(s *httpServer, c *gin.Context) {
-	url := getParam(c, "url")
-	tc, _ := strconv.Atoi(getParam(c, "thread_count"))
-	h, t := getParamWithType(c, "headers")
-	headers := map[string]string{}
-	if t == gjson.Null || t == gjson.String {
-		lines := strings.Split(h, "\r\n")
-		for _, sub := range lines {
-			str := strings.SplitN(sub, "=", 2)
-			if len(str) == 2 {
-				headers[str[0]] = str[1]
-			}
-		}
-	}
-	if t == gjson.JSON {
-		arr := gjson.Parse(h)
-		for _, sub := range arr.Array() {
-			str := strings.SplitN(sub.String(), "=", 2)
-			if len(str) == 2 {
-				headers[str[0]] = str[1]
-			}
-		}
-	}
-	println(url, tc, h, t)
-	c.JSON(200, s.bot.CQDownloadFile(url, headers, tc))
-}
-
-// OcrImage 扩展API-图片OCR
-func OcrImage(s *httpServer, c *gin.Context) {
-	img := getParam(c, "image")
-	c.JSON(200, s.bot.CQOcrImage(img))
-}
-
-// GetWordSlices 隐藏API-获取中文分词
-func GetWordSlices(s *httpServer, c *gin.Context) {
-	content := getParam(c, "content")
-	c.JSON(200, s.bot.CQGetWordSlices(content))
-}
-
-// SetGroupPortrait 扩展API-设置群头像
-func SetGroupPortrait(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	file := getParam(c, "file")
-	cache := getParam(c, "cache")
-	c.JSON(200, s.bot.CQSetGroupPortrait(gid, file, cache))
-}
-
-// SetEssenceMsg 扩展API-设置精华消息
-func SetEssenceMsg(s *httpServer, c *gin.Context) {
-	mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 64)
-	c.JSON(200, s.bot.CQSetEssenceMessage(int32(mid)))
-}
-
-// DeleteEssenceMsg 扩展API-移出精华消息
-func DeleteEssenceMsg(s *httpServer, c *gin.Context) {
-	mid, _ := strconv.ParseInt(getParam(c, "message_id"), 10, 64)
-	c.JSON(200, s.bot.CQDeleteEssenceMessage(int32(mid)))
-}
-
-// GetEssenceMsgList 扩展API-获取精华消息列表
-func GetEssenceMsgList(s *httpServer, c *gin.Context) {
-	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetEssenceMessageList(gid))
-}
-
-// CheckURLSafely 扩展API-检查链接安全性
-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 {
-	r := getParam(c, k)
-	if r != "" {
-		return r
-	}
-	return def
-}
-
-func getParam(c *gin.Context, k string) string {
-	p, _ := getParamWithType(c, k)
-	return p
-}
-
-func getParamWithType(c *gin.Context, k string) (string, gjson.Type) {
 	if q := c.Query(k); q != "" {
-		return q, gjson.Null
+		return gjson.Result{Type: gjson.String, Str: q}
 	}
 	if c.Request.Method == "POST" {
 		if h := c.Request.Header.Get("Content-Type"); h != "" {
 			if strings.Contains(h, "application/x-www-form-urlencoded") {
 				if p, ok := c.GetPostForm(k); ok {
-					return p, gjson.Null
+					return gjson.Result{Type: gjson.String, Str: p}
 				}
 			}
 			if strings.Contains(h, "application/json") {
 				if obj, ok := c.Get("json_body"); ok {
-					res := obj.(gjson.Result).Get(k)
+					return obj.(gjson.Result).Get(k)
-					if res.Exists() {
-						switch res.Type {
-						case gjson.JSON:
-							return res.Raw, gjson.JSON
-						case gjson.String:
-							return res.Str, gjson.String
-						case gjson.Number:
-							return strconv.FormatInt(res.Int(), 10), gjson.Number // 似乎没有需要接受 float 类型的api
-						case gjson.True:
-							return "true", gjson.True
-						case gjson.False:
-							return "false", gjson.False
-						}
-					}
 				}
 			}
 		}
 	}
-	return "", gjson.Null
+	return gjson.Result{Type: gjson.Null, Str: ""}
-}
-
-var httpAPI = map[string]func(s *httpServer, c *gin.Context){
-	"get_login_info":             GetLoginInfo,
-	"get_friend_list":            GetFriendList,
-	"get_group_list":             GetGroupList,
-	"get_group_info":             GetGroupInfo,
-	"get_group_member_list":      GetGroupMemberList,
-	"get_group_member_info":      GetGroupMemberInfo,
-	"get_group_file_system_info": GetGroupFileSystemInfo,
-	"get_group_root_files":       GetGroupRootFiles,
-	"get_group_files_by_folder":  GetGroupFilesByFolderID,
-	"get_group_file_url":         GetGroupFileURL,
-	"upload_group_file":          UploadGroupFile,
-	"get_essence_msg_list":       GetEssenceMsgList,
-	"send_msg":                   SendMessage,
-	"send_group_msg":             SendGroupMessage,
-	"send_group_forward_msg":     SendGroupForwardMessage,
-	"send_private_msg":           SendPrivateMessage,
-	"delete_msg":                 DeleteMessage,
-	"delete_essence_msg":         DeleteEssenceMsg,
-	"set_friend_add_request":     ProcessFriendRequest,
-	"set_group_add_request":      ProcessGroupRequest,
-	"set_group_card":             SetGroupCard,
-	"set_group_special_title":    SetSpecialTitle,
-	"set_group_kick":             SetGroupKick,
-	"set_group_ban":              SetGroupBan,
-	"set_group_whole_ban":        SetWholeBan,
-	"set_group_name":             SetGroupName,
-	"set_group_admin":            SetGroupAdmin,
-	"set_essence_msg":            SetEssenceMsg,
-	"set_restart":                SetRestart,
-	"_send_group_notice":         SendGroupNotice,
-	"set_group_leave":            SetGroupLeave,
-	"get_image":                  GetImage,
-	"get_forward_msg":            GetForwardMessage,
-	"get_msg":                    GetMessage,
-	"get_group_system_msg":       GetGroupSystemMessage,
-	"get_group_honor_info":       GetGroupHonorInfo,
-	"can_send_image":             CanSendImage,
-	"can_send_record":            CanSendRecord,
-	"get_status":                 GetStatus,
-	"get_version_info":           GetVersionInfo,
-	"_get_vip_info":              GetVipInfo,
-	"get_stranger_info":          GetStrangerInfo,
-	"reload_event_filter":        ReloadEventFilter,
-	"set_group_portrait":         SetGroupPortrait,
-	"set_group_anonymous_ban":    SetGroupAnonymousBan,
-	"get_group_msg_history":      GetGroupMessageHistory,
-	"check_url_safely":           CheckURLSafely,
-	"download_file":              DownloadFile,
-	".handle_quick_operation":    HandleQuickOperation,
-	".ocr_image":                 OcrImage,
-	"ocr_image":                  OcrImage,
-	"get_group_at_all_remain":    GetGroupAtAllRemain,
-	"get_online_clients":         GetOnlineClients,
-	".get_word_slices":           GetWordSlices,
 }
 
 func (s *httpServer) ShutDown() {

server/websocket.go

@@ -38,6 +38,7 @@ type WebSocketClient struct {
 type webSocketConn struct {
 	*websocket.Conn
 	sync.Mutex
+	apiCaller apiCaller
 }
 
 // WebSocketServer 初始化一个WebSocketServer实例
@@ -106,7 +107,7 @@ func (c *WebSocketClient) connectAPI() {
 		return
 	}
 	log.Infof("已连接到反向WebSocket API服务器 %v", c.conf.ReverseAPIURL)
-	wrappedConn := &webSocketConn{Conn: conn}
+	wrappedConn := &webSocketConn{Conn: conn, apiCaller: apiCaller{c.bot}}
 	go c.listenAPI(wrappedConn, false)
 }
 
@@ -138,7 +139,7 @@ func (c *WebSocketClient) connectEvent() {
 	}
 
 	log.Infof("已连接到反向WebSocket Event服务器 %v", c.conf.ReverseEventURL)
-	c.eventConn = &webSocketConn{Conn: conn}
+	c.eventConn = &webSocketConn{Conn: conn, apiCaller: apiCaller{c.bot}}
 }
 
 func (c *WebSocketClient) connectUniversal() {
@@ -168,7 +169,7 @@ func (c *WebSocketClient) connectUniversal() {
 		log.Warnf("反向WebSocket 握手时出现错误: %v", err)
 	}
 
-	wrappedConn := &webSocketConn{Conn: conn}
+	wrappedConn := &webSocketConn{Conn: conn, apiCaller: apiCaller{c.bot}}
 	go c.listenAPI(wrappedConn, true)
 	c.universalConn = wrappedConn
 }
@@ -250,7 +251,7 @@ func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
 
 	log.Infof("接受 WebSocket 连接: %v (/event)", r.RemoteAddr)
 
-	conn := &webSocketConn{Conn: c}
+	conn := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
 
 	s.eventConnMutex.Lock()
 	s.eventConn = append(s.eventConn, conn)
@@ -273,7 +274,7 @@ func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	log.Infof("接受 WebSocket 连接: %v (/api)", r.RemoteAddr)
-	conn := &webSocketConn{Conn: c}
+	conn := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
 	go s.listenAPI(conn)
 }
 
@@ -299,7 +300,7 @@ func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	log.Infof("接受 WebSocket 连接: %v (/)", r.RemoteAddr)
-	conn := &webSocketConn{Conn: c}
+	conn := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
 	s.eventConn = append(s.eventConn, conn)
 	s.listenAPI(conn)
 }
@@ -318,7 +319,7 @@ func (s *webSocketServer) listenAPI(c *webSocketConn) {
 	}
 }
 
-func (c *webSocketConn) handleRequest(bot *coolq.CQBot, payload []byte) {
+func (c *webSocketConn) handleRequest(_ *coolq.CQBot, payload []byte) {
 	defer func() {
 		if err := recover(); err != nil {
 			log.Printf("处置WS命令时发生无法恢复的异常：%v\n%s", err, debug.Stack())
@@ -329,23 +330,13 @@ func (c *webSocketConn) handleRequest(bot *coolq.CQBot, payload []byte) {
 	j := gjson.ParseBytes(payload)
 	t := strings.ReplaceAll(j.Get("action").Str, "_async", "")
 	log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
-	if f, ok := wsAPI[t]; ok {
+	ret := c.apiCaller.callAPI(t, j.Get("params"))
-		ret := f(bot, j.Get("params"))
+	if j.Get("echo").Exists() {
-		if j.Get("echo").Exists() {
+		ret["echo"] = j.Get("echo").Value()
-			ret["echo"] = j.Get("echo").Value()
-		}
-		c.Lock()
-		defer c.Unlock()
-		_ = c.WriteJSON(ret)
-	} else {
-		ret := coolq.Failed(1404, "API_NOT_FOUND", "API不存在")
-		if j.Get("echo").Exists() {
-			ret["echo"] = j.Get("echo").Value()
-		}
-		c.Lock()
-		defer c.Unlock()
-		_ = c.WriteJSON(ret)
 	}
+	c.Lock()
+	defer c.Unlock()
+	_ = c.WriteJSON(ret)
 }
 
 func (s *webSocketServer) onBotPushEvent(m coolq.MSG) {
@@ -371,254 +362,3 @@ func (s *webSocketServer) onBotPushEvent(m coolq.MSG) {
 		conn.Unlock()
 	}
 }
-
-var wsAPI = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
-	"get_login_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetLoginInfo()
-	},
-	"get_friend_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetFriendList()
-	},
-	"get_group_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupList(p.Get("no_cache").Bool())
-	},
-	"get_group_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupInfo(p.Get("group_id").Int(), p.Get("no_cache").Bool())
-	},
-	"get_group_member_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		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(),
-		)
-	},
-	"send_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		autoEscape := global.EnsureBool(p.Get("auto_escape"), false)
-		if p.Get("message_type").Str == "private" {
-			return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"), autoEscape)
-		}
-		if p.Get("message_type").Str == "group" {
-			return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), autoEscape)
-		}
-		if p.Get("group_id").Int() != 0 {
-			return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), autoEscape)
-		}
-		if p.Get("user_id").Int() != 0 {
-			return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"), autoEscape)
-		}
-		return coolq.MSG{}
-	},
-	"send_group_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), global.EnsureBool(p.Get("auto_escape"), false))
-	},
-	"send_group_forward_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSendGroupForwardMessage(p.Get("group_id").Int(), p.Get("messages"))
-	},
-	"send_private_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("message"), global.EnsureBool(p.Get("auto_escape"), false))
-	},
-	"delete_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQDeleteMessage(int32(p.Get("message_id").Int()))
-	},
-	"set_friend_add_request": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		apr := true
-		if p.Get("approve").Exists() {
-			apr = p.Get("approve").Bool()
-		}
-		return bot.CQProcessFriendRequest(p.Get("flag").Str, apr)
-	},
-	"set_group_add_request": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		subType := p.Get("sub_type").Str
-		apr := true
-		if subType == "" {
-			subType = p.Get("type").Str
-		}
-		if p.Get("approve").Exists() {
-			apr = p.Get("approve").Bool()
-		}
-		return bot.CQProcessGroupRequest(p.Get("flag").Str, subType, p.Get("reason").Str, apr)
-	},
-	"set_group_card": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupCard(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("card").Str)
-	},
-	"set_group_special_title": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupSpecialTitle(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("special_title").Str)
-	},
-	"set_group_kick": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupKick(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("message").Str, p.Get("reject_add_request").Bool())
-	},
-	"set_group_ban": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupBan(p.Get("group_id").Int(), p.Get("user_id").Int(), func() uint32 {
-			if p.Get("duration").Exists() {
-				return uint32(p.Get("duration").Int())
-			}
-			return 1800
-		}())
-	},
-	"set_group_whole_ban": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupWholeBan(p.Get("group_id").Int(), func() bool {
-			if p.Get("enable").Exists() {
-				return p.Get("enable").Bool()
-			}
-			return true
-		}())
-	},
-	"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)
-	},
-	"set_group_leave": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupLeave(p.Get("group_id").Int())
-	},
-	"get_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetImage(p.Get("file").Str)
-	},
-	"get_forward_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		id := p.Get("message_id").Str
-		if id == "" {
-			id = p.Get("id").Str
-		}
-		return bot.CQGetForwardMessage(id)
-	},
-	"get_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetMessage(int32(p.Get("message_id").Int()))
-	},
-	"download_file": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		headers := map[string]string{}
-		headersToken := p.Get("headers")
-		if headersToken.IsArray() {
-			for _, sub := range headersToken.Array() {
-				str := strings.SplitN(sub.String(), "=", 2)
-				if len(str) == 2 {
-					headers[str[0]] = str[1]
-				}
-			}
-		}
-		if headersToken.Type == gjson.String {
-			lines := strings.Split(headersToken.String(), "\r\n")
-			for _, sub := range lines {
-				str := strings.SplitN(sub, "=", 2)
-				if len(str) == 2 {
-					headers[str[0]] = str[1]
-				}
-			}
-		}
-		return bot.CQDownloadFile(p.Get("url").Str, headers, int(p.Get("thread_count").Int()))
-	},
-	"get_group_honor_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupHonorInfo(p.Get("group_id").Int(), p.Get("type").Str)
-	},
-	"set_restart": func(c *coolq.CQBot, p gjson.Result) coolq.MSG {
-		var delay int64
-		delay = p.Get("delay").Int()
-		if delay < 0 {
-			delay = 0
-		}
-		defer func(delay int64) {
-			time.Sleep(time.Duration(delay) * time.Millisecond)
-			Restart <- struct{}{}
-		}(delay)
-		return coolq.MSG{"data": nil, "retcode": 0, "status": "async"}
-
-	},
-	"can_send_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQCanSendImage()
-	},
-	"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()
-	},
-	"get_version_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetVersionInfo()
-	},
-	"get_group_system_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupSystemMessages()
-	},
-	"get_group_file_system_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupFileSystemInfo(p.Get("group_id").Int())
-	},
-	"get_group_root_files": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupRootFiles(p.Get("group_id").Int())
-	},
-	"get_group_files_by_folder": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupFilesByFolderID(p.Get("group_id").Int(), p.Get("folder_id").Str)
-	},
-	"get_group_file_url": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupFileURL(p.Get("group_id").Int(), p.Get("file_id").Str, int32(p.Get("busid").Int()))
-	},
-	"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)
-	},
-	"get_group_msg_history": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupMessageHistory(p.Get("group_id").Int(), p.Get("message_seq").Int())
-	},
-	"_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()
-	},
-	".ocr_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQOcrImage(p.Get("image").Str)
-	},
-	"ocr_image": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQOcrImage(p.Get("image").Str)
-	},
-	"get_group_at_all_remain": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetAtAllRemain(p.Get("group_id").Int())
-	},
-	"get_online_clients": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetOnlineClients(p.Get("no_cache").Bool())
-	},
-	".get_word_slices": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetWordSlices(p.Get("content").Str)
-	},
-	"set_group_portrait": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetGroupPortrait(p.Get("group_id").Int(), p.Get("file").String(), p.Get("cache").String())
-	},
-	"set_essence_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQSetEssenceMessage(int32(p.Get("message_id").Int()))
-	},
-	"delete_essence_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQDeleteEssenceMessage(int32(p.Get("message_id").Int()))
-	},
-	"get_essence_msg_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetEssenceMessageList(p.Get("group_id").Int())
-	},
-	"check_url_safely": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQCheckURLSafely(p.Get("url").String())
-	},
-	"set_group_anonymous_ban": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		obj := p.Get("anonymous")
-		flag := p.Get("anonymous_flag")
-		if !flag.Exists() {
-			flag = p.Get("flag")
-		}
-		if !flag.Exists() && !obj.Exists() {
-			return coolq.Failed(100, "FLAG_NOT_FOUND", "flag未找到")
-		}
-		if !flag.Exists() {
-			flag = obj.Get("flag")
-		}
-		return bot.CQSetGroupAnonymousBan(p.Get("group_id").Int(), flag.String(), int32(p.Get("duration").Int()))
-	},
-	".handle_quick_operation": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
-	},
-}