Skip to content

Commit d350a0d

Browse files
committed
use proper name fallback
1 parent 7dae828 commit d350a0d

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

apps/meteor/server/services/room/service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,8 @@ export class RoomService extends ServiceClassInternal implements IRoomService {
326326
...(inviter && { inviter: { _id: inviter._id, username: inviter.username!, ...(inviter.name && { name: inviter.name }) } }),
327327
...autoTranslateConfig,
328328
...getDefaultSubscriptionPref(userToBeAdded),
329-
...(room.t === 'd' && inviter && { fname: inviter.name, name: inviter.username }),
329+
// `name` is optional for users, so fall back to the username like `getNameForDMs` does
330+
...(room.t === 'd' && inviter && { fname: inviter.name || inviter.username, name: inviter.username }),
330331
});
331332

332333
if (insertedId) {

ee/packages/federation-matrix/src/helpers/getOrCreateFederatedUser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ const logger = new Logger('federation-matrix:user');
1111

1212
/**
1313
* `name` is deliberately not required: Rocket.Chat users are valid with a username and no
14-
* display name (`Accounts_RequireNameForSignUp` off), and every consumer falls back to the
15-
* username, so demanding it would drop membership events for nameless local users.
14+
* display name (`Accounts_RequireNameForSignUp` off), so demanding it would drop membership
15+
* events for nameless local users. Consumers must fall back to the username when displaying.
1616
*/
1717
type FederatedUser = RequiredField<IUser, 'username'>;
1818

0 commit comments

Comments
 (0)