poke

Author: lz1998

pkg/bot/api_handler.go

@@ -6,7 +6,6 @@ import (
 	"strconv"
 	_ "unsafe"
 
-
 	"github.com/ProtobufBot/Go-Mirai-Client/pkg/cache"
 	"github.com/ProtobufBot/Go-Mirai-Client/pkg/clz"
 	"github.com/ProtobufBot/Go-Mirai-Client/pkg/config"
@@ -44,6 +43,10 @@ func splitText(content string, limit int) []string {
 func preProcessPrivateSendingMessage(cli *client.QQClient, target int64, m *message.SendingMessage) {
 	newElements := make([]message.IMessageElement, 0, len(m.Elements))
 	for _, element := range m.Elements {
+		if _, ok := element.(*clz.PokeElement); ok {
+			cli.SendFriendPoke(target)
+			continue
+		}
 		if i, ok := element.(*clz.LocalImageElement); ok {
 			img, err := cli.UploadPrivateImage(target, i.Stream)
 			if err != nil {
@@ -125,6 +128,10 @@ func preProcessGroupSendingMessage(cli *client.QQClient, groupCode int64, m *mes
 			newElements = append(newElements, i)
 			continue
 		}
+		if i, ok := element.(*clz.PokeElement); ok {
+			cli.SendGroupPoke(groupCode, i.Target)
+			continue
+		}
 		if i, ok := element.(*clz.MyVideoElement); ok {
 			gm, err := cli.UploadGroupShortVideo(groupCode, i.UploadingVideo, i.UploadingCover)
 			if err != nil {

pkg/bot/proto2mirai.go

@@ -42,6 +42,8 @@ func ProtoMsgToMiraiMsg(cli *client.QQClient, msgList []*onebot.Message, notConv
 			}
 		case "at":
 			messageChain = append(messageChain, ProtoAtToMiraiAt(protoMsg.Data))
+		case "poke":
+			messageChain = append(messageChain, ProtoPokeToMiraiPoke(protoMsg.Data))
 		case "image":
 			messageChain = append(messageChain, ProtoImageToMiraiImage(protoMsg.Data))
 		case "img":
@@ -166,6 +168,20 @@ func ProtoAtToMiraiAt(data map[string]string) message.IMessageElement {
 	return message.NewAt(userId)
 }
 
+func ProtoPokeToMiraiPoke(data map[string]string) message.IMessageElement {
+	qq, ok := data["qq"]
+	if !ok {
+		log.Warnf("pokeQQ不存在")
+		return EmptyText()
+	}
+	userId, err := strconv.ParseInt(qq, 10, 64)
+	if err != nil {
+		log.Warnf("pokeQQ不是数字")
+		return EmptyText()
+	}
+	return &clz.PokeElement{Target: userId}
+}
+
 func ProtoFaceToMiraiFace(data map[string]string) message.IMessageElement {
 	idStr, ok := data["id"]
 	if !ok {

pkg/bot/raw2mirai.go

@@ -47,6 +47,8 @@ func RawMsgToMiraiMsg(cli *client.QQClient, str string) []message.IMessageElemen
 			switch node.XMLName.Local {
 			case "at":
 				elemList = append(elemList, ProtoAtToMiraiAt(attrMap))
+			case "poke":
+				elemList = append(elemList, ProtoPokeToMiraiPoke(attrMap))
 			case "img":
 				elemList = append(elemList, ProtoImageToMiraiImage(attrMap)) // TODO 为了兼容我的旧代码偷偷加的
 			case "image":

pkg/clz/clz.go

@@ -34,3 +34,11 @@ type GiftElement struct {
 func (g *GiftElement) Type() message.ElementType {
 	return message.At
 }
+
+type PokeElement struct {
+	Target int64
+}
+
+func (g *PokeElement) Type() message.ElementType {
+	return message.At
+}