From b89257a34b2a98b737f4ae544f7e436b9000b240 Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Sat, 9 Jun 2018 16:03:14 +0300
Subject: Migrate to mtxclient for the http calls

---
 src/dialogs/RoomSettings.cpp | 80 +++++++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 41 deletions(-)

(limited to 'src/dialogs/RoomSettings.cpp')

diff --git a/src/dialogs/RoomSettings.cpp b/src/dialogs/RoomSettings.cpp
index 4d2f304b..2396fc19 100644
--- a/src/dialogs/RoomSettings.cpp
+++ b/src/dialogs/RoomSettings.cpp
@@ -67,6 +67,20 @@ EditModal::EditModal(const QString &roomId, QWidget *parent)
         labelLayout->addWidget(errorField_);
         layout->addLayout(labelLayout);
 
+        connect(this, &EditModal::stateEventErrorCb, this, [this](const QString &msg) {
+                errorField_->setText(msg);
+                errorField_->show();
+        });
+        connect(this, &EditModal::nameEventSentCb, this, [this](const QString &newName) {
+                errorField_->hide();
+                emit nameChanged(newName);
+                close();
+        });
+        connect(this, &EditModal::topicEventSentCb, this, [this]() {
+                errorField_->hide();
+                close();
+        });
+
         connect(applyBtn_, &QPushButton::clicked, [this]() {
                 // Check if the values are changed from the originals.
                 auto newName  = nameInput_->text().trimmed();
@@ -85,53 +99,37 @@ EditModal::EditModal(const QString &roomId, QWidget *parent)
                         state::Name body;
                         body.name = newName.toStdString();
 
-                        auto proxy =
-                          http::client()->sendStateEvent<state::Name, EventType::RoomName>(body,
-                                                                                           roomId_);
-                        connect(proxy.get(),
-                                &StateEventProxy::stateEventSent,
-                                this,
-                                [this, proxy, newName]() {
-                                        Q_UNUSED(proxy);
-                                        errorField_->hide();
-                                        emit nameChanged(newName);
-                                        close();
-                                });
-
-                        connect(proxy.get(),
-                                &StateEventProxy::stateEventError,
-                                this,
-                                [this, proxy, newName](const QString &msg) {
-                                        Q_UNUSED(proxy);
-                                        errorField_->setText(msg);
-                                        errorField_->show();
-                                });
+                        http::v2::client()->send_state_event<state::Name, EventType::RoomName>(
+                          roomId_.toStdString(),
+                          body,
+                          [this, newName](const mtx::responses::EventId &,
+                                          mtx::http::RequestErr err) {
+                                  if (err) {
+                                          emit stateEventErrorCb(
+                                            QString::fromStdString(err->matrix_error.error));
+                                          return;
+                                  }
+
+                                  emit nameEventSentCb(newName);
+                          });
                 }
 
                 if (newTopic != initialTopic_ && !newTopic.isEmpty()) {
                         state::Topic body;
                         body.topic = newTopic.toStdString();
 
-                        auto proxy =
-                          http::client()->sendStateEvent<state::Topic, EventType::RoomTopic>(
-                            body, roomId_);
-                        connect(proxy.get(),
-                                &StateEventProxy::stateEventSent,
-                                this,
-                                [this, proxy, newTopic]() {
-                                        Q_UNUSED(proxy);
-                                        errorField_->hide();
-                                        close();
-                                });
-
-                        connect(proxy.get(),
-                                &StateEventProxy::stateEventError,
-                                this,
-                                [this, proxy, newTopic](const QString &msg) {
-                                        Q_UNUSED(proxy);
-                                        errorField_->setText(msg);
-                                        errorField_->show();
-                                });
+                        http::v2::client()->send_state_event<state::Topic, EventType::RoomTopic>(
+                          roomId_.toStdString(),
+                          body,
+                          [this](const mtx::responses::EventId &, mtx::http::RequestErr err) {
+                                  if (err) {
+                                          emit stateEventErrorCb(
+                                            QString::fromStdString(err->matrix_error.error));
+                                          return;
+                                  }
+
+                                  emit topicEventSentCb();
+                          });
                 }
         });
         connect(cancelBtn_, &QPushButton::clicked, this, &EditModal::close);
-- 
cgit 1.5.1