mirror of
https://github.com/openimsdk/open-im-server.git
synced 2026-07-15 02:21:09 +08:00
获取群成员时,按照remark、fn/ln、nickname先后顺序显示
This commit is contained in:
parent
a2760c3879
commit
e121cf0fd9
@ -16,9 +16,51 @@ package group
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
|
"github.com/openimsdk/open-im-server/v3/pkg/common/convert"
|
||||||
relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
|
relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
|
||||||
|
"github.com/openimsdk/protocol/sdkws"
|
||||||
|
"github.com/openimsdk/tools/mcontext"
|
||||||
|
"github.com/openimsdk/tools/utils/datautil"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (s *groupServer) PopulateGroupMember(ctx context.Context, members ...*relationtb.GroupMember) error {
|
func (s *groupServer) PopulateGroupMember(ctx context.Context, members ...*relationtb.GroupMember) error {
|
||||||
return s.notification.PopulateGroupMember(ctx, members...)
|
return s.notification.PopulateGroupMember(ctx, members...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// applyMemberDisplayNicknames 按当前用户视角重设群成员 Nickname:
|
||||||
|
// 好友用 remark;非好友用 firstName+lastName,为空则 fallback 到 nickname。
|
||||||
|
func (s *groupServer) applyMemberDisplayNicknames(ctx context.Context, members []*sdkws.GroupMemberFullInfo) error {
|
||||||
|
if len(members) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
viewerID := mcontext.GetOpUserID(ctx)
|
||||||
|
if viewerID == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
userIDs := datautil.Slice(members, func(m *sdkws.GroupMemberFullInfo) string { return m.UserID })
|
||||||
|
users, err := s.userClient.GetUsersInfoMap(ctx, userIDs)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
friendInfos, err := s.relationClient.GetFriendsInfo(ctx, viewerID, userIDs)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
remarkMap := make(map[string]string, len(friendInfos))
|
||||||
|
for _, f := range friendInfos {
|
||||||
|
if f != nil {
|
||||||
|
remarkMap[f.FriendUserID] = f.Remark
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, m := range members {
|
||||||
|
if remark, ok := remarkMap[m.UserID]; ok && remark != "" {
|
||||||
|
m.Nickname = remark
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if name := convert.MemberDisplayNickname(users[m.UserID]); name != "" {
|
||||||
|
m.Nickname = name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|||||||
@ -793,9 +793,13 @@ func (s *groupServer) getGroupMembersInfo(ctx context.Context, groupID string, u
|
|||||||
if err := s.PopulateGroupMember(ctx, members...); err != nil {
|
if err := s.PopulateGroupMember(ctx, members...); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return datautil.Slice(members, func(e *model.GroupMember) *sdkws.GroupMemberFullInfo {
|
pbMembers := datautil.Slice(members, func(e *model.GroupMember) *sdkws.GroupMemberFullInfo {
|
||||||
return convert.Db2PbGroupMember(e)
|
return convert.Db2PbGroupMember(e)
|
||||||
}), nil
|
})
|
||||||
|
if err := s.applyMemberDisplayNicknames(ctx, pbMembers); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return pbMembers, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetGroupApplicationList handles functions that get a list of group requests.
|
// GetGroupApplicationList handles functions that get a list of group requests.
|
||||||
|
|||||||
@ -34,6 +34,17 @@ func BuildFullName(firstName, lastName string) string {
|
|||||||
return strings.TrimSpace(firstName + " " + lastName)
|
return strings.TrimSpace(firstName + " " + lastName)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MemberDisplayNickname 非好友场景下的群成员展示名:优先 firstName+lastName,否则 nickname。
|
||||||
|
func MemberDisplayNickname(u *sdkws.UserInfo) string {
|
||||||
|
if u == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if name := BuildFullName(u.FirstName, u.LastName); name != "" {
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
return u.Nickname
|
||||||
|
}
|
||||||
|
|
||||||
func UserDB2Pb(user *relationtb.User) *sdkws.UserInfo {
|
func UserDB2Pb(user *relationtb.User) *sdkws.UserInfo {
|
||||||
return &sdkws.UserInfo{
|
return &sdkws.UserInfo{
|
||||||
UserID: user.UserID,
|
UserID: user.UserID,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user