diff --git a/src/ui/HiddenEvents.cpp b/src/ui/HiddenEvents.cpp
new file mode 100644
index 00000000..a8da812e
--- /dev/null
+++ b/src/ui/HiddenEvents.cpp
@@ -0,0 +1,93 @@
+// SPDX-FileCopyrightText: 2022 Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "HiddenEvents.h"
+
+#include "Cache_p.h"
+#include "MainWindow.h"
+#include "MatrixClient.h"
+
+void
+HiddenEvents::load()
+{
+ using namespace mtx::events;
+ mtx::events::account_data::nheko_extensions::HiddenEvents hiddenEvents;
+ hiddenEvents.hidden_event_types = std::vector{
+ EventType::Reaction,
+ EventType::CallCandidates,
+ EventType::Unsupported,
+ };
+
+ if (auto temp =
+ cache::client()->getAccountData(mtx::events::EventType::NhekoHiddenEvents, "")) {
+ auto h = std::get<
+ mtx::events::AccountDataEvent<mtx::events::account_data::nheko_extensions::HiddenEvents>>(
+ *temp);
+ if (h.content.hidden_event_types)
+ hiddenEvents = std::move(h.content);
+ }
+
+ if (!roomid_.isEmpty()) {
+ if (auto temp = cache::client()->getAccountData(mtx::events::EventType::NhekoHiddenEvents,
+ roomid_.toStdString())) {
+ auto h = std::get<mtx::events::AccountDataEvent<
+ mtx::events::account_data::nheko_extensions::HiddenEvents>>(*temp);
+ if (h.content.hidden_event_types)
+ hiddenEvents = std::move(h.content);
+ }
+ }
+
+ hiddenEvents_.clear();
+ hiddenEvents_ = std::move(hiddenEvents.hidden_event_types.value());
+ emit hiddenEventsChanged();
+}
+
+Q_INVOKABLE void
+HiddenEvents::toggle(int type)
+{
+ auto t = qml_mtx_events::fromRoomEventType(static_cast<qml_mtx_events::EventType>(type));
+ if (auto it = std::find(begin(hiddenEvents_), end(hiddenEvents_), t); it != end(hiddenEvents_))
+ hiddenEvents_.erase(it);
+ else
+ hiddenEvents_.push_back(t);
+ emit hiddenEventsChanged();
+}
+
+QVariantList
+HiddenEvents::hiddenEvents() const
+{
+ QVariantList l;
+ for (const auto &e : hiddenEvents_) {
+ l.push_back(qml_mtx_events::toRoomEventType(e));
+ }
+
+ return l;
+}
+
+void
+HiddenEvents::save()
+{
+ mtx::events::account_data::nheko_extensions::HiddenEvents hiddenEvents;
+ hiddenEvents.hidden_event_types = hiddenEvents_;
+
+ if (roomid_.isEmpty())
+ http::client()->put_account_data(hiddenEvents, [](mtx::http::RequestErr e) {
+ if (e) {
+ nhlog::net()->error("Failed to set hidden events: {}", *e);
+ MainWindow::instance()->showNotification(
+ tr("Failed to set hidden events: %1")
+ .arg(QString::fromStdString(e->matrix_error.error)));
+ }
+ });
+ else
+ http::client()->put_room_account_data(
+ roomid_.toStdString(), hiddenEvents, [](mtx::http::RequestErr e) {
+ if (e) {
+ nhlog::net()->error("Failed to set hidden events: {}", *e);
+ MainWindow::instance()->showNotification(
+ tr("Failed to set hidden events: %1")
+ .arg(QString::fromStdString(e->matrix_error.error)));
+ }
+ });
+}
diff --git a/src/ui/HiddenEvents.h b/src/ui/HiddenEvents.h
new file mode 100644
index 00000000..928b14ba
--- /dev/null
+++ b/src/ui/HiddenEvents.h
@@ -0,0 +1,46 @@
+// SPDX-FileCopyrightText: 2022 Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <QObject>
+#include <QString>
+#include <QVariantList>
+
+#include "timeline/TimelineModel.h"
+
+class HiddenEvents : public QObject
+{
+ Q_OBJECT
+ Q_PROPERTY(QString roomid READ roomid WRITE setRoomid NOTIFY roomidChanged REQUIRED)
+ Q_PROPERTY(QVariantList hiddenEvents READ hiddenEvents NOTIFY hiddenEventsChanged)
+public:
+ explicit HiddenEvents(QObject *p = nullptr)
+ : QObject(p)
+ {}
+
+ Q_INVOKABLE void toggle(int type);
+ Q_INVOKABLE void save();
+
+ [[nodiscard]] QString roomid() const { return roomid_; }
+ void setRoomid(const QString &r)
+ {
+ roomid_ = r;
+ emit roomidChanged();
+
+ load();
+ }
+
+ [[nodiscard]] QVariantList hiddenEvents() const;
+
+signals:
+ void roomidChanged();
+ void hiddenEventsChanged();
+
+private:
+ QString roomid_;
+ std::vector<mtx::events::EventType> hiddenEvents_;
+
+ void load();
+};
diff --git a/src/ui/RoomSettings.cpp b/src/ui/RoomSettings.cpp
index b7fb0887..43a11b7f 100644
--- a/src/ui/RoomSettings.cpp
+++ b/src/ui/RoomSettings.cpp
@@ -13,7 +13,6 @@
#include <QStandardPaths>
#include <QVBoxLayout>
#include <mtx/events/event_type.hpp>
-#include <mtx/events/nheko_extensions/hidden_events.hpp>
#include <mtx/responses/common.hpp>
#include <mtx/responses/media.hpp>
#include <mtxclient/http/client.hpp>
@@ -228,8 +227,6 @@ RoomSettings::RoomSettings(QString roomid, QObject *parent)
accessRules_ = 4;
}
emit accessJoinRulesChanged();
-
- readHiddenEventsSettings(roomid_);
}
QString
@@ -641,50 +638,3 @@ RoomSettings::updateAvatar()
});
});
}
-
-void
-RoomSettings::saveHiddenEventsSettings(const QSet<QString> &events, const QString &roomId)
-{
- account_data::nheko_extensions::HiddenEvents hiddenEvents;
- hiddenEvents.hidden_event_types = {
- EventType::Reaction, EventType::CallCandidates, EventType::Unsupported};
- for (const auto &event : events) {
- hiddenEvents.hidden_event_types.emplace_back(getEventType(event.toStdString()));
- }
-
- if (!roomId.isEmpty()) {
- const auto rid = roomId.toStdString();
- http::client()->put_room_account_data(rid, hiddenEvents, [&rid](mtx::http::RequestErr e) {
- if (e) {
- nhlog::net()->error(
- "Failed to update room account data with hidden events in {}: {}", rid, *e);
- }
- });
- } else {
- http::client()->put_account_data(hiddenEvents, [](mtx::http::RequestErr e) {
- if (e) {
- nhlog::net()->error("Failed to update account data with hidden events: {}", *e);
- }
- });
- }
-}
-
-bool
-RoomSettings::eventHidden(const QString event) const
-{
- return hiddenEvents_.contains(event);
-}
-
-void
-RoomSettings::readHiddenEventsSettings(const QString &roomId)
-{
- if (auto hiddenEvents = cache::client()->getAccountData(
- mtx::events::EventType::NhekoHiddenEvents, roomId.toStdString())) {
- if (auto tmp = std::get_if<mtx::events::EphemeralEvent<
- mtx::events::account_data::nheko_extensions::HiddenEvents>>(&*hiddenEvents)) {
- for (const auto event : tmp->content.hidden_event_types) {
- hiddenEvents_.insert(mtx::events::to_string(event).data());
- }
- }
- }
-}
diff --git a/src/ui/RoomSettings.h b/src/ui/RoomSettings.h
index 438ac979..f79aa3f7 100644
--- a/src/ui/RoomSettings.h
+++ b/src/ui/RoomSettings.h
@@ -111,9 +111,6 @@ public:
Q_INVOKABLE void openEditModal();
Q_INVOKABLE void changeAccessRules(int index);
Q_INVOKABLE void changeNotifications(int currentIndex);
- Q_INVOKABLE void
- saveHiddenEventsSettings(const QSet<QString> &events, const QString &roomId = {});
- Q_INVOKABLE bool eventHidden(QString event) const;
signals:
void loadingChanged();
@@ -134,7 +131,6 @@ private:
void updateAccessRules(const std::string &room_id,
const mtx::events::state::JoinRules &,
const mtx::events::state::GuestAccess &);
- void readHiddenEventsSettings(const QString &roomId = {});
private:
QString roomid_;
@@ -143,5 +139,4 @@ private:
RoomInfo info_;
int notifications_ = 0;
int accessRules_ = 0;
- QSet<QString> hiddenEvents_;
};
|
