diff --git a/client/builders.go b/client/builders.go index 6531269a..9ffa5668 100644 --- a/client/builders.go +++ b/client/builders.go @@ -165,10 +165,8 @@ func (c *QQClient) buildConfPushRespPacket(t int32, pktSeq int64, jceBuf []byte) req.WriteInt32(t, 1) req.WriteInt64(pktSeq, 2) req.WriteBytes(jceBuf, 3) - b := append([]byte{0x0A}, req.Bytes()...) - b = append(b, 0x0B) buf := &jce.RequestDataVersion3{ - Map: map[string][]byte{"PushResp": b}, + Map: map[string][]byte{"PushResp": packRequestDataV3(req.Bytes())}, } pkt := &jce.RequestPacket{ IVersion: 3, @@ -223,10 +221,8 @@ func (c *QQClient) buildFriendGroupListRequestPacket(friendStartIndex, friendLis D6B: []byte{}, SnsTypeList: []int64{13580, 13581, 13582}, } - b := append([]byte{0x0A}, req.ToBytes()...) - b = append(b, 0x0B) buf := &jce.RequestDataVersion3{ - Map: map[string][]byte{"FL": b}, + Map: map[string][]byte{"FL": packRequestDataV3(req.ToBytes())}, } pkt := &jce.RequestPacket{ IVersion: 3, diff --git a/client/global.go b/client/global.go index e284613c..2bbf42c2 100644 --- a/client/global.go +++ b/client/global.go @@ -245,3 +245,9 @@ func (b *groupMessageBuilder) build() *msg.Message { } return base } + +func packRequestDataV3(data []byte) (r []byte) { + r = append([]byte{0x0A}, data...) + r = append(r, 0x0B) + return +} diff --git a/client/pb/structmsg/msg.proto b/client/pb/structmsg/structmsg.proto similarity index 99% rename from client/pb/structmsg/msg.proto rename to client/pb/structmsg/structmsg.proto index 699c88fb..f7501cc8 100644 --- a/client/pb/structmsg/msg.proto +++ b/client/pb/structmsg/structmsg.proto @@ -32,7 +32,7 @@ message FriendInfo { string msgBlacklist = 2; } -message GroupInfo { +message SGroupInfo { int32 groupAuthType = 1; int32 displayAction = 2; string msgAlert = 3; @@ -182,7 +182,7 @@ message SystemMsg { int32 groupMsgType = 12; int32 groupInviterRole = 13; FriendInfo friendInfo = 14; - GroupInfo groupInfo = 15; + SGroupInfo groupInfo = 15; int64 actorUin = 16; string msgActorDescribe = 17; string msgAdditionalList = 18;