Fix broken User::displayName() logic

Also, add an assert to Connection::user() to make sure it doesn't create users with invalid ids. Closes quotient-im#201.
nicolasfella · Apr 27, 2018 · 3a763fd · 3a763fd
1 parent e74e485
commit 3a763fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/connection.cpp b/lib/connection.cpp
@@ -590,6 +590,7 @@ Room* Connection::invitation(const QString& roomId) const
 
 User* Connection::user(const QString& userId)
 {
+    Q_ASSERT(userId.startsWith('@') && userId.contains(':'));
     if( d->userMap.contains(userId) )
         return d->userMap.value(userId);
     auto* user = userFactory(this, userId);

diff --git a/lib/user.cpp b/lib/user.cpp
@@ -311,7 +311,7 @@ QString User::displayname(const Room* room) const
 {
     auto name = d->nameForRoom(room);
     return name.isEmpty() ? d->userId :
-           room ? room->roomMembername(name) : name;
+           room ? room->roomMembername(this) : name;
 }
 
 QString User::fullName(const Room* room) const