Skip to content

[Backport staging] Catch error when encountering invalid m.room.pinned_events event #30536

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 1 commit into from
Aug 11, 2025
Merged

[Backport staging] Catch error when encountering invalid m.room.pinned_events event #30536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions src/TextForEvent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,8 +572,11 @@ function textForPinnedEvent(event: MatrixEvent, client: MatrixClient, allowJSX:
const senderName = getSenderName(event);
const roomId = event.getRoomId()!;

const pinned = event.getContent<{ pinned: string[] }>().pinned ?? [];
const previouslyPinned: string[] = event.getPrevContent().pinned ?? [];
const content = event.getContent<{ pinned: string[] }>();
const prevContent = event.getPrevContent();

const pinned = Array.isArray(content.pinned) ? content.pinned : [];
const previouslyPinned: string[] = Array.isArray(prevContent.pinned) ? prevContent.pinned : [];
const newlyPinned = pinned.filter((item) => previouslyPinned.indexOf(item) < 0);
const newlyUnpinned = previouslyPinned.filter((item) => pinned.indexOf(item) < 0);

Expand Down
7 changes: 6 additions & 1 deletion src/Unread.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ export function eventTriggersUnreadCount(client: MatrixClient, ev: MatrixEvent):
}

if (ev.isRedacted()) return false;
return haveRendererForEvent(ev, client, false /* hidden messages should never trigger unread counts anyways */);
try {
return haveRendererForEvent(ev, client, false /* hidden messages should never trigger unread counts anyways */);
} catch (e) {
console.warn("Error determining if event should trigger unread count", e);
return false; // If we can't determine if the event should trigger an unread count, assume it does not.
}
}

export function doesRoomHaveUnreadMessages(room: Room, includeThreads: boolean): boolean {
Expand Down
Loading