reply

Author: lz1998

service/bot/proto2mirai.go

@@ -7,6 +7,7 @@ import (
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/ProtobufBot/Go-Mirai-Client/pkg/util"
 	"github.com/ProtobufBot/Go-Mirai-Client/proto_gen/onebot"
+	"github.com/ProtobufBot/Go-Mirai-Client/service/cache"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -16,6 +17,7 @@ func EmptyText() *message.TextElement {
 
 // 消息列表，不自动把code变成msg
 func ProtoMsgToMiraiMsg(msgList []*onebot.Message, notConvertText bool) []message.IMessageElement {
+	containReply := false // 每条消息只能包含一个reply
 	messageChain := make([]message.IMessageElement, 0)
 	for _, protoMsg := range msgList {
 		switch protoMsg.Type {
@@ -46,6 +48,11 @@ func ProtoMsgToMiraiMsg(msgList []*onebot.Message, notConvertText bool) []messag
 			messageChain = append(messageChain, ProtoLightAppToMiraiLightApp(protoMsg.Data))
 		case "service":
 			messageChain = append(messageChain, ProtoServiceToMiraiService(protoMsg.Data))
+		case "reply":
+			if replyElement := ProtoReplyToMiraiReply(protoMsg.Data); replyElement != nil && !containReply {
+				containReply = true
+				messageChain = append([]message.IMessageElement{replyElement}, messageChain...)
+			}
 		default:
 			log.Errorf("不支持的消息类型 %+v", protoMsg)
 		}
@@ -195,3 +202,40 @@ func ProtoServiceToMiraiService(data map[string]string) message.IMessageElement
 		SubType: subType,
 	}
 }
+
+func ProtoReplyToMiraiReply(data map[string]string) *message.ReplyElement {
+	messageIdStr, ok := data["message_id"]
+	if !ok {
+		return nil
+	}
+	messageIdInt, err := strconv.Atoi(messageIdStr)
+	if err != nil {
+		return nil
+	}
+	messageId := int32(messageIdInt)
+	eventInterface, ok := cache.GroupMessageLru.Get(messageId)
+	if ok {
+		groupMessage, ok := eventInterface.(*message.GroupMessage)
+		if ok {
+			return &message.ReplyElement{
+				ReplySeq: groupMessage.Id,
+				Sender:   groupMessage.Sender.Uin,
+				Time:     groupMessage.Time,
+				Elements: groupMessage.Elements,
+			}
+		}
+	}
+	eventInterface, ok = cache.PrivateMessageLru.Get(messageId)
+	if ok {
+		privateMessage, ok := eventInterface.(*message.PrivateMessage)
+		if ok {
+			return &message.ReplyElement{
+				ReplySeq: privateMessage.Id,
+				Sender:   privateMessage.Sender.Uin,
+				Time:     privateMessage.Time,
+				Elements: privateMessage.Elements,
+			}
+		}
+	}
+	return nil
+}

service/bot/raw2mirai.go

@@ -18,6 +18,7 @@ type Node struct {
 var re = regexp.MustCompile("<[\\s\\S]+?/>")
 
 func RawMsgToMiraiMsg(str string) []message.IMessageElement {
+	containReply := false
 	var node Node
 	textList := re.Split(str, -1)
 	codeList := re.FindAllString(str, -1)
@@ -63,6 +64,11 @@ func RawMsgToMiraiMsg(str string) []message.IMessageElement {
 				elemList = append(elemList, ProtoLightAppToMiraiLightApp(attrMap))
 			case "service":
 				elemList = append(elemList, ProtoServiceToMiraiService(attrMap))
+			case "reply":
+				if replyElement := ProtoReplyToMiraiReply(attrMap); replyElement != nil && !containReply {
+					containReply = true
+					elemList = append([]message.IMessageElement{replyElement}, elemList...)
+				}
 			default:
 				log.Warnf("不支持的类型 %s", code)
 				elemList = append(elemList, message.NewText(code))