From b40ddf0c61edd870d49c82a480fe36ce785f1fb2 Mon Sep 17 00:00:00 2001
From: Gigiaj <gigiaboone@yahoo.com>
Date: Sun, 4 May 2025 12:14:46 -0500
Subject: [PATCH] Update hook to keep method signature (accepting an array of
 Rooms instead) to support multiple room event tracking of the same event

---
 src/app/hooks/useStateEvents.ts | 43 +++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/app/hooks/useStateEvents.ts b/src/app/hooks/useStateEvents.ts
index dd085693..6d1c80bc 100644
--- a/src/app/hooks/useStateEvents.ts
+++ b/src/app/hooks/useStateEvents.ts
@@ -1,28 +1,35 @@
 import { useCallback, useMemo } from 'react';
-import { Room } from 'matrix-js-sdk';
+import { MatrixEvent, Room } from 'matrix-js-sdk';
 import { StateEvent } from '../../types/matrix/room';
+import { useMatrixClient } from './useMatrixClient';
 import { useForceUpdate } from './useForceUpdate';
 import { useStateEventCallback } from './useStateEventCallback';
-import { getStateEvents } from '../utils/room';
 
-export const useStateEvents = (room: Room, eventType: StateEvent) => {
+export const useStateEvents = (rooms: Room[], eventType: StateEvent): number => {
+  const mx = useMatrixClient();
+
   const [updateCount, forceUpdate] = useForceUpdate();
 
-  useStateEventCallback(
-    room.client,
-    useCallback(
-      (event) => {
-        if (event.getRoomId() === room.roomId && event.getType() === eventType) {
-          forceUpdate();
+  const relevantRoomIds = useMemo(() => {
+    const ids = new Set<string>();
+    if (rooms && Array.isArray(rooms)) {
+      rooms.forEach((room) => {
+        if (room?.roomId) {
+          ids.add(room.roomId);
         }
-      },
-      [room, eventType, forceUpdate]
-    )
-  );
-
-  return useMemo(
-    () => getStateEvents(room, eventType),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [room, eventType, updateCount]
+      });
+    }
+    return ids;
+  }, [rooms]);
+  const handleEventCallback = useCallback(
+    (event: MatrixEvent) => {
+      const eventRoomId = event.getRoomId();
+      if (eventRoomId && event.getType() === eventType && relevantRoomIds.has(eventRoomId)) {
+        forceUpdate();
+      }
+    },
+    [eventType, relevantRoomIds, forceUpdate]
   );
+  useStateEventCallback(mx, handleEventCallback);
+  return updateCount;
 };