From 4067d7e4b92919268d2cf4ae0b22ccd1faf513da Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 31 Jan 2023 21:06:04 +0800 Subject: [PATCH] Error code standardization --- internal/rpc/friend/black.go | 2 +- internal/rpc/msg/friend_notification.go | 76 ++++++++++++------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/internal/rpc/friend/black.go b/internal/rpc/friend/black.go index ab776da95..f2beb5a9d 100644 --- a/internal/rpc/friend/black.go +++ b/internal/rpc/friend/black.go @@ -65,6 +65,6 @@ func (s *friendServer) AddBlack(ctx context.Context, req *pbFriend.AddBlackReq) if err := s.BlackInterface.Create(ctx, []*relation.Black{&black}); err != nil { return nil, err } - chat.BlackAddedNotification(req) + chat.BlackAddedNotification(tracelog.GetOperationID(ctx), req) return resp, nil } diff --git a/internal/rpc/msg/friend_notification.go b/internal/rpc/msg/friend_notification.go index b453442fb..5ef4b0e9d 100644 --- a/internal/rpc/msg/friend_notification.go +++ b/internal/rpc/msg/friend_notification.go @@ -1,6 +1,7 @@ package msg import ( + "Open_IM/internal/common/check" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model" @@ -9,24 +10,25 @@ import ( pbFriend "Open_IM/pkg/proto/friend" open_im_sdk "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" + "context" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" ) func getFromToUserNickname(fromUserID, toUserID string) (string, string, error) { - from, err := imdb.GetUserByUserID(fromUserID) + users, err := check.GetUsersInfo(context.Background(), fromUserID, toUserID) if err != nil { - return "", "", utils.Wrap(err, "") + return "", "", nil } - to, err := imdb.GetUserByUserID(toUserID) - if err != nil { - return "", "", utils.Wrap(err, "") + if users[0].UserID == fromUserID { + return users[0].Nickname, users[1].Nickname, nil } - return from.Nickname, to.Nickname, nil + return users[1].Nickname, users[0].Nickname, nil + } func friendNotification(operationID, fromUserID, toUserID string, contentType int32, m proto.Message) { - log.Info(operationID, utils.GetSelfFuncName(), "args: ", commID, contentType) + log.Info(operationID, utils.GetSelfFuncName(), "args: ", contentType) var err error var tips open_im_sdk.TipsComm tips.Detail, err = proto.Marshal(m) @@ -90,27 +92,27 @@ func friendNotification(operationID, fromUserID, toUserID string, contentType in Notification(&n) } -func FriendApplicationNotification(req *pbFriend.AddFriendReq) { +func FriendApplicationNotification(operationID string, req *pbFriend.AddFriendReq) { FriendApplicationTips := open_im_sdk.FriendApplicationTips{FromToUserID: &open_im_sdk.FromToUserID{}} - FriendApplicationTips.FromToUserID.FromUserID = req.CommID.FromUserID - FriendApplicationTips.FromToUserID.ToUserID = req.CommID.ToUserID - friendNotification(req.CommID, constant.FriendApplicationNotification, &FriendApplicationTips) + FriendApplicationTips.FromToUserID.FromUserID = req.FromUserID + FriendApplicationTips.FromToUserID.ToUserID = req.ToUserID + friendNotification(operationID, req.FromUserID, req.ToUserID, constant.FriendApplicationNotification, &FriendApplicationTips) } -func FriendApplicationApprovedNotification(req *pbFriend.AddFriendResponseReq) { +func FriendApplicationApprovedNotification(operationID string, req *pbFriend.RespondFriendApplyReq) { FriendApplicationApprovedTips := open_im_sdk.FriendApplicationApprovedTips{FromToUserID: &open_im_sdk.FromToUserID{}} - FriendApplicationApprovedTips.FromToUserID.FromUserID = req.CommID.FromUserID - FriendApplicationApprovedTips.FromToUserID.ToUserID = req.CommID.ToUserID + FriendApplicationApprovedTips.FromToUserID.FromUserID = req.FromUserID + FriendApplicationApprovedTips.FromToUserID.ToUserID = req.ToUserID FriendApplicationApprovedTips.HandleMsg = req.HandleMsg - friendNotification(req.CommID, constant.FriendApplicationApprovedNotification, &FriendApplicationApprovedTips) + friendNotification(operationID, req.ToUserID, req.FromUserID, constant.FriendApplicationApprovedNotification, &FriendApplicationApprovedTips) } -func FriendApplicationRejectedNotification(req *pbFriend.AddFriendResponseReq) { +func FriendApplicationRejectedNotification(operationID string, req *pbFriend.RespondFriendApplyReq) { FriendApplicationApprovedTips := open_im_sdk.FriendApplicationApprovedTips{FromToUserID: &open_im_sdk.FromToUserID{}} - FriendApplicationApprovedTips.FromToUserID.FromUserID = req.CommID.FromUserID - FriendApplicationApprovedTips.FromToUserID.ToUserID = req.CommID.ToUserID + FriendApplicationApprovedTips.FromToUserID.FromUserID = req.FromUserID + FriendApplicationApprovedTips.FromToUserID.ToUserID = req.ToUserID FriendApplicationApprovedTips.HandleMsg = req.HandleMsg - friendNotification(req.CommID, constant.FriendApplicationRejectedNotification, &FriendApplicationApprovedTips) + friendNotification(operationID, req.ToUserID, req.FromUserID, constant.FriendApplicationRejectedNotification, &FriendApplicationApprovedTips) } func FriendAddedNotification(operationID, opUserID, fromUserID, toUserID string) { @@ -127,44 +129,42 @@ func FriendAddedNotification(operationID, opUserID, fromUserID, toUserID string) return } utils2.FriendDBCopyOpenIM(friendAddedTips.Friend, friend) - commID := pbFriend.CommID{FromUserID: fromUserID, ToUserID: toUserID, OpUserID: opUserID, OperationID: operationID} - friendNotification(&commID, constant.FriendAddedNotification, &friendAddedTips) + + friendNotification(operationID, fromUserID, toUserID, constant.FriendAddedNotification, &friendAddedTips) } -func FriendDeletedNotification(req *pbFriend.DeleteFriendReq) { +func FriendDeletedNotification(operationID string, req *pbFriend.DeleteFriendReq) { friendDeletedTips := open_im_sdk.FriendDeletedTips{FromToUserID: &open_im_sdk.FromToUserID{}} - friendDeletedTips.FromToUserID.FromUserID = req.CommID.FromUserID - friendDeletedTips.FromToUserID.ToUserID = req.CommID.ToUserID - friendNotification(req.CommID, constant.FriendDeletedNotification, &friendDeletedTips) + friendDeletedTips.FromToUserID.FromUserID = req.OwnerUserID + friendDeletedTips.FromToUserID.ToUserID = req.FriendUserID + friendNotification(operationID, req.OwnerUserID, req.FriendUserID, constant.FriendDeletedNotification, &friendDeletedTips) } -func FriendRemarkSetNotification(operationID, opUserID, fromUserID, toUserID string) { +func FriendRemarkSetNotification(operationID, fromUserID, toUserID string) { friendInfoChangedTips := open_im_sdk.FriendInfoChangedTips{FromToUserID: &open_im_sdk.FromToUserID{}} friendInfoChangedTips.FromToUserID.FromUserID = fromUserID friendInfoChangedTips.FromToUserID.ToUserID = toUserID - commID := pbFriend.CommID{FromUserID: fromUserID, ToUserID: toUserID, OpUserID: opUserID, OperationID: operationID} - friendNotification(&commID, constant.FriendRemarkSetNotification, &friendInfoChangedTips) + friendNotification(operationID, fromUserID, toUserID, constant.FriendRemarkSetNotification, &friendInfoChangedTips) } -func BlackAddedNotification(req *pbFriend.AddBlacklistReq) { +func BlackAddedNotification(operationID string, req *pbFriend.AddBlackReq) { blackAddedTips := open_im_sdk.BlackAddedTips{FromToUserID: &open_im_sdk.FromToUserID{}} - blackAddedTips.FromToUserID.FromUserID = req.CommID.FromUserID - blackAddedTips.FromToUserID.ToUserID = req.CommID.ToUserID - friendNotification(req.CommID, constant.BlackAddedNotification, &blackAddedTips) + blackAddedTips.FromToUserID.FromUserID = req.OwnerUserID + blackAddedTips.FromToUserID.ToUserID = req.BlackUserID + friendNotification(operationID, req.OwnerUserID, req.BlackUserID, constant.BlackAddedNotification, &blackAddedTips) } -func BlackDeletedNotification(req *pbFriend.RemoveBlacklistReq) { +func BlackDeletedNotification(operationID string, req *pbFriend.RemoveBlackReq) { blackDeletedTips := open_im_sdk.BlackDeletedTips{FromToUserID: &open_im_sdk.FromToUserID{}} - blackDeletedTips.FromToUserID.FromUserID = req.CommID.FromUserID - blackDeletedTips.FromToUserID.ToUserID = req.CommID.ToUserID - friendNotification(req.CommID, constant.BlackDeletedNotification, &blackDeletedTips) + blackDeletedTips.FromToUserID.FromUserID = req.OwnerUserID + blackDeletedTips.FromToUserID.ToUserID = req.BlackUserID + friendNotification(operationID, req.OwnerUserID, req.BlackUserID, constant.BlackDeletedNotification, &blackDeletedTips) } // send to myself func UserInfoUpdatedNotification(operationID, opUserID string, changedUserID string) { selfInfoUpdatedTips := open_im_sdk.UserInfoUpdatedTips{UserID: changedUserID} - commID := pbFriend.CommID{FromUserID: opUserID, ToUserID: changedUserID, OpUserID: opUserID, OperationID: operationID} - friendNotification(&commID, constant.UserInfoUpdatedNotification, &selfInfoUpdatedTips) + friendNotification(operationID, opUserID, changedUserID, constant.UserInfoUpdatedNotification, &selfInfoUpdatedTips) } func FriendInfoUpdatedNotification(operationID, changedUserID string, needNotifiedUserID string, opUserID string) {