From 6661c5baacec3047f36fd2a83463cbc868049337 Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Thu, 5 Jan 2023 16:11:20 +0800 Subject: [PATCH 1/6] group member cache --- internal/rpc/group/group.go | 10 +- pkg/base_info/group_api_struct.go | 1 + pkg/proto/group/group.pb.go | 433 +++++++++++++++--------------- pkg/proto/group/group.proto | 1 + 4 files changed, 232 insertions(+), 213 deletions(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index d23f17aea..fbc2dd188 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -776,7 +776,15 @@ func (s *groupServer) GetGroupMembersInfo(ctx context.Context, req *pbGroup.GetG var resp pbGroup.GetGroupMembersInfoResp resp.MemberList = []*open_im_sdk.GroupMemberFullInfo{} for _, userID := range req.MemberList { - groupMember, err := rocksCache.GetGroupMemberInfoFromCache(req.GroupID, userID) + var ( + groupMember *db.GroupMember + err error + ) + if req.NoCache { + groupMember, err = imdb.GetGroupMemberInfoByGroupIDAndUserID(req.GroupID, userID) + } else { + groupMember, err = rocksCache.GetGroupMemberInfoFromCache(req.GroupID, userID) + } if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), req.GroupID, userID, err.Error()) continue diff --git a/pkg/base_info/group_api_struct.go b/pkg/base_info/group_api_struct.go index 8f2eaccd4..6218f13b2 100644 --- a/pkg/base_info/group_api_struct.go +++ b/pkg/base_info/group_api_struct.go @@ -29,6 +29,7 @@ type GetGroupMembersInfoReq struct { GroupID string `json:"groupID" binding:"required"` MemberList []string `json:"memberList" binding:"required"` OperationID string `json:"operationID" binding:"required"` + NoCache bool `json:"noCache"` } type GetGroupMembersInfoResp struct { CommResp diff --git a/pkg/proto/group/group.pb.go b/pkg/proto/group/group.pb.go index 74d28d247..9ed5f1cb4 100644 --- a/pkg/proto/group/group.pb.go +++ b/pkg/proto/group/group.pb.go @@ -37,7 +37,7 @@ func (m *CommonResp) Reset() { *m = CommonResp{} } func (m *CommonResp) String() string { return proto.CompactTextString(m) } func (*CommonResp) ProtoMessage() {} func (*CommonResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{0} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{0} } func (m *CommonResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommonResp.Unmarshal(m, b) @@ -83,7 +83,7 @@ func (m *GroupAddMemberInfo) Reset() { *m = GroupAddMemberInfo{} } func (m *GroupAddMemberInfo) String() string { return proto.CompactTextString(m) } func (*GroupAddMemberInfo) ProtoMessage() {} func (*GroupAddMemberInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{1} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{1} } func (m *GroupAddMemberInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupAddMemberInfo.Unmarshal(m, b) @@ -132,7 +132,7 @@ func (m *CreateGroupReq) Reset() { *m = CreateGroupReq{} } func (m *CreateGroupReq) String() string { return proto.CompactTextString(m) } func (*CreateGroupReq) ProtoMessage() {} func (*CreateGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{2} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{2} } func (m *CreateGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateGroupReq.Unmarshal(m, b) @@ -200,7 +200,7 @@ func (m *CreateGroupResp) Reset() { *m = CreateGroupResp{} } func (m *CreateGroupResp) String() string { return proto.CompactTextString(m) } func (*CreateGroupResp) ProtoMessage() {} func (*CreateGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{3} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{3} } func (m *CreateGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateGroupResp.Unmarshal(m, b) @@ -254,7 +254,7 @@ func (m *GetGroupsInfoReq) Reset() { *m = GetGroupsInfoReq{} } func (m *GetGroupsInfoReq) String() string { return proto.CompactTextString(m) } func (*GetGroupsInfoReq) ProtoMessage() {} func (*GetGroupsInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{4} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{4} } func (m *GetGroupsInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsInfoReq.Unmarshal(m, b) @@ -308,7 +308,7 @@ func (m *GetGroupsInfoResp) Reset() { *m = GetGroupsInfoResp{} } func (m *GetGroupsInfoResp) String() string { return proto.CompactTextString(m) } func (*GetGroupsInfoResp) ProtoMessage() {} func (*GetGroupsInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{5} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{5} } func (m *GetGroupsInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsInfoResp.Unmarshal(m, b) @@ -362,7 +362,7 @@ func (m *SetGroupInfoReq) Reset() { *m = SetGroupInfoReq{} } func (m *SetGroupInfoReq) String() string { return proto.CompactTextString(m) } func (*SetGroupInfoReq) ProtoMessage() {} func (*SetGroupInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{6} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{6} } func (m *SetGroupInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupInfoReq.Unmarshal(m, b) @@ -414,7 +414,7 @@ func (m *SetGroupInfoResp) Reset() { *m = SetGroupInfoResp{} } func (m *SetGroupInfoResp) String() string { return proto.CompactTextString(m) } func (*SetGroupInfoResp) ProtoMessage() {} func (*SetGroupInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{7} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{7} } func (m *SetGroupInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupInfoResp.Unmarshal(m, b) @@ -454,7 +454,7 @@ func (m *GetGroupApplicationListReq) Reset() { *m = GetGroupApplicationL func (m *GetGroupApplicationListReq) String() string { return proto.CompactTextString(m) } func (*GetGroupApplicationListReq) ProtoMessage() {} func (*GetGroupApplicationListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{8} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{8} } func (m *GetGroupApplicationListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupApplicationListReq.Unmarshal(m, b) @@ -508,7 +508,7 @@ func (m *GetGroupApplicationListResp) Reset() { *m = GetGroupApplication func (m *GetGroupApplicationListResp) String() string { return proto.CompactTextString(m) } func (*GetGroupApplicationListResp) ProtoMessage() {} func (*GetGroupApplicationListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{9} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{9} } func (m *GetGroupApplicationListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupApplicationListResp.Unmarshal(m, b) @@ -562,7 +562,7 @@ func (m *GetUserReqApplicationListReq) Reset() { *m = GetUserReqApplicat func (m *GetUserReqApplicationListReq) String() string { return proto.CompactTextString(m) } func (*GetUserReqApplicationListReq) ProtoMessage() {} func (*GetUserReqApplicationListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{10} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{10} } func (m *GetUserReqApplicationListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserReqApplicationListReq.Unmarshal(m, b) @@ -615,7 +615,7 @@ func (m *GetUserReqApplicationListResp) Reset() { *m = GetUserReqApplica func (m *GetUserReqApplicationListResp) String() string { return proto.CompactTextString(m) } func (*GetUserReqApplicationListResp) ProtoMessage() {} func (*GetUserReqApplicationListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{11} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{11} } func (m *GetUserReqApplicationListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserReqApplicationListResp.Unmarshal(m, b) @@ -664,7 +664,7 @@ func (m *TransferGroupOwnerReq) Reset() { *m = TransferGroupOwnerReq{} } func (m *TransferGroupOwnerReq) String() string { return proto.CompactTextString(m) } func (*TransferGroupOwnerReq) ProtoMessage() {} func (*TransferGroupOwnerReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{12} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{12} } func (m *TransferGroupOwnerReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TransferGroupOwnerReq.Unmarshal(m, b) @@ -730,7 +730,7 @@ func (m *TransferGroupOwnerResp) Reset() { *m = TransferGroupOwnerResp{} func (m *TransferGroupOwnerResp) String() string { return proto.CompactTextString(m) } func (*TransferGroupOwnerResp) ProtoMessage() {} func (*TransferGroupOwnerResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{13} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{13} } func (m *TransferGroupOwnerResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TransferGroupOwnerResp.Unmarshal(m, b) @@ -773,7 +773,7 @@ func (m *JoinGroupReq) Reset() { *m = JoinGroupReq{} } func (m *JoinGroupReq) String() string { return proto.CompactTextString(m) } func (*JoinGroupReq) ProtoMessage() {} func (*JoinGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{14} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{14} } func (m *JoinGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupReq.Unmarshal(m, b) @@ -846,7 +846,7 @@ func (m *JoinGroupResp) Reset() { *m = JoinGroupResp{} } func (m *JoinGroupResp) String() string { return proto.CompactTextString(m) } func (*JoinGroupResp) ProtoMessage() {} func (*JoinGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{15} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{15} } func (m *JoinGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupResp.Unmarshal(m, b) @@ -889,7 +889,7 @@ func (m *GroupApplicationResponseReq) Reset() { *m = GroupApplicationRes func (m *GroupApplicationResponseReq) String() string { return proto.CompactTextString(m) } func (*GroupApplicationResponseReq) ProtoMessage() {} func (*GroupApplicationResponseReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{16} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{16} } func (m *GroupApplicationResponseReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationResponseReq.Unmarshal(m, b) @@ -962,7 +962,7 @@ func (m *GroupApplicationResponseResp) Reset() { *m = GroupApplicationRe func (m *GroupApplicationResponseResp) String() string { return proto.CompactTextString(m) } func (*GroupApplicationResponseResp) ProtoMessage() {} func (*GroupApplicationResponseResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{17} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{17} } func (m *GroupApplicationResponseResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationResponseResp.Unmarshal(m, b) @@ -1002,7 +1002,7 @@ func (m *QuitGroupReq) Reset() { *m = QuitGroupReq{} } func (m *QuitGroupReq) String() string { return proto.CompactTextString(m) } func (*QuitGroupReq) ProtoMessage() {} func (*QuitGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{18} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{18} } func (m *QuitGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QuitGroupReq.Unmarshal(m, b) @@ -1054,7 +1054,7 @@ func (m *QuitGroupResp) Reset() { *m = QuitGroupResp{} } func (m *QuitGroupResp) String() string { return proto.CompactTextString(m) } func (*QuitGroupResp) ProtoMessage() {} func (*QuitGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{19} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{19} } func (m *QuitGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QuitGroupResp.Unmarshal(m, b) @@ -1096,7 +1096,7 @@ func (m *GetGroupMemberListReq) Reset() { *m = GetGroupMemberListReq{} } func (m *GetGroupMemberListReq) String() string { return proto.CompactTextString(m) } func (*GetGroupMemberListReq) ProtoMessage() {} func (*GetGroupMemberListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{20} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{20} } func (m *GetGroupMemberListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberListReq.Unmarshal(m, b) @@ -1165,7 +1165,7 @@ func (m *GetGroupMemberListResp) Reset() { *m = GetGroupMemberListResp{} func (m *GetGroupMemberListResp) String() string { return proto.CompactTextString(m) } func (*GetGroupMemberListResp) ProtoMessage() {} func (*GetGroupMemberListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{21} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{21} } func (m *GetGroupMemberListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberListResp.Unmarshal(m, b) @@ -1218,6 +1218,7 @@ type GetGroupMembersInfoReq struct { MemberList []string `protobuf:"bytes,2,rep,name=memberList" json:"memberList,omitempty"` OpUserID string `protobuf:"bytes,3,opt,name=OpUserID" json:"OpUserID,omitempty"` OperationID string `protobuf:"bytes,4,opt,name=OperationID" json:"OperationID,omitempty"` + NoCache bool `protobuf:"varint,5,opt,name=noCache" json:"noCache,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1227,7 +1228,7 @@ func (m *GetGroupMembersInfoReq) Reset() { *m = GetGroupMembersInfoReq{} func (m *GetGroupMembersInfoReq) String() string { return proto.CompactTextString(m) } func (*GetGroupMembersInfoReq) ProtoMessage() {} func (*GetGroupMembersInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{22} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{22} } func (m *GetGroupMembersInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersInfoReq.Unmarshal(m, b) @@ -1275,6 +1276,13 @@ func (m *GetGroupMembersInfoReq) GetOperationID() string { return "" } +func (m *GetGroupMembersInfoReq) GetNoCache() bool { + if m != nil { + return m.NoCache + } + return false +} + type GetGroupMembersInfoResp struct { ErrCode int32 `protobuf:"varint,1,opt,name=ErrCode" json:"ErrCode,omitempty"` ErrMsg string `protobuf:"bytes,2,opt,name=ErrMsg" json:"ErrMsg,omitempty"` @@ -1288,7 +1296,7 @@ func (m *GetGroupMembersInfoResp) Reset() { *m = GetGroupMembersInfoResp func (m *GetGroupMembersInfoResp) String() string { return proto.CompactTextString(m) } func (*GetGroupMembersInfoResp) ProtoMessage() {} func (*GetGroupMembersInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{23} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{23} } func (m *GetGroupMembersInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersInfoResp.Unmarshal(m, b) @@ -1344,7 +1352,7 @@ func (m *KickGroupMemberReq) Reset() { *m = KickGroupMemberReq{} } func (m *KickGroupMemberReq) String() string { return proto.CompactTextString(m) } func (*KickGroupMemberReq) ProtoMessage() {} func (*KickGroupMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{24} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{24} } func (m *KickGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KickGroupMemberReq.Unmarshal(m, b) @@ -1411,7 +1419,7 @@ func (m *Id2Result) Reset() { *m = Id2Result{} } func (m *Id2Result) String() string { return proto.CompactTextString(m) } func (*Id2Result) ProtoMessage() {} func (*Id2Result) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{25} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{25} } func (m *Id2Result) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Id2Result.Unmarshal(m, b) @@ -1458,7 +1466,7 @@ func (m *KickGroupMemberResp) Reset() { *m = KickGroupMemberResp{} } func (m *KickGroupMemberResp) String() string { return proto.CompactTextString(m) } func (*KickGroupMemberResp) ProtoMessage() {} func (*KickGroupMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{26} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{26} } func (m *KickGroupMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KickGroupMemberResp.Unmarshal(m, b) @@ -1512,7 +1520,7 @@ func (m *GetJoinedGroupListReq) Reset() { *m = GetJoinedGroupListReq{} } func (m *GetJoinedGroupListReq) String() string { return proto.CompactTextString(m) } func (*GetJoinedGroupListReq) ProtoMessage() {} func (*GetJoinedGroupListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{27} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{27} } func (m *GetJoinedGroupListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedGroupListReq.Unmarshal(m, b) @@ -1566,7 +1574,7 @@ func (m *GetJoinedGroupListResp) Reset() { *m = GetJoinedGroupListResp{} func (m *GetJoinedGroupListResp) String() string { return proto.CompactTextString(m) } func (*GetJoinedGroupListResp) ProtoMessage() {} func (*GetJoinedGroupListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{28} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{28} } func (m *GetJoinedGroupListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedGroupListResp.Unmarshal(m, b) @@ -1622,7 +1630,7 @@ func (m *InviteUserToGroupReq) Reset() { *m = InviteUserToGroupReq{} } func (m *InviteUserToGroupReq) String() string { return proto.CompactTextString(m) } func (*InviteUserToGroupReq) ProtoMessage() {} func (*InviteUserToGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{29} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{29} } func (m *InviteUserToGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InviteUserToGroupReq.Unmarshal(m, b) @@ -1690,7 +1698,7 @@ func (m *InviteUserToGroupResp) Reset() { *m = InviteUserToGroupResp{} } func (m *InviteUserToGroupResp) String() string { return proto.CompactTextString(m) } func (*InviteUserToGroupResp) ProtoMessage() {} func (*InviteUserToGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{30} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{30} } func (m *InviteUserToGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InviteUserToGroupResp.Unmarshal(m, b) @@ -1746,7 +1754,7 @@ func (m *GetGroupAllMemberReq) Reset() { *m = GetGroupAllMemberReq{} } func (m *GetGroupAllMemberReq) String() string { return proto.CompactTextString(m) } func (*GetGroupAllMemberReq) ProtoMessage() {} func (*GetGroupAllMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{31} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{31} } func (m *GetGroupAllMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupAllMemberReq.Unmarshal(m, b) @@ -1814,7 +1822,7 @@ func (m *GetGroupAllMemberResp) Reset() { *m = GetGroupAllMemberResp{} } func (m *GetGroupAllMemberResp) String() string { return proto.CompactTextString(m) } func (*GetGroupAllMemberResp) ProtoMessage() {} func (*GetGroupAllMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{32} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{32} } func (m *GetGroupAllMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupAllMemberResp.Unmarshal(m, b) @@ -1868,7 +1876,7 @@ func (m *CMSGroup) Reset() { *m = CMSGroup{} } func (m *CMSGroup) String() string { return proto.CompactTextString(m) } func (*CMSGroup) ProtoMessage() {} func (*CMSGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{33} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{33} } func (m *CMSGroup) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CMSGroup.Unmarshal(m, b) @@ -1923,7 +1931,7 @@ func (m *GetGroupsReq) Reset() { *m = GetGroupsReq{} } func (m *GetGroupsReq) String() string { return proto.CompactTextString(m) } func (*GetGroupsReq) ProtoMessage() {} func (*GetGroupsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{34} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{34} } func (m *GetGroupsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsReq.Unmarshal(m, b) @@ -1985,7 +1993,7 @@ func (m *GetGroupsResp) Reset() { *m = GetGroupsResp{} } func (m *GetGroupsResp) String() string { return proto.CompactTextString(m) } func (*GetGroupsResp) ProtoMessage() {} func (*GetGroupsResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{35} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{35} } func (m *GetGroupsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsResp.Unmarshal(m, b) @@ -2045,7 +2053,7 @@ func (m *GetGroupMemberReq) Reset() { *m = GetGroupMemberReq{} } func (m *GetGroupMemberReq) String() string { return proto.CompactTextString(m) } func (*GetGroupMemberReq) ProtoMessage() {} func (*GetGroupMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{36} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{36} } func (m *GetGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberReq.Unmarshal(m, b) @@ -2093,7 +2101,7 @@ func (m *GetGroupMembersCMSReq) Reset() { *m = GetGroupMembersCMSReq{} } func (m *GetGroupMembersCMSReq) String() string { return proto.CompactTextString(m) } func (*GetGroupMembersCMSReq) ProtoMessage() {} func (*GetGroupMembersCMSReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{37} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{37} } func (m *GetGroupMembersCMSReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersCMSReq.Unmarshal(m, b) @@ -2155,7 +2163,7 @@ func (m *GetGroupMembersCMSResp) Reset() { *m = GetGroupMembersCMSResp{} func (m *GetGroupMembersCMSResp) String() string { return proto.CompactTextString(m) } func (*GetGroupMembersCMSResp) ProtoMessage() {} func (*GetGroupMembersCMSResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{38} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{38} } func (m *GetGroupMembersCMSResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersCMSResp.Unmarshal(m, b) @@ -2216,7 +2224,7 @@ func (m *DismissGroupReq) Reset() { *m = DismissGroupReq{} } func (m *DismissGroupReq) String() string { return proto.CompactTextString(m) } func (*DismissGroupReq) ProtoMessage() {} func (*DismissGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{39} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{39} } func (m *DismissGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DismissGroupReq.Unmarshal(m, b) @@ -2268,7 +2276,7 @@ func (m *DismissGroupResp) Reset() { *m = DismissGroupResp{} } func (m *DismissGroupResp) String() string { return proto.CompactTextString(m) } func (*DismissGroupResp) ProtoMessage() {} func (*DismissGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{40} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{40} } func (m *DismissGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DismissGroupResp.Unmarshal(m, b) @@ -2310,7 +2318,7 @@ func (m *MuteGroupMemberReq) Reset() { *m = MuteGroupMemberReq{} } func (m *MuteGroupMemberReq) String() string { return proto.CompactTextString(m) } func (*MuteGroupMemberReq) ProtoMessage() {} func (*MuteGroupMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{41} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{41} } func (m *MuteGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupMemberReq.Unmarshal(m, b) @@ -2376,7 +2384,7 @@ func (m *MuteGroupMemberResp) Reset() { *m = MuteGroupMemberResp{} } func (m *MuteGroupMemberResp) String() string { return proto.CompactTextString(m) } func (*MuteGroupMemberResp) ProtoMessage() {} func (*MuteGroupMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{42} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{42} } func (m *MuteGroupMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupMemberResp.Unmarshal(m, b) @@ -2417,7 +2425,7 @@ func (m *CancelMuteGroupMemberReq) Reset() { *m = CancelMuteGroupMemberR func (m *CancelMuteGroupMemberReq) String() string { return proto.CompactTextString(m) } func (*CancelMuteGroupMemberReq) ProtoMessage() {} func (*CancelMuteGroupMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{43} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{43} } func (m *CancelMuteGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupMemberReq.Unmarshal(m, b) @@ -2476,7 +2484,7 @@ func (m *CancelMuteGroupMemberResp) Reset() { *m = CancelMuteGroupMember func (m *CancelMuteGroupMemberResp) String() string { return proto.CompactTextString(m) } func (*CancelMuteGroupMemberResp) ProtoMessage() {} func (*CancelMuteGroupMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{44} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{44} } func (m *CancelMuteGroupMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupMemberResp.Unmarshal(m, b) @@ -2516,7 +2524,7 @@ func (m *MuteGroupReq) Reset() { *m = MuteGroupReq{} } func (m *MuteGroupReq) String() string { return proto.CompactTextString(m) } func (*MuteGroupReq) ProtoMessage() {} func (*MuteGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{45} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{45} } func (m *MuteGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupReq.Unmarshal(m, b) @@ -2568,7 +2576,7 @@ func (m *MuteGroupResp) Reset() { *m = MuteGroupResp{} } func (m *MuteGroupResp) String() string { return proto.CompactTextString(m) } func (*MuteGroupResp) ProtoMessage() {} func (*MuteGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{46} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{46} } func (m *MuteGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupResp.Unmarshal(m, b) @@ -2608,7 +2616,7 @@ func (m *CancelMuteGroupReq) Reset() { *m = CancelMuteGroupReq{} } func (m *CancelMuteGroupReq) String() string { return proto.CompactTextString(m) } func (*CancelMuteGroupReq) ProtoMessage() {} func (*CancelMuteGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{47} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{47} } func (m *CancelMuteGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupReq.Unmarshal(m, b) @@ -2660,7 +2668,7 @@ func (m *CancelMuteGroupResp) Reset() { *m = CancelMuteGroupResp{} } func (m *CancelMuteGroupResp) String() string { return proto.CompactTextString(m) } func (*CancelMuteGroupResp) ProtoMessage() {} func (*CancelMuteGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{48} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{48} } func (m *CancelMuteGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupResp.Unmarshal(m, b) @@ -2702,7 +2710,7 @@ func (m *SetGroupMemberNicknameReq) Reset() { *m = SetGroupMemberNicknam func (m *SetGroupMemberNicknameReq) String() string { return proto.CompactTextString(m) } func (*SetGroupMemberNicknameReq) ProtoMessage() {} func (*SetGroupMemberNicknameReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{49} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{49} } func (m *SetGroupMemberNicknameReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupMemberNicknameReq.Unmarshal(m, b) @@ -2768,7 +2776,7 @@ func (m *SetGroupMemberNicknameResp) Reset() { *m = SetGroupMemberNickna func (m *SetGroupMemberNicknameResp) String() string { return proto.CompactTextString(m) } func (*SetGroupMemberNicknameResp) ProtoMessage() {} func (*SetGroupMemberNicknameResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{50} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{50} } func (m *SetGroupMemberNicknameResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupMemberNicknameResp.Unmarshal(m, b) @@ -2808,7 +2816,7 @@ func (m *GetJoinedSuperGroupListReq) Reset() { *m = GetJoinedSuperGroupL func (m *GetJoinedSuperGroupListReq) String() string { return proto.CompactTextString(m) } func (*GetJoinedSuperGroupListReq) ProtoMessage() {} func (*GetJoinedSuperGroupListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{51} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{51} } func (m *GetJoinedSuperGroupListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedSuperGroupListReq.Unmarshal(m, b) @@ -2861,7 +2869,7 @@ func (m *GetJoinedSuperGroupListResp) Reset() { *m = GetJoinedSuperGroup func (m *GetJoinedSuperGroupListResp) String() string { return proto.CompactTextString(m) } func (*GetJoinedSuperGroupListResp) ProtoMessage() {} func (*GetJoinedSuperGroupListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{52} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{52} } func (m *GetJoinedSuperGroupListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedSuperGroupListResp.Unmarshal(m, b) @@ -2908,7 +2916,7 @@ func (m *GetSuperGroupsInfoReq) Reset() { *m = GetSuperGroupsInfoReq{} } func (m *GetSuperGroupsInfoReq) String() string { return proto.CompactTextString(m) } func (*GetSuperGroupsInfoReq) ProtoMessage() {} func (*GetSuperGroupsInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{53} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{53} } func (m *GetSuperGroupsInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSuperGroupsInfoReq.Unmarshal(m, b) @@ -2961,7 +2969,7 @@ func (m *GetSuperGroupsInfoResp) Reset() { *m = GetSuperGroupsInfoResp{} func (m *GetSuperGroupsInfoResp) String() string { return proto.CompactTextString(m) } func (*GetSuperGroupsInfoResp) ProtoMessage() {} func (*GetSuperGroupsInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{54} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{54} } func (m *GetSuperGroupsInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSuperGroupsInfoResp.Unmarshal(m, b) @@ -3013,7 +3021,7 @@ func (m *SetGroupMemberInfoReq) Reset() { *m = SetGroupMemberInfoReq{} } func (m *SetGroupMemberInfoReq) String() string { return proto.CompactTextString(m) } func (*SetGroupMemberInfoReq) ProtoMessage() {} func (*SetGroupMemberInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{55} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{55} } func (m *SetGroupMemberInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupMemberInfoReq.Unmarshal(m, b) @@ -3100,7 +3108,7 @@ func (m *SetGroupMemberInfoResp) Reset() { *m = SetGroupMemberInfoResp{} func (m *SetGroupMemberInfoResp) String() string { return proto.CompactTextString(m) } func (*SetGroupMemberInfoResp) ProtoMessage() {} func (*SetGroupMemberInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{56} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{56} } func (m *SetGroupMemberInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupMemberInfoResp.Unmarshal(m, b) @@ -3140,7 +3148,7 @@ func (m *GetGroupAbstractInfoReq) Reset() { *m = GetGroupAbstractInfoReq func (m *GetGroupAbstractInfoReq) String() string { return proto.CompactTextString(m) } func (*GetGroupAbstractInfoReq) ProtoMessage() {} func (*GetGroupAbstractInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{57} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{57} } func (m *GetGroupAbstractInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupAbstractInfoReq.Unmarshal(m, b) @@ -3194,7 +3202,7 @@ func (m *GetGroupAbstractInfoResp) Reset() { *m = GetGroupAbstractInfoRe func (m *GetGroupAbstractInfoResp) String() string { return proto.CompactTextString(m) } func (*GetGroupAbstractInfoResp) ProtoMessage() {} func (*GetGroupAbstractInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{58} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{58} } func (m *GetGroupAbstractInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupAbstractInfoResp.Unmarshal(m, b) @@ -3248,7 +3256,7 @@ func (m *GroupIsExistReq) Reset() { *m = GroupIsExistReq{} } func (m *GroupIsExistReq) String() string { return proto.CompactTextString(m) } func (*GroupIsExistReq) ProtoMessage() {} func (*GroupIsExistReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{59} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{59} } func (m *GroupIsExistReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupIsExistReq.Unmarshal(m, b) @@ -3301,7 +3309,7 @@ func (m *GroupIsExistResp) Reset() { *m = GroupIsExistResp{} } func (m *GroupIsExistResp) String() string { return proto.CompactTextString(m) } func (*GroupIsExistResp) ProtoMessage() {} func (*GroupIsExistResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{60} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{60} } func (m *GroupIsExistResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupIsExistResp.Unmarshal(m, b) @@ -3348,7 +3356,7 @@ func (m *UserIsInGroupReq) Reset() { *m = UserIsInGroupReq{} } func (m *UserIsInGroupReq) String() string { return proto.CompactTextString(m) } func (*UserIsInGroupReq) ProtoMessage() {} func (*UserIsInGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{61} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{61} } func (m *UserIsInGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserIsInGroupReq.Unmarshal(m, b) @@ -3401,7 +3409,7 @@ func (m *UserIsInGroupResp) Reset() { *m = UserIsInGroupResp{} } func (m *UserIsInGroupResp) String() string { return proto.CompactTextString(m) } func (*UserIsInGroupResp) ProtoMessage() {} func (*UserIsInGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_62d80c4ee8bcf1ea, []int{62} + return fileDescriptor_group_5cfdf63bf5b84d31, []int{62} } func (m *UserIsInGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserIsInGroupResp.Unmarshal(m, b) @@ -4499,156 +4507,157 @@ var _Group_serviceDesc = grpc.ServiceDesc{ Metadata: "group/group.proto", } -func init() { proto.RegisterFile("group/group.proto", fileDescriptor_group_62d80c4ee8bcf1ea) } +func init() { proto.RegisterFile("group/group.proto", fileDescriptor_group_5cfdf63bf5b84d31) } -var fileDescriptor_group_62d80c4ee8bcf1ea = []byte{ - // 2356 bytes of a gzipped FileDescriptorProto +var fileDescriptor_group_5cfdf63bf5b84d31 = []byte{ + // 2370 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x1a, 0x4d, 0x6f, 0x1c, 0x49, - 0x55, 0x3d, 0xe3, 0x89, 0xed, 0x67, 0x4f, 0xc6, 0x2e, 0xc7, 0xc9, 0xa4, 0xe3, 0x38, 0xde, 0xde, + 0x55, 0x3d, 0xe3, 0x89, 0xed, 0x67, 0x4f, 0xc6, 0x2e, 0xc7, 0xce, 0xa4, 0xe3, 0x38, 0xde, 0xde, 0xb0, 0x58, 0x28, 0xb1, 0xc1, 0x2b, 0x45, 0xcb, 0x2e, 0xb0, 0xc4, 0x5f, 0xf1, 0x6c, 0x62, 0x1b, - 0xf7, 0x64, 0x41, 0x5a, 0x09, 0x85, 0xf6, 0x4c, 0x4d, 0x33, 0x78, 0xa6, 0xbb, 0xdd, 0xd5, 0x13, - 0x67, 0xb9, 0xac, 0xb8, 0x20, 0x81, 0x90, 0x00, 0x71, 0x5d, 0x84, 0xe0, 0x02, 0x07, 0x40, 0x1c, - 0xe0, 0xcc, 0x1f, 0x00, 0x71, 0xe1, 0x82, 0xb8, 0xf1, 0x07, 0xb8, 0xf0, 0x03, 0x50, 0x57, 0x55, - 0x57, 0x57, 0x77, 0x75, 0xf7, 0xcc, 0xb6, 0x37, 0x9b, 0xcb, 0x68, 0xea, 0xd5, 0xab, 0xaa, 0xf7, - 0x5e, 0xbd, 0xf7, 0xea, 0x7d, 0x34, 0x2c, 0xda, 0xbe, 0x3b, 0xf2, 0x36, 0xe9, 0xef, 0x86, 0xe7, - 0xbb, 0x81, 0x8b, 0x6a, 0x74, 0xa0, 0xaf, 0x1f, 0x7b, 0xd8, 0xb9, 0xdf, 0x3a, 0xbc, 0xdf, 0xc6, - 0xfe, 0x73, 0xec, 0x6f, 0x7a, 0x67, 0xf6, 0x26, 0x45, 0xd8, 0x24, 0xdd, 0xb3, 0x67, 0x17, 0x64, - 0xf3, 0x82, 0xb0, 0x05, 0xfa, 0xc6, 0x58, 0x4c, 0xdf, 0xf2, 0x3c, 0xec, 0x73, 0x7c, 0xe3, 0x6b, - 0x00, 0x3b, 0xee, 0x70, 0xe8, 0x3a, 0x26, 0x26, 0x1e, 0x6a, 0xc2, 0xf4, 0x9e, 0xef, 0xef, 0xb8, - 0x5d, 0xdc, 0xd4, 0xd6, 0xb4, 0xf5, 0x9a, 0x19, 0x0d, 0xd1, 0x75, 0xb8, 0xb2, 0xe7, 0xfb, 0x87, - 0xc4, 0x6e, 0x56, 0xd6, 0xb4, 0xf5, 0x59, 0x93, 0x8f, 0x8c, 0xf7, 0x00, 0x3d, 0x0a, 0x49, 0x7c, - 0xd8, 0xed, 0x1e, 0xe2, 0xe1, 0x29, 0xf6, 0x5b, 0x4e, 0xcf, 0x0d, 0xb1, 0xdf, 0x27, 0xd8, 0x6f, - 0xed, 0xd2, 0x6d, 0x66, 0x4d, 0x3e, 0x42, 0x2b, 0x30, 0x6b, 0xba, 0x03, 0xfc, 0x04, 0x3f, 0xc7, - 0x03, 0xba, 0x51, 0xcd, 0x8c, 0x01, 0xc6, 0x7f, 0x35, 0xb8, 0xba, 0xe3, 0x63, 0x2b, 0xc0, 0x74, - 0x4b, 0x13, 0x9f, 0xa3, 0x87, 0x70, 0xb5, 0xe5, 0xf4, 0x03, 0xb6, 0xf5, 0x93, 0x3e, 0x09, 0x9a, - 0xda, 0x5a, 0x75, 0x7d, 0x6e, 0xeb, 0xe6, 0x06, 0x93, 0x92, 0x7a, 0xb6, 0x99, 0x5a, 0x80, 0xde, - 0x86, 0x59, 0x8a, 0x15, 0x4e, 0xd2, 0x33, 0xe7, 0xb6, 0x56, 0x36, 0x08, 0x95, 0xce, 0x33, 0xcb, - 0xeb, 0x3f, 0xf3, 0x2c, 0xdf, 0x1a, 0x92, 0x0d, 0x81, 0x63, 0xc6, 0xe8, 0x68, 0x0d, 0xe6, 0x8e, - 0x3d, 0xec, 0x5b, 0x41, 0xdf, 0x75, 0x5a, 0xbb, 0xcd, 0x2a, 0x65, 0x46, 0x06, 0x21, 0x1d, 0x66, - 0x8e, 0x3d, 0xce, 0xeb, 0x14, 0x9d, 0x16, 0x63, 0xba, 0xfa, 0xc2, 0xc1, 0x3e, 0x9f, 0xae, 0xf1, - 0xd5, 0x31, 0xc8, 0xf8, 0x08, 0x1a, 0x09, 0x86, 0xcb, 0x5c, 0x41, 0x92, 0xc1, 0xea, 0x27, 0x62, - 0xd0, 0xf0, 0x61, 0xe1, 0x11, 0x0e, 0xe8, 0x98, 0xd0, 0x39, 0x7c, 0x1e, 0x92, 0xcd, 0x10, 0x76, - 0x85, 0xc0, 0x67, 0x4d, 0x19, 0x94, 0x16, 0x4b, 0xa5, 0x58, 0x2c, 0xd5, 0xa4, 0x58, 0x8c, 0x1f, - 0x69, 0xb0, 0x98, 0x3a, 0xb4, 0x14, 0xdf, 0xdb, 0x50, 0x17, 0x8c, 0x50, 0x4a, 0xab, 0x54, 0x35, - 0x8a, 0x79, 0x4f, 0x2e, 0x31, 0x7e, 0xa9, 0x41, 0xa3, 0xcd, 0x69, 0x89, 0xf8, 0x7f, 0x02, 0x0d, - 0x3b, 0x1a, 0xef, 0xbb, 0x7e, 0x1b, 0x07, 0x94, 0xa2, 0xb9, 0x2d, 0xa3, 0x68, 0x67, 0x86, 0x69, - 0xa6, 0x97, 0x26, 0x24, 0x51, 0xc9, 0x50, 0x90, 0x42, 0xf5, 0x32, 0xf6, 0x60, 0x21, 0x49, 0x1e, - 0xf1, 0xd0, 0x97, 0x64, 0x93, 0xe5, 0xa4, 0x2d, 0x72, 0x7b, 0x88, 0x27, 0x4c, 0x09, 0xc9, 0xf8, - 0x3e, 0xe8, 0x91, 0xc4, 0x1f, 0x7a, 0xde, 0xa0, 0xdf, 0xa1, 0xfb, 0x87, 0x12, 0x08, 0x19, 0x96, - 0x49, 0xd4, 0x8a, 0x49, 0xcc, 0xb8, 0xea, 0x55, 0x80, 0x7d, 0xdf, 0x1d, 0x26, 0x2e, 0x5b, 0x82, - 0x18, 0x1f, 0x6b, 0x70, 0x2b, 0xf7, 0xf0, 0x52, 0x17, 0xff, 0x18, 0x16, 0x22, 0x07, 0x31, 0xc2, - 0x24, 0x90, 0xee, 0xfe, 0x4e, 0xde, 0x0d, 0x71, 0x54, 0x53, 0x59, 0x68, 0x04, 0xb0, 0xf2, 0x08, - 0x07, 0x21, 0xad, 0x26, 0x3e, 0xcf, 0x10, 0x4e, 0x9e, 0x2b, 0xbb, 0xdc, 0xbd, 0xfe, 0x4a, 0x83, - 0xdb, 0x05, 0xc7, 0x96, 0xba, 0xe5, 0x4c, 0xb9, 0x54, 0xca, 0xca, 0xe5, 0xaf, 0x1a, 0x2c, 0x3f, - 0xf5, 0x2d, 0x87, 0xf4, 0xb0, 0x4f, 0x27, 0xa9, 0xdf, 0x0a, 0x25, 0xd2, 0x84, 0x69, 0xee, 0x0c, - 0xb8, 0x48, 0xa2, 0x21, 0x7a, 0x03, 0xae, 0x1e, 0x0f, 0xba, 0xb2, 0xcf, 0x63, 0x92, 0x49, 0x41, - 0x43, 0xbc, 0x23, 0x7c, 0x21, 0xe3, 0x31, 0x11, 0xa5, 0xa0, 0x69, 0x39, 0x4e, 0x15, 0xfb, 0x99, - 0x5a, 0xca, 0xcf, 0x3c, 0x86, 0xeb, 0x59, 0x0c, 0x94, 0xb3, 0xa0, 0xbf, 0x69, 0x30, 0xff, 0x9e, - 0xdb, 0x77, 0xc4, 0xcb, 0x94, 0x2f, 0x85, 0x55, 0x00, 0x13, 0x9f, 0x1f, 0x62, 0x42, 0x2c, 0x1b, - 0x73, 0x09, 0x48, 0x90, 0x22, 0xdf, 0x38, 0x01, 0xc7, 0xab, 0x00, 0x21, 0x1d, 0x6d, 0x77, 0xe4, - 0x77, 0x30, 0xe5, 0xb9, 0x66, 0x4a, 0x10, 0x74, 0x17, 0xea, 0x2d, 0xe7, 0x79, 0x3f, 0x10, 0xa2, - 0xbd, 0x42, 0xf7, 0x48, 0x02, 0x8d, 0x6d, 0xa8, 0x4b, 0xdc, 0x94, 0x13, 0xc9, 0xbf, 0x42, 0xc3, - 0x4e, 0x59, 0x75, 0x38, 0xe1, 0x3a, 0x04, 0xf3, 0x77, 0x44, 0xe6, 0x45, 0x2b, 0xbe, 0xbd, 0xb4, - 0x0d, 0x49, 0xf2, 0xad, 0x2a, 0xf2, 0x95, 0x1c, 0xce, 0x54, 0xda, 0xe1, 0x84, 0xf3, 0x07, 0x96, - 0xd3, 0x1d, 0xe0, 0x6e, 0xe8, 0x3a, 0x98, 0x56, 0x48, 0x10, 0x64, 0xc0, 0x3c, 0x1b, 0x99, 0x98, - 0x8c, 0x06, 0x01, 0x15, 0x50, 0xcd, 0x4c, 0xc0, 0x8c, 0x13, 0x58, 0xc9, 0x67, 0xad, 0x9c, 0xb8, - 0x7a, 0x30, 0x7f, 0x32, 0xea, 0x07, 0x13, 0x28, 0xd0, 0xe5, 0x9e, 0xd7, 0x6d, 0xa8, 0x4b, 0xe7, - 0x94, 0xa3, 0xf5, 0xd7, 0x1a, 0x2c, 0x47, 0x3e, 0x3b, 0x0e, 0xa5, 0x8a, 0xa9, 0xbe, 0x94, 0x43, - 0x0c, 0xdd, 0xec, 0x7e, 0x7f, 0x10, 0x60, 0x9f, 0x5e, 0x68, 0xcd, 0xe4, 0xa3, 0xf0, 0xbc, 0x23, - 0xfc, 0x22, 0x68, 0xe3, 0x73, 0xae, 0xeb, 0xd1, 0xd0, 0xf8, 0xbd, 0x06, 0xd7, 0xb3, 0x68, 0x2c, - 0xf5, 0xa4, 0xec, 0x03, 0x0c, 0xe3, 0x18, 0x93, 0x3d, 0x26, 0x6f, 0xe4, 0x39, 0x4d, 0x76, 0xda, - 0xfe, 0x68, 0x30, 0xa0, 0x6f, 0xb2, 0xb4, 0x32, 0x3c, 0xd9, 0xe1, 0xe4, 0x32, 0x3e, 0xa2, 0xa1, - 0xf1, 0x33, 0x85, 0x5c, 0x11, 0x70, 0x15, 0xba, 0x12, 0x89, 0xac, 0x0a, 0x8d, 0xc4, 0xe4, 0xe3, - 0x2e, 0xe5, 0x4a, 0x8c, 0x5f, 0x68, 0x70, 0x23, 0x93, 0xa4, 0x57, 0x29, 0x42, 0xe3, 0x4f, 0x1a, - 0xa0, 0xc7, 0xfd, 0xce, 0x99, 0x84, 0x57, 0x2c, 0xa4, 0x2f, 0xc0, 0x42, 0x88, 0x8f, 0xbb, 0x8c, - 0x71, 0x49, 0x54, 0x0a, 0x3c, 0x24, 0xde, 0xc4, 0x16, 0x71, 0x1d, 0x2e, 0x2e, 0x3e, 0x4a, 0x0b, - 0xab, 0x56, 0x6c, 0x72, 0x57, 0x52, 0x26, 0xf7, 0x0e, 0xcc, 0xb6, 0xba, 0x5b, 0xcc, 0x75, 0xe4, - 0x06, 0x0c, 0xf4, 0x68, 0xea, 0x70, 0x58, 0xe2, 0xc3, 0x47, 0xc6, 0x47, 0xb0, 0xa4, 0xb0, 0x5b, - 0xea, 0x02, 0x1e, 0x40, 0x5d, 0x50, 0x21, 0xdd, 0xc1, 0x02, 0x37, 0x75, 0x31, 0x67, 0x26, 0xd1, - 0x8c, 0x11, 0xb5, 0xf5, 0xf0, 0x39, 0xc0, 0x5d, 0x4a, 0x45, 0x64, 0xeb, 0x49, 0x47, 0xab, 0x29, - 0x8e, 0x76, 0x0d, 0xe6, 0x5c, 0xd5, 0x4f, 0xb9, 0x13, 0xfa, 0xa9, 0x1f, 0x32, 0x83, 0x50, 0xce, - 0xbd, 0x54, 0x0e, 0x34, 0x71, 0x1e, 0x10, 0xa3, 0x1b, 0x7f, 0xd6, 0xe0, 0x1a, 0x7b, 0x1d, 0x43, - 0xca, 0x9e, 0xba, 0xc2, 0x43, 0x8f, 0xf7, 0xc3, 0xf9, 0x8f, 0x54, 0xac, 0x68, 0x53, 0x09, 0x45, - 0xbb, 0x07, 0x8b, 0xec, 0x2c, 0x59, 0x5b, 0x6b, 0x54, 0x5b, 0xd5, 0x89, 0x42, 0xa5, 0xfb, 0x81, - 0x06, 0xcb, 0x19, 0x64, 0x7f, 0xa6, 0xaa, 0xf3, 0xb1, 0x06, 0xd7, 0x44, 0x6c, 0x3f, 0x18, 0x4c, - 0x62, 0xad, 0x97, 0x7e, 0x26, 0x8e, 0x7b, 0x3d, 0x82, 0x83, 0xe8, 0x99, 0x60, 0x23, 0x74, 0x0d, - 0x6a, 0x3b, 0xee, 0xc8, 0x09, 0xf8, 0x23, 0xc1, 0x06, 0xc6, 0xcf, 0xa5, 0x67, 0x4c, 0x22, 0xef, - 0x95, 0xba, 0xb7, 0xdf, 0x68, 0x30, 0xb3, 0x73, 0xd8, 0xa6, 0x68, 0xc9, 0xd4, 0x5d, 0xfb, 0x64, - 0xb5, 0x89, 0x0d, 0x5e, 0x79, 0x11, 0x01, 0xf3, 0x91, 0x35, 0x8c, 0xc2, 0xcd, 0x8c, 0x99, 0xd0, - 0x4d, 0x26, 0xa1, 0x42, 0xc2, 0x0a, 0xdc, 0xf8, 0xa3, 0x06, 0xf3, 0x22, 0x45, 0x0f, 0xef, 0x73, - 0x17, 0xe0, 0x1b, 0x96, 0xdd, 0x77, 0xe8, 0x3d, 0x70, 0x4a, 0xef, 0x66, 0x50, 0xca, 0x33, 0x88, - 0x18, 0xd7, 0x94, 0xd6, 0xa1, 0x15, 0xce, 0xae, 0x44, 0x69, 0x0c, 0x28, 0x30, 0xa6, 0xf1, 0x4f, - 0xd9, 0x3f, 0x35, 0xa8, 0x4b, 0x04, 0x13, 0x0f, 0xdd, 0x87, 0xd9, 0x48, 0xcc, 0x84, 0x17, 0x8d, - 0x1a, 0x51, 0xd0, 0xc3, 0xe1, 0x66, 0x8c, 0x81, 0xf6, 0x12, 0x0c, 0xb2, 0x32, 0xd1, 0xe7, 0x32, - 0x19, 0x64, 0x51, 0x60, 0x0e, 0x87, 0x3a, 0xcc, 0x30, 0x86, 0x46, 0x43, 0xca, 0x44, 0xcd, 0x14, - 0xe3, 0x30, 0x0e, 0xeb, 0xc4, 0x71, 0xd8, 0x54, 0x6e, 0x1c, 0x16, 0x23, 0x19, 0xc7, 0x71, 0xa5, - 0x64, 0x12, 0xdb, 0x1a, 0xeb, 0xb0, 0x8c, 0xbf, 0x28, 0x81, 0x1d, 0xd9, 0x39, 0x6c, 0x8f, 0xb5, - 0xd8, 0x94, 0x7a, 0x89, 0x71, 0x4a, 0x2f, 0xaa, 0x25, 0xf5, 0x62, 0xfc, 0xfd, 0xfe, 0x4f, 0x8d, - 0x9e, 0x28, 0xdd, 0xc4, 0x43, 0x5f, 0x87, 0x69, 0x66, 0x5e, 0xd1, 0x35, 0x4f, 0x6a, 0x95, 0xd1, - 0xb2, 0x4f, 0xeb, 0xee, 0x57, 0x01, 0xd8, 0x09, 0x47, 0xa3, 0x21, 0xe1, 0xb7, 0x2f, 0x41, 0xca, - 0xdc, 0x7f, 0x1f, 0x1a, 0xbb, 0x7d, 0x32, 0xec, 0x13, 0x22, 0x1e, 0x25, 0x1d, 0x66, 0xdc, 0x54, - 0xb1, 0xc6, 0xf5, 0x26, 0x7e, 0x90, 0x9b, 0x30, 0x6d, 0x27, 0x6d, 0x8c, 0x0f, 0x8d, 0x3d, 0x58, - 0x48, 0x1e, 0xc5, 0x32, 0x87, 0xce, 0x24, 0x99, 0x83, 0x44, 0xf1, 0xef, 0x34, 0x40, 0x87, 0x23, - 0x5e, 0xd0, 0x8c, 0x75, 0xf6, 0x25, 0x51, 0x1d, 0x7a, 0xeb, 0x91, 0x9c, 0x07, 0xf2, 0x51, 0x98, - 0xe3, 0x0d, 0x47, 0x01, 0xee, 0xb6, 0x71, 0xc7, 0x75, 0xba, 0x84, 0x3e, 0x0b, 0x75, 0x33, 0x01, - 0x33, 0x0e, 0x60, 0x49, 0xa1, 0xb4, 0x1c, 0xd3, 0x3f, 0xd6, 0xa0, 0xb9, 0x63, 0x39, 0x1d, 0x3c, - 0x78, 0xf5, 0xac, 0x1b, 0x47, 0x70, 0x33, 0x87, 0x96, 0x72, 0xcc, 0xf5, 0x60, 0x5e, 0xec, 0xf4, - 0x32, 0x15, 0x70, 0x1b, 0xea, 0xd2, 0x39, 0xe5, 0x68, 0x1d, 0x00, 0x4a, 0xf1, 0xfe, 0x32, 0x29, - 0x3e, 0x80, 0x25, 0xe5, 0xb4, 0x72, 0x74, 0xff, 0x56, 0x83, 0x9b, 0xed, 0x84, 0x7b, 0x3b, 0xea, - 0x77, 0xce, 0x1c, 0x6b, 0x88, 0xb9, 0x6b, 0xb6, 0x93, 0xae, 0xd9, 0x8e, 0x5d, 0xb3, 0xc3, 0x11, - 0x23, 0xd7, 0x1c, 0x8d, 0x13, 0x5c, 0x57, 0x8b, 0xb9, 0x9e, 0x52, 0xb9, 0x8e, 0xb5, 0xab, 0x96, - 0xd0, 0xae, 0x63, 0xd0, 0xf3, 0x08, 0x2d, 0x57, 0x6a, 0xf0, 0x69, 0x69, 0x9a, 0x65, 0x01, 0xed, - 0x91, 0xc7, 0x6b, 0x75, 0x51, 0x0a, 0x92, 0x22, 0x54, 0x2b, 0x22, 0xb4, 0x92, 0xf0, 0x00, 0x05, - 0xec, 0x1b, 0x3f, 0x61, 0x25, 0xe9, 0xec, 0x43, 0x4b, 0xdd, 0xe0, 0xa5, 0x12, 0x90, 0x0b, 0xfa, - 0x26, 0xc7, 0x74, 0x7c, 0x66, 0x9d, 0x98, 0x9f, 0xb2, 0x57, 0x55, 0x39, 0xb9, 0x9c, 0x08, 0x3e, - 0x8d, 0x7e, 0xcc, 0x7f, 0x2a, 0xb0, 0x9c, 0xd4, 0x2f, 0xa9, 0x48, 0x92, 0x63, 0x04, 0x25, 0x34, - 0x60, 0x02, 0x03, 0x78, 0x4b, 0x32, 0xad, 0x1a, 0x8f, 0xcc, 0x6d, 0xd7, 0xb5, 0x07, 0x98, 0x75, - 0x4e, 0x4f, 0x47, 0xbd, 0x8d, 0x76, 0xe0, 0xf7, 0x1d, 0xfb, 0x9b, 0xd6, 0x60, 0x84, 0x25, 0xc3, - 0x7b, 0x00, 0xd3, 0x3d, 0xab, 0x83, 0xdf, 0x37, 0x9f, 0xd0, 0x9c, 0x6d, 0xdc, 0xc2, 0x08, 0x19, - 0x7d, 0x19, 0x66, 0x7d, 0xd1, 0x1c, 0x9d, 0xa6, 0x2b, 0x6f, 0x29, 0x2b, 0x5b, 0x4e, 0xf0, 0xe6, - 0x16, 0x5b, 0x18, 0x63, 0xa3, 0x7b, 0x50, 0xc1, 0x2f, 0x9a, 0x33, 0x13, 0x9c, 0x56, 0xc1, 0x2f, - 0x8c, 0xc7, 0x70, 0x3d, 0x4b, 0xc6, 0xe5, 0xec, 0xf7, 0x3c, 0xae, 0x21, 0x3d, 0x3c, 0x25, 0x81, - 0x6f, 0x75, 0x82, 0xf1, 0x57, 0x26, 0x5f, 0x4d, 0xa5, 0xf8, 0x6a, 0xaa, 0xca, 0xd5, 0x18, 0x7f, - 0xd0, 0xa0, 0x99, 0x7d, 0x66, 0xb9, 0xbe, 0xc9, 0x3d, 0xde, 0x79, 0x17, 0xb1, 0xda, 0x29, 0xf6, - 0x79, 0x91, 0x46, 0x9d, 0x40, 0x5f, 0x84, 0x25, 0x3b, 0x59, 0x73, 0x3c, 0xb0, 0xc8, 0x77, 0x29, - 0x9d, 0x53, 0x66, 0xd6, 0x94, 0x71, 0x0e, 0x0d, 0xa6, 0xe5, 0x64, 0xef, 0x45, 0xec, 0xd7, 0x6c, - 0xd5, 0xb2, 0x25, 0xd0, 0x25, 0x45, 0xf4, 0x77, 0x8d, 0x67, 0x7b, 0xe2, 0xcc, 0x72, 0xa2, 0x79, - 0x04, 0xc0, 0x77, 0x38, 0xb4, 0x3c, 0xde, 0x4c, 0xfa, 0xbc, 0xdc, 0x7b, 0x97, 0xf6, 0xdf, 0x88, - 0x31, 0xf7, 0x9c, 0xc0, 0xff, 0xd0, 0x94, 0x96, 0xea, 0x5f, 0x85, 0x46, 0x6a, 0x1a, 0x2d, 0x40, - 0xf5, 0x0c, 0x7f, 0xc8, 0x55, 0x23, 0xfc, 0x1b, 0x66, 0xf1, 0xcf, 0x43, 0x2d, 0xa5, 0x0c, 0xcf, - 0x98, 0x6c, 0xf0, 0x76, 0xe5, 0x2d, 0xcd, 0x70, 0x60, 0x81, 0xf2, 0x4e, 0x5a, 0x89, 0x0e, 0x4c, - 0x8e, 0x7a, 0xad, 0x02, 0x8c, 0xd2, 0xb5, 0x40, 0x09, 0x32, 0x81, 0xfc, 0xfe, 0xa1, 0xc1, 0x62, - 0xea, 0xc0, 0x72, 0x02, 0x3c, 0xc8, 0x10, 0xe0, 0x3a, 0x5f, 0xa2, 0x1c, 0xf0, 0x12, 0x25, 0xb8, - 0xf5, 0xef, 0x45, 0x60, 0x1f, 0x93, 0xa0, 0xaf, 0xc0, 0x5c, 0x27, 0xfe, 0xe8, 0x00, 0x2d, 0x47, - 0x0c, 0x24, 0xbe, 0xbc, 0xd0, 0xaf, 0x67, 0x81, 0x89, 0x87, 0x1e, 0xc0, 0xec, 0xf7, 0xa2, 0xce, - 0x11, 0x5a, 0xe2, 0x48, 0x72, 0x67, 0x4c, 0xbf, 0xa6, 0x02, 0xd9, 0xba, 0xf3, 0xa8, 0x2d, 0x21, - 0xd6, 0xc9, 0x0d, 0x11, 0xb1, 0x2e, 0xd9, 0xbd, 0xd8, 0x86, 0xba, 0x2d, 0x7f, 0x2c, 0x80, 0x6e, - 0x44, 0xea, 0x97, 0xfa, 0x6e, 0x41, 0x6f, 0x66, 0x4f, 0x10, 0x0f, 0xbd, 0x0b, 0xf3, 0x44, 0xea, - 0xa2, 0xa3, 0x88, 0xb7, 0x54, 0xe7, 0x5f, 0xbf, 0x91, 0x09, 0x27, 0x1e, 0xfa, 0x0e, 0xdc, 0xb0, - 0xb3, 0x5b, 0xd8, 0xe8, 0xb5, 0xd4, 0xa9, 0x6a, 0x0b, 0x59, 0x37, 0xc6, 0xa1, 0x10, 0x0f, 0xf5, - 0xe0, 0xa6, 0x9d, 0xd7, 0x0f, 0x46, 0xaf, 0xc7, 0x1b, 0xe4, 0x36, 0xaa, 0xf5, 0xbb, 0xe3, 0x91, - 0x88, 0x87, 0x4e, 0x00, 0x05, 0x4a, 0x53, 0x14, 0xad, 0xf0, 0xb5, 0x99, 0x0d, 0x5f, 0xfd, 0x76, - 0xc1, 0x2c, 0xf1, 0x50, 0x07, 0x9a, 0x76, 0x4e, 0xaf, 0x0c, 0x19, 0x89, 0xef, 0x74, 0x32, 0xfb, - 0x84, 0xfa, 0xeb, 0x63, 0x71, 0x18, 0xdd, 0xb6, 0xd2, 0xec, 0x11, 0x74, 0x67, 0xf6, 0xaa, 0x04, - 0xdd, 0x39, 0x5d, 0xa2, 0xa7, 0xb0, 0x64, 0xab, 0xdd, 0x0f, 0x94, 0xbd, 0x4a, 0x68, 0xd9, 0x6a, - 0xd1, 0x34, 0x35, 0xf8, 0xc6, 0x59, 0xb2, 0x9c, 0x8f, 0xa2, 0x8f, 0x95, 0xd4, 0xae, 0x86, 0xae, - 0xe7, 0x4d, 0x09, 0x96, 0x53, 0xf5, 0x71, 0x99, 0x65, 0xb5, 0x64, 0x2f, 0xb3, 0x9c, 0x55, 0x58, - 0x3f, 0x82, 0xc5, 0x7e, 0xba, 0x64, 0x8c, 0x6e, 0x45, 0x55, 0xde, 0x8c, 0x1a, 0xb8, 0xbe, 0x92, - 0x3f, 0xc9, 0xf6, 0xb3, 0xd3, 0xf5, 0x55, 0xb1, 0x5f, 0x56, 0x61, 0x58, 0x5f, 0xc9, 0x9f, 0x64, - 0x4e, 0x42, 0x58, 0xaf, 0x70, 0x12, 0x72, 0x21, 0x52, 0x38, 0x89, 0x64, 0xb1, 0xef, 0x04, 0x90, - 0x5a, 0x1d, 0xca, 0xd1, 0x0e, 0x5e, 0xf0, 0xca, 0xd1, 0x0e, 0x51, 0x56, 0x7a, 0x17, 0xe6, 0xe5, - 0x7a, 0x88, 0xf0, 0x19, 0xa9, 0x7a, 0x8c, 0xf0, 0x19, 0x4a, 0xf1, 0xe4, 0x00, 0x1a, 0xa9, 0x0c, - 0x5c, 0x28, 0x82, 0x5a, 0x25, 0x10, 0x8a, 0x90, 0x95, 0xb4, 0x7f, 0x00, 0xcb, 0x99, 0x19, 0x3d, - 0xba, 0x13, 0xf9, 0xe8, 0x9c, 0xda, 0x83, 0xbe, 0x56, 0x8c, 0xc0, 0x24, 0x2e, 0xc0, 0x42, 0xe2, - 0x72, 0xf6, 0x2c, 0x24, 0x9e, 0x4c, 0x72, 0x0f, 0xa0, 0x91, 0xda, 0x54, 0x70, 0xa7, 0x66, 0xe0, - 0x82, 0xbb, 0xac, 0x74, 0xf9, 0xdb, 0xe9, 0x68, 0x34, 0xca, 0x28, 0xd1, 0x5a, 0xca, 0x1d, 0x2b, - 0x99, 0xb1, 0xfe, 0xda, 0x18, 0x0c, 0xe6, 0xba, 0x73, 0x52, 0x3d, 0xd9, 0x75, 0xe7, 0xe4, 0x9f, - 0xb2, 0xeb, 0xce, 0xcd, 0x16, 0x99, 0xf2, 0xa5, 0x92, 0x28, 0x59, 0xf9, 0xd4, 0xcc, 0x4e, 0x56, - 0xbe, 0xac, 0xec, 0xeb, 0x04, 0x90, 0x1a, 0xa1, 0x8b, 0x2d, 0x33, 0x13, 0x24, 0xb1, 0x65, 0x4e, - 0x68, 0xff, 0x2d, 0xa9, 0x53, 0x23, 0xc5, 0xcc, 0x28, 0xed, 0xcf, 0x52, 0x41, 0xbc, 0x7e, 0xa7, - 0x70, 0x9e, 0x19, 0x8a, 0x1c, 0x09, 0x0a, 0x43, 0x49, 0x85, 0xbc, 0xc2, 0x50, 0x94, 0xb0, 0x74, - 0x1b, 0xea, 0x89, 0x48, 0x48, 0xbc, 0xf0, 0xe9, 0x88, 0x4f, 0xbc, 0xf0, 0x4a, 0xe0, 0xb4, 0x7d, - 0xe7, 0x83, 0xdb, 0xc7, 0x1e, 0x76, 0x9e, 0xb5, 0x0e, 0xa5, 0x2f, 0x5e, 0x29, 0xf2, 0x3b, 0xf4, - 0xf7, 0xf4, 0x0a, 0x05, 0xbd, 0xf9, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x18, 0x7c, 0x33, - 0x64, 0x2b, 0x00, 0x00, + 0xf7, 0x64, 0x41, 0x5a, 0x09, 0x85, 0xf6, 0x4c, 0xb9, 0x77, 0xf0, 0x4c, 0x77, 0xbb, 0xab, 0x27, + 0xce, 0x72, 0x59, 0x71, 0x41, 0x02, 0x21, 0x21, 0xc4, 0x75, 0x11, 0x82, 0x0b, 0x08, 0x01, 0xe2, + 0x00, 0x67, 0xfe, 0x00, 0x88, 0x0b, 0x17, 0xc4, 0x8d, 0x3f, 0xc0, 0x85, 0x1f, 0xb0, 0xea, 0xaa, + 0xea, 0xea, 0xea, 0xae, 0xee, 0x9e, 0xd9, 0xf6, 0x26, 0xb9, 0x8c, 0xa6, 0x5e, 0xbd, 0xaa, 0x7a, + 0xef, 0xd5, 0x7b, 0xaf, 0xde, 0x47, 0xc3, 0xbc, 0xed, 0xbb, 0x43, 0x6f, 0x83, 0xfe, 0xae, 0x7b, + 0xbe, 0x1b, 0xb8, 0xa8, 0x46, 0x07, 0xfa, 0xda, 0x91, 0x87, 0x9d, 0x7b, 0xad, 0x83, 0x7b, 0x6d, + 0xec, 0x3f, 0xc3, 0xfe, 0x86, 0x77, 0x66, 0x6f, 0x50, 0x84, 0x0d, 0xd2, 0x3d, 0x7b, 0x7a, 0x41, + 0x36, 0x2e, 0x08, 0x5b, 0xa0, 0xaf, 0x8f, 0xc4, 0xf4, 0x2d, 0xcf, 0xc3, 0x3e, 0xc7, 0x37, 0xbe, + 0x01, 0xb0, 0xed, 0x0e, 0x06, 0xae, 0x63, 0x62, 0xe2, 0xa1, 0x26, 0x4c, 0xee, 0xfa, 0xfe, 0xb6, + 0xdb, 0xc5, 0x4d, 0x6d, 0x55, 0x5b, 0xab, 0x99, 0xd1, 0x10, 0x2d, 0xc1, 0x95, 0x5d, 0xdf, 0x3f, + 0x20, 0x76, 0xb3, 0xb2, 0xaa, 0xad, 0x4d, 0x9b, 0x7c, 0x64, 0xbc, 0x07, 0xe8, 0x61, 0x48, 0xe2, + 0x83, 0x6e, 0xf7, 0x00, 0x0f, 0x4e, 0xb0, 0xdf, 0x72, 0x4e, 0xdd, 0x10, 0xfb, 0x7d, 0x82, 0xfd, + 0xd6, 0x0e, 0xdd, 0x66, 0xda, 0xe4, 0x23, 0xb4, 0x0c, 0xd3, 0xa6, 0xdb, 0xc7, 0x8f, 0xf1, 0x33, + 0xdc, 0xa7, 0x1b, 0xd5, 0xcc, 0x18, 0x60, 0xfc, 0x4f, 0x83, 0xab, 0xdb, 0x3e, 0xb6, 0x02, 0x4c, + 0xb7, 0x34, 0xf1, 0x39, 0x7a, 0x00, 0x57, 0x5b, 0x4e, 0x2f, 0x60, 0x5b, 0x3f, 0xee, 0x91, 0xa0, + 0xa9, 0xad, 0x56, 0xd7, 0x66, 0x36, 0x6f, 0xac, 0x33, 0x29, 0xa9, 0x67, 0x9b, 0xa9, 0x05, 0xe8, + 0x6d, 0x98, 0xa6, 0x58, 0xe1, 0x24, 0x3d, 0x73, 0x66, 0x73, 0x79, 0x9d, 0x50, 0xe9, 0x3c, 0xb5, + 0xbc, 0xde, 0x53, 0xcf, 0xf2, 0xad, 0x01, 0x59, 0x17, 0x38, 0x66, 0x8c, 0x8e, 0x56, 0x61, 0xe6, + 0xc8, 0xc3, 0xbe, 0x15, 0xf4, 0x5c, 0xa7, 0xb5, 0xd3, 0xac, 0x52, 0x66, 0x64, 0x10, 0xd2, 0x61, + 0xea, 0xc8, 0xe3, 0xbc, 0x4e, 0xd0, 0x69, 0x31, 0xa6, 0xab, 0x2f, 0x1c, 0xec, 0xf3, 0xe9, 0x1a, + 0x5f, 0x1d, 0x83, 0x8c, 0x8f, 0xa1, 0x91, 0x60, 0xb8, 0xcc, 0x15, 0x24, 0x19, 0xac, 0x7e, 0x26, + 0x06, 0x0d, 0x1f, 0xe6, 0x1e, 0xe2, 0x80, 0x8e, 0x09, 0x9d, 0xc3, 0xe7, 0x21, 0xd9, 0x0c, 0x61, + 0x47, 0x08, 0x7c, 0xda, 0x94, 0x41, 0x69, 0xb1, 0x54, 0x8a, 0xc5, 0x52, 0x4d, 0x8a, 0xc5, 0xf8, + 0xb1, 0x06, 0xf3, 0xa9, 0x43, 0x4b, 0xf1, 0xbd, 0x05, 0x75, 0xc1, 0x08, 0xa5, 0xb4, 0x4a, 0x55, + 0xa3, 0x98, 0xf7, 0xe4, 0x12, 0xe3, 0x97, 0x1a, 0x34, 0xda, 0x9c, 0x96, 0x88, 0xff, 0xc7, 0xd0, + 0xb0, 0xa3, 0xf1, 0x9e, 0xeb, 0xb7, 0x71, 0x40, 0x29, 0x9a, 0xd9, 0x34, 0x8a, 0x76, 0x66, 0x98, + 0x66, 0x7a, 0x69, 0x42, 0x12, 0x95, 0x0c, 0x05, 0x29, 0x54, 0x2f, 0x63, 0x17, 0xe6, 0x92, 0xe4, + 0x11, 0x0f, 0x7d, 0x45, 0x36, 0x59, 0x4e, 0xda, 0x3c, 0xb7, 0x87, 0x78, 0xc2, 0x94, 0x90, 0x8c, + 0x1f, 0x80, 0x1e, 0x49, 0xfc, 0x81, 0xe7, 0xf5, 0x7b, 0x1d, 0xba, 0x7f, 0x28, 0x81, 0x90, 0x61, + 0x99, 0x44, 0xad, 0x98, 0xc4, 0x8c, 0xab, 0x5e, 0x01, 0xd8, 0xf3, 0xdd, 0x41, 0xe2, 0xb2, 0x25, + 0x88, 0xf1, 0x89, 0x06, 0x37, 0x73, 0x0f, 0x2f, 0x75, 0xf1, 0x8f, 0x60, 0x2e, 0x72, 0x10, 0x43, + 0x4c, 0x02, 0xe9, 0xee, 0x6f, 0xe7, 0xdd, 0x10, 0x47, 0x35, 0x95, 0x85, 0x46, 0x00, 0xcb, 0x0f, + 0x71, 0x10, 0xd2, 0x6a, 0xe2, 0xf3, 0x0c, 0xe1, 0xe4, 0xb9, 0xb2, 0xcb, 0xdd, 0xeb, 0xaf, 0x34, + 0xb8, 0x55, 0x70, 0x6c, 0xa9, 0x5b, 0xce, 0x94, 0x4b, 0xa5, 0xac, 0x5c, 0xfe, 0xa6, 0xc1, 0xe2, + 0x13, 0xdf, 0x72, 0xc8, 0x29, 0xf6, 0xe9, 0x24, 0xf5, 0x5b, 0xa1, 0x44, 0x9a, 0x30, 0xc9, 0x9d, + 0x01, 0x17, 0x49, 0x34, 0x44, 0x6f, 0xc0, 0xd5, 0xa3, 0x7e, 0x57, 0xf6, 0x79, 0x4c, 0x32, 0x29, + 0x68, 0x88, 0x77, 0x88, 0x2f, 0x64, 0x3c, 0x26, 0xa2, 0x14, 0x34, 0x2d, 0xc7, 0x89, 0x62, 0x3f, + 0x53, 0x4b, 0xf9, 0x99, 0x47, 0xb0, 0x94, 0xc5, 0x40, 0x39, 0x0b, 0xfa, 0xbb, 0x06, 0xb3, 0xef, + 0xb9, 0x3d, 0x47, 0xbc, 0x4c, 0xf9, 0x52, 0x58, 0x01, 0x30, 0xf1, 0xf9, 0x01, 0x26, 0xc4, 0xb2, + 0x31, 0x97, 0x80, 0x04, 0x29, 0xf2, 0x8d, 0x63, 0x70, 0xbc, 0x02, 0x10, 0xd2, 0xd1, 0x76, 0x87, + 0x7e, 0x07, 0x53, 0x9e, 0x6b, 0xa6, 0x04, 0x41, 0x77, 0xa0, 0xde, 0x72, 0x9e, 0xf5, 0x02, 0x21, + 0xda, 0x2b, 0x74, 0x8f, 0x24, 0xd0, 0xd8, 0x82, 0xba, 0xc4, 0x4d, 0x39, 0x91, 0xfc, 0x3b, 0x34, + 0xec, 0x94, 0x55, 0x87, 0x13, 0xae, 0x43, 0x30, 0x7f, 0x47, 0x64, 0x5e, 0xb4, 0xe2, 0xdb, 0x4b, + 0xdb, 0x90, 0x24, 0xdf, 0xaa, 0x22, 0x5f, 0xc9, 0xe1, 0x4c, 0xa4, 0x1d, 0x4e, 0x38, 0xbf, 0x6f, + 0x39, 0xdd, 0x3e, 0xee, 0x86, 0xae, 0x83, 0x69, 0x85, 0x04, 0x41, 0x06, 0xcc, 0xb2, 0x91, 0x89, + 0xc9, 0xb0, 0x1f, 0x50, 0x01, 0xd5, 0xcc, 0x04, 0xcc, 0x38, 0x86, 0xe5, 0x7c, 0xd6, 0xca, 0x89, + 0xeb, 0x14, 0x66, 0x8f, 0x87, 0xbd, 0x60, 0x0c, 0x05, 0xba, 0xdc, 0xf3, 0xba, 0x05, 0x75, 0xe9, + 0x9c, 0x72, 0xb4, 0xfe, 0x5a, 0x83, 0xc5, 0xc8, 0x67, 0xc7, 0xa1, 0x54, 0x31, 0xd5, 0x97, 0x72, + 0x88, 0xa1, 0x9b, 0xdd, 0xeb, 0xf5, 0x03, 0xec, 0xd3, 0x0b, 0xad, 0x99, 0x7c, 0x14, 0x9e, 0x77, + 0x88, 0x9f, 0x07, 0x6d, 0x7c, 0xce, 0x75, 0x3d, 0x1a, 0x1a, 0x7f, 0xd0, 0x60, 0x29, 0x8b, 0xc6, + 0x52, 0x4f, 0xca, 0x1e, 0xc0, 0x20, 0x8e, 0x31, 0xd9, 0x63, 0xf2, 0x46, 0x9e, 0xd3, 0x64, 0xa7, + 0xed, 0x0d, 0xfb, 0x7d, 0xfa, 0x26, 0x4b, 0x2b, 0xc3, 0x93, 0x1d, 0x4e, 0x2e, 0xe3, 0x23, 0x1a, + 0x1a, 0xbf, 0x57, 0xc8, 0x15, 0x01, 0x57, 0xa1, 0x2b, 0x91, 0xc8, 0xaa, 0xd0, 0x48, 0x4c, 0x3e, + 0xee, 0x72, 0xae, 0x24, 0x24, 0xd6, 0xdd, 0xb6, 0x3a, 0x1f, 0x32, 0x3f, 0x32, 0x65, 0x46, 0x43, + 0xe3, 0x17, 0x1a, 0x5c, 0xcf, 0x24, 0xf6, 0x55, 0x0a, 0xd7, 0xf8, 0xb3, 0x06, 0xe8, 0x51, 0xaf, + 0x73, 0x26, 0xe1, 0x15, 0x8b, 0xef, 0x4b, 0x30, 0x17, 0xe2, 0xe3, 0x2e, 0x13, 0x89, 0x24, 0x44, + 0x05, 0x1e, 0x12, 0x6f, 0x62, 0x8b, 0xb8, 0x0e, 0x17, 0x24, 0x1f, 0xa5, 0xc5, 0x58, 0x2b, 0x36, + 0xc6, 0x2b, 0x29, 0x63, 0x7c, 0x07, 0xa6, 0x5b, 0xdd, 0x4d, 0xe6, 0x54, 0x72, 0x43, 0x09, 0x7a, + 0x34, 0x75, 0x45, 0x2c, 0x25, 0xe2, 0x23, 0xe3, 0x63, 0x58, 0x50, 0xd8, 0x2d, 0x75, 0x01, 0xf7, + 0xa1, 0x2e, 0xa8, 0x90, 0xee, 0x60, 0x8e, 0x3b, 0x01, 0x31, 0x67, 0x26, 0xd1, 0x8c, 0x21, 0xf5, + 0x02, 0xe1, 0x43, 0x81, 0xbb, 0x94, 0x8a, 0xc8, 0x0b, 0x24, 0x5d, 0xb0, 0xa6, 0xb8, 0xe0, 0x55, + 0x98, 0x71, 0x55, 0x0f, 0xe6, 0x8e, 0xe9, 0xc1, 0x7e, 0xc4, 0x4c, 0x45, 0x39, 0xf7, 0x52, 0xd9, + 0xd1, 0xd8, 0x19, 0x42, 0x8c, 0x6e, 0xfc, 0x45, 0x83, 0x6b, 0xec, 0xdd, 0x0c, 0x29, 0x7b, 0xe2, + 0x0a, 0xdf, 0x3d, 0xda, 0x43, 0xe7, 0x3f, 0x5f, 0xb1, 0xa2, 0x4d, 0x24, 0x14, 0xed, 0x2e, 0xcc, + 0xb3, 0xb3, 0x64, 0x6d, 0xad, 0x51, 0x6d, 0x55, 0x27, 0x0a, 0x95, 0xee, 0x87, 0x1a, 0x2c, 0x66, + 0x90, 0xfd, 0x52, 0x55, 0xe7, 0x13, 0x0d, 0xae, 0x89, 0xa8, 0xbf, 0xdf, 0x1f, 0xc7, 0x5a, 0x2f, + 0xfd, 0x80, 0x1c, 0x9d, 0x9e, 0x12, 0x1c, 0x44, 0x0f, 0x08, 0x1b, 0xa1, 0x6b, 0x50, 0xdb, 0x76, + 0x87, 0x4e, 0xc0, 0x9f, 0x0f, 0x36, 0x30, 0x7e, 0x2e, 0x3d, 0x70, 0x12, 0x79, 0xaf, 0xd4, 0xbd, + 0xfd, 0x46, 0x83, 0xa9, 0xed, 0x83, 0x36, 0x45, 0x4b, 0x26, 0xf5, 0xda, 0x67, 0xab, 0x5a, 0xac, + 0xf3, 0x9a, 0x8c, 0x08, 0xa5, 0x0f, 0xad, 0x41, 0x14, 0x88, 0x66, 0xcc, 0x84, 0x6e, 0x32, 0x09, + 0x15, 0x12, 0x56, 0xe0, 0xc6, 0x9f, 0x34, 0x98, 0x15, 0xc9, 0x7b, 0x78, 0x9f, 0x3b, 0x00, 0xdf, + 0xb2, 0xec, 0x9e, 0x43, 0xef, 0x81, 0x53, 0x7a, 0x27, 0x83, 0x52, 0x9e, 0x5b, 0xc4, 0xb8, 0xa6, + 0xb4, 0x0e, 0x2d, 0x73, 0x76, 0x25, 0x4a, 0x63, 0x40, 0x81, 0x31, 0x8d, 0x7c, 0xe4, 0x8c, 0x7f, + 0x69, 0x50, 0x97, 0x08, 0x26, 0x1e, 0xba, 0x07, 0xd3, 0x91, 0x98, 0x09, 0x2f, 0x27, 0x35, 0xa2, + 0x70, 0x88, 0xc3, 0xcd, 0x18, 0x03, 0xed, 0x26, 0x18, 0x64, 0x05, 0xa4, 0x2f, 0x64, 0x32, 0xc8, + 0xe2, 0xc3, 0x1c, 0x0e, 0x75, 0x98, 0x62, 0x0c, 0x0d, 0x07, 0x94, 0x89, 0x9a, 0x29, 0xc6, 0x61, + 0x84, 0xd6, 0x89, 0x23, 0xb4, 0x89, 0xdc, 0x08, 0x2d, 0x46, 0x32, 0x8e, 0xe2, 0x1a, 0xca, 0x38, + 0xb6, 0x35, 0xd2, 0x61, 0x19, 0x7f, 0x55, 0x42, 0x3e, 0xb2, 0x7d, 0xd0, 0x1e, 0x69, 0xb1, 0x29, + 0xf5, 0x12, 0xe3, 0x94, 0x5e, 0x54, 0x4b, 0xea, 0xc5, 0xe8, 0xfb, 0xfd, 0xbf, 0x1a, 0x57, 0x51, + 0xba, 0x89, 0x87, 0xbe, 0x09, 0x93, 0xcc, 0xbc, 0xa2, 0x6b, 0x1e, 0xd7, 0x2a, 0xa3, 0x65, 0x9f, + 0xd7, 0xdd, 0xaf, 0x00, 0xb0, 0x13, 0x0e, 0x87, 0x03, 0xc2, 0x6f, 0x5f, 0x82, 0x94, 0xb9, 0xff, + 0x1e, 0x34, 0x76, 0x7a, 0x64, 0xd0, 0x23, 0x44, 0x3c, 0x4a, 0x3a, 0x4c, 0xb9, 0xa9, 0x32, 0x8e, + 0xeb, 0x8d, 0xfd, 0x20, 0x37, 0x61, 0xd2, 0x4e, 0xda, 0x18, 0x1f, 0x1a, 0xbb, 0x30, 0x97, 0x3c, + 0x8a, 0xe5, 0x14, 0x9d, 0x71, 0x72, 0x0a, 0x89, 0xe2, 0xdf, 0x69, 0x80, 0x0e, 0x86, 0xbc, 0xd4, + 0x19, 0xeb, 0xec, 0x0b, 0xa2, 0x3a, 0xf4, 0xd6, 0x43, 0x39, 0x43, 0xe4, 0xa3, 0x30, 0xfb, 0x1b, + 0x0c, 0x03, 0xdc, 0x6d, 0xe3, 0x8e, 0xeb, 0x74, 0x09, 0x7d, 0x16, 0xea, 0x66, 0x02, 0x66, 0xec, + 0xc3, 0x82, 0x42, 0x69, 0x39, 0xa6, 0x7f, 0xa2, 0x41, 0x73, 0xdb, 0x72, 0x3a, 0xb8, 0xff, 0xea, + 0x59, 0x37, 0x0e, 0xe1, 0x46, 0x0e, 0x2d, 0xe5, 0x98, 0x3b, 0x85, 0x59, 0xb1, 0xd3, 0x8b, 0x54, + 0xc0, 0x2d, 0xa8, 0x4b, 0xe7, 0x94, 0xa3, 0xb5, 0x0f, 0x28, 0xc5, 0xfb, 0x8b, 0xa4, 0x78, 0x1f, + 0x16, 0x94, 0xd3, 0xca, 0xd1, 0xfd, 0x5b, 0x0d, 0x6e, 0xb4, 0x13, 0xee, 0xed, 0xb0, 0xd7, 0x39, + 0x73, 0xac, 0x01, 0xe6, 0xae, 0xd9, 0x4e, 0xba, 0x66, 0x3b, 0x76, 0xcd, 0x0e, 0x47, 0x8c, 0x5c, + 0x73, 0x34, 0x4e, 0x70, 0x5d, 0x2d, 0xe6, 0x7a, 0x42, 0xe5, 0x3a, 0xd6, 0xae, 0x5a, 0x42, 0xbb, + 0x8e, 0x40, 0xcf, 0x23, 0xb4, 0x5c, 0x11, 0xc2, 0xa7, 0x45, 0x6b, 0x96, 0x05, 0xb4, 0x87, 0x1e, + 0xaf, 0xe2, 0x45, 0x29, 0x48, 0x8a, 0x50, 0xad, 0x88, 0xd0, 0x4a, 0xc2, 0x03, 0x14, 0xb0, 0x6f, + 0xfc, 0x94, 0x15, 0xab, 0xb3, 0x0f, 0x2d, 0x75, 0x83, 0x97, 0x4a, 0x40, 0x2e, 0xe8, 0x9b, 0x1c, + 0xd3, 0xf1, 0xd2, 0x7a, 0x34, 0x3f, 0x63, 0xaf, 0xaa, 0x72, 0x72, 0x39, 0x11, 0x7c, 0x1e, 0x9d, + 0x9a, 0xff, 0x56, 0x60, 0x31, 0xa9, 0x5f, 0x52, 0xf9, 0x24, 0xc7, 0x08, 0x4a, 0x68, 0xc0, 0x18, + 0x06, 0xf0, 0x96, 0x64, 0x5a, 0x35, 0x1e, 0x99, 0xdb, 0xae, 0x6b, 0xf7, 0x31, 0xeb, 0xa9, 0x9e, + 0x0c, 0x4f, 0xd7, 0xdb, 0x81, 0xdf, 0x73, 0xec, 0x6f, 0x5b, 0xfd, 0x21, 0x96, 0x0c, 0xef, 0x3e, + 0x4c, 0x9e, 0x5a, 0x1d, 0xfc, 0xbe, 0xf9, 0x98, 0xe6, 0x6c, 0xa3, 0x16, 0x46, 0xc8, 0xe8, 0xab, + 0x30, 0xed, 0x8b, 0xb6, 0xe9, 0x24, 0x5d, 0x79, 0x53, 0x59, 0xd9, 0x72, 0x82, 0x37, 0x37, 0xd9, + 0xc2, 0x18, 0x1b, 0xdd, 0x85, 0x0a, 0x7e, 0xde, 0x9c, 0x1a, 0xe3, 0xb4, 0x0a, 0x7e, 0x6e, 0x3c, + 0x82, 0xa5, 0x2c, 0x19, 0x97, 0xb3, 0xdf, 0xf3, 0xb8, 0x86, 0xf4, 0xe0, 0x84, 0x04, 0xbe, 0xd5, + 0x09, 0x46, 0x5f, 0x99, 0x7c, 0x35, 0x95, 0xe2, 0xab, 0xa9, 0x2a, 0x57, 0x63, 0xfc, 0x51, 0x83, + 0x66, 0xf6, 0x99, 0xe5, 0x3a, 0x2a, 0x77, 0x79, 0x4f, 0x5e, 0xc4, 0x6a, 0x27, 0xd8, 0xe7, 0x45, + 0x1a, 0x75, 0x02, 0x7d, 0x19, 0x16, 0xec, 0x64, 0x35, 0x72, 0xdf, 0x22, 0x1f, 0x52, 0x3a, 0x27, + 0xcc, 0xac, 0x29, 0xe3, 0x1c, 0x1a, 0x4c, 0xcb, 0xc9, 0xee, 0xf3, 0xd8, 0xaf, 0xd9, 0xaa, 0x65, + 0x4b, 0xa0, 0x4b, 0x8a, 0xe8, 0x1f, 0x1a, 0xcf, 0xf6, 0xc4, 0x99, 0xe5, 0x44, 0xf3, 0x10, 0x80, + 0xef, 0x70, 0x60, 0x79, 0xbc, 0xcd, 0xf4, 0x45, 0xb9, 0x2b, 0x2f, 0xed, 0xbf, 0x1e, 0x63, 0xee, + 0x3a, 0x81, 0xff, 0x91, 0x29, 0x2d, 0xd5, 0xbf, 0x0e, 0x8d, 0xd4, 0x34, 0x9a, 0x83, 0xea, 0x19, + 0xfe, 0x88, 0xab, 0x46, 0xf8, 0x37, 0xcc, 0xe2, 0x9f, 0x85, 0x5a, 0x4a, 0x19, 0x9e, 0x32, 0xd9, + 0xe0, 0xed, 0xca, 0x5b, 0x9a, 0xe1, 0xc0, 0x1c, 0xe5, 0x9d, 0xb4, 0x12, 0xbd, 0x99, 0x1c, 0xf5, + 0x5a, 0x01, 0x18, 0xa6, 0x6b, 0x81, 0x12, 0x64, 0x0c, 0xf9, 0xfd, 0x53, 0x83, 0xf9, 0xd4, 0x81, + 0xe5, 0x04, 0xb8, 0x9f, 0x21, 0xc0, 0x35, 0xbe, 0x44, 0x39, 0xe0, 0x05, 0x4a, 0x70, 0xf3, 0x3f, + 0xf3, 0xc0, 0x3e, 0x33, 0x41, 0x5f, 0x83, 0x99, 0x4e, 0xfc, 0x39, 0x02, 0x5a, 0x8c, 0x18, 0x48, + 0x7c, 0x93, 0xa1, 0x2f, 0x65, 0x81, 0x89, 0x87, 0xee, 0xc3, 0xf4, 0xf7, 0xa3, 0x9e, 0x12, 0x5a, + 0xe0, 0x48, 0x72, 0xcf, 0x4c, 0xbf, 0xa6, 0x02, 0xd9, 0xba, 0xf3, 0xa8, 0x61, 0x21, 0xd6, 0xc9, + 0xad, 0x12, 0xb1, 0x2e, 0xd9, 0xd7, 0xd8, 0x82, 0xba, 0x2d, 0x7f, 0x46, 0x80, 0xae, 0x47, 0xea, + 0x97, 0xfa, 0xa2, 0x41, 0x6f, 0x66, 0x4f, 0x10, 0x0f, 0xbd, 0x0b, 0xb3, 0x44, 0xea, 0xaf, 0xa3, + 0x88, 0xb7, 0xd4, 0x37, 0x01, 0xfa, 0xf5, 0x4c, 0x38, 0xf1, 0xd0, 0xf7, 0xe0, 0xba, 0x9d, 0xdd, + 0xdc, 0x46, 0xaf, 0xa5, 0x4e, 0x55, 0x9b, 0xcb, 0xba, 0x31, 0x0a, 0x85, 0x78, 0xe8, 0x14, 0x6e, + 0xd8, 0x79, 0x9d, 0x62, 0xf4, 0x7a, 0xbc, 0x41, 0x6e, 0x0b, 0x5b, 0xbf, 0x33, 0x1a, 0x89, 0x78, + 0xe8, 0x18, 0x50, 0xa0, 0xb4, 0x4b, 0xd1, 0x32, 0x5f, 0x9b, 0xd9, 0x0a, 0xd6, 0x6f, 0x15, 0xcc, + 0x12, 0x0f, 0x75, 0xa0, 0x69, 0xe7, 0x74, 0xd1, 0x90, 0x91, 0xf8, 0x82, 0x27, 0xb3, 0x83, 0xa8, + 0xbf, 0x3e, 0x12, 0x87, 0xd1, 0x6d, 0x2b, 0x6d, 0x20, 0x41, 0x77, 0x66, 0x17, 0x4b, 0xd0, 0x9d, + 0xd3, 0x3f, 0x7a, 0x02, 0x0b, 0xb6, 0xda, 0xfd, 0x40, 0xd9, 0xab, 0x84, 0x96, 0xad, 0x14, 0x4d, + 0x53, 0x83, 0x6f, 0x9c, 0x25, 0xcb, 0xf9, 0x28, 0xfa, 0x8c, 0x49, 0xed, 0x6a, 0xe8, 0x7a, 0xde, + 0x94, 0x60, 0x39, 0x55, 0x1f, 0x97, 0x59, 0x56, 0x4b, 0xf6, 0x32, 0xcb, 0x59, 0x85, 0xf5, 0x43, + 0x98, 0xef, 0xa5, 0x4b, 0xc6, 0xe8, 0x66, 0x54, 0xe5, 0xcd, 0xa8, 0x81, 0xeb, 0xcb, 0xf9, 0x93, + 0x6c, 0x3f, 0x3b, 0x5d, 0x5f, 0x15, 0xfb, 0x65, 0x15, 0x86, 0xf5, 0xe5, 0xfc, 0x49, 0xe6, 0x24, + 0x84, 0xf5, 0x0a, 0x27, 0x21, 0x17, 0x22, 0x85, 0x93, 0x48, 0x16, 0xfb, 0x8e, 0x01, 0xa9, 0xd5, + 0xa1, 0x1c, 0xed, 0xe0, 0x05, 0xaf, 0x1c, 0xed, 0x10, 0x65, 0xa5, 0x77, 0x61, 0x56, 0xae, 0x87, + 0x08, 0x9f, 0x91, 0xaa, 0xc7, 0x08, 0x9f, 0xa1, 0x14, 0x4f, 0xf6, 0xa1, 0x91, 0xca, 0xc0, 0x85, + 0x22, 0xa8, 0x55, 0x02, 0xa1, 0x08, 0x59, 0x49, 0xfb, 0x07, 0xb0, 0x98, 0x99, 0xd1, 0xa3, 0xdb, + 0x91, 0x8f, 0xce, 0xa9, 0x3d, 0xe8, 0xab, 0xc5, 0x08, 0x4c, 0xe2, 0x02, 0x2c, 0x24, 0x2e, 0x67, + 0xcf, 0x42, 0xe2, 0xc9, 0x24, 0x77, 0x1f, 0x1a, 0xa9, 0x4d, 0x05, 0x77, 0x6a, 0x06, 0x2e, 0xb8, + 0xcb, 0x4a, 0x97, 0xbf, 0x9b, 0x8e, 0x46, 0xa3, 0x8c, 0x12, 0xad, 0xa6, 0xdc, 0xb1, 0x92, 0x19, + 0xeb, 0xaf, 0x8d, 0xc0, 0x60, 0xae, 0x3b, 0x27, 0xd5, 0x93, 0x5d, 0x77, 0x4e, 0xfe, 0x29, 0xbb, + 0xee, 0xdc, 0x6c, 0x91, 0x29, 0x5f, 0x2a, 0x89, 0x92, 0x95, 0x4f, 0xcd, 0xec, 0x64, 0xe5, 0xcb, + 0xca, 0xbe, 0x8e, 0x01, 0xa9, 0x11, 0xba, 0xd8, 0x32, 0x33, 0x41, 0x12, 0x5b, 0xe6, 0x84, 0xf6, + 0xdf, 0x91, 0x3a, 0x35, 0x52, 0xcc, 0x8c, 0xd2, 0xfe, 0x2c, 0x15, 0xc4, 0xeb, 0xb7, 0x0b, 0xe7, + 0x99, 0xa1, 0xc8, 0x91, 0xa0, 0x30, 0x94, 0x54, 0xc8, 0x2b, 0x0c, 0x45, 0x09, 0x4b, 0xb7, 0xa0, + 0x9e, 0x88, 0x84, 0xc4, 0x0b, 0x9f, 0x8e, 0xf8, 0xc4, 0x0b, 0xaf, 0x04, 0x4e, 0x5b, 0xb7, 0x3f, + 0xb8, 0x75, 0xe4, 0x61, 0xe7, 0x69, 0xeb, 0x40, 0xfa, 0x16, 0x96, 0x22, 0xbf, 0x43, 0x7f, 0x4f, + 0xae, 0x50, 0xd0, 0x9b, 0x9f, 0x06, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x7e, 0x59, 0x05, 0x7e, 0x2b, + 0x00, 0x00, } diff --git a/pkg/proto/group/group.proto b/pkg/proto/group/group.proto index 3f61b4961..b05b840e6 100644 --- a/pkg/proto/group/group.proto +++ b/pkg/proto/group/group.proto @@ -146,6 +146,7 @@ message GetGroupMembersInfoReq { repeated string memberList = 2; string OpUserID = 3; //No verification permission string OperationID = 4; + bool noCache = 5; } message GetGroupMembersInfoResp { From 3e3818d4b5c5b11170815536554160304d8c0b40 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 6 Jan 2023 16:11:49 +0800 Subject: [PATCH 2/6] reaction message update --- cmd/Open-IM-SDK-Core | 2 +- internal/api/msg/extend_msg.go | 10 +- internal/rpc/msg/extend_msg.go | 43 +- internal/rpc/msg/extend_msg.notification.go | 25 + internal/rpc/msg/extend_msg_callback.go | 43 +- pkg/base_info/msg.go | 12 +- pkg/call_back_struct/message.go | 19 + pkg/common/constant/constant.go | 4 + pkg/proto/msg/msg.pb.go | 511 ++++++++++++++------ pkg/proto/msg/msg.proto | 26 +- 10 files changed, 521 insertions(+), 174 deletions(-) diff --git a/cmd/Open-IM-SDK-Core b/cmd/Open-IM-SDK-Core index e731cb86e..a9f57645a 160000 --- a/cmd/Open-IM-SDK-Core +++ b/cmd/Open-IM-SDK-Core @@ -1 +1 @@ -Subproject commit e731cb86ec9314a0b30b4f8331d53854c2c9d858 +Subproject commit a9f57645a5edf7e327e711ea49137676b5e0fbe3 diff --git a/internal/api/msg/extend_msg.go b/internal/api/msg/extend_msg.go index b6920825d..9933ce0cf 100644 --- a/internal/api/msg/extend_msg.go +++ b/internal/api/msg/extend_msg.go @@ -17,8 +17,8 @@ import ( func SetMessageReactionExtensions(c *gin.Context) { var ( - req api.SetMessageReactionExtensionsCallbackReq - resp api.SetMessageReactionExtensionsCallbackResp + req api.SetMessageReactionExtensionsReq + resp api.SetMessageReactionExtensionsResp reqPb rpc.SetMessageReactionExtensionsReq ) @@ -115,8 +115,9 @@ func AddMessageReactionExtensions(c *gin.Context) { var ( req api.AddMessageReactionExtensionsReq resp api.AddMessageReactionExtensionsResp - reqPb rpc.ModifyMessageReactionExtensionsReq + reqPb rpc.AddMessageReactionExtensionsReq ) + if err := c.BindJSON(&req); err != nil { c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) return @@ -152,6 +153,9 @@ func AddMessageReactionExtensions(c *gin.Context) { } resp.ErrCode = respPb.ErrCode resp.ErrMsg = respPb.ErrMsg + resp.Data.ResultKeyValue = respPb.Result + resp.Data.MsgFirstModifyTime = reqPb.MsgFirstModifyTime + resp.Data.IsReact = reqPb.IsReact log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp) c.JSON(http.StatusOK, resp) } diff --git a/internal/rpc/msg/extend_msg.go b/internal/rpc/msg/extend_msg.go index 3d8fa83bc..30e9d492c 100644 --- a/internal/rpc/msg/extend_msg.go +++ b/internal/rpc/msg/extend_msg.go @@ -282,8 +282,47 @@ func (rpc *rpcChat) GetMessageListReactionExtensions(ctx context.Context, req *m } -func (rpc *rpcChat) AddMessageReactionExtensions(ctx context.Context, req *msg.ModifyMessageReactionExtensionsReq) (resp *msg.ModifyMessageReactionExtensionsResp, err error) { - return +func (rpc *rpcChat) AddMessageReactionExtensions(ctx context.Context, req *msg.AddMessageReactionExtensionsReq) (resp *msg.AddMessageReactionExtensionsResp, err error) { + log.Debug(req.OperationID, utils.GetSelfFuncName(), "rpc args is:", req.String()) + var rResp msg.AddMessageReactionExtensionsResp + rResp.ClientMsgID = req.ClientMsgID + rResp.MsgFirstModifyTime = req.MsgFirstModifyTime + callbackResp := callbackAddMessageReactionExtensions(req) + if callbackResp.ActionCode != constant.ActionAllow || callbackResp.ErrCode != 0 { + rResp.ErrCode = int32(callbackResp.ErrCode) + rResp.ErrMsg = callbackResp.ErrMsg + for _, value := range req.ReactionExtensionList { + temp := new(msg.KeyValueResp) + temp.KeyValue = value + temp.ErrMsg = callbackResp.ErrMsg + temp.ErrCode = 100 + rResp.Result = append(rResp.Result, temp) + } + return &rResp, nil + } + if !req.IsExternalExtensions { + rResp.ErrCode = 200 + rResp.ErrMsg = "only extenalextensions message can be used" + for _, value := range req.ReactionExtensionList { + temp := new(msg.KeyValueResp) + temp.KeyValue = value + temp.ErrMsg = callbackResp.ErrMsg + temp.ErrCode = 100 + rResp.Result = append(rResp.Result, temp) + } + return &rResp, nil + } + //if ExternalExtension + var isHistory bool + if req.IsReact { + isHistory = false + } else { + isHistory = true + } + rResp.MsgFirstModifyTime = callbackResp.MsgFirstModifyTime + rResp.Result = callbackResp.ResultReactionExtensionList + ExtendMessageAddedNotification(req.OperationID, req.OpUserID, req.SourceID, req.SessionType, req, &rResp, isHistory, false) + return &rResp, nil } func (rpc *rpcChat) DeleteMessageReactionExtensions(ctx context.Context, req *msg.DeleteMessageListReactionExtensionsReq) (resp *msg.DeleteMessageListReactionExtensionsResp, err error) { diff --git a/internal/rpc/msg/extend_msg.notification.go b/internal/rpc/msg/extend_msg.notification.go index 971f2f797..dd8699624 100644 --- a/internal/rpc/msg/extend_msg.notification.go +++ b/internal/rpc/msg/extend_msg.notification.go @@ -18,6 +18,31 @@ func ExtendMessageUpdatedNotification(operationID, sendID string, sourceID strin var m base_info.ReactionMessageModifierNotification m.SourceID = req.SourceID m.OpUserID = req.OpUserID + m.Operation = constant.SetMessageExtensions + m.SessionType = req.SessionType + keyMap := make(map[string]*open_im_sdk.KeyValue) + for _, valueResp := range resp.Result { + if valueResp.ErrCode == 0 { + keyMap[valueResp.KeyValue.TypeKey] = valueResp.KeyValue + } + } + if len(keyMap) == 0 { + log.NewWarn(operationID, "all key set failed can not send notification", *req) + return + } + m.SuccessReactionExtensionList = keyMap + m.ClientMsgID = req.ClientMsgID + m.IsReact = resp.IsReact + m.IsExternalExtensions = req.IsExternalExtensions + m.MsgFirstModifyTime = resp.MsgFirstModifyTime + messageReactionSender(operationID, sendID, sourceID, sessionType, constant.ReactionMessageModifier, utils.StructToJsonString(m), isHistory, isReactionFromCache) +} +func ExtendMessageAddedNotification(operationID, sendID string, sourceID string, sessionType int32, + req *msg.AddMessageReactionExtensionsReq, resp *msg.AddMessageReactionExtensionsResp, isHistory bool, isReactionFromCache bool) { + var m base_info.ReactionMessageModifierNotification + m.SourceID = req.SourceID + m.OpUserID = req.OpUserID + m.Operation = constant.AddMessageExtensions m.SessionType = req.SessionType keyMap := make(map[string]*open_im_sdk.KeyValue) for _, valueResp := range resp.Result { diff --git a/internal/rpc/msg/extend_msg_callback.go b/internal/rpc/msg/extend_msg_callback.go index eb2595456..393f4129e 100644 --- a/internal/rpc/msg/extend_msg_callback.go +++ b/internal/rpc/msg/extend_msg_callback.go @@ -58,22 +58,47 @@ func callbackDeleteMessageReactionExtensions(setReq *msg.DeleteMessageListReacti } return resp } -func callbackGetMessageListReactionExtensions(setReq *msg.GetMessageListReactionExtensionsReq) *cbApi.CallbackGetMessageListReactionExtResp { - callbackResp := cbApi.CommonCallbackResp{OperationID: setReq.OperationID} - log.NewDebug(setReq.OperationID, utils.GetSelfFuncName(), setReq.String()) +func callbackGetMessageListReactionExtensions(getReq *msg.GetMessageListReactionExtensionsReq) *cbApi.CallbackGetMessageListReactionExtResp { + callbackResp := cbApi.CommonCallbackResp{OperationID: getReq.OperationID} + log.NewDebug(getReq.OperationID, utils.GetSelfFuncName(), getReq.String()) req := cbApi.CallbackGetMessageListReactionExtReq{ - OperationID: setReq.OperationID, + OperationID: getReq.OperationID, CallbackCommand: constant.CallbackGetMessageListReactionExtensionsCommand, - SourceID: setReq.SourceID, - OpUserID: setReq.OpUserID, - SessionType: setReq.SessionType, - MessageKeyList: setReq.MessageReactionKeyList, + SourceID: getReq.SourceID, + OpUserID: getReq.OpUserID, + SessionType: getReq.SessionType, + TypeKeyList: getReq.TypeKeyList, + MessageKeyList: getReq.MessageReactionKeyList, } resp := &cbApi.CallbackGetMessageListReactionExtResp{CommonCallbackResp: &callbackResp} - defer log.NewDebug(setReq.OperationID, utils.GetSelfFuncName(), req, *resp) + defer log.NewDebug(getReq.OperationID, utils.GetSelfFuncName(), req, *resp) if err := http.CallBackPostReturn(config.Config.Callback.CallbackUrl, constant.CallbackGetMessageListReactionExtensionsCommand, req, resp, config.Config.Callback.CallbackAfterSendGroupMsg.CallbackTimeOut); err != nil { callbackResp.ErrCode = http2.StatusInternalServerError callbackResp.ErrMsg = err.Error() } return resp } +func callbackAddMessageReactionExtensions(setReq *msg.AddMessageReactionExtensionsReq) *cbApi.CallbackAddMessageReactionExtResp { + callbackResp := cbApi.CommonCallbackResp{OperationID: setReq.OperationID} + log.NewDebug(setReq.OperationID, utils.GetSelfFuncName(), setReq.String()) + req := cbApi.CallbackAddMessageReactionExtReq{ + OperationID: setReq.OperationID, + CallbackCommand: constant.CallbackAddMessageListReactionExtensionsCommand, + SourceID: setReq.SourceID, + OpUserID: setReq.OpUserID, + SessionType: setReq.SessionType, + ReactionExtensionList: setReq.ReactionExtensionList, + ClientMsgID: setReq.ClientMsgID, + IsReact: setReq.IsReact, + IsExternalExtensions: setReq.IsExternalExtensions, + MsgFirstModifyTime: setReq.MsgFirstModifyTime, + } + resp := &cbApi.CallbackAddMessageReactionExtResp{CommonCallbackResp: &callbackResp} + defer log.NewDebug(setReq.OperationID, utils.GetSelfFuncName(), req, *resp) + if err := http.CallBackPostReturn(config.Config.Callback.CallbackUrl, constant.CallbackAddMessageListReactionExtensionsCommand, req, resp, config.Config.Callback.CallbackAfterSendGroupMsg.CallbackTimeOut); err != nil { + callbackResp.ErrCode = http2.StatusInternalServerError + callbackResp.ErrMsg = err.Error() + } + return resp + +} diff --git a/pkg/base_info/msg.go b/pkg/base_info/msg.go index 56a539b52..7df39b585 100644 --- a/pkg/base_info/msg.go +++ b/pkg/base_info/msg.go @@ -80,6 +80,7 @@ type OperateMessageListReactionExtensionsReq struct { SourceID string `json:"sourceID" binding:"required"` SessionType string `json:"sessionType" binding:"required"` IsExternalExtensions bool `json:"isExternalExtensions"` + TypeKeyList []string `json:"typeKeyList"` MessageReactionKeyList []*msg.GetMessageListReactionExtensionsReq_MessageReactionKey `json:"messageReactionKeyList" binding:"required"` } @@ -91,10 +92,12 @@ type OperateMessageListReactionExtensionsResp struct { } `json:"data"` } -type SetMessageReactionExtensionsCallbackReq ModifyMessageReactionExtensionsReq +type SetMessageReactionExtensionsReq ModifyMessageReactionExtensionsReq -type SetMessageReactionExtensionsCallbackResp ModifyMessageReactionExtensionsResp +type SetMessageReactionExtensionsResp ModifyMessageReactionExtensionsResp +type AddMessageReactionExtensionsReq ModifyMessageReactionExtensionsReq +type AddMessageReactionExtensionsResp ModifyMessageReactionExtensionsResp type GetMessageListReactionExtensionsReq OperateMessageListReactionExtensionsReq type GetMessageListReactionExtensionsResp struct { @@ -102,10 +105,6 @@ type GetMessageListReactionExtensionsResp struct { Data []*msg.SingleMessageExtensionResult `json:"data"` } -type AddMessageReactionExtensionsReq ModifyMessageReactionExtensionsReq - -type AddMessageReactionExtensionsResp ModifyMessageReactionExtensionsResp - type DeleteMessageReactionExtensionsReq struct { OperationID string `json:"operationID" binding:"required"` SourceID string `json:"sourceID" binding:"required"` @@ -122,6 +121,7 @@ type DeleteMessageReactionExtensionsResp struct { } type ReactionMessageModifierNotification struct { + Operation int `json:"operation" binding:"required"` SourceID string `json:"sourceID" binding:"required"` OpUserID string `json:"opUserID" binding:"required"` SessionType int32 `json:"sessionType" binding:"required"` diff --git a/pkg/call_back_struct/message.go b/pkg/call_back_struct/message.go index 9e6ea0697..6e285a793 100644 --- a/pkg/call_back_struct/message.go +++ b/pkg/call_back_struct/message.go @@ -105,9 +105,28 @@ type CallbackGetMessageListReactionExtReq struct { SourceID string `json:"sourceID"` OpUserID string `json:"opUserID"` SessionType int32 `json:"sessionType"` + TypeKeyList []string `json:"typeKeyList"` MessageKeyList []*msg.GetMessageListReactionExtensionsReq_MessageReactionKey `json:"messageKeyList"` } type CallbackGetMessageListReactionExtResp struct { *CommonCallbackResp MessageResultList []*msg.SingleMessageExtensionResult `json:"messageResultList"` } + +type CallbackAddMessageReactionExtReq struct { + OperationID string `json:"operationID"` + CallbackCommand string `json:"callbackCommand"` + SourceID string `json:"sourceID"` + OpUserID string `json:"opUserID"` + SessionType int32 `json:"sessionType"` + ReactionExtensionList map[string]*sdk_ws.KeyValue `json:"reactionExtensionList"` + ClientMsgID string `json:"clientMsgID"` + IsReact bool `json:"isReact"` + IsExternalExtensions bool `json:"isExternalExtensions"` + MsgFirstModifyTime int64 `json:"msgFirstModifyTime"` +} +type CallbackAddMessageReactionExtResp struct { + *CommonCallbackResp + ResultReactionExtensionList []*msg.KeyValueResp `json:"resultReactionExtensionList"` + MsgFirstModifyTime int64 `json:"msgFirstModifyTime"` +} diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go index 87d796ab0..62cf8339c 100644 --- a/pkg/common/constant/constant.go +++ b/pkg/common/constant/constant.go @@ -223,6 +223,10 @@ const ( CallbackBeforeSetMessageReactionExtensionCommand = "callbackBeforeSetMessageReactionExtensionCommand" CallbackBeforeDeleteMessageReactionExtensionsCommand = "callbackBeforeDeleteMessageReactionExtensionsCommand" CallbackGetMessageListReactionExtensionsCommand = "callbackGetMessageListReactionExtensionsCommand" + CallbackAddMessageListReactionExtensionsCommand = "callbackAddMessageListReactionExtensionsCommand" + + SetMessageExtensions = 1 + AddMessageExtensions = 2 //callback actionCode ActionAllow = 0 diff --git a/pkg/proto/msg/msg.pb.go b/pkg/proto/msg/msg.pb.go index 7d1bfa68f..8aafb5462 100644 --- a/pkg/proto/msg/msg.pb.go +++ b/pkg/proto/msg/msg.pb.go @@ -38,7 +38,7 @@ func (m *MsgDataToMQ) Reset() { *m = MsgDataToMQ{} } func (m *MsgDataToMQ) String() string { return proto.CompactTextString(m) } func (*MsgDataToMQ) ProtoMessage() {} func (*MsgDataToMQ) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{0} + return fileDescriptor_msg_bafb742f07ab638a, []int{0} } func (m *MsgDataToMQ) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgDataToMQ.Unmarshal(m, b) @@ -91,7 +91,7 @@ func (m *MsgDataToDB) Reset() { *m = MsgDataToDB{} } func (m *MsgDataToDB) String() string { return proto.CompactTextString(m) } func (*MsgDataToDB) ProtoMessage() {} func (*MsgDataToDB) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{1} + return fileDescriptor_msg_bafb742f07ab638a, []int{1} } func (m *MsgDataToDB) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgDataToDB.Unmarshal(m, b) @@ -138,7 +138,7 @@ func (m *PushMsgDataToMQ) Reset() { *m = PushMsgDataToMQ{} } func (m *PushMsgDataToMQ) String() string { return proto.CompactTextString(m) } func (*PushMsgDataToMQ) ProtoMessage() {} func (*PushMsgDataToMQ) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{2} + return fileDescriptor_msg_bafb742f07ab638a, []int{2} } func (m *PushMsgDataToMQ) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PushMsgDataToMQ.Unmarshal(m, b) @@ -193,7 +193,7 @@ func (m *MsgDataToMongoByMQ) Reset() { *m = MsgDataToMongoByMQ{} } func (m *MsgDataToMongoByMQ) String() string { return proto.CompactTextString(m) } func (*MsgDataToMongoByMQ) ProtoMessage() {} func (*MsgDataToMongoByMQ) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{3} + return fileDescriptor_msg_bafb742f07ab638a, []int{3} } func (m *MsgDataToMongoByMQ) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgDataToMongoByMQ.Unmarshal(m, b) @@ -273,7 +273,7 @@ func (m *GetMaxAndMinSeqReq) Reset() { *m = GetMaxAndMinSeqReq{} } func (m *GetMaxAndMinSeqReq) String() string { return proto.CompactTextString(m) } func (*GetMaxAndMinSeqReq) ProtoMessage() {} func (*GetMaxAndMinSeqReq) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{4} + return fileDescriptor_msg_bafb742f07ab638a, []int{4} } func (m *GetMaxAndMinSeqReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqReq.Unmarshal(m, b) @@ -321,7 +321,7 @@ func (m *GetMaxAndMinSeqResp) Reset() { *m = GetMaxAndMinSeqResp{} } func (m *GetMaxAndMinSeqResp) String() string { return proto.CompactTextString(m) } func (*GetMaxAndMinSeqResp) ProtoMessage() {} func (*GetMaxAndMinSeqResp) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{5} + return fileDescriptor_msg_bafb742f07ab638a, []int{5} } func (m *GetMaxAndMinSeqResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqResp.Unmarshal(m, b) @@ -382,7 +382,7 @@ func (m *SendMsgReq) Reset() { *m = SendMsgReq{} } func (m *SendMsgReq) String() string { return proto.CompactTextString(m) } func (*SendMsgReq) ProtoMessage() {} func (*SendMsgReq) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{6} + return fileDescriptor_msg_bafb742f07ab638a, []int{6} } func (m *SendMsgReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SendMsgReq.Unmarshal(m, b) @@ -438,7 +438,7 @@ func (m *SendMsgResp) Reset() { *m = SendMsgResp{} } func (m *SendMsgResp) String() string { return proto.CompactTextString(m) } func (*SendMsgResp) ProtoMessage() {} func (*SendMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{7} + return fileDescriptor_msg_bafb742f07ab638a, []int{7} } func (m *SendMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SendMsgResp.Unmarshal(m, b) @@ -506,7 +506,7 @@ func (m *ClearMsgReq) Reset() { *m = ClearMsgReq{} } func (m *ClearMsgReq) String() string { return proto.CompactTextString(m) } func (*ClearMsgReq) ProtoMessage() {} func (*ClearMsgReq) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{8} + return fileDescriptor_msg_bafb742f07ab638a, []int{8} } func (m *ClearMsgReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ClearMsgReq.Unmarshal(m, b) @@ -559,7 +559,7 @@ func (m *ClearMsgResp) Reset() { *m = ClearMsgResp{} } func (m *ClearMsgResp) String() string { return proto.CompactTextString(m) } func (*ClearMsgResp) ProtoMessage() {} func (*ClearMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{9} + return fileDescriptor_msg_bafb742f07ab638a, []int{9} } func (m *ClearMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ClearMsgResp.Unmarshal(m, b) @@ -608,7 +608,7 @@ func (m *SetMsgMinSeqReq) Reset() { *m = SetMsgMinSeqReq{} } func (m *SetMsgMinSeqReq) String() string { return proto.CompactTextString(m) } func (*SetMsgMinSeqReq) ProtoMessage() {} func (*SetMsgMinSeqReq) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{10} + return fileDescriptor_msg_bafb742f07ab638a, []int{10} } func (m *SetMsgMinSeqReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetMsgMinSeqReq.Unmarshal(m, b) @@ -675,7 +675,7 @@ func (m *SetMsgMinSeqResp) Reset() { *m = SetMsgMinSeqResp{} } func (m *SetMsgMinSeqResp) String() string { return proto.CompactTextString(m) } func (*SetMsgMinSeqResp) ProtoMessage() {} func (*SetMsgMinSeqResp) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{11} + return fileDescriptor_msg_bafb742f07ab638a, []int{11} } func (m *SetMsgMinSeqResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetMsgMinSeqResp.Unmarshal(m, b) @@ -721,7 +721,7 @@ func (m *SetSendMsgStatusReq) Reset() { *m = SetSendMsgStatusReq{} } func (m *SetSendMsgStatusReq) String() string { return proto.CompactTextString(m) } func (*SetSendMsgStatusReq) ProtoMessage() {} func (*SetSendMsgStatusReq) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{12} + return fileDescriptor_msg_bafb742f07ab638a, []int{12} } func (m *SetSendMsgStatusReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetSendMsgStatusReq.Unmarshal(m, b) @@ -767,7 +767,7 @@ func (m *SetSendMsgStatusResp) Reset() { *m = SetSendMsgStatusResp{} } func (m *SetSendMsgStatusResp) String() string { return proto.CompactTextString(m) } func (*SetSendMsgStatusResp) ProtoMessage() {} func (*SetSendMsgStatusResp) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{13} + return fileDescriptor_msg_bafb742f07ab638a, []int{13} } func (m *SetSendMsgStatusResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetSendMsgStatusResp.Unmarshal(m, b) @@ -812,7 +812,7 @@ func (m *GetSendMsgStatusReq) Reset() { *m = GetSendMsgStatusReq{} } func (m *GetSendMsgStatusReq) String() string { return proto.CompactTextString(m) } func (*GetSendMsgStatusReq) ProtoMessage() {} func (*GetSendMsgStatusReq) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{14} + return fileDescriptor_msg_bafb742f07ab638a, []int{14} } func (m *GetSendMsgStatusReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSendMsgStatusReq.Unmarshal(m, b) @@ -852,7 +852,7 @@ func (m *GetSendMsgStatusResp) Reset() { *m = GetSendMsgStatusResp{} } func (m *GetSendMsgStatusResp) String() string { return proto.CompactTextString(m) } func (*GetSendMsgStatusResp) ProtoMessage() {} func (*GetSendMsgStatusResp) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{15} + return fileDescriptor_msg_bafb742f07ab638a, []int{15} } func (m *GetSendMsgStatusResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSendMsgStatusResp.Unmarshal(m, b) @@ -907,7 +907,7 @@ func (m *DelSuperGroupMsgReq) Reset() { *m = DelSuperGroupMsgReq{} } func (m *DelSuperGroupMsgReq) String() string { return proto.CompactTextString(m) } func (*DelSuperGroupMsgReq) ProtoMessage() {} func (*DelSuperGroupMsgReq) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{16} + return fileDescriptor_msg_bafb742f07ab638a, []int{16} } func (m *DelSuperGroupMsgReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DelSuperGroupMsgReq.Unmarshal(m, b) @@ -967,7 +967,7 @@ func (m *DelSuperGroupMsgResp) Reset() { *m = DelSuperGroupMsgResp{} } func (m *DelSuperGroupMsgResp) String() string { return proto.CompactTextString(m) } func (*DelSuperGroupMsgResp) ProtoMessage() {} func (*DelSuperGroupMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{17} + return fileDescriptor_msg_bafb742f07ab638a, []int{17} } func (m *DelSuperGroupMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DelSuperGroupMsgResp.Unmarshal(m, b) @@ -1014,7 +1014,7 @@ func (m *GetSuperGroupMsgReq) Reset() { *m = GetSuperGroupMsgReq{} } func (m *GetSuperGroupMsgReq) String() string { return proto.CompactTextString(m) } func (*GetSuperGroupMsgReq) ProtoMessage() {} func (*GetSuperGroupMsgReq) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{18} + return fileDescriptor_msg_bafb742f07ab638a, []int{18} } func (m *GetSuperGroupMsgReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSuperGroupMsgReq.Unmarshal(m, b) @@ -1068,7 +1068,7 @@ func (m *GetSuperGroupMsgResp) Reset() { *m = GetSuperGroupMsgResp{} } func (m *GetSuperGroupMsgResp) String() string { return proto.CompactTextString(m) } func (*GetSuperGroupMsgResp) ProtoMessage() {} func (*GetSuperGroupMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{19} + return fileDescriptor_msg_bafb742f07ab638a, []int{19} } func (m *GetSuperGroupMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSuperGroupMsgResp.Unmarshal(m, b) @@ -1121,7 +1121,7 @@ func (m *GetWriteDiffMsgReq) Reset() { *m = GetWriteDiffMsgReq{} } func (m *GetWriteDiffMsgReq) String() string { return proto.CompactTextString(m) } func (*GetWriteDiffMsgReq) ProtoMessage() {} func (*GetWriteDiffMsgReq) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{20} + return fileDescriptor_msg_bafb742f07ab638a, []int{20} } func (m *GetWriteDiffMsgReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetWriteDiffMsgReq.Unmarshal(m, b) @@ -1168,7 +1168,7 @@ func (m *GetWriteDiffMsgResp) Reset() { *m = GetWriteDiffMsgResp{} } func (m *GetWriteDiffMsgResp) String() string { return proto.CompactTextString(m) } func (*GetWriteDiffMsgResp) ProtoMessage() {} func (*GetWriteDiffMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{21} + return fileDescriptor_msg_bafb742f07ab638a, []int{21} } func (m *GetWriteDiffMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetWriteDiffMsgResp.Unmarshal(m, b) @@ -1230,7 +1230,7 @@ func (m *ModifyMessageReactionExtensionsReq) Reset() { *m = ModifyMessag func (m *ModifyMessageReactionExtensionsReq) String() string { return proto.CompactTextString(m) } func (*ModifyMessageReactionExtensionsReq) ProtoMessage() {} func (*ModifyMessageReactionExtensionsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{22} + return fileDescriptor_msg_bafb742f07ab638a, []int{22} } func (m *ModifyMessageReactionExtensionsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ModifyMessageReactionExtensionsReq.Unmarshal(m, b) @@ -1348,7 +1348,7 @@ func (m *SetMessageReactionExtensionsReq) Reset() { *m = SetMessageReact func (m *SetMessageReactionExtensionsReq) String() string { return proto.CompactTextString(m) } func (*SetMessageReactionExtensionsReq) ProtoMessage() {} func (*SetMessageReactionExtensionsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{23} + return fileDescriptor_msg_bafb742f07ab638a, []int{23} } func (m *SetMessageReactionExtensionsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetMessageReactionExtensionsReq.Unmarshal(m, b) @@ -1461,7 +1461,7 @@ func (m *SetMessageReactionExtensionsResp) Reset() { *m = SetMessageReac func (m *SetMessageReactionExtensionsResp) String() string { return proto.CompactTextString(m) } func (*SetMessageReactionExtensionsResp) ProtoMessage() {} func (*SetMessageReactionExtensionsResp) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{24} + return fileDescriptor_msg_bafb742f07ab638a, []int{24} } func (m *SetMessageReactionExtensionsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetMessageReactionExtensionsResp.Unmarshal(m, b) @@ -1523,13 +1523,210 @@ func (m *SetMessageReactionExtensionsResp) GetResult() []*KeyValueResp { return nil } +type AddMessageReactionExtensionsReq struct { + OperationID string `protobuf:"bytes,1,opt,name=operationID" json:"operationID,omitempty"` + SourceID string `protobuf:"bytes,2,opt,name=sourceID" json:"sourceID,omitempty"` + OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` + SessionType int32 `protobuf:"varint,4,opt,name=sessionType" json:"sessionType,omitempty"` + ReactionExtensionList map[string]*sdk_ws.KeyValue `protobuf:"bytes,5,rep,name=reactionExtensionList" json:"reactionExtensionList,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + ClientMsgID string `protobuf:"bytes,6,opt,name=clientMsgID" json:"clientMsgID,omitempty"` + Ex *wrapperspb.StringValue `protobuf:"bytes,7,opt,name=ex" json:"ex,omitempty"` + AttachedInfo *wrapperspb.StringValue `protobuf:"bytes,8,opt,name=attachedInfo" json:"attachedInfo,omitempty"` + IsReact bool `protobuf:"varint,9,opt,name=isReact" json:"isReact,omitempty"` + IsExternalExtensions bool `protobuf:"varint,10,opt,name=isExternalExtensions" json:"isExternalExtensions,omitempty"` + MsgFirstModifyTime int64 `protobuf:"varint,11,opt,name=msgFirstModifyTime" json:"msgFirstModifyTime,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *AddMessageReactionExtensionsReq) Reset() { *m = AddMessageReactionExtensionsReq{} } +func (m *AddMessageReactionExtensionsReq) String() string { return proto.CompactTextString(m) } +func (*AddMessageReactionExtensionsReq) ProtoMessage() {} +func (*AddMessageReactionExtensionsReq) Descriptor() ([]byte, []int) { + return fileDescriptor_msg_bafb742f07ab638a, []int{25} +} +func (m *AddMessageReactionExtensionsReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_AddMessageReactionExtensionsReq.Unmarshal(m, b) +} +func (m *AddMessageReactionExtensionsReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_AddMessageReactionExtensionsReq.Marshal(b, m, deterministic) +} +func (dst *AddMessageReactionExtensionsReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_AddMessageReactionExtensionsReq.Merge(dst, src) +} +func (m *AddMessageReactionExtensionsReq) XXX_Size() int { + return xxx_messageInfo_AddMessageReactionExtensionsReq.Size(m) +} +func (m *AddMessageReactionExtensionsReq) XXX_DiscardUnknown() { + xxx_messageInfo_AddMessageReactionExtensionsReq.DiscardUnknown(m) +} + +var xxx_messageInfo_AddMessageReactionExtensionsReq proto.InternalMessageInfo + +func (m *AddMessageReactionExtensionsReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +func (m *AddMessageReactionExtensionsReq) GetSourceID() string { + if m != nil { + return m.SourceID + } + return "" +} + +func (m *AddMessageReactionExtensionsReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + +func (m *AddMessageReactionExtensionsReq) GetSessionType() int32 { + if m != nil { + return m.SessionType + } + return 0 +} + +func (m *AddMessageReactionExtensionsReq) GetReactionExtensionList() map[string]*sdk_ws.KeyValue { + if m != nil { + return m.ReactionExtensionList + } + return nil +} + +func (m *AddMessageReactionExtensionsReq) GetClientMsgID() string { + if m != nil { + return m.ClientMsgID + } + return "" +} + +func (m *AddMessageReactionExtensionsReq) GetEx() *wrapperspb.StringValue { + if m != nil { + return m.Ex + } + return nil +} + +func (m *AddMessageReactionExtensionsReq) GetAttachedInfo() *wrapperspb.StringValue { + if m != nil { + return m.AttachedInfo + } + return nil +} + +func (m *AddMessageReactionExtensionsReq) GetIsReact() bool { + if m != nil { + return m.IsReact + } + return false +} + +func (m *AddMessageReactionExtensionsReq) GetIsExternalExtensions() bool { + if m != nil { + return m.IsExternalExtensions + } + return false +} + +func (m *AddMessageReactionExtensionsReq) GetMsgFirstModifyTime() int64 { + if m != nil { + return m.MsgFirstModifyTime + } + return 0 +} + +type AddMessageReactionExtensionsResp struct { + ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` + ClientMsgID string `protobuf:"bytes,3,opt,name=clientMsgID" json:"clientMsgID,omitempty"` + MsgFirstModifyTime int64 `protobuf:"varint,4,opt,name=msgFirstModifyTime" json:"msgFirstModifyTime,omitempty"` + IsReact bool `protobuf:"varint,5,opt,name=isReact" json:"isReact,omitempty"` + Result []*KeyValueResp `protobuf:"bytes,6,rep,name=result" json:"result,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *AddMessageReactionExtensionsResp) Reset() { *m = AddMessageReactionExtensionsResp{} } +func (m *AddMessageReactionExtensionsResp) String() string { return proto.CompactTextString(m) } +func (*AddMessageReactionExtensionsResp) ProtoMessage() {} +func (*AddMessageReactionExtensionsResp) Descriptor() ([]byte, []int) { + return fileDescriptor_msg_bafb742f07ab638a, []int{26} +} +func (m *AddMessageReactionExtensionsResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_AddMessageReactionExtensionsResp.Unmarshal(m, b) +} +func (m *AddMessageReactionExtensionsResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_AddMessageReactionExtensionsResp.Marshal(b, m, deterministic) +} +func (dst *AddMessageReactionExtensionsResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_AddMessageReactionExtensionsResp.Merge(dst, src) +} +func (m *AddMessageReactionExtensionsResp) XXX_Size() int { + return xxx_messageInfo_AddMessageReactionExtensionsResp.Size(m) +} +func (m *AddMessageReactionExtensionsResp) XXX_DiscardUnknown() { + xxx_messageInfo_AddMessageReactionExtensionsResp.DiscardUnknown(m) +} + +var xxx_messageInfo_AddMessageReactionExtensionsResp proto.InternalMessageInfo + +func (m *AddMessageReactionExtensionsResp) GetErrCode() int32 { + if m != nil { + return m.ErrCode + } + return 0 +} + +func (m *AddMessageReactionExtensionsResp) GetErrMsg() string { + if m != nil { + return m.ErrMsg + } + return "" +} + +func (m *AddMessageReactionExtensionsResp) GetClientMsgID() string { + if m != nil { + return m.ClientMsgID + } + return "" +} + +func (m *AddMessageReactionExtensionsResp) GetMsgFirstModifyTime() int64 { + if m != nil { + return m.MsgFirstModifyTime + } + return 0 +} + +func (m *AddMessageReactionExtensionsResp) GetIsReact() bool { + if m != nil { + return m.IsReact + } + return false +} + +func (m *AddMessageReactionExtensionsResp) GetResult() []*KeyValueResp { + if m != nil { + return m.Result + } + return nil +} + type GetMessageListReactionExtensionsReq struct { OperationID string `protobuf:"bytes,1,opt,name=operationID" json:"operationID,omitempty"` OpUserID string `protobuf:"bytes,2,opt,name=opUserID" json:"opUserID,omitempty"` SourceID string `protobuf:"bytes,3,opt,name=sourceID" json:"sourceID,omitempty"` SessionType int32 `protobuf:"varint,4,opt,name=sessionType" json:"sessionType,omitempty"` IsExternalExtensions bool `protobuf:"varint,5,opt,name=isExternalExtensions" json:"isExternalExtensions,omitempty"` - MessageReactionKeyList []*GetMessageListReactionExtensionsReq_MessageReactionKey `protobuf:"bytes,6,rep,name=messageReactionKeyList" json:"messageReactionKeyList,omitempty"` + TypeKeyList []string `protobuf:"bytes,6,rep,name=typeKeyList" json:"typeKeyList,omitempty"` + MessageReactionKeyList []*GetMessageListReactionExtensionsReq_MessageReactionKey `protobuf:"bytes,7,rep,name=messageReactionKeyList" json:"messageReactionKeyList,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1539,7 +1736,7 @@ func (m *GetMessageListReactionExtensionsReq) Reset() { *m = GetMessageL func (m *GetMessageListReactionExtensionsReq) String() string { return proto.CompactTextString(m) } func (*GetMessageListReactionExtensionsReq) ProtoMessage() {} func (*GetMessageListReactionExtensionsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{25} + return fileDescriptor_msg_bafb742f07ab638a, []int{27} } func (m *GetMessageListReactionExtensionsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMessageListReactionExtensionsReq.Unmarshal(m, b) @@ -1594,6 +1791,13 @@ func (m *GetMessageListReactionExtensionsReq) GetIsExternalExtensions() bool { return false } +func (m *GetMessageListReactionExtensionsReq) GetTypeKeyList() []string { + if m != nil { + return m.TypeKeyList + } + return nil +} + func (m *GetMessageListReactionExtensionsReq) GetMessageReactionKeyList() []*GetMessageListReactionExtensionsReq_MessageReactionKey { if m != nil { return m.MessageReactionKeyList @@ -1617,7 +1821,7 @@ func (m *GetMessageListReactionExtensionsReq_MessageReactionKey) String() string } func (*GetMessageListReactionExtensionsReq_MessageReactionKey) ProtoMessage() {} func (*GetMessageListReactionExtensionsReq_MessageReactionKey) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{25, 0} + return fileDescriptor_msg_bafb742f07ab638a, []int{27, 0} } func (m *GetMessageListReactionExtensionsReq_MessageReactionKey) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMessageListReactionExtensionsReq_MessageReactionKey.Unmarshal(m, b) @@ -1664,7 +1868,7 @@ func (m *GetMessageListReactionExtensionsResp) Reset() { *m = GetMessage func (m *GetMessageListReactionExtensionsResp) String() string { return proto.CompactTextString(m) } func (*GetMessageListReactionExtensionsResp) ProtoMessage() {} func (*GetMessageListReactionExtensionsResp) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{26} + return fileDescriptor_msg_bafb742f07ab638a, []int{28} } func (m *GetMessageListReactionExtensionsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMessageListReactionExtensionsResp.Unmarshal(m, b) @@ -1719,7 +1923,7 @@ func (m *SingleMessageExtensionResult) Reset() { *m = SingleMessageExten func (m *SingleMessageExtensionResult) String() string { return proto.CompactTextString(m) } func (*SingleMessageExtensionResult) ProtoMessage() {} func (*SingleMessageExtensionResult) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{27} + return fileDescriptor_msg_bafb742f07ab638a, []int{29} } func (m *SingleMessageExtensionResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SingleMessageExtensionResult.Unmarshal(m, b) @@ -1781,7 +1985,7 @@ func (m *ModifyMessageReactionExtensionsResp) Reset() { *m = ModifyMessa func (m *ModifyMessageReactionExtensionsResp) String() string { return proto.CompactTextString(m) } func (*ModifyMessageReactionExtensionsResp) ProtoMessage() {} func (*ModifyMessageReactionExtensionsResp) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{28} + return fileDescriptor_msg_bafb742f07ab638a, []int{30} } func (m *ModifyMessageReactionExtensionsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ModifyMessageReactionExtensionsResp.Unmarshal(m, b) @@ -1849,7 +2053,7 @@ func (m *DeleteMessageListReactionExtensionsReq) Reset() { func (m *DeleteMessageListReactionExtensionsReq) String() string { return proto.CompactTextString(m) } func (*DeleteMessageListReactionExtensionsReq) ProtoMessage() {} func (*DeleteMessageListReactionExtensionsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{29} + return fileDescriptor_msg_bafb742f07ab638a, []int{31} } func (m *DeleteMessageListReactionExtensionsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteMessageListReactionExtensionsReq.Unmarshal(m, b) @@ -1940,7 +2144,7 @@ func (m *DeleteMessageListReactionExtensionsResp) Reset() { func (m *DeleteMessageListReactionExtensionsResp) String() string { return proto.CompactTextString(m) } func (*DeleteMessageListReactionExtensionsResp) ProtoMessage() {} func (*DeleteMessageListReactionExtensionsResp) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{30} + return fileDescriptor_msg_bafb742f07ab638a, []int{32} } func (m *DeleteMessageListReactionExtensionsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteMessageListReactionExtensionsResp.Unmarshal(m, b) @@ -1994,7 +2198,7 @@ func (m *ExtendMsgResp) Reset() { *m = ExtendMsgResp{} } func (m *ExtendMsgResp) String() string { return proto.CompactTextString(m) } func (*ExtendMsgResp) ProtoMessage() {} func (*ExtendMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{31} + return fileDescriptor_msg_bafb742f07ab638a, []int{33} } func (m *ExtendMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExtendMsgResp.Unmarshal(m, b) @@ -2050,7 +2254,7 @@ func (m *ExtendMsg) Reset() { *m = ExtendMsg{} } func (m *ExtendMsg) String() string { return proto.CompactTextString(m) } func (*ExtendMsg) ProtoMessage() {} func (*ExtendMsg) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{32} + return fileDescriptor_msg_bafb742f07ab638a, []int{34} } func (m *ExtendMsg) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExtendMsg.Unmarshal(m, b) @@ -2118,7 +2322,7 @@ func (m *KeyValueResp) Reset() { *m = KeyValueResp{} } func (m *KeyValueResp) String() string { return proto.CompactTextString(m) } func (*KeyValueResp) ProtoMessage() {} func (*KeyValueResp) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{33} + return fileDescriptor_msg_bafb742f07ab638a, []int{35} } func (m *KeyValueResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KeyValueResp.Unmarshal(m, b) @@ -2172,7 +2376,7 @@ func (m *MsgDataToModifyByMQ) Reset() { *m = MsgDataToModifyByMQ{} } func (m *MsgDataToModifyByMQ) String() string { return proto.CompactTextString(m) } func (*MsgDataToModifyByMQ) ProtoMessage() {} func (*MsgDataToModifyByMQ) Descriptor() ([]byte, []int) { - return fileDescriptor_msg_24cf87b309a51053, []int{34} + return fileDescriptor_msg_bafb742f07ab638a, []int{36} } func (m *MsgDataToModifyByMQ) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgDataToModifyByMQ.Unmarshal(m, b) @@ -2241,6 +2445,9 @@ func init() { proto.RegisterType((*SetMessageReactionExtensionsReq)(nil), "msg.SetMessageReactionExtensionsReq") proto.RegisterMapType((map[string]*sdk_ws.KeyValue)(nil), "msg.SetMessageReactionExtensionsReq.ReactionExtensionListEntry") proto.RegisterType((*SetMessageReactionExtensionsResp)(nil), "msg.SetMessageReactionExtensionsResp") + proto.RegisterType((*AddMessageReactionExtensionsReq)(nil), "msg.AddMessageReactionExtensionsReq") + proto.RegisterMapType((map[string]*sdk_ws.KeyValue)(nil), "msg.AddMessageReactionExtensionsReq.ReactionExtensionListEntry") + proto.RegisterType((*AddMessageReactionExtensionsResp)(nil), "msg.AddMessageReactionExtensionsResp") proto.RegisterType((*GetMessageListReactionExtensionsReq)(nil), "msg.GetMessageListReactionExtensionsReq") proto.RegisterType((*GetMessageListReactionExtensionsReq_MessageReactionKey)(nil), "msg.GetMessageListReactionExtensionsReq.MessageReactionKey") proto.RegisterType((*GetMessageListReactionExtensionsResp)(nil), "msg.GetMessageListReactionExtensionsResp") @@ -2281,7 +2488,7 @@ type MsgClient interface { // modify msg SetMessageReactionExtensions(ctx context.Context, in *SetMessageReactionExtensionsReq, opts ...grpc.CallOption) (*SetMessageReactionExtensionsResp, error) GetMessageListReactionExtensions(ctx context.Context, in *GetMessageListReactionExtensionsReq, opts ...grpc.CallOption) (*GetMessageListReactionExtensionsResp, error) - AddMessageReactionExtensions(ctx context.Context, in *ModifyMessageReactionExtensionsReq, opts ...grpc.CallOption) (*ModifyMessageReactionExtensionsResp, error) + AddMessageReactionExtensions(ctx context.Context, in *AddMessageReactionExtensionsReq, opts ...grpc.CallOption) (*AddMessageReactionExtensionsResp, error) DeleteMessageReactionExtensions(ctx context.Context, in *DeleteMessageListReactionExtensionsReq, opts ...grpc.CallOption) (*DeleteMessageListReactionExtensionsResp, error) } @@ -2410,8 +2617,8 @@ func (c *msgClient) GetMessageListReactionExtensions(ctx context.Context, in *Ge return out, nil } -func (c *msgClient) AddMessageReactionExtensions(ctx context.Context, in *ModifyMessageReactionExtensionsReq, opts ...grpc.CallOption) (*ModifyMessageReactionExtensionsResp, error) { - out := new(ModifyMessageReactionExtensionsResp) +func (c *msgClient) AddMessageReactionExtensions(ctx context.Context, in *AddMessageReactionExtensionsReq, opts ...grpc.CallOption) (*AddMessageReactionExtensionsResp, error) { + out := new(AddMessageReactionExtensionsResp) err := grpc.Invoke(ctx, "/msg.msg/AddMessageReactionExtensions", in, out, c.cc, opts...) if err != nil { return nil, err @@ -2445,7 +2652,7 @@ type MsgServer interface { // modify msg SetMessageReactionExtensions(context.Context, *SetMessageReactionExtensionsReq) (*SetMessageReactionExtensionsResp, error) GetMessageListReactionExtensions(context.Context, *GetMessageListReactionExtensionsReq) (*GetMessageListReactionExtensionsResp, error) - AddMessageReactionExtensions(context.Context, *ModifyMessageReactionExtensionsReq) (*ModifyMessageReactionExtensionsResp, error) + AddMessageReactionExtensions(context.Context, *AddMessageReactionExtensionsReq) (*AddMessageReactionExtensionsResp, error) DeleteMessageReactionExtensions(context.Context, *DeleteMessageListReactionExtensionsReq) (*DeleteMessageListReactionExtensionsResp, error) } @@ -2688,7 +2895,7 @@ func _Msg_GetMessageListReactionExtensions_Handler(srv interface{}, ctx context. } func _Msg_AddMessageReactionExtensions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ModifyMessageReactionExtensionsReq) + in := new(AddMessageReactionExtensionsReq) if err := dec(in); err != nil { return nil, err } @@ -2700,7 +2907,7 @@ func _Msg_AddMessageReactionExtensions_Handler(srv interface{}, ctx context.Cont FullMethod: "/msg.msg/AddMessageReactionExtensions", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).AddMessageReactionExtensions(ctx, req.(*ModifyMessageReactionExtensionsReq)) + return srv.(MsgServer).AddMessageReactionExtensions(ctx, req.(*AddMessageReactionExtensionsReq)) } return interceptor(ctx, in, info, handler) } @@ -2792,114 +2999,116 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ Metadata: "msg/msg.proto", } -func init() { proto.RegisterFile("msg/msg.proto", fileDescriptor_msg_24cf87b309a51053) } +func init() { proto.RegisterFile("msg/msg.proto", fileDescriptor_msg_bafb742f07ab638a) } -var fileDescriptor_msg_24cf87b309a51053 = []byte{ - // 1683 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0x4f, 0x6f, 0xdb, 0x46, +var fileDescriptor_msg_bafb742f07ab638a = []byte{ + // 1720 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0x4f, 0x6f, 0xdb, 0x46, 0x16, 0x07, 0x49, 0x4b, 0xb6, 0x9f, 0xec, 0xd8, 0x19, 0x3b, 0x5e, 0x85, 0x31, 0x10, 0x85, 0xf9, - 0xa7, 0x6c, 0x12, 0x19, 0xeb, 0x5d, 0x20, 0x8b, 0xcd, 0x02, 0x9b, 0x38, 0xf2, 0x2a, 0x46, 0x96, - 0xeb, 0x98, 0xf2, 0x6e, 0x81, 0xf6, 0xe0, 0x30, 0xd2, 0x98, 0x21, 0x2c, 0x91, 0x34, 0x87, 0x8a, - 0xad, 0xfe, 0xbb, 0xb5, 0x28, 0x50, 0xe4, 0xd0, 0x63, 0x4f, 0xbd, 0xf5, 0xd6, 0x4b, 0xbf, 0x41, - 0x3f, 0x40, 0xd1, 0x0f, 0xd2, 0xcf, 0x50, 0xa0, 0x98, 0x19, 0x4a, 0x1a, 0xfe, 0x93, 0x68, 0xb9, - 0x08, 0x52, 0xa0, 0x37, 0xbd, 0x99, 0x37, 0x6f, 0xde, 0xef, 0xbd, 0xdf, 0xbc, 0x19, 0x3e, 0xc1, - 0x62, 0x97, 0x58, 0x1b, 0x5d, 0x62, 0xd5, 0x3c, 0xdf, 0x0d, 0x5c, 0xa4, 0x74, 0x89, 0xa5, 0x56, - 0x77, 0x3d, 0xec, 0xdc, 0xdf, 0xd1, 0xef, 0x37, 0xb1, 0xff, 0x1a, 0xfb, 0x1b, 0xde, 0x91, 0xb5, - 0xc1, 0xa6, 0x37, 0x48, 0xfb, 0xe8, 0xe0, 0x84, 0x6c, 0x9c, 0x10, 0xae, 0xae, 0xd6, 0x26, 0x6a, - 0xfa, 0xa6, 0xe7, 0x61, 0x3f, 0xd4, 0xd7, 0x3e, 0x82, 0x92, 0x4e, 0xac, 0xba, 0x19, 0x98, 0xfb, - 0xae, 0xbe, 0x87, 0x56, 0xa1, 0x10, 0xb8, 0x47, 0xd8, 0x29, 0x4b, 0x15, 0xa9, 0x3a, 0x6f, 0x70, - 0x01, 0x55, 0xa0, 0xe4, 0x7a, 0xd8, 0x37, 0x03, 0xdb, 0x75, 0x76, 0xea, 0x65, 0x99, 0xcd, 0x89, - 0x43, 0xe8, 0x6f, 0x30, 0xdb, 0xe5, 0x66, 0xca, 0x4a, 0x45, 0xaa, 0x96, 0x36, 0xd5, 0x1a, 0x61, - 0x0e, 0x1c, 0x98, 0x9e, 0x7d, 0xe0, 0x99, 0xbe, 0xd9, 0x25, 0xb5, 0x70, 0x23, 0x63, 0xa0, 0xaa, - 0x61, 0x61, 0xf3, 0xfa, 0x96, 0x68, 0x44, 0xca, 0x6d, 0x64, 0xb2, 0x73, 0xda, 0x1b, 0x09, 0x96, - 0x9e, 0xf7, 0xc8, 0x2b, 0x11, 0x68, 0x05, 0x4a, 0xbb, 0xc2, 0x2a, 0x0e, 0x57, 0x1c, 0x12, 0xbd, - 0x91, 0xf3, 0x7b, 0xa3, 0xc1, 0x82, 0xd7, 0x23, 0xaf, 0xf6, 0xdd, 0xff, 0x11, 0xec, 0xef, 0xd4, - 0x59, 0x34, 0xe6, 0x8d, 0xc8, 0x98, 0xf6, 0xad, 0x04, 0x68, 0xe4, 0x8b, 0xeb, 0x58, 0xee, 0x56, - 0x5f, 0xdf, 0x43, 0x65, 0x98, 0xed, 0x98, 0x24, 0x68, 0xe2, 0x63, 0xe6, 0xce, 0x8c, 0x31, 0x10, - 0xd1, 0x0d, 0x58, 0x34, 0x2d, 0xcb, 0xc7, 0x56, 0x14, 0x64, 0x74, 0x10, 0x6d, 0x42, 0xa9, 0x8b, - 0x09, 0x31, 0x2d, 0xfc, 0x1f, 0x9b, 0x04, 0x65, 0xa5, 0xa2, 0x54, 0x4b, 0x9b, 0xcb, 0x35, 0x4a, - 0x25, 0x01, 0xb9, 0x21, 0x2a, 0xa1, 0x75, 0x98, 0x0f, 0x7c, 0xdb, 0xb2, 0x98, 0xaf, 0x33, 0xcc, - 0xea, 0x68, 0x40, 0xfb, 0x2f, 0xa0, 0x06, 0x0e, 0x74, 0xf3, 0xf4, 0xb1, 0xd3, 0xd6, 0x6d, 0xa7, - 0x89, 0x8f, 0x0d, 0x7c, 0x8c, 0xd6, 0xa0, 0x18, 0x82, 0xe3, 0x51, 0x0b, 0xa5, 0x78, 0x48, 0xe5, - 0x44, 0x48, 0xb5, 0x13, 0x58, 0x49, 0xd8, 0x23, 0x1e, 0x05, 0xbe, 0xed, 0xfb, 0x4f, 0xdc, 0x36, - 0x66, 0x16, 0x0b, 0xc6, 0x40, 0xa4, 0x5b, 0x6d, 0xfb, 0xbe, 0x4e, 0xac, 0xd0, 0x5a, 0x28, 0xd1, - 0x71, 0xdd, 0x3c, 0xa5, 0x91, 0xa2, 0xf1, 0x5d, 0x34, 0x42, 0x89, 0x8d, 0x33, 0xbb, 0x0c, 0x0b, - 0x1d, 0x67, 0x92, 0xf6, 0x21, 0x40, 0x13, 0x3b, 0x6d, 0x9d, 0x58, 0x14, 0xc0, 0xdb, 0x25, 0xf9, - 0x37, 0x12, 0x94, 0x86, 0x9b, 0x73, 0xb4, 0x38, 0x8a, 0x16, 0x8f, 0xd0, 0xe2, 0x08, 0x5a, 0x2e, - 0x51, 0xcf, 0xf8, 0x3e, 0x3a, 0xb1, 0x86, 0x69, 0x12, 0x87, 0xa8, 0x46, 0xab, 0x63, 0x63, 0x27, - 0xe0, 0x1a, 0x05, 0xae, 0x21, 0x0c, 0x21, 0x15, 0xe6, 0x08, 0x76, 0xda, 0xfb, 0x76, 0x17, 0x97, - 0x8b, 0x15, 0xa9, 0xaa, 0x18, 0x43, 0x59, 0x6b, 0x41, 0xe9, 0x49, 0x07, 0x9b, 0x7e, 0x18, 0x9e, - 0x35, 0x28, 0xf6, 0x22, 0xf9, 0xe5, 0x12, 0x35, 0xe1, 0x7a, 0x61, 0xe6, 0xb9, 0x83, 0x43, 0x39, - 0x1e, 0x3c, 0x25, 0x79, 0x08, 0x1f, 0xc1, 0xc2, 0x68, 0x93, 0x69, 0xc2, 0xa0, 0x7d, 0x2d, 0xc1, - 0x52, 0x13, 0x53, 0x3c, 0x11, 0x2e, 0xa6, 0xfa, 0x5a, 0x86, 0x59, 0xcb, 0x77, 0x7b, 0xde, 0xd0, - 0xd5, 0x81, 0x48, 0x57, 0x74, 0x39, 0x45, 0x42, 0xea, 0x70, 0x29, 0x8e, 0x60, 0x26, 0x99, 0x7e, - 0x11, 0x7f, 0x21, 0x8a, 0x5f, 0xab, 0xc3, 0x72, 0xd4, 0xb5, 0xa9, 0x10, 0xee, 0xc2, 0x4a, 0x13, - 0x07, 0x21, 0x59, 0x9a, 0x81, 0x19, 0xf4, 0x88, 0x91, 0x74, 0x4d, 0x4a, 0xba, 0xb6, 0x06, 0x45, - 0xc2, 0xd4, 0x99, 0xc1, 0x82, 0x11, 0x4a, 0xda, 0x53, 0x58, 0x4d, 0x1a, 0x9c, 0xca, 0xb5, 0x07, - 0xec, 0xe8, 0x9e, 0xdd, 0x35, 0xed, 0x05, 0xac, 0x36, 0x7e, 0x13, 0x17, 0x04, 0x90, 0x4a, 0x04, - 0xe4, 0x67, 0x12, 0xac, 0xd4, 0x71, 0xa7, 0xd9, 0xf3, 0xb0, 0xdf, 0xa0, 0x59, 0x0e, 0x79, 0x2c, - 0xe6, 0x4b, 0x8a, 0xf1, 0x75, 0xc4, 0x1b, 0x39, 0x8b, 0x37, 0x4a, 0x94, 0x37, 0x13, 0xf9, 0x41, - 0x83, 0x9d, 0x74, 0x63, 0xaa, 0x60, 0xb7, 0x78, 0xb0, 0xe3, 0x80, 0x26, 0xf3, 0x60, 0x19, 0x14, - 0xca, 0x6c, 0x99, 0x31, 0x9b, 0xfe, 0xcc, 0x06, 0xa4, 0x7d, 0xca, 0x13, 0x73, 0x7e, 0x77, 0xa7, - 0xac, 0x8b, 0x4f, 0xd9, 0xe5, 0xf2, 0x9e, 0x6f, 0x07, 0xb8, 0x6e, 0x1f, 0x1e, 0x4e, 0x8f, 0x51, - 0xfb, 0x84, 0x85, 0x2b, 0x6a, 0xe9, 0x2d, 0x02, 0xf9, 0xaa, 0x00, 0x9a, 0xee, 0xb6, 0xed, 0xc3, - 0xbe, 0xce, 0x6f, 0x56, 0x03, 0x9b, 0x2d, 0xea, 0xec, 0xf6, 0x69, 0x80, 0x1d, 0x62, 0xbb, 0x4e, - 0xce, 0x53, 0x4c, 0x6b, 0xb4, 0xdb, 0xf3, 0x5b, 0x78, 0x54, 0x60, 0x07, 0x72, 0x84, 0xcc, 0x4a, - 0xb2, 0xf8, 0x12, 0x4c, 0xe8, 0x46, 0xfb, 0x7d, 0x0f, 0x33, 0x6a, 0x16, 0x0c, 0x71, 0x08, 0x9d, - 0xc2, 0x25, 0x3f, 0xee, 0x14, 0x7b, 0x24, 0x14, 0xd8, 0x23, 0x61, 0x8b, 0x3f, 0x12, 0x26, 0x62, - 0xa8, 0x19, 0x69, 0x46, 0xb6, 0x9d, 0xc0, 0xef, 0x1b, 0xe9, 0x1b, 0xc4, 0x6f, 0xa6, 0x62, 0xf2, - 0x66, 0xba, 0x07, 0x32, 0x3e, 0x2d, 0xcf, 0xb2, 0x78, 0xaf, 0xd7, 0x2c, 0xd7, 0xb5, 0x3a, 0x98, - 0x3f, 0x4e, 0x5f, 0xf6, 0x0e, 0x6b, 0xcd, 0xc0, 0xb7, 0x1d, 0xeb, 0xff, 0x66, 0xa7, 0x87, 0x0d, - 0x19, 0x9f, 0xa2, 0x47, 0xb0, 0x60, 0x06, 0x81, 0xd9, 0x7a, 0x85, 0xdb, 0x3b, 0xce, 0xa1, 0x5b, - 0x9e, 0xcb, 0xb1, 0x2e, 0xb2, 0x82, 0xd2, 0xc2, 0x26, 0x0c, 0x48, 0x79, 0xbe, 0x22, 0x55, 0xe7, - 0x8c, 0x81, 0x88, 0x36, 0x61, 0xd5, 0x26, 0xd4, 0x7d, 0xdf, 0x31, 0x3b, 0x23, 0xe0, 0x65, 0x60, - 0x6a, 0xa9, 0x73, 0xa8, 0x06, 0xa8, 0x4b, 0xac, 0x7f, 0xdb, 0x3e, 0x09, 0x78, 0xfc, 0xd8, 0x0d, - 0x5b, 0x62, 0x37, 0x6c, 0xca, 0x8c, 0x8a, 0x41, 0xcd, 0x0e, 0x22, 0xe5, 0xf6, 0x11, 0xee, 0x87, - 0xdc, 0xa0, 0x3f, 0xd1, 0x5f, 0xa0, 0xf0, 0x9a, 0x82, 0x08, 0xdf, 0xa0, 0x57, 0x52, 0x08, 0xf9, - 0x0c, 0xf7, 0x39, 0x4e, 0xae, 0xf9, 0x0f, 0xf9, 0xef, 0x92, 0xf6, 0x65, 0x01, 0xae, 0xd2, 0x0b, - 0xe9, 0x5d, 0x25, 0x64, 0x6f, 0x3c, 0x21, 0xff, 0xc5, 0x08, 0x39, 0x01, 0xc0, 0x1f, 0x6c, 0xfc, - 0xbd, 0xb0, 0xf1, 0x67, 0x09, 0x2a, 0xe3, 0x93, 0x39, 0xed, 0xbb, 0x58, 0xcc, 0xa6, 0x92, 0xcc, - 0x66, 0x7a, 0x3c, 0x66, 0xb2, 0xe2, 0x21, 0x66, 0xa3, 0x10, 0xcd, 0xc6, 0x1d, 0x28, 0xfa, 0x98, - 0xf4, 0x3a, 0x41, 0xb9, 0xc8, 0x18, 0x7a, 0x91, 0x31, 0x74, 0x08, 0x16, 0x13, 0xcf, 0x08, 0x15, - 0xb4, 0xef, 0x15, 0xb8, 0xde, 0x18, 0xa2, 0xa5, 0xe1, 0x3c, 0xc7, 0xf9, 0xcb, 0x7c, 0x71, 0x8b, - 0x67, 0x53, 0x89, 0x9d, 0xcd, 0xc9, 0xe7, 0x2f, 0x8b, 0x5c, 0x85, 0x31, 0xe4, 0x22, 0xb0, 0xd6, - 0x8d, 0x66, 0xf0, 0x19, 0xee, 0xb3, 0x43, 0xcb, 0x43, 0xf2, 0x90, 0x85, 0x24, 0x07, 0xf2, 0x9a, - 0x9e, 0x30, 0x63, 0x64, 0x98, 0x56, 0x0f, 0x01, 0x25, 0xb5, 0xe3, 0x99, 0x97, 0xf2, 0x66, 0x5e, - 0xce, 0xca, 0xbc, 0xf6, 0x9d, 0x04, 0x37, 0x26, 0xbb, 0x3e, 0x15, 0x4d, 0x9b, 0xb0, 0x42, 0x6c, - 0xc7, 0xea, 0xe0, 0x21, 0x10, 0xc6, 0x23, 0xfe, 0x7d, 0x7e, 0x8d, 0x57, 0x3a, 0x71, 0x7e, 0xb8, - 0x21, 0x57, 0x34, 0xd2, 0x56, 0x6b, 0x3f, 0xca, 0xb0, 0x3e, 0x6e, 0xd5, 0x14, 0x7e, 0xfa, 0x59, - 0x35, 0x99, 0x7b, 0xfa, 0xcf, 0x89, 0x9e, 0x9e, 0xbf, 0x20, 0xcf, 0x24, 0x12, 0xf9, 0xb6, 0x4a, - 0xd4, 0x0f, 0x12, 0x5c, 0x9f, 0xf8, 0x00, 0x9a, 0xf2, 0x51, 0x59, 0x22, 0xbd, 0x56, 0x0b, 0x13, - 0x22, 0x04, 0x13, 0xb1, 0x60, 0x32, 0xdb, 0x83, 0xc6, 0x80, 0x21, 0xaa, 0xa1, 0x4d, 0x80, 0x43, - 0xd3, 0xee, 0xe0, 0x36, 0x5b, 0x34, 0x93, 0xb9, 0x48, 0xd0, 0xd2, 0x7e, 0x91, 0xe1, 0x56, 0x1d, - 0x77, 0x70, 0x80, 0xdf, 0xe9, 0xda, 0x33, 0xb9, 0x59, 0x91, 0x55, 0x9d, 0x8a, 0x67, 0xbe, 0xfa, - 0x66, 0x33, 0x4b, 0xfd, 0x5e, 0x16, 0xdb, 0xe7, 0x58, 0xac, 0xc7, 0xf2, 0x26, 0x7d, 0xa5, 0xf6, - 0xb9, 0x04, 0xb7, 0x73, 0xc5, 0x7f, 0x2a, 0x1e, 0x9d, 0xe1, 0x06, 0x72, 0x61, 0x31, 0xc2, 0x12, - 0x74, 0x0f, 0xe6, 0xf1, 0x60, 0x20, 0xec, 0xad, 0x5e, 0x88, 0x91, 0x69, 0xa4, 0x20, 0xfa, 0x26, - 0x67, 0xf9, 0xa6, 0x44, 0x3e, 0x58, 0x7f, 0x92, 0x61, 0x7e, 0x68, 0x0a, 0x1d, 0x64, 0x85, 0x56, - 0x62, 0x8e, 0xdf, 0x89, 0xee, 0x7c, 0xfe, 0xaa, 0x21, 0xe7, 0x2d, 0xff, 0x4a, 0x26, 0x1b, 0xb4, - 0xd8, 0x43, 0x8e, 0x17, 0xa2, 0xe8, 0x53, 0xed, 0x02, 0x7b, 0x1a, 0x72, 0xba, 0xca, 0xf8, 0x54, - 0xfd, 0xe0, 0x8c, 0x95, 0xe9, 0x76, 0xb4, 0x32, 0xa5, 0xe4, 0x4f, 0xa8, 0x47, 0x7d, 0x58, 0x10, - 0xa7, 0xd0, 0x03, 0x98, 0x3b, 0x0a, 0xe5, 0x30, 0x81, 0x63, 0x19, 0x3a, 0x54, 0x9e, 0x22, 0x99, - 0x6f, 0x24, 0x58, 0x11, 0xda, 0xd3, 0x34, 0x46, 0xac, 0x3f, 0x9d, 0xe8, 0x42, 0x4b, 0x39, 0xba, - 0xd0, 0xf2, 0x99, 0xbb, 0xd0, 0x4a, 0xac, 0x0b, 0xbd, 0xf9, 0x05, 0x80, 0xd2, 0x25, 0x16, 0x7a, - 0x01, 0x4b, 0xb1, 0xee, 0x31, 0xba, 0x99, 0x12, 0x83, 0x64, 0xc7, 0x5a, 0xbd, 0x95, 0x47, 0x8d, - 0x78, 0xc8, 0x85, 0xd5, 0xe7, 0xbd, 0x4e, 0x27, 0x3c, 0xbd, 0x5b, 0xfd, 0x26, 0x3e, 0x66, 0xfe, - 0xfd, 0x39, 0x65, 0x7d, 0x9a, 0x22, 0xdd, 0xeb, 0x6e, 0x6e, 0x5d, 0x76, 0x2e, 0x67, 0xc3, 0xce, - 0x18, 0x5a, 0x0a, 0x3f, 0x79, 0x06, 0x5d, 0x6a, 0x75, 0x39, 0x3a, 0x40, 0x3c, 0xb4, 0x07, 0x50, - 0xc7, 0x1d, 0x9d, 0x58, 0xfc, 0x10, 0xa4, 0x6c, 0x34, 0x9a, 0xa6, 0x16, 0xae, 0x4d, 0xd0, 0x20, - 0x1e, 0x6a, 0xc0, 0x72, 0xbc, 0x67, 0x85, 0xca, 0x6c, 0xe3, 0x94, 0x8e, 0x9a, 0x7a, 0x39, 0x63, - 0x86, 0x78, 0x68, 0x03, 0xe6, 0x06, 0xed, 0x5d, 0xc4, 0x3d, 0x17, 0x5a, 0xca, 0xea, 0xc5, 0xd8, - 0x08, 0xf1, 0xd0, 0x43, 0x58, 0x10, 0x3b, 0xa6, 0x68, 0x75, 0xf8, 0xc9, 0x27, 0xf4, 0x77, 0xd5, - 0x4b, 0x29, 0xa3, 0xdc, 0xed, 0x78, 0x5f, 0x33, 0x74, 0x3b, 0xa5, 0x7f, 0x1a, 0xba, 0x9d, 0xda, - 0x08, 0x6d, 0xc0, 0x72, 0x23, 0xdd, 0x50, 0x23, 0xd3, 0x50, 0x63, 0x8c, 0xa1, 0x94, 0x40, 0xa6, - 0x74, 0xf2, 0x04, 0x43, 0x89, 0x40, 0xd6, 0x19, 0xcb, 0xc5, 0x66, 0x16, 0xfa, 0xd3, 0x40, 0x3b, - 0xd6, 0x2c, 0x53, 0xcb, 0xe9, 0x13, 0xc4, 0x43, 0x47, 0xb0, 0x3e, 0xee, 0x83, 0x0b, 0xdd, 0xc8, - 0xf3, 0x81, 0xad, 0xde, 0xcc, 0xa1, 0x45, 0x3c, 0x74, 0x02, 0x95, 0x49, 0x4f, 0x67, 0x54, 0xcd, - 0xfb, 0x71, 0xa0, 0xde, 0xc9, 0xa9, 0x49, 0x3c, 0x74, 0x0c, 0xeb, 0x8f, 0xdb, 0xed, 0x6c, 0x94, - 0xb7, 0x73, 0xf6, 0xb5, 0xd4, 0x6a, 0x3e, 0x45, 0xe2, 0xa1, 0x8f, 0xe1, 0x6a, 0xe4, 0x8a, 0x4f, - 0xd9, 0xf5, 0xee, 0xe0, 0x94, 0xe4, 0x78, 0x88, 0xa9, 0xf7, 0xf2, 0x2b, 0x13, 0x6f, 0xeb, 0xca, - 0xfb, 0x97, 0x77, 0x3d, 0xec, 0x1c, 0xec, 0xe8, 0xc2, 0x1f, 0xbb, 0x5d, 0x62, 0x3d, 0xec, 0x12, - 0xeb, 0x65, 0x91, 0x89, 0x7f, 0xfd, 0x35, 0x00, 0x00, 0xff, 0xff, 0x33, 0xaa, 0x7d, 0xf5, 0x41, - 0x1e, 0x00, 0x00, + 0xe7, 0x6c, 0x12, 0x19, 0xeb, 0x5d, 0x20, 0x8b, 0xcd, 0x02, 0x9b, 0x38, 0xf2, 0x2a, 0x46, 0x56, + 0xeb, 0x98, 0x72, 0x5b, 0xa0, 0x3d, 0x38, 0x8c, 0x34, 0x66, 0x08, 0x4b, 0x24, 0xcd, 0xa1, 0x62, + 0xab, 0xff, 0x0e, 0x05, 0xda, 0x4b, 0x91, 0x43, 0x8f, 0x3d, 0xf5, 0xd6, 0x5b, 0x3f, 0x44, 0x3f, + 0x40, 0xd1, 0x4b, 0xbf, 0x45, 0x3f, 0x43, 0x81, 0x62, 0x66, 0x28, 0x69, 0xf8, 0x4f, 0xa4, 0xe5, + 0x22, 0x48, 0x8a, 0xdc, 0xf4, 0x66, 0xde, 0xbc, 0x79, 0xbf, 0xf7, 0x7e, 0xf3, 0x87, 0xf3, 0x04, + 0xf3, 0x5d, 0x62, 0xae, 0x77, 0x89, 0x59, 0x75, 0x3d, 0xc7, 0x77, 0x90, 0xd2, 0x25, 0xa6, 0xba, + 0xb6, 0xe3, 0x62, 0xfb, 0xee, 0x76, 0xe3, 0x6e, 0x13, 0x7b, 0x2f, 0xb1, 0xb7, 0xee, 0x1e, 0x9a, + 0xeb, 0xac, 0x7b, 0x9d, 0xb4, 0x0f, 0xf7, 0x8f, 0xc9, 0xfa, 0x31, 0xe1, 0xea, 0x6a, 0x35, 0x53, + 0xd3, 0x33, 0x5c, 0x17, 0x7b, 0x81, 0xbe, 0xf6, 0x09, 0x94, 0x1a, 0xc4, 0xac, 0x19, 0xbe, 0xb1, + 0xe7, 0x34, 0x76, 0xd1, 0x32, 0x14, 0x7c, 0xe7, 0x10, 0xdb, 0x65, 0xa9, 0x22, 0xad, 0xcd, 0xea, + 0x5c, 0x40, 0x15, 0x28, 0x39, 0x2e, 0xf6, 0x0c, 0xdf, 0x72, 0xec, 0xed, 0x5a, 0x59, 0x66, 0x7d, + 0x62, 0x13, 0xfa, 0x07, 0x4c, 0x77, 0xb9, 0x99, 0xb2, 0x52, 0x91, 0xd6, 0x4a, 0x1b, 0x6a, 0x95, + 0x30, 0x07, 0xf6, 0x0d, 0xd7, 0xda, 0x77, 0x0d, 0xcf, 0xe8, 0x92, 0x6a, 0x30, 0x91, 0x3e, 0x50, + 0xd5, 0xb0, 0x30, 0x79, 0x6d, 0x53, 0x34, 0x22, 0xe5, 0x36, 0x92, 0xed, 0x9c, 0xf6, 0x4a, 0x82, + 0x85, 0xa7, 0x3d, 0xf2, 0x42, 0x04, 0x5a, 0x81, 0xd2, 0x8e, 0x30, 0x8a, 0xc3, 0x15, 0x9b, 0x44, + 0x6f, 0xe4, 0xfc, 0xde, 0x68, 0x30, 0xe7, 0xf6, 0xc8, 0x8b, 0x3d, 0xe7, 0x3d, 0x82, 0xbd, 0xed, + 0x1a, 0x8b, 0xc6, 0xac, 0x1e, 0x6a, 0xd3, 0xbe, 0x97, 0x00, 0x8d, 0x7c, 0x71, 0x6c, 0xd3, 0xd9, + 0xec, 0x37, 0x76, 0x51, 0x19, 0xa6, 0x3b, 0x06, 0xf1, 0x9b, 0xf8, 0x88, 0xb9, 0x33, 0xa5, 0x0f, + 0x44, 0x74, 0x0d, 0xe6, 0x0d, 0xd3, 0xf4, 0xb0, 0x19, 0x06, 0x19, 0x6e, 0x44, 0x1b, 0x50, 0xea, + 0x62, 0x42, 0x0c, 0x13, 0xff, 0xcf, 0x22, 0x7e, 0x59, 0xa9, 0x28, 0x6b, 0xa5, 0x8d, 0xc5, 0x2a, + 0xa5, 0x92, 0x80, 0x5c, 0x17, 0x95, 0xd0, 0x2a, 0xcc, 0xfa, 0x9e, 0x65, 0x9a, 0xcc, 0xd7, 0x29, + 0x66, 0x75, 0xd4, 0xa0, 0xfd, 0x1f, 0x50, 0x1d, 0xfb, 0x0d, 0xe3, 0xe4, 0xa1, 0xdd, 0x6e, 0x58, + 0x76, 0x13, 0x1f, 0xe9, 0xf8, 0x08, 0xad, 0x40, 0x31, 0x00, 0xc7, 0xa3, 0x16, 0x48, 0xd1, 0x90, + 0xca, 0xb1, 0x90, 0x6a, 0xc7, 0xb0, 0x14, 0xb3, 0x47, 0x5c, 0x0a, 0x7c, 0xcb, 0xf3, 0x1e, 0x39, + 0x6d, 0xcc, 0x2c, 0x16, 0xf4, 0x81, 0x48, 0xa7, 0xda, 0xf2, 0xbc, 0x06, 0x31, 0x03, 0x6b, 0x81, + 0x44, 0xdb, 0x1b, 0xc6, 0x09, 0x8d, 0x14, 0x8d, 0xef, 0xbc, 0x1e, 0x48, 0xac, 0x9d, 0xd9, 0x65, + 0x58, 0x68, 0x3b, 0x93, 0xb4, 0x8f, 0x01, 0x9a, 0xd8, 0x6e, 0x37, 0x88, 0x49, 0x01, 0xbc, 0x5e, + 0x92, 0x7f, 0x27, 0x41, 0x69, 0x38, 0x39, 0x47, 0x8b, 0xc3, 0x68, 0xf1, 0x08, 0x2d, 0x0e, 0xa1, + 0xe5, 0x12, 0xf5, 0x8c, 0xcf, 0xd3, 0x20, 0xe6, 0x30, 0x4d, 0x62, 0x13, 0xd5, 0x68, 0x75, 0x2c, + 0x6c, 0xfb, 0x5c, 0xa3, 0xc0, 0x35, 0x84, 0x26, 0xa4, 0xc2, 0x0c, 0xc1, 0x76, 0x7b, 0xcf, 0xea, + 0xe2, 0x72, 0xb1, 0x22, 0xad, 0x29, 0xfa, 0x50, 0xd6, 0x5a, 0x50, 0x7a, 0xd4, 0xc1, 0x86, 0x17, + 0x84, 0x67, 0x05, 0x8a, 0xbd, 0x50, 0x7e, 0xb9, 0x44, 0x4d, 0x38, 0x6e, 0x90, 0x79, 0xee, 0xe0, + 0x50, 0x8e, 0x06, 0x4f, 0x89, 0x2f, 0xc2, 0x07, 0x30, 0x37, 0x9a, 0x64, 0x92, 0x30, 0x68, 0xdf, + 0x4a, 0xb0, 0xd0, 0xc4, 0x14, 0x4f, 0x88, 0x8b, 0x89, 0xbe, 0x96, 0x61, 0xda, 0xf4, 0x9c, 0x9e, + 0x3b, 0x74, 0x75, 0x20, 0xd2, 0x11, 0x5d, 0x4e, 0x91, 0x80, 0x3a, 0x5c, 0x8a, 0x22, 0x98, 0x8a, + 0xa7, 0x5f, 0xc4, 0x5f, 0x08, 0xe3, 0xd7, 0x6a, 0xb0, 0x18, 0x76, 0x6d, 0x22, 0x84, 0x3b, 0xb0, + 0xd4, 0xc4, 0x7e, 0x40, 0x96, 0xa6, 0x6f, 0xf8, 0x3d, 0xa2, 0xc7, 0x5d, 0x93, 0xe2, 0xae, 0xad, + 0x40, 0x91, 0x30, 0x75, 0x66, 0xb0, 0xa0, 0x07, 0x92, 0xf6, 0x18, 0x96, 0xe3, 0x06, 0x27, 0x72, + 0xed, 0x1e, 0x5b, 0xba, 0xa7, 0x77, 0x4d, 0x7b, 0x06, 0xcb, 0xf5, 0x3f, 0xc4, 0x05, 0x01, 0xa4, + 0x12, 0x02, 0xf9, 0xa5, 0x04, 0x4b, 0x35, 0xdc, 0x69, 0xf6, 0x5c, 0xec, 0xd5, 0x69, 0x96, 0x03, + 0x1e, 0x8b, 0xf9, 0x92, 0x22, 0x7c, 0x1d, 0xf1, 0x46, 0x4e, 0xe3, 0x8d, 0x12, 0xe6, 0x4d, 0x26, + 0x3f, 0x68, 0xb0, 0xe3, 0x6e, 0x4c, 0x14, 0xec, 0x16, 0x0f, 0x76, 0x14, 0x50, 0x36, 0x0f, 0x16, + 0x41, 0xa1, 0xcc, 0x96, 0x19, 0xb3, 0xe9, 0xcf, 0x74, 0x40, 0xda, 0xe7, 0x3c, 0x31, 0x67, 0x77, + 0x77, 0xc2, 0x7d, 0xf1, 0x31, 0x3b, 0x5c, 0x3e, 0xf0, 0x2c, 0x1f, 0xd7, 0xac, 0x83, 0x83, 0xc9, + 0x31, 0x6a, 0x9f, 0xb1, 0x70, 0x85, 0x2d, 0xbd, 0x46, 0x20, 0xdf, 0x14, 0x40, 0x6b, 0x38, 0x6d, + 0xeb, 0xa0, 0xdf, 0xe0, 0x27, 0xab, 0x8e, 0x8d, 0x16, 0x75, 0x76, 0xeb, 0xc4, 0xc7, 0x36, 0xb1, + 0x1c, 0x3b, 0xe7, 0x2a, 0xa6, 0x7b, 0xb4, 0xd3, 0xf3, 0x5a, 0x78, 0xb4, 0xc1, 0x0e, 0xe4, 0x10, + 0x99, 0x95, 0xf8, 0xe6, 0x4b, 0x30, 0xa1, 0x13, 0xed, 0xf5, 0x5d, 0xcc, 0xa8, 0x59, 0xd0, 0xc5, + 0x26, 0x74, 0x02, 0x17, 0xbc, 0xa8, 0x53, 0xec, 0x92, 0x50, 0x60, 0x97, 0x84, 0x4d, 0x7e, 0x49, + 0xc8, 0xc4, 0x50, 0xd5, 0x93, 0x8c, 0x6c, 0xd9, 0xbe, 0xd7, 0xd7, 0x93, 0x27, 0x88, 0x9e, 0x4c, + 0xc5, 0xf8, 0xc9, 0x74, 0x07, 0x64, 0x7c, 0x52, 0x9e, 0x66, 0xf1, 0x5e, 0xad, 0x9a, 0x8e, 0x63, + 0x76, 0x30, 0xbf, 0x9c, 0x3e, 0xef, 0x1d, 0x54, 0x9b, 0xbe, 0x67, 0xd9, 0xe6, 0xfb, 0x46, 0xa7, + 0x87, 0x75, 0x19, 0x9f, 0xa0, 0x07, 0x30, 0x67, 0xf8, 0xbe, 0xd1, 0x7a, 0x81, 0xdb, 0xdb, 0xf6, + 0x81, 0x53, 0x9e, 0xc9, 0x31, 0x2e, 0x34, 0x82, 0xd2, 0xc2, 0x22, 0x0c, 0x48, 0x79, 0xb6, 0x22, + 0xad, 0xcd, 0xe8, 0x03, 0x11, 0x6d, 0xc0, 0xb2, 0x45, 0xa8, 0xfb, 0x9e, 0x6d, 0x74, 0x46, 0xc0, + 0xcb, 0xc0, 0xd4, 0x12, 0xfb, 0x50, 0x15, 0x50, 0x97, 0x98, 0xff, 0xb5, 0x3c, 0xe2, 0xf3, 0xf8, + 0xb1, 0x13, 0xb6, 0xc4, 0x4e, 0xd8, 0x84, 0x1e, 0x15, 0x83, 0x9a, 0x1e, 0x44, 0xca, 0xed, 0x43, + 0xdc, 0x0f, 0xb8, 0x41, 0x7f, 0xa2, 0xbf, 0x41, 0xe1, 0x25, 0x05, 0x11, 0xdc, 0x41, 0x2f, 0x25, + 0x10, 0xf2, 0x09, 0xee, 0x73, 0x9c, 0x5c, 0xf3, 0x5f, 0xf2, 0x3f, 0x25, 0xed, 0xeb, 0x02, 0x5c, + 0xa6, 0x07, 0xd2, 0x9b, 0x4a, 0xc8, 0xde, 0x78, 0x42, 0xfe, 0x87, 0x11, 0x32, 0x03, 0xc0, 0x3b, + 0x36, 0xbe, 0x2d, 0x6c, 0xfc, 0x55, 0x82, 0xca, 0xf8, 0x64, 0x4e, 0x7a, 0x2f, 0x16, 0xb3, 0xa9, + 0xc4, 0xb3, 0x99, 0x1c, 0x8f, 0xa9, 0xb4, 0x78, 0x88, 0xd9, 0x28, 0x84, 0xb3, 0x71, 0x0b, 0x8a, + 0x1e, 0x26, 0xbd, 0x8e, 0x5f, 0x2e, 0x32, 0x86, 0x9e, 0x67, 0x0c, 0x1d, 0x82, 0xc5, 0xc4, 0xd5, + 0x03, 0x05, 0xb6, 0xf6, 0x1e, 0xb6, 0xdb, 0x6f, 0xf7, 0xda, 0xcb, 0x00, 0xf0, 0x6e, 0xed, 0xbd, + 0x4d, 0x6b, 0x6f, 0x7c, 0x32, 0xff, 0x4c, 0x6b, 0xef, 0x17, 0x05, 0xae, 0xd6, 0x87, 0x3b, 0x0d, + 0x0d, 0xe7, 0x19, 0xd6, 0x5f, 0xea, 0xd7, 0xae, 0xb8, 0x36, 0x95, 0xc8, 0xda, 0xcc, 0x5e, 0x7f, + 0x69, 0xe4, 0x2a, 0x8c, 0x21, 0x57, 0x05, 0x4a, 0x7e, 0xdf, 0xc5, 0x4f, 0x70, 0x9f, 0xad, 0x54, + 0x1a, 0x87, 0x59, 0x5d, 0x6c, 0x42, 0x04, 0x56, 0xba, 0xe1, 0x1c, 0x0f, 0x94, 0xa7, 0x59, 0xd0, + 0xee, 0xb3, 0xa0, 0xe5, 0x88, 0x4d, 0xb5, 0x11, 0x33, 0xa3, 0xa7, 0x98, 0x56, 0x0f, 0x00, 0xc5, + 0xb5, 0xa3, 0xdc, 0x90, 0xf2, 0x72, 0x43, 0x4e, 0xe3, 0x86, 0xf6, 0x83, 0x04, 0xd7, 0xb2, 0x5d, + 0x9f, 0x88, 0xc8, 0x4d, 0x58, 0x22, 0x96, 0x6d, 0x76, 0xf0, 0x10, 0x08, 0x63, 0x1a, 0x7f, 0x3d, + 0xbb, 0xc2, 0xef, 0x21, 0x62, 0xff, 0x70, 0x42, 0xae, 0xa8, 0x27, 0x8d, 0xd6, 0x7e, 0x92, 0x61, + 0x75, 0xdc, 0xa8, 0x09, 0xfc, 0xf4, 0xd2, 0x76, 0x6d, 0xee, 0xe9, 0xbf, 0x33, 0x3d, 0x3d, 0xfb, + 0x96, 0x3d, 0x15, 0x4b, 0xe4, 0xeb, 0xda, 0xc4, 0x7e, 0x94, 0xe0, 0x6a, 0xe6, 0xe7, 0xc9, 0x84, + 0x9f, 0x7c, 0x25, 0xd2, 0x6b, 0xb5, 0x30, 0x21, 0x42, 0x30, 0x11, 0x0b, 0x26, 0xb3, 0x3d, 0x78, + 0xb6, 0xd3, 0x45, 0x35, 0xb4, 0x01, 0x70, 0x60, 0x58, 0x1d, 0xdc, 0x66, 0x83, 0xa6, 0x52, 0x07, + 0x09, 0x5a, 0xda, 0x6f, 0x32, 0xdc, 0xa8, 0xe1, 0x0e, 0xf6, 0xf1, 0x1b, 0xbd, 0x3b, 0x65, 0x3f, + 0x25, 0xa6, 0xed, 0x5f, 0xc5, 0x53, 0x1f, 0x8e, 0xd3, 0xa9, 0x87, 0xc1, 0x6e, 0x1a, 0xdb, 0x67, + 0x58, 0xac, 0xc7, 0xf2, 0x26, 0x79, 0xa4, 0xf6, 0x95, 0x04, 0x37, 0x73, 0xc5, 0x7f, 0x22, 0x1e, + 0x9d, 0xe2, 0x8c, 0x72, 0x60, 0x3e, 0xc4, 0x12, 0x74, 0x07, 0x66, 0xf1, 0xa0, 0x21, 0xa8, 0x7c, + 0x9c, 0x8b, 0x90, 0x69, 0xa4, 0x20, 0xfa, 0x26, 0xa7, 0xf9, 0xa6, 0x84, 0x9e, 0x93, 0x7e, 0x96, + 0x61, 0x76, 0x68, 0x0a, 0xed, 0xa7, 0x85, 0x56, 0x62, 0x8e, 0xdf, 0x0a, 0xcf, 0x7c, 0xf6, 0x5d, + 0x43, 0xce, 0xbb, 0xfd, 0x2b, 0xa9, 0x6c, 0xd0, 0x22, 0x57, 0x3d, 0xbe, 0x11, 0x85, 0x2f, 0x73, + 0xe7, 0xd8, 0xe5, 0x91, 0xd3, 0x55, 0xc6, 0x27, 0xea, 0x47, 0xa7, 0xdc, 0x99, 0x6e, 0x86, 0x77, + 0xa6, 0x84, 0xfc, 0x09, 0xfb, 0x51, 0x1f, 0xe6, 0xc4, 0x2e, 0x74, 0x0f, 0x66, 0x0e, 0x03, 0x39, + 0x48, 0xe0, 0x58, 0x86, 0x0e, 0x95, 0x27, 0x48, 0xe6, 0x2b, 0x09, 0x96, 0x84, 0xe2, 0x11, 0x8d, + 0x11, 0xab, 0x1e, 0xc5, 0x6a, 0x44, 0x52, 0x8e, 0x1a, 0x91, 0x7c, 0xea, 0x1a, 0x91, 0x12, 0xa9, + 0x11, 0x6d, 0x7c, 0x01, 0xa0, 0x74, 0x89, 0x89, 0x9e, 0xc1, 0x42, 0xa4, 0xb6, 0x83, 0xae, 0x27, + 0xc4, 0x20, 0x5e, 0x4f, 0x52, 0x6f, 0xe4, 0x51, 0x23, 0x2e, 0x72, 0x60, 0xf9, 0x69, 0xaf, 0xd3, + 0x09, 0x56, 0xef, 0x66, 0xbf, 0x89, 0x8f, 0x98, 0x7f, 0x7f, 0x4d, 0x18, 0x9f, 0xa4, 0x48, 0xe7, + 0xba, 0x9d, 0x5b, 0x97, 0xad, 0xcb, 0xe9, 0xe0, 0xdd, 0x1a, 0x2d, 0x04, 0x0f, 0x12, 0x83, 0x1a, + 0x92, 0xba, 0x18, 0x6e, 0x20, 0x2e, 0xda, 0x05, 0xa8, 0xe1, 0x4e, 0x83, 0x98, 0x7c, 0x11, 0x24, + 0x4c, 0x34, 0xea, 0xa6, 0x16, 0xae, 0x64, 0x68, 0x10, 0x17, 0xd5, 0x61, 0x31, 0xfa, 0xa2, 0x8c, + 0xca, 0x6c, 0xe2, 0x84, 0xf7, 0x6e, 0xf5, 0x62, 0x4a, 0x0f, 0x71, 0xd1, 0x3a, 0xcc, 0x0c, 0x8a, + 0x2f, 0x88, 0x7b, 0x2e, 0x14, 0x7c, 0xd4, 0xf3, 0x91, 0x16, 0xe2, 0xa2, 0xfb, 0x30, 0x27, 0xd6, + 0x33, 0xd0, 0xf2, 0xf0, 0x41, 0x46, 0xa8, 0xbe, 0xa8, 0x17, 0x12, 0x5a, 0xb9, 0xdb, 0xd1, 0xaa, + 0x43, 0xe0, 0x76, 0x42, 0x75, 0x23, 0x70, 0x3b, 0xb1, 0x4c, 0x51, 0x87, 0xc5, 0x7a, 0xb2, 0xa1, + 0x7a, 0xaa, 0xa1, 0xfa, 0x18, 0x43, 0x09, 0x81, 0x4c, 0x78, 0x67, 0x17, 0x0c, 0xc5, 0x02, 0x59, + 0x63, 0x2c, 0x17, 0x9f, 0x9a, 0xd1, 0x5f, 0x06, 0xda, 0x91, 0xa7, 0x6c, 0xb5, 0x9c, 0xdc, 0x41, + 0x5c, 0x74, 0x08, 0xab, 0xe3, 0x9e, 0x43, 0xd0, 0xb5, 0x3c, 0xcf, 0x5f, 0xea, 0xf5, 0x1c, 0x5a, + 0xc4, 0x45, 0xc7, 0x50, 0xc9, 0xba, 0x3a, 0xa3, 0xb5, 0xbc, 0x1f, 0x07, 0xea, 0xad, 0x9c, 0x9a, + 0x1c, 0xe5, 0xb8, 0x0f, 0xcf, 0x00, 0x65, 0xc6, 0x43, 0x43, 0x80, 0x32, 0xf3, 0x0b, 0xf6, 0x53, + 0xb8, 0x1c, 0x3a, 0xdc, 0x13, 0xe6, 0xbb, 0x3d, 0x58, 0x1f, 0x39, 0xae, 0x60, 0xea, 0x9d, 0xfc, + 0xca, 0xc4, 0xdd, 0xbc, 0xf4, 0xe1, 0xc5, 0x1d, 0x17, 0xdb, 0xfb, 0xdb, 0x0d, 0xe1, 0x0f, 0x17, + 0x5d, 0x62, 0xde, 0xef, 0x12, 0xf3, 0x79, 0x91, 0x89, 0x7f, 0xff, 0x3d, 0x00, 0x00, 0xff, 0xff, + 0x9c, 0xc6, 0x92, 0x59, 0xd9, 0x21, 0x00, 0x00, } diff --git a/pkg/proto/msg/msg.proto b/pkg/proto/msg/msg.proto index 78025bd00..901ebb122 100644 --- a/pkg/proto/msg/msg.proto +++ b/pkg/proto/msg/msg.proto @@ -188,6 +188,27 @@ message SetMessageReactionExtensionsResp { bool isReact = 5; repeated KeyValueResp result = 6; } +message AddMessageReactionExtensionsReq { + string operationID = 1; + string sourceID = 2; + string opUserID = 3; + int32 sessionType = 4; + map reactionExtensionList = 5; + string clientMsgID = 6; + google.protobuf.StringValue ex = 7; + google.protobuf.StringValue attachedInfo = 8; + bool isReact = 9; + bool isExternalExtensions = 10; + int64 msgFirstModifyTime = 11; +} +message AddMessageReactionExtensionsResp { + int32 errCode = 1; + string errMsg = 2; + string clientMsgID = 3; + int64 msgFirstModifyTime = 4; + bool isReact = 5; + repeated KeyValueResp result = 6; +} message GetMessageListReactionExtensionsReq { @@ -200,7 +221,8 @@ message GetMessageListReactionExtensionsReq { string clientMsgID = 1; int64 msgFirstModifyTime = 2; } - repeated MessageReactionKey messageReactionKeyList = 6; + repeated string typeKeyList = 6; + repeated MessageReactionKey messageReactionKeyList = 7; } message GetMessageListReactionExtensionsResp{ int32 errCode = 1; @@ -283,6 +305,6 @@ service msg { // modify msg rpc SetMessageReactionExtensions(SetMessageReactionExtensionsReq) returns(SetMessageReactionExtensionsResp); rpc GetMessageListReactionExtensions(GetMessageListReactionExtensionsReq) returns(GetMessageListReactionExtensionsResp); - rpc AddMessageReactionExtensions(ModifyMessageReactionExtensionsReq) returns(ModifyMessageReactionExtensionsResp); + rpc AddMessageReactionExtensions(AddMessageReactionExtensionsReq) returns(AddMessageReactionExtensionsResp); rpc DeleteMessageReactionExtensions(DeleteMessageListReactionExtensionsReq) returns(DeleteMessageListReactionExtensionsResp); } From 5ae35bfee15e2996609bc0473101dc130bb41c4a Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 9 Jan 2023 18:58:40 +0800 Subject: [PATCH 3/6] fix Pb2String --- pkg/utils/utils.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 8d144c7e8..8669e80f7 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -137,12 +137,17 @@ func RemoveRepeatedStringInList(slc []string) []string { } func Pb2String(pb proto.Message) (string, error) { - marshaler := jsonpb.Marshaler{ - OrigName: true, - EnumsAsInts: false, - EmitDefaults: false, + //marshaler := jsonpb.Marshaler{ + // OrigName: true, + // EnumsAsInts: false, + // EmitDefaults: false, + //} + //return marshaler.MarshalToString(pb) + bytes, err := proto.Marshal(pb) + if err != nil { + return "", err } - return marshaler.MarshalToString(pb) + return string(bytes), nil } func String2Pb(s string, pb proto.Message) error { From 4f322254b009c1b15b0c9cc3329df09623865a5c Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 9 Jan 2023 19:11:50 +0800 Subject: [PATCH 4/6] fix Pb2String --- internal/rpc/msg/rpcChat.go | 11 +++-------- pkg/common/db/mongoModel.go | 6 +++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/internal/rpc/msg/rpcChat.go b/internal/rpc/msg/rpcChat.go index 470325deb..a8ca5bc05 100644 --- a/internal/rpc/msg/rpcChat.go +++ b/internal/rpc/msg/rpcChat.go @@ -145,14 +145,9 @@ func (rpc *rpcChat) runCh() { select { case msg := <-rpc.delMsgCh: log.NewInfo(msg.OperationID, utils.GetSelfFuncName(), "delmsgch recv new: ", msg) - db.DB.DelMsgFromCache(msg.UserID, msg.SeqList, msg.OperationID) - unexistSeqList, err := db.DB.DelMsgBySeqList(msg.UserID, msg.SeqList, msg.OperationID) - if err != nil { - log.NewError(msg.OperationID, utils.GetSelfFuncName(), "DelMsgBySeqList args: ", msg.UserID, msg.SeqList, msg.OperationID, err.Error()) - continue - } - if len(unexistSeqList) > 0 { - DeleteMessageNotification(msg.OpUserID, msg.UserID, unexistSeqList, msg.OperationID) + if len(msg.SeqList) > 0 { + db.DB.DelMsgFromCache(msg.UserID, msg.SeqList, msg.OperationID) + DeleteMessageNotification(msg.OpUserID, msg.UserID, msg.SeqList, msg.OperationID) } } } diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go index 4d7d01f80..5b8cd2fb9 100644 --- a/pkg/common/db/mongoModel.go +++ b/pkg/common/db/mongoModel.go @@ -94,7 +94,7 @@ func (d *DataBases) GetMinSeqFromMongo2(uid string) (MinSeq uint32, err error) { } // deleteMsgByLogic -func (d *DataBases) DelMsgBySeqList(userID string, seqList []uint32, operationID string) (totalUnexistSeqList []uint32, err error) { +func (d *DataBases) DelMsgBySeqList(userID string, seqList []uint32, operationID string) (totalUnExistSeqList []uint32, err error) { log.Debug(operationID, utils.GetSelfFuncName(), "args ", userID, seqList) sortkeys.Uint32s(seqList) suffixUserID2SubSeqList := func(uid string, seqList []uint32) map[string][]uint32 { @@ -123,11 +123,11 @@ func (d *DataBases) DelMsgBySeqList(userID string, seqList []uint32, operationID return } lock.Lock() - totalUnexistSeqList = append(totalUnexistSeqList, unexistSeqList...) + totalUnExistSeqList = append(totalUnExistSeqList, unexistSeqList...) lock.Unlock() }(k, v, operationID) } - return totalUnexistSeqList, err + return totalUnExistSeqList, err } func (d *DataBases) DelMsgBySeqListInOneDoc(suffixUserID string, seqList []uint32, operationID string) ([]uint32, error) { From 818ed107c61c7b4696de94405b840c2be952b70e Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 10 Jan 2023 13:07:42 +0800 Subject: [PATCH 5/6] fix Pb2String --- pkg/common/db/RedisModel.go | 2 +- pkg/utils/utils.go | 18 +++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkg/common/db/RedisModel.go b/pkg/common/db/RedisModel.go index 29e2772a0..a133b624c 100644 --- a/pkg/common/db/RedisModel.go +++ b/pkg/common/db/RedisModel.go @@ -374,7 +374,7 @@ func (d *DataBases) DelMsgFromCache(uid string, seqList []uint32, operationID st continue } var msg pbCommon.MsgData - if err := utils.String2Pb(result, &msg); err != nil { + if err := jsonpb.UnmarshalString(result, &msg); err != nil { log2.Error(operationID, utils.GetSelfFuncName(), "String2Pb failed", msg, result, key, err.Error()) continue } diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 8669e80f7..e925ab994 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -137,21 +137,17 @@ func RemoveRepeatedStringInList(slc []string) []string { } func Pb2String(pb proto.Message) (string, error) { - //marshaler := jsonpb.Marshaler{ - // OrigName: true, - // EnumsAsInts: false, - // EmitDefaults: false, - //} - //return marshaler.MarshalToString(pb) - bytes, err := proto.Marshal(pb) - if err != nil { - return "", err + marshaler := jsonpb.Marshaler{ + OrigName: true, + EnumsAsInts: false, + EmitDefaults: false, } - return string(bytes), nil + return marshaler.MarshalToString(pb) } func String2Pb(s string, pb proto.Message) error { - return proto.Unmarshal([]byte(s), pb) + err := jsonpb.UnmarshalString(s, pb) + return err } func Map2Pb(m map[string]string) (pb proto.Message, err error) { From 85e3a81419e1a59a738ceb5a7b6614d78c308088 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 11 Jan 2023 14:33:33 +0800 Subject: [PATCH 6/6] super group remove unread message --- internal/rpc/group/group.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index fbc2dd188..4bb686364 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -743,6 +743,27 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou resp.ErrMsg = constant.ErrDB.ErrMsg return &resp, nil } + reqPb := pbConversation.ModifyConversationFieldReq{Conversation: &pbConversation.Conversation{}} + reqPb.OperationID = req.OperationID + reqPb.UserIDList = okUserIDList + reqPb.FieldType = constant.FieldUnread + reqPb.Conversation.GroupID = req.GroupID + reqPb.Conversation.ConversationID = utils.GetConversationIDBySessionType(req.GroupID, constant.SuperGroupChatType) + reqPb.Conversation.ConversationType = int32(constant.SuperGroupChatType) + reqPb.Conversation.UpdateUnreadCountTime = utils.GetCurrentTimestampByMill() + etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImConversationName, req.OperationID) + if etcdConn == nil { + errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil" + log.NewError(req.OperationID, errMsg) + } + client := pbConversation.NewConversationClient(etcdConn) + respPb, err := client.ModifyConversationField(context.Background(), &reqPb) + if err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), "ModifyConversationField rpc failed, ", reqPb.String(), err.Error()) + } else { + log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "ModifyConversationField success", respPb.String()) + } + } if groupInfo.GroupType != constant.SuperGroup {