diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index a9f3972bb..8cbc6b47a 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -33,13 +33,13 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/http" ) -type EventCallbackConfig struct { +type GroupEventCallbackConfig struct { CallbackUrl string BeforeCreateGroup config.CallBackConfig } // CallbackBeforeCreateGroup callback before create group -func CallbackBeforeCreateGroup(ctx context.Context, cfg *EventCallbackConfig, req *group.CreateGroupReq) (err error) { +func CallbackBeforeCreateGroup(ctx context.Context, cfg *GroupEventCallbackConfig, req *group.CreateGroupReq) (err error) { if !cfg.BeforeCreateGroup.Enable { return nil } @@ -85,7 +85,7 @@ func CallbackBeforeCreateGroup(ctx context.Context, cfg *EventCallbackConfig, re return nil } -func CallbackAfterCreateGroup(ctx context.Context, cfg *EventCallbackConfig, req *group.CreateGroupReq) (err error) { +func CallbackAfterCreateGroup(ctx context.Context, cfg *GroupEventCallbackConfig, req *group.CreateGroupReq) (err error) { if !cfg.BeforeCreateGroup.Enable { return nil } @@ -117,7 +117,7 @@ func CallbackAfterCreateGroup(ctx context.Context, cfg *EventCallbackConfig, req return nil } -func CallbackBeforeMemberJoinGroup(ctx context.Context, cfg *EventCallbackConfig, groupMember *relation.GroupMemberModel, groupEx string) (err error) { +func CallbackBeforeMemberJoinGroup(ctx context.Context, cfg *GroupEventCallbackConfig, groupMember *relation.GroupMemberModel, groupEx string) (err error) { if !cfg.BeforeCreateGroup.Enable { return nil } @@ -145,7 +145,7 @@ func CallbackBeforeMemberJoinGroup(ctx context.Context, cfg *EventCallbackConfig return nil } -func CallbackBeforeSetGroupMemberInfo(ctx context.Context, cfg *EventCallbackConfig, req *group.SetGroupMemberInfo) (err error) { +func CallbackBeforeSetGroupMemberInfo(ctx context.Context, cfg *GroupEventCallbackConfig, req *group.SetGroupMemberInfo) (err error) { if !cfg.BeforeCreateGroup.Enable { return nil } @@ -193,7 +193,7 @@ func CallbackBeforeSetGroupMemberInfo(ctx context.Context, cfg *EventCallbackCon return nil } -func CallbackAfterSetGroupMemberInfo(ctx context.Context, cfg *EventCallbackConfig, req *group.SetGroupMemberInfo) (err error) { +func CallbackAfterSetGroupMemberInfo(ctx context.Context, cfg *GroupEventCallbackConfig, req *group.SetGroupMemberInfo) (err error) { if !cfg.BeforeCreateGroup.Enable { return nil } @@ -221,7 +221,7 @@ func CallbackAfterSetGroupMemberInfo(ctx context.Context, cfg *EventCallbackConf return nil } -func CallbackQuitGroup(ctx context.Context, cfg *EventCallbackConfig, req *group.QuitGroupReq) (err error) { +func CallbackQuitGroup(ctx context.Context, cfg *GroupEventCallbackConfig, req *group.QuitGroupReq) (err error) { if !cfg.BeforeCreateGroup.Enable { return nil } @@ -237,7 +237,7 @@ func CallbackQuitGroup(ctx context.Context, cfg *EventCallbackConfig, req *group return nil } -func CallbackKillGroupMember(ctx context.Context, cfg *EventCallbackConfig, req *pbgroup.KickGroupMemberReq) (err error) { +func CallbackKillGroupMember(ctx context.Context, cfg *GroupEventCallbackConfig, req *pbgroup.KickGroupMemberReq) (err error) { if !cfg.BeforeCreateGroup.Enable { return nil } @@ -253,7 +253,7 @@ func CallbackKillGroupMember(ctx context.Context, cfg *EventCallbackConfig, req return nil } -func CallbackDismissGroup(ctx context.Context, cfg *EventCallbackConfig, req *callbackstruct.CallbackDisMissGroupReq) (err error) { +func CallbackDismissGroup(ctx context.Context, cfg *GroupEventCallbackConfig, req *callbackstruct.CallbackDisMissGroupReq) (err error) { if !cfg.BeforeCreateGroup.Enable { return nil } @@ -265,7 +265,7 @@ func CallbackDismissGroup(ctx context.Context, cfg *EventCallbackConfig, req *ca return nil } -func CallbackApplyJoinGroupBefore(ctx context.Context, cfg *EventCallbackConfig, req *callbackstruct.CallbackJoinGroupReq) (err error) { +func CallbackApplyJoinGroupBefore(ctx context.Context, cfg *GroupEventCallbackConfig, req *callbackstruct.CallbackJoinGroupReq) (err error) { if !cfg.BeforeCreateGroup.Enable { return nil } @@ -280,7 +280,7 @@ func CallbackApplyJoinGroupBefore(ctx context.Context, cfg *EventCallbackConfig, return nil } -func CallbackAfterTransferGroupOwner(ctx context.Context, cfg *EventCallbackConfig, req *pbgroup.TransferGroupOwnerReq) (err error) { +func CallbackAfterTransferGroupOwner(ctx context.Context, cfg *GroupEventCallbackConfig, req *pbgroup.TransferGroupOwnerReq) (err error) { if !cfg.BeforeCreateGroup.Enable { return nil } @@ -298,7 +298,7 @@ func CallbackAfterTransferGroupOwner(ctx context.Context, cfg *EventCallbackConf } return nil } -func CallbackBeforeInviteUserToGroup(ctx context.Context, cfg *EventCallbackConfig, req *group.InviteUserToGroupReq) (err error) { +func CallbackBeforeInviteUserToGroup(ctx context.Context, cfg *GroupEventCallbackConfig, req *group.InviteUserToGroupReq) (err error) { if !cfg.BeforeCreateGroup.Enable { return nil } @@ -331,7 +331,7 @@ func CallbackBeforeInviteUserToGroup(ctx context.Context, cfg *EventCallbackConf return nil } -func CallbackAfterJoinGroup(ctx context.Context, cfg *EventCallbackConfig, req *group.JoinGroupReq) error { +func CallbackAfterJoinGroup(ctx context.Context, cfg *GroupEventCallbackConfig, req *group.JoinGroupReq) error { if !cfg.BeforeCreateGroup.Enable { return nil } @@ -350,7 +350,7 @@ func CallbackAfterJoinGroup(ctx context.Context, cfg *EventCallbackConfig, req * return nil } -func CallbackBeforeSetGroupInfo(ctx context.Context, cfg *EventCallbackConfig, req *group.SetGroupInfoReq) error { +func CallbackBeforeSetGroupInfo(ctx context.Context, cfg *GroupEventCallbackConfig, req *group.SetGroupInfoReq) error { if !cfg.BeforeCreateGroup.Enable { return nil } @@ -401,7 +401,7 @@ func CallbackBeforeSetGroupInfo(ctx context.Context, cfg *EventCallbackConfig, r return nil } -func CallbackAfterSetGroupInfo(ctx context.Context, cfg *EventCallbackConfig, req *group.SetGroupInfoReq) error { +func CallbackAfterSetGroupInfo(ctx context.Context, cfg *GroupEventCallbackConfig, req *group.SetGroupInfoReq) error { if !cfg.BeforeCreateGroup.Enable { return nil } diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index cfcff090f..3f4a2013f 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -218,7 +218,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbgroup.CreateGroupR return nil, errs.ErrUserIDNotFound.Wrap("user not found") } - config := &EventCallbackConfig{ + config := &GroupEventCallbackConfig{ CallbackUrl: s.config.Callback.CallbackUrl, BeforeCreateGroup: s.config.Callback.CallbackBeforeCreateGroup, } @@ -234,7 +234,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbgroup.CreateGroupR return nil, err } - beforeCreateGroupConfig := &EventCallbackConfig{ + beforeCreateGroupConfig := &GroupEventCallbackConfig{ CallbackUrl: s.config.Callback.CallbackUrl, BeforeCreateGroup: s.config.Callback.CallbackBeforeMemberJoinGroup, } @@ -391,8 +391,9 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbgroup.Invite } if group.Status == constant.GroupStatusDismissed { - return nil, errs.Wrap(errors.New("group dismissed")) + return nil, errs.Wrap(errors.New("group dismissed"), "checking group status found it dismissed") } + userMap, err := s.User.GetUsersInfoMap(ctx, req.InvitedUserIDs) if err != nil { return nil, err @@ -414,7 +415,7 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbgroup.Invite } } - beforeInviteUserToGroupConfig := &EventCallbackConfig{ + beforeInviteUserToGroupConfig := &GroupEventCallbackConfig{ CallbackUrl: s.config.Callback.CallbackUrl, BeforeCreateGroup: s.config.Callback.CallbackBeforeInviteUserToGroup, } @@ -639,7 +640,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbgroup.KickGrou return nil, err } - killGroupMemberConfig := &EventCallbackConfig{ + killGroupMemberConfig := &GroupEventCallbackConfig{ CallbackUrl: s.config.Callback.CallbackUrl, BeforeCreateGroup: s.config.Callback.CallbackBeforeMemberJoinGroup, } @@ -815,7 +816,7 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbgroup Ex: groupRequest.Ex, } - beforeMemberJoinGroupConfig := &EventCallbackConfig{ + beforeMemberJoinGroupConfig := &GroupEventCallbackConfig{ CallbackUrl: s.config.Callback.CallbackUrl, BeforeCreateGroup: s.config.Callback.CallbackBeforeMemberJoinGroup, } @@ -868,7 +869,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbgroup.JoinGroupReq) Ex: req.Ex, } - applyJoinGroupBeforeConfig := &EventCallbackConfig{ + applyJoinGroupBeforeConfig := &GroupEventCallbackConfig{ CallbackUrl: s.config.Callback.CallbackUrl, BeforeCreateGroup: s.config.Callback.CallbackBeforeMemberJoinGroup, } @@ -956,7 +957,7 @@ func (s *groupServer) QuitGroup(ctx context.Context, req *pbgroup.QuitGroupReq) return nil, err } - quitGroupConfig := &EventCallbackConfig{ + quitGroupConfig := &GroupEventCallbackConfig{ CallbackUrl: s.config.Callback.CallbackUrl, BeforeCreateGroup: s.config.Callback.CallbackBeforeMemberJoinGroup, } @@ -992,7 +993,7 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbgroup.SetGroupInf } } - beforeSetGroupInfoConfig := &EventCallbackConfig{ + beforeSetGroupInfoConfig := &GroupEventCallbackConfig{ CallbackUrl: s.config.Callback.CallbackUrl, BeforeCreateGroup: s.config.Callback.CallbackBeforeMemberJoinGroup, } @@ -1114,7 +1115,7 @@ func (s *groupServer) TransferGroupOwner(ctx context.Context, req *pbgroup.Trans return nil, err } - afterTransferGroupOwnerConfig := &EventCallbackConfig{ + afterTransferGroupOwnerConfig := &GroupEventCallbackConfig{ CallbackUrl: s.config.Callback.CallbackUrl, BeforeCreateGroup: s.config.Callback.CallbackBeforeMemberJoinGroup, } @@ -1287,7 +1288,7 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbgroup.DismissGrou GroupType: string(group.GroupType), } - dismissGroupConfig := &EventCallbackConfig{ + dismissGroupConfig := &GroupEventCallbackConfig{ CallbackUrl: s.config.Callback.CallbackUrl, BeforeCreateGroup: s.config.Callback.CallbackBeforeMemberJoinGroup, } @@ -1484,7 +1485,7 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbgroup.SetGr } } - beforeSetGroupMemberInfoConfig := &EventCallbackConfig{ + beforeSetGroupMemberInfoConfig := &GroupEventCallbackConfig{ CallbackUrl: s.config.Callback.CallbackUrl, BeforeCreateGroup: s.config.Callback.CallbackBeforeMemberJoinGroup, } diff --git a/internal/rpc/group/statistics.go b/internal/rpc/group/statistics.go index d909e9503..504266854 100644 --- a/internal/rpc/group/statistics.go +++ b/internal/rpc/group/statistics.go @@ -24,7 +24,7 @@ import ( func (s *groupServer) GroupCreateCount(ctx context.Context, req *group.GroupCreateCountReq) (*group.GroupCreateCountResp, error) { if req.Start > req.End { - return nil, errs.ErrArgs.Wrap("start > end") + return nil, errs.ErrArgs.Wrap("start > end: %d > %d", req.Start, req.End) } total, err := s.db.CountTotal(ctx, nil) if err != nil { diff --git a/internal/rpc/group/super_group.go b/internal/rpc/group/super_group.go index f893a79c2..b3c32168c 100644 --- a/internal/rpc/group/super_group.go +++ b/internal/rpc/group/super_group.go @@ -19,12 +19,13 @@ import ( "errors" pbgroup "github.com/OpenIMSDK/protocol/group" + "github.com/OpenIMSDK/tools/errs" ) func (s *groupServer) GetJoinedSuperGroupList(context.Context, *pbgroup.GetJoinedSuperGroupListReq) (*pbgroup.GetJoinedSuperGroupListResp, error) { - return nil, errors.New("deprecated") + return nil, errs.Wrap(errors.New("GetJoinedSuperGroupList is deprecated"), "This feature is deprecated and no longer supported.") } func (s *groupServer) GetSuperGroupsInfo(context.Context, *pbgroup.GetSuperGroupsInfoReq) (resp *pbgroup.GetSuperGroupsInfoResp, err error) { - return nil, errors.New("deprecated") + return nil, errs.Wrap(errors.New("GetSuperGroupsInfo is deprecated"), "This feature is deprecated and no longer supported.") } diff --git a/internal/rpc/msg/as_read.go b/internal/rpc/msg/as_read.go index 43537358d..f852e7656 100644 --- a/internal/rpc/msg/as_read.go +++ b/internal/rpc/msg/as_read.go @@ -69,10 +69,7 @@ func (m *msgServer) GetConversationsHasReadAndMaxSeq(ctx context.Context, req *m return resp, nil } -func (m *msgServer) SetConversationHasReadSeq( - ctx context.Context, - req *msg.SetConversationHasReadSeqReq, -) (resp *msg.SetConversationHasReadSeqResp, err error) { +func (m *msgServer) SetConversationHasReadSeq(ctx context.Context, req *msg.SetConversationHasReadSeqReq) (resp *msg.SetConversationHasReadSeqResp, err error) { maxSeq, err := m.MsgDatabase.GetMaxSeq(ctx, req.ConversationID) if err != nil { return @@ -90,10 +87,7 @@ func (m *msgServer) SetConversationHasReadSeq( return &msg.SetConversationHasReadSeqResp{}, nil } -func (m *msgServer) MarkMsgsAsRead( - ctx context.Context, - req *msg.MarkMsgsAsReadReq, -) (resp *msg.MarkMsgsAsReadResp, err error) { +func (m *msgServer) MarkMsgsAsRead(ctx context.Context, req *msg.MarkMsgsAsReadReq) (resp *msg.MarkMsgsAsReadResp, err error) { if len(req.Seqs) < 1 { return nil, errs.ErrArgs.Wrap("seqs must not be empty") } @@ -124,13 +118,13 @@ func (m *msgServer) MarkMsgsAsRead( } } - req_callback := &cbapi.CallbackSingleMsgReadReq{ + reqCallback := &cbapi.CallbackSingleMsgReadReq{ ConversationID: conversation.ConversationID, UserID: req.UserID, Seqs: req.Seqs, ContentType: conversation.ConversationType, } - if err = CallbackSingleMsgRead(ctx, m.config, req_callback); err != nil { + if err = CallbackSingleMsgRead(ctx, m.config, reqCallback); err != nil { return nil, err } @@ -141,10 +135,7 @@ func (m *msgServer) MarkMsgsAsRead( return &msg.MarkMsgsAsReadResp{}, nil } -func (m *msgServer) MarkConversationAsRead( - ctx context.Context, - req *msg.MarkConversationAsReadReq, -) (resp *msg.MarkConversationAsReadResp, err error) { +func (m *msgServer) MarkConversationAsRead(ctx context.Context, req *msg.MarkConversationAsReadReq) (resp *msg.MarkConversationAsReadResp, err error) { conversation, err := m.ConversationLocalCache.GetConversation(ctx, req.UserID, req.ConversationID) if err != nil { return nil, err diff --git a/internal/rpc/msg/callback.go b/internal/rpc/msg/callback.go index d4e4966fc..de414fb3c 100644 --- a/internal/rpc/msg/callback.go +++ b/internal/rpc/msg/callback.go @@ -156,6 +156,7 @@ func callbackMsgModify(ctx context.Context, globalConfig *config.GlobalConfig, m log.ZDebug(ctx, "callbackMsgModify", "msg", msg.MsgData) return nil } + func CallbackGroupMsgRead(ctx context.Context, globalConfig *config.GlobalConfig, req *cbapi.CallbackGroupMsgReadReq) error { if !globalConfig.Callback.CallbackGroupMsgRead.Enable || req.ContentType != constant.Text { return nil