From 82c1b2352c1892f1ff755c16e433d7e65159a55c Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 31 Jan 2023 09:35:00 +0800 Subject: [PATCH] Error code standardization --- internal/rpc/friend/friend.go | 33 +++++++++++++++++---------------- internal/rpc/friend/other.go | 5 +---- internal/rpc/group/group.go | 1 - pkg/proto/friend/friend.proto | 4 ++-- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go index 87f2e8935..2acf09656 100644 --- a/internal/rpc/friend/friend.go +++ b/internal/rpc/friend/friend.go @@ -5,6 +5,7 @@ import ( "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/db/controller" + "Open_IM/pkg/common/tracelog" "Open_IM/pkg/common/db/relation" "Open_IM/pkg/common/log" @@ -114,12 +115,12 @@ func (s *friendServer) Run() { } } -func (s *friendServer) AddBlacklist(ctx context.Context, req *pbFriend.AddBlacklistReq) (*pbFriend.AddBlacklistResp, error) { - resp := &pbFriend.AddBlacklistResp{} - if err := token_verify.CheckAccessV3(ctx, req.FromUserID); err != nil { +func (s *friendServer) AddBlack(ctx context.Context, req *pbFriend.AddBlackReq) (*pbFriend.AddBlackResp, error) { + resp := &pbFriend.AddBlackResp{} + if err := token_verify.CheckAccessV3(ctx, req.OwnerUserID); err != nil { return nil, err } - black := relation.Black{OwnerUserID: req.FromUserID, BlockUserID: req.ToUserID, OperatorUserID: tools.OpUserID(ctx)} + black := relation.Black{OwnerUserID: req.OwnerUserID, BlockUserID: req.BlackUserID, OperatorUserID: tracelog.OpUserID(ctx)} if err := s.BlackInterface.Create(ctx, []*relation.Black{&black}); err != nil { return nil, err } @@ -136,10 +137,11 @@ func (s *friendServer) AddFriend(ctx context.Context, req *pbFriend.AddFriendReq return nil, err } - //检查toUserID是否存在 - if _, err := GetUsersInfo(ctx, []string{req.ToUserID}); err != nil { + //检查toUserID fromUserID是否存在 + if _, err := GetUsersInfo(ctx, req.ToUserID, req.FromUserID); err != nil { return nil, err } + //from是否在to的好友列表里面 err, in1, in2 := s.FriendInterface.CheckIn(ctx, req.FromUserID, req.ToUserID) if err != nil { @@ -160,7 +162,7 @@ func (s *friendServer) ImportFriend(ctx context.Context, req *pbFriend.ImportFri if err := token_verify.CheckAdmin(ctx); err != nil { return nil, err } - if _, err := GetUsersInfo(ctx, []string{req.OwnerUserID}); err != nil { + if _, err := GetUsersInfo(ctx, req.OwnerUserID); err != nil { return nil, err } @@ -177,12 +179,11 @@ func (s *friendServer) ImportFriend(ctx context.Context, req *pbFriend.ImportFri } // process Friend application -func (s *friendServer) friendApplyResponse(ctx context.Context, req *pbFriend.FriendApplyResponseReq) (*pbFriend.FriendApplyResponseResp, error) { - resp := &pbFriend.FriendApplyResponseResp{} +func (s *friendServer) RespondFriendApply(ctx context.Context, req *pbFriend.RespondFriendApplyReq) (*pbFriend.RespondFriendApplyResp, error) { + resp := &pbFriend.RespondFriendApplyResp{} if err := token_verify.CheckAccessV3(ctx, req.ToUserID); err != nil { return nil, err } - friendRequest := relation.FriendRequest{FromUserID: req.FromUserID, ToUserID: req.ToUserID, HandleMsg: req.HandleMsg, HandleResult: req.HandleResult} if req.HandleResult == constant.FriendResponseAgree { err := s.AgreeFriendRequest(ctx, &friendRequest) @@ -205,10 +206,10 @@ func (s *friendServer) friendApplyResponse(ctx context.Context, req *pbFriend.Fr func (s *friendServer) DeleteFriend(ctx context.Context, req *pbFriend.DeleteFriendReq) (*pbFriend.DeleteFriendResp, error) { resp := &pbFriend.DeleteFriendResp{} - if err := token_verify.CheckAccessV3(ctx, req.FromUserID); err != nil { + if err := token_verify.CheckAccessV3(ctx, req.OwnerUserID); err != nil { return nil, err } - if err := s.FriendInterface.Delete(ctx, req.FromUserID, req.ToUserID); err != nil { + if err := s.FriendInterface.Delete(ctx, req.OwnerUserID, req.FriendUserID); err != nil { return nil, err } chat.FriendDeletedNotification(req) @@ -217,17 +218,17 @@ func (s *friendServer) DeleteFriend(ctx context.Context, req *pbFriend.DeleteFri func (s *friendServer) SetFriendRemark(ctx context.Context, req *pbFriend.SetFriendRemarkReq) (*pbFriend.SetFriendRemarkResp, error) { resp := &pbFriend.SetFriendRemarkResp{} - if err := token_verify.CheckAccessV3(ctx, req.FromUserID); err != nil { + if err := token_verify.CheckAccessV3(ctx, req.OwnerUserID); err != nil { return nil, err } - if err := s.FriendInterface.UpdateRemark(ctx, req.FromUserID, req.ToUserID, req.Remark); err != nil { + if err := s.FriendInterface.UpdateRemark(ctx, req.OwnerUserID, req.FriendUserID, req.Remark); err != nil { return nil, err } - chat.FriendRemarkSetNotification(tools.OperationID(ctx), tools.OpUserID(ctx), req.FromUserID, req.ToUserID) + chat.FriendRemarkSetNotification(tools.OperationID(ctx), tools.OpUserID(ctx), req.OwnerUserID, req.FriendUserID) return resp, nil } -func (s *friendServer) RemoveBlacklist(ctx context.Context, req *pbFriend.RemoveBlacklistReq) (*pbFriend.RemoveBlacklistResp, error) { +func (s *friendServer) RemoveBlacklist(ctx context.Context, req *pbFriend.RemoveBlackReq) (*pbFriend.RemoveBlackResp, error) { resp := &pbFriend.RemoveBlacklistResp{} //Parse token, to find current user information if err := token_verify.CheckAccessV3(ctx, req.FromUserID); err != nil { diff --git a/internal/rpc/friend/other.go b/internal/rpc/friend/other.go index e9150cf7e..312dfad08 100644 --- a/internal/rpc/friend/other.go +++ b/internal/rpc/friend/other.go @@ -13,9 +13,6 @@ func GetPublicUserInfoBatch(ctx context.Context, userIDs []string) ([]*server_ap return nil, errors.New("TODO:GetUserInfo") } -func GetUsersInfo(ctx context.Context, userIDs []string) ([]*server_api_params.UserInfo, error) { - if len(userIDs) == 0 { - return []*server_api_params.UserInfo{}, nil - } +func GetUsersInfo(ctx context.Context, args ...interface{}) ([]*server_api_params.UserInfo, error) { return nil, errors.New("TODO:GetUserInfo") } diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 2826bf2bd..ea23d068f 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -1265,7 +1265,6 @@ func (s *groupServer) CancelMuteGroup(ctx context.Context, req *pbGroup.CancelMu func (s *groupServer) SetGroupMemberNickname(ctx context.Context, req *pbGroup.SetGroupMemberNicknameReq) (*pbGroup.SetGroupMemberNicknameResp, error) { resp := &pbGroup.SetGroupMemberNicknameResp{} - if utils.OpUserID(ctx) != req.UserID && !token_verify.IsManagerUserID(utils.OpUserID(ctx)) { return nil, utils.Wrap(constant.ErrIdentity, "") } diff --git a/pkg/proto/friend/friend.proto b/pkg/proto/friend/friend.proto index 178900d20..fcd6f91f6 100644 --- a/pkg/proto/friend/friend.proto +++ b/pkg/proto/friend/friend.proto @@ -64,7 +64,7 @@ message removeBlackReq{ string ownerUserID = 1; string blackUserID = 2; } -message removeBlackReqResp{ +message removeBlackResp{ } message getBlacksReq{ @@ -141,7 +141,7 @@ service friend{ //添加黑名单 rpc addBlack(addBlackReq) returns(addBlackResp); //移除黑名单 - rpc removeBlack(removeBlackReq) returns(removeBlackReqResp); + rpc removeBlack(removeBlackReq) returns(removeBlackResp); //判断是否好友关系 rpc isFriend(isFriendReq) returns(isFriendResp); //判断是否在黑名单中