From 09b88d164fabe13440a74dfb3137ba0e57e4e7f1 Mon Sep 17 00:00:00 2001
From: Ajay Bura <32841439+ajbura@users.noreply.github.com>
Date: Tue, 19 Aug 2025 18:08:46 +0530
Subject: [PATCH] Fix message button opens left dm room (#2453)

---
 src/app/utils/matrix.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/utils/matrix.ts b/src/app/utils/matrix.ts
index b4e2e6b8..a8031202 100644
--- a/src/app/utils/matrix.ts
+++ b/src/app/utils/matrix.ts
@@ -17,7 +17,7 @@ import to from 'await-to-js';
 import { IImageInfo, IThumbnailContent, IVideoInfo } from '../../types/matrix/common';
 import { AccountDataEvent } from '../../types/matrix/accountData';
 import { getStateEvent } from './room';
-import { StateEvent } from '../../types/matrix/room';
+import { Membership, StateEvent } from '../../types/matrix/room';
 
 const DOMAIN_REGEX = /\b(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}\b/;
 
@@ -182,7 +182,12 @@ export const eventWithShortcode = (ev: MatrixEvent) =>
 export const getDMRoomFor = (mx: MatrixClient, userId: string): Room | undefined => {
   const dmLikeRooms = mx
     .getRooms()
-    .filter((room) => room.hasEncryptionStateEvent() && room.getMembers().length <= 2);
+    .filter(
+      (room) =>
+        room.getMyMembership() === Membership.Join &&
+        room.hasEncryptionStateEvent() &&
+        room.getMembers().length <= 2
+    );
 
   return dmLikeRooms.find((room) => room.getMember(userId));
 };