fix atall permission error.

Mrs4s · Feb 20, 2021 · fff33e3 · fff33e3
1 parent 977ee0c
commit fff33e3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/coolq/api.go b/coolq/api.go
@@ -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()
 					}

diff --git a/coolq/bot.go b/coolq/bot.go
@@ -170,6 +170,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 +219,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 {