IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-11 04:25:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Error code standardization

Browse Source
This commit is contained in:
skiffer-git
2023-02-01 16:44:50 +08:00
parent aafe17a0f3
commit fb436e7713
6 changed files with 85 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/common/convert/convert.go
+3 -2
View File
@@ -2,6 +2,7 @@ package convert
import (
"Open_IM/pkg/common/db/relation"
"Open_IM/pkg/common/db/table"
sdk "Open_IM/pkg/proto/sdk_ws"
utils "github.com/OpenIMSDK/open_utils"
"time"
@@ -19,10 +20,10 @@ func getNumberOfGroupMember(groupID string) (int32, error) {
}
type DBFriend struct {
*relation.Friend
*table.FriendModel
}
func NewDBFriend(friend *relation.Friend) *DBFriend {
func NewDBFriend(friend *controller.Friend) *DBFriend {
return &DBFriend{Friend: friend}
}
internal/rpc/friend/friend.go
+1 -1
View File
@@ -171,7 +171,7 @@ func (s *friendServer) RespondFriendApply(ctx context.Context, req *pbFriend.Res
if err := check.Access(ctx, req.ToUserID); err != nil {
return nil, err
}
friendRequest := relation.FriendRequest{FromUserID: req.FromUserID, ToUserID: req.ToUserID, HandleMsg: req.HandleMsg, HandleResult: req.HandleResult}
friendRequest := controller.FriendRequest{FromUserID: req.FromUserID, ToUserID: req.ToUserID, HandleMsg: req.HandleMsg, HandleResult: req.HandleResult}
if req.HandleResult == constant.FriendResponseAgree {
err := s.AgreeFriendRequest(ctx, &friendRequest)
if err != nil {