Use properties

6 files changed, 58 insertions, 34 deletions

diff --git a/resources/qml/dialogs/IgnoredUsers.qml b/resources/qml/dialogs/IgnoredUsers.qml
index 65574338..bdd24a57 100644
--- a/resources/qml/dialogs/IgnoredUsers.qml
+++ b/resources/qml/dialogs/IgnoredUsers.qml
@@ -10,7 +10,6 @@ import im.nheko 1.0
 
 Window {
     id: ignoredUsers
-    required property list<string> users
     required property var profile
 
     title: qsTr("Ignored users")
@@ -22,13 +21,9 @@ Window {
 
     Connections {
         target: profile
-        function onUnignoredUser(id, err) {
-            if (err) {
-                const text = qsTr("Failed to unignore \"%1\": %2").arg(id).arg(err)
-                MainWindow.showNotification(text)
-            } else {
-                users = Array.from(users).filter(user => user !== id)
-            }
+        function onUnignoredUserError(id, err) {
+            const text = qsTr("Failed to unignore \"%1\": %2").arg(id).arg(err)
+            MainWindow.showNotification(text)
         }
     }
 
@@ -37,7 +32,7 @@ Window {
         anchors.fill: parent
         spacing: Nheko.paddingMedium
 
-        model: users
+        model: TimelineManager.ignoredUsers
         header: ColumnLayout {
             Text {
                 Layout.fillWidth: true
diff --git a/resources/qml/dialogs/UserProfile.qml b/resources/qml/dialogs/UserProfile.qml
index 4df27a3f..3d65d52a 100644
--- a/resources/qml/dialogs/UserProfile.qml
+++ b/resources/qml/dialogs/UserProfile.qml
@@ -322,7 +322,7 @@ ApplicationWindow {
                     onClicked: {
                         var component = Qt.createComponent("IgnoredUsers.qml")
                         if (component.status == Component.Ready) {
-                            var window = component.createObject(userProfileDialog, {users: profile.getIgnoredUsers(), profile: profile})
+                            var window = component.createObject(userProfileDialog, { profile: profile})
                             window.show()
                             timelineRoot.destroyOnClose(window)
                         } else {
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index b8bd679b..3e623d7a 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -12,6 +12,7 @@
 #include <QString>
 
 #include "Cache.h"
+#include "Cache_p.h"
 #include "ChatPage.h"
 #include "CombinedImagePackModel.h"
 #include "CommandCompleter.h"
@@ -210,6 +211,7 @@ TimelineViewManager::sync(const mtx::responses::Sync &sync_)
     this->rooms_->sync(sync_);
     this->communities_->sync(sync_);
     this->presenceEmitter->sync(sync_.presence);
+    this->processIgnoredUsers(sync_.account_data);
 
     if (isInitialSync_) {
         this->isInitialSync_ = false;
@@ -560,3 +562,39 @@ TimelineViewManager::fixImageRendering(QQuickTextDocument *t, QQuickItem *i)
         QObject::connect(t->textDocument(), SIGNAL(imagesLoaded()), i, SLOT(updateWholeDocument()));
     }
 }
+
+using IgnoredUsers = mtx::events::EphemeralEvent<mtx::events::account_data::IgnoredUsers>;
+
+static QVector<QString> convertIgnoredToQt(const IgnoredUsers &ev) {
+    QVector<QString> users;
+    for (const mtx::events::account_data::IgnoredUser &user : ev.content.users) {
+        users.push_back(QString::fromStdString(user.id));
+    }
+
+    return users;
+}
+
+QVector<QString>
+TimelineViewManager::getIgnoredUsers()
+{
+    const auto cache = cache::client()->getAccountData(mtx::events::EventType::IgnoredUsers);
+    if (!cache) {
+        return {};
+    }
+
+    return convertIgnoredToQt(std::get<IgnoredUsers>(*cache));
+}
+
+void
+TimelineViewManager::processIgnoredUsers(const mtx::responses::AccountData &data) 
+{
+    for (const mtx::events::collections::RoomAccountDataEvents::variant &ev : data.events) {
+        if (!std::holds_alternative<IgnoredUsers>(ev)) {
+            continue;
+        }
+        const auto &ignoredEv = std::get<IgnoredUsers>(ev);
+        
+        emit this->ignoredUsersChanged(convertIgnoredToQt(ignoredEv));
+        break;
+    }
+}
\ No newline at end of file
diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h
index f3bd04a2..74832c02 100644
--- a/src/timeline/TimelineViewManager.h
+++ b/src/timeline/TimelineViewManager.h
@@ -39,6 +39,7 @@ class TimelineViewManager final : public QObject
     Q_PROPERTY(
       bool isInitialSync MEMBER isInitialSync_ READ isInitialSync NOTIFY initialSyncChanged)
     Q_PROPERTY(bool isConnected READ isConnected NOTIFY isConnectedChanged)
+    Q_PROPERTY(QVector<QString> ignoredUsers READ getIgnoredUsers NOTIFY ignoredUsersChanged)
 
 public:
     TimelineViewManager(CallManager *callManager, ChatPage *parent = nullptr);
@@ -62,6 +63,13 @@ public:
         return instance_;
     }
 
+    static TimelineViewManager *instance()
+    {
+        return TimelineViewManager::instance_;
+    }
+
+    QVector<QString> getIgnoredUsers();
+
     void sync(const mtx::responses::Sync &sync_);
 
     VerificationManager *verificationManager() { return verificationManager_; }
@@ -113,6 +121,7 @@ signals:
                           QString url,
                           double originalWidth,
                           double proportionalHeight);
+    void ignoredUsersChanged(const QVector<QString> &ignoredUsers);
 
 public slots:
     void updateReadReceipts(const QString &room_id, const std::vector<QString> &event_ids);
@@ -154,4 +163,6 @@ private:
     QHash<QPair<QString, quint64>, QColor> userColors;
 
     inline static TimelineViewManager *instance_ = nullptr;
+
+    void processIgnoredUsers(const mtx::responses::AccountData &data);
 };
diff --git a/src/ui/UserProfile.cpp b/src/ui/UserProfile.cpp
index 5146ff26..3b2375ad 100644
--- a/src/ui/UserProfile.cpp
+++ b/src/ui/UserProfile.cpp
@@ -224,28 +224,10 @@ UserProfile::refreshDevices()
     fetchDeviceList(this->userid_);
 }
 
-QVector<QString>
-UserProfile::getIgnoredUsers()
-{
-    QVector<QString> vec;
-    const std::optional<mtx::events::collections::RoomAccountDataEvents::variant> optEv =
-      cache::client()->getAccountData(mtx::events::EventType::IgnoredUsers);
-    if (optEv) {
-        const auto &ev =
-          std::get<mtx::events::EphemeralEvent<mtx::events::account_data::IgnoredUsers>>(*optEv)
-            .content;
-        for (const mtx::events::account_data::IgnoredUser &user : ev.users) {
-            vec.append(QString::fromStdString(user.id));
-        }
-    }
-
-    return vec;
-}
-
 void
 UserProfile::ignoredStatus(const QString &id, const bool ignore)
 {
-    auto old = this->getIgnoredUsers();
+    auto old = TimelineViewManager::instance()->getIgnoredUsers();
     if (ignore) {
         if (old.contains(id)) {
             emit this->room()->ignoredUser(id, tr("Already ignored"));
@@ -268,9 +250,8 @@ UserProfile::ignoredStatus(const QString &id, const bool ignore)
         if (ignore) {
             emit this->room()->ignoredUser(
               id, e ? std::optional(QString::fromStdString(e->matrix_error.error)) : std::nullopt);
-        } else {
-            emit this->unignoredUser(
-              id, e ? QVariant(QString::fromStdString(e->matrix_error.error)) : QVariant());
+        } else if (e) {
+            emit this->unignoredUserError(id, QString::fromStdString(e->matrix_error.error));
         }
     });
 }
diff --git a/src/ui/UserProfile.h b/src/ui/UserProfile.h
index 2908b57e..1affe8bd 100644
--- a/src/ui/UserProfile.h
+++ b/src/ui/UserProfile.h
@@ -182,7 +182,6 @@ public:
     Q_INVOKABLE void unverify(const QString &device = QLatin1String(""));
     Q_INVOKABLE void fetchDeviceList(const QString &userID);
     Q_INVOKABLE void refreshDevices();
-    Q_INVOKABLE QVector<QString> getIgnoredUsers();
     Q_INVOKABLE void banUser();
     Q_INVOKABLE void signOutDevice(const QString &deviceID);
     Q_INVOKABLE void ignoredStatus(const QString &id, const bool ignore);
@@ -202,7 +201,7 @@ signals:
     void displayError(const QString &errorMessage);
     void globalUsernameRetrieved(const QString &globalUser);
     void devicesChanged();
-    void unignoredUser(const QString &id, const QVariant &err);
+    void unignoredUserError(const QString &id, const QVariant &err);
 
     // internal
     void verificationStatiChanged();