From bbecadf1a8c3d78609a6112a879288f841b592f4 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Wed, 21 Jul 2021 20:38:18 -0400
Subject: Add functionality for loading global user profile where needed

This is so viewing profiles from the invite dialog will work as expected.
---
 src/timeline/TimelineViewManager.cpp | 6 ++++++
 src/timeline/TimelineViewManager.h   | 1 +
 2 files changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index b1643798..da3ba282 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -379,6 +379,12 @@ TimelineViewManager::openInviteUsers(QString roomId)
         emit openInviteUsersDialog(model);
 }
 
+void TimelineViewManager::openGlobalUserProfile(QString userId)
+{
+        UserProfile *profile = new UserProfile{QString{}, userId, this};
+        emit openProfile(profile);
+}
+
 void
 TimelineViewManager::setVideoCallItem()
 {
diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h
index 374685e3..bfc116b1 100644
--- a/src/timeline/TimelineViewManager.h
+++ b/src/timeline/TimelineViewManager.h
@@ -67,6 +67,7 @@ public:
         Q_INVOKABLE void openRoomMembers(QString room_id);
         Q_INVOKABLE void openRoomSettings(QString room_id);
         Q_INVOKABLE void openInviteUsers(QString roomId);
+        Q_INVOKABLE void openGlobalUserProfile(QString userId);
 
         Q_INVOKABLE void focusMessageInput();
         Q_INVOKABLE void openLeaveRoomDialog(QString roomid) const;
-- 
cgit 1.5.1


From 0ce7d02abed2f687a1a9795da8ab8e2ec96b0d65 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Thu, 22 Jul 2021 07:55:12 -0400
Subject: make lint

---
 resources/qml/MessageView.qml        | 1 +
 src/timeline/TimelineViewManager.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index d2c97d57..50cbd371 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -493,6 +493,7 @@ ScrollView {
                 foreground: Nheko.colors.mid
                 z: 3
             }
+
         }
 
     }
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index da3ba282..c08cfd53 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -379,7 +379,8 @@ TimelineViewManager::openInviteUsers(QString roomId)
         emit openInviteUsersDialog(model);
 }
 
-void TimelineViewManager::openGlobalUserProfile(QString userId)
+void
+TimelineViewManager::openGlobalUserProfile(QString userId)
 {
         UserProfile *profile = new UserProfile{QString{}, userId, this};
         emit openProfile(profile);
-- 
cgit 1.5.1