From e3e40ace819ff025d1c48f5b0e9ec60bc5f9b7a4 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 26 Mar 2020 17:45:59 +0100
Subject: [PATCH] Fix: pick last active DM for verification request

---
 src/createRoom.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/createRoom.js b/src/createRoom.js
index 45e849065d..66d4d1908e 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -174,6 +174,9 @@ export function findDMForUser(client, userId) {
             return member && (member.membership === "invite" || member.membership === "join");
         }
         return false;
+    }).sort((r1, r2) => {
+        return r2.getLastActiveTimestamp() -
+            r1.getLastActiveTimestamp();
     });
     if (suitableDMRooms.length) {
         return suitableDMRooms[0];