update

Author: lz1998

go.mod

@@ -3,7 +3,7 @@ module github.com/ProtobufBot/Go-Mirai-Client
 go 1.18
 
 require (
-	github.com/Mrs4s/MiraiGo v0.0.0-20220630160133-a39b3fdd962f
+	github.com/Mrs4s/MiraiGo v0.0.0-20220720124026-5c0e2c5773de
 	github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72
 	github.com/gin-gonic/gin v1.8.1
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
@@ -17,7 +17,6 @@ require (
 	github.com/tidwall/gjson v1.14.1
 	github.com/zserge/lorca v0.1.10
 	golang.org/x/mobile v0.0.0-20220518205345-8578da9835fd
-	google.golang.org/protobuf v1.28.0
 )
 
 require (
@@ -51,5 +50,6 @@ require (
 	golang.org/x/text v0.3.6 // indirect
 	golang.org/x/tools v0.1.8-0.20211022200916-316ba0b74098 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

go.sum

@@ -1,6 +1,6 @@
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/Mrs4s/MiraiGo v0.0.0-20220630160133-a39b3fdd962f h1:PHOwN3/cEL/zoBpcJJXwx1mJ1NL901zrt2mvlQUO5BA=
-github.com/Mrs4s/MiraiGo v0.0.0-20220630160133-a39b3fdd962f/go.mod h1:Ow7nlaVS5FztyjrTlTRSG7HLpTNmgINMluHRCgKunDI=
+github.com/Mrs4s/MiraiGo v0.0.0-20220720124026-5c0e2c5773de h1:cCEsQlZsem2DJlvtWI+CNI+lyz9zRuioBQFuBO94/MU=
+github.com/Mrs4s/MiraiGo v0.0.0-20220720124026-5c0e2c5773de/go.mod h1:Ow7nlaVS5FztyjrTlTRSG7HLpTNmgINMluHRCgKunDI=
 github.com/RomiChan/protobuf v0.1.1-0.20220624030127-3310cba9dbc0 h1:+UGPBYVjssFsdahLJIiNPwpmmwgl/OaVdv1oc5NonC0=
 github.com/RomiChan/protobuf v0.1.1-0.20220624030127-3310cba9dbc0/go.mod h1:2Ie+hdBFQpQFDHfeklgxoFmQRCE7O+KwFpISeXq7OwA=
 github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c h1:cNPOdTNiVwxLpROLjXCgbIPvdkE+BwvxDvgmdYmWx6Q=

onebot_idl

@@ -591,20 +591,26 @@ func HandleSetGroupSignIn(cli *client.QQClient, req *onebot.SetGroupSignInReq) *
 	return nil
 }
 
-func HandleSetGroupPoke(cli *client.QQClient, req *onebot.SetGroupPokeReq) *onebot.SetGroupPokeResp {
-	if group := cli.FindGroup(req.GroupId); group != nil {
-		if member := group.FindMember(req.ToUin); member != nil {
-			cli.SendGroupPoke(group.Code, member.Uin)
-		}
+func HandleSendGroupPoke(cli *client.QQClient, req *onebot.SendGroupPokeReq) *onebot.SendGroupPokeResp {
+	group := cli.FindGroup(req.GroupId)
+	if group == nil {
+		return nil
 	}
-	return nil
+	member := group.FindMember(req.UserId)
+	if member == nil {
+		return nil
+	}
+	cli.SendGroupPoke(group.Code, member.Uin)
+	return &onebot.SendGroupPokeResp{}
 }
 
-func HandleSetFriendPoke(cli *client.QQClient, req *onebot.SetFriendPokeReq) *onebot.SetFriendPokeResp {
-	for _, friend := range cli.FriendList {
-		if friend.Uin == req.ToUin && friend.Uin != cli.Uin {
-			cli.SendFriendPoke(friend.Uin)
-		}
+func HandleSendFriendPoke(cli *client.QQClient, req *onebot.SendFriendPokeReq) *onebot.SendFriendPokeResp {
+	if cli.FindFriend(req.UserId) == nil {
+		return nil
 	}
-	return nil
+	if cli.Uin == req.UserId {
+		return nil
+	}
+	cli.SendFriendPoke(req.UserId)
+	return &onebot.SendFriendPokeResp{}
 }

pkg/bot/api_handler.go

@@ -374,27 +374,27 @@ func handleApiFrame(cli *client.QQClient, req *onebot.Frame, isApiAllow func(one
 		}
 	case *onebot.Frame_SetGroupSignInReq:
 		resp.FrameType = onebot.Frame_TSetGroupSignInResp
-		if resp.Ok = isApiAllow(onebot.Frame_TSetGroupSignInReq); !resp.Ok{
+		if resp.Ok = isApiAllow(onebot.Frame_TSetGroupSignInReq); !resp.Ok {
 			return
 		}
 		resp.Data = &onebot.Frame_SetGroupSignInResp{
 			SetGroupSignInResp: HandleSetGroupSignIn(cli, data.SetGroupSignInReq),
 		}
-	case *onebot.Frame_SetGroupPokeReq:
-		resp.FrameType = onebot.Frame_TSetGroupPokeResp
-		if resp.Ok = isApiAllow(onebot.Frame_TSetGroupPokeReq); !resp.Ok{
+	case *onebot.Frame_SendGroupPokeReq:
+		resp.FrameType = onebot.Frame_TSendGroupPokeResp
+		if resp.Ok = isApiAllow(onebot.Frame_TSendGroupPokeReq); !resp.Ok {
 			return
 		}
-		resp.Data = &onebot.Frame_SetGroupPokeResp{
-			SetGroupPokeResp: HandleSetGroupPoke(cli, data.SetGroupPokeReq),
+		resp.Data = &onebot.Frame_SendGroupPokeResp{
+			SendGroupPokeResp: HandleSendGroupPoke(cli, data.SendGroupPokeReq),
 		}
-	case *onebot.Frame_SetFriendPokeReq:
-		resp.FrameType = onebot.Frame_TSetFriendPokeResp
-		if resp.Ok = isApiAllow(onebot.Frame_TSetFriendPokeReq); !resp.Ok{
+	case *onebot.Frame_SendFriendPokeReq:
+		resp.FrameType = onebot.Frame_TSendFriendPokeResp
+		if resp.Ok = isApiAllow(onebot.Frame_TSendFriendPokeReq); !resp.Ok {
 			return
 		}
-		resp.Data = &onebot.Frame_SetFriendPokeResp{
-			SetFriendPokeResp: HandleSetFriendPoke(cli, data.SetFriendPokeReq),
+		resp.Data = &onebot.Frame_SendFriendPokeResp{
+			SendFriendPokeResp: HandleSendFriendPoke(cli, data.SendFriendPokeReq),
 		}
 	default:
 		return resp

pkg/bot/api_handler.s

@@ -28,12 +28,12 @@ func ReportPrivateMessage(cli *client.QQClient, event *message.PrivateMessage) i
 			PostType:    "message",
 			MessageType: "private",
 			SubType:     "normal",
-			MessageId:   &onebot.MessageReceipt{
+			MessageId: &onebot.MessageReceipt{
 				Seqs: []int32{event.Id},
 			},
-			UserId:      event.Sender.Uin,
-			Message:     bot.MiraiMsgToProtoMsg(cli, event.Elements),
-			RawMessage:  bot.MiraiMsgToRawMsg(cli, event.Elements),
+			UserId:     event.Sender.Uin,
+			Message:    bot.MiraiMsgToProtoMsg(cli, event.Elements),
+			RawMessage: bot.MiraiMsgToRawMsg(cli, event.Elements),
 			Sender: &onebot.PrivateMessageEvent_Sender{
 				UserId:   event.Sender.Uin,
 				Nickname: event.Sender.Nickname,
@@ -58,13 +58,13 @@ func ReportGroupMessage(cli *client.QQClient, event *message.GroupMessage) int32
 		PostType:    "message",
 		MessageType: "group",
 		SubType:     "normal",
-		MessageId:   &onebot.MessageReceipt{
+		MessageId: &onebot.MessageReceipt{
 			Seqs: []int32{event.Id},
 		},
-		GroupId:     event.GroupCode,
-		UserId:      event.Sender.Uin,
-		Message:     bot.MiraiMsgToProtoMsg(cli, event.Elements),
-		RawMessage:  bot.MiraiMsgToRawMsg(cli, event.Elements),
+		GroupId:    event.GroupCode,
+		UserId:     event.Sender.Uin,
+		Message:    bot.MiraiMsgToProtoMsg(cli, event.Elements),
+		RawMessage: bot.MiraiMsgToRawMsg(cli, event.Elements),
 		Sender: &onebot.GroupMessageEvent_Sender{
 			UserId: event.Sender.Uin,
 		},
@@ -126,7 +126,7 @@ func CheckGroupFile(cli *client.QQClient, event *message.GroupMessage) bool {
 					Id:    file.Path,
 					Name:  file.Name,
 					Busid: int64(file.Busid),
-					Size: file.Size,
+					Size_: file.Size,
 					Url:   cli.GetGroupFileUrl(event.GroupCode, file.Path, file.Busid),
 				},
 			}
@@ -152,12 +152,12 @@ func ReportTempMessage(cli *client.QQClient, event *client.TempMessageEvent) int
 			PostType:    "message",
 			MessageType: "private",
 			SubType:     "group",
-			MessageId:   &onebot.MessageReceipt{
+			MessageId: &onebot.MessageReceipt{
 				Seqs: []int32{event.Message.Id},
 			},
-			UserId:      event.Message.Sender.Uin,
-			Message:     bot.MiraiMsgToProtoMsg(cli, event.Message.Elements),
-			RawMessage:  bot.MiraiMsgToRawMsg(cli, event.Message.Elements),
+			UserId:     event.Message.Sender.Uin,
+			Message:    bot.MiraiMsgToProtoMsg(cli, event.Message.Elements),
+			RawMessage: bot.MiraiMsgToRawMsg(cli, event.Message.Elements),
 			Sender: &onebot.PrivateMessageEvent_Sender{
 				UserId:   event.Message.Sender.Uin,
 				Nickname: event.Message.Sender.Nickname,
@@ -400,7 +400,7 @@ func ReportGroupMessageRecalled(cli *client.QQClient, event *client.GroupMessage
 			GroupId:    event.GroupCode,
 			UserId:     event.AuthorUin,
 			OperatorId: event.OperatorUin,
-			MessageId:  &onebot.MessageReceipt{
+			MessageId: &onebot.MessageReceipt{
 				Seqs: []int32{event.MessageId},
 			},
 		},
@@ -420,7 +420,7 @@ func ReportFriendMessageRecalled(cli *client.QQClient, event *client.FriendMessa
 			PostType:   "notice",
 			NoticeType: "friend_recall",
 			UserId:     event.FriendUin,
-			MessageId:  &onebot.MessageReceipt{
+			MessageId: &onebot.MessageReceipt{
 				Seqs: []int32{event.MessageId},
 			},
 		},
@@ -458,10 +458,10 @@ func ReportOfflineFile(cli *client.QQClient, event *client.OfflineFileEvent) int
 			PostType:    "message",
 			MessageType: "private",
 			SubType:     "normal",
-			MessageId:   &onebot.MessageReceipt{
+			MessageId: &onebot.MessageReceipt{
 				Seqs: []int32{0},
 			},
-			UserId:      event.Sender,
+			UserId: event.Sender,
 			Message: []*onebot.Message{
 				{
 					Type: "file",
@@ -480,4 +480,4 @@ func ReportOfflineFile(cli *client.QQClient, event *client.OfflineFileEvent) int
 	}
 	bot.HandleEventFrame(cli, eventProto)
 	return plugin.MessageIgnore
-}
+}