Don't read avatarUrl from local profile, if no global avatar is set

resources/qml/RoomList.qml

@@ -447,6 +447,8 @@ Page {
             RowLayout {
                 id: userInfoGrid
 
+                property var profile: Nheko.currentUser
+
                 spacing: Nheko.paddingMedium
                 anchors.fill: parent
                 anchors.margins: Nheko.paddingMedium
@@ -457,9 +459,9 @@ Page {
                     Layout.alignment: Qt.AlignVCenter
                     Layout.preferredWidth: fontMetrics.lineSpacing * 2
                     Layout.preferredHeight: fontMetrics.lineSpacing * 2
-                    url: Nheko.currentUser.avatarUrl.replace("mxc://", "image://MxcImage/")
-                    displayName: Nheko.currentUser.displayName
-                    userid: Nheko.currentUser.userid
+                    url: (userInfoGrid.profile ? userInfoGrid.profile.avatarUrl : "").replace("mxc://", "image://MxcImage/")
+                    displayName: userInfoGrid.profile ? userInfoGrid.profile.displayName : ""
+                    userid: userInfoGrid.profile ? userInfoGrid.profile.userid : ""
                 }
 
                 ColumnLayout {
@@ -476,7 +478,7 @@ Page {
                         Layout.alignment: Qt.AlignBottom
                         font.pointSize: fontMetrics.font.pointSize * 1.1
                         font.weight: Font.DemiBold
-                        fullText: Nheko.currentUser.displayName
+                        fullText: userInfoGrid.profile ? userInfoGrid.profile.displayName : ""
                         elideWidth: col.width
                     }
 
@@ -486,7 +488,7 @@ Page {
                         font.weight: Font.Thin
                         font.pointSize: fontMetrics.font.pointSize * 0.9
                         elideWidth: col.width
-                        fullText: Nheko.currentUser.userid
+                        fullText: userInfoGrid.profile ? userInfoGrid.profile.userid : ""
                     }
 
                 }

src/Cache.cpp

@@ -2479,7 +2479,8 @@ Cache::getMember(const std::string &room_id, const std::string &user_id)
                         return m;
                 }
         } catch (std::exception &e) {
-                nhlog::db()->warn("Failed to read member ({}): {}", user_id, e.what());
+                nhlog::db()->warn(
+                  "Failed to read member ({}) in room ({}): {}", user_id, room_id, e.what());
         }
         return std::nullopt;
 }

src/ui/UserProfile.cpp

@@ -39,7 +39,8 @@ UserProfile::UserProfile(QString roomid,
                 getGlobalProfileData();
         }
 
-        if (!cache::client() || !cache::client()->isDatabaseReady())
+        if (!cache::client() || !cache::client()->isDatabaseReady() ||
+            !ChatPage::instance()->timelineManager())
                 return;
 
         connect(cache::client(),
@@ -127,10 +128,7 @@ UserProfile::displayName()
 QString
 UserProfile::avatarUrl()
 {
-        return (isGlobalUserProfile() && globalAvatarUrl != "")
-                 ? globalAvatarUrl
-                 : cache::avatarUrl(roomid_, userid_);
-        ;
+        return isGlobalUserProfile() ? globalAvatarUrl : cache::avatarUrl(roomid_, userid_);
 }
 
 bool