Add join room/create room/create direct chat && small bug fixes.

src/controller.cpp

@@ -4,26 +4,25 @@
 #include "events/eventcontent.h"
 #include "events/roommessageevent.h"
 
+#include "csapi/create_room.h"
+#include "csapi/joining.h"
+#include "csapi/leaving.h"
+
 #include <QFile>
 #include <QImage>
 #include <QMimeDatabase>
 
 Controller::Controller(QObject* parent) : QObject(parent) {
-  connect(m_connection, &Connection::connected, this,
-          &Controller::connected);
+  connect(m_connection, &Connection::connected, this, &Controller::connected);
   connect(m_connection, &Connection::resolveError, this,
           &Controller::reconnect);
-  connect(m_connection, &Connection::syncError, this,
-          &Controller::reconnect);
-  connect(m_connection, &Connection::syncDone, this,
-          &Controller::resync);
+  connect(m_connection, &Connection::syncError, this, &Controller::reconnect);
+  connect(m_connection, &Connection::syncDone, this, &Controller::resync);
   connect(m_connection, &Connection::connected, this,
           &Controller::connectionChanged);
 
-  connect(m_connection, &Connection::connected,
-          [=] { setBusy(true); });
-  connect(m_connection, &Connection::syncDone,
-          [=] { setBusy(false); });
+  connect(m_connection, &Connection::connected, [=] { setBusy(true); });
+  connect(m_connection, &Connection::syncDone, [=] { setBusy(false); });
 }
 
 Controller::~Controller() {
@@ -52,6 +51,7 @@ void Controller::loginWithCredentials(QString serverAddr, QString user,
 }
 
 void Controller::logout() {
+  m_connection->logout();
   setUserID("");
   setToken("");
   setIsLogin(false);
@@ -66,10 +66,7 @@ void Controller::connected() {
   setIsLogin(true);
 }
 
-void Controller::resync() {
-  m_connection->sync(30000);
-  m_connection->saveState();
-}
+void Controller::resync() { m_connection->sync(30000); }
 
 void Controller::reconnect() {
   qDebug() << "Connection lost. Reconnecting...";
@@ -97,3 +94,29 @@ QString Controller::getMIME(const QUrl& fileUrl) const {
   delete db;
   return mime;
 }
+
+void Controller::forgetRoom(const QString& roomID) {
+  ForgetRoomJob* forgetRoomJob = m_connection->forgetRoom(roomID);
+  setBusy(true);
+  forgetRoomJob->connect(forgetRoomJob, &ForgetRoomJob::finished,
+                         [=] { setBusy(false); });
+}
+
+void Controller::joinRoom(const QString& alias) {
+  JoinRoomJob* joinRoomJob = m_connection->joinRoom(alias);
+  setBusy(true);
+  joinRoomJob->connect(joinRoomJob, &JoinRoomJob::finished,
+                       [=] { setBusy(false); });
+}
+
+void Controller::createRoom(const QString& name, const QString& topic) {
+  CreateRoomJob* createRoomJob = m_connection->createRoom(
+      Connection::PublishRoom, "", name, topic, QStringList());
+  setBusy(true);
+  createRoomJob->connect(createRoomJob, &CreateRoomJob::finished,
+                         [=] { setBusy(false); });
+}
+
+void Controller::createDirectChat(const QString& userID) {
+  m_connection->requestDirectChat(userID);
+}

src/controller.h

@@ -95,9 +95,12 @@ class Controller : public QObject {
   void errorOccured();
 
  public slots:
-  void postFile(Room* room, const QUrl& localFile,
-                const QUrl& mxcUrl);
+  void postFile(Room* room, const QUrl& localFile, const QUrl& mxcUrl);
   QString getMIME(const QUrl& fileUrl) const;
+  void forgetRoom(const QString& roomID);
+  void joinRoom(const QString& alias);
+  void createRoom(const QString& name, const QString& topic);
+  void createDirectChat(const QString& userID);
 };
 
 #endif  // CONTROLLER_H

src/main.cpp

@@ -9,6 +9,7 @@
 #include "room.h"
 #include "roomlistmodel.h"
 
+#include "csapi/joining.h"
 #include "csapi/leaving.h"
 
 using namespace QMatrixClient;
@@ -28,8 +29,6 @@ int main(int argc, char *argv[]) {
   //    QNetworkProxy::setApplicationProxy(proxy);
 
   qRegisterMetaType<Room *>("Room*");
-  qRegisterMetaType<LeaveRoomJob *>("LeaveRoomJob*");
-  qRegisterMetaType<ForgetRoomJob *>("ForgetRoomJob*");
 
   qRegisterMetaType<User *>("User*");