OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4286 from matrix-org/bwindels/picklastactivedmforverifreq 

Fix: pick last active DM for verification request
pull/21833/head
Bruno Windels 2020-03-26 17:05:17 +00:00 committed by GitHub
parent 053a5a5ff4 e3e40ace81
commit 491dad3669
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/createRoom.js
View File

@ -174,6 +174,9 @@ export function findDMForUser(client, userId) {
return member && (member.membership === "invite" || member.membership === "join"); return member && (member.membership === "invite" || member.membership === "join");
} }
return false; return false;
}).sort((r1, r2) => {
return r2.getLastActiveTimestamp() -
r1.getLastActiveTimestamp();
}); });
if (suitableDMRooms.length) { if (suitableDMRooms.length) {
return suitableDMRooms[0]; return suitableDMRooms[0];