From a0bc1b0d17f2badab4689165f8acecca9c647d40 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Sun, 29 Dec 2024 14:39:43 +0200
Subject: [PATCH] web/statestore: fix dm_user_id field in room list entries

---
 web/src/api/media.ts                          | 4 ++--
 web/src/api/statestore/main.ts                | 4 ++--
 web/src/api/statestore/room.ts                | 2 +-
 web/src/api/types/mxtypes.ts                  | 2 +-
 web/src/ui/rightpanel/UserInfoMutualRooms.tsx | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/web/src/api/media.ts b/web/src/api/media.ts
index 5ece955..5c97ac1 100644
--- a/web/src/api/media.ts
+++ b/web/src/api/media.ts
@@ -103,8 +103,8 @@ export const getRoomAvatarURL = (room: RoomForAvatarURL, avatarOverride?: Conten
 	if ("dm_user_id" in room) {
 		dmUserID = room.dm_user_id
 	} else if ("lazy_load_summary" in room) {
-		dmUserID = room.lazy_load_summary?.heroes?.length === 1
-			? room.lazy_load_summary.heroes[0] : undefined
+		dmUserID = room.lazy_load_summary?.["m.heroes"]?.length === 1
+			? room.lazy_load_summary["m.heroes"][0] : undefined
 	}
 	return getAvatarURL(dmUserID ?? room.room_id, {
 		displayname: room.name,
diff --git a/web/src/api/statestore/main.ts b/web/src/api/statestore/main.ts
index 65dac61..f4332f8 100644
--- a/web/src/api/statestore/main.ts
+++ b/web/src/api/statestore/main.ts
@@ -143,8 +143,8 @@ export class StateStore {
 		const name = entry.meta.name ?? "Unnamed room"
 		return {
 			room_id: entry.meta.room_id,
-			dm_user_id: entry.meta.lazy_load_summary?.heroes?.length === 1
-				? entry.meta.lazy_load_summary.heroes[0] : undefined,
+			dm_user_id: entry.meta.lazy_load_summary?.["m.heroes"]?.length === 1
+				? entry.meta.lazy_load_summary["m.heroes"][0] : undefined,
 			sorting_timestamp: entry.meta.sorting_timestamp,
 			preview_event,
 			preview_sender,
diff --git a/web/src/api/statestore/room.ts b/web/src/api/statestore/room.ts
index 3896de7..20b4ae3 100644
--- a/web/src/api/statestore/room.ts
+++ b/web/src/api/statestore/room.ts
@@ -62,7 +62,7 @@ function arraysAreEqual<T>(arr1?: T[], arr2?: T[]): boolean {
 function llSummaryIsEqual(ll1?: LazyLoadSummary, ll2?: LazyLoadSummary): boolean {
 	return ll1?.["m.joined_member_count"] === ll2?.["m.joined_member_count"] &&
 		ll1?.["m.invited_member_count"] === ll2?.["m.invited_member_count"] &&
-		arraysAreEqual(ll1?.heroes, ll2?.heroes)
+		arraysAreEqual(ll1?.["m.heroes"], ll2?.["m.heroes"])
 }
 
 function visibleMetaIsEqual(meta1: DBRoom, meta2: DBRoom): boolean {
diff --git a/web/src/api/types/mxtypes.ts b/web/src/api/types/mxtypes.ts
index 45fe52c..5932e3e 100644
--- a/web/src/api/types/mxtypes.ts
+++ b/web/src/api/types/mxtypes.ts
@@ -43,7 +43,7 @@ export interface TombstoneEventContent {
 }
 
 export interface LazyLoadSummary {
-	heroes?: UserID[]
+	"m.heroes"?: UserID[]
 	"m.joined_member_count"?: number
 	"m.invited_member_count"?: number
 }
diff --git a/web/src/ui/rightpanel/UserInfoMutualRooms.tsx b/web/src/ui/rightpanel/UserInfoMutualRooms.tsx
index 3238699..fadd041 100644
--- a/web/src/ui/rightpanel/UserInfoMutualRooms.tsx
+++ b/web/src/ui/rightpanel/UserInfoMutualRooms.tsx
@@ -40,8 +40,8 @@ const MutualRooms = ({ client, userID }: MutualRoomsProps) => {
 				}
 				return {
 					room_id: roomID,
-					dm_user_id: roomData.meta.current.lazy_load_summary?.heroes?.length === 1
-						? roomData.meta.current.lazy_load_summary.heroes[0] : undefined,
+					dm_user_id: roomData.meta.current.lazy_load_summary?.["m.heroes"]?.length === 1
+						? roomData.meta.current.lazy_load_summary["m.heroes"][0] : undefined,
 					name: roomData.meta.current.name ?? "Unnamed room",
 					avatar: roomData.meta.current.avatar,
 					search_name: "",