fix panic.

Fix EventFilter & Add reload_event_filter

coolq/api.go

@@ -68,20 +68,7 @@ func (bot *CQBot) CQGetGroupInfo(groupId int64) MSG {
 }
 
 // https://cqhttp.cc/docs/4.15/#/API?id=get_group_member_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8
-func (bot *CQBot) CQGetGroupMemberList(groupId int64) MSG {
+func (bot *CQBot) CQGetGroupMemberList(groupId int64, noCache bool) MSG {
-	group := bot.Client.FindGroup(groupId)
-	if group == nil {
-		return Failed(100)
-	}
-	members := make([]MSG, 0)
-	for _, m := range group.Members {
-		members = append(members, convertGroupMemberInfo(groupId, m))
-	}
-	return OK(members)
-}
-
-// https://cqhttp.cc/docs/4.15/#/API?id=get_group_member_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E4%BF%A1%E6%81%AF
-func (bot *CQBot) CQGetGroupMemberInfo(groupId, userId int64, noCache bool) MSG {
 	group := bot.Client.FindGroup(groupId)
 	if group == nil {
 		return Failed(100)
@@ -94,6 +81,19 @@ func (bot *CQBot) CQGetGroupMemberInfo(groupId, userId int64, noCache bool) MSG
 		}
 		group.Members = t
 	}
+	members := make([]MSG, 0)
+	for _, m := range group.Members {
+		members = append(members, convertGroupMemberInfo(groupId, m))
+	}
+	return OK(members)
+}
+
+// https://cqhttp.cc/docs/4.15/#/API?id=get_group_member_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E4%BF%A1%E6%81%AF
+func (bot *CQBot) CQGetGroupMemberInfo(groupId, userId int64) MSG {
+	group := bot.Client.FindGroup(groupId)
+	if group == nil {
+		return Failed(100)
+	}
 	member := group.FindMember(userId)
 	if member == nil {
 		return Failed(102)
@@ -404,6 +404,26 @@ func (bot *CQBot) CQDeleteMessage(messageId int32) MSG {
 	return OK(nil)
 }
 
+// https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_admin-%E7%BE%A4%E7%BB%84%E8%AE%BE%E7%BD%AE%E7%AE%A1%E7%90%86%E5%91%98
+func (bot *CQBot) CQSetGroupAdmin(groupId, userId int64, enable bool) MSG {
+	group := bot.Client.FindGroup(groupId)
+	if group == nil || group.OwnerUin != bot.Client.Uin {
+		return Failed(100)
+	}
+	mem := group.FindMember(userId)
+	if mem == nil {
+		return Failed(100)
+	}
+	mem.SetAdmin(enable)
+	t, err := bot.Client.GetGroupMembers(group)
+	if err != nil {
+		log.Warnf("刷新群 %v 成员列表失败: %v", groupId, err)
+		return Failed(100)
+	}
+	group.Members = t
+	return OK(nil)
+}
+
 func (bot *CQBot) CQGetVipInfo(userId int64) MSG {
 	msg := MSG{}
 	vip, err := bot.Client.GetVipInfo(userId)
@@ -411,13 +431,13 @@ func (bot *CQBot) CQGetVipInfo(userId int64) MSG {
 		return Failed(100)
 	}
 	msg = MSG{
-		"user_id":			vip.Uin,
+		"user_id":          vip.Uin,
-		"nickname":			vip.Name,
+		"nickname":         vip.Name,
-		"level":			vip.Level,
+		"level":            vip.Level,
-		"level_speed":		vip.LevelSpeed,
+		"level_speed":      vip.LevelSpeed,
-		"vip_level":		vip.VipLevel,
+		"vip_level":        vip.VipLevel,
-		"vip_growth_speed":	vip.VipGrowthSpeed,
+		"vip_growth_speed": vip.VipGrowthSpeed,
-		"vip_growth_total":	vip.VipGrowthTotal,
+		"vip_growth_total": vip.VipGrowthTotal,
 	}
 	return OK(msg)
 }
@@ -607,6 +627,11 @@ func (bot *CQBot) CQCanSendRecord() MSG {
 	return OK(MSG{"yes": true})
 }
 
+func (bot *CQBot) CQReloadEventFilter() MSG {
+	global.BootFilter()
+	return OK(nil)
+}
+
 func (bot *CQBot) CQGetStatus() MSG {
 	return OK(MSG{
 		"app_initialized": true,

coolq/bot.go

@@ -226,7 +226,7 @@ func (bot *CQBot) Release() {
 
 func (bot *CQBot) dispatchEventMessage(m MSG) {
 	payload := gjson.Parse(m.ToJson())
-	filter := global.GetFilter()
+	filter := global.EventFilter
 	if filter != nil && (*filter).Eval(payload) == false {
 		log.Debug("Event filtered!")
 		return

docs/config.md

@@ -22,10 +22,15 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 	"password_encrypted": "",
 	"enable_db": true,
 	"access_token": "",
-    "relogin": {
+	"relogin": {
-        "enabled": true,
+		"enabled": true,
-        "relogin_delay": 3,
+		"relogin_delay": 3,
-        "max_relogin_times": 0
+		"max_relogin_times": 0
+	},
+    "_rate_limit": {
+		"enabled": false,
+		"frequency": 1,
+		"bucket_size": 1
     },
 	"post_message_format": "string",
 	"ignore_invalid_cqcode": false,
@@ -66,6 +71,9 @@ go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
 | relogin              | bool     | 是否自动重新登录                                                     |
 | relogin_delay        | int      | 重登录延时（秒）                                                     |
 | max_relogin_times    | uint     | 最大重登录次数，若0则不设置上限                                        |
+| _rate_limit          | bool     | 是否启用API调用限速                                                  |
+| frequency            | float64  | 1s内能调用API的次数                                                  |
+| bucket_size          | int      | 令牌桶的大小，默认为1，修改此值可允许一定程度内连续调用api                 |
 | post_message_format  | string   | 上报信息类型                                                        |
 | ignore_invalid_cqcode| bool     | 是否忽略错误的CQ码                                                   |
 | force_fragmented     | bool     | 是否强制分片发送群长消息                                              |

global/config.go

@@ -21,6 +21,11 @@ type JsonConfig struct {
 		ReLoginDelay    int  `json:"relogin_delay"`
 		MaxReloginTimes uint `json:"max_relogin_times"`
 	} `json:"relogin"`
+	RateLimit struct {
+		Enabled    bool    `json:"enabled"`
+		Frequency  float64 `json:"frequency"`
+		BucketSize int     `json:"bucket_size"`
+	} `json:"_rate_limit"`
 	IgnoreInvalidCQCode bool                          `json:"ignore_invalid_cqcode"`
 	ForceFragmented     bool                          `json:"force_fragmented"`
 	HeartbeatInterval   time.Duration                 `json:"heartbeat_interval"`
@@ -85,6 +90,15 @@ func DefaultConfig() *JsonConfig {
 			ReLoginDelay:    3,
 			MaxReloginTimes: 0,
 		},
+		RateLimit: struct {
+			Enabled    bool    `json:"enabled"`
+			Frequency  float64 `json:"frequency"`
+			BucketSize int     `json:"bucket_size"`
+		}{
+			Enabled:    false,
+			Frequency:  1,
+			BucketSize: 1,
+		},
 		PostMessageFormat: "string",
 		ForceFragmented:   true,
 		HttpConfig: &GoCQHttpConfig{

global/filter.go

@@ -6,7 +6,6 @@ import (
 	"io/ioutil"
 	"regexp"
 	"strings"
-	"sync"
 )
 
 type Filter interface {
@@ -14,7 +13,7 @@ type Filter interface {
 }
 
 type OperationNode struct {
-	key string
+	key    string
 	filter Filter
 }
 
@@ -24,15 +23,14 @@ type NotOperator struct {
 
 func notOperatorConstruct(argument gjson.Result) *NotOperator {
 	if !argument.IsObject() {
-		log.Error("the argument of 'not' operator must be an object")
+		panic("the argument of 'not' operator must be an object")
 	}
 	op := new(NotOperator)
-	op.operand_ = GetOperatorFactory().Generate("and", argument)
+	op.operand_ = Generate("and", argument)
 	return op
 }
 
 func (notOperator NotOperator) Eval(payload gjson.Result) bool {
-	log.Debug("not " + payload.Str)
 	return !(notOperator.operand_).Eval(payload)
 }
 
@@ -42,7 +40,7 @@ type AndOperator struct {
 
 func andOperatorConstruct(argument gjson.Result) *AndOperator {
 	if !argument.IsObject() {
-		log.Error("the argument of 'and' operator must be an object")
+		panic("the argument of 'and' operator must be an object")
 	}
 	op := new(AndOperator)
 	argument.ForEach(func(key, value gjson.Result) bool {
@@ -52,19 +50,19 @@ func andOperatorConstruct(argument gjson.Result) *AndOperator {
 			//       "bar": "baz"
 			//   }
 			opKey := key.Str[1:]
-			op.operands = append(op.operands, OperationNode{"", GetOperatorFactory().Generate(opKey, value)})
+			op.operands = append(op.operands, OperationNode{"", Generate(opKey, value)})
 		} else if value.IsObject() {
 			// is an normal key with an object as the value
 			//   "foo": {
 			//       ".bar": "baz"
 			//   }
-			opKey := key.Str
+			opKey := key.String()
-			op.operands = append(op.operands, OperationNode{opKey, GetOperatorFactory().Generate("and", value)})
+			op.operands = append(op.operands, OperationNode{opKey, Generate("and", value)})
 		} else {
 			// is an normal key with a non-object as the value
 			//   "foo": "bar"
-			opKey := key.Str
+			opKey := key.String()
-			op.operands = append(op.operands, OperationNode{opKey, GetOperatorFactory().Generate("eq", value)})
+			op.operands = append(op.operands, OperationNode{opKey, Generate("eq", value)})
 		}
 		return true
 	})
@@ -72,7 +70,6 @@ func andOperatorConstruct(argument gjson.Result) *AndOperator {
 }
 
 func (andOperator *AndOperator) Eval(payload gjson.Result) bool {
-	log.Debug("and " + payload.Str)
 	res := true
 	for _, operand := range andOperator.operands {
 
@@ -98,19 +95,18 @@ type OrOperator struct {
 
 func orOperatorConstruct(argument gjson.Result) *OrOperator {
 	if !argument.IsArray() {
-		log.Error("the argument of 'or' operator must be an array")
+		panic("the argument of 'or' operator must be an array")
 	}
 	op := new(OrOperator)
 	argument.ForEach(func(_, value gjson.Result) bool {
-		op.operands = append(op.operands, GetOperatorFactory().Generate("and", value))
+		op.operands = append(op.operands, Generate("and", value))
 		return true
 	})
 	return op
 }
 
 func (orOperator OrOperator) Eval(payload gjson.Result) bool {
-	log.Debug("or "+ payload.Str)
+	res := false
-	res:= false
 	for _, operand := range orOperator.operands {
 		res = res || operand.Eval(payload)
 
@@ -132,8 +128,7 @@ func equalOperatorConstruct(argument gjson.Result) *EqualOperator {
 }
 
 func (equalOperator EqualOperator) Eval(payload gjson.Result) bool {
-	log.Debug("eq "+ payload.Str + "==" + equalOperator.value.Str)
+	return payload.String() == equalOperator.value.String()
-	return payload.Str == equalOperator.value.Str
 }
 
 type NotEqualOperator struct {
@@ -147,18 +142,16 @@ func notEqualOperatorConstruct(argument gjson.Result) *NotEqualOperator {
 }
 
 func (notEqualOperator NotEqualOperator) Eval(payload gjson.Result) bool {
-	log.Debug("neq " + payload.Str)
+	return !(payload.String() == notEqualOperator.value.String())
-	return !(payload.Str == notEqualOperator.value.Str)
 }
 
-
 type InOperator struct {
 	operand gjson.Result
 }
 
 func inOperatorConstruct(argument gjson.Result) *InOperator {
 	if argument.IsObject() {
-		log.Error("the argument of 'in' operator must be an array or a string")
+		panic("the argument of 'in' operator must be an array or a string")
 	}
 	op := new(InOperator)
 	op.operand = argument
@@ -166,16 +159,15 @@ func inOperatorConstruct(argument gjson.Result) *InOperator {
 }
 
 func (inOperator InOperator) Eval(payload gjson.Result) bool {
-	log.Debug("in " + payload.Str)
 	if inOperator.operand.IsArray() {
 		res := false
 		inOperator.operand.ForEach(func(key, value gjson.Result) bool {
-			res = res || value.Str == payload.Str
+			res = res || value.String() == payload.String()
 			return true
 		})
 		return res
 	}
-	return strings.Contains(inOperator.operand.Str, payload.Str)
+	return strings.Contains(inOperator.operand.String(), payload.String())
 }
 
 type ContainsOperator struct {
@@ -184,15 +176,14 @@ type ContainsOperator struct {
 
 func containsOperatorConstruct(argument gjson.Result) *ContainsOperator {
 	if argument.IsArray() || argument.IsObject() {
-		log.Error("the argument of 'contains' operator must be a string")
+		panic("the argument of 'contains' operator must be a string")
 	}
 	op := new(ContainsOperator)
-	op.operand = argument.Str
+	op.operand = argument.String()
 	return op
 }
 
 func (containsOperator ContainsOperator) Eval(payload gjson.Result) bool {
-	log.Debug("contains "+ payload.Str)
 	if payload.IsObject() || payload.IsArray() {
 		return false
 	}
@@ -205,29 +196,19 @@ type RegexOperator struct {
 
 func regexOperatorConstruct(argument gjson.Result) *RegexOperator {
 	if argument.IsArray() || argument.IsObject() {
-		log.Error("the argument of 'regex' operator must be a string")
+		panic("the argument of 'regex' operator must be a string")
 	}
 	op := new(RegexOperator)
-	op.regex = argument.Str
+	op.regex = argument.String()
 	return op
 }
 
 func (containsOperator RegexOperator) Eval(payload gjson.Result) bool {
-	log.Debug("regex " + payload.Str)
+	matched, _ := regexp.MatchString(containsOperator.regex, payload.String())
-	matched, _ := regexp.MatchString(containsOperator.regex, payload.Str)
 	return matched
 }
-// 单例工厂
-type operatorFactory struct{
-}
 
-var instance *operatorFactory = &operatorFactory{}
+func Generate(opName string, argument gjson.Result) Filter {
-
-func GetOperatorFactory() *operatorFactory {
-	return instance
-}
-
-func (o operatorFactory) Generate(opName string, argument gjson.Result) Filter {
 	switch opName {
 	case "not":
 		return notOperatorConstruct(argument)
@@ -246,22 +227,25 @@ func (o operatorFactory) Generate(opName string, argument gjson.Result) Filter {
 	case "regex":
 		return regexOperatorConstruct(argument)
 	default:
-		log.Warnf("the operator '%s' is not supported", opName)
+		panic("the operator " + opName + " is not supported")
-		return nil
 	}
 }
 
-var filter = new(Filter)
+var EventFilter = new(Filter)
-var once sync.Once   // 过滤器单例模式
 
-func GetFilter() *Filter {
+func BootFilter() {
-	once.Do(func() {
+	defer func() {
-		f, err := ioutil.ReadFile("filter.json")
+		if e := recover(); e != nil {
-		if err != nil {
+			log.Warnf("事件过滤器启动失败: %v", e)
-			filter = nil
+			EventFilter = nil
 		} else {
-			*filter = GetOperatorFactory().Generate("and", gjson.ParseBytes(f))
+			log.Info("事件过滤器启动成功.")
 		}
-	})
+	}()
-	return filter
+	f, err := ioutil.ReadFile("filter.json")
-}
+	if err != nil {
+		panic(err)
+	} else {
+		*EventFilter = Generate("and", gjson.ParseBytes(f))
+	}
+}

global/ratelimit.go

@@ -0,0 +1,20 @@
+package global
+
+import (
+	"context"
+	"golang.org/x/time/rate"
+)
+
+var limiter *rate.Limiter
+var limitEnable = false
+
+func RateLimit(ctx context.Context) {
+	if limitEnable {
+		_ = limiter.Wait(ctx)
+	}
+}
+
+func InitLimiter(r float64, b int) {
+	limitEnable = true
+	limiter = rate.NewLimiter(rate.Limit(r), b)
+}

go.mod

@@ -3,7 +3,7 @@ module github.com/Mrs4s/go-cqhttp
 go 1.14
 
 require (
-	github.com/Mrs4s/MiraiGo v0.0.0-20200906025848-23750bb59124
+	github.com/Mrs4s/MiraiGo v0.0.0-20200911100852-71bc19cd42eb
 	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
 	github.com/gin-gonic/gin v1.6.3
 	github.com/go-playground/validator/v10 v10.3.0 // indirect
@@ -12,7 +12,7 @@ require (
 	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
 	github.com/jonboulle/clockwork v0.2.0 // indirect
 	github.com/json-iterator/go v1.1.10 // indirect
-	github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
+	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.3 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
@@ -25,6 +25,7 @@ require (
 	github.com/xujiajun/nutsdb v0.5.0
 	github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189
 	golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect
-	golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f // indirect
+	golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 // indirect
+	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
 	gopkg.in/yaml.v2 v2.3.0 // indirect
 )

go.sum

@@ -1,24 +1,29 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Mrs4s/MiraiGo v0.0.0-20200906025848-23750bb59124 h1:qqwuCK/U9wzVf4ZmlvXI2BC1+gBESNSUD5yNjTfoExQ=
+github.com/Mrs4s/MiraiGo v0.0.0-20200909095006-dde8bded28d1 h1:3cmUqA5RaikLx+59SODlBA7tjORQoh4t1w5CzH5bIH8=
-github.com/Mrs4s/MiraiGo v0.0.0-20200906025848-23750bb59124/go.mod h1:TVEPCV9iayaBPTDLNGO9kc734jXNT/sxbhqo4IYkvko=
+github.com/Mrs4s/MiraiGo v0.0.0-20200909095006-dde8bded28d1/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
+github.com/Mrs4s/MiraiGo v0.0.0-20200909103204-808a63a78efe h1:O2BW87BwpwZDsn7YFHLfRGFGvTS4OUZsG2UiA13OxcQ=
+github.com/Mrs4s/MiraiGo v0.0.0-20200909103204-808a63a78efe/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
+github.com/Mrs4s/MiraiGo v0.0.0-20200910010455-37409b1f6b9c h1:bhVr3W0+WTVN+vgZGlxD4iFSV9L3CmUg/lt91h+Ll18=
+github.com/Mrs4s/MiraiGo v0.0.0-20200910010455-37409b1f6b9c/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
+github.com/Mrs4s/MiraiGo v0.0.0-20200910013944-236c0f629099 h1:b+Tmo9h5leZmQokdUu8c2xSIRkkSYoP1z8G+zcwwyRY=
+github.com/Mrs4s/MiraiGo v0.0.0-20200910013944-236c0f629099/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
+github.com/Mrs4s/MiraiGo v0.0.0-20200911100852-71bc19cd42eb h1:WRj/3obehfAMTNKfNo+X3NVqXjeNurMk2yy6haNl/Yk=
+github.com/Mrs4s/MiraiGo v0.0.0-20200911100852-71bc19cd42eb/go.mod h1:cwYPI2uq6nxNbx0nA6YuAKF1V5szSs6FPlGVLQvRUlo=
 github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
 github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 h1:Ghm4eQYC0nEPnSJdVkTrXpu9KtoVCSo1hg7mtI7G9KU=
 github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239/go.mod h1:Gdwt2ce0yfBxPvZrHkprdPPTTS3N5rwmLE8T22KBXlw=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
 github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
-github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
@@ -26,7 +31,6 @@ github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTM
 github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
 github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-playground/validator/v10 v10.3.0 h1:nZU+7q+yJoFmwvNgv/LnPUkwPal62+b2xXj0AU1Es7o=
 github.com/go-playground/validator/v10 v10.3.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
@@ -34,7 +38,6 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
@@ -48,22 +51,17 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/guonaihong/gout v0.1.2 h1:TR2XCRopGgJdj231IayEoeavgbznFXzzzcZVdT/hG10=
 github.com/guonaihong/gout v0.1.2/go.mod h1:vXvv5Kxr70eM5wrp4F0+t9lnLWmq+YPW2GByll2f/EA=
-github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 h1:IPJ3dvxmJ4uczJe5YQdrYB16oTJlGSC/OyZDqUk9xX4=
 github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag=
-github.com/jonboulle/clockwork v0.2.0 h1:J2SLSdy7HgElq8ekSl2Mxh6vrRNFxqbXGenYH2I02Vs=
 github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
@@ -71,27 +69,25 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv
 github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8=
 github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
 github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible h1:4mNlp+/SvALIPFpbXV3kxNJJno9iKFWGxSDE13Kl66Q=
 github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
+github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4=
+github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
 github.com/lestrrat-go/strftime v1.0.3 h1:qqOPU7y+TM8Y803I8fG9c/DyKG3xH/xkng6keC1015Q=
 github.com/lestrrat-go/strftime v1.0.3/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo=
@@ -103,11 +99,9 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk=
 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
-github.com/tebeka/strftime v0.1.5 h1:1NQKN1NiQgkqd/2moD6ySP/5CoZQsKa1d3ZhJ44Jpmg=
 github.com/tebeka/strftime v0.1.5/go.mod h1:29/OidkoWHdEKZqzyDLUyC+LmgDgdHo4WAFCDT7D/Ig=
 github.com/tidwall/gjson v1.6.1 h1:LRbvNuNuvAiISWg6gxLEFuCe72UKy5hDqhxW/8183ws=
 github.com/tidwall/gjson v1.6.1/go.mod h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0=
@@ -139,7 +133,6 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200904194848-62affa334b73 h1:MXfv8rhZWmFeqX3GNZRsd6vOLoaCHjYEX3qkRo3YBUA=
 golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
@@ -157,14 +150,17 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f h1:Fqb3ao1hUmOR3GkUOg/Y+BadLwykBIzs5q8Ez2SbHyc=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 h1:W0lCpv29Hv0UaM1LXb9QlBHLNP8UFfcKjblhVCWftOM=
+golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s=
+golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -184,12 +180,10 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
 gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

main.go

@@ -10,6 +10,7 @@ import (
 	"image"
 	"io"
 	"io/ioutil"
+	"net"
 	"os"
 	"os/signal"
 	"path"
@@ -224,6 +225,28 @@ func main() {
 			log.Debug("Protocol -> " + e.Message)
 		}
 	})
+	cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) {
+		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. 服务器地址: %v:%v 服务器位置: %v", e.Servers[0].Server, e.Servers[0].Port, e.Servers[0].Location)
+		_ = ioutil.WriteFile("servers.bin", binary.NewWriterF(func(w *binary.Writer) {
+			w.WriteUInt16(uint16(len(e.Servers)))
+			for _, s := range e.Servers {
+				if !strings.Contains(s.Server, "com") {
+					w.WriteString(s.Server)
+					w.WriteUInt16(uint16(s.Port))
+				}
+			}
+		}), 0644)
+	})
+	if global.PathExists("servers.bin") {
+		if data, err := ioutil.ReadFile("servers.bin"); err == nil {
+			r := binary.NewReader(data)
+			r.ReadUInt16()
+			cli.CustomServer = &net.TCPAddr{
+				IP:   net.ParseIP(r.ReadString()),
+				Port: int(r.ReadUInt16()),
+			}
+		}
+	}
 	rsp, err := cli.Login()
 	for {
 		global.Check(err)
@@ -263,6 +286,11 @@ func main() {
 	} else {
 		coolq.SetMessageFormat(conf.PostMessageFormat)
 	}
+	if conf.RateLimit.Enabled {
+		global.InitLimiter(conf.RateLimit.Frequency, conf.RateLimit.BucketSize)
+	}
+	log.Info("正在加载事件过滤器.")
+	global.BootFilter()
 	coolq.IgnoreInvalidCQCode = conf.IgnoreInvalidCQCode
 	coolq.ForceFragmented = conf.ForceFragmented
 	if conf.HttpConfig != nil && conf.HttpConfig.Enabled {

server/http.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+	"context"
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/hex"
@@ -74,93 +75,7 @@ func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
 		})
 	}
 
-	s.engine.Any("/get_login_info", s.GetLoginInfo)
+	s.engine.Any("/:action", s.HandleActions)
-	s.engine.Any("/get_login_info_async", s.GetLoginInfo)
-
-	s.engine.Any("/get_friend_list", s.GetFriendList)
-	s.engine.Any("/get_friend_list_async", s.GetFriendList)
-
-	s.engine.Any("/get_group_list", s.GetGroupList)
-	s.engine.Any("/get_group_list_async", s.GetGroupList)
-
-	s.engine.Any("/get_group_info", s.GetGroupInfo)
-	s.engine.Any("/get_group_info_async", s.GetGroupInfo)
-
-	s.engine.Any("/get_group_member_list", s.GetGroupMemberList)
-	s.engine.Any("/get_group_member_list_async", s.GetGroupMemberList)
-
-	s.engine.Any("/get_group_member_info", s.GetGroupMemberInfo)
-	s.engine.Any("/get_group_member_info_async", s.GetGroupMemberInfo)
-
-	s.engine.Any("/send_msg", s.SendMessage)
-	s.engine.Any("/send_msg_async", s.SendMessage)
-
-	s.engine.Any("/send_private_msg", s.SendPrivateMessage)
-	s.engine.Any("/send_private_msg_async", s.SendPrivateMessage)
-
-	s.engine.Any("/send_group_msg", s.SendGroupMessage)
-	s.engine.Any("/send_group_msg_async", s.SendGroupMessage)
-
-	s.engine.Any("/send_group_forward_msg", s.SendGroupForwardMessage)
-	s.engine.Any("/send_group_forward_msg_async", s.SendGroupForwardMessage)
-
-	s.engine.Any("/delete_msg", s.DeleteMessage)
-	s.engine.Any("/delete_msg_async", s.DeleteMessage)
-
-	s.engine.Any("/set_friend_add_request", s.ProcessFriendRequest)
-	s.engine.Any("/set_friend_add_request_async", s.ProcessFriendRequest)
-
-	s.engine.Any("/set_group_add_request", s.ProcessGroupRequest)
-	s.engine.Any("/set_group_add_request_async", s.ProcessGroupRequest)
-
-	s.engine.Any("/set_group_card", s.SetGroupCard)
-	s.engine.Any("/set_group_card_async", s.SetGroupCard)
-
-	s.engine.Any("/set_group_special_title", s.SetSpecialTitle)
-	s.engine.Any("/set_group_special_title_async", s.SetSpecialTitle)
-
-	s.engine.Any("/set_group_kick", s.SetGroupKick)
-	s.engine.Any("/set_group_kick_async", s.SetGroupKick)
-
-	s.engine.Any("/set_group_ban", s.SetGroupBan)
-	s.engine.Any("/set_group_ban_async", s.SetGroupBan)
-
-	s.engine.Any("/set_group_whole_ban", s.SetWholeBan)
-	s.engine.Any("/set_group_whole_ban_async", s.SetWholeBan)
-
-	s.engine.Any("/set_group_name", s.SetGroupName)
-	s.engine.Any("/set_group_name_async", s.SetGroupName)
-
-	s.engine.Any("/_send_group_notice", s.SendGroupNotice)
-	s.engine.Any("/_send_group_notice_async", s.SendGroupNotice)
-
-	s.engine.Any("/set_group_leave", s.SetGroupLeave)
-	s.engine.Any("/set_group_leave_async", s.SetGroupLeave)
-
-	s.engine.Any("/get_image", s.GetImage)
-
-	s.engine.Any("/get_forward_msg", s.GetForwardMessage)
-
-	s.engine.Any("/get_group_msg", s.GetGroupMessage)
-
-	s.engine.Any("/get_group_honor_info", s.GetGroupHonorInfo)
-
-	s.engine.Any("/can_send_image", s.CanSendImage)
-	s.engine.Any("/can_send_image_async", s.CanSendImage)
-
-	s.engine.Any("/can_send_record", s.CanSendRecord)
-	s.engine.Any("/can_send_record_async", s.CanSendRecord)
-
-	s.engine.Any("/get_status", s.GetStatus)
-	s.engine.Any("/get_status_async", s.GetStatus)
-
-	s.engine.Any("/get_version_info", s.GetVersionInfo)
-	s.engine.Any("/get_version_info_async", s.GetVersionInfo)
-
-	s.engine.Any("/_get_vip_info", s.GetVipInfo)
-	s.engine.Any("/_get_vip_info_async", s.GetVipInfo)
-
-	s.engine.Any("/.handle_quick_operation", s.HandleQuickOperation)
 
 	go func() {
 		log.Infof("CQ HTTP 服务器已启动: %v", addr)
@@ -213,6 +128,17 @@ func (c *httpClient) onBotPushEvent(m coolq.MSG) {
 	}
 }
 
+func (s *httpServer) HandleActions(c *gin.Context) {
+	global.RateLimit(context.Background())
+	action := strings.ReplaceAll(c.Param("action"), "_async", "")
+	log.Debugf("HTTPServer接收到API调用: %v", action)
+	if f, ok := httpApi[action]; ok {
+		f(s, c)
+	} else {
+		c.JSON(200, coolq.Failed(404))
+	}
+}
+
 func (s *httpServer) GetLoginInfo(c *gin.Context) {
 	c.JSON(200, s.bot.CQGetLoginInfo())
 }
@@ -233,14 +159,14 @@ func (s *httpServer) GetGroupInfo(c *gin.Context) {
 
 func (s *httpServer) GetGroupMemberList(c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
-	c.JSON(200, s.bot.CQGetGroupMemberList(gid))
+	nc := getParamOrDefault(c, "no_cache", "false")
+	c.JSON(200, s.bot.CQGetGroupMemberList(gid, nc == "true"))
 }
 
 func (s *httpServer) GetGroupMemberInfo(c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
-	nc := getParamOrDefault(c, "no_cache", "false")
+	c.JSON(200, s.bot.CQGetGroupMemberInfo(gid, uid))
-	c.JSON(200, s.bot.CQGetGroupMemberInfo(gid, uid, nc == "true"))
 }
 
 func (s *httpServer) SendMessage(c *gin.Context) {
@@ -356,6 +282,12 @@ func (s *httpServer) SetGroupName(c *gin.Context) {
 	c.JSON(200, s.bot.CQSetGroupName(gid, getParam(c, "group_name")))
 }
 
+func (s *httpServer) SetGroupAdmin(c *gin.Context) {
+	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
+	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
+	c.JSON(200, s.bot.CQSetGroupAdmin(gid, uid, getParamOrDefault(c, "enable", "true") == "true"))
+}
+
 func (s *httpServer) SendGroupNotice(c *gin.Context) {
 	gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
 	c.JSON(200, s.bot.CQSetGroupMemo(gid, getParam(c, "content")))
@@ -392,6 +324,10 @@ func (s *httpServer) GetVersionInfo(c *gin.Context) {
 	c.JSON(200, s.bot.CQGetVersionInfo())
 }
 
+func (s *httpServer) ReloadEventFilter(c *gin.Context) {
+	c.JSON(200, s.bot.CQReloadEventFilter())
+}
+
 func (s *httpServer) GetVipInfo(c *gin.Context) {
 	uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
 	c.JSON(200, s.bot.CQGetVipInfo(uid))
@@ -455,3 +391,105 @@ func getParamWithType(c *gin.Context, k string) (string, gjson.Type) {
 	}
 	return "", gjson.Null
 }
+
+var httpApi = map[string]func(s *httpServer, c *gin.Context){
+	"get_login_info": func(s *httpServer, c *gin.Context) {
+		s.GetLoginInfo(c)
+	},
+	"get_friend_list": func(s *httpServer, c *gin.Context) {
+		s.GetFriendList(c)
+	},
+	"get_group_list": func(s *httpServer, c *gin.Context) {
+		s.GetGroupList(c)
+	},
+	"get_group_info": func(s *httpServer, c *gin.Context) {
+		s.GetGroupInfo(c)
+	},
+	"get_group_member_list": func(s *httpServer, c *gin.Context) {
+		s.GetGroupMemberList(c)
+	},
+	"get_group_member_info": func(s *httpServer, c *gin.Context) {
+		s.GetGroupMemberInfo(c)
+	},
+	"send_msg": func(s *httpServer, c *gin.Context) {
+		s.SendMessage(c)
+	},
+	"send_group_msg": func(s *httpServer, c *gin.Context) {
+		s.SendGroupMessage(c)
+	},
+	"send_group_forward_msg": func(s *httpServer, c *gin.Context) {
+		s.SendGroupForwardMessage(c)
+	},
+	"send_private_msg": func(s *httpServer, c *gin.Context) {
+		s.SendPrivateMessage(c)
+	},
+	"delete_msg": func(s *httpServer, c *gin.Context) {
+		s.DeleteMessage(c)
+	},
+	"set_friend_add_request": func(s *httpServer, c *gin.Context) {
+		s.ProcessFriendRequest(c)
+	},
+	"set_group_add_request": func(s *httpServer, c *gin.Context) {
+		s.ProcessGroupRequest(c)
+	},
+	"set_group_card": func(s *httpServer, c *gin.Context) {
+		s.SetGroupCard(c)
+	},
+	"set_group_special_title": func(s *httpServer, c *gin.Context) {
+		s.SetSpecialTitle(c)
+	},
+	"set_group_kick": func(s *httpServer, c *gin.Context) {
+		s.SetGroupKick(c)
+	},
+	"set_group_ban": func(s *httpServer, c *gin.Context) {
+		s.SetGroupBan(c)
+	},
+	"set_group_whole_ban": func(s *httpServer, c *gin.Context) {
+		s.SetWholeBan(c)
+	},
+	"set_group_name": func(s *httpServer, c *gin.Context) {
+		s.SetGroupName(c)
+	},
+	"set_group_admin": func(s *httpServer, c *gin.Context) {
+		s.SetGroupAdmin(c)
+	},
+	"_send_group_notice": func(s *httpServer, c *gin.Context) {
+		s.SendGroupNotice(c)
+	},
+	"set_group_leave": func(s *httpServer, c *gin.Context) {
+		s.SetGroupLeave(c)
+	},
+	"get_image": func(s *httpServer, c *gin.Context) {
+		s.GetImage(c)
+	},
+	"get_forward_msg": func(s *httpServer, c *gin.Context) {
+		s.GetForwardMessage(c)
+	},
+	"get_group_msg": func(s *httpServer, c *gin.Context) {
+		s.GetGroupMessage(c)
+	},
+	"get_group_honor_info": func(s *httpServer, c *gin.Context) {
+		s.GetGroupHonorInfo(c)
+	},
+	"can_send_image": func(s *httpServer, c *gin.Context) {
+		s.CanSendImage(c)
+	},
+	"can_send_record": func(s *httpServer, c *gin.Context) {
+		s.CanSendRecord(c)
+	},
+	"get_status": func(s *httpServer, c *gin.Context) {
+		s.GetStatus(c)
+	},
+	"get_version_info": func(s *httpServer, c *gin.Context) {
+		s.GetVersionInfo(c)
+	},
+	"_get_vip_info": func(s *httpServer, c *gin.Context) {
+		s.GetVipInfo(c)
+	},
+	"reload_event_filter": func(s *httpServer, c *gin.Context) {
+		s.ReloadEventFilter(c)
+	},
+	".handle_quick_operation": func(s *httpServer, c *gin.Context) {
+		s.HandleQuickOperation(c)
+	},
+}

server/websocket.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"strconv"
@@ -222,20 +223,12 @@ func (c *websocketClient) onBotPushEvent(m coolq.MSG) {
 
 func (s *websocketServer) event(w http.ResponseWriter, r *http.Request) {
 	if s.token != "" {
-		if auth := r.URL.Query().Get("access_token"); auth != s.token && auth != "" {
+		if auth := r.URL.Query().Get("access_token"); auth != s.token {
-			log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
+			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
-			w.WriteHeader(401)
+				log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr)
-			return
-		} else if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) == 2 {
-			if auth[1] != s.token {
-				log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
 				w.WriteHeader(401)
 				return
 			}
-		} else {
-			log.Warnf("已拒绝 %v 的 Websocket 请求: 空Token或传入格式错误", r.RemoteAddr)
-			w.WriteHeader(401)
-			return
 		}
 	}
 	c, err := upgrader.Upgrade(w, r, nil)
@@ -261,20 +254,12 @@ func (s *websocketServer) event(w http.ResponseWriter, r *http.Request) {
 
 func (s *websocketServer) api(w http.ResponseWriter, r *http.Request) {
 	if s.token != "" {
-		if auth := r.URL.Query().Get("access_token"); auth != s.token && auth != "" {
+		if auth := r.URL.Query().Get("access_token"); auth != s.token {
-			log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
+			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
-			w.WriteHeader(401)
+				log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr)
-			return
-		} else if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) == 2 {
-			if auth[1] != s.token {
-				log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
 				w.WriteHeader(401)
 				return
 			}
-		} else {
-			log.Warnf("已拒绝 %v 的 Websocket 请求: 空Token或传入格式错误", r.RemoteAddr)
-			w.WriteHeader(401)
-			return
 		}
 	}
 	c, err := upgrader.Upgrade(w, r, nil)
@@ -289,20 +274,12 @@ func (s *websocketServer) api(w http.ResponseWriter, r *http.Request) {
 
 func (s *websocketServer) any(w http.ResponseWriter, r *http.Request) {
 	if s.token != "" {
-		if auth := r.URL.Query().Get("access_token"); auth != s.token && auth != "" {
+		if auth := r.URL.Query().Get("access_token"); auth != s.token {
-			log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
+			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
-			w.WriteHeader(401)
+				log.Warnf("已拒绝 %v 的 Websocket 请求: Token鉴权失败", r.RemoteAddr)
-			return
-		} else if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) == 2 {
-			if auth[1] != s.token {
-				log.Warnf("已拒绝 %v 的 Websocket 请求: Token错误", r.RemoteAddr)
 				w.WriteHeader(401)
 				return
 			}
-		} else {
-			log.Warnf("已拒绝 %v 的 Websocket 请求: 空Token或传入格式错误", r.RemoteAddr)
-			w.WriteHeader(401)
-			return
 		}
 	}
 	c, err := upgrader.Upgrade(w, r, nil)
@@ -316,7 +293,6 @@ func (s *websocketServer) any(w http.ResponseWriter, r *http.Request) {
 		c.Close()
 		return
 	}
-
 	log.Infof("接受 Websocket 连接: %v (/)", r.RemoteAddr)
 	conn := &websocketConn{Conn: c}
 	s.eventConn = append(s.eventConn, conn)
@@ -344,7 +320,7 @@ func (c *websocketConn) handleRequest(bot *coolq.CQBot, payload []byte) {
 			c.Close()
 		}
 	}()
-
+	global.RateLimit(context.Background())
 	j := gjson.ParseBytes(payload)
 	t := strings.ReplaceAll(j.Get("action").Str, "_async", "")
 	log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
@@ -397,12 +373,11 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
 		return bot.CQGetGroupInfo(p.Get("group_id").Int())
 	},
 	"get_group_member_list": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
-		return bot.CQGetGroupMemberList(p.Get("group_id").Int())
+		return bot.CQGetGroupMemberList(p.Get("group_id").Int(), p.Get("no_cache").Bool())
 	},
 	"get_group_member_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQGetGroupMemberInfo(
 			p.Get("group_id").Int(), p.Get("user_id").Int(),
-			p.Get("no_cache").Bool(),
 		)
 	},
 	"send_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
@@ -479,6 +454,14 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
 	"set_group_name": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQSetGroupName(p.Get("group_id").Int(), p.Get("group_name").Str)
 	},
+	"set_group_admin": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		return bot.CQSetGroupAdmin(p.Get("group_id").Int(), p.Get("user_id").Int(), func() bool {
+			if p.Get("enable").Exists() {
+				return p.Get("enable").Bool()
+			}
+			return true
+		}())
+	},
 	"_send_group_notice": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQSetGroupMemo(p.Get("group_id").Int(), p.Get("content").Str)
 	},
@@ -512,6 +495,9 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
 	"_get_vip_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQGetVipInfo(p.Get("user_id").Int())
 	},
+	"reload_event_filter": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
+		return bot.CQReloadEventFilter()
+	},
 	".handle_quick_operation": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
 		return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
 	},