|
|
@ -16,6 +16,8 @@ package friend
|
|
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"context"
|
|
|
|
|
|
|
|
"github.com/OpenIMSDK/protocol/wrapperspb"
|
|
|
|
|
|
|
|
"strconv"
|
|
|
|
|
|
|
|
|
|
|
|
"github.com/OpenIMSDK/tools/tx"
|
|
|
|
"github.com/OpenIMSDK/tools/tx"
|
|
|
|
|
|
|
|
|
|
|
@ -407,6 +409,10 @@ func (s *friendServer) GetSpecifiedFriendsInfo(ctx context.Context, req *pbfrien
|
|
|
|
}
|
|
|
|
}
|
|
|
|
var friendInfo *sdkws.FriendInfo
|
|
|
|
var friendInfo *sdkws.FriendInfo
|
|
|
|
if friend := friendMap[userID]; friend != nil {
|
|
|
|
if friend := friendMap[userID]; friend != nil {
|
|
|
|
|
|
|
|
var isPinnedBool bool
|
|
|
|
|
|
|
|
if friend.IsPinned != nil {
|
|
|
|
|
|
|
|
isPinnedBool, _ = strconv.ParseBool(*friend.IsPinned) // ignoring error for simplicity
|
|
|
|
|
|
|
|
}
|
|
|
|
friendInfo = &sdkws.FriendInfo{
|
|
|
|
friendInfo = &sdkws.FriendInfo{
|
|
|
|
OwnerUserID: friend.OwnerUserID,
|
|
|
|
OwnerUserID: friend.OwnerUserID,
|
|
|
|
Remark: friend.Remark,
|
|
|
|
Remark: friend.Remark,
|
|
|
@ -414,6 +420,7 @@ func (s *friendServer) GetSpecifiedFriendsInfo(ctx context.Context, req *pbfrien
|
|
|
|
AddSource: friend.AddSource,
|
|
|
|
AddSource: friend.AddSource,
|
|
|
|
OperatorUserID: friend.OperatorUserID,
|
|
|
|
OperatorUserID: friend.OperatorUserID,
|
|
|
|
Ex: friend.Ex,
|
|
|
|
Ex: friend.Ex,
|
|
|
|
|
|
|
|
IsPinned: wrapperspb.Bool(isPinnedBool),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
var blackInfo *sdkws.BlackInfo
|
|
|
|
var blackInfo *sdkws.BlackInfo
|
|
|
|