From e8b9d92e8e84df51dfce386e722f0de398b198bd Mon Sep 17 00:00:00 2001
From: FallenValkyrie <e.vanemelen@proton.me>
Date: Thu, 7 Dec 2023 00:56:24 +0100
Subject: [PATCH] Factor out the logic to delete an ImagePack
---
src/SingleImagePackModel.cpp | 30 ++++++++++++++++++------------
src/SingleImagePackModel.h | 1 +
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/SingleImagePackModel.cpp b/src/SingleImagePackModel.cpp
index 1adfdaa23..daec135fa 100644
--- a/src/SingleImagePackModel.cpp
+++ b/src/SingleImagePackModel.cpp
@@ -285,18 +285,7 @@ SingleImagePackModel::save()
});
} else {
if (old_statekey_ != statekey_) {
- http::client()->send_state_event(
- roomid_,
- to_string(mtx::events::EventType::ImagePackInRoom),
- old_statekey_,
- nlohmann::json::object(),
- [](const mtx::responses::EventId &, mtx::http::RequestErr e) {
- if (e)
- ChatPage::instance()->showNotification(
- tr("Failed to delete old image pack: %1")
- .arg(QString::fromStdString(e->matrix_error.error)));
- });
- old_statekey_ = statekey_;
+ this->remove();
}
http::client()->send_state_event(
@@ -314,6 +303,23 @@ SingleImagePackModel::save()
}
}
+void
+SingleImagePackModel::remove()
+{
+ http::client()->send_state_event(
+ roomid_,
+ to_string(mtx::events::EventType::ImagePackInRoom),
+ old_statekey_,
+ nlohmann::json::object(),
+ [](const mtx::responses::EventId &, mtx::http::RequestErr e) {
+ if (e)
+ ChatPage::instance()->showNotification(
+ tr("Failed to delete old image pack: %1")
+ .arg(QString::fromStdString(e->matrix_error.error)));
+ });
+ old_statekey_ = statekey_;
+}
+
void
SingleImagePackModel::addStickers(QList<QUrl> files)
{
diff --git a/src/SingleImagePackModel.h b/src/SingleImagePackModel.h
index e1ab98fba..d5cc818e8 100644
--- a/src/SingleImagePackModel.h
+++ b/src/SingleImagePackModel.h
@@ -70,6 +70,7 @@ public:
void setIsEmotePack(bool val);
Q_INVOKABLE void save();
+ Q_INVOKABLE void remove();
Q_INVOKABLE void addStickers(QList<QUrl> files);
Q_INVOKABLE void remove(int index);
Q_INVOKABLE void setAvatar(QUrl file);
--
GitLab