Cleanup ignore user functionality slightly

3 files changed, 2 insertions, 19 deletions

diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp

index d85a9516..e8a0a507 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -521,8 +521,6 @@ 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>
@@ -2223,16 +2221,6 @@ 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, *err));
-    } else {
-        this->clearTimeline();
-    }
-}
-
-void
 TimelineModel::requestKeyForEvent(const QString &id)
 {
     auto encrypted_event = events.get(id.toStdString(), "", false);
diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h

index eefe921f..4ffd61ec 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -18,8 +18,6 @@
 #include "CacheStructs.h"
 #include "EventStore.h"
 #include "InputBar.h"
-#include "InviteesModel.h"
-#include "MemberList.h"
 #include "Permissions.h"
 #include "ReadReceiptsModel.h"
 #include "ui/RoomSummary.h"
@@ -463,7 +461,6 @@ public slots:
 private slots:
     void addPendingMessage(mtx::events::collections::TimelineEvents event);
     void scrollTimerEvent();
-    void handleIgnoredUser(const QString &id, const std::optional<QString> &err);
 
 signals:
     void dataAtIdChanged(QString id);
@@ -513,9 +510,6 @@ signals:
 
     void fetchedMore();
 
-    // The user may close the profile window before we receive a response, so handle it here
-    void ignoredUser(const QString &id, const std::optional<QString> &err);
-
 private:
     template<typename T>
     void sendEncryptedMessage(mtx::events::RoomEvent<T> msg, mtx::events::EventType eventType);
diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h

index 6a825b6f..b4e176cd 100644
--- a/src/timeline/TimelineViewManager.h
+++ b/src/timeline/TimelineViewManager.h
@@ -11,7 +11,8 @@
 #include <mtx/common.hpp>
 #include <mtx/responses/messages.hpp>
 
-#include "ReadReceiptsModel.h"
+#include "InviteesModel.h"
+#include "MemberList.h"
 #include "timeline/CommunitiesModel.h"
 #include "timeline/PresenceEmitter.h"
 #include "timeline/RoomlistModel.h"