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

Commit a9d0699

Browse files
authored
Merge pull request #6062 from matrix-org/t3chguy/fix/17280
Show DMs in space for invited members too, to match Android impl
2 parents f985918 + 88d3706 commit a9d0699

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/stores/SpaceStore.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,8 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
361361
const space = this.matrixClient?.getRoom(spaceId);
362362

363363
// Add relevant DMs
364-
space?.getJoinedMembers().forEach(member => {
364+
space?.getMembers().forEach(member => {
365+
if (member.membership !== "join" && member.membership !== "invite") return;
365366
DMRoomMap.shared().getDMRoomsForUserId(member.userId).forEach(roomId => {
366367
roomIds.add(roomId);
367368
});

test/test-utils.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ export function mkStubRoom(roomId = null) {
234234
}),
235235
getMembersWithMembership: jest.fn().mockReturnValue([]),
236236
getJoinedMembers: jest.fn().mockReturnValue([]),
237+
getMembers: jest.fn().mockReturnValue([]),
237238
getPendingEvents: () => [],
238239
getLiveTimeline: () => stubTimeline,
239240
getUnfilteredTimelineSet: () => null,

0 commit comments

Comments
 (0)