blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-11-05 03:42:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: update lastest commit to relation.

Browse Source
This commit is contained in:
Monet Lee 2024-06-05 11:39:10 +08:00
parent 7821f5f265
commit e11807c028
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/rpc/friend/sync.go
View File

@ -63,7 +63,7 @@ func (s *friendServer) GetIncrementalFriends(ctx context.Context, req *relation.
return nil, err return nil, err
} }
opt := incrversion.Option[*pbfriend.FriendInfo, pbfriend.GetIncrementalFriendsResp]{ opt := incrversion.Option[*relation.FriendInfo, relation.GetIncrementalFriendsResp]{
Ctx: ctx, Ctx: ctx,
VersionKey: req.UserID, VersionKey: req.UserID,
VersionID: req.VersionID, VersionID: req.VersionID,
@ -72,8 +72,7 @@ func (s *friendServer) GetIncrementalFriends(ctx context.Context, req *relation.
Version: s.friendDatabase.FindFriendIncrVersion, Version: s.friendDatabase.FindFriendIncrVersion,
CacheMaxVersion: s.friendDatabase.FindMaxFriendVersionCache, CacheMaxVersion: s.friendDatabase.FindMaxFriendVersionCache,
SortID: s.friendDatabase.FindSortFriendUserIDs, SortID: s.friendDatabase.FindSortFriendUserIDs,
Find: func(ctx context.Context, ids []string) ([]*pbfriend.FriendInfo, error) { Find: func(ctx context.Context, ids []string) ([]*relation.FriendInfo, error) {
friends, err := s.friendDatabase.FindFriendsWithError(ctx, req.UserID, ids) friends, err := s.friendDatabase.FindFriendsWithError(ctx, req.UserID, ids)
if err != nil { if err != nil {
return nil, err return nil, err
@ -81,9 +80,9 @@ func (s *friendServer) GetIncrementalFriends(ctx context.Context, req *relation.
return friendsDB2PB(friends), nil return friendsDB2PB(friends), nil
}, },
ID: func(elem *pbfriend.FriendInfo) string { return elem.FriendUserID }, ID: func(elem *relation.FriendInfo) string { return elem.FriendUserID },
Resp: func(version *model.VersionLog, delIDs []string, list []*pbfriend.FriendInfo, full bool) *pbfriend.GetIncrementalFriendsResp { Resp: func(version *model.VersionLog, delIDs []string, list []*relation.FriendInfo, full bool) *relation.GetIncrementalFriendsResp {
return &pbfriend.GetIncrementalFriendsResp{ return &relation.GetIncrementalFriendsResp{
VersionID: version.ID.Hex(), VersionID: version.ID.Hex(),
Version: uint64(version.Version), Version: uint64(version.Version),
Full: full, Full: full,