blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-30 14:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Error code standardization

Browse Source
This commit is contained in:
skiffer-git 2023-01-31 09:35:00 +08:00
parent fa45eb1fa8
commit 82c1b2352c
4 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
internal/rpc/friend/friend.go
View File

@ -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 {

5
internal/rpc/friend/other.go
View File

@ -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")
}

1
internal/rpc/group/group.go
View File

@ -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, "")
}

4
pkg/proto/friend/friend.proto
View File

@ -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);
//判断是否在黑名单中