From d5a9fc8d7d72d679d2ec8ecd59a70e6d584b0614 Mon Sep 17 00:00:00 2001 From: Mrs4s Date: Tue, 15 Dec 2020 23:46:27 +0800 Subject: [PATCH] feature GetAtAllRemain. --- client/entities.go | 6 + client/group_msg.go | 45 +++++ client/pb/oidb/oidb0x8a7.pb.go | 294 +++++++++++++++++++++++++++++++++ client/pb/oidb/oidb0x8a7.proto | 18 ++ 4 files changed, 363 insertions(+) create mode 100644 client/pb/oidb/oidb0x8a7.pb.go create mode 100644 client/pb/oidb/oidb0x8a7.proto diff --git a/client/entities.go b/client/entities.go index 4958c946..402b81dd 100644 --- a/client/entities.go +++ b/client/entities.go @@ -198,6 +198,12 @@ type ( Y int32 `json:"y"` } + AtAllRemainInfo struct { + CanAtAll bool `json:"can_at_all"` + RemainAtAllCountForGroup uint32 `json:"remain_at_all_count_for_group"` + RemainAtAllCountForUin uint32 `json:"remain_at_all_count_for_uin"` + } + groupMemberListResponse struct { NextUin int64 list []*GroupMemberInfo diff --git a/client/group_msg.go b/client/group_msg.go index b89f7caa..41dacec2 100644 --- a/client/group_msg.go +++ b/client/group_msg.go @@ -5,6 +5,7 @@ import ( "github.com/Mrs4s/MiraiGo/client/pb/longmsg" "github.com/Mrs4s/MiraiGo/client/pb/msg" "github.com/Mrs4s/MiraiGo/client/pb/multimsg" + "github.com/Mrs4s/MiraiGo/client/pb/oidb" "github.com/Mrs4s/MiraiGo/message" "github.com/Mrs4s/MiraiGo/protocol/packets" "github.com/Mrs4s/MiraiGo/utils" @@ -19,6 +20,7 @@ func init() { decoders["OnlinePush.PbPushGroupMsg"] = decodeGroupMessagePacket decoders["MessageSvc.PbSendMsg"] = decodeMsgSendResponse decoders["MessageSvc.PbGetGroupMsg"] = decodeGetGroupMsgResponse + decoders["OidbSvc.0x8a7_0"] = decodeAtAllRemainResponse } // SendGroupMessage 发送群消息 @@ -65,6 +67,14 @@ func (c *QQClient) GetGroupMessages(groupCode, beginSeq, endSeq int64) ([]*messa return i.([]*message.GroupMessage), nil } +func (c *QQClient) GetAtAllRemain(groupCode int64) (*AtAllRemainInfo, error) { + i, err := c.sendAndWait(c.buildAtAllRemainRequestPacket(groupCode)) + if err != nil { + return nil, err + } + return i.(*AtAllRemainInfo), nil +} + func (c *QQClient) sendGroupMessage(groupCode int64, forward bool, m *message.SendingMessage) *message.GroupMessage { eid := utils.RandomString(6) mr := int32(rand.Uint32()) @@ -236,6 +246,25 @@ func (c *QQClient) buildGetGroupMsgRequest(groupCode, beginSeq, endSeq int64) (u return seq, packet } +func (c *QQClient) buildAtAllRemainRequestPacket(groupCode int64) (uint16, []byte) { + seq := c.nextSeq() + body := &oidb.D8A7ReqBody{ + SubCmd: proto.Uint32(1), + LimitIntervalTypeForUin: proto.Uint32(2), + LimitIntervalTypeForGroup: proto.Uint32(1), + Uin: proto.Uint64(uint64(c.Uin)), + GroupCode: proto.Uint64(uint64(groupCode)), + } + b, _ := proto.Marshal(body) + req := &oidb.OIDBSSOPkg{ + Command: 2215, + Bodybuffer: b, + } + payload, _ := proto.Marshal(req) + packet := packets.BuildUniPacket(c.Uin, seq, "OidbSvc.0x8a7_0", 1, c.OutGoingPacketSessionId, EmptyBytes, c.sigInfo.d2Key, payload) + return seq, packet +} + // OnlinePush.PbPushGroupMsg func decodeGroupMessagePacket(c *QQClient, _ uint16, payload []byte) (interface{}, error) { pkt := msg.PushMessagePacket{} @@ -300,3 +329,19 @@ func decodeGetGroupMsgResponse(c *QQClient, _ uint16, payload []byte) (interface } return ret, nil } + +func decodeAtAllRemainResponse(_ *QQClient, _ uint16, payload []byte) (interface{}, error) { + pkg := oidb.OIDBSSOPkg{} + rsp := oidb.D8A7RspBody{} + if err := proto.Unmarshal(payload, &pkg); err != nil { + return nil, errors.Wrap(err, "failed to unmarshal protobuf message") + } + if err := proto.Unmarshal(pkg.Bodybuffer, &rsp); err != nil { + return nil, errors.Wrap(err, "failed to unmarshal protobuf message") + } + return &AtAllRemainInfo{ + CanAtAll: rsp.GetCanAtAll(), + RemainAtAllCountForGroup: rsp.GetRemainAtAllCountForGroup(), + RemainAtAllCountForUin: rsp.GetRemainAtAllCountForUin(), + }, nil +} diff --git a/client/pb/oidb/oidb0x8a7.pb.go b/client/pb/oidb/oidb0x8a7.pb.go new file mode 100644 index 00000000..fd64ad78 --- /dev/null +++ b/client/pb/oidb/oidb0x8a7.pb.go @@ -0,0 +1,294 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.25.0 +// protoc v3.11.4 +// source: oidb0x8a7.proto + +package oidb + +import ( + proto "github.com/golang/protobuf/proto" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + +type D8A7ReqBody struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + SubCmd *uint32 `protobuf:"varint,1,opt,name=subCmd" json:"subCmd,omitempty"` + LimitIntervalTypeForUin *uint32 `protobuf:"varint,2,opt,name=limitIntervalTypeForUin" json:"limitIntervalTypeForUin,omitempty"` + LimitIntervalTypeForGroup *uint32 `protobuf:"varint,3,opt,name=limitIntervalTypeForGroup" json:"limitIntervalTypeForGroup,omitempty"` + Uin *uint64 `protobuf:"varint,4,opt,name=uin" json:"uin,omitempty"` + GroupCode *uint64 `protobuf:"varint,5,opt,name=groupCode" json:"groupCode,omitempty"` +} + +func (x *D8A7ReqBody) Reset() { + *x = D8A7ReqBody{} + if protoimpl.UnsafeEnabled { + mi := &file_oidb0x8a7_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *D8A7ReqBody) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*D8A7ReqBody) ProtoMessage() {} + +func (x *D8A7ReqBody) ProtoReflect() protoreflect.Message { + mi := &file_oidb0x8a7_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use D8A7ReqBody.ProtoReflect.Descriptor instead. +func (*D8A7ReqBody) Descriptor() ([]byte, []int) { + return file_oidb0x8a7_proto_rawDescGZIP(), []int{0} +} + +func (x *D8A7ReqBody) GetSubCmd() uint32 { + if x != nil && x.SubCmd != nil { + return *x.SubCmd + } + return 0 +} + +func (x *D8A7ReqBody) GetLimitIntervalTypeForUin() uint32 { + if x != nil && x.LimitIntervalTypeForUin != nil { + return *x.LimitIntervalTypeForUin + } + return 0 +} + +func (x *D8A7ReqBody) GetLimitIntervalTypeForGroup() uint32 { + if x != nil && x.LimitIntervalTypeForGroup != nil { + return *x.LimitIntervalTypeForGroup + } + return 0 +} + +func (x *D8A7ReqBody) GetUin() uint64 { + if x != nil && x.Uin != nil { + return *x.Uin + } + return 0 +} + +func (x *D8A7ReqBody) GetGroupCode() uint64 { + if x != nil && x.GroupCode != nil { + return *x.GroupCode + } + return 0 +} + +type D8A7RspBody struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + CanAtAll *bool `protobuf:"varint,1,opt,name=canAtAll" json:"canAtAll,omitempty"` + RemainAtAllCountForUin *uint32 `protobuf:"varint,2,opt,name=remainAtAllCountForUin" json:"remainAtAllCountForUin,omitempty"` + RemainAtAllCountForGroup *uint32 `protobuf:"varint,3,opt,name=remainAtAllCountForGroup" json:"remainAtAllCountForGroup,omitempty"` + PromptMsg1 []byte `protobuf:"bytes,4,opt,name=promptMsg1" json:"promptMsg1,omitempty"` + PromptMsg2 []byte `protobuf:"bytes,5,opt,name=promptMsg2" json:"promptMsg2,omitempty"` +} + +func (x *D8A7RspBody) Reset() { + *x = D8A7RspBody{} + if protoimpl.UnsafeEnabled { + mi := &file_oidb0x8a7_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *D8A7RspBody) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*D8A7RspBody) ProtoMessage() {} + +func (x *D8A7RspBody) ProtoReflect() protoreflect.Message { + mi := &file_oidb0x8a7_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use D8A7RspBody.ProtoReflect.Descriptor instead. +func (*D8A7RspBody) Descriptor() ([]byte, []int) { + return file_oidb0x8a7_proto_rawDescGZIP(), []int{1} +} + +func (x *D8A7RspBody) GetCanAtAll() bool { + if x != nil && x.CanAtAll != nil { + return *x.CanAtAll + } + return false +} + +func (x *D8A7RspBody) GetRemainAtAllCountForUin() uint32 { + if x != nil && x.RemainAtAllCountForUin != nil { + return *x.RemainAtAllCountForUin + } + return 0 +} + +func (x *D8A7RspBody) GetRemainAtAllCountForGroup() uint32 { + if x != nil && x.RemainAtAllCountForGroup != nil { + return *x.RemainAtAllCountForGroup + } + return 0 +} + +func (x *D8A7RspBody) GetPromptMsg1() []byte { + if x != nil { + return x.PromptMsg1 + } + return nil +} + +func (x *D8A7RspBody) GetPromptMsg2() []byte { + if x != nil { + return x.PromptMsg2 + } + return nil +} + +var File_oidb0x8a7_proto protoreflect.FileDescriptor + +var file_oidb0x8a7_proto_rawDesc = []byte{ + 0x0a, 0x0f, 0x6f, 0x69, 0x64, 0x62, 0x30, 0x78, 0x38, 0x61, 0x37, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x22, 0xcd, 0x01, 0x0a, 0x0b, 0x44, 0x38, 0x41, 0x37, 0x52, 0x65, 0x71, 0x42, 0x6f, 0x64, + 0x79, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x75, 0x62, 0x43, 0x6d, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0d, 0x52, 0x06, 0x73, 0x75, 0x62, 0x43, 0x6d, 0x64, 0x12, 0x38, 0x0a, 0x17, 0x6c, 0x69, 0x6d, + 0x69, 0x74, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x46, 0x6f, + 0x72, 0x55, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x17, 0x6c, 0x69, 0x6d, 0x69, + 0x74, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x46, 0x6f, 0x72, + 0x55, 0x69, 0x6e, 0x12, 0x3c, 0x0a, 0x19, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x49, 0x6e, 0x74, 0x65, + 0x72, 0x76, 0x61, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x46, 0x6f, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x19, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x49, 0x6e, 0x74, + 0x65, 0x72, 0x76, 0x61, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x46, 0x6f, 0x72, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, + 0x75, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x43, 0x6f, 0x64, 0x65, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x43, 0x6f, 0x64, + 0x65, 0x22, 0xdd, 0x01, 0x0a, 0x0b, 0x44, 0x38, 0x41, 0x37, 0x52, 0x73, 0x70, 0x42, 0x6f, 0x64, + 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x6e, 0x41, 0x74, 0x41, 0x6c, 0x6c, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x08, 0x63, 0x61, 0x6e, 0x41, 0x74, 0x41, 0x6c, 0x6c, 0x12, 0x36, 0x0a, + 0x16, 0x72, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x41, 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, + 0x74, 0x46, 0x6f, 0x72, 0x55, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x16, 0x72, + 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x41, 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x46, + 0x6f, 0x72, 0x55, 0x69, 0x6e, 0x12, 0x3a, 0x0a, 0x18, 0x72, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x41, + 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x46, 0x6f, 0x72, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x18, 0x72, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x41, + 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x46, 0x6f, 0x72, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x4d, 0x73, 0x67, 0x31, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x4d, 0x73, 0x67, + 0x31, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x4d, 0x73, 0x67, 0x32, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x4d, 0x73, 0x67, + 0x32, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x3b, 0x6f, 0x69, 0x64, 0x62, +} + +var ( + file_oidb0x8a7_proto_rawDescOnce sync.Once + file_oidb0x8a7_proto_rawDescData = file_oidb0x8a7_proto_rawDesc +) + +func file_oidb0x8a7_proto_rawDescGZIP() []byte { + file_oidb0x8a7_proto_rawDescOnce.Do(func() { + file_oidb0x8a7_proto_rawDescData = protoimpl.X.CompressGZIP(file_oidb0x8a7_proto_rawDescData) + }) + return file_oidb0x8a7_proto_rawDescData +} + +var file_oidb0x8a7_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_oidb0x8a7_proto_goTypes = []interface{}{ + (*D8A7ReqBody)(nil), // 0: D8A7ReqBody + (*D8A7RspBody)(nil), // 1: D8A7RspBody +} +var file_oidb0x8a7_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_oidb0x8a7_proto_init() } +func file_oidb0x8a7_proto_init() { + if File_oidb0x8a7_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_oidb0x8a7_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*D8A7ReqBody); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_oidb0x8a7_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*D8A7RspBody); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_oidb0x8a7_proto_rawDesc, + NumEnums: 0, + NumMessages: 2, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_oidb0x8a7_proto_goTypes, + DependencyIndexes: file_oidb0x8a7_proto_depIdxs, + MessageInfos: file_oidb0x8a7_proto_msgTypes, + }.Build() + File_oidb0x8a7_proto = out.File + file_oidb0x8a7_proto_rawDesc = nil + file_oidb0x8a7_proto_goTypes = nil + file_oidb0x8a7_proto_depIdxs = nil +} diff --git a/client/pb/oidb/oidb0x8a7.proto b/client/pb/oidb/oidb0x8a7.proto new file mode 100644 index 00000000..9bc5b66f --- /dev/null +++ b/client/pb/oidb/oidb0x8a7.proto @@ -0,0 +1,18 @@ +syntax = "proto2"; + +option go_package = ".;oidb"; + +message D8A7ReqBody { + optional uint32 subCmd = 1; + optional uint32 limitIntervalTypeForUin = 2; + optional uint32 limitIntervalTypeForGroup = 3; + optional uint64 uin = 4; + optional uint64 groupCode = 5; +} +message D8A7RspBody { + optional bool canAtAll = 1; + optional uint32 remainAtAllCountForUin = 2; + optional uint32 remainAtAllCountForGroup = 3; + optional bytes promptMsg1 = 4; + optional bytes promptMsg2 = 5; +} \ No newline at end of file