From 4da27eb1997ceb5f8e0dce8e7e34074e5e7fbc91 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 11 Aug 2025 10:42:46 +0100
Subject: [PATCH] Catch error when encountering invalid m.room.pinned_events
 event (#30534)

---
 src/TextForEvent.tsx | 7 +++++--
 src/Unread.ts        | 7 ++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/TextForEvent.tsx b/src/TextForEvent.tsx
index 604dd2142f..60ada112e0 100644
--- a/src/TextForEvent.tsx
+++ b/src/TextForEvent.tsx
@@ -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);
 
diff --git a/src/Unread.ts b/src/Unread.ts
index e8f4769e25..d6a80a8f97 100644
--- a/src/Unread.ts
+++ b/src/Unread.ts
@@ -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 {