From 5dfa4528dd746f98813e5d3c50c223a3ff2c3b19 Mon Sep 17 00:00:00 2001 From: wdvxdr Date: Thu, 23 Dec 2021 14:02:49 +0800 Subject: [PATCH] fix: fix group unmute all --- client/builders.go | 2 +- client/pb/oidb/oidb.pb.go | 6 +++--- client/pb/oidb/oidb.proto | 3 ++- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/client/builders.go b/client/builders.go index e69e66c9..407022cd 100644 --- a/client/builders.go +++ b/client/builders.go @@ -1030,7 +1030,7 @@ func (c *QQClient) buildGroupMuteAllPacket(groupCode int64, mute bool) (uint16, body := &oidb.D89AReqBody{ GroupCode: groupCode, StGroupInfo: &oidb.D89AGroupinfo{ - ShutupTime: shutUpTime, + ShutupTime: &shutUpTime, }, } return c.buildGroupOperationPacket(body) diff --git a/client/pb/oidb/oidb.pb.go b/client/pb/oidb/oidb.pb.go index 8b708f59..e6a90dc7 100644 --- a/client/pb/oidb/oidb.pb.go +++ b/client/pb/oidb/oidb.pb.go @@ -222,7 +222,7 @@ type D89AGroupinfo struct { StGroupNewguidelines *D89AGroupNewGuidelinesInfo `protobuf:"bytes,14,opt"` GroupFace int32 `protobuf:"varint,15,opt"` AddOption int32 `protobuf:"varint,16,opt"` - ShutupTime int32 `protobuf:"varint,17,opt"` + ShutupTime *int32 `protobuf:"varint,17,opt"` GroupTypeFlag int32 `protobuf:"varint,18,opt"` StringGroupTag []byte `protobuf:"bytes,19,opt"` MsgGroupGeoInfo *D89AGroupGeoInfo `protobuf:"bytes,20,opt"` @@ -359,8 +359,8 @@ func (x *D89AGroupinfo) GetAddOption() int32 { } func (x *D89AGroupinfo) GetShutupTime() int32 { - if x != nil { - return x.ShutupTime + if x != nil && x.ShutupTime != nil { + return *x.ShutupTime } return 0 } diff --git a/client/pb/oidb/oidb.proto b/client/pb/oidb/oidb.proto index 08d971dd..d8093feb 100644 --- a/client/pb/oidb/oidb.proto +++ b/client/pb/oidb/oidb.proto @@ -57,7 +57,7 @@ message D89AGroupinfo { D89AGroupNewGuidelinesInfo stGroupNewguidelines = 14; int32 groupFace = 15; int32 addOption = 16; - int32 shutupTime = 17; + optional int32 shutupTime = 17; int32 groupTypeFlag = 18; bytes stringGroupTag = 19; D89AGroupGeoInfo msgGroupGeoInfo = 20; @@ -80,6 +80,7 @@ message D89AGroupinfo { int64 rootId = 37; int32 msgLimitFrequency = 38; } + message D89AGroupNewGuidelinesInfo { bool boolEnabled = 1; bytes ingContent = 2; diff --git a/go.mod b/go.mod index 67ce77f9..c676ed7f 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/Mrs4s/MiraiGo go 1.17 require ( - github.com/RomiChan/protobuf v0.0.0-20211204042931-ff4f35848737 + github.com/RomiChan/protobuf v0.0.0-20211223055824-048df49a8956 github.com/klauspost/compress v1.13.6 github.com/pierrec/lz4/v4 v4.1.11 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 2beda80c..78856e76 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/RomiChan/protobuf v0.0.0-20211204042931-ff4f35848737 h1:p4o7/eSoP39jwnGZz08N1IpH/mNzg9SdCn7kPM9A9BE= -github.com/RomiChan/protobuf v0.0.0-20211204042931-ff4f35848737/go.mod h1:CKKOWC7mBxd36zxsCB1V8DTrwlTNRQvkSVbYqyUiGEE= +github.com/RomiChan/protobuf v0.0.0-20211223055824-048df49a8956 h1:hnaAkKz4t+xpSNVp5mnuloRMd3Rj2Lfg5biZ3emv//c= +github.com/RomiChan/protobuf v0.0.0-20211223055824-048df49a8956/go.mod h1:CKKOWC7mBxd36zxsCB1V8DTrwlTNRQvkSVbYqyUiGEE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=