fix: 修复reply中at消息

Author: icey-yu

README.MD

@@ -5,3 +5,8 @@
 ```bash
 ChatGPT-API-server 8848 Alice
 ```
+
+### 开发注意事项
+- 如果要在`Reply`类型的消息的开始部位加入`At`消息，需要加入两次才能生效。 
+如：`sendingMessage.Elements = append(sendingMessage.Elements, at, reply, at, msgStr)`或
+`sendingMessage.Elements = append(sendingMessage.Elements, reply, at, at, msgStr)`

internal/logic/chatGPT/chat_gpt.go

@@ -10,6 +10,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/Mrs4s/MiraiGo/message"
 	"io"
 	"sync"
 	"time"
@@ -27,7 +28,8 @@ const (
 	groupRedisKeyFormat   = "botAlice:chatGPT:group:%d"   // 群聊的redis会话消息保存key
 	privateRedisKeyFormat = "botAlice:chatGPT:private:%d" // 私聊的redis会话消息保存key
 
-	tryTimes = 2 // 最多尝试次数
+	tryTimes    = 10              // 最多尝试次数。半分钟刷新时间，是很正常的
+	refreshTime = time.Second * 3 // 重试的等待时间
 )
 
 var (
@@ -55,21 +57,28 @@ func init() {
 	service.RegisterChatGPT(new_())
 }
 
-func (s *sChatGPT) GroupChat(code int64, msg string) (string, error) {
+func (s *sChatGPT) GroupChat(groupMessage *message.GroupMessage, msg string) (string, error) {
+	code := groupMessage.GroupCode
+	replyMsg := message.NewReply(groupMessage)
 	// 锁
+	ch <- true
 	if ok := mutex.TryLock(); !ok {
 		// 有人正在使用
-		sendMsg := utils.BuildTextMessage(fmt.Sprintf("有%d人正在使用chatGPT，稍后将为您重新调用~", len(ch)))
+		sendMsg := utils.BuildTextMessage(fmt.Sprintf("有%d条消息在您之前使用chatGPT，稍后将为您重新调用~", len(ch)-1)).Append(replyMsg)
 		global.Alice.SendGroupMessage(code, sendMsg)
 		mutex.Lock()
+	} else {
+		// 发送消息表示已经接收到了请求
+		sendMsg := message.NewSendingMessage()
+		textMsg := message.NewText("让我想想呢🤔...") // 单独🤔 不支持reply消息，哈软！
+		sendMsg.Elements = append(sendMsg.Elements, replyMsg, textMsg)
+		global.Alice.SendGroupMessage(code, sendMsg)
 	}
 	defer func() {
 		mutex.Unlock() // 解锁
 		<-ch
 	}()
 
-	ch <- true
-
 	return s.chat(consts.Group, code, msg)
 }
 
@@ -95,11 +104,12 @@ func (s *sChatGPT) chat(type_ int, code int64, msg string) (string, error) {
 		// 说明有错
 		g.Log().Errorf(gctx.New(), err.Error())
 		reTryCount++
+		time.Sleep(refreshTime) // 等待页面刷新
 	}
 	if err != nil {
 		return "", gerror.Wrapf(err, "发送聊天请求失败")
 	}
-	
+
 	msgData.ConversationId = resp.ConversationId
 	msgData.ParentId = resp.ResponseId
 	err = s.saveMsgData(type_, code, *msgData)

internal/logic/groupMessageEvent/at_event.go

@@ -32,10 +32,8 @@ func (s *groupMessageEventPerformer) atEvent(msg string) (bool, error) {
 
 // callChatGPT 调用chatGPT
 func (s *groupMessageEventPerformer) callChatGPT(msg string) error {
-	sendMsg := utils.BuildTextMessage("🤔")
-	s.Client.SendGroupMessage(s.Event.GroupCode, sendMsg)
 	// 开始调用chatGPT
-	res, err := service.ChatGPT().GroupChat(s.Event.GroupCode, msg)
+	res, err := service.ChatGPT().GroupChat(s.Event, msg)
 	if err != nil {
 		if gerror.Is(err, consts.ErrChatIsLocked) {
 			// 因为有人正在聊天而失败
@@ -49,8 +47,9 @@ func (s *groupMessageEventPerformer) callChatGPT(msg string) error {
 	}
 	sendingMessage := message.NewSendingMessage()
 	reply := message.NewReply(s.Event)
+	at := message.NewAt(s.Event.Sender.Uin) // at并没有起效果qaq
 	msgStr := message.NewText(res)
-	sendingMessage.Elements = append(sendingMessage.Elements, reply, msgStr)
+	sendingMessage.Elements = append(sendingMessage.Elements, at, reply, at, msgStr)
 	s.Client.SendGroupMessage(s.Event.GroupCode, sendingMessage)
 	return nil
 }

internal/logic/groupMessageEvent/strategy.go

@@ -3,7 +3,6 @@ package groupMessageEvent
 import (
 	"bot-Alice/internal/service"
 	"bot-Alice/internal/utils"
-
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/gogf/gf/v2/frame/g"

internal/service/chat_gpt.go

@@ -25,6 +25,34 @@ func RemoveChat(msg string) string {
 // BuildTextMessage 构建发送文本信息
 func BuildTextMessage(msg string) *message.SendingMessage {
 	sendingMessage := message.NewSendingMessage()
-	sendingMessage.Elements = append(sendingMessage.Elements, message.NewText(msg))
+	SendMsgAppends(sendingMessage, message.NewText(msg))
 	return sendingMessage
 }
+
+// SendMsgAppends 添加需要发送的消息
+func SendMsgAppends(sendMsg *message.SendingMessage, messages ...message.IMessageElement) {
+	// 回复消息中，如果有at，需要at两次
+	sendMsg.Elements = append(sendMsg.Elements, messages...)
+}
+
+// RemoveReplyAt 在回复消息中移除多余的at
+func RemoveReplyAt(messages []message.IMessageElement) []message.IMessageElement {
+	for index, msg := range messages {
+		if msg.Type() == message.Reply {
+			if index < 2 { // 由qq群聊发送的reply消息，reply是第三个元素。
+				return messages
+			}
+			if messages[index-1].Type() == message.Text && messages[index-2].Type() == message.At {
+				// 当reply的前两个元素分别人At和内容为" "的text元素时，进行移除
+				textMsg := messages[index-1].(*message.TextElement)
+				if textMsg.Content == " " {
+					if index == 2 {
+						return append(messages[2:])
+					}
+					return append(messages[:index-3], messages[index:]...)
+				}
+			}
+		}
+	}
+	return messages
+}

internal/utils/msg.go

@@ -4,7 +4,6 @@ import (
 	"bot-Alice/internal/core"
 	_ "bot-Alice/internal/core"
 	_ "bot-Alice/internal/packed"
-
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 )