Skip to content

Re-add truthy check on room name/avatar/alias events #5081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 25, 2025
Merged

Re-add truthy check on room name/avatar/alias events #5081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77069d9
Re-add truthy check on room name/avatar/alias events
t3chguy Nov 24, 2025
25d7cb5
Add regression test
t3chguy Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions spec/unit/models/room.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,4 +229,27 @@ describe("Room", () => {
expect(room.getAltAliases()).toEqual(["#foo:bar"]);
});
});

describe("calculateRoomName()", () => {
it("should ignore empty m.room.name 'name' field", async () => {
const mockClient = createMockClient();
const room = new Room("!room:example.org", mockClient, CREATOR_USER_ID);
const event = new MatrixEvent({
type: EventType.RoomName,
content: {
name: "",
},
state_key: "",
event_id: "$123",
room_id: room.roomId,
sender: CREATOR_USER_ID,
});

// Set up the room
room.currentState.setStateEvents([event]);
room.recalculate();

expect(room.name).not.toEqual("");
});
});
});
6 changes: 3 additions & 3 deletions src/models/room.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1810,7 +1810,7 @@ export class Room extends ReadReceipt<RoomEmittedEvents, RoomEventHandlerMap> {
*/
public getMxcAvatarUrl(): string | null {
const url = this.currentState.getStateEvents(EventType.RoomAvatar, "")?.getContent().url;
return typeof url === "string" ? url : null;
return url && typeof url === "string" ? url : null;
}

/**
Expand All @@ -1821,7 +1821,7 @@ export class Room extends ReadReceipt<RoomEmittedEvents, RoomEventHandlerMap> {
*/
public getCanonicalAlias(): string | null {
const canonicalAlias = this.currentState.getStateEvents(EventType.RoomCanonicalAlias, "")?.getContent().alias;
return typeof canonicalAlias === "string" ? canonicalAlias : null;
return canonicalAlias && typeof canonicalAlias === "string" ? canonicalAlias : null;
}

/**
Expand Down Expand Up @@ -3638,7 +3638,7 @@ export class Room extends ReadReceipt<RoomEmittedEvents, RoomEventHandlerMap> {
private calculateRoomName(userId: string, ignoreRoomNameEvent = false): string {
if (!ignoreRoomNameEvent) {
const name = this.currentState.getStateEvents(EventType.RoomName, "")?.getContent().name;
if (typeof name === "string") {
if (name && typeof name === "string") {
return this.roomNameGenerator({
type: RoomNameType.Actual,
name,
Expand Down