Merge remote-tracking branch 'origin/main'

This commit is contained in:
AndrewZuo01 2023-12-11 17:15:13 +08:00
commit f96f680115
2 changed files with 3 additions and 4 deletions

2
go.mod
View File

@ -33,7 +33,7 @@ require github.com/google/uuid v1.3.1
require (
github.com/IBM/sarama v1.41.3
github.com/OpenIMSDK/protocol v0.0.32
github.com/OpenIMSDK/protocol v0.0.32
github.com/OpenIMSDK/tools v0.0.18
github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible
github.com/go-redis/redis v6.15.9+incompatible

View File

@ -451,14 +451,13 @@ func (s *friendServer) PinFriends(
} else {
return nil, errs.ErrArgs.Wrap("isPinned is nil")
}
//檢查是不是在好友列表裏
//check whther in friend list
_, err := s.friendDatabase.FindFriendsWithError(ctx, req.OwnerUserID, req.FriendUserIDs)
if err != nil {
return nil, err
}
//全部置頂
//把所有friendslist的isPinned都設置為isPinned
//set friendslist friend pin status to isPinned
for _, friendID := range req.FriendUserIDs {
if err := s.friendDatabase.UpdateFriendPinStatus(ctx, req.OwnerUserID, friendID, isPinned); err != nil {
return nil, err