From 3ff1fee1b6454797000454739b2bb3bb621bbb4a Mon Sep 17 00:00:00 2001 From: wdvxdr Date: Mon, 13 Feb 2023 21:26:55 +0800 Subject: [PATCH] client: remove some unused pb field remove 64KiB from go-cqhttp. --- client/pb/cmd0x346/cmd0x346.pb.go | 108 ++++++------ client/pb/cmd0x346/cmd0x346.proto | 47 +++--- client/pb/cmd0x6ff/smbcmd0x519.pb.go | 66 ++++---- client/pb/cmd0x6ff/smbcmd0x519.proto | 14 +- client/pb/data.proto | 2 +- client/pb/longmsg/longmsg.pb.go | 21 ++- client/pb/longmsg/longmsg.proto | 8 +- client/pb/msf/register_proxy.pb.go | 24 +-- client/pb/msf/register_proxy.proto | 6 +- client/pb/msg/TextMsgExt.pb.go | 6 +- client/pb/msg/TextMsgExt.proto | 4 +- client/pb/msg/msg.pb.go | 60 +++---- client/pb/msg/msg.proto | 8 +- client/pb/msgtype0x210/subMsgType0x27.pb.go | 51 ++---- client/pb/msgtype0x210/subMsgType0x27.proto | 6 +- client/pb/oidb/oidb.pb.go | 80 ++++----- client/pb/oidb/oidb.proto | 8 +- client/pb/oidb/oidb0x6d6.pb.go | 6 +- client/pb/oidb/oidb0x6d6.proto | 6 +- client/pb/oidb/oidb0x6d7.pb.go | 6 +- client/pb/oidb/oidb0x6d7.proto | 4 +- client/pb/oidb/oidb0x6d8.pb.go | 4 +- client/pb/oidb/oidb0x6d8.proto | 4 +- client/pb/oidb/oidb0x6d9.pb.go | 8 +- client/pb/oidb/oidb0x6d9.proto | 6 +- client/pb/oidb/oidb0x88d.pb.go | 176 ++++++++++---------- client/pb/oidb/oidb0x88d.proto | 8 +- client/pb/oidb/oidb0xeb7.pb.go | 6 +- client/pb/oidb/oidb0xeb7.proto | 2 +- client/pb/profilecard/gate.pb.go | 22 +-- client/pb/profilecard/gate.proto | 12 +- client/pb/pttcenter/shortvideo.pb.go | 37 ++-- client/pb/pttcenter/shortvideo.proto | 18 +- client/pb/structmsg/structmsg.pb.go | 104 ++++++------ client/pb/structmsg/structmsg.proto | 11 +- 35 files changed, 466 insertions(+), 493 deletions(-) diff --git a/client/pb/cmd0x346/cmd0x346.pb.go b/client/pb/cmd0x346/cmd0x346.pb.go index 93793d1e..d7f03ce8 100644 --- a/client/pb/cmd0x346/cmd0x346.pb.go +++ b/client/pb/cmd0x346/cmd0x346.pb.go @@ -422,66 +422,62 @@ type RenewFileRsp struct { } type C346ReqBody struct { - Cmd int32 `protobuf:"varint,1,opt"` - Seq int32 `protobuf:"varint,2,opt"` - RecvListQueryReq *RecvListQueryReq `protobuf:"bytes,3,opt"` - SendListQueryReq *SendListQueryReq `protobuf:"bytes,4,opt"` - RenewFileReq *RenewFileReq `protobuf:"bytes,5,opt"` - RecallFileReq *RecallFileReq `protobuf:"bytes,6,opt"` - ApplyUploadReq *ApplyUploadReq `protobuf:"bytes,7,opt"` - ApplyUploadHitReq *ApplyUploadHitReq `protobuf:"bytes,8,opt"` - ApplyForwardFileReq *ApplyForwardFileReq `protobuf:"bytes,9,opt"` - UploadSuccReq *UploadSuccReq `protobuf:"bytes,10,opt"` - DeleteFileReq *DeleteFileReq `protobuf:"bytes,11,opt"` - DownloadSuccReq *DownloadSuccReq `protobuf:"bytes,12,opt"` - ApplyDownloadAbsReq *ApplyDownloadAbsReq `protobuf:"bytes,13,opt"` - ApplyDownloadReq *ApplyDownloadReq `protobuf:"bytes,14,opt"` - ApplyListDownloadReq *ApplyListDownloadReq `protobuf:"bytes,15,opt"` - FileQueryReq *FileQueryReq `protobuf:"bytes,16,opt"` - ApplyCopyFromReq *ApplyCopyFromReq `protobuf:"bytes,17,opt"` - ApplyUploadReqV2 *ApplyUploadReqV2 `protobuf:"bytes,18,opt"` - ApplyUploadReqV3 *ApplyUploadReqV3 `protobuf:"bytes,19,opt"` - ApplyUploadHitReqV2 *ApplyUploadHitReqV2 `protobuf:"bytes,20,opt"` - ApplyUploadHitReqV3 *ApplyUploadHitReqV3 `protobuf:"bytes,21,opt"` - BusinessId int32 `protobuf:"varint,101,opt"` - ClientType int32 `protobuf:"varint,102,opt"` - FlagSupportMediaplatform uint32 `protobuf:"varint,200,opt"` - ApplyCopyToReq *ApplyCopyToReq `protobuf:"bytes,90000,opt"` + Cmd int32 `protobuf:"varint,1,opt"` + Seq int32 `protobuf:"varint,2,opt"` + // RecvListQueryReq recvListQueryReq = 3; + // SendListQueryReq sendListQueryReq = 4; + // RenewFileReq renewFileReq = 5; + // RecallFileReq recallFileReq = 6; + ApplyUploadReq *ApplyUploadReq `protobuf:"bytes,7,opt"` + // ApplyUploadHitReq applyUploadHitReq = 8; + // ApplyForwardFileReq applyForwardFileReq = 9; + UploadSuccReq *UploadSuccReq `protobuf:"bytes,10,opt"` + // DeleteFileReq deleteFileReq = 11; + // DownloadSuccReq downloadSuccReq = 12; + // ApplyDownloadAbsReq applyDownloadAbsReq = 13; + ApplyDownloadReq *ApplyDownloadReq `protobuf:"bytes,14,opt"` + // ApplyListDownloadReq applyListDownloadReq = 15; + // FileQueryReq fileQueryReq = 16; + // ApplyCopyFromReq applyCopyFromReq = 17; + // ApplyUploadReqV2 applyUploadReqV2 = 18; + ApplyUploadReqV3 *ApplyUploadReqV3 `protobuf:"bytes,19,opt"` + // ApplyUploadHitReqV2 applyUploadHitReqV2 = 20; + // ApplyUploadHitReqV3 applyUploadHitReqV3 = 21; + BusinessId int32 `protobuf:"varint,101,opt"` + ClientType int32 `protobuf:"varint,102,opt"` + FlagSupportMediaplatform uint32 `protobuf:"varint,200,opt"` + // ApplyCopyToReq applyCopyToReq = 90000; // ApplyCleanTrafficReq applyCleanTrafficReq = 90001; empty message - ApplyGetTrafficReq *ApplyGetTrafficReq `protobuf:"bytes,90002,opt"` - ExtensionReq *ExtensionReq `protobuf:"bytes,99999,opt"` - _ [0]func() + // ApplyGetTrafficReq applyGetTrafficReq = 90002; + ExtensionReq *ExtensionReq `protobuf:"bytes,99999,opt"` + _ [0]func() } type C346RspBody struct { - Cmd int32 `protobuf:"varint,1,opt"` - Seq int32 `protobuf:"varint,2,opt"` - RecvListQueryRsp *RecvListQueryRsp `protobuf:"bytes,3,opt"` - SendListQueryRsp *SendListQueryRsp `protobuf:"bytes,4,opt"` - RenewFileRsp *RenewFileRsp `protobuf:"bytes,5,opt"` - RecallFileRsp *RecallFileRsp `protobuf:"bytes,6,opt"` - ApplyUploadRsp *ApplyUploadRsp `protobuf:"bytes,7,opt"` - ApplyUploadHitRsp *ApplyUploadHitRsp `protobuf:"bytes,8,opt"` - ApplyForwardFileRsp *ApplyForwardFileRsp `protobuf:"bytes,9,opt"` - UploadSuccRsp *UploadSuccRsp `protobuf:"bytes,10,opt"` - DeleteFileRsp *DeleteFileRsp `protobuf:"bytes,11,opt"` - DownloadSuccRsp *DownloadSuccRsp `protobuf:"bytes,12,opt"` - ApplyDownloadAbsRsp *ApplyDownloadAbsRsp `protobuf:"bytes,13,opt"` - ApplyDownloadRsp *ApplyDownloadRsp `protobuf:"bytes,14,opt"` - ApplyListDownloadRsp *ApplyListDownloadRsp `protobuf:"bytes,15,opt"` - FileQueryRsp *FileQueryRsp `protobuf:"bytes,16,opt"` - ApplyCopyFromRsp *ApplyCopyFromRsp `protobuf:"bytes,17,opt"` - ApplyUploadRspV2 *ApplyUploadRspV2 `protobuf:"bytes,18,opt"` - ApplyUploadRspV3 *ApplyUploadRspV3 `protobuf:"bytes,19,opt"` - ApplyUploadHitRspV2 *ApplyUploadHitRspV2 `protobuf:"bytes,20,opt"` - ApplyUploadHitRspV3 *ApplyUploadHitRspV3 `protobuf:"bytes,21,opt"` - BusinessId int32 `protobuf:"varint,101,opt"` - ClientType int32 `protobuf:"varint,102,opt"` - ApplyCopyToRsp *ApplyCopyToRsp `protobuf:"bytes,90000,opt"` - ApplyCleanTrafficRsp *ApplyCleanTrafficRsp `protobuf:"bytes,90001,opt"` - ApplyGetTrafficRsp *ApplyGetTrafficRsp `protobuf:"bytes,90002,opt"` - ExtensionRsp *ExtensionRsp `protobuf:"bytes,99999,opt"` - _ [0]func() + Cmd int32 `protobuf:"varint,1,opt"` + Seq int32 `protobuf:"varint,2,opt"` + // RecvListQueryRsp recvListQueryRsp = 3; + // SendListQueryRsp sendListQueryRsp = 4; + // RenewFileRsp renewFileRsp = 5; + // RecallFileRsp recallFileRsp = 6; + ApplyUploadRsp *ApplyUploadRsp `protobuf:"bytes,7,opt"` + // ApplyUploadHitRsp applyUploadHitRsp = 8; + // ApplyForwardFileRsp applyForwardFileRsp = 9; + // UploadSuccRsp uploadSuccRsp = 10; + // DeleteFileRsp deleteFileRsp = 11; + // DownloadSuccRsp downloadSuccRsp = 12; + // ApplyDownloadAbsRsp applyDownloadAbsRsp = 13; + ApplyDownloadRsp *ApplyDownloadRsp `protobuf:"bytes,14,opt"` + // ApplyListDownloadRsp applyListDownloadRsp = 15; + // FileQueryRsp fileQueryRsp = 16; + // ApplyCopyFromRsp applyCopyFromRsp = 17; + // ApplyUploadRspV2 applyUploadRspV2 = 18; + ApplyUploadRspV3 *ApplyUploadRspV3 `protobuf:"bytes,19,opt"` + // ApplyUploadHitRspV2 applyUploadHitRspV2 = 20; + // ApplyUploadHitRspV3 applyUploadHitRspV3 = 21; + BusinessId int32 `protobuf:"varint,101,opt"` + ClientType int32 `protobuf:"varint,102,opt"` + _ [0]func() } type SendListQueryReq struct { diff --git a/client/pb/cmd0x346/cmd0x346.proto b/client/pb/cmd0x346/cmd0x346.proto index 8b29eab2..2e953c59 100644 --- a/client/pb/cmd0x346/cmd0x346.proto +++ b/client/pb/cmd0x346/cmd0x346.proto @@ -364,62 +364,69 @@ message RenewFileRsp { message C346ReqBody { int32 cmd = 1; int32 seq = 2; + /* RecvListQueryReq recvListQueryReq = 3; SendListQueryReq sendListQueryReq = 4; RenewFileReq renewFileReq = 5; RecallFileReq recallFileReq = 6; + */ ApplyUploadReq applyUploadReq = 7; - ApplyUploadHitReq applyUploadHitReq = 8; - ApplyForwardFileReq applyForwardFileReq = 9; + // ApplyUploadHitReq applyUploadHitReq = 8; + // ApplyForwardFileReq applyForwardFileReq = 9; UploadSuccReq uploadSuccReq = 10; - DeleteFileReq deleteFileReq = 11; - DownloadSuccReq downloadSuccReq = 12; - ApplyDownloadAbsReq applyDownloadAbsReq = 13; + // DeleteFileReq deleteFileReq = 11; + // DownloadSuccReq downloadSuccReq = 12; + // ApplyDownloadAbsReq applyDownloadAbsReq = 13; ApplyDownloadReq applyDownloadReq = 14; - ApplyListDownloadReq applyListDownloadReq = 15; - FileQueryReq fileQueryReq = 16; - ApplyCopyFromReq applyCopyFromReq = 17; - ApplyUploadReqV2 applyUploadReqV2 = 18; + // ApplyListDownloadReq applyListDownloadReq = 15; + // FileQueryReq fileQueryReq = 16; + // ApplyCopyFromReq applyCopyFromReq = 17; + // ApplyUploadReqV2 applyUploadReqV2 = 18; ApplyUploadReqV3 applyUploadReqV3 = 19; - ApplyUploadHitReqV2 applyUploadHitReqV2 = 20; - ApplyUploadHitReqV3 applyUploadHitReqV3 = 21; + //ApplyUploadHitReqV2 applyUploadHitReqV2 = 20; + //ApplyUploadHitReqV3 applyUploadHitReqV3 = 21; int32 businessId = 101; int32 clientType = 102; uint32 flagSupportMediaplatform = 200; - ApplyCopyToReq applyCopyToReq = 90000; + //ApplyCopyToReq applyCopyToReq = 90000; //ApplyCleanTrafficReq applyCleanTrafficReq = 90001; empty message - ApplyGetTrafficReq applyGetTrafficReq = 90002; + //ApplyGetTrafficReq applyGetTrafficReq = 90002; ExtensionReq extensionReq = 99999; } message C346RspBody { int32 cmd = 1; int32 seq = 2; + /* RecvListQueryRsp recvListQueryRsp = 3; SendListQueryRsp sendListQueryRsp = 4; RenewFileRsp renewFileRsp = 5; RecallFileRsp recallFileRsp = 6; + */ ApplyUploadRsp applyUploadRsp = 7; + /* ApplyUploadHitRsp applyUploadHitRsp = 8; ApplyForwardFileRsp applyForwardFileRsp = 9; UploadSuccRsp uploadSuccRsp = 10; DeleteFileRsp deleteFileRsp = 11; DownloadSuccRsp downloadSuccRsp = 12; ApplyDownloadAbsRsp applyDownloadAbsRsp = 13; + */ ApplyDownloadRsp applyDownloadRsp = 14; - ApplyListDownloadRsp applyListDownloadRsp = 15; - FileQueryRsp fileQueryRsp = 16; - ApplyCopyFromRsp applyCopyFromRsp = 17; - ApplyUploadRspV2 applyUploadRspV2 = 18; + // ApplyListDownloadRsp applyListDownloadRsp = 15; + // FileQueryRsp fileQueryRsp = 16; + // ApplyCopyFromRsp applyCopyFromRsp = 17; + // ApplyUploadRspV2 applyUploadRspV2 = 18; ApplyUploadRspV3 applyUploadRspV3 = 19; - ApplyUploadHitRspV2 applyUploadHitRspV2 = 20; - ApplyUploadHitRspV3 applyUploadHitRspV3 = 21; + // ApplyUploadHitRspV2 applyUploadHitRspV2 = 20; + // ApplyUploadHitRspV3 applyUploadHitRspV3 = 21; int32 businessId = 101; int32 clientType = 102; + /* ApplyCopyToRsp applyCopyToRsp = 90000; ApplyCleanTrafficRsp applyCleanTrafficRsp = 90001; ApplyGetTrafficRsp applyGetTrafficRsp = 90002; ExtensionRsp extensionRsp = 99999; - + */ } message SendListQueryReq { int64 uin = 1; diff --git a/client/pb/cmd0x6ff/smbcmd0x519.pb.go b/client/pb/cmd0x6ff/smbcmd0x519.pb.go index 8e811780..359bdeac 100644 --- a/client/pb/cmd0x6ff/smbcmd0x519.pb.go +++ b/client/pb/cmd0x6ff/smbcmd0x519.pb.go @@ -42,8 +42,7 @@ type GetNavigationMenuRspBody struct { type C519ReqBody struct { SubCmd proto.Option[uint32] `protobuf:"varint,1,opt"` CrmCommonHead *C519CRMMsgHead `protobuf:"bytes,2,opt"` - GetAddressDetailListReqBody *GetAddressDetailListReqBody `protobuf:"bytes,33,opt"` - GetNavigationMenuReq *GetNavigationMenuReqBody `protobuf:"bytes,35,opt"` + GetAddressDetailListReqBody *GetAddressDetailListReqBody `protobuf:"bytes,33,opt"` // optional GetNavigationMenuReqBody getNavigationMenuReq = 35; _ [0]func() } @@ -54,10 +53,9 @@ type C519RetInfo struct { } type C519RspBody struct { - SubCmd proto.Option[uint32] `protobuf:"varint,1,opt"` - CrmCommonHead *C519CRMMsgHead `protobuf:"bytes,2,opt"` - GetAddressDetailListRspBody *GetAddressDetailListRspBody `protobuf:"bytes,33,opt"` - GetNavigationMenuRsp *GetNavigationMenuRspBody `protobuf:"bytes,35,opt"` + SubCmd proto.Option[uint32] `protobuf:"varint,1,opt"` + // optional C519CRMMsgHead crmCommonHead = 2; + GetAddressDetailListRspBody *GetAddressDetailListRspBody `protobuf:"bytes,33,opt"` //optional GetNavigationMenuRspBody getNavigationMenuRsp = 35; _ [0]func() } @@ -68,7 +66,7 @@ type GetAddressDetailListReqBody struct { } type GetAddressDetailListRspBody struct { - Ret *C519RetInfo `protobuf:"bytes,1,opt"` + // optional C519RetInfo ret = 1; Timestamp proto.Option[uint32] `protobuf:"fixed32,2,opt"` Full proto.Option[bool] `protobuf:"varint,3,opt"` AddressDetail []*AddressDetail `protobuf:"bytes,4,rep"` @@ -76,34 +74,32 @@ type GetAddressDetailListRspBody struct { } type AddressDetail struct { - Aid proto.Option[uint32] `protobuf:"varint,1,opt"` - ModifyTime proto.Option[uint32] `protobuf:"fixed32,2,opt"` - CreateTime proto.Option[uint32] `protobuf:"fixed32,3,opt"` - Status proto.Option[uint32] `protobuf:"varint,4,opt"` - Groupid proto.Option[uint32] `protobuf:"varint,5,opt"` - AddGroupName []byte `protobuf:"bytes,6,opt"` - Name []byte `protobuf:"bytes,7,opt"` - Gender proto.Option[uint32] `protobuf:"varint,8,opt"` - Birthday proto.Option[uint32] `protobuf:"fixed32,9,opt"` - Company0 []byte `protobuf:"bytes,10,opt"` - CompanyPosition0 []byte `protobuf:"bytes,11,opt"` - Company1 []byte `protobuf:"bytes,12,opt"` - CompanyPosition1 []byte `protobuf:"bytes,13,opt"` - FixedPhone0 []byte `protobuf:"bytes,14,opt"` - FixedPhone1 []byte `protobuf:"bytes,15,opt"` - Email0 []byte `protobuf:"bytes,16,opt"` - Email1 []byte `protobuf:"bytes,17,opt"` - Fax0 []byte `protobuf:"bytes,18,opt"` - Fax1 []byte `protobuf:"bytes,19,opt"` - Comment []byte `protobuf:"bytes,20,opt"` - HeadUrl []byte `protobuf:"bytes,21,opt"` - MobilePhone []*AddressMobileInfo `protobuf:"bytes,22,rep"` - MobilePhoneUpdated proto.Option[bool] `protobuf:"varint,23,opt"` - Qq []*AddressQQinfo `protobuf:"bytes,24,rep"` - QqPhoneUpdated proto.Option[bool] `protobuf:"varint,25,opt"` - ModifyTime2 proto.Option[uint64] `protobuf:"fixed64,26,opt"` - ClientRegion *NewBizClientRegion `protobuf:"bytes,27,opt"` - ClientRegionCode *NewBizClientRegionCode `protobuf:"bytes,28,opt"` + Aid proto.Option[uint32] `protobuf:"varint,1,opt"` + ModifyTime proto.Option[uint32] `protobuf:"fixed32,2,opt"` + CreateTime proto.Option[uint32] `protobuf:"fixed32,3,opt"` + Status proto.Option[uint32] `protobuf:"varint,4,opt"` + Groupid proto.Option[uint32] `protobuf:"varint,5,opt"` + AddGroupName []byte `protobuf:"bytes,6,opt"` + Name []byte `protobuf:"bytes,7,opt"` + Gender proto.Option[uint32] `protobuf:"varint,8,opt"` + Birthday proto.Option[uint32] `protobuf:"fixed32,9,opt"` + Company0 []byte `protobuf:"bytes,10,opt"` + CompanyPosition0 []byte `protobuf:"bytes,11,opt"` + Company1 []byte `protobuf:"bytes,12,opt"` + CompanyPosition1 []byte `protobuf:"bytes,13,opt"` + FixedPhone0 []byte `protobuf:"bytes,14,opt"` + FixedPhone1 []byte `protobuf:"bytes,15,opt"` + Email0 []byte `protobuf:"bytes,16,opt"` + Email1 []byte `protobuf:"bytes,17,opt"` + Fax0 []byte `protobuf:"bytes,18,opt"` + Fax1 []byte `protobuf:"bytes,19,opt"` + Comment []byte `protobuf:"bytes,20,opt"` + HeadUrl []byte `protobuf:"bytes,21,opt"` + // repeated AddressMobileInfo mobilePhone = 22; + MobilePhoneUpdated proto.Option[bool] `protobuf:"varint,23,opt"` + Qq []*AddressQQinfo `protobuf:"bytes,24,rep"` + QqPhoneUpdated proto.Option[bool] `protobuf:"varint,25,opt"` + ModifyTime2 proto.Option[uint64] `protobuf:"fixed64,26,opt"` } type AddressMobileInfo struct { diff --git a/client/pb/cmd0x6ff/smbcmd0x519.proto b/client/pb/cmd0x6ff/smbcmd0x519.proto index 3fcc227b..29e017b4 100644 --- a/client/pb/cmd0x6ff/smbcmd0x519.proto +++ b/client/pb/cmd0x6ff/smbcmd0x519.proto @@ -34,7 +34,7 @@ message C519ReqBody { optional uint32 subCmd = 1; optional C519CRMMsgHead crmCommonHead = 2; optional GetAddressDetailListReqBody getAddressDetailListReqBody = 33; - optional GetNavigationMenuReqBody getNavigationMenuReq = 35; + // optional GetNavigationMenuReqBody getNavigationMenuReq = 35; } message C519RetInfo { @@ -44,9 +44,9 @@ message C519RetInfo { message C519RspBody { optional uint32 subCmd = 1; - optional C519CRMMsgHead crmCommonHead = 2; + // optional C519CRMMsgHead crmCommonHead = 2; optional GetAddressDetailListRspBody getAddressDetailListRspBody = 33; - optional GetNavigationMenuRspBody getNavigationMenuRsp = 35; + //optional GetNavigationMenuRspBody getNavigationMenuRsp = 35; } message GetAddressDetailListReqBody { @@ -55,7 +55,7 @@ message GetAddressDetailListReqBody { } message GetAddressDetailListRspBody { - optional C519RetInfo ret = 1; + //optional C519RetInfo ret = 1; optional fixed32 timestamp = 2; optional bool full = 3; repeated AddressDetail addressDetail = 4; @@ -84,13 +84,13 @@ message AddressDetail { optional bytes fax1 = 19; optional bytes comment = 20; optional bytes headUrl = 21; - repeated AddressMobileInfo mobilePhone = 22; + //repeated AddressMobileInfo mobilePhone = 22; optional bool mobilePhoneUpdated = 23; repeated AddressQQinfo qq = 24; optional bool qqPhoneUpdated = 25; optional fixed64 modifyTime2 = 26; - optional NewBizClientRegion clientRegion = 27; - optional NewBizClientRegionCode clientRegionCode = 28; + //optional NewBizClientRegion clientRegion = 27; + //optional NewBizClientRegionCode clientRegionCode = 28; } message AddressMobileInfo { diff --git a/client/pb/data.proto b/client/pb/data.proto index c4b18bf5..3e956270 100644 --- a/client/pb/data.proto +++ b/client/pb/data.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = "github.com/Mrs4s/MiraiGo/client/pb/pb"; +option go_package = "github.com/Mrs4s/MiraiGo/client/pb"; message DeviceInfo { string bootloader = 1; diff --git a/client/pb/longmsg/longmsg.pb.go b/client/pb/longmsg/longmsg.pb.go index 496eb720..c5c2de05 100644 --- a/client/pb/longmsg/longmsg.pb.go +++ b/client/pb/longmsg/longmsg.pb.go @@ -43,18 +43,17 @@ type LongMsgUpRsp struct { } type LongReqBody struct { - Subcmd int32 `protobuf:"varint,1,opt"` - TermType int32 `protobuf:"varint,2,opt"` - PlatformType int32 `protobuf:"varint,3,opt"` - MsgUpReq []*LongMsgUpReq `protobuf:"bytes,4,rep"` - MsgDownReq []*LongMsgDownReq `protobuf:"bytes,5,rep"` - MsgDelReq []*LongMsgDeleteReq `protobuf:"bytes,6,rep"` - AgentType int32 `protobuf:"varint,10,opt"` + Subcmd int32 `protobuf:"varint,1,opt"` + TermType int32 `protobuf:"varint,2,opt"` + PlatformType int32 `protobuf:"varint,3,opt"` + MsgUpReq []*LongMsgUpReq `protobuf:"bytes,4,rep"` + // repeated LongMsgDownReq msgDownReq = 5; + // repeated LongMsgDeleteReq msgDelReq = 6; + AgentType int32 `protobuf:"varint,10,opt"` } type LongRspBody struct { - Subcmd int32 `protobuf:"varint,1,opt"` - MsgUpRsp []*LongMsgUpRsp `protobuf:"bytes,2,rep"` - MsgDownRsp []*LongMsgDownRsp `protobuf:"bytes,3,rep"` - MsgDelRsp []*LongMsgDeleteRsp `protobuf:"bytes,4,rep"` + Subcmd int32 `protobuf:"varint,1,opt"` + // repeated LongMsgUpRsp msgUpRsp = 2; + MsgDownRsp []*LongMsgDownRsp `protobuf:"bytes,3,rep"` //repeated LongMsgDeleteRsp msgDelRsp = 4; } diff --git a/client/pb/longmsg/longmsg.proto b/client/pb/longmsg/longmsg.proto index 15d234d8..21f55c9a 100644 --- a/client/pb/longmsg/longmsg.proto +++ b/client/pb/longmsg/longmsg.proto @@ -40,14 +40,14 @@ message LongReqBody { int32 termType = 2; int32 platformType = 3; repeated LongMsgUpReq msgUpReq = 4; - repeated LongMsgDownReq msgDownReq = 5; - repeated LongMsgDeleteReq msgDelReq = 6; + //repeated LongMsgDownReq msgDownReq = 5; + //repeated LongMsgDeleteReq msgDelReq = 6; int32 agentType = 10; } message LongRspBody { int32 subcmd = 1; - repeated LongMsgUpRsp msgUpRsp = 2; + //repeated LongMsgUpRsp msgUpRsp = 2; repeated LongMsgDownRsp msgDownRsp = 3; - repeated LongMsgDeleteRsp msgDelRsp = 4; + //repeated LongMsgDeleteRsp msgDelRsp = 4; } \ No newline at end of file diff --git a/client/pb/msf/register_proxy.pb.go b/client/pb/msf/register_proxy.pb.go index ae4f609f..d1d0ffa2 100644 --- a/client/pb/msf/register_proxy.pb.go +++ b/client/pb/msf/register_proxy.pb.go @@ -41,18 +41,18 @@ type SvcPbResponsePullDisMsgProxy struct { } type SvcRegisterProxyMsgResp struct { - Result proto.Option[uint32] `protobuf:"varint,1,opt"` - ErrMsg []byte `protobuf:"bytes,2,opt"` - Flag proto.Option[uint32] `protobuf:"varint,3,opt"` - Seq proto.Option[uint32] `protobuf:"varint,4,opt"` - Info *SvcResponseMsgInfo `protobuf:"bytes,5,opt"` - GroupList []*GroupList `protobuf:"bytes,6,rep"` - DiscussList []*DiscussList `protobuf:"bytes,7,rep"` - GroupMsg []*SvcResponsePbPullGroupMsgProxy `protobuf:"bytes,8,rep"` - DiscussMsg []*SvcPbResponsePullDisMsgProxy `protobuf:"bytes,9,rep"` - C2CMsg []byte `protobuf:"bytes,10,opt"` - PubAccountMsg []byte `protobuf:"bytes,11,opt"` - DiscussListFlag proto.Option[uint32] `protobuf:"varint,12,opt"` + Result proto.Option[uint32] `protobuf:"varint,1,opt"` + ErrMsg []byte `protobuf:"bytes,2,opt"` + Flag proto.Option[uint32] `protobuf:"varint,3,opt"` + Seq proto.Option[uint32] `protobuf:"varint,4,opt"` + Info *SvcResponseMsgInfo `protobuf:"bytes,5,opt"` + // repeated GroupList groupList = 6; + // repeated DiscussList discussList = 7; + GroupMsg []*SvcResponsePbPullGroupMsgProxy `protobuf:"bytes,8,rep"` + // repeated SvcPbResponsePullDisMsgProxy discussMsg = 9; + C2CMsg []byte `protobuf:"bytes,10,opt"` + PubAccountMsg []byte `protobuf:"bytes,11,opt"` + DiscussListFlag proto.Option[uint32] `protobuf:"varint,12,opt"` } type SvcResponseMsgInfo struct { diff --git a/client/pb/msf/register_proxy.proto b/client/pb/msf/register_proxy.proto index 14e7cb36..36db3282 100644 --- a/client/pb/msf/register_proxy.proto +++ b/client/pb/msf/register_proxy.proto @@ -39,10 +39,10 @@ message SvcRegisterProxyMsgResp { optional uint32 flag = 3; optional uint32 seq = 4; optional SvcResponseMsgInfo info = 5; - repeated GroupList groupList = 6; - repeated DiscussList discussList = 7; + //repeated GroupList groupList = 6; + //repeated DiscussList discussList = 7; repeated SvcResponsePbPullGroupMsgProxy groupMsg = 8; - repeated SvcPbResponsePullDisMsgProxy discussMsg = 9; + //repeated SvcPbResponsePullDisMsgProxy discussMsg = 9; optional bytes c2CMsg = 10; optional bytes pubAccountMsg = 11; optional uint32 discussListFlag = 12; diff --git a/client/pb/msg/TextMsgExt.pb.go b/client/pb/msg/TextMsgExt.pb.go index 28b2b0c4..a7e6b582 100644 --- a/client/pb/msg/TextMsgExt.pb.go +++ b/client/pb/msg/TextMsgExt.pb.go @@ -19,9 +19,9 @@ type TextResvAttr struct { AtType proto.Option[uint32] `protobuf:"varint,3,opt"` AtMemberUin proto.Option[uint64] `protobuf:"varint,4,opt"` AtMemberTinyid proto.Option[uint64] `protobuf:"varint,5,opt"` - AtMemberRoleInfo *ExtRoleInfo `protobuf:"bytes,6,opt"` - AtRoleInfo *ExtRoleInfo `protobuf:"bytes,7,opt"` - AtChannelInfo *ExtChannelInfo `protobuf:"bytes,8,opt"` + // optional ExtRoleInfo atMemberRoleInfo = 6; + // optional ExtRoleInfo atRoleInfo = 7; + AtChannelInfo *ExtChannelInfo `protobuf:"bytes,8,opt"` } type ExtRoleInfo struct { diff --git a/client/pb/msg/TextMsgExt.proto b/client/pb/msg/TextMsgExt.proto index 54ff318d..ff2fc479 100644 --- a/client/pb/msg/TextMsgExt.proto +++ b/client/pb/msg/TextMsgExt.proto @@ -13,8 +13,8 @@ message TextResvAttr { optional uint32 atType = 3; optional uint64 atMemberUin = 4; optional uint64 atMemberTinyid = 5; - optional ExtRoleInfo atMemberRoleInfo = 6; - optional ExtRoleInfo atRoleInfo = 7; + //optional ExtRoleInfo atMemberRoleInfo = 6; + //optional ExtRoleInfo atRoleInfo = 7; optional ExtChannelInfo atChannelInfo = 8; } diff --git a/client/pb/msg/msg.pb.go b/client/pb/msg/msg.pb.go index 1a74e438..1285f652 100644 --- a/client/pb/msg/msg.pb.go +++ b/client/pb/msg/msg.pb.go @@ -210,7 +210,7 @@ type Elem struct { MarketFace *MarketFace `protobuf:"bytes,6,opt"` // ElemFlags elemFlags = 7; CustomFace *CustomFace `protobuf:"bytes,8,opt"` - ElemFlags2 *ElemFlags2 `protobuf:"bytes,9,opt"` + // optional ElemFlags2 elemFlags2 = 9; // FunFace funFace = 10; // SecretFileMsg secretFile = 11; RichMsg *RichMsg `protobuf:"bytes,12,opt"` @@ -622,35 +622,35 @@ type ContentHead struct { } type MessageHead struct { - FromUin proto.Option[int64] `protobuf:"varint,1,opt"` - ToUin proto.Option[int64] `protobuf:"varint,2,opt"` - MsgType proto.Option[int32] `protobuf:"varint,3,opt"` - C2CCmd proto.Option[int32] `protobuf:"varint,4,opt"` - MsgSeq proto.Option[int32] `protobuf:"varint,5,opt"` - MsgTime proto.Option[int32] `protobuf:"varint,6,opt"` - MsgUid proto.Option[int64] `protobuf:"varint,7,opt"` - C2CTmpMsgHead *C2CTempMessageHead `protobuf:"bytes,8,opt"` - GroupInfo *GroupInfo `protobuf:"bytes,9,opt"` - FromAppid proto.Option[int32] `protobuf:"varint,10,opt"` - FromInstid proto.Option[int32] `protobuf:"varint,11,opt"` - UserActive proto.Option[int32] `protobuf:"varint,12,opt"` - DiscussInfo *DiscussInfo `protobuf:"bytes,13,opt"` - FromNick proto.Option[string] `protobuf:"bytes,14,opt"` - AuthUin proto.Option[int64] `protobuf:"varint,15,opt"` - AuthNick proto.Option[string] `protobuf:"bytes,16,opt"` - MsgFlag proto.Option[int32] `protobuf:"varint,17,opt"` - AuthRemark proto.Option[string] `protobuf:"bytes,18,opt"` - GroupName proto.Option[string] `protobuf:"bytes,19,opt"` - MutiltransHead *MutilTransHead `protobuf:"bytes,20,opt"` - MsgInstCtrl *InstCtrl `protobuf:"bytes,21,opt"` - PublicAccountGroupSendFlag proto.Option[int32] `protobuf:"varint,22,opt"` - WseqInC2CMsghead proto.Option[int32] `protobuf:"varint,23,opt"` - Cpid proto.Option[int64] `protobuf:"varint,24,opt"` - ExtGroupKeyInfo *ExtGroupKeyInfo `protobuf:"bytes,25,opt"` - MultiCompatibleText proto.Option[string] `protobuf:"bytes,26,opt"` - AuthSex proto.Option[int32] `protobuf:"varint,27,opt"` - IsSrcMsg proto.Option[bool] `protobuf:"varint,28,opt"` - _ [0]func() + FromUin proto.Option[int64] `protobuf:"varint,1,opt"` + ToUin proto.Option[int64] `protobuf:"varint,2,opt"` + MsgType proto.Option[int32] `protobuf:"varint,3,opt"` + C2CCmd proto.Option[int32] `protobuf:"varint,4,opt"` + MsgSeq proto.Option[int32] `protobuf:"varint,5,opt"` + MsgTime proto.Option[int32] `protobuf:"varint,6,opt"` + MsgUid proto.Option[int64] `protobuf:"varint,7,opt"` + C2CTmpMsgHead *C2CTempMessageHead `protobuf:"bytes,8,opt"` + GroupInfo *GroupInfo `protobuf:"bytes,9,opt"` + FromAppid proto.Option[int32] `protobuf:"varint,10,opt"` + FromInstid proto.Option[int32] `protobuf:"varint,11,opt"` + UserActive proto.Option[int32] `protobuf:"varint,12,opt"` + // optional DiscussInfo discussInfo = 13; + FromNick proto.Option[string] `protobuf:"bytes,14,opt"` + AuthUin proto.Option[int64] `protobuf:"varint,15,opt"` + AuthNick proto.Option[string] `protobuf:"bytes,16,opt"` + MsgFlag proto.Option[int32] `protobuf:"varint,17,opt"` + AuthRemark proto.Option[string] `protobuf:"bytes,18,opt"` + GroupName proto.Option[string] `protobuf:"bytes,19,opt"` + MutiltransHead *MutilTransHead `protobuf:"bytes,20,opt"` + // optional InstCtrl msgInstCtrl = 21; + PublicAccountGroupSendFlag proto.Option[int32] `protobuf:"varint,22,opt"` + WseqInC2CMsghead proto.Option[int32] `protobuf:"varint,23,opt"` + Cpid proto.Option[int64] `protobuf:"varint,24,opt"` + // optional ExtGroupKeyInfo extGroupKeyInfo = 25; + MultiCompatibleText proto.Option[string] `protobuf:"bytes,26,opt"` + AuthSex proto.Option[int32] `protobuf:"varint,27,opt"` + IsSrcMsg proto.Option[bool] `protobuf:"varint,28,opt"` + _ [0]func() } type GroupInfo struct { diff --git a/client/pb/msg/msg.proto b/client/pb/msg/msg.proto index 7341d843..b2023341 100644 --- a/client/pb/msg/msg.proto +++ b/client/pb/msg/msg.proto @@ -206,7 +206,7 @@ message Elem { optional MarketFace marketFace = 6; //ElemFlags elemFlags = 7; optional CustomFace customFace = 8; - optional ElemFlags2 elemFlags2 = 9; + //optional ElemFlags2 elemFlags2 = 9; //FunFace funFace = 10; //SecretFileMsg secretFile = 11; optional RichMsg richMsg = 12; @@ -637,7 +637,7 @@ message MessageHead { optional int32 fromAppid = 10; optional int32 fromInstid = 11; optional int32 userActive = 12; - optional DiscussInfo discussInfo = 13; + // optional DiscussInfo discussInfo = 13; optional string fromNick = 14; optional int64 authUin = 15; optional string authNick = 16; @@ -645,11 +645,11 @@ message MessageHead { optional string authRemark = 18; optional string groupName = 19; optional MutilTransHead mutiltransHead = 20; - optional InstCtrl msgInstCtrl = 21; + // optional InstCtrl msgInstCtrl = 21; optional int32 publicAccountGroupSendFlag = 22; optional int32 wseqInC2cMsghead = 23; optional int64 cpid = 24; - optional ExtGroupKeyInfo extGroupKeyInfo = 25; + // optional ExtGroupKeyInfo extGroupKeyInfo = 25; optional string multiCompatibleText = 26; optional int32 authSex = 27; optional bool isSrcMsg = 28; diff --git a/client/pb/msgtype0x210/subMsgType0x27.pb.go b/client/pb/msgtype0x210/subMsgType0x27.pb.go index e7232cff..1749fd9b 100644 --- a/client/pb/msgtype0x210/subMsgType0x27.pb.go +++ b/client/pb/msgtype0x210/subMsgType0x27.pb.go @@ -78,42 +78,21 @@ type FanpaiziNotify struct { } type ForwardBody struct { - NotifyType proto.Option[uint32] `protobuf:"varint,1,opt"` - OpType proto.Option[uint32] `protobuf:"varint,2,opt"` - AddGroup *AddGroup `protobuf:"bytes,3,opt"` - DelGroup *DelGroup `protobuf:"bytes,4,opt"` - ModGroupName *ModGroupName `protobuf:"bytes,5,opt"` - ModGroupSort *ModGroupSort `protobuf:"bytes,6,opt"` - ModFriendGroup *ModFriendGroup `protobuf:"bytes,7,opt"` - ModProfile *ModProfile `protobuf:"bytes,8,opt"` - ModFriendRemark *ModFriendRemark `protobuf:"bytes,9,opt"` - ModLongNick *ModLongNick `protobuf:"bytes,10,opt"` - ModCustomFace *ModCustomFace `protobuf:"bytes,11,opt"` - ModGroupProfile *ModGroupProfile `protobuf:"bytes,12,opt"` - ModGroupMemberProfile *ModGroupMemberProfile `protobuf:"bytes,13,opt"` - DelFriend *DelFriend `protobuf:"bytes,14,opt"` - RoamPriv *ModFrdRoamPriv `protobuf:"bytes,15,opt"` - GrpMsgRoamFlag *GrpMsgRoamFlag `protobuf:"bytes,16,opt"` - ConfMsgRoamFlag *ConfMsgRoamFlag `protobuf:"bytes,17,opt"` - ModRichLongNick *ModLongNick `protobuf:"bytes,18,opt"` - BinPkg *BinaryMsg `protobuf:"bytes,19,opt"` - ModFriendRings *ModSnsGeneralInfo `protobuf:"bytes,20,opt"` - ModConfProfile *ModConfProfile `protobuf:"bytes,21,opt"` - ModFriendFlag *SnsUpdateFlag `protobuf:"bytes,22,opt"` - AppointmentNotify *AppointmentNotify `protobuf:"bytes,23,opt"` - DarenNotify *DaRenNotify `protobuf:"bytes,25,opt"` - NewComeinUserNotify *NewComeinUserNotify `protobuf:"bytes,26,opt"` - PushSearchDev *PushSearchDev `protobuf:"bytes,200,opt"` - PushReportDev *PushReportDev `protobuf:"bytes,201,opt"` - QqPayPush *QQPayPush `protobuf:"bytes,202,opt"` - RedpointInfo []byte `protobuf:"bytes,203,opt"` - HotFriendNotify *HotFriendNotify `protobuf:"bytes,204,opt"` - PraiseRankNotify *PraiseRankNotify `protobuf:"bytes,205,opt"` - CampusNotify *MQQCampusNotify `protobuf:"bytes,210,opt"` - ModRichLongNickEx *ModLongNick `protobuf:"bytes,211,opt"` - ChatMatchInfo *ChatMatchInfo `protobuf:"bytes,212,opt"` - FrdCustomOnlineStatusChange *FrdCustomOnlineStatusChange `protobuf:"bytes,214,opt"` - FanpanziNotify *FanpaiziNotify `protobuf:"bytes,2000,opt"` + // optional uint32 notifyType = 1; + // optional uint32 opType = 2; + // optional AddGroup addGroup = 3; + // optional DelGroup delGroup = 4; + // optional ModGroupName modGroupName = 5; + // optional ModGroupSort modGroupSort = 6; + // optional ModFriendGroup modFriendGroup = 7; + // optional ModProfile modProfile = 8; + // optional ModFriendRemark modFriendRemark = 9; + // optional ModLongNick modLongNick = 10; + // optional ModCustomFace modCustomFace = 11; + ModGroupProfile *ModGroupProfile `protobuf:"bytes,12,opt"` + // optional ModGroupMemberProfile modGroupMemberProfile = 13; + DelFriend *DelFriend `protobuf:"bytes,14,opt"` + _ [0]func() } type FrdCustomOnlineStatusChange struct { diff --git a/client/pb/msgtype0x210/subMsgType0x27.proto b/client/pb/msgtype0x210/subMsgType0x27.proto index 8e7298c8..6818bdc0 100644 --- a/client/pb/msgtype0x210/subMsgType0x27.proto +++ b/client/pb/msgtype0x210/subMsgType0x27.proto @@ -70,6 +70,7 @@ message FanpaiziNotify { } message ForwardBody { + /* optional uint32 notifyType = 1; optional uint32 opType = 2; optional AddGroup addGroup = 3; @@ -81,9 +82,11 @@ message ForwardBody { optional ModFriendRemark modFriendRemark = 9; optional ModLongNick modLongNick = 10; optional ModCustomFace modCustomFace = 11; + */ optional ModGroupProfile modGroupProfile = 12; - optional ModGroupMemberProfile modGroupMemberProfile = 13; + //optional ModGroupMemberProfile modGroupMemberProfile = 13; optional DelFriend delFriend = 14; + /* optional ModFrdRoamPriv roamPriv = 15; optional GrpMsgRoamFlag grpMsgRoamFlag = 16; optional ConfMsgRoamFlag confMsgRoamFlag = 17; @@ -106,6 +109,7 @@ message ForwardBody { optional ChatMatchInfo chatMatchInfo = 212; optional FrdCustomOnlineStatusChange frdCustomOnlineStatusChange = 214; optional FanpaiziNotify fanpanziNotify = 2000; + */ } message FrdCustomOnlineStatusChange { diff --git a/client/pb/oidb/oidb.pb.go b/client/pb/oidb/oidb.pb.go index 2e3366cc..c6e22966 100644 --- a/client/pb/oidb/oidb.pb.go +++ b/client/pb/oidb/oidb.pb.go @@ -17,8 +17,8 @@ type OIDBSSOPkg struct { } type D8A0RspBody struct { - OptUint64GroupCode int64 `protobuf:"varint,1,opt"` - MsgKickResult []*D8A0KickResult `protobuf:"bytes,2,rep"` + OptUint64GroupCode int64 `protobuf:"varint,1,opt"` // repeated D8A0KickResult msgKickResult = 2; + _ [0]func() } type D8A0KickResult struct { @@ -51,44 +51,44 @@ type D89AReqBody struct { } type D89AGroupinfo struct { - GroupExtAdmNum int32 `protobuf:"varint,1,opt"` - Flag int32 `protobuf:"varint,2,opt"` - IngGroupName []byte `protobuf:"bytes,3,opt"` - IngGroupMemo []byte `protobuf:"bytes,4,opt"` - IngGroupFingerMemo []byte `protobuf:"bytes,5,opt"` - IngGroupAioSkinUrl []byte `protobuf:"bytes,6,opt"` - IngGroupBoardSkinUrl []byte `protobuf:"bytes,7,opt"` - IngGroupCoverSkinUrl []byte `protobuf:"bytes,8,opt"` - GroupGrade int32 `protobuf:"varint,9,opt"` - ActiveMemberNum int32 `protobuf:"varint,10,opt"` - CertificationType int32 `protobuf:"varint,11,opt"` - IngCertificationText []byte `protobuf:"bytes,12,opt"` - IngGroupRichFingerMemo []byte `protobuf:"bytes,13,opt"` - StGroupNewguidelines *D89AGroupNewGuidelinesInfo `protobuf:"bytes,14,opt"` - GroupFace int32 `protobuf:"varint,15,opt"` - AddOption int32 `protobuf:"varint,16,opt"` - ShutupTime proto.Option[int32] `protobuf:"varint,17,opt"` - GroupTypeFlag int32 `protobuf:"varint,18,opt"` - StringGroupTag []byte `protobuf:"bytes,19,opt"` - MsgGroupGeoInfo *D89AGroupGeoInfo `protobuf:"bytes,20,opt"` - GroupClassExt int32 `protobuf:"varint,21,opt"` - IngGroupClassText []byte `protobuf:"bytes,22,opt"` - AppPrivilegeFlag int32 `protobuf:"varint,23,opt"` - AppPrivilegeMask int32 `protobuf:"varint,24,opt"` - StGroupExInfo *D89AGroupExInfoOnly `protobuf:"bytes,25,opt"` - GroupSecLevel int32 `protobuf:"varint,26,opt"` - GroupSecLevelInfo int32 `protobuf:"varint,27,opt"` - SubscriptionUin int64 `protobuf:"varint,28,opt"` - AllowMemberInvite int32 `protobuf:"varint,29,opt"` - IngGroupQuestion []byte `protobuf:"bytes,30,opt"` - IngGroupAnswer []byte `protobuf:"bytes,31,opt"` - GroupFlagext3 int32 `protobuf:"varint,32,opt"` - GroupFlagext3Mask int32 `protobuf:"varint,33,opt"` - GroupOpenAppid int32 `protobuf:"varint,34,opt"` - NoFingerOpenFlag int32 `protobuf:"varint,35,opt"` - NoCodeFingerOpenFlag int32 `protobuf:"varint,36,opt"` - RootId int64 `protobuf:"varint,37,opt"` - MsgLimitFrequency int32 `protobuf:"varint,38,opt"` + GroupExtAdmNum int32 `protobuf:"varint,1,opt"` + Flag int32 `protobuf:"varint,2,opt"` + IngGroupName []byte `protobuf:"bytes,3,opt"` + IngGroupMemo []byte `protobuf:"bytes,4,opt"` + IngGroupFingerMemo []byte `protobuf:"bytes,5,opt"` + IngGroupAioSkinUrl []byte `protobuf:"bytes,6,opt"` + IngGroupBoardSkinUrl []byte `protobuf:"bytes,7,opt"` + IngGroupCoverSkinUrl []byte `protobuf:"bytes,8,opt"` + GroupGrade int32 `protobuf:"varint,9,opt"` + ActiveMemberNum int32 `protobuf:"varint,10,opt"` + CertificationType int32 `protobuf:"varint,11,opt"` + IngCertificationText []byte `protobuf:"bytes,12,opt"` + IngGroupRichFingerMemo []byte `protobuf:"bytes,13,opt"` + // D89AGroupNewGuidelinesInfo stGroupNewguidelines = 14; + GroupFace int32 `protobuf:"varint,15,opt"` + AddOption int32 `protobuf:"varint,16,opt"` + ShutupTime proto.Option[int32] `protobuf:"varint,17,opt"` + GroupTypeFlag int32 `protobuf:"varint,18,opt"` + StringGroupTag []byte `protobuf:"bytes,19,opt"` + // D89AGroupGeoInfo msgGroupGeoInfo = 20; + GroupClassExt int32 `protobuf:"varint,21,opt"` + IngGroupClassText []byte `protobuf:"bytes,22,opt"` + AppPrivilegeFlag int32 `protobuf:"varint,23,opt"` + AppPrivilegeMask int32 `protobuf:"varint,24,opt"` + // D89AGroupExInfoOnly stGroupExInfo = 25; + GroupSecLevel int32 `protobuf:"varint,26,opt"` + GroupSecLevelInfo int32 `protobuf:"varint,27,opt"` + SubscriptionUin int64 `protobuf:"varint,28,opt"` + AllowMemberInvite int32 `protobuf:"varint,29,opt"` + IngGroupQuestion []byte `protobuf:"bytes,30,opt"` + IngGroupAnswer []byte `protobuf:"bytes,31,opt"` + GroupFlagext3 int32 `protobuf:"varint,32,opt"` + GroupFlagext3Mask int32 `protobuf:"varint,33,opt"` + GroupOpenAppid int32 `protobuf:"varint,34,opt"` + NoFingerOpenFlag int32 `protobuf:"varint,35,opt"` + NoCodeFingerOpenFlag int32 `protobuf:"varint,36,opt"` + RootId int64 `protobuf:"varint,37,opt"` + MsgLimitFrequency int32 `protobuf:"varint,38,opt"` } type D89AGroupNewGuidelinesInfo struct { diff --git a/client/pb/oidb/oidb.proto b/client/pb/oidb/oidb.proto index a95704fe..b0787299 100644 --- a/client/pb/oidb/oidb.proto +++ b/client/pb/oidb/oidb.proto @@ -13,7 +13,7 @@ message OIDBSSOPkg { message D8A0RspBody { int64 optUint64GroupCode = 1; - repeated D8A0KickResult msgKickResult = 2; + // repeated D8A0KickResult msgKickResult = 2; } message D8A0KickResult { int32 optUint32Result = 1; @@ -54,18 +54,18 @@ message D89AGroupinfo { int32 certificationType = 11; bytes ingCertificationText = 12; bytes ingGroupRichFingerMemo = 13; - D89AGroupNewGuidelinesInfo stGroupNewguidelines = 14; + // D89AGroupNewGuidelinesInfo stGroupNewguidelines = 14; int32 groupFace = 15; int32 addOption = 16; optional int32 shutupTime = 17; int32 groupTypeFlag = 18; bytes stringGroupTag = 19; - D89AGroupGeoInfo msgGroupGeoInfo = 20; + // D89AGroupGeoInfo msgGroupGeoInfo = 20; int32 groupClassExt = 21; bytes ingGroupClassText = 22; int32 appPrivilegeFlag = 23; int32 appPrivilegeMask = 24; - D89AGroupExInfoOnly stGroupExInfo = 25; + // D89AGroupExInfoOnly stGroupExInfo = 25; int32 groupSecLevel = 26; int32 groupSecLevelInfo = 27; int64 subscriptionUin = 28; diff --git a/client/pb/oidb/oidb0x6d6.pb.go b/client/pb/oidb/oidb0x6d6.pb.go index 6366023a..23339d9f 100644 --- a/client/pb/oidb/oidb0x6d6.pb.go +++ b/client/pb/oidb/oidb0x6d6.pb.go @@ -85,12 +85,10 @@ type RenameFileRspBody struct { } type D6D6ReqBody struct { - UploadFileReq *UploadFileReqBody `protobuf:"bytes,1,opt"` - ResendFileReq *ResendReqBody `protobuf:"bytes,2,opt"` + UploadFileReq *UploadFileReqBody `protobuf:"bytes,1,opt"` + // optional ResendReqBody resendFileReq = 2; DownloadFileReq *DownloadFileReqBody `protobuf:"bytes,3,opt"` DeleteFileReq *DeleteFileReqBody `protobuf:"bytes,4,opt"` - RenameFileReq *RenameFileReqBody `protobuf:"bytes,5,opt"` - MoveFileReq *MoveFileReqBody `protobuf:"bytes,6,opt"` _ [0]func() } diff --git a/client/pb/oidb/oidb0x6d6.proto b/client/pb/oidb/oidb0x6d6.proto index 29efb2e2..c998408d 100644 --- a/client/pb/oidb/oidb0x6d6.proto +++ b/client/pb/oidb/oidb0x6d6.proto @@ -66,11 +66,11 @@ message RenameFileRspBody { } message D6D6ReqBody { optional UploadFileReqBody uploadFileReq = 1; - optional ResendReqBody resendFileReq = 2; + // optional ResendReqBody resendFileReq = 2; optional DownloadFileReqBody downloadFileReq = 3; optional DeleteFileReqBody deleteFileReq = 4; - optional RenameFileReqBody renameFileReq = 5; - optional MoveFileReqBody moveFileReq = 6; + // optional RenameFileReqBody renameFileReq = 5; + // optional MoveFileReqBody moveFileReq = 6; } message ResendReqBody { optional int64 groupCode = 1; diff --git a/client/pb/oidb/oidb0x6d7.pb.go b/client/pb/oidb/oidb0x6d7.pb.go index 3e102637..5b7940a0 100644 --- a/client/pb/oidb/oidb0x6d7.pb.go +++ b/client/pb/oidb/oidb0x6d7.pb.go @@ -70,15 +70,13 @@ type RenameFolderRspBody struct { type D6D7ReqBody struct { CreateFolderReq *CreateFolderReqBody `protobuf:"bytes,1,opt"` DeleteFolderReq *DeleteFolderReqBody `protobuf:"bytes,2,opt"` - RenameFolderReq *RenameFolderReqBody `protobuf:"bytes,3,opt"` - MoveFolderReq *MoveFolderReqBody `protobuf:"bytes,4,opt"` + RenameFolderReq *RenameFolderReqBody `protobuf:"bytes,3,opt"` // optional MoveFolderReqBody moveFolderReq = 4; _ [0]func() } type D6D7RspBody struct { CreateFolderRsp *CreateFolderRspBody `protobuf:"bytes,1,opt"` DeleteFolderRsp *DeleteFolderRspBody `protobuf:"bytes,2,opt"` - RenameFolderRsp *RenameFolderRspBody `protobuf:"bytes,3,opt"` - MoveFolderRsp *MoveFolderRspBody `protobuf:"bytes,4,opt"` + RenameFolderRsp *RenameFolderRspBody `protobuf:"bytes,3,opt"` // optional MoveFolderRspBody moveFolderRsp = 4; _ [0]func() } diff --git a/client/pb/oidb/oidb0x6d7.proto b/client/pb/oidb/oidb0x6d7.proto index f3b4f6e8..e81a596f 100644 --- a/client/pb/oidb/oidb0x6d7.proto +++ b/client/pb/oidb/oidb0x6d7.proto @@ -61,12 +61,12 @@ message D6D7ReqBody { optional CreateFolderReqBody createFolderReq = 1; optional DeleteFolderReqBody deleteFolderReq = 2; optional RenameFolderReqBody renameFolderReq = 3; - optional MoveFolderReqBody moveFolderReq = 4; + // optional MoveFolderReqBody moveFolderReq = 4; } message D6D7RspBody { optional CreateFolderRspBody createFolderRsp = 1; optional DeleteFolderRspBody deleteFolderRsp = 2; optional RenameFolderRspBody renameFolderRsp = 3; - optional MoveFolderRspBody moveFolderRsp = 4; + // optional MoveFolderRspBody moveFolderRsp = 4; } \ No newline at end of file diff --git a/client/pb/oidb/oidb0x6d8.pb.go b/client/pb/oidb/oidb0x6d8.pb.go index a80e925d..6a52d0c6 100644 --- a/client/pb/oidb/oidb0x6d8.pb.go +++ b/client/pb/oidb/oidb0x6d8.pb.go @@ -8,7 +8,7 @@ import ( ) type D6D8ReqBody struct { - FileInfoReq *GetFileInfoReqBody `protobuf:"bytes,1,opt"` + // optional GetFileInfoReqBody fileInfoReq = 1; FileListInfoReq *GetFileListReqBody `protobuf:"bytes,2,opt"` GroupFileCountReq *GetFileCountReqBody `protobuf:"bytes,3,opt"` GroupSpaceReq *GetSpaceReqBody `protobuf:"bytes,4,opt"` @@ -16,7 +16,7 @@ type D6D8ReqBody struct { } type D6D8RspBody struct { - FileInfoRsp *GetFileInfoRspBody `protobuf:"bytes,1,opt"` + // optional GetFileInfoRspBody fileInfoRsp = 1; FileListInfoRsp *GetFileListRspBody `protobuf:"bytes,2,opt"` FileCountRsp *GetFileCountRspBody `protobuf:"bytes,3,opt"` GroupSpaceRsp *GetSpaceRspBody `protobuf:"bytes,4,opt"` diff --git a/client/pb/oidb/oidb0x6d8.proto b/client/pb/oidb/oidb0x6d8.proto index 3251d0d9..0e05b6fc 100644 --- a/client/pb/oidb/oidb0x6d8.proto +++ b/client/pb/oidb/oidb0x6d8.proto @@ -3,14 +3,14 @@ syntax = "proto2"; option go_package = "github.com/Mrs4s/MiraiGo/client/pb/oidb"; message D6D8ReqBody { - optional GetFileInfoReqBody fileInfoReq = 1; + // optional GetFileInfoReqBody fileInfoReq = 1; optional GetFileListReqBody fileListInfoReq = 2; optional GetFileCountReqBody groupFileCountReq = 3; optional GetSpaceReqBody groupSpaceReq = 4; } message D6D8RspBody { - optional GetFileInfoRspBody fileInfoRsp = 1; + // optional GetFileInfoRspBody fileInfoRsp = 1; optional GetFileListRspBody fileListInfoRsp = 2; optional GetFileCountRspBody fileCountRsp = 3; optional GetSpaceRspBody groupSpaceRsp = 4; diff --git a/client/pb/oidb/oidb0x6d9.pb.go b/client/pb/oidb/oidb0x6d9.pb.go index 07d47d63..8ff613d0 100644 --- a/client/pb/oidb/oidb0x6d9.pb.go +++ b/client/pb/oidb/oidb0x6d9.pb.go @@ -79,10 +79,10 @@ type FeedsRspBody struct { } type D6D9ReqBody struct { - TransFileReq *TransFileReqBody `protobuf:"bytes,1,opt"` - CopyFromReq *CopyFromReqBody `protobuf:"bytes,2,opt"` - CopyToReq *CopyToReqBody `protobuf:"bytes,3,opt"` - FeedsInfoReq *FeedsReqBody `protobuf:"bytes,5,opt"` + // optional TransFileReqBody transFileReq = 1; + // optional CopyFromReqBody copyFromReq = 2; + // optional CopyToReqBody copyToReq = 3; + FeedsInfoReq *FeedsReqBody `protobuf:"bytes,5,opt"` _ [0]func() } diff --git a/client/pb/oidb/oidb0x6d9.proto b/client/pb/oidb/oidb0x6d9.proto index 4f5942db..99fc6a94 100644 --- a/client/pb/oidb/oidb0x6d9.proto +++ b/client/pb/oidb/oidb0x6d9.proto @@ -72,9 +72,9 @@ message FeedsRspBody { } message D6D9ReqBody { - optional TransFileReqBody transFileReq = 1; - optional CopyFromReqBody copyFromReq = 2; - optional CopyToReqBody copyToReq = 3; + // optional TransFileReqBody transFileReq = 1; + // optional CopyFromReqBody copyFromReq = 2; + // optional CopyToReqBody copyToReq = 3; optional FeedsReqBody feedsInfoReq = 5; } diff --git a/client/pb/oidb/oidb0x88d.pb.go b/client/pb/oidb/oidb0x88d.pb.go index b8ce2cd0..7b23b8f9 100644 --- a/client/pb/oidb/oidb0x88d.pb.go +++ b/client/pb/oidb/oidb0x88d.pb.go @@ -13,103 +13,97 @@ type D88DGroupHeadPortraitInfo struct { } type D88DGroupHeadPortrait struct { - PicCount proto.Option[uint32] `protobuf:"varint,1,opt"` - MsgInfo []*D88DGroupHeadPortraitInfo `protobuf:"bytes,2,rep"` - DefaultId proto.Option[uint32] `protobuf:"varint,3,opt"` - VerifyingPicCnt proto.Option[uint32] `protobuf:"varint,4,opt"` - MsgVerifyingPicInfo []*D88DGroupHeadPortraitInfo `protobuf:"bytes,5,rep"` + _ [0]func() } type D88DGroupExInfoOnly struct { - TribeId proto.Option[uint32] `protobuf:"varint,1,opt"` - MoneyForAddGroup proto.Option[uint32] `protobuf:"varint,2,opt"` - _ [0]func() + _ [0]func() } type D88DGroupInfo struct { - GroupOwner proto.Option[uint64] `protobuf:"varint,1,opt"` - GroupCreateTime proto.Option[uint32] `protobuf:"varint,2,opt"` - GroupFlag proto.Option[uint32] `protobuf:"varint,3,opt"` - GroupFlagExt proto.Option[uint32] `protobuf:"varint,4,opt"` - GroupMemberMaxNum proto.Option[uint32] `protobuf:"varint,5,opt"` - GroupMemberNum proto.Option[uint32] `protobuf:"varint,6,opt"` - GroupOption proto.Option[uint32] `protobuf:"varint,7,opt"` - GroupClassExt proto.Option[uint32] `protobuf:"varint,8,opt"` - GroupSpecialClass proto.Option[uint32] `protobuf:"varint,9,opt"` - GroupLevel proto.Option[uint32] `protobuf:"varint,10,opt"` - GroupFace proto.Option[uint32] `protobuf:"varint,11,opt"` - GroupDefaultPage proto.Option[uint32] `protobuf:"varint,12,opt"` - GroupInfoSeq proto.Option[uint32] `protobuf:"varint,13,opt"` - GroupRoamingTime proto.Option[uint32] `protobuf:"varint,14,opt"` - GroupName []byte `protobuf:"bytes,15,opt"` - GroupMemo []byte `protobuf:"bytes,16,opt"` - GroupFingerMemo []byte `protobuf:"bytes,17,opt"` - GroupClassText []byte `protobuf:"bytes,18,opt"` - GroupAllianceCode []uint32 `protobuf:"varint,19,rep"` - GroupExtraAadmNum proto.Option[uint32] `protobuf:"varint,20,opt"` - GroupUin proto.Option[uint64] `protobuf:"varint,21,opt"` - GroupCurMsgSeq proto.Option[uint32] `protobuf:"varint,22,opt"` - GroupLastMsgTime proto.Option[uint32] `protobuf:"varint,23,opt"` - GroupQuestion []byte `protobuf:"bytes,24,opt"` - GroupAnswer []byte `protobuf:"bytes,25,opt"` - GroupVisitorMaxNum proto.Option[uint32] `protobuf:"varint,26,opt"` - GroupVisitorCurNum proto.Option[uint32] `protobuf:"varint,27,opt"` - LevelNameSeq proto.Option[uint32] `protobuf:"varint,28,opt"` - GroupAdminMaxNum proto.Option[uint32] `protobuf:"varint,29,opt"` - GroupAioSkinTimestamp proto.Option[uint32] `protobuf:"varint,30,opt"` - GroupBoardSkinTimestamp proto.Option[uint32] `protobuf:"varint,31,opt"` - GroupAioSkinUrl []byte `protobuf:"bytes,32,opt"` - GroupBoardSkinUrl []byte `protobuf:"bytes,33,opt"` - GroupCoverSkinTimestamp proto.Option[uint32] `protobuf:"varint,34,opt"` - GroupCoverSkinUrl []byte `protobuf:"bytes,35,opt"` - GroupGrade proto.Option[uint32] `protobuf:"varint,36,opt"` - ActiveMemberNum proto.Option[uint32] `protobuf:"varint,37,opt"` - CertificationType proto.Option[uint32] `protobuf:"varint,38,opt"` - CertificationText []byte `protobuf:"bytes,39,opt"` - GroupRichFingerMemo []byte `protobuf:"bytes,40,opt"` - TagRecord []*D88DTagRecord `protobuf:"bytes,41,rep"` - GroupGeoInfo *D88DGroupGeoInfo `protobuf:"bytes,42,opt"` - HeadPortraitSeq proto.Option[uint32] `protobuf:"varint,43,opt"` - MsgHeadPortrait *D88DGroupHeadPortrait `protobuf:"bytes,44,opt"` - ShutupTimestamp proto.Option[uint32] `protobuf:"varint,45,opt"` - ShutupTimestampMe proto.Option[uint32] `protobuf:"varint,46,opt"` - CreateSourceFlag proto.Option[uint32] `protobuf:"varint,47,opt"` - CmduinMsgSeq proto.Option[uint32] `protobuf:"varint,48,opt"` - CmduinJoinTime proto.Option[uint32] `protobuf:"varint,49,opt"` - CmduinUinFlag proto.Option[uint32] `protobuf:"varint,50,opt"` - CmduinFlagEx proto.Option[uint32] `protobuf:"varint,51,opt"` - CmduinNewMobileFlag proto.Option[uint32] `protobuf:"varint,52,opt"` - CmduinReadMsgSeq proto.Option[uint32] `protobuf:"varint,53,opt"` - CmduinLastMsgTime proto.Option[uint32] `protobuf:"varint,54,opt"` - GroupTypeFlag proto.Option[uint32] `protobuf:"varint,55,opt"` - AppPrivilegeFlag proto.Option[uint32] `protobuf:"varint,56,opt"` - StGroupExInfo *D88DGroupExInfoOnly `protobuf:"bytes,57,opt"` - GroupSecLevel proto.Option[uint32] `protobuf:"varint,58,opt"` - GroupSecLevelInfo proto.Option[uint32] `protobuf:"varint,59,opt"` - CmduinPrivilege proto.Option[uint32] `protobuf:"varint,60,opt"` - PoidInfo []byte `protobuf:"bytes,61,opt"` - CmduinFlagEx2 proto.Option[uint32] `protobuf:"varint,62,opt"` - ConfUin proto.Option[uint64] `protobuf:"varint,63,opt"` - ConfMaxMsgSeq proto.Option[uint32] `protobuf:"varint,64,opt"` - ConfToGroupTime proto.Option[uint32] `protobuf:"varint,65,opt"` - PasswordRedbagTime proto.Option[uint32] `protobuf:"varint,66,opt"` - SubscriptionUin proto.Option[uint64] `protobuf:"varint,67,opt"` - MemberListChangeSeq proto.Option[uint32] `protobuf:"varint,68,opt"` - MembercardSeq proto.Option[uint32] `protobuf:"varint,69,opt"` - RootId proto.Option[uint64] `protobuf:"varint,70,opt"` - ParentId proto.Option[uint64] `protobuf:"varint,71,opt"` - TeamSeq proto.Option[uint32] `protobuf:"varint,72,opt"` - HistoryMsgBeginTime proto.Option[uint64] `protobuf:"varint,73,opt"` - InviteNoAuthNumLimit proto.Option[uint64] `protobuf:"varint,74,opt"` - CmduinHistoryMsgSeq proto.Option[uint32] `protobuf:"varint,75,opt"` - CmduinJoinMsgSeq proto.Option[uint32] `protobuf:"varint,76,opt"` - GroupFlagext3 proto.Option[uint32] `protobuf:"varint,77,opt"` - GroupOpenAppid proto.Option[uint32] `protobuf:"varint,78,opt"` - IsConfGroup proto.Option[uint32] `protobuf:"varint,79,opt"` - IsModifyConfGroupFace proto.Option[uint32] `protobuf:"varint,80,opt"` - IsModifyConfGroupName proto.Option[uint32] `protobuf:"varint,81,opt"` - NoFingerOpenFlag proto.Option[uint32] `protobuf:"varint,82,opt"` - NoCodeFingerOpenFlag proto.Option[uint32] `protobuf:"varint,83,opt"` + GroupOwner proto.Option[uint64] `protobuf:"varint,1,opt"` + GroupCreateTime proto.Option[uint32] `protobuf:"varint,2,opt"` + GroupFlag proto.Option[uint32] `protobuf:"varint,3,opt"` + GroupFlagExt proto.Option[uint32] `protobuf:"varint,4,opt"` + GroupMemberMaxNum proto.Option[uint32] `protobuf:"varint,5,opt"` + GroupMemberNum proto.Option[uint32] `protobuf:"varint,6,opt"` + GroupOption proto.Option[uint32] `protobuf:"varint,7,opt"` + GroupClassExt proto.Option[uint32] `protobuf:"varint,8,opt"` + GroupSpecialClass proto.Option[uint32] `protobuf:"varint,9,opt"` + GroupLevel proto.Option[uint32] `protobuf:"varint,10,opt"` + GroupFace proto.Option[uint32] `protobuf:"varint,11,opt"` + GroupDefaultPage proto.Option[uint32] `protobuf:"varint,12,opt"` + GroupInfoSeq proto.Option[uint32] `protobuf:"varint,13,opt"` + GroupRoamingTime proto.Option[uint32] `protobuf:"varint,14,opt"` + GroupName []byte `protobuf:"bytes,15,opt"` + GroupMemo []byte `protobuf:"bytes,16,opt"` + GroupFingerMemo []byte `protobuf:"bytes,17,opt"` + GroupClassText []byte `protobuf:"bytes,18,opt"` + GroupAllianceCode []uint32 `protobuf:"varint,19,rep"` + GroupExtraAadmNum proto.Option[uint32] `protobuf:"varint,20,opt"` + GroupUin proto.Option[uint64] `protobuf:"varint,21,opt"` + GroupCurMsgSeq proto.Option[uint32] `protobuf:"varint,22,opt"` + GroupLastMsgTime proto.Option[uint32] `protobuf:"varint,23,opt"` + GroupQuestion []byte `protobuf:"bytes,24,opt"` + GroupAnswer []byte `protobuf:"bytes,25,opt"` + GroupVisitorMaxNum proto.Option[uint32] `protobuf:"varint,26,opt"` + GroupVisitorCurNum proto.Option[uint32] `protobuf:"varint,27,opt"` + LevelNameSeq proto.Option[uint32] `protobuf:"varint,28,opt"` + GroupAdminMaxNum proto.Option[uint32] `protobuf:"varint,29,opt"` + GroupAioSkinTimestamp proto.Option[uint32] `protobuf:"varint,30,opt"` + GroupBoardSkinTimestamp proto.Option[uint32] `protobuf:"varint,31,opt"` + GroupAioSkinUrl []byte `protobuf:"bytes,32,opt"` + GroupBoardSkinUrl []byte `protobuf:"bytes,33,opt"` + GroupCoverSkinTimestamp proto.Option[uint32] `protobuf:"varint,34,opt"` + GroupCoverSkinUrl []byte `protobuf:"bytes,35,opt"` + GroupGrade proto.Option[uint32] `protobuf:"varint,36,opt"` + ActiveMemberNum proto.Option[uint32] `protobuf:"varint,37,opt"` + CertificationType proto.Option[uint32] `protobuf:"varint,38,opt"` + CertificationText []byte `protobuf:"bytes,39,opt"` + GroupRichFingerMemo []byte `protobuf:"bytes,40,opt"` + // repeated D88DTagRecord tagRecord = 41; + // optional D88DGroupGeoInfo groupGeoInfo = 42; + HeadPortraitSeq proto.Option[uint32] `protobuf:"varint,43,opt"` + MsgHeadPortrait *D88DGroupHeadPortrait `protobuf:"bytes,44,opt"` + ShutupTimestamp proto.Option[uint32] `protobuf:"varint,45,opt"` + ShutupTimestampMe proto.Option[uint32] `protobuf:"varint,46,opt"` + CreateSourceFlag proto.Option[uint32] `protobuf:"varint,47,opt"` + CmduinMsgSeq proto.Option[uint32] `protobuf:"varint,48,opt"` + CmduinJoinTime proto.Option[uint32] `protobuf:"varint,49,opt"` + CmduinUinFlag proto.Option[uint32] `protobuf:"varint,50,opt"` + CmduinFlagEx proto.Option[uint32] `protobuf:"varint,51,opt"` + CmduinNewMobileFlag proto.Option[uint32] `protobuf:"varint,52,opt"` + CmduinReadMsgSeq proto.Option[uint32] `protobuf:"varint,53,opt"` + CmduinLastMsgTime proto.Option[uint32] `protobuf:"varint,54,opt"` + GroupTypeFlag proto.Option[uint32] `protobuf:"varint,55,opt"` + AppPrivilegeFlag proto.Option[uint32] `protobuf:"varint,56,opt"` + StGroupExInfo *D88DGroupExInfoOnly `protobuf:"bytes,57,opt"` + GroupSecLevel proto.Option[uint32] `protobuf:"varint,58,opt"` + GroupSecLevelInfo proto.Option[uint32] `protobuf:"varint,59,opt"` + CmduinPrivilege proto.Option[uint32] `protobuf:"varint,60,opt"` + PoidInfo []byte `protobuf:"bytes,61,opt"` + CmduinFlagEx2 proto.Option[uint32] `protobuf:"varint,62,opt"` + ConfUin proto.Option[uint64] `protobuf:"varint,63,opt"` + ConfMaxMsgSeq proto.Option[uint32] `protobuf:"varint,64,opt"` + ConfToGroupTime proto.Option[uint32] `protobuf:"varint,65,opt"` + PasswordRedbagTime proto.Option[uint32] `protobuf:"varint,66,opt"` + SubscriptionUin proto.Option[uint64] `protobuf:"varint,67,opt"` + MemberListChangeSeq proto.Option[uint32] `protobuf:"varint,68,opt"` + MembercardSeq proto.Option[uint32] `protobuf:"varint,69,opt"` + RootId proto.Option[uint64] `protobuf:"varint,70,opt"` + ParentId proto.Option[uint64] `protobuf:"varint,71,opt"` + TeamSeq proto.Option[uint32] `protobuf:"varint,72,opt"` + HistoryMsgBeginTime proto.Option[uint64] `protobuf:"varint,73,opt"` + InviteNoAuthNumLimit proto.Option[uint64] `protobuf:"varint,74,opt"` + CmduinHistoryMsgSeq proto.Option[uint32] `protobuf:"varint,75,opt"` + CmduinJoinMsgSeq proto.Option[uint32] `protobuf:"varint,76,opt"` + GroupFlagext3 proto.Option[uint32] `protobuf:"varint,77,opt"` + GroupOpenAppid proto.Option[uint32] `protobuf:"varint,78,opt"` + IsConfGroup proto.Option[uint32] `protobuf:"varint,79,opt"` + IsModifyConfGroupFace proto.Option[uint32] `protobuf:"varint,80,opt"` + IsModifyConfGroupName proto.Option[uint32] `protobuf:"varint,81,opt"` + NoFingerOpenFlag proto.Option[uint32] `protobuf:"varint,82,opt"` + NoCodeFingerOpenFlag proto.Option[uint32] `protobuf:"varint,83,opt"` } type ReqGroupInfo struct { diff --git a/client/pb/oidb/oidb0x88d.proto b/client/pb/oidb/oidb0x88d.proto index c85a52cd..1f6d6336 100644 --- a/client/pb/oidb/oidb0x88d.proto +++ b/client/pb/oidb/oidb0x88d.proto @@ -9,17 +9,21 @@ message D88DGroupHeadPortraitInfo message D88DGroupHeadPortrait { + /* optional uint32 picCount = 1; repeated D88DGroupHeadPortraitInfo msgInfo = 2; optional uint32 defaultId = 3; optional uint32 verifyingPicCnt = 4; repeated D88DGroupHeadPortraitInfo msgVerifyingPicInfo = 5; + */ } message D88DGroupExInfoOnly { + /* optional uint32 tribeId = 1; optional uint32 moneyForAddGroup = 2; + */ }; message D88DGroupInfo @@ -64,8 +68,8 @@ message D88DGroupInfo optional uint32 certificationType = 38; optional bytes certificationText = 39; optional bytes groupRichFingerMemo = 40; - repeated D88DTagRecord tagRecord = 41; - optional D88DGroupGeoInfo groupGeoInfo = 42; + // repeated D88DTagRecord tagRecord = 41; + // optional D88DGroupGeoInfo groupGeoInfo = 42; optional uint32 headPortraitSeq = 43; optional D88DGroupHeadPortrait msgHeadPortrait = 44; optional uint32 shutupTimestamp = 45 ; diff --git a/client/pb/oidb/oidb0xeb7.pb.go b/client/pb/oidb/oidb0xeb7.pb.go index f2ec9d74..53cdba3d 100644 --- a/client/pb/oidb/oidb0xeb7.pb.go +++ b/client/pb/oidb/oidb0xeb7.pb.go @@ -9,9 +9,9 @@ import ( // DEB7 prefix type DEB7ReqBody struct { - SignInStatusReq *StSignInStatusReq `protobuf:"bytes,1,opt"` - SignInWriteReq *StSignInWriteReq `protobuf:"bytes,2,opt"` - _ [0]func() + // optional StSignInStatusReq signInStatusReq = 1; + SignInWriteReq *StSignInWriteReq `protobuf:"bytes,2,opt"` + _ [0]func() } type DEB7Ret struct { diff --git a/client/pb/oidb/oidb0xeb7.proto b/client/pb/oidb/oidb0xeb7.proto index 2b3d0746..fbcea507 100644 --- a/client/pb/oidb/oidb0xeb7.proto +++ b/client/pb/oidb/oidb0xeb7.proto @@ -4,7 +4,7 @@ option go_package = "github.com/Mrs4s/MiraiGo/client/pb/oidb"; // DEB7 prefix message DEB7ReqBody { - optional StSignInStatusReq signInStatusReq = 1; + // optional StSignInStatusReq signInStatusReq = 1; optional StSignInWriteReq signInWriteReq = 2; } diff --git a/client/pb/profilecard/gate.pb.go b/client/pb/profilecard/gate.pb.go index 13fa0c79..ca13de0d 100644 --- a/client/pb/profilecard/gate.pb.go +++ b/client/pb/profilecard/gate.pb.go @@ -69,9 +69,9 @@ type GateVaProfileGateReq struct { UCmd proto.Option[int32] `protobuf:"varint,1,opt"` StPrivilegeReq *GatePrivilegeBaseInfoReq `protobuf:"bytes,2,opt"` StGiftReq *GateGetGiftListReq `protobuf:"bytes,3,opt"` - TaskItem []*GateCommTaskInfo `protobuf:"bytes,4,rep"` - OidbFlag []*GateOidbFlagInfo `protobuf:"bytes,5,rep"` - StVipCare *GateGetVipCareReq `protobuf:"bytes,6,opt"` + // repeated GateCommTaskInfo taskItem = 4; + OidbFlag []*GateOidbFlagInfo `protobuf:"bytes,5,rep"` + StVipCare *GateGetVipCareReq `protobuf:"bytes,6,opt"` } type GateQidInfoItem struct { @@ -83,12 +83,12 @@ type GateQidInfoItem struct { } type GateVaProfileGateRsp struct { - IRetCode proto.Option[int32] `protobuf:"varint,1,opt"` - SRetMsg []byte `protobuf:"bytes,2,opt"` - StPrivilegeRsp *GatePrivilegeBaseInfoRsp `protobuf:"bytes,3,opt"` - StGiftRsp *GateGetGiftListRsp `protobuf:"bytes,4,opt"` - TaskItem []*GateCommTaskInfo `protobuf:"bytes,5,rep"` - OidbFlag []*GateOidbFlagInfo `protobuf:"bytes,6,rep"` - StVipCare *GateGetVipCareRsp `protobuf:"bytes,7,opt"` - QidInfo *GateQidInfoItem `protobuf:"bytes,9,opt"` + IRetCode proto.Option[int32] `protobuf:"varint,1,opt"` + SRetMsg []byte `protobuf:"bytes,2,opt"` + // optional GatePrivilegeBaseInfoRsp stPrivilegeRsp = 3; + // optional GateGetGiftListRsp stGiftRsp = 4; + // repeated GateCommTaskInfo taskItem = 5; + // repeated GateOidbFlagInfo oidbFlag = 6; + // optional GateGetVipCareRsp stVipCare = 7; + QidInfo *GateQidInfoItem `protobuf:"bytes,9,opt"` } diff --git a/client/pb/profilecard/gate.proto b/client/pb/profilecard/gate.proto index 53fa00a7..9e9e59e3 100644 --- a/client/pb/profilecard/gate.proto +++ b/client/pb/profilecard/gate.proto @@ -50,7 +50,7 @@ message GateVaProfileGateReq { optional int32 uCmd = 1; optional GatePrivilegeBaseInfoReq stPrivilegeReq = 2; optional GateGetGiftListReq stGiftReq = 3; - repeated GateCommTaskInfo taskItem = 4; + // repeated GateCommTaskInfo taskItem = 4; repeated GateOidbFlagInfo oidbFlag = 5; optional GateGetVipCareReq stVipCare = 6; } @@ -65,10 +65,10 @@ message GateQidInfoItem { message GateVaProfileGateRsp { optional int32 iRetCode = 1; optional bytes sRetMsg = 2; - optional GatePrivilegeBaseInfoRsp stPrivilegeRsp = 3; - optional GateGetGiftListRsp stGiftRsp = 4; - repeated GateCommTaskInfo taskItem = 5; - repeated GateOidbFlagInfo oidbFlag = 6; - optional GateGetVipCareRsp stVipCare = 7; + //optional GatePrivilegeBaseInfoRsp stPrivilegeRsp = 3; + //optional GateGetGiftListRsp stGiftRsp = 4; + //repeated GateCommTaskInfo taskItem = 5; + //repeated GateOidbFlagInfo oidbFlag = 6; + //optional GateGetVipCareRsp stVipCare = 7; optional GateQidInfoItem qidInfo = 9; } diff --git a/client/pb/pttcenter/shortvideo.pb.go b/client/pb/pttcenter/shortvideo.pb.go index f8537989..1fad3cd5 100644 --- a/client/pb/pttcenter/shortvideo.pb.go +++ b/client/pb/pttcenter/shortvideo.pb.go @@ -48,29 +48,26 @@ type ShortVideoDownloadReq struct { } type ShortVideoDownloadRsp struct { - RetCode int32 `protobuf:"varint,1,opt"` - RetMsg string `protobuf:"bytes,2,opt"` - SameAreaOutAddr []*ShortVideoIpList `protobuf:"bytes,3,rep"` - DiffAreaOutAddr []*ShortVideoIpList `protobuf:"bytes,4,rep"` - DownloadKey []byte `protobuf:"bytes,5,opt"` - FileMd5 []byte `protobuf:"bytes,6,opt"` - SameAreaInnerAddr []*ShortVideoIpList `protobuf:"bytes,7,rep"` - DiffAreaInnerAddr []*ShortVideoIpList `protobuf:"bytes,8,rep"` - DownloadAddr *ShortVideoAddr `protobuf:"bytes,9,opt"` - EncryptKey []byte `protobuf:"bytes,10,opt"` + RetCode int32 `protobuf:"varint,1,opt"` + RetMsg string `protobuf:"bytes,2,opt"` + // repeated ShortVideoIpList sameAreaOutAddr = 3; + // repeated ShortVideoIpList diffAreaOutAddr = 4; + DownloadKey []byte `protobuf:"bytes,5,opt"` + FileMd5 []byte `protobuf:"bytes,6,opt"` + // repeated ShortVideoIpList sameAreaInnerAddr = 7; + // repeated ShortVideoIpList diffAreaInnerAddr = 8; + DownloadAddr *ShortVideoAddr `protobuf:"bytes,9,opt"` + EncryptKey []byte `protobuf:"bytes,10,opt"` } type ShortVideoUploadRsp struct { - RetCode int32 `protobuf:"varint,1,opt"` - RetMsg string `protobuf:"bytes,2,opt"` - SameAreaOutAddr []*ShortVideoIpList `protobuf:"bytes,3,rep"` - DiffAreaOutAddr []*ShortVideoIpList `protobuf:"bytes,4,rep"` - FileId string `protobuf:"bytes,5,opt"` - UKey []byte `protobuf:"bytes,6,opt"` - FileExists int32 `protobuf:"varint,7,opt"` - SameAreaInnerAddr []*ShortVideoIpList `protobuf:"bytes,8,rep"` - DiffAreaInnerAddr []*ShortVideoIpList `protobuf:"bytes,9,rep"` - DataHole []*DataHole `protobuf:"bytes,10,rep"` + RetCode int32 `protobuf:"varint,1,opt"` + RetMsg string `protobuf:"bytes,2,opt"` + // repeated ShortVideoIpList sameAreaOutAddr = 3; + // repeated ShortVideoIpList diffAreaOutAddr = 4; + FileId string `protobuf:"bytes,5,opt"` + UKey []byte `protobuf:"bytes,6,opt"` + FileExists int32 `protobuf:"varint,7,opt"` } type ShortVideoFileInfo struct { diff --git a/client/pb/pttcenter/shortvideo.proto b/client/pb/pttcenter/shortvideo.proto index ecbd3c6e..4b30ba3a 100644 --- a/client/pb/pttcenter/shortvideo.proto +++ b/client/pb/pttcenter/shortvideo.proto @@ -46,12 +46,12 @@ message ShortVideoDownloadReq { message ShortVideoDownloadRsp { int32 retCode = 1; string retMsg = 2; - repeated ShortVideoIpList sameAreaOutAddr = 3; - repeated ShortVideoIpList diffAreaOutAddr = 4; + //repeated ShortVideoIpList sameAreaOutAddr = 3; + //repeated ShortVideoIpList diffAreaOutAddr = 4; bytes downloadKey = 5; bytes fileMd5 = 6; - repeated ShortVideoIpList sameAreaInnerAddr = 7; - repeated ShortVideoIpList diffAreaInnerAddr = 8; + //repeated ShortVideoIpList sameAreaInnerAddr = 7; + //repeated ShortVideoIpList diffAreaInnerAddr = 8; ShortVideoAddr downloadAddr = 9; bytes encryptKey = 10; } @@ -59,14 +59,14 @@ message ShortVideoDownloadRsp { message ShortVideoUploadRsp { int32 retCode = 1; string retMsg = 2; - repeated ShortVideoIpList sameAreaOutAddr = 3; - repeated ShortVideoIpList diffAreaOutAddr = 4; + //repeated ShortVideoIpList sameAreaOutAddr = 3; + //repeated ShortVideoIpList diffAreaOutAddr = 4; string fileId = 5; bytes uKey = 6; int32 fileExists = 7; - repeated ShortVideoIpList sameAreaInnerAddr = 8; - repeated ShortVideoIpList diffAreaInnerAddr = 9; - repeated DataHole dataHole = 10; + //repeated ShortVideoIpList sameAreaInnerAddr = 8; + //repeated ShortVideoIpList diffAreaInnerAddr = 9; + //repeated DataHole dataHole = 10; } message ShortVideoFileInfo { diff --git a/client/pb/structmsg/structmsg.pb.go b/client/pb/structmsg/structmsg.pb.go index 373f0f62..212ab6f9 100644 --- a/client/pb/structmsg/structmsg.pb.go +++ b/client/pb/structmsg/structmsg.pb.go @@ -193,58 +193,58 @@ type StructMsg struct { } type SystemMsg struct { - SubType int32 `protobuf:"varint,1,opt"` - MsgTitle string `protobuf:"bytes,2,opt"` - MsgDescribe string `protobuf:"bytes,3,opt"` - MsgAdditional string `protobuf:"bytes,4,opt"` - MsgSource string `protobuf:"bytes,5,opt"` - MsgDecided string `protobuf:"bytes,6,opt"` - SrcId int32 `protobuf:"varint,7,opt"` - SubSrcId int32 `protobuf:"varint,8,opt"` - Actions []*SystemMsgAction `protobuf:"bytes,9,rep"` - GroupCode int64 `protobuf:"varint,10,opt"` - ActionUin int64 `protobuf:"varint,11,opt"` - GroupMsgType int32 `protobuf:"varint,12,opt"` - GroupInviterRole int32 `protobuf:"varint,13,opt"` - FriendInfo *FriendInfo `protobuf:"bytes,14,opt"` - GroupInfo *SGroupInfo `protobuf:"bytes,15,opt"` - ActorUin int64 `protobuf:"varint,16,opt"` - MsgActorDescribe string `protobuf:"bytes,17,opt"` - MsgAdditionalList string `protobuf:"bytes,18,opt"` - Relation int32 `protobuf:"varint,19,opt"` - Reqsubtype int32 `protobuf:"varint,20,opt"` - CloneUin int64 `protobuf:"varint,21,opt"` - DiscussUin int64 `protobuf:"varint,22,opt"` - EimGroupId int64 `protobuf:"varint,23,opt"` - MsgInviteExtinfo *MsgInviteExt `protobuf:"bytes,24,opt"` - MsgPayGroupExtinfo *MsgPayGroupExt `protobuf:"bytes,25,opt"` - SourceFlag int32 `protobuf:"varint,26,opt"` - GameNick []byte `protobuf:"bytes,27,opt"` - GameMsg []byte `protobuf:"bytes,28,opt"` - GroupFlagext3 int32 `protobuf:"varint,29,opt"` - GroupOwnerUin int64 `protobuf:"varint,30,opt"` - DoubtFlag int32 `protobuf:"varint,31,opt"` - WarningTips []byte `protobuf:"bytes,32,opt"` - NameMore []byte `protobuf:"bytes,33,opt"` - ReqUinFaceid int32 `protobuf:"varint,50,opt"` - ReqUinNick string `protobuf:"bytes,51,opt"` - GroupName string `protobuf:"bytes,52,opt"` - ActionUinNick string `protobuf:"bytes,53,opt"` - MsgQna string `protobuf:"bytes,54,opt"` - MsgDetail string `protobuf:"bytes,55,opt"` - GroupExtFlag int32 `protobuf:"varint,57,opt"` - ActorUinNick string `protobuf:"bytes,58,opt"` - PicUrl string `protobuf:"bytes,59,opt"` - CloneUinNick string `protobuf:"bytes,60,opt"` - ReqUinBusinessCard string `protobuf:"bytes,61,opt"` - EimGroupIdName string `protobuf:"bytes,63,opt"` - ReqUinPreRemark string `protobuf:"bytes,64,opt"` - ActionUinQqNick string `protobuf:"bytes,65,opt"` - ActionUinRemark string `protobuf:"bytes,66,opt"` - ReqUinGender int32 `protobuf:"varint,67,opt"` - ReqUinAge int32 `protobuf:"varint,68,opt"` - C2CInviteJoinGroupFlag int32 `protobuf:"varint,69,opt"` - CardSwitch int32 `protobuf:"varint,101,opt"` + SubType int32 `protobuf:"varint,1,opt"` + MsgTitle string `protobuf:"bytes,2,opt"` + MsgDescribe string `protobuf:"bytes,3,opt"` + MsgAdditional string `protobuf:"bytes,4,opt"` + MsgSource string `protobuf:"bytes,5,opt"` + MsgDecided string `protobuf:"bytes,6,opt"` + SrcId int32 `protobuf:"varint,7,opt"` + SubSrcId int32 `protobuf:"varint,8,opt"` + // repeated SystemMsgAction actions = 9; + GroupCode int64 `protobuf:"varint,10,opt"` + ActionUin int64 `protobuf:"varint,11,opt"` + GroupMsgType int32 `protobuf:"varint,12,opt"` + GroupInviterRole int32 `protobuf:"varint,13,opt"` + // FriendInfo friendInfo = 14; + // SGroupInfo groupInfo = 15; + ActorUin int64 `protobuf:"varint,16,opt"` + MsgActorDescribe string `protobuf:"bytes,17,opt"` + MsgAdditionalList string `protobuf:"bytes,18,opt"` + Relation int32 `protobuf:"varint,19,opt"` + Reqsubtype int32 `protobuf:"varint,20,opt"` + CloneUin int64 `protobuf:"varint,21,opt"` + DiscussUin int64 `protobuf:"varint,22,opt"` + EimGroupId int64 `protobuf:"varint,23,opt"` + // MsgInviteExt msgInviteExtinfo = 24; + // MsgPayGroupExt msgPayGroupExtinfo = 25; + SourceFlag int32 `protobuf:"varint,26,opt"` + GameNick []byte `protobuf:"bytes,27,opt"` + GameMsg []byte `protobuf:"bytes,28,opt"` + GroupFlagext3 int32 `protobuf:"varint,29,opt"` + GroupOwnerUin int64 `protobuf:"varint,30,opt"` + DoubtFlag int32 `protobuf:"varint,31,opt"` + WarningTips []byte `protobuf:"bytes,32,opt"` + NameMore []byte `protobuf:"bytes,33,opt"` + ReqUinFaceid int32 `protobuf:"varint,50,opt"` + ReqUinNick string `protobuf:"bytes,51,opt"` + GroupName string `protobuf:"bytes,52,opt"` + ActionUinNick string `protobuf:"bytes,53,opt"` + MsgQna string `protobuf:"bytes,54,opt"` + MsgDetail string `protobuf:"bytes,55,opt"` + GroupExtFlag int32 `protobuf:"varint,57,opt"` + ActorUinNick string `protobuf:"bytes,58,opt"` + PicUrl string `protobuf:"bytes,59,opt"` + CloneUinNick string `protobuf:"bytes,60,opt"` + ReqUinBusinessCard string `protobuf:"bytes,61,opt"` + EimGroupIdName string `protobuf:"bytes,63,opt"` + ReqUinPreRemark string `protobuf:"bytes,64,opt"` + ActionUinQqNick string `protobuf:"bytes,65,opt"` + ActionUinRemark string `protobuf:"bytes,66,opt"` + ReqUinGender int32 `protobuf:"varint,67,opt"` + ReqUinAge int32 `protobuf:"varint,68,opt"` + C2CInviteJoinGroupFlag int32 `protobuf:"varint,69,opt"` + CardSwitch int32 `protobuf:"varint,101,opt"` } type SystemMsgAction struct { diff --git a/client/pb/structmsg/structmsg.proto b/client/pb/structmsg/structmsg.proto index 3463f719..6eb00898 100644 --- a/client/pb/structmsg/structmsg.proto +++ b/client/pb/structmsg/structmsg.proto @@ -177,13 +177,13 @@ message SystemMsg { string msgDecided = 6; int32 srcId = 7; int32 subSrcId = 8; - repeated SystemMsgAction actions = 9; + // repeated SystemMsgAction actions = 9; int64 groupCode = 10; int64 actionUin = 11; int32 groupMsgType = 12; int32 groupInviterRole = 13; - FriendInfo friendInfo = 14; - SGroupInfo groupInfo = 15; + // FriendInfo friendInfo = 14; + // SGroupInfo groupInfo = 15; int64 actorUin = 16; string msgActorDescribe = 17; string msgAdditionalList = 18; @@ -192,8 +192,8 @@ message SystemMsg { int64 cloneUin = 21; int64 discussUin = 22; int64 eimGroupId = 23; - MsgInviteExt msgInviteExtinfo = 24; - MsgPayGroupExt msgPayGroupExtinfo = 25; + // MsgInviteExt msgInviteExtinfo = 24; + // MsgPayGroupExt msgPayGroupExtinfo = 25; int32 sourceFlag = 26; bytes gameNick = 27; bytes gameMsg = 28; @@ -222,6 +222,7 @@ message SystemMsg { int32 c2cInviteJoinGroupFlag = 69; int32 cardSwitch = 101; } + message SystemMsgAction { string name = 1; string result = 2;