Fix all rooms search generating permalinks to wrong room id

src/components/structures/RoomSearchView.tsx

@@ -59,7 +59,16 @@ interface Props {
 // XXX: why doesn't searching on name work?
 export const RoomSearchView = forwardRef<ScrollPanel, Props>(
     (
-        { term, scope, promise, abortController, resizeNotifier, permalinkCreator, className, onUpdate }: Props,
+        {
+            term,
+            scope,
+            promise,
+            abortController,
+            resizeNotifier,
+            permalinkCreator: _permalinkCreator,
+            className,
+            onUpdate,
+        }: Props,
         ref: RefObject<ScrollPanel>,
     ) => {
         const client = useContext(MatrixClientContext);
@@ -68,6 +77,7 @@ export const RoomSearchView = forwardRef<ScrollPanel, Props>(
         const [highlights, setHighlights] = useState<string[] | null>(null);
         const [results, setResults] = useState<ISearchResults | null>(null);
         const aborted = useRef(false);
+        const permalinkCreators = useRef(new Map<string, RoomPermalinkCreator>()).current;
 
         const handleSearchResult = useCallback(
             (searchPromise: Promise<ISearchResults>): Promise<boolean> => {
@@ -217,7 +227,7 @@ export const RoomSearchView = forwardRef<ScrollPanel, Props>(
             const result = results.results[i];
 
             const mxEv = result.context.getEvent();
-            const roomId = mxEv.getRoomId();
+            const roomId = mxEv.getRoomId()!;
             const room = client.getRoom(roomId);
             if (!room) {
                 // if we do not have the room in js-sdk stores then hide it as we cannot easily show it
@@ -283,6 +293,16 @@ export const RoomSearchView = forwardRef<ScrollPanel, Props>(
                 ourEventsIndexes.push(result.context.getOurEventIndex());
             }
 
+            let permalinkCreator = _permalinkCreator;
+            if (roomId !== permalinkCreator.roomId) {
+                if (permalinkCreators.has(roomId)) {
+                    permalinkCreator = permalinkCreators.get(roomId)!;
+                } else {
+                    permalinkCreator = new RoomPermalinkCreator(client.getRoom(roomId), roomId);
+                    permalinkCreators.set(roomId, permalinkCreator);
+                }
+            }
+
             ret.push(
                 <SearchResultTile
                     key={mxEv.getId()}

src/utils/permalinks/Permalinks.ts

@@ -82,7 +82,7 @@ const ANY_REGEX = /.*/;
 // the list and magically have the link work.
 
 export class RoomPermalinkCreator {
-    private roomId: string;
+    public readonly roomId: string;
     private highestPlUserId: string | null = null;
     private populationMap: { [serverName: string]: number } = {};
     private bannedHostsRegexps: RegExp[] = [];