Allow finding group DMs by members in spotlight

src/components/views/dialogs/spotlight/SpotlightDialog.tsx

@@ -180,17 +180,33 @@ const toPublicRoomResult = (publicRoom: IPublicRoomsChunkRoom): IPublicRoomResul
 });
 
 const toRoomResult = (room: Room): IRoomResult => {
+    const myUserId = MatrixClientPeg.get().getUserId();
     const otherUserId = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
+
     if (otherUserId) {
-        return {
-            room,
-            section: Section.People,
-            filter: [Filter.People],
-            query: [
-                otherUserId.toLowerCase(),
-                room.getMember(otherUserId)?.name.toLowerCase(),
-            ].filter(Boolean),
-        };
+        const otherMembers = room.getMembers().filter(it => it.userId !== myUserId);
+        const query = [
+            ...otherMembers.map(it => it.name.toLowerCase()),
+            ...otherMembers.map(it => it.userId.toLowerCase()),
+        ].filter(Boolean);
+
+        // if we’ve got more than 2 users, don’t treat it like a regular DM
+        const isGroupDm = room.getMembers().length > 2;
+        if (isGroupDm) {
+            return {
+                room,
+                section: Section.Rooms,
+                filter: [],
+                query,
+            };
+        } else {
+            return {
+                room,
+                section: Section.People,
+                filter: [Filter.People],
+                query,
+            };
+        }
     } else if (room.isSpaceRoom()) {
         return {
             room,

src/utils/i18n-helpers.ts

@@ -44,7 +44,9 @@ export function roomContextDetailsText(room: Room): string {
     if (room.isSpaceRoom()) return undefined;
 
     const dmPartner = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
-    if (dmPartner) {
+    // if we’ve got more than 2 users, don’t treat it like a regular DM
+    const isGroupDm = room.getMembers().length > 2;
+    if (dmPartner && !isGroupDm) {
         return dmPartner;
     }