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

fix pb warning.

Browse Source
This commit is contained in:
Mrs4s 2020-07-17 03:24:38 +08:00
parent 7fddb30e68
commit 2e0c0dfae8
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/builders.go
View File

@ -165,10 +165,8 @@ func (c *QQClient) buildConfPushRespPacket(t int32, pktSeq int64, jceBuf []byte)
req.WriteInt32(t, 1) req.WriteInt32(t, 1)
req.WriteInt64(pktSeq, 2) req.WriteInt64(pktSeq, 2)
req.WriteBytes(jceBuf, 3) req.WriteBytes(jceBuf, 3)
b := append([]byte{0x0A}, req.Bytes()...)
b = append(b, 0x0B)
buf := &jce.RequestDataVersion3{ buf := &jce.RequestDataVersion3{
Map: map[string][]byte{"PushResp": b}, Map: map[string][]byte{"PushResp": packRequestDataV3(req.Bytes())},
} }
pkt := &jce.RequestPacket{ pkt := &jce.RequestPacket{
IVersion: 3, IVersion: 3,
@ -223,10 +221,8 @@ func (c *QQClient) buildFriendGroupListRequestPacket(friendStartIndex, friendLis
D6B: []byte{}, D6B: []byte{},
SnsTypeList: []int64{13580, 13581, 13582}, SnsTypeList: []int64{13580, 13581, 13582},
} }
b := append([]byte{0x0A}, req.ToBytes()...)
b = append(b, 0x0B)
buf := &jce.RequestDataVersion3{ buf := &jce.RequestDataVersion3{
Map: map[string][]byte{"FL": b}, Map: map[string][]byte{"FL": packRequestDataV3(req.ToBytes())},
} }
pkt := &jce.RequestPacket{ pkt := &jce.RequestPacket{
IVersion: 3, IVersion: 3,

6
client/global.go
View File

@ -245,3 +245,9 @@ func (b *groupMessageBuilder) build() *msg.Message {
} }
return base return base
} }
func packRequestDataV3(data []byte) (r []byte) {
r = append([]byte{0x0A}, data...)
r = append(r, 0x0B)
return
}

4
client/pb/structmsg/msg.proto → client/pb/structmsg/structmsg.proto
View File

@ -32,7 +32,7 @@ message FriendInfo {
string msgBlacklist = 2; string msgBlacklist = 2;
} }
message GroupInfo { message SGroupInfo {
int32 groupAuthType = 1; int32 groupAuthType = 1;
int32 displayAction = 2; int32 displayAction = 2;
string msgAlert = 3; string msgAlert = 3;
@ -182,7 +182,7 @@ message SystemMsg {
int32 groupMsgType = 12; int32 groupMsgType = 12;
int32 groupInviterRole = 13; int32 groupInviterRole = 13;
FriendInfo friendInfo = 14; FriendInfo friendInfo = 14;
GroupInfo groupInfo = 15; SGroupInfo groupInfo = 15;
int64 actorUin = 16; int64 actorUin = 16;
string msgActorDescribe = 17; string msgActorDescribe = 17;
string msgAdditionalList = 18; string msgAdditionalList = 18;