From d1ba9fd878ce4fedcd9a8f21875e53d322653e7e Mon Sep 17 00:00:00 2001
From: NepNep21 <43792621+NepNep21@users.noreply.github.com>
Date: Thu, 27 Jul 2023 22:04:34 -0300
Subject: Rebase

---
 src/timeline/TimelineModel.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src/timeline/TimelineModel.cpp')

diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index b2a036c5..ce136e35 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -521,6 +521,8 @@ TimelineModel::TimelineModel(TimelineViewManager *manager, QString room_id, QObj
         cache::client()->updateState(room_id_.toStdString(), events_, true);
         this->syncState({std::move(events_.events)});
     });
+
+    connect(this, &TimelineModel::ignoredUser, this, &TimelineModel::handleIgnoredUser);
 }
 
 QHash<int, QByteArray>
@@ -2108,6 +2110,17 @@ TimelineModel::scrollTimerEvent()
     }
 }
 
+void
+TimelineModel::handleIgnoredUser(const QString &id, const std::optional<QString> &err)
+{
+    if (err) {
+        MainWindow::instance()->showNotification(
+          tr("Failed to ignore \"%1\": %2").arg(id).arg(*err));
+    } else {
+        this->clearTimeline();
+    }
+}
+
 void
 TimelineModel::requestKeyForEvent(const QString &id)
 {
-- 
cgit 1.5.1


From 44cf096111388264531fe5750a3c5caa59be7203 Mon Sep 17 00:00:00 2001
From: NepNep21 <43792621+NepNep21@users.noreply.github.com>
Date: Thu, 7 Sep 2023 19:17:03 -0300
Subject: Lint + clazy

---
 src/timeline/TimelineModel.cpp       | 2 +-
 src/timeline/TimelineViewManager.cpp | 8 +++++---
 src/timeline/TimelineViewManager.h   | 5 +----
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/timeline/TimelineModel.cpp')

diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index ce136e35..a384d7c2 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -2115,7 +2115,7 @@ TimelineModel::handleIgnoredUser(const QString &id, const std::optional<QString>
 {
     if (err) {
         MainWindow::instance()->showNotification(
-          tr("Failed to ignore \"%1\": %2").arg(id).arg(*err));
+          tr("Failed to ignore \"%1\": %2").arg(id, *err));
     } else {
         this->clearTimeline();
     }
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index 3e623d7a..e2616c14 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -565,7 +565,9 @@ TimelineViewManager::fixImageRendering(QQuickTextDocument *t, QQuickItem *i)
 
 using IgnoredUsers = mtx::events::EphemeralEvent<mtx::events::account_data::IgnoredUsers>;
 
-static QVector<QString> convertIgnoredToQt(const IgnoredUsers &ev) {
+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));
@@ -586,14 +588,14 @@ TimelineViewManager::getIgnoredUsers()
 }
 
 void
-TimelineViewManager::processIgnoredUsers(const mtx::responses::AccountData &data) 
+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;
     }
diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h
index 74832c02..6a825b6f 100644
--- a/src/timeline/TimelineViewManager.h
+++ b/src/timeline/TimelineViewManager.h
@@ -63,10 +63,7 @@ public:
         return instance_;
     }
 
-    static TimelineViewManager *instance()
-    {
-        return TimelineViewManager::instance_;
-    }
+    static TimelineViewManager *instance() { return TimelineViewManager::instance_; }
 
     QVector<QString> getIgnoredUsers();
 
-- 
cgit 1.5.1


From c4fb9ac14519848a5476942585923acbbe687fec Mon Sep 17 00:00:00 2001
From: NepNep21 <43792621+NepNep21@users.noreply.github.com>
Date: Thu, 7 Sep 2023 19:22:13 -0300
Subject: Fix lint after clazy fix

---
 src/timeline/TimelineModel.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/timeline/TimelineModel.cpp')

diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index a384d7c2..e13b56d7 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -2114,8 +2114,7 @@ void
 TimelineModel::handleIgnoredUser(const QString &id, const std::optional<QString> &err)
 {
     if (err) {
-        MainWindow::instance()->showNotification(
-          tr("Failed to ignore \"%1\": %2").arg(id, *err));
+        MainWindow::instance()->showNotification(tr("Failed to ignore \"%1\": %2").arg(id, *err));
     } else {
         this->clearTimeline();
     }
-- 
cgit 1.5.1