delete msg

Author: lz1998

service/bot/api_handler.go

@@ -4,6 +4,7 @@ import (
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/ProtobufBot/Go-Mirai-Client/proto_gen/onebot"
+	"github.com/ProtobufBot/Go-Mirai-Client/service/cache"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -24,8 +25,10 @@ func HandleSendPrivateMsg(cli *client.QQClient, req *onebot.SendPrivateMsgReq) *
 		newElem = append(newElem, elem)
 	}
 	ret := cli.SendPrivateMessage(req.UserId, &message.SendingMessage{Elements: newElem})
+	messageId := cache.NextGlobalSeq()
+	cache.PrivateMessageLru.Add(messageId, ret)
 	return &onebot.SendPrivateMsgResp{
-		MessageId: ret.Id,
+		MessageId: messageId,
 	}
 }
 
@@ -54,7 +57,19 @@ func HandleSendGroupMsg(cli *client.QQClient, req *onebot.SendGroupMsgReq) *oneb
 		newElem = append(newElem, elem)
 	}
 	ret := cli.SendGroupMessage(req.GroupId, &message.SendingMessage{Elements: newElem})
+	messageId := cache.NextGlobalSeq()
+	cache.GroupMessageLru.Add(messageId, ret)
 	return &onebot.SendGroupMsgResp{
-		MessageId: ret.Id,
+		MessageId: messageId,
 	}
 }
+
+func HandleDeleteMsg(cli *client.QQClient, req *onebot.DeleteMsgReq) *onebot.DeleteMsgResp {
+	eventInterface, ok := cache.GroupMessageLru.Get(req.MessageId)
+	if !ok {
+		return &onebot.DeleteMsgResp{}
+	}
+	event := eventInterface.(*message.GroupMessage)
+	cli.RecallGroupMessage(event.GroupCode, event.Id, event.InternalId)
+	return &onebot.DeleteMsgResp{}
+}

service/bot/remote.go

@@ -98,6 +98,11 @@ func handleApiFrame(cli *client.QQClient, req *onebot.Frame) *onebot.Frame {
 		resp.Data = &onebot.Frame_SendGroupMsgResp{
 			SendGroupMsgResp: HandleSendGroupMsg(cli, data.SendGroupMsgReq),
 		}
+	case *onebot.Frame_DeleteMsgReq:
+		resp.FrameType = onebot.Frame_TDeleteMsgReq
+		resp.Data = &onebot.Frame_DeleteMsgResp{
+			DeleteMsgResp: HandleDeleteMsg(cli, data.DeleteMsgReq),
+		}
 	default:
 		return resp
 	}

service/cache/cache.go

@@ -1,9 +1,17 @@
 package cache
 
 import (
+	"sync/atomic"
+
 	"github.com/golang/groupcache/lru"
 )
 
+var GlobalSeq int32 = 0
+
+func NextGlobalSeq() int32 {
+	return atomic.AddInt32(&GlobalSeq, 1)
+}
+
 var PrivateMessageLru = lru.New(512)
 var GroupMessageLru = lru.New(2048)
 var FriendRequestLru = lru.New(128)

service/plugins/report.go

@@ -8,9 +8,12 @@ import (
 	"github.com/ProtobufBot/Go-Mirai-Client/pkg/plugin"
 	"github.com/ProtobufBot/Go-Mirai-Client/proto_gen/onebot"
 	"github.com/ProtobufBot/Go-Mirai-Client/service/bot"
+	"github.com/ProtobufBot/Go-Mirai-Client/service/cache"
 )
 
 func ReportPrivateMessage(cli *client.QQClient, event *message.PrivateMessage) int32 {
+	messageId := cache.NextGlobalSeq()
+	cache.PrivateMessageLru.Add(messageId, event)
 	eventProto := &onebot.Frame{
 		FrameType: onebot.Frame_TPrivateMessageEvent,
 	}
@@ -19,7 +22,7 @@ func ReportPrivateMessage(cli *client.QQClient, event *message.PrivateMessage) i
 			PostType:    "message",
 			MessageType: "private",
 			SubType:     "normal",
-			MessageId:   event.Id,
+			MessageId:   messageId,
 			UserId:      event.Sender.Uin,
 			Message:     bot.MiraiMsgToProtoMsg(event.Elements),
 			RawMessage:  bot.MiraiMsgToRawMsg(event.Elements),
@@ -34,6 +37,8 @@ func ReportPrivateMessage(cli *client.QQClient, event *message.PrivateMessage) i
 }
 
 func ReportGroupMessage(cli *client.QQClient, event *message.GroupMessage) int32 {
+	messageId := cache.NextGlobalSeq()
+	cache.GroupMessageLru.Add(messageId, event)
 	eventProto := &onebot.Frame{
 		FrameType: onebot.Frame_TGroupMessageEvent,
 	}
@@ -44,7 +49,7 @@ func ReportGroupMessage(cli *client.QQClient, event *message.GroupMessage) int32
 			PostType:    "message",
 			MessageType: "group",
 			SubType:     "normal",
-			MessageId:   event.Id,
+			MessageId:   messageId,
 			GroupId:     event.GroupCode,
 			UserId:      event.Sender.Uin,
 			Message:     bot.MiraiMsgToProtoMsg(event.Elements),