From f2593ec532311133c51146d1a42faf7e01ea5e86 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sat, 16 Jun 2018 20:56:48 +0900 Subject: Connection::doInDirectChat: "direct chat with self" feature Essentially - create/switch to the room with you as the only member instead of getting the first room where you happen to be flagged as a direct chat user (which is pretty unpredictable even if stable from the user point of view). --- lib/connection.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/connection.cpp b/lib/connection.cpp index 6c04cf08..d363b433 100644 --- a/lib/connection.cpp +++ b/lib/connection.cpp @@ -497,6 +497,9 @@ void Connection::doInDirectChat(const QString& userId, if (auto r = room(roomId, JoinState::Join)) { Q_ASSERT(r->id() == roomId); + // A direct chat with yourself should only involve yourself :) + if (userId == d->userId && r->memberCount() > 1) + continue; qCDebug(MAIN) << "Requested direct chat with" << userId << "is already available as" << r->id(); operation(r); -- cgit v1.2.3