From 7c8c809fb85392b7f4c713b4f029e9b558c5dcfe Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 17 Mar 2023 16:01:56 +0800 Subject: [PATCH] errcode --- pkg/common/db/controller/friend.go | 2 ++ pkg/rpcclient/convert/convert.go | 3 +++ 2 files changed, 5 insertions(+) diff --git a/pkg/common/db/controller/friend.go b/pkg/common/db/controller/friend.go index 77cc7d5d3..553e52d17 100644 --- a/pkg/common/db/controller/friend.go +++ b/pkg/common/db/controller/friend.go @@ -142,6 +142,7 @@ func (f *friendDatabase) RefuseFriendRequest(ctx context.Context, friendRequest return err } friendRequest.HandleResult = constant.FriendResponseRefuse + friendRequest.HandleTime = time.Now() err = f.friendRequest.Update(ctx, friendRequest) if err != nil { return err @@ -158,6 +159,7 @@ func (f *friendDatabase) AgreeFriendRequest(ctx context.Context, friendRequest * } friendRequest.HandlerUserID = friendRequest.FromUserID friendRequest.HandleResult = constant.FriendResponseAgree + friendRequest.HandleTime = time.Now() err = f.friendRequest.NewTx(tx).Update(ctx, friendRequest) if err != nil { return err diff --git a/pkg/rpcclient/convert/convert.go b/pkg/rpcclient/convert/convert.go index f7d059c21..41c340a6b 100644 --- a/pkg/rpcclient/convert/convert.go +++ b/pkg/rpcclient/convert/convert.go @@ -120,14 +120,17 @@ func (db *DBFriendRequest) DB2PB(ctx context.Context, friendRequests []*relation } for _, v := range friendRequests { pbFriendRequest := &sdk.FriendRequest{} + pbFriendRequest.FromUserID = users[v.FromUserID].UserID pbFriendRequest.FromNickname = users[v.FromUserID].Nickname pbFriendRequest.FromFaceURL = users[v.FromUserID].FaceURL pbFriendRequest.FromGender = users[v.FromUserID].Gender + pbFriendRequest.ToUserID = users[v.ToUserID].UserID pbFriendRequest.ToNickname = users[v.ToUserID].Nickname pbFriendRequest.ToFaceURL = users[v.ToUserID].FaceURL pbFriendRequest.ToGender = users[v.ToUserID].Gender pbFriendRequest.CreateTime = v.CreateTime.Unix() pbFriendRequest.HandleTime = v.HandleTime.Unix() + pbFriendRequest.HandlerUserID = v.HandlerUserID PBFriendRequests = append(PBFriendRequests, pbFriendRequest) } return