shkong/MiraiGo
1
0
Fork 0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-05-04 19:17:38 +08:00
Code Issues Projects Releases Wiki Activity

proto: update channel/common.proto

Browse Source
This commit is contained in:
Mrs4s 2021-12-14 16:43:25 +08:00
parent 5eb78e427c
commit ed979508cf
No known key found for this signature in database
GPG Key ID: 3186E98FA19CE3A7
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/entities.go
View File

@ -221,12 +221,12 @@ type (
} }
GuildMessageReactionsUpdatedEvent struct { GuildMessageReactionsUpdatedEvent struct {
OperatorId uint64 // OperatorId 操作者TinyId, 删除贴表情的事件下不会有值 OperatorId uint64 // OperatorId 操作者TinyId, 删除贴表情的事件下不会有值
EmojiId int32 // EmojiId 被贴的表情, 只有自身消息被贴表情才会有值 EmojiId int32 // EmojiId 被贴的表情, 只有自身消息被贴表情才会有值
GuildId uint64 GuildId uint64
ChannelId uint64 ChannelId uint64
MessageId uint64 MessageId uint64
MessageSenderUin int64 // MessageSenderUin 被贴表情的消息发送者QQ号 // MessageSenderUin int64 // MessageSenderUin 被贴表情的消息发送者QQ号
CurrentReactions []*message.GuildMessageEmojiReaction CurrentReactions []*message.GuildMessageEmojiReaction
} }

18
client/guild_eventflow.go
View File

@ -22,10 +22,10 @@ var (
) )
type tipsPushInfo struct { type tipsPushInfo struct {
TinyId uint64 TinyId uint64
TargetMessageSenderUin int64 // TargetMessageSenderUin int64
GuildId uint64 GuildId uint64
ChannelId uint64 ChannelId uint64
} }
func decodeGuildEventFlowPacket(c *QQClient, _ *incomingPacketInfo, payload []byte) (interface{}, error) { 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(), GuildId: m.Head.RoutingHead.GetGuildId(),
ChannelId: m.Head.RoutingHead.GetChannelId(), 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 return tipsInfo, nil
} }
if common == nil || common.GetServiceType() != 500 { if common == nil || common.GetServiceType() != 500 {
@ -229,7 +231,7 @@ func (c *QQClient) processGuildEventBody(m *channel.ChannelMsgContent, eventBody
}) })
if err == nil { if err == nil {
updatedEvent.OperatorId = tipsInfo.(*tipsPushInfo).TinyId updatedEvent.OperatorId = tipsInfo.(*tipsPushInfo).TinyId
updatedEvent.MessageSenderUin = tipsInfo.(*tipsPushInfo).TargetMessageSenderUin // updatedEvent.MessageSenderUin = tipsInfo.(*tipsPushInfo).TargetMessageSenderUin
} }
c.dispatchGuildMessageReactionsUpdatedEvent(updatedEvent) c.dispatchGuildMessageReactionsUpdatedEvent(updatedEvent)
} }

4
client/pb/channel/common.pb.go
View File

@ -411,7 +411,7 @@ func (x *ChannelMsgContent) GetExtInfo() *ChannelExtInfo {
} }
type ChannelMsgCtrlHead struct { type ChannelMsgCtrlHead struct {
IncludeUin []uint64 `protobuf:"varint,1,rep"` IncludeUin [][]byte `protobuf:"bytes,1,rep"`
// repeated uint64 excludeUin = 2; // bytes? // repeated uint64 excludeUin = 2; // bytes?
// repeated uint64 featureid = 3; // repeated uint64 featureid = 3;
OfflineFlag *uint32 `protobuf:"varint,4,opt"` OfflineFlag *uint32 `protobuf:"varint,4,opt"`
@ -426,7 +426,7 @@ type ChannelMsgCtrlHead struct {
PrivateType *uint32 `protobuf:"varint,13,opt"` PrivateType *uint32 `protobuf:"varint,13,opt"`
} }
func (x *ChannelMsgCtrlHead) GetIncludeUin() []uint64 { func (x *ChannelMsgCtrlHead) GetIncludeUin() [][]byte {
if x != nil { if x != nil {
return x.IncludeUin return x.IncludeUin
} }

2
client/pb/channel/common.proto
View File

@ -81,7 +81,7 @@ message ChannelMsgContent {
} }
message ChannelMsgCtrlHead { message ChannelMsgCtrlHead {
repeated uint64 includeUin = 1; repeated bytes includeUin = 1;
// repeated uint64 excludeUin = 2; // bytes? // repeated uint64 excludeUin = 2; // bytes?
// repeated uint64 featureid = 3; // repeated uint64 featureid = 3;
optional uint32 offlineFlag = 4; optional uint32 offlineFlag = 4;