Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 9bc2793

Browse files
committed
Allow finding group DMs by members in spotlight
1 parent 8b84195 commit 9bc2793

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,16 +180,20 @@ const toPublicRoomResult = (publicRoom: IPublicRoomsChunkRoom): IPublicRoomResul
180180
});
181181

182182
const toRoomResult = (room: Room): IRoomResult => {
183+
const myUserId = MatrixClientPeg.get().getUserId();
183184
const otherUserId = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
185+
184186
if (otherUserId) {
187+
const otherMembers = room.getMembers().filter(it => it.userId !== myUserId);
188+
const query = [
189+
...otherMembers.map(it => it.name.toLowerCase()),
190+
...otherMembers.map(it => it.userId.toLowerCase()),
191+
].filter(Boolean);
185192
return {
186193
room,
187194
section: Section.People,
188195
filter: [Filter.People],
189-
query: [
190-
otherUserId.toLowerCase(),
191-
room.getMember(otherUserId)?.name.toLowerCase(),
192-
].filter(Boolean),
196+
query,
193197
};
194198
} else if (room.isSpaceRoom()) {
195199
return {

src/utils/i18n-helpers.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ export function roomContextDetailsText(room: Room): string {
4444
if (room.isSpaceRoom()) return undefined;
4545

4646
const dmPartner = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
47-
if (dmPartner) {
47+
// if we’ve got more than 2 users, don’t treat it like a regular DM
48+
const isGroupDm = room.getMembers().length > 2;
49+
if (dmPartner && !isGroupDm) {
4850
return dmPartner;
4951
}
5052

0 commit comments

Comments
 (0)