diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 639e20070..a2eaf3457 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -189,8 +189,8 @@ func (s *groupServer) resolveFriendDisplayName(ctx context.Context, ownerUserID, if err != nil || len(users) == 0 { return "", err } - if users[0].FirstName != "" { - return users[0].FirstName, nil + if users[0].FirstName != "" || users[0].LastName != "" { + return users[0].FirstName + " " + users[0].LastName, nil } return users[0].Nickname, nil } diff --git a/protocol b/protocol index c5adb72b8..bf66521b2 160000 --- a/protocol +++ b/protocol @@ -1 +1 @@ -Subproject commit c5adb72b8d02244a5d3d7d814e607e9b6256fdd6 +Subproject commit bf66521b27c2302dcae38ff441b035cd443edf20