From f829012045e06fb6794eab5345688404b40bdc1a Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 20 Oct 2017 10:16:51 +0100 Subject: [PATCH] Fix creation of DM rooms The check on whether a new chat was being started as a DM room got broken, so we weren't using the trusted_private_chat preset or setting the appropriate DM flags. Fixes https://github.com/vector-im/riot-web/issues/5318 and probably https://github.com/vector-im/riot-web/issues/3987 --- src/RoomInvite.js | 2 +- src/i18n/strings/en_EN.json | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/RoomInvite.js b/src/RoomInvite.js index ceb3dd0fda..427f549eb0 100644 --- a/src/RoomInvite.js +++ b/src/RoomInvite.js @@ -127,7 +127,7 @@ function _onRoomInviteFinished(roomId, shouldInvite, addrs) { } function _isDmChat(addrTexts) { - if (addrTexts.length === 1 && getAddressType(addrTexts[0]) === 'mx') { + if (addrTexts.length === 1 && getAddressType(addrTexts[0]) === 'mx-user-id') { return true; } else { return false; diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index f071d42f56..4338287be3 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -582,9 +582,7 @@ "Confirm Removal": "Confirm Removal", "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.", "%(actionVerb)s this person?": "%(actionVerb)s this person?", - "Community IDs must be of the form +localpart:%(domain)s": "Community IDs must be of the form +localpart:%(domain)s", "Community IDs may only contain alphanumeric characters": "Community IDs may only contain alphanumeric characters", - "It is currently only possible to create communities on your own home server: use a community ID ending with %(domain)s": "It is currently only possible to create communities on your own home server: use a community ID ending with %(domain)s", "Room creation failed": "Room creation failed", "Create Community": "Create Community", "Community Name": "Community Name",