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

friend

Browse Source
This commit is contained in:
wangchuxiao 2023-03-17 16:24:47 +08:00
parent 7c8c809fb8
commit fd19cd89a3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/friend.go
View File

@ -46,7 +46,7 @@ func (o *Friend) GetFriendApplyList(c *gin.Context) {
} }
func (o *Friend) GetSelfApplyList(c *gin.Context) { func (o *Friend) GetSelfApplyList(c *gin.Context) {
a2r.Call(friend.FriendClient.GetPaginationFriendsApplyFrom, o.client, c) a2r.Call(friend.FriendClient.GetPaginationFriendsApplyTo, o.client, c)
} }
func (o *Friend) GetFriendList(c *gin.Context) { func (o *Friend) GetFriendList(c *gin.Context) {

7
pkg/rpcclient/convert/convert.go
View File

@ -40,7 +40,7 @@ func (*PBFriend) PB2DB(friends []*sdk.FriendInfo) (DBFriends []*relation.FriendM
return return
} }
func (db *DBFriend) DB2PB(ctx context.Context, friends []*relation.FriendModel) (PBFriends []*sdk.FriendInfo, err error) { func (db *DBFriend) DB2PB(ctx context.Context, friends []*relation.FriendModel) (pbFriends []*sdk.FriendInfo, err error) {
userIDs := utils2.Slice(friends, func(e *relation.FriendModel) string { return e.FriendUserID }) userIDs := utils2.Slice(friends, func(e *relation.FriendModel) string { return e.FriendUserID })
users, err := db.userCheck.GetUsersInfoMap(ctx, userIDs, true) users, err := db.userCheck.GetUsersInfoMap(ctx, userIDs, true)
if err != nil { if err != nil {
@ -52,6 +52,7 @@ func (db *DBFriend) DB2PB(ctx context.Context, friends []*relation.FriendModel)
utils.CopyStructFields(pbfriend.FriendUser, users[v.FriendUserID]) utils.CopyStructFields(pbfriend.FriendUser, users[v.FriendUserID])
pbfriend.CreateTime = v.CreateTime.Unix() pbfriend.CreateTime = v.CreateTime.Unix()
pbfriend.FriendUser.CreateTime = v.CreateTime.Unix() pbfriend.FriendUser.CreateTime = v.CreateTime.Unix()
pbFriends = append(pbFriends, pbfriend)
} }
return return
} }
@ -131,6 +132,10 @@ func (db *DBFriendRequest) DB2PB(ctx context.Context, friendRequests []*relation
pbFriendRequest.CreateTime = v.CreateTime.Unix() pbFriendRequest.CreateTime = v.CreateTime.Unix()
pbFriendRequest.HandleTime = v.HandleTime.Unix() pbFriendRequest.HandleTime = v.HandleTime.Unix()
pbFriendRequest.HandlerUserID = v.HandlerUserID pbFriendRequest.HandlerUserID = v.HandlerUserID
pbFriendRequest.HandleResult = v.HandleResult
pbFriendRequest.Ex = v.Ex
pbFriendRequest.HandleMsg = v.HandleMsg
pbFriendRequest.ReqMsg = v.ReqMsg
PBFriendRequests = append(PBFriendRequests, pbFriendRequest) PBFriendRequests = append(PBFriendRequests, pbFriendRequest)
} }
return return