From 04445c21d7cf2858bf30d20e2033deb9b0f7a96c Mon Sep 17 00:00:00 2001 From: DengBiao <2319963317@qq.com> Date: Fri, 7 Apr 2023 11:44:35 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=8F=96=E6=B6=88=E7=A6=81=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/logic/api/logic_ext.go | 15 +- internal/logic/app/group_app.go | 37 ++- pkg/pb/logic.ext.pb.go | 511 +++++++++++++++++++------------- pkg/proto/logic.ext.proto | 10 +- 4 files changed, 361 insertions(+), 212 deletions(-) diff --git a/internal/logic/api/logic_ext.go b/internal/logic/api/logic_ext.go index f27ed79..865c5c1 100644 --- a/internal/logic/api/logic_ext.go +++ b/internal/logic/api/logic_ext.go @@ -10,6 +10,19 @@ import ( type LogicExtServer struct{} +func (s *LogicExtServer) SetGroupRemoveBannedMembers(ctx context.Context, in *pb.SetGroupMemberRemoveBannedReq) (*pb.Empty, error) { + userId, _, err := grpclib.GetCtxData(ctx) + if err != nil { + return nil, err + } + + err = app.GroupApp.SetGroupMemberRemoveBanned(ctx, userId, in.GroupId, in.RemoveUserIds) + if err != nil { + return nil, err + } + return &pb.Empty{}, nil +} + // SetGroupBannedMembers 设置禁言 func (s *LogicExtServer) SetGroupBannedMembers(ctx context.Context, in *pb.SetGroupMemberBannedReq) (*pb.SetGroupMemberBannedResp, error) { userId, _, err := grpclib.GetCtxData(ctx) @@ -21,7 +34,7 @@ func (s *LogicExtServer) SetGroupBannedMembers(ctx context.Context, in *pb.SetGr if in.IsAllMemberBanned == pb.AllMemberBannedType_YES_All_Member_Banned { isAllMemberBanned = true } - members, err := app.GroupApp.SetGroupMemberBanned(ctx, userId, in.GroupId, in.UserIds, in.RemoveUserIds, isAllMemberBanned) + members, err := app.GroupApp.SetGroupMemberBanned(ctx, userId, in.GroupId, in.UserIds, isAllMemberBanned) return &pb.SetGroupMemberBannedResp{Members: members, IsAllMemberBanned: in.IsAllMemberBanned}, err } diff --git a/internal/logic/app/group_app.go b/internal/logic/app/group_app.go index 40de9a3..c01ea7f 100644 --- a/internal/logic/app/group_app.go +++ b/internal/logic/app/group_app.go @@ -167,7 +167,7 @@ func (*groupApp) GetBannedMembers(ctx context.Context, groupId int64) ([]*pb.Gro } // SetGroupMemberBanned 设置禁言 -func (*groupApp) SetGroupMemberBanned(ctx context.Context, optId, groupId int64, userIds []int64, removeUserIds []int64, isAllMemberBanned bool) ([]*pb.GroupMember, error) { +func (*groupApp) SetGroupMemberBanned(ctx context.Context, optId, groupId int64, userIds []int64, isAllMemberBanned bool) ([]*pb.GroupMember, error) { groupUser, err := repo.GroupUserRepo.Get(groupId, optId) if err != nil { return nil, err @@ -223,22 +223,43 @@ func (*groupApp) SetGroupMemberBanned(ctx context.Context, optId, groupId int64, } } + // 查询被禁言的成员列表 + group, err = repo.GroupRepo.GetForBanned(groupId) + if err != nil { + return nil, err + } + return group.GetMembers(ctx) +} + +// SetGroupMemberRemoveBanned 设置取消禁言 +func (*groupApp) SetGroupMemberRemoveBanned(ctx context.Context, optId, groupId int64, removeUserIds []int64) error { + groupUser, err := repo.GroupUserRepo.Get(groupId, optId) + if err != nil { + return err + } + if groupUser == nil { + return errors.New("未查询到群组用户信息") + } + if groupUser.MemberType != int(pb.MemberType_GMT_ADMIN) { + return errors.New("非管理员操作") + } + + group, err := repo.GroupRepo.Get(groupId) + if err != nil { + return err + } + if len(removeUserIds) > 0 { //给取消禁言用户推送消息 for _, u := range removeUserIds { err = group.PushGroupMemberRemoveBanned(ctx, optId, u) if err != nil { - return nil, err + return err } } } - // 查询被禁言的成员列表 - group, err = repo.GroupRepo.GetForBanned(groupId) - if err != nil { - return nil, err - } - return group.GetMembers(ctx) + return nil } // RecallSendMessage 撤回发送消息 diff --git a/pkg/pb/logic.ext.pb.go b/pkg/pb/logic.ext.pb.go index 98af47a..cf01d54 100644 --- a/pkg/pb/logic.ext.pb.go +++ b/pkg/pb/logic.ext.pb.go @@ -2123,8 +2123,7 @@ type SetGroupMemberBannedReq struct { GroupId int64 `protobuf:"varint,1,opt,name=group_id,json=groupId,proto3" json:"group_id,omitempty"` // 群组id UserIds []int64 `protobuf:"varint,2,rep,packed,name=user_ids,json=userIds,proto3" json:"user_ids,omitempty"` // 用户id列表 - RemoveUserIds []int64 `protobuf:"varint,3,rep,packed,name=remove_user_ids,json=removeUserIds,proto3" json:"remove_user_ids,omitempty"` // 解除 - IsAllMemberBanned AllMemberBannedType `protobuf:"varint,4,opt,name=is_all_member_banned,json=isAllMemberBanned,proto3,enum=pb.AllMemberBannedType" json:"is_all_member_banned,omitempty"` // 全员禁言(1:是 2:否) + IsAllMemberBanned AllMemberBannedType `protobuf:"varint,3,opt,name=is_all_member_banned,json=isAllMemberBanned,proto3,enum=pb.AllMemberBannedType" json:"is_all_member_banned,omitempty"` // 全员禁言(1:是 2:否) } func (x *SetGroupMemberBannedReq) Reset() { @@ -2173,18 +2172,66 @@ func (x *SetGroupMemberBannedReq) GetUserIds() []int64 { return nil } -func (x *SetGroupMemberBannedReq) GetRemoveUserIds() []int64 { +func (x *SetGroupMemberBannedReq) GetIsAllMemberBanned() AllMemberBannedType { if x != nil { - return x.RemoveUserIds + return x.IsAllMemberBanned } - return nil + return AllMemberBannedType_UNKNOWN_All_Member_Banned } -func (x *SetGroupMemberBannedReq) GetIsAllMemberBanned() AllMemberBannedType { +type SetGroupMemberRemoveBannedReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + GroupId int64 `protobuf:"varint,1,opt,name=group_id,json=groupId,proto3" json:"group_id,omitempty"` // 群组id + RemoveUserIds []int64 `protobuf:"varint,2,rep,packed,name=remove_user_ids,json=removeUserIds,proto3" json:"remove_user_ids,omitempty"` // 解除用户id列表 +} + +func (x *SetGroupMemberRemoveBannedReq) Reset() { + *x = SetGroupMemberRemoveBannedReq{} + if protoimpl.UnsafeEnabled { + mi := &file_logic_ext_proto_msgTypes[31] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SetGroupMemberRemoveBannedReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SetGroupMemberRemoveBannedReq) ProtoMessage() {} + +func (x *SetGroupMemberRemoveBannedReq) ProtoReflect() protoreflect.Message { + mi := &file_logic_ext_proto_msgTypes[31] + 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 SetGroupMemberRemoveBannedReq.ProtoReflect.Descriptor instead. +func (*SetGroupMemberRemoveBannedReq) Descriptor() ([]byte, []int) { + return file_logic_ext_proto_rawDescGZIP(), []int{31} +} + +func (x *SetGroupMemberRemoveBannedReq) GetGroupId() int64 { if x != nil { - return x.IsAllMemberBanned + return x.GroupId } - return AllMemberBannedType_UNKNOWN_All_Member_Banned + return 0 +} + +func (x *SetGroupMemberRemoveBannedReq) GetRemoveUserIds() []int64 { + if x != nil { + return x.RemoveUserIds + } + return nil } type SetGroupMemberBannedResp struct { @@ -2199,7 +2246,7 @@ type SetGroupMemberBannedResp struct { func (x *SetGroupMemberBannedResp) Reset() { *x = SetGroupMemberBannedResp{} if protoimpl.UnsafeEnabled { - mi := &file_logic_ext_proto_msgTypes[31] + mi := &file_logic_ext_proto_msgTypes[32] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2212,7 +2259,7 @@ func (x *SetGroupMemberBannedResp) String() string { func (*SetGroupMemberBannedResp) ProtoMessage() {} func (x *SetGroupMemberBannedResp) ProtoReflect() protoreflect.Message { - mi := &file_logic_ext_proto_msgTypes[31] + mi := &file_logic_ext_proto_msgTypes[32] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2225,7 +2272,7 @@ func (x *SetGroupMemberBannedResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SetGroupMemberBannedResp.ProtoReflect.Descriptor instead. func (*SetGroupMemberBannedResp) Descriptor() ([]byte, []int) { - return file_logic_ext_proto_rawDescGZIP(), []int{31} + return file_logic_ext_proto_rawDescGZIP(), []int{32} } func (x *SetGroupMemberBannedResp) GetIsAllMemberBanned() AllMemberBannedType { @@ -2253,7 +2300,7 @@ type GetGroupBannedMembersReq struct { func (x *GetGroupBannedMembersReq) Reset() { *x = GetGroupBannedMembersReq{} if protoimpl.UnsafeEnabled { - mi := &file_logic_ext_proto_msgTypes[32] + mi := &file_logic_ext_proto_msgTypes[33] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2266,7 +2313,7 @@ func (x *GetGroupBannedMembersReq) String() string { func (*GetGroupBannedMembersReq) ProtoMessage() {} func (x *GetGroupBannedMembersReq) ProtoReflect() protoreflect.Message { - mi := &file_logic_ext_proto_msgTypes[32] + mi := &file_logic_ext_proto_msgTypes[33] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2279,7 +2326,7 @@ func (x *GetGroupBannedMembersReq) ProtoReflect() protoreflect.Message { // Deprecated: Use GetGroupBannedMembersReq.ProtoReflect.Descriptor instead. func (*GetGroupBannedMembersReq) Descriptor() ([]byte, []int) { - return file_logic_ext_proto_rawDescGZIP(), []int{32} + return file_logic_ext_proto_rawDescGZIP(), []int{33} } func (x *GetGroupBannedMembersReq) GetGroupId() int64 { @@ -2300,7 +2347,7 @@ type GetGroupBannedMembersResp struct { func (x *GetGroupBannedMembersResp) Reset() { *x = GetGroupBannedMembersResp{} if protoimpl.UnsafeEnabled { - mi := &file_logic_ext_proto_msgTypes[33] + mi := &file_logic_ext_proto_msgTypes[34] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2313,7 +2360,7 @@ func (x *GetGroupBannedMembersResp) String() string { func (*GetGroupBannedMembersResp) ProtoMessage() {} func (x *GetGroupBannedMembersResp) ProtoReflect() protoreflect.Message { - mi := &file_logic_ext_proto_msgTypes[33] + mi := &file_logic_ext_proto_msgTypes[34] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2326,7 +2373,7 @@ func (x *GetGroupBannedMembersResp) ProtoReflect() protoreflect.Message { // Deprecated: Use GetGroupBannedMembersResp.ProtoReflect.Descriptor instead. func (*GetGroupBannedMembersResp) Descriptor() ([]byte, []int) { - return file_logic_ext_proto_rawDescGZIP(), []int{33} + return file_logic_ext_proto_rawDescGZIP(), []int{34} } func (x *GetGroupBannedMembersResp) GetMembers() []*GroupMember { @@ -2579,120 +2626,129 @@ var file_logic_ext_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x6d, 0x61, 0x72, 0x6b, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x78, 0x74, 0x72, 0x61, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x78, 0x74, 0x72, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x09, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0xc1, 0x01, 0x0a, 0x17, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x99, 0x01, 0x0a, 0x17, 0x53, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x52, 0x65, 0x71, 0x12, 0x19, 0x0a, 0x08, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x02, - 0x20, 0x03, 0x28, 0x03, 0x52, 0x07, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x73, 0x12, 0x26, 0x0a, - 0x0f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x73, - 0x18, 0x03, 0x20, 0x03, 0x28, 0x03, 0x52, 0x0d, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x55, 0x73, - 0x65, 0x72, 0x49, 0x64, 0x73, 0x12, 0x48, 0x0a, 0x14, 0x69, 0x73, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, - 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x5f, 0x62, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x70, 0x62, 0x2e, 0x41, 0x6c, 0x6c, 0x4d, 0x65, 0x6d, 0x62, - 0x65, 0x72, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x52, 0x11, 0x69, 0x73, - 0x41, 0x6c, 0x6c, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x22, - 0x8f, 0x01, 0x0a, 0x18, 0x53, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, - 0x65, 0x72, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x48, 0x0a, 0x14, - 0x69, 0x73, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x5f, 0x62, 0x61, - 0x6e, 0x6e, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x70, 0x62, 0x2e, - 0x41, 0x6c, 0x6c, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x54, - 0x79, 0x70, 0x65, 0x52, 0x11, 0x69, 0x73, 0x41, 0x6c, 0x6c, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, - 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x12, 0x29, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, - 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, - 0x73, 0x22, 0x35, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x61, 0x6e, - 0x6e, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x12, 0x19, 0x0a, - 0x08, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x46, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x47, - 0x72, 0x6f, 0x75, 0x70, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, - 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x29, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x72, 0x6f, 0x75, - 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, - 0x2a, 0x3c, 0x0a, 0x0a, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, - 0x0a, 0x0b, 0x47, 0x4d, 0x54, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, - 0x0d, 0x0a, 0x09, 0x47, 0x4d, 0x54, 0x5f, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x01, 0x12, 0x0e, - 0x0a, 0x0a, 0x47, 0x4d, 0x54, 0x5f, 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x02, 0x2a, 0x6a, - 0x0a, 0x13, 0x41, 0x6c, 0x6c, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x61, 0x6e, 0x6e, 0x65, - 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x0a, 0x19, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, - 0x5f, 0x41, 0x6c, 0x6c, 0x5f, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x5f, 0x42, 0x61, 0x6e, 0x6e, - 0x65, 0x64, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x59, 0x45, 0x53, 0x5f, 0x41, 0x6c, 0x6c, 0x5f, - 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x5f, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x10, 0x01, 0x12, - 0x19, 0x0a, 0x15, 0x4e, 0x4f, 0x54, 0x5f, 0x41, 0x6c, 0x6c, 0x5f, 0x4d, 0x65, 0x6d, 0x62, 0x65, - 0x72, 0x5f, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x10, 0x02, 0x32, 0xfa, 0x08, 0x0a, 0x08, 0x4c, - 0x6f, 0x67, 0x69, 0x63, 0x45, 0x78, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x52, 0x65, 0x67, 0x69, 0x73, - 0x74, 0x65, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x12, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x52, - 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, - 0x1a, 0x16, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x44, 0x65, - 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x36, 0x0a, 0x0b, 0x53, 0x65, 0x6e, 0x64, - 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x6e, - 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x13, 0x2e, 0x70, 0x62, - 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x3c, 0x0a, 0x0d, 0x52, 0x65, 0x63, 0x61, 0x6c, 0x6c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x12, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x63, 0x61, 0x6c, 0x6c, 0x4d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x63, - 0x61, 0x6c, 0x6c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, - 0x0a, 0x08, 0x50, 0x75, 0x73, 0x68, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x2e, - 0x50, 0x75, 0x73, 0x68, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x1a, 0x09, 0x2e, 0x70, 0x62, - 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x3c, 0x0a, 0x0d, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, - 0x64, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x6e, - 0x64, 0x52, 0x65, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, - 0x70, 0x62, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x09, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x12, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x52, 0x65, 0x71, 0x1a, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x32, - 0x0a, 0x0e, 0x41, 0x67, 0x72, 0x65, 0x65, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x12, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x41, 0x67, 0x72, 0x65, 0x65, 0x41, 0x64, 0x64, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, - 0x74, 0x79, 0x12, 0x2e, 0x0a, 0x0c, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x12, 0x13, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, - 0x74, 0x79, 0x12, 0x30, 0x0a, 0x09, 0x53, 0x65, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, - 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, - 0x71, 0x1a, 0x11, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x2b, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x73, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x12, 0x2e, - 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x36, 0x0a, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, - 0x12, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x72, 0x6f, 0x75, - 0x70, 0x52, 0x65, 0x71, 0x1a, 0x13, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2c, 0x0a, 0x0b, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x71, 0x1a, 0x09, 0x2e, 0x70, - 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x2d, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x47, 0x72, - 0x6f, 0x75, 0x70, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, - 0x70, 0x52, 0x65, 0x71, 0x1a, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x29, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x73, 0x12, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x11, - 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x42, 0x0a, 0x0f, 0x41, 0x64, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, - 0x62, 0x65, 0x72, 0x73, 0x12, 0x16, 0x2e, 0x70, 0x62, 0x2e, 0x41, 0x64, 0x64, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x17, 0x2e, 0x70, - 0x62, 0x2e, 0x41, 0x64, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, - 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x38, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x47, - 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x18, 0x2e, 0x70, 0x62, 0x2e, - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, - 0x72, 0x52, 0x65, 0x71, 0x1a, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, - 0x38, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, - 0x6d, 0x62, 0x65, 0x72, 0x12, 0x18, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, - 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x09, - 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x42, 0x0a, 0x0f, 0x47, 0x65, 0x74, - 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x12, 0x16, 0x2e, 0x70, - 0x62, 0x2e, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, - 0x73, 0x52, 0x65, 0x71, 0x1a, 0x17, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x52, 0x0a, - 0x15, 0x53, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x4d, - 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x12, 0x1b, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x74, 0x47, - 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, - 0x52, 0x65, 0x71, 0x1a, 0x1c, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, - 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x54, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x61, 0x6e, - 0x6e, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x12, 0x1c, 0x2e, 0x70, 0x62, 0x2e, - 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x4d, 0x65, - 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x1d, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x65, + 0x20, 0x03, 0x28, 0x03, 0x52, 0x07, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x73, 0x12, 0x48, 0x0a, + 0x14, 0x69, 0x73, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x5f, 0x62, + 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x70, 0x62, + 0x2e, 0x41, 0x6c, 0x6c, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, + 0x54, 0x79, 0x70, 0x65, 0x52, 0x11, 0x69, 0x73, 0x41, 0x6c, 0x6c, 0x4d, 0x65, 0x6d, 0x62, 0x65, + 0x72, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x22, 0x62, 0x0a, 0x1d, 0x53, 0x65, 0x74, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, + 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x52, 0x65, 0x71, 0x12, 0x19, 0x0a, 0x08, 0x67, 0x72, 0x6f, 0x75, + 0x70, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, + 0x70, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x0f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x75, 0x73, + 0x65, 0x72, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x03, 0x52, 0x0d, 0x72, 0x65, + 0x6d, 0x6f, 0x76, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x73, 0x22, 0x8f, 0x01, 0x0a, 0x18, + 0x53, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x61, + 0x6e, 0x6e, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x48, 0x0a, 0x14, 0x69, 0x73, 0x5f, 0x61, + 0x6c, 0x6c, 0x5f, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x5f, 0x62, 0x61, 0x6e, 0x6e, 0x65, 0x64, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x70, 0x62, 0x2e, 0x41, 0x6c, 0x6c, 0x4d, + 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x52, + 0x11, 0x69, 0x73, 0x41, 0x6c, 0x6c, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x61, 0x6e, 0x6e, + 0x65, 0x64, 0x12, 0x29, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, + 0x6d, 0x62, 0x65, 0x72, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x22, 0x35, 0x0a, + 0x18, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x4d, + 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x12, 0x19, 0x0a, 0x08, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x49, 0x64, 0x22, 0x46, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x29, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, + 0x62, 0x65, 0x72, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x2a, 0x3c, 0x0a, 0x0a, + 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x47, 0x4d, + 0x54, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x47, + 0x4d, 0x54, 0x5f, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x4d, + 0x54, 0x5f, 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x02, 0x2a, 0x6a, 0x0a, 0x13, 0x41, 0x6c, + 0x6c, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x54, 0x79, 0x70, + 0x65, 0x12, 0x1d, 0x0a, 0x19, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x41, 0x6c, 0x6c, + 0x5f, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x5f, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x10, 0x00, + 0x12, 0x19, 0x0a, 0x15, 0x59, 0x45, 0x53, 0x5f, 0x41, 0x6c, 0x6c, 0x5f, 0x4d, 0x65, 0x6d, 0x62, + 0x65, 0x72, 0x5f, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, 0x4e, + 0x4f, 0x54, 0x5f, 0x41, 0x6c, 0x6c, 0x5f, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x5f, 0x42, 0x61, + 0x6e, 0x6e, 0x65, 0x64, 0x10, 0x02, 0x32, 0xc7, 0x09, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x69, 0x63, + 0x45, 0x78, 0x74, 0x12, 0x3f, 0x0a, 0x0e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x44, + 0x65, 0x76, 0x69, 0x63, 0x65, 0x12, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, + 0x74, 0x65, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x70, + 0x62, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x36, 0x0a, 0x0b, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, + 0x61, 0x67, 0x65, 0x12, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, + 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x13, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x6e, + 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3c, 0x0a, 0x0d, + 0x52, 0x65, 0x63, 0x61, 0x6c, 0x6c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x14, 0x2e, + 0x70, 0x62, 0x2e, 0x52, 0x65, 0x63, 0x61, 0x6c, 0x6c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x63, 0x61, 0x6c, 0x6c, 0x4d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x08, 0x50, 0x75, + 0x73, 0x68, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x75, 0x73, 0x68, + 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x1a, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, + 0x74, 0x79, 0x12, 0x3c, 0x0a, 0x0d, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x64, 0x50, 0x61, 0x63, + 0x6b, 0x65, 0x74, 0x12, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x64, + 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x53, + 0x65, 0x6e, 0x64, 0x52, 0x65, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x28, 0x0a, 0x09, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x10, 0x2e, + 0x70, 0x62, 0x2e, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x1a, + 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x32, 0x0a, 0x0e, 0x41, 0x67, + 0x72, 0x65, 0x65, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x15, 0x2e, 0x70, + 0x62, 0x2e, 0x41, 0x67, 0x72, 0x65, 0x65, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x52, 0x65, 0x71, 0x1a, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x2e, + 0x0a, 0x0c, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x13, + 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x52, 0x65, 0x71, 0x1a, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x30, + 0x0a, 0x09, 0x53, 0x65, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x10, 0x2e, 0x70, 0x62, + 0x2e, 0x53, 0x65, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, + 0x70, 0x62, 0x2e, 0x53, 0x65, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x2b, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x12, 0x09, + 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x47, + 0x65, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x36, 0x0a, + 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x2e, 0x70, + 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x71, + 0x1a, 0x13, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2c, 0x0a, 0x0b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x47, + 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x71, 0x1a, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, + 0x70, 0x74, 0x79, 0x12, 0x2d, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, + 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x71, + 0x1a, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x29, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, + 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x11, 0x2e, 0x70, 0x62, 0x2e, + 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x42, 0x0a, + 0x0f, 0x41, 0x64, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, + 0x12, 0x16, 0x2e, 0x70, 0x62, 0x2e, 0x41, 0x64, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, + 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x17, 0x2e, 0x70, 0x62, 0x2e, 0x41, 0x64, + 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x38, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x18, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, + 0x1a, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x38, 0x0a, 0x11, 0x44, + 0x65, 0x6c, 0x65, 0x74, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, + 0x12, 0x18, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x09, 0x2e, 0x70, 0x62, 0x2e, + 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x42, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x12, 0x16, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x65, + 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, + 0x1a, 0x17, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, + 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x52, 0x0a, 0x15, 0x53, 0x65, 0x74, + 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, + 0x72, 0x73, 0x12, 0x1b, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x52, 0x65, 0x71, 0x1a, + 0x1c, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, + 0x62, 0x65, 0x72, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x4b, 0x0a, + 0x1b, 0x53, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, + 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x12, 0x21, 0x2e, 0x70, + 0x62, 0x2e, 0x53, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, + 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x52, 0x65, 0x71, 0x1a, + 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x54, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x62, - 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x42, 0x0d, 0x5a, 0x0b, 0x67, 0x69, 0x6d, 0x2f, 0x70, - 0x6b, 0x67, 0x2f, 0x70, 0x62, 0x2f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x73, 0x12, 0x1c, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x42, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, + 0x71, 0x1a, 0x1d, 0x2e, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, + 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, + 0x42, 0x0d, 0x5a, 0x0b, 0x67, 0x69, 0x6d, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x62, 0x2f, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2708,56 +2764,57 @@ func file_logic_ext_proto_rawDescGZIP() []byte { } var file_logic_ext_proto_enumTypes = make([]protoimpl.EnumInfo, 2) -var file_logic_ext_proto_msgTypes = make([]protoimpl.MessageInfo, 34) +var file_logic_ext_proto_msgTypes = make([]protoimpl.MessageInfo, 35) var file_logic_ext_proto_goTypes = []interface{}{ - (MemberType)(0), // 0: pb.MemberType - (AllMemberBannedType)(0), // 1: pb.AllMemberBannedType - (*RegisterDeviceReq)(nil), // 2: pb.RegisterDeviceReq - (*RegisterDeviceResp)(nil), // 3: pb.RegisterDeviceResp - (*SendMessageReq)(nil), // 4: pb.SendMessageReq - (*SendMessageResp)(nil), // 5: pb.SendMessageResp - (*RecallMessageReq)(nil), // 6: pb.RecallMessageReq - (*RecallMessageResp)(nil), // 7: pb.RecallMessageResp - (*SendRedPacketReq)(nil), // 8: pb.SendRedPacketReq - (*SendRedPacketResp)(nil), // 9: pb.SendRedPacketResp - (*PushRoomReq)(nil), // 10: pb.PushRoomReq - (*AddFriendReq)(nil), // 11: pb.AddFriendReq - (*DeleteFriendReq)(nil), // 12: pb.DeleteFriendReq - (*AgreeAddFriendReq)(nil), // 13: pb.AgreeAddFriendReq - (*SetFriendReq)(nil), // 14: pb.SetFriendReq - (*SetFriendResp)(nil), // 15: pb.SetFriendResp - (*Friend)(nil), // 16: pb.Friend - (*GetFriendsResp)(nil), // 17: pb.GetFriendsResp - (*CreateGroupReq)(nil), // 18: pb.CreateGroupReq - (*CreateGroupResp)(nil), // 19: pb.CreateGroupResp - (*UpdateGroupReq)(nil), // 20: pb.UpdateGroupReq - (*GetGroupReq)(nil), // 21: pb.GetGroupReq - (*GetGroupResp)(nil), // 22: pb.GetGroupResp - (*Group)(nil), // 23: pb.Group - (*GetGroupsResp)(nil), // 24: pb.GetGroupsResp - (*AddGroupMembersReq)(nil), // 25: pb.AddGroupMembersReq - (*AddGroupMembersResp)(nil), // 26: pb.AddGroupMembersResp - (*UpdateGroupMemberReq)(nil), // 27: pb.UpdateGroupMemberReq - (*DeleteGroupMemberReq)(nil), // 28: pb.DeleteGroupMemberReq - (*GetGroupMembersReq)(nil), // 29: pb.GetGroupMembersReq - (*GetGroupMembersResp)(nil), // 30: pb.GetGroupMembersResp - (*GroupMember)(nil), // 31: pb.GroupMember - (*SetGroupMemberBannedReq)(nil), // 32: pb.SetGroupMemberBannedReq - (*SetGroupMemberBannedResp)(nil), // 33: pb.SetGroupMemberBannedResp - (*GetGroupBannedMembersReq)(nil), // 34: pb.GetGroupBannedMembersReq - (*GetGroupBannedMembersResp)(nil), // 35: pb.GetGroupBannedMembersResp - (ReceiverType)(0), // 36: pb.ReceiverType - (MessageType)(0), // 37: pb.MessageType - (*Empty)(nil), // 38: pb.Empty + (MemberType)(0), // 0: pb.MemberType + (AllMemberBannedType)(0), // 1: pb.AllMemberBannedType + (*RegisterDeviceReq)(nil), // 2: pb.RegisterDeviceReq + (*RegisterDeviceResp)(nil), // 3: pb.RegisterDeviceResp + (*SendMessageReq)(nil), // 4: pb.SendMessageReq + (*SendMessageResp)(nil), // 5: pb.SendMessageResp + (*RecallMessageReq)(nil), // 6: pb.RecallMessageReq + (*RecallMessageResp)(nil), // 7: pb.RecallMessageResp + (*SendRedPacketReq)(nil), // 8: pb.SendRedPacketReq + (*SendRedPacketResp)(nil), // 9: pb.SendRedPacketResp + (*PushRoomReq)(nil), // 10: pb.PushRoomReq + (*AddFriendReq)(nil), // 11: pb.AddFriendReq + (*DeleteFriendReq)(nil), // 12: pb.DeleteFriendReq + (*AgreeAddFriendReq)(nil), // 13: pb.AgreeAddFriendReq + (*SetFriendReq)(nil), // 14: pb.SetFriendReq + (*SetFriendResp)(nil), // 15: pb.SetFriendResp + (*Friend)(nil), // 16: pb.Friend + (*GetFriendsResp)(nil), // 17: pb.GetFriendsResp + (*CreateGroupReq)(nil), // 18: pb.CreateGroupReq + (*CreateGroupResp)(nil), // 19: pb.CreateGroupResp + (*UpdateGroupReq)(nil), // 20: pb.UpdateGroupReq + (*GetGroupReq)(nil), // 21: pb.GetGroupReq + (*GetGroupResp)(nil), // 22: pb.GetGroupResp + (*Group)(nil), // 23: pb.Group + (*GetGroupsResp)(nil), // 24: pb.GetGroupsResp + (*AddGroupMembersReq)(nil), // 25: pb.AddGroupMembersReq + (*AddGroupMembersResp)(nil), // 26: pb.AddGroupMembersResp + (*UpdateGroupMemberReq)(nil), // 27: pb.UpdateGroupMemberReq + (*DeleteGroupMemberReq)(nil), // 28: pb.DeleteGroupMemberReq + (*GetGroupMembersReq)(nil), // 29: pb.GetGroupMembersReq + (*GetGroupMembersResp)(nil), // 30: pb.GetGroupMembersResp + (*GroupMember)(nil), // 31: pb.GroupMember + (*SetGroupMemberBannedReq)(nil), // 32: pb.SetGroupMemberBannedReq + (*SetGroupMemberRemoveBannedReq)(nil), // 33: pb.SetGroupMemberRemoveBannedReq + (*SetGroupMemberBannedResp)(nil), // 34: pb.SetGroupMemberBannedResp + (*GetGroupBannedMembersReq)(nil), // 35: pb.GetGroupBannedMembersReq + (*GetGroupBannedMembersResp)(nil), // 36: pb.GetGroupBannedMembersResp + (ReceiverType)(0), // 37: pb.ReceiverType + (MessageType)(0), // 38: pb.MessageType + (*Empty)(nil), // 39: pb.Empty } var file_logic_ext_proto_depIdxs = []int32{ - 36, // 0: pb.SendMessageReq.receiver_type:type_name -> pb.ReceiverType - 37, // 1: pb.SendMessageReq.message_type:type_name -> pb.MessageType - 36, // 2: pb.RecallMessageReq.receiver_type:type_name -> pb.ReceiverType - 37, // 3: pb.RecallMessageReq.message_type:type_name -> pb.MessageType - 36, // 4: pb.SendRedPacketReq.receiver_type:type_name -> pb.ReceiverType - 37, // 5: pb.SendRedPacketReq.message_type:type_name -> pb.MessageType - 37, // 6: pb.PushRoomReq.message_type:type_name -> pb.MessageType + 37, // 0: pb.SendMessageReq.receiver_type:type_name -> pb.ReceiverType + 38, // 1: pb.SendMessageReq.message_type:type_name -> pb.MessageType + 37, // 2: pb.RecallMessageReq.receiver_type:type_name -> pb.ReceiverType + 38, // 3: pb.RecallMessageReq.message_type:type_name -> pb.MessageType + 37, // 4: pb.SendRedPacketReq.receiver_type:type_name -> pb.ReceiverType + 38, // 5: pb.SendRedPacketReq.message_type:type_name -> pb.MessageType + 38, // 6: pb.PushRoomReq.message_type:type_name -> pb.MessageType 16, // 7: pb.GetFriendsResp.friends:type_name -> pb.Friend 23, // 8: pb.GetGroupResp.group:type_name -> pb.Group 23, // 9: pb.GetGroupsResp.groups:type_name -> pb.Group @@ -2777,39 +2834,41 @@ var file_logic_ext_proto_depIdxs = []int32{ 13, // 23: pb.LogicExt.AgreeAddFriend:input_type -> pb.AgreeAddFriendReq 12, // 24: pb.LogicExt.DeleteFriend:input_type -> pb.DeleteFriendReq 14, // 25: pb.LogicExt.SetFriend:input_type -> pb.SetFriendReq - 38, // 26: pb.LogicExt.GetFriends:input_type -> pb.Empty + 39, // 26: pb.LogicExt.GetFriends:input_type -> pb.Empty 18, // 27: pb.LogicExt.CreateGroup:input_type -> pb.CreateGroupReq 20, // 28: pb.LogicExt.UpdateGroup:input_type -> pb.UpdateGroupReq 21, // 29: pb.LogicExt.GetGroup:input_type -> pb.GetGroupReq - 38, // 30: pb.LogicExt.GetGroups:input_type -> pb.Empty + 39, // 30: pb.LogicExt.GetGroups:input_type -> pb.Empty 25, // 31: pb.LogicExt.AddGroupMembers:input_type -> pb.AddGroupMembersReq 27, // 32: pb.LogicExt.UpdateGroupMember:input_type -> pb.UpdateGroupMemberReq 28, // 33: pb.LogicExt.DeleteGroupMember:input_type -> pb.DeleteGroupMemberReq 29, // 34: pb.LogicExt.GetGroupMembers:input_type -> pb.GetGroupMembersReq 32, // 35: pb.LogicExt.SetGroupBannedMembers:input_type -> pb.SetGroupMemberBannedReq - 34, // 36: pb.LogicExt.GetGroupBannedMembers:input_type -> pb.GetGroupBannedMembersReq - 3, // 37: pb.LogicExt.RegisterDevice:output_type -> pb.RegisterDeviceResp - 5, // 38: pb.LogicExt.SendMessage:output_type -> pb.SendMessageResp - 7, // 39: pb.LogicExt.RecallMessage:output_type -> pb.RecallMessageResp - 38, // 40: pb.LogicExt.PushRoom:output_type -> pb.Empty - 9, // 41: pb.LogicExt.SendRedPacket:output_type -> pb.SendRedPacketResp - 38, // 42: pb.LogicExt.AddFriend:output_type -> pb.Empty - 38, // 43: pb.LogicExt.AgreeAddFriend:output_type -> pb.Empty - 38, // 44: pb.LogicExt.DeleteFriend:output_type -> pb.Empty - 15, // 45: pb.LogicExt.SetFriend:output_type -> pb.SetFriendResp - 17, // 46: pb.LogicExt.GetFriends:output_type -> pb.GetFriendsResp - 19, // 47: pb.LogicExt.CreateGroup:output_type -> pb.CreateGroupResp - 38, // 48: pb.LogicExt.UpdateGroup:output_type -> pb.Empty - 22, // 49: pb.LogicExt.GetGroup:output_type -> pb.GetGroupResp - 24, // 50: pb.LogicExt.GetGroups:output_type -> pb.GetGroupsResp - 26, // 51: pb.LogicExt.AddGroupMembers:output_type -> pb.AddGroupMembersResp - 38, // 52: pb.LogicExt.UpdateGroupMember:output_type -> pb.Empty - 38, // 53: pb.LogicExt.DeleteGroupMember:output_type -> pb.Empty - 30, // 54: pb.LogicExt.GetGroupMembers:output_type -> pb.GetGroupMembersResp - 33, // 55: pb.LogicExt.SetGroupBannedMembers:output_type -> pb.SetGroupMemberBannedResp - 35, // 56: pb.LogicExt.GetGroupBannedMembers:output_type -> pb.GetGroupBannedMembersResp - 37, // [37:57] is the sub-list for method output_type - 17, // [17:37] is the sub-list for method input_type + 33, // 36: pb.LogicExt.SetGroupRemoveBannedMembers:input_type -> pb.SetGroupMemberRemoveBannedReq + 35, // 37: pb.LogicExt.GetGroupBannedMembers:input_type -> pb.GetGroupBannedMembersReq + 3, // 38: pb.LogicExt.RegisterDevice:output_type -> pb.RegisterDeviceResp + 5, // 39: pb.LogicExt.SendMessage:output_type -> pb.SendMessageResp + 7, // 40: pb.LogicExt.RecallMessage:output_type -> pb.RecallMessageResp + 39, // 41: pb.LogicExt.PushRoom:output_type -> pb.Empty + 9, // 42: pb.LogicExt.SendRedPacket:output_type -> pb.SendRedPacketResp + 39, // 43: pb.LogicExt.AddFriend:output_type -> pb.Empty + 39, // 44: pb.LogicExt.AgreeAddFriend:output_type -> pb.Empty + 39, // 45: pb.LogicExt.DeleteFriend:output_type -> pb.Empty + 15, // 46: pb.LogicExt.SetFriend:output_type -> pb.SetFriendResp + 17, // 47: pb.LogicExt.GetFriends:output_type -> pb.GetFriendsResp + 19, // 48: pb.LogicExt.CreateGroup:output_type -> pb.CreateGroupResp + 39, // 49: pb.LogicExt.UpdateGroup:output_type -> pb.Empty + 22, // 50: pb.LogicExt.GetGroup:output_type -> pb.GetGroupResp + 24, // 51: pb.LogicExt.GetGroups:output_type -> pb.GetGroupsResp + 26, // 52: pb.LogicExt.AddGroupMembers:output_type -> pb.AddGroupMembersResp + 39, // 53: pb.LogicExt.UpdateGroupMember:output_type -> pb.Empty + 39, // 54: pb.LogicExt.DeleteGroupMember:output_type -> pb.Empty + 30, // 55: pb.LogicExt.GetGroupMembers:output_type -> pb.GetGroupMembersResp + 34, // 56: pb.LogicExt.SetGroupBannedMembers:output_type -> pb.SetGroupMemberBannedResp + 39, // 57: pb.LogicExt.SetGroupRemoveBannedMembers:output_type -> pb.Empty + 36, // 58: pb.LogicExt.GetGroupBannedMembers:output_type -> pb.GetGroupBannedMembersResp + 38, // [38:59] is the sub-list for method output_type + 17, // [17:38] is the sub-list for method input_type 17, // [17:17] is the sub-list for extension type_name 17, // [17:17] is the sub-list for extension extendee 0, // [0:17] is the sub-list for field type_name @@ -3196,7 +3255,7 @@ func file_logic_ext_proto_init() { } } file_logic_ext_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SetGroupMemberBannedResp); i { + switch v := v.(*SetGroupMemberRemoveBannedReq); i { case 0: return &v.state case 1: @@ -3208,7 +3267,7 @@ func file_logic_ext_proto_init() { } } file_logic_ext_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetGroupBannedMembersReq); i { + switch v := v.(*SetGroupMemberBannedResp); i { case 0: return &v.state case 1: @@ -3220,6 +3279,18 @@ func file_logic_ext_proto_init() { } } file_logic_ext_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetGroupBannedMembersReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_logic_ext_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetGroupBannedMembersResp); i { case 0: return &v.state @@ -3238,7 +3309,7 @@ func file_logic_ext_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_logic_ext_proto_rawDesc, NumEnums: 2, - NumMessages: 34, + NumMessages: 35, NumExtensions: 0, NumServices: 1, }, @@ -3300,6 +3371,8 @@ type LogicExtClient interface { GetGroupMembers(ctx context.Context, in *GetGroupMembersReq, opts ...grpc.CallOption) (*GetGroupMembersResp, error) // 设置禁言 SetGroupBannedMembers(ctx context.Context, in *SetGroupMemberBannedReq, opts ...grpc.CallOption) (*SetGroupMemberBannedResp, error) + // 取消禁言 + SetGroupRemoveBannedMembers(ctx context.Context, in *SetGroupMemberRemoveBannedReq, opts ...grpc.CallOption) (*Empty, error) // 获取群组禁言成员 GetGroupBannedMembers(ctx context.Context, in *GetGroupBannedMembersReq, opts ...grpc.CallOption) (*GetGroupBannedMembersResp, error) } @@ -3483,6 +3556,15 @@ func (c *logicExtClient) SetGroupBannedMembers(ctx context.Context, in *SetGroup return out, nil } +func (c *logicExtClient) SetGroupRemoveBannedMembers(ctx context.Context, in *SetGroupMemberRemoveBannedReq, opts ...grpc.CallOption) (*Empty, error) { + out := new(Empty) + err := c.cc.Invoke(ctx, "/pb.LogicExt/SetGroupRemoveBannedMembers", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *logicExtClient) GetGroupBannedMembers(ctx context.Context, in *GetGroupBannedMembersReq, opts ...grpc.CallOption) (*GetGroupBannedMembersResp, error) { out := new(GetGroupBannedMembersResp) err := c.cc.Invoke(ctx, "/pb.LogicExt/GetGroupBannedMembers", in, out, opts...) @@ -3534,6 +3616,8 @@ type LogicExtServer interface { GetGroupMembers(context.Context, *GetGroupMembersReq) (*GetGroupMembersResp, error) // 设置禁言 SetGroupBannedMembers(context.Context, *SetGroupMemberBannedReq) (*SetGroupMemberBannedResp, error) + // 取消禁言 + SetGroupRemoveBannedMembers(context.Context, *SetGroupMemberRemoveBannedReq) (*Empty, error) // 获取群组禁言成员 GetGroupBannedMembers(context.Context, *GetGroupBannedMembersReq) (*GetGroupBannedMembersResp, error) } @@ -3599,6 +3683,9 @@ func (UnimplementedLogicExtServer) GetGroupMembers(context.Context, *GetGroupMem func (UnimplementedLogicExtServer) SetGroupBannedMembers(context.Context, *SetGroupMemberBannedReq) (*SetGroupMemberBannedResp, error) { return nil, status.Errorf(codes.Unimplemented, "method SetGroupBannedMembers not implemented") } +func (UnimplementedLogicExtServer) SetGroupRemoveBannedMembers(context.Context, *SetGroupMemberRemoveBannedReq) (*Empty, error) { + return nil, status.Errorf(codes.Unimplemented, "method SetGroupRemoveBannedMembers not implemented") +} func (UnimplementedLogicExtServer) GetGroupBannedMembers(context.Context, *GetGroupBannedMembersReq) (*GetGroupBannedMembersResp, error) { return nil, status.Errorf(codes.Unimplemented, "method GetGroupBannedMembers not implemented") } @@ -3949,6 +4036,24 @@ func _LogicExt_SetGroupBannedMembers_Handler(srv interface{}, ctx context.Contex return interceptor(ctx, in, info, handler) } +func _LogicExt_SetGroupRemoveBannedMembers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SetGroupMemberRemoveBannedReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(LogicExtServer).SetGroupRemoveBannedMembers(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/pb.LogicExt/SetGroupRemoveBannedMembers", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(LogicExtServer).SetGroupRemoveBannedMembers(ctx, req.(*SetGroupMemberRemoveBannedReq)) + } + return interceptor(ctx, in, info, handler) +} + func _LogicExt_GetGroupBannedMembers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetGroupBannedMembersReq) if err := dec(in); err != nil { @@ -4050,6 +4155,10 @@ var LogicExt_ServiceDesc = grpc.ServiceDesc{ MethodName: "SetGroupBannedMembers", Handler: _LogicExt_SetGroupBannedMembers_Handler, }, + { + MethodName: "SetGroupRemoveBannedMembers", + Handler: _LogicExt_SetGroupRemoveBannedMembers_Handler, + }, { MethodName: "GetGroupBannedMembers", Handler: _LogicExt_GetGroupBannedMembers_Handler, diff --git a/pkg/proto/logic.ext.proto b/pkg/proto/logic.ext.proto index 283bc05..3e43ae8 100644 --- a/pkg/proto/logic.ext.proto +++ b/pkg/proto/logic.ext.proto @@ -49,6 +49,8 @@ service LogicExt { rpc GetGroupMembers (GetGroupMembersReq) returns (GetGroupMembersResp); // 设置禁言 rpc SetGroupBannedMembers (SetGroupMemberBannedReq) returns (SetGroupMemberBannedResp); + // 取消禁言 + rpc SetGroupRemoveBannedMembers (SetGroupMemberRemoveBannedReq) returns (Empty); // 获取群组禁言成员 rpc GetGroupBannedMembers (GetGroupBannedMembersReq) returns (GetGroupBannedMembersResp); } @@ -246,8 +248,12 @@ message GroupMember { message SetGroupMemberBannedReq { int64 group_id = 1; // 群组id repeated int64 user_ids = 2; // 用户id列表 - repeated int64 remove_user_ids = 3; // 解除 - AllMemberBannedType is_all_member_banned = 4; // 全员禁言(1:是 2:否) + AllMemberBannedType is_all_member_banned = 3; // 全员禁言(1:是 2:否) +} + +message SetGroupMemberRemoveBannedReq { + int64 group_id = 1; // 群组id + repeated int64 remove_user_ids = 2; // 解除用户id列表 } enum AllMemberBannedType {