From ed979508cf8a707876cf79f6cc7307b7f9d85798 Mon Sep 17 00:00:00 2001
From: Mrs4s <mrs4sxiaoshi@gmail.com>
Date: Tue, 14 Dec 2021 16:43:25 +0800
Subject: [PATCH] proto: update channel/common.proto

---
 client/entities.go             | 12 ++++++------
 client/guild_eventflow.go      | 18 ++++++++++--------
 client/pb/channel/common.pb.go |  4 ++--
 client/pb/channel/common.proto |  2 +-
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/client/entities.go b/client/entities.go
index e5c46c7f..47bb79ed 100644
--- a/client/entities.go
+++ b/client/entities.go
@@ -221,12 +221,12 @@ type (
 	}
 
 	GuildMessageReactionsUpdatedEvent struct {
-		OperatorId       uint64 // OperatorId 操作者TinyId, 删除贴表情的事件下不会有值
-		EmojiId          int32  // EmojiId 被贴的表情, 只有自身消息被贴表情才会有值
-		GuildId          uint64
-		ChannelId        uint64
-		MessageId        uint64
-		MessageSenderUin int64 // MessageSenderUin 被贴表情的消息发送者QQ号
+		OperatorId uint64 // OperatorId 操作者TinyId, 删除贴表情的事件下不会有值
+		EmojiId    int32  // EmojiId 被贴的表情, 只有自身消息被贴表情才会有值
+		GuildId    uint64
+		ChannelId  uint64
+		MessageId  uint64
+		// MessageSenderUin int64 // MessageSenderUin 被贴表情的消息发送者QQ号
 		CurrentReactions []*message.GuildMessageEmojiReaction
 	}
 
diff --git a/client/guild_eventflow.go b/client/guild_eventflow.go
index 20bf48b8..1a93f403 100644
--- a/client/guild_eventflow.go
+++ b/client/guild_eventflow.go
@@ -22,10 +22,10 @@ var (
 )
 
 type tipsPushInfo struct {
-	TinyId                 uint64
-	TargetMessageSenderUin int64
-	GuildId                uint64
-	ChannelId              uint64
+	TinyId uint64
+	// TargetMessageSenderUin int64
+	GuildId   uint64
+	ChannelId uint64
 }
 
 func decodeGuildEventFlowPacket(c *QQClient, _ *incomingPacketInfo, payload []byte) (interface{}, error) {
@@ -70,9 +70,11 @@ func decodeGuildEventFlowPacket(c *QQClient, _ *incomingPacketInfo, payload []by
 					GuildId:   m.Head.RoutingHead.GetGuildId(),
 					ChannelId: m.Head.RoutingHead.GetChannelId(),
 				}
-				if len(m.CtrlHead.IncludeUin) > 0 {
-					tipsInfo.TargetMessageSenderUin = int64(m.CtrlHead.IncludeUin[0])
-				}
+				/*
+					if len(m.CtrlHead.IncludeUin) > 0 {
+						tipsInfo.TargetMessageSenderUin = int64(m.CtrlHead.IncludeUin[0])
+					}
+				*/
 				return tipsInfo, nil
 			}
 			if common == nil || common.GetServiceType() != 500 {
@@ -229,7 +231,7 @@ func (c *QQClient) processGuildEventBody(m *channel.ChannelMsgContent, eventBody
 			})
 			if err == nil {
 				updatedEvent.OperatorId = tipsInfo.(*tipsPushInfo).TinyId
-				updatedEvent.MessageSenderUin = tipsInfo.(*tipsPushInfo).TargetMessageSenderUin
+				// updatedEvent.MessageSenderUin = tipsInfo.(*tipsPushInfo).TargetMessageSenderUin
 			}
 			c.dispatchGuildMessageReactionsUpdatedEvent(updatedEvent)
 		}
diff --git a/client/pb/channel/common.pb.go b/client/pb/channel/common.pb.go
index 0e4e2bf1..637bc052 100644
--- a/client/pb/channel/common.pb.go
+++ b/client/pb/channel/common.pb.go
@@ -411,7 +411,7 @@ func (x *ChannelMsgContent) GetExtInfo() *ChannelExtInfo {
 }
 
 type ChannelMsgCtrlHead struct {
-	IncludeUin []uint64 `protobuf:"varint,1,rep"`
+	IncludeUin [][]byte `protobuf:"bytes,1,rep"`
 	// repeated uint64 excludeUin = 2; // bytes?
 	// repeated uint64 featureid = 3;
 	OfflineFlag    *uint32          `protobuf:"varint,4,opt"`
@@ -426,7 +426,7 @@ type ChannelMsgCtrlHead struct {
 	PrivateType    *uint32          `protobuf:"varint,13,opt"`
 }
 
-func (x *ChannelMsgCtrlHead) GetIncludeUin() []uint64 {
+func (x *ChannelMsgCtrlHead) GetIncludeUin() [][]byte {
 	if x != nil {
 		return x.IncludeUin
 	}
diff --git a/client/pb/channel/common.proto b/client/pb/channel/common.proto
index c22a2ff9..91ead324 100644
--- a/client/pb/channel/common.proto
+++ b/client/pb/channel/common.proto
@@ -81,7 +81,7 @@ message ChannelMsgContent {
 }
 
 message ChannelMsgCtrlHead {
-  repeated uint64 includeUin = 1;
+  repeated bytes includeUin = 1;
   // repeated uint64 excludeUin = 2; // bytes?
   // repeated uint64 featureid = 3;
   optional uint32 offlineFlag = 4;