diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index e8a0a507..d85a9516 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>
@@ -2221,6 +2223,16 @@ 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 23c3c802..eefe921f 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -463,6 +463,7 @@ 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);
@@ -512,6 +513,9 @@ 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.cpp b/src/timeline/TimelineViewManager.cpp
index b8bd679b..e2616c14 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,41 @@ 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..6a825b6f 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,10 @@ 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 +118,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 +160,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 80def409..3b2375ad 100644
--- a/src/ui/UserProfile.cpp
+++ b/src/ui/UserProfile.cpp
@@ -225,6 +225,38 @@ UserProfile::refreshDevices()
}
void
+UserProfile::ignoredStatus(const QString &id, const bool ignore)
+{
+ auto old = TimelineViewManager::instance()->getIgnoredUsers();
+ if (ignore) {
+ if (old.contains(id)) {
+ emit this->room()->ignoredUser(id, tr("Already ignored"));
+ return;
+ }
+ old.append(id);
+ } else {
+ old.removeOne(id);
+ }
+
+ std::vector<mtx::events::account_data::IgnoredUser> content;
+ for (const QString &item : old) {
+ const mtx::events::account_data::IgnoredUser data{.id = item.toStdString()};
+ content.push_back(data);
+ }
+
+ const mtx::events::account_data::IgnoredUsers payload{.users{content}};
+
+ http::client()->put_account_data(payload, [this, id, ignore](mtx::http::RequestErr e) {
+ if (ignore) {
+ emit this->room()->ignoredUser(
+ id, e ? std::optional(QString::fromStdString(e->matrix_error.error)) : std::nullopt);
+ } else if (e) {
+ emit this->unignoredUserError(id, QString::fromStdString(e->matrix_error.error));
+ }
+ });
+}
+
+void
UserProfile::fetchDeviceList(const QString &userID)
{
if (!cache::client() || !cache::client()->isDatabaseReady())
@@ -345,10 +377,6 @@ UserProfile::banUser()
ChatPage::instance()->banUser(roomid_, this->userid_, QLatin1String(""));
}
-// void ignoreUser(){
-
-// }
-
void
UserProfile::kickUser()
{
diff --git a/src/ui/UserProfile.h b/src/ui/UserProfile.h
index d8e06aa1..1affe8bd 100644
--- a/src/ui/UserProfile.h
+++ b/src/ui/UserProfile.h
@@ -184,7 +184,7 @@ public:
Q_INVOKABLE void refreshDevices();
Q_INVOKABLE void banUser();
Q_INVOKABLE void signOutDevice(const QString &deviceID);
- // Q_INVOKABLE void ignoreUser();
+ Q_INVOKABLE void ignoredStatus(const QString &id, const bool ignore);
Q_INVOKABLE void kickUser();
Q_INVOKABLE void startChat();
Q_INVOKABLE void startChat(bool encryptionEnabled);
@@ -201,6 +201,7 @@ signals:
void displayError(const QString &errorMessage);
void globalUsernameRetrieved(const QString &globalUser);
void devicesChanged();
+ void unignoredUserError(const QString &id, const QVariant &err);
// internal
void verificationStatiChanged();
|
