style: apply .clang-format to all .cpp and .h files

215 files changed, 10237 insertions, 10420 deletions

diff --git a/examples/qmc-example.cpp b/examples/qmc-example.cpp
index 9d6f2f39..3e9f7611 100644
--- a/examples/qmc-example.cpp
+++ b/examples/qmc-example.cpp
@@ -1,19 +1,19 @@
 
 #include "connection.h"
-#include "room.h"
-#include "user.h"
-#include "csapi/room_send.h"
 #include "csapi/joining.h"
 #include "csapi/leaving.h"
+#include "csapi/room_send.h"
 #include "events/simplestateevents.h"
+#include "room.h"
+#include "user.h"
 
 #include <QtCore/QCoreApplication>
+#include <QtCore/QFileInfo>
 #include <QtCore/QStringBuilder>
-#include <QtCore/QTimer>
 #include <QtCore/QTemporaryFile>
-#include <QtCore/QFileInfo>
-#include <iostream>
+#include <QtCore/QTimer>
 #include <functional>
+#include <iostream>
 
 using namespace QMatrixClient;
 using std::cout;
@@ -23,70 +23,69 @@ using namespace std::placeholders;
 class QMCTest : public QObject
 {
     public:
-        QMCTest(Connection* conn, QString testRoomName, QString source);
+    QMCTest(Connection* conn, QString testRoomName, QString source);
 
     private slots:
-        void setupAndRun();
-        void onNewRoom(Room* r);
-        void run();
-        void doTests();
-            void loadMembers();
-            void sendMessage();
-            void sendFile();
-                void checkFileSendingOutcome(const QString& txnId,
-                                             const QString& fileName);
-            void setTopic();
-            void addAndRemoveTag();
-            void sendAndRedact();
-                bool checkRedactionOutcome(const QString& evtIdToRedact);
-            void markDirectChat();
-                void checkDirectChatOutcome(
-                        const Connection::DirectChatsMap& added);
-        void conclude();
-        void finalize();
+    void setupAndRun();
+    void onNewRoom(Room* r);
+    void run();
+    void doTests();
+    void loadMembers();
+    void sendMessage();
+    void sendFile();
+    void checkFileSendingOutcome(const QString& txnId, const QString& fileName);
+    void setTopic();
+    void addAndRemoveTag();
+    void sendAndRedact();
+    bool checkRedactionOutcome(const QString& evtIdToRedact);
+    void markDirectChat();
+    void checkDirectChatOutcome(const Connection::DirectChatsMap& added);
+    void conclude();
+    void finalize();
 
     private:
-        QScopedPointer<Connection, QScopedPointerDeleteLater> c;
-        QStringList running;
-        QStringList succeeded;
-        QStringList failed;
-        QString origin;
-        QString targetRoomName;
-        Room* targetRoom = nullptr;
-
-        bool validatePendingEvent(const QString& txnId);
+    QScopedPointer<Connection, QScopedPointerDeleteLater> c;
+    QStringList running;
+    QStringList succeeded;
+    QStringList failed;
+    QString origin;
+    QString targetRoomName;
+    Room* targetRoom = nullptr;
+
+    bool validatePendingEvent(const QString& txnId);
 };
 
-#define QMC_CHECK(description, condition) \
-{ \
-    Q_ASSERT(running.removeOne(description)); \
-    if (!!(condition)) \
-    { \
-        succeeded.push_back(description); \
-        cout << (description) << " successful" << endl; \
-        if (targetRoom) \
-            targetRoom->postMessage( \
-                origin % ": " % (description) % " successful", \
-                MessageEventType::Notice); \
-    } else { \
-        failed.push_back(description); \
-        cout << (description) << " FAILED" << endl; \
-        if (targetRoom) \
-            targetRoom->postPlainText( \
-                origin % ": " % (description) % " FAILED"); \
-    } \
-}
+#define QMC_CHECK(description, condition)                                      \
+    {                                                                          \
+        Q_ASSERT(running.removeOne(description));                              \
+        if (!!(condition)) {                                                   \
+            succeeded.push_back(description);                                  \
+            cout << (description) << " successful" << endl;                    \
+            if (targetRoom)                                                    \
+                targetRoom->postMessage(origin % ": " % (description)          \
+                                                % " successful",               \
+                                        MessageEventType::Notice);             \
+        } else {                                                               \
+            failed.push_back(description);                                     \
+            cout << (description) << " FAILED" << endl;                        \
+            if (targetRoom)                                                    \
+                targetRoom->postPlainText(origin % ": " % (description)        \
+                                          % " FAILED");                        \
+        }                                                                      \
+    }
 
 bool QMCTest::validatePendingEvent(const QString& txnId)
 {
     auto it = targetRoom->findPendingEvent(txnId);
-    return it != targetRoom->pendingEvents().end() &&
-            it->deliveryStatus() == EventStatus::Submitted &&
-            (*it)->transactionId() == txnId;
+    return it != targetRoom->pendingEvents().end()
+            && it->deliveryStatus() == EventStatus::Submitted
+            && (*it)->transactionId() == txnId;
 }
 
 QMCTest::QMCTest(Connection* conn, QString testRoomName, QString source)
-    : c(conn), origin(std::move(source)), targetRoomName(std::move(testRoomName))
+    : c(conn),
+      origin(std::move(source)),
+      targetRoomName(std::move(testRoomName))
 {
     if (!origin.isEmpty())
         cout << "Origin for the test message: " << origin.toStdString() << endl;
@@ -105,16 +104,18 @@ void QMCTest::setupAndRun()
          << c->homeserver().toDisplayString().toStdString() << endl;
     cout << "Access token: " << c->accessToken().toStdString() << endl;
 
-    if (!targetRoomName.isEmpty())
-    {
+    if (!targetRoomName.isEmpty()) {
         cout << "Joining " << targetRoomName.toStdString() << endl;
         running.push_back("Join room");
         auto joinJob = c->joinRoom(targetRoomName);
-        connect(joinJob, &BaseJob::failure, this,
-            [this] { QMC_CHECK("Join room", false); conclude(); });
-        // Connection::joinRoom() creates a Room object upon JoinRoomJob::success
-        // but this object is empty until the first sync is done.
-        connect(joinJob, &BaseJob::success, this, [this,joinJob] {
+        connect(joinJob, &BaseJob::failure, this, [this] {
+            QMC_CHECK("Join room", false);
+            conclude();
+        });
+        // Connection::joinRoom() creates a Room object upon
+        // JoinRoomJob::success but this object is empty until the first sync is
+        // done.
+        connect(joinJob, &BaseJob::success, this, [this, joinJob] {
             targetRoom = c->room(joinJob->roomId(), JoinState::Join);
             QMC_CHECK("Join room", targetRoom != nullptr);
 
@@ -130,17 +131,18 @@ void QMCTest::onNewRoom(Room* r)
          << "  Name: " << r->name().toStdString() << endl
          << "  Canonical alias: " << r->canonicalAlias().toStdString() << endl
          << endl;
-    connect(r, &Room::aboutToAddNewMessages, r, [r] (RoomEventsRange timeline) {
+    connect(r, &Room::aboutToAddNewMessages, r, [r](RoomEventsRange timeline) {
         cout << timeline.size() << " new event(s) in room "
              << r->canonicalAlias().toStdString() << endl;
-//        for (const auto& item: timeline)
-//        {
-//            cout << "From: "
-//                 << r->roomMembername(item->senderId()).toStdString()
-//                 << endl << "Timestamp:"
-//                 << item->timestamp().toString().toStdString() << endl
-//                 << "JSON:" << endl << item->originalJson().toStdString() << endl;
-//        }
+        //        for (const auto& item: timeline)
+        //        {
+        //            cout << "From: "
+        //                 << r->roomMembername(item->senderId()).toStdString()
+        //                 << endl << "Timestamp:"
+        //                 << item->timestamp().toString().toStdString() << endl
+        //                 << "JSON:" << endl <<
+        //                 item->originalJson().toStdString() << endl;
+        //        }
     });
 }
 
@@ -150,8 +152,9 @@ void QMCTest::run()
     c->syncLoop();
     connectSingleShot(c.data(), &Connection::syncDone, this, &QMCTest::doTests);
     connect(c.data(), &Connection::syncDone, c.data(), [this] {
-        cout << "Sync complete, " << running.size() << " test(s) in the air: "
-             << running.join(", ").toStdString() << endl;
+        cout << "Sync complete, " << running.size()
+             << " test(s) in the air: " << running.join(", ").toStdString()
+             << endl;
         if (running.isEmpty())
             conclude();
     });
@@ -182,23 +185,22 @@ void QMCTest::loadMembers()
     // lazy-loading-then-full-loading; use #qmatrixclient:matrix.org instead.
     // TODO: #264
     auto* r = c->room(QStringLiteral("!PCzUtxtOjUySxSelof:matrix.org"));
-    if (!r)
-    {
-        cout << "#test:matrix.org is not found in the test user's rooms" << endl;
+    if (!r) {
+        cout << "#test:matrix.org is not found in the test user's rooms"
+             << endl;
         QMC_CHECK("Loading members", false);
         return;
     }
     // It's not exactly correct because an arbitrary server might not support
     // lazy loading; but in the absence of capabilities framework we assume
     // it does.
-    if (r->memberNames().size() >= r->joinedCount())
-    {
+    if (r->memberNames().size() >= r->joinedCount()) {
         cout << "Lazy loading doesn't seem to be enabled" << endl;
         QMC_CHECK("Loading members", false);
         return;
     }
     r->setDisplayed();
-    connect(r, &Room::allMembersLoaded, [this,r] {
+    connect(r, &Room::allMembersLoaded, [this, r] {
         QMC_CHECK("Loading members",
                   r->memberNames().size() >= r->joinedCount());
     });
@@ -209,27 +211,29 @@ void QMCTest::sendMessage()
     running.push_back("Message sending");
     cout << "Sending a message" << endl;
     auto txnId = targetRoom->postPlainText("Hello, " % origin % " is here");
-    if (!validatePendingEvent(txnId))
-    {
+    if (!validatePendingEvent(txnId)) {
         cout << "Invalid pending event right after submitting" << endl;
         QMC_CHECK("Message sending", false);
         return;
     }
 
     connectUntil(targetRoom, &Room::pendingEventAboutToMerge, this,
-        [this,txnId] (const RoomEvent* evt, int pendingIdx) {
-            const auto& pendingEvents = targetRoom->pendingEvents();
-            Q_ASSERT(pendingIdx >= 0 && pendingIdx < int(pendingEvents.size()));
-
-            if (evt->transactionId() != txnId)
-                return false;
-
-            QMC_CHECK("Message sending",
-                is<RoomMessageEvent>(*evt) && !evt->id().isEmpty() &&
-                pendingEvents[size_t(pendingIdx)]->transactionId()
-                    == evt->transactionId());
-            return true;
-        });
+                 [this, txnId](const RoomEvent* evt, int pendingIdx) {
+                     const auto& pendingEvents = targetRoom->pendingEvents();
+                     Q_ASSERT(pendingIdx >= 0
+                              && pendingIdx < int(pendingEvents.size()));
+
+                     if (evt->transactionId() != txnId)
+                         return false;
+
+                     QMC_CHECK("Message sending",
+                               is<RoomMessageEvent>(*evt)
+                                       && !evt->id().isEmpty()
+                                       && pendingEvents[size_t(pendingIdx)]
+                                                       ->transactionId()
+                                               == evt->transactionId());
+                     return true;
+                 });
 }
 
 void QMCTest::sendFile()
@@ -237,8 +241,7 @@ void QMCTest::sendFile()
     running.push_back("File sending");
     cout << "Sending a file" << endl;
     auto* tf = new QTemporaryFile;
-    if (!tf->open())
-    {
+    if (!tf->open()) {
         cout << "Failed to create a temporary file" << endl;
         QMC_CHECK("File sending", false);
         return;
@@ -249,10 +252,9 @@ void QMCTest::sendFile()
     // the full path
     const auto tfName = QFileInfo(*tf).fileName();
     cout << "Sending file" << tfName.toStdString() << endl;
-    const auto txnId = targetRoom->postFile("Test file",
-                                            QUrl::fromLocalFile(tf->fileName()));
-    if (!validatePendingEvent(txnId))
-    {
+    const auto txnId = targetRoom->postFile(
+            "Test file", QUrl::fromLocalFile(tf->fileName()));
+    if (!validatePendingEvent(txnId)) {
         cout << "Invalid pending event right after submitting" << endl;
         QMC_CHECK("File sending", false);
         delete tf;
@@ -261,43 +263,40 @@ void QMCTest::sendFile()
 
     // FIXME: Clean away connections (connectUntil doesn't help here).
     connect(targetRoom, &Room::fileTransferCompleted, this,
-        [this,txnId,tf,tfName] (const QString& id) {
-            auto fti = targetRoom->fileTransferInfo(id);
-            Q_ASSERT(fti.status == FileTransferInfo::Completed);
+            [this, txnId, tf, tfName](const QString& id) {
+                auto fti = targetRoom->fileTransferInfo(id);
+                Q_ASSERT(fti.status == FileTransferInfo::Completed);
 
-            if (id != txnId)
-                return;
+                if (id != txnId)
+                    return;
 
-            delete tf;
+                delete tf;
 
-            checkFileSendingOutcome(txnId, tfName);
-        });
+                checkFileSendingOutcome(txnId, tfName);
+            });
     connect(targetRoom, &Room::fileTransferFailed, this,
-        [this,txnId,tf]
-        (const QString& id, const QString& error) {
-            if (id != txnId)
-                return;
+            [this, txnId, tf](const QString& id, const QString& error) {
+                if (id != txnId)
+                    return;
 
-            targetRoom->postPlainText(origin % ": File upload failed: " % error);
-            delete tf;
+                targetRoom->postPlainText(origin % ": File upload failed: "
+                                          % error);
+                delete tf;
 
-            QMC_CHECK("File sending", false);
-        });
+                QMC_CHECK("File sending", false);
+            });
 }
 
 void QMCTest::checkFileSendingOutcome(const QString& txnId,
                                       const QString& fileName)
 {
     auto it = targetRoom->findPendingEvent(txnId);
-    if (it == targetRoom->pendingEvents().end())
-    {
-        cout << "Pending file event dropped before upload completion"
-             << endl;
+    if (it == targetRoom->pendingEvents().end()) {
+        cout << "Pending file event dropped before upload completion" << endl;
         QMC_CHECK("File sending", false);
         return;
     }
-    if (it->deliveryStatus() != EventStatus::FileUploaded)
-    {
+    if (it->deliveryStatus() != EventStatus::FileUploaded) {
         cout << "Pending file event status upon upload completion is "
              << it->deliveryStatus() << " != FileUploaded("
              << EventStatus::FileUploaded << ')' << endl;
@@ -305,36 +304,42 @@ void QMCTest::checkFileSendingOutcome(const QString& txnId,
         return;
     }
 
-    connectUntil(targetRoom, &Room::pendingEventAboutToMerge, this,
-        [this,txnId,fileName] (const RoomEvent* evt, int pendingIdx) {
-            const auto& pendingEvents = targetRoom->pendingEvents();
-            Q_ASSERT(pendingIdx >= 0 && pendingIdx < int(pendingEvents.size()));
-
-            if (evt->transactionId() != txnId)
-                return false;
-
-            cout << "File event " << txnId.toStdString()
-                 << " arrived in the timeline" << endl;
-            visit(*evt,
-                [&] (const RoomMessageEvent& e) {
-                    QMC_CHECK("File sending",
-                        !e.id().isEmpty() &&
-                        pendingEvents[size_t(pendingIdx)]
-                            ->transactionId() == txnId &&
-                        e.hasFileContent() &&
-                        e.content()->fileInfo()->originalName == fileName);
-                },
-                [this] (const RoomEvent&) {
-                    QMC_CHECK("File sending", false);
-                });
-            return true;
-    });
+    connectUntil(
+            targetRoom, &Room::pendingEventAboutToMerge, this,
+            [this, txnId, fileName](const RoomEvent* evt, int pendingIdx) {
+                const auto& pendingEvents = targetRoom->pendingEvents();
+                Q_ASSERT(pendingIdx >= 0
+                         && pendingIdx < int(pendingEvents.size()));
+
+                if (evt->transactionId() != txnId)
+                    return false;
+
+                cout << "File event " << txnId.toStdString()
+                     << " arrived in the timeline" << endl;
+                visit(*evt,
+                      [&](const RoomMessageEvent& e) {
+                          QMC_CHECK("File sending",
+                                    !e.id().isEmpty()
+                                            && pendingEvents[size_t(pendingIdx)]
+                                                            ->transactionId()
+                                                    == txnId
+                                            && e.hasFileContent()
+                                            && e.content()->fileInfo()
+                                                            ->originalName
+                                                    == fileName);
+                      },
+                      [this](const RoomEvent&) {
+                          QMC_CHECK("File sending", false);
+                      });
+                return true;
+            });
 }
 
 void QMCTest::setTopic()
 {
     static const char* const stateTestName = "State setting test";
-    static const char* const fakeStateTestName = "Fake state event immunity test";
+    static const char* const fakeStateTestName =
+            "Fake state event immunity test";
     running.push_back(stateTestName);
     running.push_back(fakeStateTestName);
     auto initialTopic = targetRoom->topic();
@@ -346,29 +351,30 @@ void QMCTest::setTopic()
                          RoomTopicEvent(fakeTopic).contentJson());
 
     connectUntil(targetRoom, &Room::topicChanged, this,
-        [this,newTopic,fakeTopic,initialTopic] {
-            if (targetRoom->topic() == newTopic)
-            {
-                QMC_CHECK(stateTestName, true);
-                // Don't reset the topic yet if the negative test still runs
-                if (!running.contains(fakeStateTestName))
-                    targetRoom->setTopic(initialTopic);
-
-                return true;
-            }
-            return false;
-        });
+                 [this, newTopic, fakeTopic, initialTopic] {
+                     if (targetRoom->topic() == newTopic) {
+                         QMC_CHECK(stateTestName, true);
+                         // Don't reset the topic yet if the negative test still
+                         // runs
+                         if (!running.contains(fakeStateTestName))
+                             targetRoom->setTopic(initialTopic);
+
+                         return true;
+                     }
+                     return false;
+                 });
 
     connectUntil(targetRoom, &Room::pendingEventAboutToMerge, this,
-        [this,fakeTopic,initialTopic] (const RoomEvent* e, int) {
-            if (e->contentJson().value("topic").toString() != fakeTopic)
-                return false; // Wait on for the right event
-
-            QMC_CHECK(fakeStateTestName, !e->isStateEvent());
-            if (!running.contains(fakeStateTestName))
-                targetRoom->setTopic(initialTopic);
-            return true;
-        });
+                 [this, fakeTopic, initialTopic](const RoomEvent* e, int) {
+                     if (e->contentJson().value("topic").toString()
+                         != fakeTopic)
+                         return false; // Wait on for the right event
+
+                     QMC_CHECK(fakeStateTestName, !e->isStateEvent());
+                     if (!running.contains(fakeStateTestName))
+                         targetRoom->setTopic(initialTopic);
+                     return true;
+                 });
 }
 
 void QMCTest::addAndRemoveTag()
@@ -384,8 +390,7 @@ void QMCTest::addAndRemoveTag()
         cout << "Room " << targetRoom->id().toStdString()
              << ", tag(s) changed:" << endl
              << "  " << targetRoom->tagNames().join(", ").toStdString() << endl;
-        if (targetRoom->tags().contains(TestTag))
-        {
+        if (targetRoom->tags().contains(TestTag)) {
             cout << "Test tag set, removing it now" << endl;
             targetRoom->removeTag(TestTag);
             QMC_CHECK("Tagging test", !targetRoom->tags().contains(TestTag));
@@ -401,22 +406,22 @@ void QMCTest::sendAndRedact()
     running.push_back("Redaction");
     cout << "Sending a message to redact" << endl;
     auto txnId = targetRoom->postPlainText(origin % ": message to redact");
-    if (txnId.isEmpty())
-    {
+    if (txnId.isEmpty()) {
         QMC_CHECK("Redaction", false);
         return;
     }
     connect(targetRoom, &Room::messageSent, this,
-        [this,txnId] (const QString& tId, const QString& evtId) {
-            if (tId != txnId)
-                return;
+            [this, txnId](const QString& tId, const QString& evtId) {
+                if (tId != txnId)
+                    return;
 
-            cout << "Redacting the message" << endl;
-            targetRoom->redactEvent(evtId, origin);
+                cout << "Redacting the message" << endl;
+                targetRoom->redactEvent(evtId, origin);
 
-            connectUntil(targetRoom, &Room::addedMessages, this,
-                [this,evtId] { return checkRedactionOutcome(evtId); });
-        });
+                connectUntil(
+                        targetRoom, &Room::addedMessages, this,
+                        [this, evtId] { return checkRedactionOutcome(evtId); });
+            });
 }
 
 bool QMCTest::checkRedactionOutcome(const QString& evtIdToRedact)
@@ -428,39 +433,40 @@ bool QMCTest::checkRedactionOutcome(const QString& evtIdToRedact)
     if (it == targetRoom->timelineEdge())
         return false; // Waiting for the next sync
 
-    if ((*it)->isRedacted())
-    {
+    if ((*it)->isRedacted()) {
         cout << "The sync brought already redacted message" << endl;
         QMC_CHECK("Redaction", true);
     } else {
         cout << "Message came non-redacted with the sync, waiting for redaction"
              << endl;
         connectUntil(targetRoom, &Room::replacedEvent, this,
-            [this,evtIdToRedact]
-            (const RoomEvent* newEvent, const RoomEvent* oldEvent) {
-                if (oldEvent->id() != evtIdToRedact)
-                    return false;
-
-                QMC_CHECK("Redaction", newEvent->isRedacted() &&
-                                       newEvent->redactionReason() == origin);
-                return true;
-            });
+                     [this, evtIdToRedact](const RoomEvent* newEvent,
+                                           const RoomEvent* oldEvent) {
+                         if (oldEvent->id() != evtIdToRedact)
+                             return false;
+
+                         QMC_CHECK("Redaction",
+                                   newEvent->isRedacted()
+                                           && newEvent->redactionReason()
+                                                   == origin);
+                         return true;
+                     });
     }
     return true;
 }
 
 void QMCTest::markDirectChat()
 {
-    if (targetRoom->directChatUsers().contains(c->user()))
-    {
+    if (targetRoom->directChatUsers().contains(c->user())) {
         cout << "Warning: the room is already a direct chat,"
-                " only unmarking will be tested" << endl;
-        checkDirectChatOutcome({{ c->user(), targetRoom->id() }});
+                " only unmarking will be tested"
+             << endl;
+        checkDirectChatOutcome({ { c->user(), targetRoom->id() } });
         return;
     }
     // Connect first because the signal is emitted synchronously.
-    connect(c.data(), &Connection::directChatsListChanged,
-            this, &QMCTest::checkDirectChatOutcome);
+    connect(c.data(), &Connection::directChatsListChanged, this,
+            &QMCTest::checkDirectChatOutcome);
     cout << "Marking the room as a direct chat" << endl;
     c->addToDirectChats(targetRoom, c->user());
 }
@@ -469,14 +475,12 @@ void QMCTest::checkDirectChatOutcome(const Connection::DirectChatsMap& added)
 {
     running.push_back("Direct chat test");
     disconnect(c.data(), &Connection::directChatsListChanged, nullptr, nullptr);
-    if (!targetRoom->isDirectChat())
-    {
+    if (!targetRoom->isDirectChat()) {
         cout << "The room has not been marked as a direct chat" << endl;
         QMC_CHECK("Direct chat test", false);
         return;
     }
-    if (!added.contains(c->user(), targetRoom->id()))
-    {
+    if (!added.contains(c->user(), targetRoom->id())) {
         cout << "The room has not been listed in new direct chats" << endl;
         QMC_CHECK("Direct chat test", false);
         return;
@@ -492,45 +496,42 @@ void QMCTest::conclude()
     c->stopSync();
     auto succeededRec = QString::number(succeeded.size()) + " tests succeeded";
     if (!failed.isEmpty() || !running.isEmpty())
-        succeededRec += " of " %
-            QString::number(succeeded.size() + failed.size() + running.size()) %
-            " total";
+        succeededRec += " of "
+                % QString::number(succeeded.size() + failed.size()
+                                  + running.size())
+                % " total";
     QString plainReport = origin % ": Testing complete, " % succeededRec;
     QString color = failed.isEmpty() && running.isEmpty() ? "00AA00" : "AA0000";
-    QString htmlReport = origin % ": <strong><font data-mx-color='#" % color %
-            "' color='#" % color % "'>Testing complete</font></strong>, " %
-            succeededRec;
-    if (!failed.isEmpty())
-    {
+    QString htmlReport = origin % ": <strong><font data-mx-color='#" % color
+            % "' color='#" % color % "'>Testing complete</font></strong>, "
+            % succeededRec;
+    if (!failed.isEmpty()) {
         plainReport += "\nFAILED: " % failed.join(", ");
         htmlReport += "<br><strong>Failed:</strong> " % failed.join(", ");
     }
-    if (!running.isEmpty())
-    {
+    if (!running.isEmpty()) {
         plainReport += "\nDID NOT FINISH: " % running.join(", ");
         htmlReport +=
-            "<br><strong>Did not finish:</strong> " % running.join(", ");
+                "<br><strong>Did not finish:</strong> " % running.join(", ");
     }
     cout << plainReport.toStdString() << endl;
 
-    if (targetRoom)
-    {
-            // TODO: Waiting for proper futures to come so that it could be:
-//            targetRoom->postHtmlText(...)
-//            .then(this, &QMCTest::finalize); // Qt-style or
-//            .then([this] { finalize(); }); // STL-style
+    if (targetRoom) {
+        // TODO: Waiting for proper futures to come so that it could be:
+        //            targetRoom->postHtmlText(...)
+        //            .then(this, &QMCTest::finalize); // Qt-style or
+        //            .then([this] { finalize(); }); // STL-style
         auto txnId = targetRoom->postHtmlText(plainReport, htmlReport);
         connect(targetRoom, &Room::messageSent, this,
-            [this,txnId] (QString serverTxnId) {
-                if (txnId != serverTxnId)
-                    return;
+                [this, txnId](QString serverTxnId) {
+                    if (txnId != serverTxnId)
+                        return;
 
-                cout << "Leaving the room" << endl;
-                connect(targetRoom->leaveRoom(), &BaseJob::finished,
-                        this, &QMCTest::finalize);
-            });
-    }
-    else
+                    cout << "Leaving the room" << endl;
+                    connect(targetRoom->leaveRoom(), &BaseJob::finished, this,
+                            &QMCTest::finalize);
+                });
+    } else
         finalize();
 }
 
@@ -538,19 +539,19 @@ void QMCTest::finalize()
 {
     cout << "Logging out" << endl;
     c->logout();
-    connect(c.data(), &Connection::loggedOut, qApp,
-        [this] {
-            QCoreApplication::processEvents();
-            QCoreApplication::exit(failed.size() + running.size());
-        });
+    connect(c.data(), &Connection::loggedOut, qApp, [this] {
+        QCoreApplication::processEvents();
+        QCoreApplication::exit(failed.size() + running.size());
+    });
 }
 
 int main(int argc, char* argv[])
 {
     QCoreApplication app(argc, argv);
-    if (argc < 4)
-    {
-        cout << "Usage: qmc-example <user> <passwd> <device_name> [<room_alias> [origin]]" << endl;
+    if (argc < 4) {
+        cout << "Usage: qmc-example <user> <passwd> <device_name> "
+                "[<room_alias> [origin]]"
+             << endl;
         return -1;
     }
 
@@ -558,6 +559,6 @@ int main(int argc, char* argv[])
     auto conn = new Connection;
     conn->connectToServer(argv[1], argv[2], argv[3]);
     QMCTest test { conn, argc >= 5 ? argv[4] : nullptr,
-                         argc >= 6 ? argv[5] : nullptr };
+                   argc >= 6 ? argv[5] : nullptr };
     return app.exec();
 }
diff --git a/lib/application-service/definitions/location.cpp b/lib/application-service/definitions/location.cpp
index a53db8d7..4da0e69d 100644
--- a/lib/application-service/definitions/location.cpp
+++ b/lib/application-service/definitions/location.cpp
@@ -15,10 +15,9 @@ void JsonObjectConverter<ThirdPartyLocation>::dumpTo(
 }
 
 void JsonObjectConverter<ThirdPartyLocation>::fillFrom(
-    const QJsonObject& jo, ThirdPartyLocation& result)
+        const QJsonObject& jo, ThirdPartyLocation& result)
 {
     fromJson(jo.value("alias"_ls), result.alias);
     fromJson(jo.value("protocol"_ls), result.protocol);
     fromJson(jo.value("fields"_ls), result.fields);
 }
-
diff --git a/lib/application-service/definitions/location.h b/lib/application-service/definitions/location.h
index 5586cfc6..f92fa8c5 100644
--- a/lib/application-service/definitions/location.h
+++ b/lib/application-service/definitions/location.h
@@ -8,12 +8,10 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
-    struct ThirdPartyLocation
-    {
+    struct ThirdPartyLocation {
         /// An alias for a matrix room.
         QString alias;
         /// The protocol ID that the third party location is a part of.
@@ -21,8 +19,7 @@ namespace QMatrixClient
         /// Information used to identify this third party location.
         QJsonObject fields;
     };
-    template <> struct JsonObjectConverter<ThirdPartyLocation>
-    {
+    template <> struct JsonObjectConverter<ThirdPartyLocation> {
         static void dumpTo(QJsonObject& jo, const ThirdPartyLocation& pod);
         static void fillFrom(const QJsonObject& jo, ThirdPartyLocation& pod);
     };
diff --git a/lib/application-service/definitions/protocol.cpp b/lib/application-service/definitions/protocol.cpp
index 2a62b15d..4c148796 100644
--- a/lib/application-service/definitions/protocol.cpp
+++ b/lib/application-service/definitions/protocol.cpp
@@ -6,22 +6,22 @@
 
 using namespace QMatrixClient;
 
-void JsonObjectConverter<FieldType>::dumpTo(
-        QJsonObject& jo, const FieldType& pod)
+void JsonObjectConverter<FieldType>::dumpTo(QJsonObject& jo,
+                                            const FieldType& pod)
 {
     addParam<>(jo, QStringLiteral("regexp"), pod.regexp);
     addParam<>(jo, QStringLiteral("placeholder"), pod.placeholder);
 }
 
-void JsonObjectConverter<FieldType>::fillFrom(
-    const QJsonObject& jo, FieldType& result)
+void JsonObjectConverter<FieldType>::fillFrom(const QJsonObject& jo,
+                                              FieldType& result)
 {
     fromJson(jo.value("regexp"_ls), result.regexp);
     fromJson(jo.value("placeholder"_ls), result.placeholder);
 }
 
-void JsonObjectConverter<ProtocolInstance>::dumpTo(
-        QJsonObject& jo, const ProtocolInstance& pod)
+void JsonObjectConverter<ProtocolInstance>::dumpTo(QJsonObject& jo,
+                                                   const ProtocolInstance& pod)
 {
     addParam<>(jo, QStringLiteral("desc"), pod.desc);
     addParam<IfNotEmpty>(jo, QStringLiteral("icon"), pod.icon);
@@ -29,8 +29,8 @@ void JsonObjectConverter<ProtocolInstance>::dumpTo(
     addParam<>(jo, QStringLiteral("network_id"), pod.networkId);
 }
 
-void JsonObjectConverter<ProtocolInstance>::fillFrom(
-    const QJsonObject& jo, ProtocolInstance& result)
+void JsonObjectConverter<ProtocolInstance>::fillFrom(const QJsonObject& jo,
+                                                     ProtocolInstance& result)
 {
     fromJson(jo.value("desc"_ls), result.desc);
     fromJson(jo.value("icon"_ls), result.icon);
@@ -49,7 +49,7 @@ void JsonObjectConverter<ThirdPartyProtocol>::dumpTo(
 }
 
 void JsonObjectConverter<ThirdPartyProtocol>::fillFrom(
-    const QJsonObject& jo, ThirdPartyProtocol& result)
+        const QJsonObject& jo, ThirdPartyProtocol& result)
 {
     fromJson(jo.value("user_fields"_ls), result.userFields);
     fromJson(jo.value("location_fields"_ls), result.locationFields);
@@ -57,4 +57,3 @@ void JsonObjectConverter<ThirdPartyProtocol>::fillFrom(
     fromJson(jo.value("field_types"_ls), result.fieldTypes);
     fromJson(jo.value("instances"_ls), result.instances);
 }
-
diff --git a/lib/application-service/definitions/protocol.h b/lib/application-service/definitions/protocol.h
index 0a1f9a21..66012a13 100644
--- a/lib/application-service/definitions/protocol.h
+++ b/lib/application-service/definitions/protocol.h
@@ -6,76 +6,72 @@
 
 #include "converters.h"
 
+#include "converters.h"
 #include <QtCore/QHash>
 #include <QtCore/QJsonObject>
-#include "converters.h"
 #include <QtCore/QVector>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
     /// Definition of valid values for a field.
-    struct FieldType
-    {
-        /// A regular expression for validation of a field's value. This may be relatively
-        /// coarse to verify the value as the application service providing this protocol
-        /// may apply additional validation or filtering.
+    struct FieldType {
+        /// A regular expression for validation of a field's value. This may be
+        /// relatively coarse to verify the value as the application service
+        /// providing this protocol may apply additional validation or
+        /// filtering.
         QString regexp;
         /// An placeholder serving as a valid example of the field value.
         QString placeholder;
     };
-    template <> struct JsonObjectConverter<FieldType>
-    {
+    template <> struct JsonObjectConverter<FieldType> {
         static void dumpTo(QJsonObject& jo, const FieldType& pod);
         static void fillFrom(const QJsonObject& jo, FieldType& pod);
     };
 
-    struct ProtocolInstance
-    {
+    struct ProtocolInstance {
         /// A human-readable description for the protocol, such as the name.
         QString desc;
-        /// An optional content URI representing the protocol. Overrides the one provided
-        /// at the higher level Protocol object.
+        /// An optional content URI representing the protocol. Overrides the one
+        /// provided at the higher level Protocol object.
         QString icon;
         /// Preset values for ``fields`` the client may use to search by.
         QJsonObject fields;
         /// A unique identifier across all instances.
         QString networkId;
     };
-    template <> struct JsonObjectConverter<ProtocolInstance>
-    {
+    template <> struct JsonObjectConverter<ProtocolInstance> {
         static void dumpTo(QJsonObject& jo, const ProtocolInstance& pod);
         static void fillFrom(const QJsonObject& jo, ProtocolInstance& pod);
     };
 
-    struct ThirdPartyProtocol
-    {
-        /// Fields which may be used to identify a third party user. These should be
-        /// ordered to suggest the way that entities may be grouped, where higher
-        /// groupings are ordered first. For example, the name of a network should be
-        /// searched before the nickname of a user.
+    struct ThirdPartyProtocol {
+        /// Fields which may be used to identify a third party user. These
+        /// should be ordered to suggest the way that entities may be grouped,
+        /// where higher groupings are ordered first. For example, the name of a
+        /// network should be searched before the nickname of a user.
         QStringList userFields;
-        /// Fields which may be used to identify a third party location. These should be
-        /// ordered to suggest the way that entities may be grouped, where higher
-        /// groupings are ordered first. For example, the name of a network should be
-        /// searched before the name of a channel.
+        /// Fields which may be used to identify a third party location. These
+        /// should be ordered to suggest the way that entities may be grouped,
+        /// where higher groupings are ordered first. For example, the name of a
+        /// network should be searched before the name of a channel.
         QStringList locationFields;
         /// A content URI representing an icon for the third party protocol.
         QString icon;
-        /// The type definitions for the fields defined in the ``user_fields`` and 
-        /// ``location_fields``. Each entry in those arrays MUST have an entry here. The
+        /// The type definitions for the fields defined in the ``user_fields``
+        /// and
+        /// ``location_fields``. Each entry in those arrays MUST have an entry
+        /// here. The
         /// ``string`` key for this object is field name itself.
-        /// 
+        ///
         /// May be an empty object if no fields are defined.
         QHash<QString, FieldType> fieldTypes;
-        /// A list of objects representing independent instances of configuration.
-        /// For example, multiple networks on IRC if multiple are provided by the
-        /// same application service.
+        /// A list of objects representing independent instances of
+        /// configuration. For example, multiple networks on IRC if multiple are
+        /// provided by the same application service.
         QVector<ProtocolInstance> instances;
     };
-    template <> struct JsonObjectConverter<ThirdPartyProtocol>
-    {
+    template <> struct JsonObjectConverter<ThirdPartyProtocol> {
         static void dumpTo(QJsonObject& jo, const ThirdPartyProtocol& pod);
         static void fillFrom(const QJsonObject& jo, ThirdPartyProtocol& pod);
     };
diff --git a/lib/application-service/definitions/user.cpp b/lib/application-service/definitions/user.cpp
index 8ba92321..0f3c3130 100644
--- a/lib/application-service/definitions/user.cpp
+++ b/lib/application-service/definitions/user.cpp
@@ -6,19 +6,18 @@
 
 using namespace QMatrixClient;
 
-void JsonObjectConverter<ThirdPartyUser>::dumpTo(
-        QJsonObject& jo, const ThirdPartyUser& pod)
+void JsonObjectConverter<ThirdPartyUser>::dumpTo(QJsonObject& jo,
+                                                 const ThirdPartyUser& pod)
 {
     addParam<>(jo, QStringLiteral("userid"), pod.userid);
     addParam<>(jo, QStringLiteral("protocol"), pod.protocol);
     addParam<>(jo, QStringLiteral("fields"), pod.fields);
 }
 
-void JsonObjectConverter<ThirdPartyUser>::fillFrom(
-    const QJsonObject& jo, ThirdPartyUser& result)
+void JsonObjectConverter<ThirdPartyUser>::fillFrom(const QJsonObject& jo,
+                                                   ThirdPartyUser& result)
 {
     fromJson(jo.value("userid"_ls), result.userid);
     fromJson(jo.value("protocol"_ls), result.protocol);
     fromJson(jo.value("fields"_ls), result.fields);
 }
-
diff --git a/lib/application-service/definitions/user.h b/lib/application-service/definitions/user.h
index 062d2cac..9b314db1 100644
--- a/lib/application-service/definitions/user.h
+++ b/lib/application-service/definitions/user.h
@@ -8,12 +8,10 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
-    struct ThirdPartyUser
-    {
+    struct ThirdPartyUser {
         /// A Matrix User ID represting a third party user.
         QString userid;
         /// The protocol ID that the third party location is a part of.
@@ -21,8 +19,7 @@ namespace QMatrixClient
         /// Information used to identify this third party location.
         QJsonObject fields;
     };
-    template <> struct JsonObjectConverter<ThirdPartyUser>
-    {
+    template <> struct JsonObjectConverter<ThirdPartyUser> {
         static void dumpTo(QJsonObject& jo, const ThirdPartyUser& pod);
         static void fillFrom(const QJsonObject& jo, ThirdPartyUser& pod);
     };
diff --git a/lib/avatar.cpp b/lib/avatar.cpp
index c0ef3cba..5de43dd5 100644
--- a/lib/avatar.cpp
+++ b/lib/avatar.cpp
@@ -15,20 +15,20 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "avatar.h"
 
-#include "jobs/mediathumbnailjob.h"
-#include "events/eventcontent.h"
 #include "connection.h"
+#include "events/eventcontent.h"
+#include "jobs/mediathumbnailjob.h"
 
-#include <QtGui/QPainter>
-#include <QtCore/QPointer>
 #include <QtCore/QDir>
+#include <QtCore/QPointer>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QStringBuilder>
+#include <QtGui/QPainter>
 
 using namespace QMatrixClient;
 using std::move;
@@ -36,43 +36,37 @@ using std::move;
 class Avatar::Private
 {
     public:
-        explicit Private(QUrl url = {})
-            : _url(move(url))
-        { }
-        ~Private()
-        {
-            if (isJobRunning(_thumbnailRequest))
-                _thumbnailRequest->abandon();
-            if (isJobRunning(_uploadRequest))
-                _uploadRequest->abandon();
-        }
-
-        QImage get(Connection* connection, QSize size,
-                   get_callback_t callback) const;
-        bool upload(UploadContentJob* job, upload_callback_t callback);
-
-        bool checkUrl(const QUrl& url) const;
-        QString localFile() const;
-
-        QUrl _url;
-
-        // The below are related to image caching, hence mutable
-        mutable QImage _originalImage;
-        mutable std::vector<QPair<QSize, QImage>> _scaledImages;
-        mutable QSize _requestedSize;
-        mutable enum { Unknown, Cache, Network, Banned } _imageSource = Unknown;
-        mutable QPointer<MediaThumbnailJob> _thumbnailRequest = nullptr;
-        mutable QPointer<BaseJob> _uploadRequest = nullptr;
-        mutable std::vector<get_callback_t> callbacks;
+    explicit Private(QUrl url = {}) : _url(move(url)) {}
+    ~Private()
+    {
+        if (isJobRunning(_thumbnailRequest))
+            _thumbnailRequest->abandon();
+        if (isJobRunning(_uploadRequest))
+            _uploadRequest->abandon();
+    }
+
+    QImage get(Connection* connection, QSize size,
+               get_callback_t callback) const;
+    bool upload(UploadContentJob* job, upload_callback_t callback);
+
+    bool checkUrl(const QUrl& url) const;
+    QString localFile() const;
+
+    QUrl _url;
+
+    // The below are related to image caching, hence mutable
+    mutable QImage _originalImage;
+    mutable std::vector<QPair<QSize, QImage>> _scaledImages;
+    mutable QSize _requestedSize;
+    mutable enum { Unknown, Cache, Network, Banned } _imageSource = Unknown;
+    mutable QPointer<MediaThumbnailJob> _thumbnailRequest = nullptr;
+    mutable QPointer<BaseJob> _uploadRequest = nullptr;
+    mutable std::vector<get_callback_t> callbacks;
 };
 
-Avatar::Avatar()
-    : d(std::make_unique<Private>())
-{ }
+Avatar::Avatar() : d(std::make_unique<Private>()) {}
 
-Avatar::Avatar(QUrl url)
-    : d(std::make_unique<Private>(std::move(url)))
-{ }
+Avatar::Avatar(QUrl url) : d(std::make_unique<Private>(std::move(url))) {}
 
 Avatar::Avatar(Avatar&&) = default;
 
@@ -83,13 +77,13 @@ Avatar& Avatar::operator=(Avatar&&) = default;
 QImage Avatar::get(Connection* connection, int dimension,
                    get_callback_t callback) const
 {
-    return d->get(connection, {dimension, dimension}, move(callback));
+    return d->get(connection, { dimension, dimension }, move(callback));
 }
 
 QImage Avatar::get(Connection* connection, int width, int height,
                    get_callback_t callback) const
 {
-    return d->get(connection, {width, height}, move(callback));
+    return d->get(connection, { width, height }, move(callback));
 }
 
 bool Avatar::upload(Connection* connection, const QString& fileName,
@@ -108,22 +102,17 @@ bool Avatar::upload(Connection* connection, QIODevice* source,
     return d->upload(connection->uploadContent(source), move(callback));
 }
 
-QString Avatar::mediaId() const
-{
-    return d->_url.authority() + d->_url.path();
-}
+QString Avatar::mediaId() const { return d->_url.authority() + d->_url.path(); }
 
 QImage Avatar::Private::get(Connection* connection, QSize size,
                             get_callback_t callback) const
 {
-    if (!callback)
-    {
+    if (!callback) {
         qCCritical(MAIN) << "Null callbacks are not allowed in Avatar::get";
         Q_ASSERT(false);
     }
 
-    if (_imageSource == Unknown && _originalImage.load(localFile()))
-    {
+    if (_imageSource == Unknown && _originalImage.load(localFile())) {
         _imageSource = Cache;
         _requestedSize = _originalImage.size();
     }
@@ -132,9 +121,10 @@ QImage Avatar::Private::get(Connection* connection, QSize size,
     // to trick the below code into constantly getting another image from
     // the server because the existing one is alleged unsatisfactory.
     // Client authors can only blame themselves if they do so.
-    if (((_imageSource == Unknown && !_thumbnailRequest) ||
-            size.width() > _requestedSize.width() ||
-            size.height() > _requestedSize.height()) && checkUrl(_url)) {
+    if (((_imageSource == Unknown && !_thumbnailRequest)
+         || size.width() > _requestedSize.width()
+         || size.height() > _requestedSize.height())
+        && checkUrl(_url)) {
         qCDebug(MAIN) << "Getting avatar from" << _url.toString();
         _requestedSize = size;
         if (isJobRunning(_thumbnailRequest))
@@ -142,24 +132,27 @@ QImage Avatar::Private::get(Connection* connection, QSize size,
         if (callback)
             callbacks.emplace_back(move(callback));
         _thumbnailRequest = connection->getThumbnail(_url, size);
-        QObject::connect( _thumbnailRequest, &MediaThumbnailJob::success,
-            _thumbnailRequest, [this] {
-                _imageSource = Network;
-                _originalImage =
-                        _thumbnailRequest->scaledThumbnail(_requestedSize);
-                _originalImage.save(localFile());
-                _scaledImages.clear();
-                for (const auto& n: callbacks)
-                    n();
-                callbacks.clear();
-            });
+        QObject::connect(_thumbnailRequest, &MediaThumbnailJob::success,
+                         _thumbnailRequest, [this] {
+                             _imageSource = Network;
+                             _originalImage =
+                                     _thumbnailRequest->scaledThumbnail(
+                                             _requestedSize);
+                             _originalImage.save(localFile());
+                             _scaledImages.clear();
+                             for (const auto& n : callbacks)
+                                 n();
+                             callbacks.clear();
+                         });
     }
 
-    for (const auto& p: _scaledImages)
+    for (const auto& p : _scaledImages)
         if (p.first == size)
             return p.second;
-    auto result = _originalImage.isNull() ? QImage() : _originalImage.scaled(size,
-                    Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    auto result = _originalImage.isNull()
+            ? QImage()
+            : _originalImage.scaled(size, Qt::KeepAspectRatio,
+                                    Qt::SmoothTransformation);
     _scaledImages.emplace_back(size, result);
     return result;
 }
@@ -170,7 +163,7 @@ bool Avatar::Private::upload(UploadContentJob* job, upload_callback_t callback)
     if (!isJobRunning(_uploadRequest))
         return false;
     _uploadRequest->connect(_uploadRequest, &BaseJob::success, _uploadRequest,
-                            [job,callback] { callback(job->contentUri()); });
+                            [job, callback] { callback(job->contentUri()); });
     return true;
 }
 
@@ -181,8 +174,7 @@ bool Avatar::Private::checkUrl(const QUrl& url) const
 
     // FIXME: Make "mxc" a library-wide constant and maybe even make
     // the URL checker a Connection(?) method.
-    if (!url.isValid() || url.scheme() != "mxc" || url.path().count('/') != 1)
-    {
+    if (!url.isValid() || url.scheme() != "mxc" || url.path().count('/') != 1) {
         qCWarning(MAIN) << "Avatar URL is invalid or not mxc-based:"
                         << url.toDisplayString();
         _imageSource = Banned;
@@ -190,7 +182,8 @@ bool Avatar::Private::checkUrl(const QUrl& url) const
     return _imageSource != Banned;
 }
 
-QString Avatar::Private::localFile() const {
+QString Avatar::Private::localFile() const
+{
     static const auto cachePath = cacheLocation("avatars");
     return cachePath % _url.authority() % '_' % _url.fileName() % ".png";
 }
diff --git a/lib/avatar.h b/lib/avatar.h
index c86345e3..2ca2c987 100644
--- a/lib/avatar.h
+++ b/lib/avatar.h
@@ -13,49 +13,48 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
-#include <QtGui/QIcon>
 #include <QtCore/QUrl>
+#include <QtGui/QIcon>
 
 #include <functional>
 #include <memory>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     class Connection;
 
     class Avatar
     {
         public:
-            explicit Avatar();
-            explicit Avatar(QUrl url);
-            Avatar(Avatar&&);
-            ~Avatar();
-            Avatar& operator=(Avatar&&);
+        explicit Avatar();
+        explicit Avatar(QUrl url);
+        Avatar(Avatar&&);
+        ~Avatar();
+        Avatar& operator=(Avatar&&);
 
-            using get_callback_t = std::function<void()>;
-            using upload_callback_t = std::function<void(QString)>;
+        using get_callback_t = std::function<void()>;
+        using upload_callback_t = std::function<void(QString)>;
 
-            QImage get(Connection* connection, int dimension,
-                       get_callback_t callback) const;
-            QImage get(Connection* connection, int w, int h,
-                       get_callback_t callback) const;
+        QImage get(Connection* connection, int dimension,
+                   get_callback_t callback) const;
+        QImage get(Connection* connection, int w, int h,
+                   get_callback_t callback) const;
 
-            bool upload(Connection* connection, const QString& fileName,
-                        upload_callback_t callback) const;
-            bool upload(Connection* connection, QIODevice* source,
-                        upload_callback_t callback) const;
+        bool upload(Connection* connection, const QString& fileName,
+                    upload_callback_t callback) const;
+        bool upload(Connection* connection, QIODevice* source,
+                    upload_callback_t callback) const;
 
-            QString mediaId() const;
-            QUrl url() const;
-            bool updateUrl(const QUrl& newUrl);
+        QString mediaId() const;
+        QUrl url() const;
+        bool updateUrl(const QUrl& newUrl);
 
         private:
-            class Private;
-            std::unique_ptr<Private> d;
+        class Private;
+        std::unique_ptr<Private> d;
     };
-}  // namespace QMatrixClient
+} // namespace QMatrixClient
diff --git a/lib/connection.cpp b/lib/connection.cpp
index 26b40c03..2b1cc1b9 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -13,39 +13,39 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "connection.h"
 #include "connectiondata.h"
-#include "user.h"
-#include "events/directchatevent.h"
-#include "events/eventloader.h"
-#include "room.h"
-#include "settings.h"
-#include "csapi/login.h"
+#include "csapi/account-data.h"
 #include "csapi/capabilities.h"
+#include "csapi/joining.h"
+#include "csapi/leaving.h"
+#include "csapi/login.h"
 #include "csapi/logout.h"
 #include "csapi/receipts.h"
-#include "csapi/leaving.h"
-#include "csapi/account-data.h"
-#include "csapi/joining.h"
-#include "csapi/to_device.h"
 #include "csapi/room_send.h"
-#include "jobs/syncjob.h"
-#include "jobs/mediathumbnailjob.h"
-#include "jobs/downloadfilejob.h"
+#include "csapi/to_device.h"
 #include "csapi/voip.h"
+#include "events/directchatevent.h"
+#include "events/eventloader.h"
+#include "jobs/downloadfilejob.h"
+#include "jobs/mediathumbnailjob.h"
+#include "jobs/syncjob.h"
+#include "room.h"
+#include "settings.h"
+#include "user.h"
 
-#include <QtNetwork/QDnsLookup>
-#include <QtCore/QFile>
+#include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
-#include <QtCore/QStandardPaths>
-#include <QtCore/QStringBuilder>
 #include <QtCore/QElapsedTimer>
-#include <QtCore/QRegularExpression>
+#include <QtCore/QFile>
 #include <QtCore/QMimeDatabase>
-#include <QtCore/QCoreApplication>
+#include <QtCore/QRegularExpression>
+#include <QtCore/QStandardPaths>
+#include <QtCore/QStringBuilder>
+#include <QtNetwork/QDnsLookup>
 
 using namespace QMatrixClient;
 
@@ -54,10 +54,8 @@ template <typename HashT, typename Pred>
 HashT erase_if(HashT& hashMap, Pred pred)
 {
     HashT removals;
-    for (auto it = hashMap.begin(); it != hashMap.end();)
-    {
-        if (pred(it))
-        {
+    for (auto it = hashMap.begin(); it != hashMap.end();) {
+        if (pred(it)) {
             removals.insert(it.key(), it.value());
             it = hashMap.erase(it);
         } else
@@ -69,82 +67,81 @@ HashT erase_if(HashT& hashMap, Pred pred)
 class Connection::Private
 {
     public:
-        explicit Private(std::unique_ptr<ConnectionData>&& connection)
-            : data(move(connection))
-        { }
-        Q_DISABLE_COPY(Private)
-        Private(Private&&) = delete;
-        Private operator=(Private&&) = delete;
-
-        Connection* q = nullptr;
-        std::unique_ptr<ConnectionData> data;
-        // A complex key below is a pair of room name and whether its
-        // state is Invited. The spec mandates to keep Invited room state
-        // separately so we should, e.g., keep objects for Invite and
-        // Leave state of the same room.
-        QHash<QPair<QString, bool>, Room*> roomMap;
-        // Mapping from aliases to room ids, as per the last sync
-        QHash<QString, QString> roomAliasMap;
-        QVector<QString> roomIdsToForget;
-        QVector<Room*> firstTimeRooms;
-        QVector<QString> pendingStateRoomIds;
-        QMap<QString, User*> userMap;
-        DirectChatsMap directChats;
-        DirectChatUsersMap directChatUsers;
-        std::unordered_map<QString, EventPtr> accountData;
-        QString userId;
-        int syncLoopTimeout = -1;
-
-        GetCapabilitiesJob* capabilitiesJob = nullptr;
-        GetCapabilitiesJob::Capabilities capabilities;
-
-        SyncJob* syncJob = nullptr;
-
-        bool cacheState = true;
-        bool cacheToBinary = SettingsGroup("libqmatrixclient")
-                             .value("cache_type").toString() != "json";
-        bool lazyLoading = false;
-
-        void connectWithToken(const QString& user, const QString& accessToken,
-                              const QString& deviceId);
-        void broadcastDirectChatUpdates(const DirectChatsMap& additions,
-                                        const DirectChatsMap& removals);
-
-        template <typename EventT>
-        EventT* unpackAccountData() const
-        {
-            const auto& eventIt = accountData.find(EventT::matrixTypeId());
-            return eventIt == accountData.end()
-                    ? nullptr : weakPtrCast<EventT>(eventIt->second);
-        }
+    explicit Private(std::unique_ptr<ConnectionData>&& connection)
+        : data(move(connection))
+    {
+    }
+    Q_DISABLE_COPY(Private)
+    Private(Private&&) = delete;
+    Private operator=(Private&&) = delete;
+
+    Connection* q = nullptr;
+    std::unique_ptr<ConnectionData> data;
+    // A complex key below is a pair of room name and whether its
+    // state is Invited. The spec mandates to keep Invited room state
+    // separately so we should, e.g., keep objects for Invite and
+    // Leave state of the same room.
+    QHash<QPair<QString, bool>, Room*> roomMap;
+    // Mapping from aliases to room ids, as per the last sync
+    QHash<QString, QString> roomAliasMap;
+    QVector<QString> roomIdsToForget;
+    QVector<Room*> firstTimeRooms;
+    QVector<QString> pendingStateRoomIds;
+    QMap<QString, User*> userMap;
+    DirectChatsMap directChats;
+    DirectChatUsersMap directChatUsers;
+    std::unordered_map<QString, EventPtr> accountData;
+    QString userId;
+    int syncLoopTimeout = -1;
+
+    GetCapabilitiesJob* capabilitiesJob = nullptr;
+    GetCapabilitiesJob::Capabilities capabilities;
+
+    SyncJob* syncJob = nullptr;
+
+    bool cacheState = true;
+    bool cacheToBinary =
+            SettingsGroup("libqmatrixclient").value("cache_type").toString()
+            != "json";
+    bool lazyLoading = false;
+
+    void connectWithToken(const QString& user, const QString& accessToken,
+                          const QString& deviceId);
+    void broadcastDirectChatUpdates(const DirectChatsMap& additions,
+                                    const DirectChatsMap& removals);
+
+    template <typename EventT> EventT* unpackAccountData() const
+    {
+        const auto& eventIt = accountData.find(EventT::matrixTypeId());
+        return eventIt == accountData.end()
+                ? nullptr
+                : weakPtrCast<EventT>(eventIt->second);
+    }
 
-        void packAndSendAccountData(EventPtr&& event)
-        {
-            const auto eventType = event->matrixType();
-            q->callApi<SetAccountDataJob>(userId, eventType,
-                                          event->contentJson());
-            accountData[eventType] = std::move(event);
-            emit q->accountDataChanged(eventType);
-        }
+    void packAndSendAccountData(EventPtr&& event)
+    {
+        const auto eventType = event->matrixType();
+        q->callApi<SetAccountDataJob>(userId, eventType, event->contentJson());
+        accountData[eventType] = std::move(event);
+        emit q->accountDataChanged(eventType);
+    }
 
-        template <typename EventT, typename ContentT>
-        void packAndSendAccountData(ContentT&& content)
-        {
-            packAndSendAccountData(
-                        makeEvent<EventT>(std::forward<ContentT>(content)));
-        }
+    template <typename EventT, typename ContentT>
+    void packAndSendAccountData(ContentT&& content)
+    {
+        packAndSendAccountData(
+                makeEvent<EventT>(std::forward<ContentT>(content)));
+    }
 };
 
 Connection::Connection(const QUrl& server, QObject* parent)
-    : QObject(parent)
-    , d(std::make_unique<Private>(std::make_unique<ConnectionData>(server)))
+    : QObject(parent),
+      d(std::make_unique<Private>(std::make_unique<ConnectionData>(server)))
 {
     d->q = this; // All d initialization should occur before this line
 }
 
-Connection::Connection(QObject* parent)
-    : Connection({}, parent)
-{ }
+Connection::Connection(QObject* parent) : Connection({}, parent) {}
 
 Connection::~Connection()
 {
@@ -159,19 +156,20 @@ void Connection::resolveServer(const QString& mxidOrDomain)
 
     // Try to parse as an FQID; if there's no @ part, assume it's a domain name.
     QRegularExpression parser(
-        "^(@.+?:)?" // Optional username (allow everything for compatibility)
-        "(\\[[^]]+\\]|[^:@]+)" // Either IPv6 address or hostname/IPv4 address
-        "(:\\d{1,5})?$", // Optional port
-        QRegularExpression::UseUnicodePropertiesOption); // Because asian digits
+            "^(@.+?:)?" // Optional username (allow everything for
+                        // compatibility)
+            "(\\[[^]]+\\]|[^:@]+)" // Either IPv6 address or hostname/IPv4
+                                   // address
+            "(:\\d{1,5})?$", // Optional port
+            QRegularExpression::UseUnicodePropertiesOption); // Because asian
+                                                             // digits
     auto match = parser.match(mxidOrDomain);
 
     QUrl maybeBaseUrl = QUrl::fromUserInput(match.captured(2));
     maybeBaseUrl.setScheme("https"); // Instead of the Qt-default "http"
-    if (!match.hasMatch() || !maybeBaseUrl.isValid())
-    {
-        emit resolveError(
-            tr("%1 is not a valid homeserver address")
-                    .arg(maybeBaseUrl.toString()));
+    if (!match.hasMatch() || !maybeBaseUrl.isValid()) {
+        emit resolveError(tr("%1 is not a valid homeserver address")
+                                  .arg(maybeBaseUrl.toString()));
         return;
     }
 
@@ -188,16 +186,15 @@ void Connection::resolveServer(const QString& mxidOrDomain)
     dns->setType(QDnsLookup::SRV);
     dns->setName("_matrix._tcp." + domain);
 
-    connect(dns, &QDnsLookup::finished, [this,dns,maybeBaseUrl]() {
+    connect(dns, &QDnsLookup::finished, [this, dns, maybeBaseUrl]() {
         QUrl baseUrl { maybeBaseUrl };
-        if (dns->error() == QDnsLookup::NoError &&
-                dns->serviceRecords().isEmpty())
-        {
+        if (dns->error() == QDnsLookup::NoError
+            && dns->serviceRecords().isEmpty()) {
             auto record = dns->serviceRecords().front();
             baseUrl.setHost(record.target());
             baseUrl.setPort(record.port());
-            qCDebug(MAIN) << "SRV record for" << maybeBaseUrl.host()
-                          << "is" << baseUrl.authority();
+            qCDebug(MAIN) << "SRV record for" << maybeBaseUrl.host() << "is"
+                          << baseUrl.authority();
         } else {
             qCDebug(MAIN) << baseUrl.host() << "doesn't have SRV record"
                           << dns->name() << "- using the hostname as is";
@@ -213,41 +210,37 @@ void Connection::connectToServer(const QString& user, const QString& password,
                                  const QString& initialDeviceName,
                                  const QString& deviceId)
 {
-    checkAndConnect(user,
-        [=] {
-            doConnectToServer(user, password, initialDeviceName, deviceId);
-        });
+    checkAndConnect(user, [=] {
+        doConnectToServer(user, password, initialDeviceName, deviceId);
+    });
 }
 void Connection::doConnectToServer(const QString& user, const QString& password,
                                    const QString& initialDeviceName,
                                    const QString& deviceId)
 {
-    auto loginJob = callApi<LoginJob>(QStringLiteral("m.login.password"),
+    auto loginJob = callApi<LoginJob>(
+            QStringLiteral("m.login.password"),
             UserIdentifier { QStringLiteral("m.id.user"),
-                             {{ QStringLiteral("user"), user }} },
+                             { { QStringLiteral("user"), user } } },
             password, /*token*/ "", deviceId, initialDeviceName);
-    connect(loginJob, &BaseJob::success, this,
-        [this, loginJob] {
-            d->connectWithToken(loginJob->userId(), loginJob->accessToken(),
-                                loginJob->deviceId());
-        });
-    connect(loginJob, &BaseJob::failure, this,
-        [this, loginJob] {
-            emit loginError(loginJob->errorString(), loginJob->rawDataSample());
-        });
+    connect(loginJob, &BaseJob::success, this, [this, loginJob] {
+        d->connectWithToken(loginJob->userId(), loginJob->accessToken(),
+                            loginJob->deviceId());
+    });
+    connect(loginJob, &BaseJob::failure, this, [this, loginJob] {
+        emit loginError(loginJob->errorString(), loginJob->rawDataSample());
+    });
 }
 
-void Connection::syncLoopIteration()
-{
-    sync(d->syncLoopTimeout);
-}
+void Connection::syncLoopIteration() { sync(d->syncLoopTimeout); }
 
 void Connection::connectWithToken(const QString& userId,
                                   const QString& accessToken,
                                   const QString& deviceId)
 {
-    checkAndConnect(userId,
-        [=] { d->connectWithToken(userId, accessToken, deviceId); });
+    checkAndConnect(userId, [=] {
+        d->connectWithToken(userId, accessToken, deviceId);
+    });
 }
 
 void Connection::reloadCapabilities()
@@ -259,18 +252,17 @@ void Connection::reloadCapabilities()
         else if (d->capabilitiesJob->error() == BaseJob::IncorrectRequestError)
             qCDebug(MAIN) << "Server doesn't support /capabilities";
 
-        if (d->capabilities.roomVersions.omitted())
-        {
+        if (d->capabilities.roomVersions.omitted()) {
             qCWarning(MAIN) << "Pinning supported room version to 1";
-            d->capabilities.roomVersions = { "1", {{ "1", "stable" }} };
+            d->capabilities.roomVersions = { "1", { { "1", "stable" } } };
         } else {
-            qCDebug(MAIN) << "Room versions:"
-                << defaultRoomVersion() << "is default, full list:"
-                << availableRoomVersions();
+            qCDebug(MAIN) << "Room versions:" << defaultRoomVersion()
+                          << "is default, full list:"
+                          << availableRoomVersions();
         }
         Q_ASSERT(!d->capabilities.roomVersions.omitted());
         emit capabilitiesLoaded();
-        for (auto* r: d->roomMap)
+        for (auto* r : d->roomMap)
             if (r->joinState() == JoinState::Join && r->successorId().isEmpty())
                 r->checkVersion();
     });
@@ -301,28 +293,26 @@ void Connection::Private::connectWithToken(const QString& user,
 void Connection::checkAndConnect(const QString& userId,
                                  std::function<void()> connectFn)
 {
-    if (d->data->baseUrl().isValid())
-    {
+    if (d->data->baseUrl().isValid()) {
         connectFn();
         return;
     }
     // Not good to go, try to fix the homeserver URL.
-    if (userId.startsWith('@') && userId.indexOf(':') != -1)
-    {
-        connectSingleShot(this, &Connection::homeserverChanged, this, connectFn);
+    if (userId.startsWith('@') && userId.indexOf(':') != -1) {
+        connectSingleShot(this, &Connection::homeserverChanged, this,
+                          connectFn);
         // NB: doResolveServer can emit resolveError, so this is a part of
         // checkAndConnect function contract.
         resolveServer(userId);
     } else
-        emit resolveError(
-            tr("%1 is an invalid homeserver URL")
-                .arg(d->data->baseUrl().toString()));
+        emit resolveError(tr("%1 is an invalid homeserver URL")
+                                  .arg(d->data->baseUrl().toString()));
 }
 
 void Connection::logout()
 {
     auto job = callApi<LogoutJob>();
-    connect( job, &LogoutJob::success, this, [this] {
+    connect(job, &LogoutJob::success, this, [this] {
         stopSync();
         d->data->setToken({});
         emit stateChanged();
@@ -338,28 +328,25 @@ void Connection::sync(int timeout)
     Filter filter;
     filter.room->timeline->limit = 100;
     filter.room->state->lazyLoadMembers = d->lazyLoading;
-    auto job = d->syncJob = callApi<SyncJob>(BackgroundRequest,
-                                d->data->lastEvent(), filter, timeout);
-    connect( job, &SyncJob::success, this, [this, job] {
+    auto job = d->syncJob = callApi<SyncJob>(
+            BackgroundRequest, d->data->lastEvent(), filter, timeout);
+    connect(job, &SyncJob::success, this, [this, job] {
         onSyncSuccess(job->takeData());
         d->syncJob = nullptr;
         emit syncDone();
     });
-    connect( job, &SyncJob::retryScheduled, this,
-        [this,job] (int retriesTaken, int nextInMilliseconds)
-        {
-            emit networkError(job->errorString(), job->rawDataSample(),
-                              retriesTaken, nextInMilliseconds);
-        });
-    connect( job, &SyncJob::failure, this, [this, job] {
+    connect(job, &SyncJob::retryScheduled, this,
+            [this, job](int retriesTaken, int nextInMilliseconds) {
+                emit networkError(job->errorString(), job->rawDataSample(),
+                                  retriesTaken, nextInMilliseconds);
+            });
+    connect(job, &SyncJob::failure, this, [this, job] {
         d->syncJob = nullptr;
-        if (job->error() == BaseJob::ContentAccessError)
-        {
-            qCWarning(SYNCJOB)
-                << "Sync job failed with ContentAccessError - login expired?";
+        if (job->error() == BaseJob::ContentAccessError) {
+            qCWarning(SYNCJOB) << "Sync job failed with ContentAccessError - "
+                                  "login expired?";
             emit loginError(job->errorString(), job->rawDataSample());
-        }
-        else
+        } else
             emit syncError(job->errorString(), job->rawDataSample());
     });
 }
@@ -371,65 +358,59 @@ void Connection::syncLoop(int timeout)
     syncLoopIteration(); // initial sync to start the loop
 }
 
-void Connection::onSyncSuccess(SyncData &&data, bool fromCache) {
+void Connection::onSyncSuccess(SyncData&& data, bool fromCache)
+{
     d->data->setLastEvent(data.nextBatch());
-    for (auto&& roomData: data.takeRoomData())
-    {
+    for (auto&& roomData : data.takeRoomData()) {
         const auto forgetIdx = d->roomIdsToForget.indexOf(roomData.roomId);
-        if (forgetIdx != -1)
-        {
+        if (forgetIdx != -1) {
             d->roomIdsToForget.removeAt(forgetIdx);
-            if (roomData.joinState == JoinState::Leave)
-            {
-                qDebug(MAIN) << "Room" << roomData.roomId
-                    << "has been forgotten, ignoring /sync response for it";
+            if (roomData.joinState == JoinState::Leave) {
+                qDebug(MAIN)
+                        << "Room" << roomData.roomId
+                        << "has been forgotten, ignoring /sync response for it";
                 continue;
             }
             qWarning(MAIN) << "Room" << roomData.roomId
-                 << "has just been forgotten but /sync returned it in"
-                 << toCString(roomData.joinState)
-                 << "state - suspiciously fast turnaround";
+                           << "has just been forgotten but /sync returned it in"
+                           << toCString(roomData.joinState)
+                           << "state - suspiciously fast turnaround";
         }
-        if ( auto* r = provideRoom(roomData.roomId, roomData.joinState) )
-        {
+        if (auto* r = provideRoom(roomData.roomId, roomData.joinState)) {
             d->pendingStateRoomIds.removeOne(roomData.roomId);
             r->updateData(std::move(roomData), fromCache);
-            if (d->firstTimeRooms.removeOne(r))
-            {
+            if (d->firstTimeRooms.removeOne(r)) {
                 emit loadedRoomState(r);
                 if (!d->capabilities.roomVersions.omitted())
                     r->checkVersion();
-                // Otherwise, the version will be checked in reloadCapabilities()
+                // Otherwise, the version will be checked in
+                // reloadCapabilities()
             }
         }
         // Let UI update itself after updating each room
         QCoreApplication::processEvents();
     }
-    for (auto&& accountEvent: data.takeAccountData())
-    {
-        if (is<DirectChatEvent>(*accountEvent))
-        {
+    for (auto&& accountEvent : data.takeAccountData()) {
+        if (is<DirectChatEvent>(*accountEvent)) {
             const auto usersToDCs = ptrCast<DirectChatEvent>(move(accountEvent))
-                                        ->usersToDirectChats();
+                                            ->usersToDirectChats();
             DirectChatsMap removals =
-                erase_if(d->directChats, [&usersToDCs] (auto it) {
-                    return !usersToDCs.contains(it.key()->id(), it.value());
-                });
-            erase_if(d->directChatUsers, [&usersToDCs] (auto it) {
+                    erase_if(d->directChats, [&usersToDCs](auto it) {
+                        return !usersToDCs.contains(it.key()->id(), it.value());
+                    });
+            erase_if(d->directChatUsers, [&usersToDCs](auto it) {
                 return !usersToDCs.contains(it.value()->id(), it.key());
             });
             if (MAIN().isDebugEnabled())
                 for (auto it = removals.begin(); it != removals.end(); ++it)
-                    qCDebug(MAIN) << it.value()
-                        << "is no more a direct chat with" << it.key()->id();
+                    qCDebug(MAIN)
+                            << it.value() << "is no more a direct chat with"
+                            << it.key()->id();
 
             DirectChatsMap additions;
-            for (auto it = usersToDCs.begin(); it != usersToDCs.end(); ++it)
-            {
-                if (auto* u = user(it.key()))
-                {
-                    if (!d->directChats.contains(u, it.value()))
-                    {
+            for (auto it = usersToDCs.begin(); it != usersToDCs.end(); ++it) {
+                if (auto* u = user(it.key())) {
+                    if (!d->directChats.contains(u, it.value())) {
                         Q_ASSERT(!d->directChatUsers.contains(it.value(), u));
                         additions.insert(u, it.value());
                         d->directChats.insert(u, it.value());
@@ -448,14 +429,13 @@ void Connection::onSyncSuccess(SyncData &&data, bool fromCache) {
         }
         if (is<IgnoredUsersEvent>(*accountEvent))
             qCDebug(MAIN) << "Users ignored by" << d->userId << "updated:"
-                << QStringList::fromSet(ignoredUsers()).join(',');
+                          << QStringList::fromSet(ignoredUsers()).join(',');
 
         auto& currentData = d->accountData[accountEvent->matrixType()];
         // A polymorphic event-specific comparison might be a bit more
         // efficient; maaybe do it another day
-        if (!currentData ||
-                currentData->contentJson() != accountEvent->contentJson())
-        {
+        if (!currentData
+            || currentData->contentJson() != accountEvent->contentJson()) {
             currentData = std::move(accountEvent);
             qCDebug(MAIN) << "Updated account data of type"
                           << currentData->matrixType();
@@ -467,8 +447,8 @@ void Connection::onSyncSuccess(SyncData &&data, bool fromCache) {
 void Connection::stopSync()
 {
     // If there's a sync loop, break it
-    disconnect(this, &Connection::syncDone,
-               this, &Connection::syncLoopIteration);
+    disconnect(this, &Connection::syncDone, this,
+               &Connection::syncLoopIteration);
     if (d->syncJob) // If there's an ongoing sync job, stop it too
     {
         d->syncJob->abandon();
@@ -476,10 +456,7 @@ void Connection::stopSync()
     }
 }
 
-QString Connection::nextBatchToken() const
-{
-    return d->data->lastEvent();
-}
+QString Connection::nextBatchToken() const { return d->data->lastEvent(); }
 
 PostReceiptJob* Connection::postReceipt(Room* room, RoomEvent* event) const
 {
@@ -492,8 +469,8 @@ JoinRoomJob* Connection::joinRoom(const QString& roomAlias,
     auto job = callApi<JoinRoomJob>(roomAlias, serverNames);
     // Upon completion, ensure a room object in Join state is created but only
     // if it's not already there due to a sync completing earlier.
-    connect(job, &JoinRoomJob::success,
-            this, [this, job] { provideRoom(job->roomId()); });
+    connect(job, &JoinRoomJob::success, this,
+            [this, job] { provideRoom(job->roomId()); });
     return job;
 }
 
@@ -501,15 +478,13 @@ LeaveRoomJob* Connection::leaveRoom(Room* room)
 {
     const auto& roomId = room->id();
     const auto job = callApi<LeaveRoomJob>(roomId);
-    if (room->joinState() == JoinState::Invite)
-    {
+    if (room->joinState() == JoinState::Invite) {
         // Workaround matrix-org/synapse#2181 - if the room is in invite state
         // the invite may have been cancelled but Synapse didn't send it in
         // `/sync`. See also #273 for the discussion in the library context.
         d->pendingStateRoomIds.push_back(roomId);
-        connect(job, &LeaveRoomJob::success, this, [this,roomId] {
-            if (d->pendingStateRoomIds.removeOne(roomId))
-            {
+        connect(job, &LeaveRoomJob::success, this, [this, roomId] {
+            if (d->pendingStateRoomIds.removeOne(roomId)) {
                 qCDebug(MAIN) << "Forcing the room to Leave status";
                 provideRoom(roomId, JoinState::Leave);
             }
@@ -522,40 +497,44 @@ inline auto splitMediaId(const QString& mediaId)
 {
     auto idParts = mediaId.split('/');
     Q_ASSERT_X(idParts.size() == 2, __FUNCTION__,
-               ("'" + mediaId +
-                "' doesn't look like 'serverName/localMediaId'").toLatin1());
+               ("'" + mediaId + "' doesn't look like 'serverName/localMediaId'")
+                       .toLatin1());
     return idParts;
 }
 
 MediaThumbnailJob* Connection::getThumbnail(const QString& mediaId,
-    QSize requestedSize, RunningPolicy policy) const
+                                            QSize requestedSize,
+                                            RunningPolicy policy) const
 {
     auto idParts = splitMediaId(mediaId);
-    return callApi<MediaThumbnailJob>(policy,
-        idParts.front(), idParts.back(), requestedSize);
+    return callApi<MediaThumbnailJob>(policy, idParts.front(), idParts.back(),
+                                      requestedSize);
 }
 
 MediaThumbnailJob* Connection::getThumbnail(const QUrl& url,
-    QSize requestedSize, RunningPolicy policy) const
+                                            QSize requestedSize,
+                                            RunningPolicy policy) const
 {
     return getThumbnail(url.authority() + url.path(), requestedSize, policy);
 }
 
-MediaThumbnailJob* Connection::getThumbnail(const QUrl& url,
-    int requestedWidth, int requestedHeight, RunningPolicy policy) const
+MediaThumbnailJob* Connection::getThumbnail(const QUrl& url, int requestedWidth,
+                                            int requestedHeight,
+                                            RunningPolicy policy) const
 {
     return getThumbnail(url, QSize(requestedWidth, requestedHeight), policy);
 }
 
-UploadContentJob* Connection::uploadContent(QIODevice* contentSource,
-        const QString& filename, const QString& overrideContentType) const
+UploadContentJob*
+Connection::uploadContent(QIODevice* contentSource, const QString& filename,
+                          const QString& overrideContentType) const
 {
     auto contentType = overrideContentType;
-    if (contentType.isEmpty())
-    {
+    if (contentType.isEmpty()) {
         contentType =
-            QMimeDatabase().mimeTypeForFileNameAndData(filename, contentSource)
-            .name();
+                QMimeDatabase()
+                        .mimeTypeForFileNameAndData(filename, contentSource)
+                        .name();
         contentSource->open(QIODevice::ReadOnly);
     }
     return callApi<UploadContentJob>(contentSource, filename, contentType);
@@ -565,8 +544,7 @@ UploadContentJob* Connection::uploadFile(const QString& fileName,
                                          const QString& overrideContentType)
 {
     auto sourceFile = new QFile(fileName);
-    if (!sourceFile->open(QIODevice::ReadOnly))
-    {
+    if (!sourceFile->open(QIODevice::ReadOnly)) {
         qCWarning(MAIN) << "Couldn't open" << sourceFile->fileName()
                         << "for reading";
         return nullptr;
@@ -596,13 +574,14 @@ DownloadFileJob* Connection::downloadFile(const QUrl& url,
     return job;
 }
 
-CreateRoomJob* Connection::createRoom(RoomVisibility visibility,
-    const QString& alias, const QString& name, const QString& topic,
-    QStringList invites, const QString& presetName,
-    const QString& roomVersion, bool isDirect,
-    const QVector<CreateRoomJob::StateEvent>& initialState,
-    const QVector<CreateRoomJob::Invite3pid>& invite3pids,
-    const QJsonObject& creationContent)
+CreateRoomJob*
+Connection::createRoom(RoomVisibility visibility, const QString& alias,
+                       const QString& name, const QString& topic,
+                       QStringList invites, const QString& presetName,
+                       const QString& roomVersion, bool isDirect,
+                       const QVector<CreateRoomJob::StateEvent>& initialState,
+                       const QVector<CreateRoomJob::Invite3pid>& invite3pids,
+                       const QJsonObject& creationContent)
 {
     invites.removeOne(d->userId); // The creator is by definition in the room
     auto job = callApi<CreateRoomJob>(
@@ -610,7 +589,7 @@ CreateRoomJob* Connection::createRoom(RoomVisibility visibility,
                                       : QStringLiteral("private"),
             alias, name, topic, invites, invite3pids, roomVersion,
             creationContent, initialState, presetName, isDirect);
-    connect(job, &BaseJob::success, this, [this,job] {
+    connect(job, &BaseJob::success, this, [this, job] {
         emit createdRoom(provideRoom(job->roomId(), JoinState::Join));
     });
     return job;
@@ -621,14 +600,14 @@ void Connection::requestDirectChat(const QString& userId)
     if (auto* u = user(userId))
         requestDirectChat(u);
     else
-        qCCritical(MAIN)
-            << "Connection::requestDirectChat: Couldn't get a user object for"
-            << userId;
+        qCCritical(MAIN) << "Connection::requestDirectChat: Couldn't get a "
+                            "user object for"
+                         << userId;
 }
 
 void Connection::requestDirectChat(User* u)
 {
-    doInDirectChat(u, [this] (Room* r) { emit directChatAvailable(r); });
+    doInDirectChat(u, [this](Room* r) { emit directChatAvailable(r); });
 }
 
 void Connection::doInDirectChat(const QString& userId,
@@ -638,8 +617,8 @@ void Connection::doInDirectChat(const QString& userId,
         doInDirectChat(u, operation);
     else
         qCCritical(MAIN)
-            << "Connection::doInDirectChat: Couldn't get a user object for"
-            << userId;
+                << "Connection::doInDirectChat: Couldn't get a user object for"
+                << userId;
 }
 
 void Connection::doInDirectChat(User* u,
@@ -651,11 +630,9 @@ void Connection::doInDirectChat(User* u,
     // (left/forgotten) ones along the way.
     DirectChatsMap removals;
     for (auto it = d->directChats.find(u);
-         it != d->directChats.end() && it.key() == u; ++it)
-    {
+         it != d->directChats.end() && it.key() == u; ++it) {
         const auto& roomId = *it;
-        if (auto r = room(roomId, JoinState::Join))
-        {
+        if (auto r = room(roomId, JoinState::Join)) {
             Q_ASSERT(r->id() == roomId);
             // A direct chat with yourself should only involve yourself :)
             if (userId == d->userId && r->totalMemberCount() > 1)
@@ -665,15 +642,16 @@ void Connection::doInDirectChat(User* u,
             operation(r);
             return;
         }
-        if (auto ir = invitation(roomId))
-        {
+        if (auto ir = invitation(roomId)) {
             Q_ASSERT(ir->id() == roomId);
             auto j = joinRoom(ir->id());
-            connect(j, &BaseJob::success, this, [this,roomId,userId,operation] {
-                qCDebug(MAIN) << "Joined the already invited direct chat with"
-                              << userId << "as" << roomId;
-                operation(room(roomId, JoinState::Join));
-            });
+            connect(j, &BaseJob::success, this,
+                    [this, roomId, userId, operation] {
+                        qCDebug(MAIN)
+                                << "Joined the already invited direct chat with"
+                                << userId << "as" << roomId;
+                        operation(room(roomId, JoinState::Join));
+                    });
             return;
         }
         // Avoid reusing previously left chats but don't remove them
@@ -686,10 +664,8 @@ void Connection::doInDirectChat(User* u,
         // Postpone actual deletion until we finish iterating d->directChats.
         removals.insert(it.key(), it.value());
     }
-    if (!removals.isEmpty())
-    {
-        for (auto it = removals.cbegin(); it != removals.cend(); ++it)
-        {
+    if (!removals.isEmpty()) {
+        for (auto it = removals.cbegin(); it != removals.cend(); ++it) {
             d->directChats.remove(it.key(), it.value());
             d->directChatUsers.remove(it.value(),
                                       const_cast<User*>(it.key())); // FIXME
@@ -698,18 +674,18 @@ void Connection::doInDirectChat(User* u,
     }
 
     auto j = createDirectChat(userId);
-    connect(j, &BaseJob::success, this, [this,j,userId,operation] {
-        qCDebug(MAIN) << "Direct chat with" << userId
-                      << "has been created as" << j->roomId();
+    connect(j, &BaseJob::success, this, [this, j, userId, operation] {
+        qCDebug(MAIN) << "Direct chat with" << userId << "has been created as"
+                      << j->roomId();
         operation(room(j->roomId(), JoinState::Join));
     });
-
 }
 
 CreateRoomJob* Connection::createDirectChat(const QString& userId,
-    const QString& topic, const QString& name)
+                                            const QString& topic,
+                                            const QString& name)
 {
-    return createRoom(UnpublishRoom, "", name, topic, {userId},
+    return createRoom(UnpublishRoom, "", name, topic, { userId },
                       "trusted_private_chat", {}, true);
 }
 
@@ -723,11 +699,10 @@ ForgetRoomJob* Connection::forgetRoom(const QString& id)
     // a ForgetRoomJob is created in advance and can be returned in a probably
     // not-yet-started state (it will start once /leave completes).
     auto forgetJob = new ForgetRoomJob(id);
-    auto room = d->roomMap.value({id, false});
+    auto room = d->roomMap.value({ id, false });
     if (!room)
-        room = d->roomMap.value({id, true});
-    if (room && room->joinState() != JoinState::Leave)
-    {
+        room = d->roomMap.value({ id, true });
+    if (room && room->joinState() != JoinState::Leave) {
         auto leaveJob = room->leaveRoom();
         connect(leaveJob, &BaseJob::success, this, [this, forgetJob, room] {
             forgetJob->start(connectionData());
@@ -737,18 +712,14 @@ ForgetRoomJob* Connection::forgetRoom(const QString& id)
                 d->roomIdsToForget.push_back(room->id());
         });
         connect(leaveJob, &BaseJob::failure, forgetJob, &BaseJob::abandon);
-    }
-    else
+    } else
         forgetJob->start(connectionData());
-    connect(forgetJob, &BaseJob::success, this, [this, id]
-    {
+    connect(forgetJob, &BaseJob::success, this, [this, id] {
         // Delete whatever instances of the room are still in the map.
-        for (auto f: {false, true})
-            if (auto r = d->roomMap.take({ id, f }))
-            {
-                qCDebug(MAIN) << "Room" << r->objectName()
-                              << "in state" << toCString(r->joinState())
-                              << "will be deleted";
+        for (auto f : { false, true })
+            if (auto r = d->roomMap.take({ id, f })) {
+                qCDebug(MAIN) << "Room" << r->objectName() << "in state"
+                              << toCString(r->joinState()) << "will be deleted";
                 emit r->beforeDestruction(r);
                 r->deleteLater();
             }
@@ -756,52 +727,52 @@ ForgetRoomJob* Connection::forgetRoom(const QString& id)
     return forgetJob;
 }
 
-SendToDeviceJob* Connection::sendToDevices(const QString& eventType,
-        const UsersToDevicesToEvents& eventsMap) const
+SendToDeviceJob*
+Connection::sendToDevices(const QString& eventType,
+                          const UsersToDevicesToEvents& eventsMap) const
 {
     QHash<QString, QHash<QString, QJsonObject>> json;
     json.reserve(int(eventsMap.size()));
-    std::for_each(eventsMap.begin(), eventsMap.end(),
-        [&json] (const auto& userTodevicesToEvents) {
-            auto& jsonUser = json[userTodevicesToEvents.first];
-            const auto& devicesToEvents = userTodevicesToEvents.second;
-            std::for_each(devicesToEvents.begin(), devicesToEvents.end(),
-                [&jsonUser] (const auto& deviceToEvents) {
-                    jsonUser.insert(deviceToEvents.first,
-                                    deviceToEvents.second.contentJson());
-                });
-        });
-    return callApi<SendToDeviceJob>(BackgroundRequest,
-                eventType, generateTxnId(), json);
+    std::for_each(
+            eventsMap.begin(), eventsMap.end(),
+            [&json](const auto& userTodevicesToEvents) {
+                auto& jsonUser = json[userTodevicesToEvents.first];
+                const auto& devicesToEvents = userTodevicesToEvents.second;
+                std::for_each(devicesToEvents.begin(), devicesToEvents.end(),
+                              [&jsonUser](const auto& deviceToEvents) {
+                                  jsonUser.insert(
+                                          deviceToEvents.first,
+                                          deviceToEvents.second.contentJson());
+                              });
+            });
+    return callApi<SendToDeviceJob>(BackgroundRequest, eventType,
+                                    generateTxnId(), json);
 }
 
 SendMessageJob* Connection::sendMessage(const QString& roomId,
                                         const RoomEvent& event) const
 {
-    const auto txnId = event.transactionId().isEmpty()
-                            ? generateTxnId() : event.transactionId();
-    return callApi<SendMessageJob>(roomId, event.matrixType(),
-                                   txnId, event.contentJson());
+    const auto txnId = event.transactionId().isEmpty() ? generateTxnId()
+                                                       : event.transactionId();
+    return callApi<SendMessageJob>(roomId, event.matrixType(), txnId,
+                                   event.contentJson());
 }
 
-QUrl Connection::homeserver() const
-{
-    return d->data->baseUrl();
-}
+QUrl Connection::homeserver() const { return d->data->baseUrl(); }
 
 Room* Connection::room(const QString& roomId, JoinStates states) const
 {
-    Room* room = d->roomMap.value({roomId, false}, nullptr);
-    if (states.testFlag(JoinState::Join) &&
-            room && room->joinState() == JoinState::Join)
+    Room* room = d->roomMap.value({ roomId, false }, nullptr);
+    if (states.testFlag(JoinState::Join) && room
+        && room->joinState() == JoinState::Join)
         return room;
 
     if (states.testFlag(JoinState::Invite))
         if (Room* invRoom = invitation(roomId))
             return invRoom;
 
-    if (states.testFlag(JoinState::Leave) &&
-            room && room->joinState() == JoinState::Leave)
+    if (states.testFlag(JoinState::Leave) && room
+        && room->joinState() == JoinState::Leave)
         return room;
 
     return nullptr;
@@ -821,22 +792,21 @@ void Connection::updateRoomAliases(const QString& roomId,
                                    const QStringList& previousRoomAliases,
                                    const QStringList& roomAliases)
 {
-    for (const auto& a: previousRoomAliases)
+    for (const auto& a : previousRoomAliases)
         if (d->roomAliasMap.remove(a) == 0)
-            qCWarning(MAIN) << "Alias" << a << "is not found (already deleted?)";
+            qCWarning(MAIN)
+                    << "Alias" << a << "is not found (already deleted?)";
 
-    for (const auto& a: roomAliases)
-    {
+    for (const auto& a : roomAliases) {
         auto& mappedId = d->roomAliasMap[a];
-        if (!mappedId.isEmpty())
-        {
+        if (!mappedId.isEmpty()) {
             if (mappedId == roomId)
                 qCDebug(MAIN) << "Alias" << a << "is already mapped to room"
                               << roomId;
             else
-                qCWarning(MAIN) << "Alias" << a
-                                << "will be force-remapped from room"
-                                << mappedId << "to" << roomId;
+                qCWarning(MAIN)
+                        << "Alias" << a << "will be force-remapped from room"
+                        << mappedId << "to" << roomId;
         }
         mappedId = roomId;
     }
@@ -844,19 +814,18 @@ void Connection::updateRoomAliases(const QString& roomId,
 
 Room* Connection::invitation(const QString& roomId) const
 {
-    return d->roomMap.value({roomId, true}, nullptr);
+    return d->roomMap.value({ roomId, true }, nullptr);
 }
 
 User* Connection::user(const QString& userId)
 {
     if (userId.isEmpty())
         return nullptr;
-    if (!userId.startsWith('@') || !userId.contains(':'))
-    {
+    if (!userId.startsWith('@') || !userId.contains(':')) {
         qCCritical(MAIN) << "Malformed userId:" << userId;
         return nullptr;
     }
-    if( d->userMap.contains(userId) )
+    if (d->userMap.contains(userId))
         return d->userMap.value(userId);
     auto* user = userFactory()(this, userId);
     d->userMap.insert(userId, user);
@@ -869,47 +838,29 @@ const User* Connection::user() const
     return d->userMap.value(d->userId, nullptr);
 }
 
-User* Connection::user()
-{
-    return user(d->userId);
-}
+User* Connection::user() { return user(d->userId); }
 
-QString Connection::userId() const
-{
-    return d->userId;
-}
+QString Connection::userId() const { return d->userId; }
 
-QString Connection::deviceId() const
-{
-    return d->data->deviceId();
-}
+QString Connection::deviceId() const { return d->data->deviceId(); }
 
-QString Connection::token() const
-{
-    return accessToken();
-}
+QString Connection::token() const { return accessToken(); }
 
-QByteArray Connection::accessToken() const
-{
-    return d->data->accessToken();
-}
+QByteArray Connection::accessToken() const { return d->data->accessToken(); }
 
-SyncJob* Connection::syncJob() const
-{
-    return d->syncJob;
-}
+SyncJob* Connection::syncJob() const { return d->syncJob; }
 
 int Connection::millisToReconnect() const
 {
     return d->syncJob ? d->syncJob->millisToRetry() : 0;
 }
 
-QHash< QPair<QString, bool>, Room* > Connection::roomMap() const
+QHash<QPair<QString, bool>, Room*> Connection::roomMap() const
 {
-    // Copy-on-write-and-remove-elements is faster than copying elements one by one.
-    QHash< QPair<QString, bool>, Room* > roomMap = d->roomMap;
-    for (auto it = roomMap.begin(); it != roomMap.end(); )
-    {
+    // Copy-on-write-and-remove-elements is faster than copying elements one by
+    // one.
+    QHash<QPair<QString, bool>, Room*> roomMap = d->roomMap;
+    for (auto it = roomMap.begin(); it != roomMap.end();) {
         if (it.value()->joinState() == JoinState::Leave)
             it = roomMap.erase(it);
         else
@@ -949,24 +900,22 @@ void Connection::setAccountData(const QString& type, const QJsonObject& content)
 QHash<QString, QVector<Room*>> Connection::tagsToRooms() const
 {
     QHash<QString, QVector<Room*>> result;
-    for (auto* r: qAsConst(d->roomMap))
-    {
-        for (const auto& tagName: r->tagNames())
+    for (auto* r : qAsConst(d->roomMap)) {
+        for (const auto& tagName : r->tagNames())
             result[tagName].push_back(r);
     }
     for (auto it = result.begin(); it != result.end(); ++it)
-        std::sort(it->begin(), it->end(),
-            [t=it.key()] (Room* r1, Room* r2) {
-                return r1->tags().value(t) < r2->tags().value(t);
-            });
+        std::sort(it->begin(), it->end(), [t = it.key()](Room* r1, Room* r2) {
+            return r1->tags().value(t) < r2->tags().value(t);
+        });
     return result;
 }
 
 QStringList Connection::tagNames() const
 {
-    QStringList tags ({FavouriteTag});
-    for (auto* r: qAsConst(d->roomMap))
-        for (const auto& tag: r->tagNames())
+    QStringList tags({ FavouriteTag });
+    for (auto* r : qAsConst(d->roomMap))
+        for (const auto& tag : r->tagNames())
             if (tag != LowPriorityTag && !tags.contains(tag))
                 tags.push_back(tag);
     tags.push_back(LowPriorityTag);
@@ -976,8 +925,9 @@ QStringList Connection::tagNames() const
 QVector<Room*> Connection::roomsWithTag(const QString& tagName) const
 {
     QVector<Room*> rooms;
-    std::copy_if(d->roomMap.begin(), d->roomMap.end(), std::back_inserter(rooms),
-                 [&tagName] (Room* r) { return r->tags().contains(tagName); });
+    std::copy_if(d->roomMap.begin(), d->roomMap.end(),
+                 std::back_inserter(rooms),
+                 [&tagName](Room* r) { return r->tags().contains(tagName); });
     return rooms;
 }
 
@@ -989,8 +939,7 @@ Connection::DirectChatsMap Connection::directChats() const
 QJsonObject toJson(const Connection::DirectChatsMap& directChats)
 {
     QJsonObject json;
-    for (auto it = directChats.begin(); it != directChats.end();)
-    {
+    for (auto it = directChats.begin(); it != directChats.end();) {
         QJsonArray roomIds;
         const auto* user = it.key();
         for (; it != directChats.end() && it.key() == user; ++it)
@@ -1000,8 +949,8 @@ QJsonObject toJson(const Connection::DirectChatsMap& directChats)
     return json;
 }
 
-void Connection::Private::broadcastDirectChatUpdates(const DirectChatsMap& additions,
-                                                     const DirectChatsMap& removals)
+void Connection::Private::broadcastDirectChatUpdates(
+        const DirectChatsMap& additions, const DirectChatsMap& removals)
 {
     q->callApi<SetAccountDataJob>(userId, QStringLiteral("m.direct"),
                                   toJson(directChats));
@@ -1023,19 +972,19 @@ void Connection::addToDirectChats(const Room* room, User* user)
 void Connection::removeFromDirectChats(const QString& roomId, User* user)
 {
     Q_ASSERT(!roomId.isEmpty());
-    if ((user != nullptr && !d->directChats.contains(user, roomId)) ||
-            d->directChats.key(roomId) == nullptr)
+    if ((user != nullptr && !d->directChats.contains(user, roomId))
+        || d->directChats.key(roomId) == nullptr)
         return;
 
     DirectChatsMap removals;
-    if (user != nullptr)
-    {
+    if (user != nullptr) {
         removals.insert(user, roomId);
         d->directChats.remove(user, roomId);
         d->directChatUsers.remove(roomId, user);
     } else {
-        removals = erase_if(d->directChats,
-                            [&roomId] (auto it) { return it.value() == roomId; });
+        removals = erase_if(d->directChats, [&roomId](auto it) {
+            return it.value() == roomId;
+        });
         d->directChatUsers.remove(roomId);
     }
     d->broadcastDirectChatUpdates({}, removals);
@@ -1068,11 +1017,10 @@ void Connection::addToIgnoredUsers(const User* user)
     Q_ASSERT(user != nullptr);
 
     auto ignoreList = ignoredUsers();
-    if (!ignoreList.contains(user->id()))
-    {
+    if (!ignoreList.contains(user->id())) {
         ignoreList.insert(user->id());
         d->packAndSendAccountData<IgnoredUsersEvent>(ignoreList);
-        emit ignoredUsersListChanged({{ user->id() }}, {});
+        emit ignoredUsersListChanged({ { user->id() } }, {});
     }
 }
 
@@ -1081,17 +1029,13 @@ void Connection::removeFromIgnoredUsers(const User* user)
     Q_ASSERT(user != nullptr);
 
     auto ignoreList = ignoredUsers();
-    if (ignoreList.remove(user->id()) != 0)
-    {
+    if (ignoreList.remove(user->id()) != 0) {
         d->packAndSendAccountData<IgnoredUsersEvent>(ignoreList);
-        emit ignoredUsersListChanged({}, {{ user->id() }});
+        emit ignoredUsersListChanged({}, { { user->id() } });
     }
 }
 
-QMap<QString, User*> Connection::users() const
-{
-    return d->userMap;
-}
+QMap<QString, User*> Connection::users() const { return d->userMap; }
 
 const ConnectionData* Connection::connectionData() const
 {
@@ -1106,58 +1050,52 @@ Room* Connection::provideRoom(const QString& id, Omittable<JoinState> joinState)
     // If joinState.omitted(), all joinState == comparisons below are false.
     const auto roomKey = qMakePair(id, joinState == JoinState::Invite);
     auto* room = d->roomMap.value(roomKey, nullptr);
-    if (room)
-    {
+    if (room) {
         // Leave is a special case because in transition (5a) (see the .h file)
         // joinState == room->joinState but we still have to preempt the Invite
         // and emit a signal. For Invite and Join, there's no such problem.
         if (room->joinState() == joinState && joinState != JoinState::Leave)
             return room;
-    } else if (joinState.omitted())
-    {
+    } else if (joinState.omitted()) {
         // No Join and Leave, maybe Invite?
-        room = d->roomMap.value({id, true}, nullptr);
+        room = d->roomMap.value({ id, true }, nullptr);
         if (room)
             return room;
         // No Invite either, setup a new room object below
     }
 
-    if (!room)
-    {
+    if (!room) {
         room = roomFactory()(this, id,
-                joinState.omitted() ? JoinState::Join : joinState.value());
-        if (!room)
-        {
+                             joinState.omitted() ? JoinState::Join
+                                                 : joinState.value());
+        if (!room) {
             qCCritical(MAIN) << "Failed to create a room" << id;
             return nullptr;
         }
         d->roomMap.insert(roomKey, room);
         d->firstTimeRooms.push_back(room);
-        connect(room, &Room::beforeDestruction,
-                this, &Connection::aboutToDeleteRoom);
+        connect(room, &Room::beforeDestruction, this,
+                &Connection::aboutToDeleteRoom);
         emit newRoom(room);
     }
     if (joinState.omitted())
         return room;
 
-    if (joinState == JoinState::Invite)
-    {
+    if (joinState == JoinState::Invite) {
         // prev is either Leave or nullptr
-        auto* prev = d->roomMap.value({id, false}, nullptr);
+        auto* prev = d->roomMap.value({ id, false }, nullptr);
         emit invitedRoom(room, prev);
-    }
-    else
-    {
+    } else {
         room->setJoinState(joinState.value());
         // Preempt the Invite room (if any) with a room in Join/Leave state.
-        auto* prevInvite = d->roomMap.take({id, true});
+        auto* prevInvite = d->roomMap.take({ id, true });
         if (joinState == JoinState::Join)
             emit joinedRoom(room, prevInvite);
         else if (joinState == JoinState::Leave)
             emit leftRoom(room, prevInvite);
-        if (prevInvite)
-        {
-            qCDebug(MAIN) << "Deleting Invite state for room" << prevInvite->id();
+        if (prevInvite) {
+            qCDebug(MAIN) << "Deleting Invite state for room"
+                          << prevInvite->id();
             emit prevInvite->beforeDestruction(prevInvite);
             prevInvite->deleteLater();
         }
@@ -1176,15 +1114,9 @@ void Connection::setUserFactory(user_factory_t f)
     _userFactory = std::move(f);
 }
 
-room_factory_t Connection::roomFactory()
-{
-    return _roomFactory;
-}
+room_factory_t Connection::roomFactory() { return _roomFactory; }
 
-user_factory_t Connection::userFactory()
-{
-    return _userFactory;
-}
+user_factory_t Connection::userFactory() { return _userFactory; }
 
 room_factory_t Connection::_roomFactory = defaultRoomFactory<>();
 user_factory_t Connection::_userFactory = defaultUserFactory<>();
@@ -1210,16 +1142,15 @@ void Connection::saveRoomState(Room* r) const
         return;
 
     QFile outRoomFile { stateCachePath() % SyncData::fileNameForRoom(r->id()) };
-    if (outRoomFile.open(QFile::WriteOnly))
-    {
+    if (outRoomFile.open(QFile::WriteOnly)) {
         QJsonDocument json { r->toJson() };
         auto data = d->cacheToBinary ? json.toBinaryData()
                                      : json.toJson(QJsonDocument::Compact);
         outRoomFile.write(data.data(), data.size());
         qCDebug(MAIN) << "Room state cache saved to" << outRoomFile.fileName();
     } else {
-        qCWarning(MAIN) << "Error opening" << outRoomFile.fileName()
-                        << ":" << outRoomFile.errorString();
+        qCWarning(MAIN) << "Error opening" << outRoomFile.fileName() << ":"
+                        << outRoomFile.errorString();
     }
 }
 
@@ -1228,29 +1159,31 @@ void Connection::saveState() const
     if (!d->cacheState)
         return;
 
-    QElapsedTimer et; et.start();
+    QElapsedTimer et;
+    et.start();
 
     QFile outFile { stateCachePath() % "state.json" };
-    if (!outFile.open(QFile::WriteOnly))
-    {
-        qCWarning(MAIN) << "Error opening" << outFile.fileName()
-                        << ":" << outFile.errorString();
+    if (!outFile.open(QFile::WriteOnly)) {
+        qCWarning(MAIN) << "Error opening" << outFile.fileName() << ":"
+                        << outFile.errorString();
         qCWarning(MAIN) << "Caching the rooms state disabled";
         d->cacheState = false;
         return;
     }
 
     QJsonObject rootObj {
-        { QStringLiteral("cache_version"), QJsonObject {
-            { QStringLiteral("major"), SyncData::cacheVersion().first },
-            { QStringLiteral("minor"), SyncData::cacheVersion().second }
-    }}};
+        { QStringLiteral("cache_version"),
+          QJsonObject {
+                  { QStringLiteral("major"), SyncData::cacheVersion().first },
+                  { QStringLiteral("minor"),
+                    SyncData::cacheVersion().second } } }
+    };
     {
         QJsonObject rooms;
         QJsonObject inviteRooms;
         for (const auto* i : roomMap()) // Pass on rooms in Leave state
             (i->joinState() == JoinState::Invite ? inviteRooms : rooms)
-            .insert(i->id(), QJsonValue::Null);
+                    .insert(i->id(), QJsonValue::Null);
 
         QJsonObject roomObj;
         if (!rooms.isEmpty())
@@ -1262,20 +1195,20 @@ void Connection::saveState() const
         rootObj.insert("rooms", roomObj);
     }
     {
-        QJsonArray accountDataEvents {
-            basicEventJson(QStringLiteral("m.direct"), toJson(d->directChats))
-        };
-        for (const auto &e : d->accountData)
+        QJsonArray accountDataEvents { basicEventJson(
+                QStringLiteral("m.direct"), toJson(d->directChats)) };
+        for (const auto& e : d->accountData)
             accountDataEvents.append(
-                basicEventJson(e.first, e.second->contentJson()));
+                    basicEventJson(e.first, e.second->contentJson()));
 
         rootObj.insert("account_data",
-            QJsonObject {{ QStringLiteral("events"), accountDataEvents }});
+                       QJsonObject { { QStringLiteral("events"),
+                                       accountDataEvents } });
     }
 
     QJsonDocument json { rootObj };
-    auto data = d->cacheToBinary ? json.toBinaryData() :
-                                   json.toJson(QJsonDocument::Compact);
+    auto data = d->cacheToBinary ? json.toBinaryData()
+                                 : json.toJson(QJsonDocument::Compact);
     qCDebug(PROFILER) << "Cache for" << userId() << "generated in" << et;
 
     outFile.write(data.data(), data.size());
@@ -1287,14 +1220,14 @@ void Connection::loadState()
     if (!d->cacheState)
         return;
 
-    QElapsedTimer et; et.start();
+    QElapsedTimer et;
+    et.start();
 
     SyncData sync { stateCachePath() % "state.json" };
     if (sync.nextBatch().isEmpty()) // No token means no cache by definition
         return;
 
-    if (!sync.unresolvedRooms().isEmpty())
-    {
+    if (!sync.unresolvedRooms().isEmpty()) {
         qCWarning(MAIN) << "State cache incomplete, discarding";
         return;
     }
@@ -1302,7 +1235,8 @@ void Connection::loadState()
     // 1. Do initial sync on failed rooms without saving the nextBatch token
     // 2. Do the sync across all rooms as normal
     onSyncSuccess(std::move(sync), true);
-    qCDebug(PROFILER) << "*** Cached state for" << userId() << "loaded in" << et;
+    qCDebug(PROFILER) << "*** Cached state for" << userId() << "loaded in"
+                      << et;
 }
 
 QString Connection::stateCachePath() const
@@ -1312,29 +1246,21 @@ QString Connection::stateCachePath() const
     return cacheLocation(safeUserId);
 }
 
-bool Connection::cacheState() const
-{
-    return d->cacheState;
-}
+bool Connection::cacheState() const { return d->cacheState; }
 
 void Connection::setCacheState(bool newValue)
 {
-    if (d->cacheState != newValue)
-    {
+    if (d->cacheState != newValue) {
         d->cacheState = newValue;
         emit cacheStateChanged();
     }
 }
 
-bool QMatrixClient::Connection::lazyLoading() const
-{
-    return d->lazyLoading;
-}
+bool QMatrixClient::Connection::lazyLoading() const { return d->lazyLoading; }
 
 void QMatrixClient::Connection::setLazyLoading(bool newValue)
 {
-    if (d->lazyLoading != newValue)
-    {
+    if (d->lazyLoading != newValue) {
         d->lazyLoading = newValue;
         emit lazyLoadingChanged();
     }
@@ -1343,8 +1269,8 @@ void QMatrixClient::Connection::setLazyLoading(bool newValue)
 void Connection::getTurnServers()
 {
     auto job = callApi<GetTurnServerJob>();
-    connect(job, &GetTurnServerJob::success,
-            this, [=] { emit turnServersChanged(job->data()); });
+    connect(job, &GetTurnServerJob::success, this,
+            [=] { emit turnServersChanged(job->data()); });
 }
 
 const QString Connection::SupportedRoomVersion::StableTag =
@@ -1376,7 +1302,8 @@ inline bool roomVersionLess(const Connection::SupportedRoomVersion& v1,
     return ok1 && ok2 ? vNum1 < vNum2 : v1.id < v2.id;
 }
 
-QVector<Connection::SupportedRoomVersion> Connection::availableRoomVersions() const
+QVector<Connection::SupportedRoomVersion>
+Connection::availableRoomVersions() const
 {
     Q_ASSERT(!d->capabilities.roomVersions.omitted());
     QVector<SupportedRoomVersion> result;
@@ -1386,8 +1313,9 @@ QVector<Connection::SupportedRoomVersion> Connection::availableRoomVersions() co
         result.push_back({ it.key(), it.value() });
     // Put stable versions over unstable; within each group,
     // sort numeric versions as numbers, the rest as strings.
-    const auto mid = std::partition(result.begin(), result.end(),
-                                    std::mem_fn(&SupportedRoomVersion::isStable));
+    const auto mid =
+            std::partition(result.begin(), result.end(),
+                           std::mem_fn(&SupportedRoomVersion::isStable));
     std::sort(result.begin(), mid, roomVersionLess);
     std::sort(mid, result.end(), roomVersionLess);
 
diff --git a/lib/connection.h b/lib/connection.h
index b22d63da..50f7b71b 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -13,25 +13,24 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
 #include "csapi/create_room.h"
-#include "joinstate.h"
 #include "events/accountdataevents.h"
+#include "joinstate.h"
 #include "qt_connection_util.h"
 
 #include <QtCore/QObject>
-#include <QtCore/QUrl>
 #include <QtCore/QSize>
+#include <QtCore/QUrl>
 
 #include <functional>
 #include <memory>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     class Room;
     class User;
     class ConnectionData;
@@ -53,8 +52,8 @@ namespace QMatrixClient
 
     class Connection;
 
-    using room_factory_t = std::function<Room*(Connection*, const QString&,
-                                               JoinState)>;
+    using room_factory_t =
+            std::function<Room*(Connection*, const QString&, JoinState)>;
     using user_factory_t = std::function<User*(Connection*, const QString&)>;
 
     /** The default factory to create room objects
@@ -65,10 +64,9 @@ namespace QMatrixClient
     template <typename T = Room>
     static inline room_factory_t defaultRoomFactory()
     {
-        return [](Connection* c, const QString& id, JoinState js)
-            {
-                return new T(c, id, js);
-            };
+        return [](Connection* c, const QString& id, JoinState js) {
+            return new T(c, id, js);
+        };
     }
 
     /** The default factory to create user objects
@@ -79,10 +77,7 @@ namespace QMatrixClient
     template <typename T = User>
     static inline user_factory_t defaultUserFactory()
     {
-        return [](Connection* c, const QString& id)
-            {
-                return new T(id, c);
-            };
+        return [](Connection* c, const QString& id) { return new T(id, c); };
     }
 
     /** Enumeration with flags defining the network job running policy
@@ -92,667 +87,685 @@ namespace QMatrixClient
      */
     enum RunningPolicy { ForegroundRequest = 0x0, BackgroundRequest = 0x1 };
 
-    class Connection: public QObject {
-            Q_OBJECT
-
-            /** Whether or not the rooms state should be cached locally
-             * \sa loadState(), saveState()
-             */
-            Q_PROPERTY(User* localUser READ user NOTIFY stateChanged)
-            Q_PROPERTY(QString localUserId READ userId NOTIFY stateChanged)
-            Q_PROPERTY(QString deviceId READ deviceId NOTIFY stateChanged)
-            Q_PROPERTY(QByteArray accessToken READ accessToken NOTIFY stateChanged)
-            Q_PROPERTY(QString defaultRoomVersion READ defaultRoomVersion NOTIFY capabilitiesLoaded)
-            Q_PROPERTY(QUrl homeserver READ homeserver WRITE setHomeserver NOTIFY homeserverChanged)
-            Q_PROPERTY(bool cacheState READ cacheState WRITE setCacheState NOTIFY cacheStateChanged)
-            Q_PROPERTY(bool lazyLoading READ lazyLoading WRITE setLazyLoading NOTIFY lazyLoadingChanged)
+    class Connection : public QObject
+    {
+        Q_OBJECT
+
+        /** Whether or not the rooms state should be cached locally
+         * \sa loadState(), saveState()
+         */
+        Q_PROPERTY(User* localUser READ user NOTIFY stateChanged)
+        Q_PROPERTY(QString localUserId READ userId NOTIFY stateChanged)
+        Q_PROPERTY(QString deviceId READ deviceId NOTIFY stateChanged)
+        Q_PROPERTY(QByteArray accessToken READ accessToken NOTIFY stateChanged)
+        Q_PROPERTY(QString defaultRoomVersion READ defaultRoomVersion NOTIFY
+                           capabilitiesLoaded)
+        Q_PROPERTY(QUrl homeserver READ homeserver WRITE setHomeserver NOTIFY
+                           homeserverChanged)
+        Q_PROPERTY(bool cacheState READ cacheState WRITE setCacheState NOTIFY
+                           cacheStateChanged)
+        Q_PROPERTY(bool lazyLoading READ lazyLoading WRITE setLazyLoading NOTIFY
+                           lazyLoadingChanged)
 
         public:
-            // Room ids, rather than room pointers, are used in the direct chat
-            // map types because the library keeps Invite rooms separate from
-            // rooms in Join and Leave state; and direct chats in account data
-            // are stored with no regard to their state.
-            using DirectChatsMap = QMultiHash<const User*, QString>;
-            using DirectChatUsersMap = QMultiHash<QString, User*>;
-            using IgnoredUsersList = IgnoredUsersEvent::content_type;
-
-            using UsersToDevicesToEvents =
+        // Room ids, rather than room pointers, are used in the direct chat
+        // map types because the library keeps Invite rooms separate from
+        // rooms in Join and Leave state; and direct chats in account data
+        // are stored with no regard to their state.
+        using DirectChatsMap = QMultiHash<const User*, QString>;
+        using DirectChatUsersMap = QMultiHash<QString, User*>;
+        using IgnoredUsersList = IgnoredUsersEvent::content_type;
+
+        using UsersToDevicesToEvents =
                 std::unordered_map<QString,
-                    std::unordered_map<QString, const Event&>>;
-
-            enum RoomVisibility { PublishRoom, UnpublishRoom }; // FIXME: Should go inside CreateRoomJob
-
-            explicit Connection(QObject* parent = nullptr);
-            explicit Connection(const QUrl& server, QObject* parent = nullptr);
-            virtual ~Connection();
-
-            /** Get all Invited and Joined rooms
-             * \return a hashmap from a composite key - room name and whether
-             *         it's an Invite rather than Join - to room pointers
-             */
-            QHash<QPair<QString, bool>, Room*> roomMap() const;
-
-            /** Check whether the account has data of the given type
-             * Direct chats map is not supported by this method _yet_.
-             */
-            bool hasAccountData(const QString& type) const;
-
-            /** Get a generic account data event of the given type
-             * This returns an account data event of the given type
-             * stored on the server. Direct chats map cannot be retrieved
-             * using this method _yet_; use directChats() instead.
-             */
-            const EventPtr& accountData(const QString& type) const;
-
-            /** Get a generic account data event of the given type
-             * This returns an account data event of the given type
-             * stored on the server. Direct chats map cannot be retrieved
-             * using this method _yet_; use directChats() instead.
-             */
-            template <typename EventT>
-            const typename EventT::content_type accountData() const
-            {
-                if (const auto& eventPtr = accountData(EventT::matrixTypeId()))
-                    return eventPtr->content();
-                return {};
-            }
-
-            /** Get account data as a JSON object
-             * This returns the content part of the account data event
-             * of the given type. Direct chats map cannot be retrieved using
-             * this method _yet_; use directChats() instead.
-             */
-            Q_INVOKABLE QJsonObject accountDataJson(const QString& type) const;
-
-            /** Set a generic account data event of the given type */
-            void setAccountData(EventPtr&& event);
-
-            Q_INVOKABLE void setAccountData(const QString& type,
-                                            const QJsonObject& content);
-
-            /** Get all Invited and Joined rooms grouped by tag
-             * \return a hashmap from tag name to a vector of room pointers,
-             *         sorted by their order in the tag - details are at
-             *         https://matrix.org/speculator/spec/drafts%2Fe2e/client_server/unstable.html#id95
-             */
-            QHash<QString, QVector<Room*>> tagsToRooms() const;
-
-            /** Get all room tags known on this connection */
-            QStringList tagNames() const;
-
-            /** Get the list of rooms with the specified tag */
-            QVector<Room*> roomsWithTag(const QString& tagName) const;
-
-            /** Mark the room as a direct chat with the user
-             * This function marks \p room as a direct chat with \p user.
-             * Emits the signal synchronously, without waiting to complete
-             * synchronisation with the server.
-             *
-             * \sa directChatsListChanged
-             */
-            void addToDirectChats(const Room* room, User* user);
-
-            /** Unmark the room from direct chats
-             * This function removes the room id from direct chats either for
-             * a specific \p user or for all users if \p user in nullptr.
-             * The room id is used to allow removal of, e.g., ids of forgotten
-             * rooms; a Room object need not exist. Emits the signal
-             * immediately, without waiting to complete synchronisation with
-             * the server.
-             *
-             * \sa directChatsListChanged
-             */
-            void removeFromDirectChats(const QString& roomId,
-                                       User* user = nullptr);
-
-            /** Check whether the room id corresponds to a direct chat */
-            bool isDirectChat(const QString& roomId) const;
-
-            /** Get the whole map from users to direct chat rooms */
-            DirectChatsMap directChats() const;
-
-            /** Retrieve the list of users the room is a direct chat with
-             * @return The list of users for which this room is marked as
-             * a direct chat; an empty list if the room is not a direct chat
-             */
-            QList<User*> directChatUsers(const Room* room) const;
-
-            /** Check whether a particular user is in the ignore list */
-            bool isIgnored(const User* user) const;
-
-            /** Get the whole list of ignored users */
-            IgnoredUsersList ignoredUsers() const;
-
-            /** Add the user to the ignore list
-             * The change signal is emitted synchronously, without waiting
-             * to complete synchronisation with the server.
-             *
-             * \sa ignoredUsersListChanged
-             */
-            void addToIgnoredUsers(const User* user);
-
-            /** Remove the user from the ignore list */
-            /** Similar to adding, the change signal is emitted synchronously.
-             *
-             * \sa ignoredUsersListChanged
-             */
-            void removeFromIgnoredUsers(const User* user);
-
-            /** Get the full list of users known to this account */
-            QMap<QString, User*> users() const;
-
-            QUrl homeserver() const;
-            /** Find a room by its id and a mask of applicable states */
-            Q_INVOKABLE Room* room(const QString& roomId,
-                JoinStates states = JoinState::Invite|JoinState::Join) const;
-            /** Find a room by its alias and a mask of applicable states */
-            Q_INVOKABLE Room* roomByAlias(const QString& roomAlias,
-                JoinStates states = JoinState::Invite|JoinState::Join) const;
-            /** Update the internal map of room aliases to IDs */
-            /// This is used for internal bookkeeping of rooms. Do NOT use
-            /// it to try change aliases, use Room::setAliases instead
-            void updateRoomAliases(const QString& roomId,
-                const QStringList& previousRoomAliases,
-                const QStringList& roomAliases);
-            Q_INVOKABLE Room* invitation(const QString& roomId) const;
-            Q_INVOKABLE User* user(const QString& userId);
-            const User* user() const;
-            User* user();
-            QString userId() const;
-            QString deviceId() const;
-            QByteArray accessToken() const;
-            Q_INVOKABLE SyncJob* syncJob() const;
-            Q_INVOKABLE int millisToReconnect() const;
-
-            [[deprecated("Use accessToken() instead")]]
-            Q_INVOKABLE QString token() const;
-            Q_INVOKABLE void getTurnServers();
-
-            struct SupportedRoomVersion
-            {
-                QString id;
-                QString status;
-
-                static const QString StableTag; // "stable", as of CS API 0.5
-                bool isStable() const { return status == StableTag; }
-
-                friend QDebug operator<<(QDebug dbg,
-                                         const SupportedRoomVersion& v)
-                {
-                    QDebugStateSaver _(dbg);
-                    return dbg.nospace() << v.id << '/' << v.status;
-                }
-            };
-
-            /// Get the room version recommended by the server
-            /** Only works after server capabilities have been loaded.
-             * \sa loadingCapabilities */
-            QString defaultRoomVersion() const;
-            /// Get the room version considered stable by the server
-            /** Only works after server capabilities have been loaded.
-             * \sa loadingCapabilities */
-            QStringList stableRoomVersions() const;
-            /// Get all room versions supported by the server
-            /** Only works after server capabilities have been loaded.
-             * \sa loadingCapabilities */
-            QVector<SupportedRoomVersion> availableRoomVersions() const;
-
-            /**
-             * Call this before first sync to load from previously saved file.
-             *
-             * \param fromFile A local path to read the state from. Uses QUrl
-             * to be QML-friendly. Empty parameter means using a path
-             * defined by stateCachePath().
-             */
-            Q_INVOKABLE void loadState();
-            /**
-             * This method saves the current state of rooms (but not messages
-             * in them) to a local cache file, so that it could be loaded by
-             * loadState() on a next run of the client.
-             *
-             * \param toFile A local path to save the state to. Uses QUrl to be
-             * QML-friendly. Empty parameter means using a path defined by
-             * stateCachePath().
-             */
-            Q_INVOKABLE void saveState() const;
-
-            /// This method saves the current state of a single room.
-            void saveRoomState(Room* r) const;
-
-            /**
-             * The default path to store the cached room state, defined as
-             * follows:
-             *     QStandardPaths::writeableLocation(QStandardPaths::CacheLocation) + _safeUserId + "_state.json"
-             * where `_safeUserId` is userId() with `:` (colon) replaced with
-             * `_` (underscore)
-             * /see loadState(), saveState()
-             */
-            Q_INVOKABLE QString stateCachePath() const;
-
-            bool cacheState() const;
-            void setCacheState(bool newValue);
-
-            bool lazyLoading() const;
-            void setLazyLoading(bool newValue);
-
-            /** Start a job of a specified type with specified arguments and policy
-             *
-             * This is a universal method to start a job of a type passed
-             * as a template parameter. The policy allows to fine-tune the way
-             * the job is executed - as of this writing it means a choice
-             * between "foreground" and "background".
-             *
-             * \param runningPolicy controls how the job is executed
-             * \param jobArgs arguments to the job constructor
-             *
-             * \sa BaseJob::isBackground. QNetworkRequest::BackgroundRequestAttribute
-             */
-            template <typename JobT, typename... JobArgTs>
-            JobT* callApi(RunningPolicy runningPolicy,
-                          JobArgTs&&... jobArgs) const
+                                   std::unordered_map<QString, const Event&>>;
+
+        enum RoomVisibility {
+            PublishRoom,
+            UnpublishRoom
+        }; // FIXME: Should go inside CreateRoomJob
+
+        explicit Connection(QObject* parent = nullptr);
+        explicit Connection(const QUrl& server, QObject* parent = nullptr);
+        virtual ~Connection();
+
+        /** Get all Invited and Joined rooms
+         * \return a hashmap from a composite key - room name and whether
+         *         it's an Invite rather than Join - to room pointers
+         */
+        QHash<QPair<QString, bool>, Room*> roomMap() const;
+
+        /** Check whether the account has data of the given type
+         * Direct chats map is not supported by this method _yet_.
+         */
+        bool hasAccountData(const QString& type) const;
+
+        /** Get a generic account data event of the given type
+         * This returns an account data event of the given type
+         * stored on the server. Direct chats map cannot be retrieved
+         * using this method _yet_; use directChats() instead.
+         */
+        const EventPtr& accountData(const QString& type) const;
+
+        /** Get a generic account data event of the given type
+         * This returns an account data event of the given type
+         * stored on the server. Direct chats map cannot be retrieved
+         * using this method _yet_; use directChats() instead.
+         */
+        template <typename EventT>
+        const typename EventT::content_type accountData() const
+        {
+            if (const auto& eventPtr = accountData(EventT::matrixTypeId()))
+                return eventPtr->content();
+            return {};
+        }
+
+        /** Get account data as a JSON object
+         * This returns the content part of the account data event
+         * of the given type. Direct chats map cannot be retrieved using
+         * this method _yet_; use directChats() instead.
+         */
+        Q_INVOKABLE QJsonObject accountDataJson(const QString& type) const;
+
+        /** Set a generic account data event of the given type */
+        void setAccountData(EventPtr&& event);
+
+        Q_INVOKABLE void setAccountData(const QString& type,
+                                        const QJsonObject& content);
+
+        /** Get all Invited and Joined rooms grouped by tag
+         * \return a hashmap from tag name to a vector of room pointers,
+         *         sorted by their order in the tag - details are at
+         *         https://matrix.org/speculator/spec/drafts%2Fe2e/client_server/unstable.html#id95
+         */
+        QHash<QString, QVector<Room*>> tagsToRooms() const;
+
+        /** Get all room tags known on this connection */
+        QStringList tagNames() const;
+
+        /** Get the list of rooms with the specified tag */
+        QVector<Room*> roomsWithTag(const QString& tagName) const;
+
+        /** Mark the room as a direct chat with the user
+         * This function marks \p room as a direct chat with \p user.
+         * Emits the signal synchronously, without waiting to complete
+         * synchronisation with the server.
+         *
+         * \sa directChatsListChanged
+         */
+        void addToDirectChats(const Room* room, User* user);
+
+        /** Unmark the room from direct chats
+         * This function removes the room id from direct chats either for
+         * a specific \p user or for all users if \p user in nullptr.
+         * The room id is used to allow removal of, e.g., ids of forgotten
+         * rooms; a Room object need not exist. Emits the signal
+         * immediately, without waiting to complete synchronisation with
+         * the server.
+         *
+         * \sa directChatsListChanged
+         */
+        void removeFromDirectChats(const QString& roomId, User* user = nullptr);
+
+        /** Check whether the room id corresponds to a direct chat */
+        bool isDirectChat(const QString& roomId) const;
+
+        /** Get the whole map from users to direct chat rooms */
+        DirectChatsMap directChats() const;
+
+        /** Retrieve the list of users the room is a direct chat with
+         * @return The list of users for which this room is marked as
+         * a direct chat; an empty list if the room is not a direct chat
+         */
+        QList<User*> directChatUsers(const Room* room) const;
+
+        /** Check whether a particular user is in the ignore list */
+        bool isIgnored(const User* user) const;
+
+        /** Get the whole list of ignored users */
+        IgnoredUsersList ignoredUsers() const;
+
+        /** Add the user to the ignore list
+         * The change signal is emitted synchronously, without waiting
+         * to complete synchronisation with the server.
+         *
+         * \sa ignoredUsersListChanged
+         */
+        void addToIgnoredUsers(const User* user);
+
+        /** Remove the user from the ignore list */
+        /** Similar to adding, the change signal is emitted synchronously.
+         *
+         * \sa ignoredUsersListChanged
+         */
+        void removeFromIgnoredUsers(const User* user);
+
+        /** Get the full list of users known to this account */
+        QMap<QString, User*> users() const;
+
+        QUrl homeserver() const;
+        /** Find a room by its id and a mask of applicable states */
+        Q_INVOKABLE Room* room(const QString& roomId,
+                               JoinStates states = JoinState::Invite
+                                       | JoinState::Join) const;
+        /** Find a room by its alias and a mask of applicable states */
+        Q_INVOKABLE Room* roomByAlias(const QString& roomAlias,
+                                      JoinStates states = JoinState::Invite
+                                              | JoinState::Join) const;
+        /** Update the internal map of room aliases to IDs */
+        /// This is used for internal bookkeeping of rooms. Do NOT use
+        /// it to try change aliases, use Room::setAliases instead
+        void updateRoomAliases(const QString& roomId,
+                               const QStringList& previousRoomAliases,
+                               const QStringList& roomAliases);
+        Q_INVOKABLE Room* invitation(const QString& roomId) const;
+        Q_INVOKABLE User* user(const QString& userId);
+        const User* user() const;
+        User* user();
+        QString userId() const;
+        QString deviceId() const;
+        QByteArray accessToken() const;
+        Q_INVOKABLE SyncJob* syncJob() const;
+        Q_INVOKABLE int millisToReconnect() const;
+
+        [[deprecated("Use accessToken() instead")]] Q_INVOKABLE QString
+        token() const;
+        Q_INVOKABLE void getTurnServers();
+
+        struct SupportedRoomVersion {
+            QString id;
+            QString status;
+
+            static const QString StableTag; // "stable", as of CS API 0.5
+            bool isStable() const { return status == StableTag; }
+
+            friend QDebug operator<<(QDebug dbg, const SupportedRoomVersion& v)
             {
-                auto job = new JobT(std::forward<JobArgTs>(jobArgs)...);
-                connect(job, &BaseJob::failure, this, &Connection::requestFailed);
-                job->start(connectionData(), runningPolicy&BackgroundRequest);
-                return job;
+                QDebugStateSaver _(dbg);
+                return dbg.nospace() << v.id << '/' << v.status;
             }
-
-            /** Start a job of a specified type with specified arguments
-             *
-             * This is an overload that calls the job with "foreground" policy.
-             */
-            template <typename JobT, typename... JobArgTs>
-            JobT* callApi(JobArgTs&&... jobArgs) const
-            {
-                return callApi<JobT>(ForegroundRequest,
-                                     std::forward<JobArgTs>(jobArgs)...);
-            }
-
-            /** Generate a new transaction id. Transaction id's are unique within
-             * a single Connection object
-             */
-            Q_INVOKABLE QByteArray generateTxnId() const;
-
-            /// Set a room factory function
-            static void setRoomFactory(room_factory_t f);
-
-            /// Set a user factory function
-            static void setUserFactory(user_factory_t f);
-
-            /// Get a room factory function
-            static room_factory_t roomFactory();
-
-            /// Get a user factory function
-            static user_factory_t userFactory();
-
-            /// Set the room factory to default with the overriden room type
-            template <typename T>
-            static void setRoomType() { setRoomFactory(defaultRoomFactory<T>()); }
-
-            /// Set the user factory to default with the overriden user type
-            template <typename T>
-            static void setUserType() { setUserFactory(defaultUserFactory<T>()); }
+        };
+
+        /// Get the room version recommended by the server
+        /** Only works after server capabilities have been loaded.
+         * \sa loadingCapabilities */
+        QString defaultRoomVersion() const;
+        /// Get the room version considered stable by the server
+        /** Only works after server capabilities have been loaded.
+         * \sa loadingCapabilities */
+        QStringList stableRoomVersions() const;
+        /// Get all room versions supported by the server
+        /** Only works after server capabilities have been loaded.
+         * \sa loadingCapabilities */
+        QVector<SupportedRoomVersion> availableRoomVersions() const;
+
+        /**
+         * Call this before first sync to load from previously saved file.
+         *
+         * \param fromFile A local path to read the state from. Uses QUrl
+         * to be QML-friendly. Empty parameter means using a path
+         * defined by stateCachePath().
+         */
+        Q_INVOKABLE void loadState();
+        /**
+         * This method saves the current state of rooms (but not messages
+         * in them) to a local cache file, so that it could be loaded by
+         * loadState() on a next run of the client.
+         *
+         * \param toFile A local path to save the state to. Uses QUrl to be
+         * QML-friendly. Empty parameter means using a path defined by
+         * stateCachePath().
+         */
+        Q_INVOKABLE void saveState() const;
+
+        /// This method saves the current state of a single room.
+        void saveRoomState(Room* r) const;
+
+        /**
+         * The default path to store the cached room state, defined as
+         * follows:
+         *     QStandardPaths::writeableLocation(QStandardPaths::CacheLocation)
+         * + _safeUserId + "_state.json" where `_safeUserId` is userId() with
+         * `:` (colon) replaced with
+         * `_` (underscore)
+         * /see loadState(), saveState()
+         */
+        Q_INVOKABLE QString stateCachePath() const;
+
+        bool cacheState() const;
+        void setCacheState(bool newValue);
+
+        bool lazyLoading() const;
+        void setLazyLoading(bool newValue);
+
+        /** Start a job of a specified type with specified arguments and policy
+         *
+         * This is a universal method to start a job of a type passed
+         * as a template parameter. The policy allows to fine-tune the way
+         * the job is executed - as of this writing it means a choice
+         * between "foreground" and "background".
+         *
+         * \param runningPolicy controls how the job is executed
+         * \param jobArgs arguments to the job constructor
+         *
+         * \sa BaseJob::isBackground.
+         * QNetworkRequest::BackgroundRequestAttribute
+         */
+        template <typename JobT, typename... JobArgTs>
+        JobT* callApi(RunningPolicy runningPolicy, JobArgTs&&... jobArgs) const
+        {
+            auto job = new JobT(std::forward<JobArgTs>(jobArgs)...);
+            connect(job, &BaseJob::failure, this, &Connection::requestFailed);
+            job->start(connectionData(), runningPolicy & BackgroundRequest);
+            return job;
+        }
+
+        /** Start a job of a specified type with specified arguments
+         *
+         * This is an overload that calls the job with "foreground" policy.
+         */
+        template <typename JobT, typename... JobArgTs>
+        JobT* callApi(JobArgTs&&... jobArgs) const
+        {
+            return callApi<JobT>(ForegroundRequest,
+                                 std::forward<JobArgTs>(jobArgs)...);
+        }
+
+        /** Generate a new transaction id. Transaction id's are unique within
+         * a single Connection object
+         */
+        Q_INVOKABLE QByteArray generateTxnId() const;
+
+        /// Set a room factory function
+        static void setRoomFactory(room_factory_t f);
+
+        /// Set a user factory function
+        static void setUserFactory(user_factory_t f);
+
+        /// Get a room factory function
+        static room_factory_t roomFactory();
+
+        /// Get a user factory function
+        static user_factory_t userFactory();
+
+        /// Set the room factory to default with the overriden room type
+        template <typename T> static void setRoomType()
+        {
+            setRoomFactory(defaultRoomFactory<T>());
+        }
+
+        /// Set the user factory to default with the overriden user type
+        template <typename T> static void setUserType()
+        {
+            setUserFactory(defaultUserFactory<T>());
+        }
 
         public slots:
-            /** Set the homeserver base URL */
-            void setHomeserver(const QUrl& baseUrl);
-
-            /** Determine and set the homeserver from domain or MXID */
-            void resolveServer(const QString& mxidOrDomain);
-
-            void connectToServer(const QString& user, const QString& password,
-                                 const QString& initialDeviceName,
-                                 const QString& deviceId = {});
-            void connectWithToken(const QString& userId, const QString& accessToken,
-                                  const QString& deviceId);
-            /// Explicitly request capabilities from the server
-            void reloadCapabilities();
-
-            /// Find out if capabilites are still loading from the server
-            bool loadingCapabilities() const;
-
-            /** @deprecated Use stopSync() instead */
-            void disconnectFromServer() { stopSync(); }
-            void logout();
-
-            void sync(int timeout = -1);
-            void syncLoop(int timeout = -1);
-
-            void stopSync();
-            QString nextBatchToken() const;
-
-            virtual MediaThumbnailJob* getThumbnail(const QString& mediaId,
-                QSize requestedSize, RunningPolicy policy = BackgroundRequest) const;
-            MediaThumbnailJob* getThumbnail(const QUrl& url,
-                QSize requestedSize, RunningPolicy policy = BackgroundRequest) const;
-            MediaThumbnailJob* getThumbnail(const QUrl& url,
-                int requestedWidth, int requestedHeight,
-                RunningPolicy policy = BackgroundRequest) const;
-
-            // QIODevice* should already be open
-            UploadContentJob* uploadContent(QIODevice* contentSource,
-                                const QString& filename = {},
-                                const QString& overrideContentType = {}) const;
-            UploadContentJob* uploadFile(const QString& fileName,
-                                const QString& overrideContentType = {});
-            GetContentJob* getContent(const QString& mediaId) const;
-            GetContentJob* getContent(const QUrl& url) const;
-            // If localFilename is empty, a temporary file will be created
-            DownloadFileJob* downloadFile(const QUrl& url,
-                            const QString& localFilename = {}) const;
-
-            /**
-             * \brief Create a room (generic method)
-             * This method allows to customize room entirely to your liking,
-             * providing all the attributes the original CS API provides.
-             */
-            CreateRoomJob* createRoom(RoomVisibility visibility,
-                const QString& alias, const QString& name, const QString& topic,
-                QStringList invites, const QString& presetName = {},
-                const QString& roomVersion = {}, bool isDirect = false,
-                const QVector<CreateRoomJob::StateEvent>& initialState = {},
-                const QVector<CreateRoomJob::Invite3pid>& invite3pids = {},
-                const QJsonObject& creationContent = {});
-
-            /** Get a direct chat with a single user
-             * This method may return synchronously or asynchoronously depending
-             * on whether a direct chat room with the respective person exists
-             * already.
-             *
-             * \sa directChatAvailable
-             */
-            void requestDirectChat(const QString& userId);
-
-            /** Get a direct chat with a single user
-             * This method may return synchronously or asynchoronously depending
-             * on whether a direct chat room with the respective person exists
-             * already.
-             *
-             * \sa directChatAvailable
-             */
-            void requestDirectChat(User* u);
-
-            /** Run an operation in a direct chat with the user
-             * This method may return synchronously or asynchoronously depending
-             * on whether a direct chat room with the respective person exists
-             * already. Instead of emitting a signal it executes the passed
-             * function object with the direct chat room as its parameter.
-             */
-            void doInDirectChat(const QString& userId,
-                                const std::function<void(Room*)>& operation);
-
-            /** Run an operation in a direct chat with the user
-             * This method may return synchronously or asynchoronously depending
-             * on whether a direct chat room with the respective person exists
-             * already. Instead of emitting a signal it executes the passed
-             * function object with the direct chat room as its parameter.
-             */
-            void doInDirectChat(User* u,
-                                const std::function<void(Room*)>& operation);
-
-            /** Create a direct chat with a single user, optional name and topic
-             * A room will always be created, unlike in requestDirectChat.
-             * It is advised to use requestDirectChat as a default way of getting
-             * one-on-one with a person, and only use createDirectChat when
-             * a new creation is explicitly desired.
-             */
-            CreateRoomJob* createDirectChat(const QString& userId,
-                const QString& topic = {}, const QString& name = {});
-
-            virtual JoinRoomJob* joinRoom(const QString& roomAlias,
-                                          const QStringList& serverNames = {});
-
-            /** Sends /forget to the server and also deletes room locally.
-             * This method is in Connection, not in Room, since it's a
-             * room lifecycle operation, and Connection is an acting room manager.
-             * It ensures that the local user is not a member of a room (running /leave,
-             * if necessary) then issues a /forget request and if that one doesn't fail
-             * deletion of the local Room object is ensured.
-             * \param id - the room id to forget
-             * \return - the ongoing /forget request to the server; note that the
-             * success() signal of this request is connected to deleteLater()
-             * of a respective room so by the moment this finishes, there might be no
-             * Room object anymore.
-             */
-            ForgetRoomJob* forgetRoom(const QString& id);
-
-            SendToDeviceJob* sendToDevices(const QString& eventType,
-                    const UsersToDevicesToEvents& eventsMap) const;
-
-            /** \deprecated This method is experimental and may be removed any time */
-            SendMessageJob* sendMessage(const QString& roomId,
-                                        const RoomEvent& event) const;
-
-            /** \deprecated Do not use this directly, use Room::leaveRoom() instead */
-            virtual LeaveRoomJob* leaveRoom( Room* room );
-
-            // Old API that will be abolished any time soon. DO NOT USE.
-
-            /** @deprecated Use callApi<PostReceiptJob>() or Room::postReceipt() instead */
-            virtual PostReceiptJob* postReceipt(Room* room,
-                                                RoomEvent* event) const;
+        /** Set the homeserver base URL */
+        void setHomeserver(const QUrl& baseUrl);
+
+        /** Determine and set the homeserver from domain or MXID */
+        void resolveServer(const QString& mxidOrDomain);
+
+        void connectToServer(const QString& user, const QString& password,
+                             const QString& initialDeviceName,
+                             const QString& deviceId = {});
+        void connectWithToken(const QString& userId, const QString& accessToken,
+                              const QString& deviceId);
+        /// Explicitly request capabilities from the server
+        void reloadCapabilities();
+
+        /// Find out if capabilites are still loading from the server
+        bool loadingCapabilities() const;
+
+        /** @deprecated Use stopSync() instead */
+        void disconnectFromServer() { stopSync(); }
+        void logout();
+
+        void sync(int timeout = -1);
+        void syncLoop(int timeout = -1);
+
+        void stopSync();
+        QString nextBatchToken() const;
+
+        virtual MediaThumbnailJob*
+        getThumbnail(const QString& mediaId, QSize requestedSize,
+                     RunningPolicy policy = BackgroundRequest) const;
+        MediaThumbnailJob*
+        getThumbnail(const QUrl& url, QSize requestedSize,
+                     RunningPolicy policy = BackgroundRequest) const;
+        MediaThumbnailJob*
+        getThumbnail(const QUrl& url, int requestedWidth, int requestedHeight,
+                     RunningPolicy policy = BackgroundRequest) const;
+
+        // QIODevice* should already be open
+        UploadContentJob*
+        uploadContent(QIODevice* contentSource, const QString& filename = {},
+                      const QString& overrideContentType = {}) const;
+        UploadContentJob* uploadFile(const QString& fileName,
+                                     const QString& overrideContentType = {});
+        GetContentJob* getContent(const QString& mediaId) const;
+        GetContentJob* getContent(const QUrl& url) const;
+        // If localFilename is empty, a temporary file will be created
+        DownloadFileJob* downloadFile(const QUrl& url,
+                                      const QString& localFilename = {}) const;
+
+        /**
+         * \brief Create a room (generic method)
+         * This method allows to customize room entirely to your liking,
+         * providing all the attributes the original CS API provides.
+         */
+        CreateRoomJob*
+        createRoom(RoomVisibility visibility, const QString& alias,
+                   const QString& name, const QString& topic,
+                   QStringList invites, const QString& presetName = {},
+                   const QString& roomVersion = {}, bool isDirect = false,
+                   const QVector<CreateRoomJob::StateEvent>& initialState = {},
+                   const QVector<CreateRoomJob::Invite3pid>& invite3pids = {},
+                   const QJsonObject& creationContent = {});
+
+        /** Get a direct chat with a single user
+         * This method may return synchronously or asynchoronously depending
+         * on whether a direct chat room with the respective person exists
+         * already.
+         *
+         * \sa directChatAvailable
+         */
+        void requestDirectChat(const QString& userId);
+
+        /** Get a direct chat with a single user
+         * This method may return synchronously or asynchoronously depending
+         * on whether a direct chat room with the respective person exists
+         * already.
+         *
+         * \sa directChatAvailable
+         */
+        void requestDirectChat(User* u);
+
+        /** Run an operation in a direct chat with the user
+         * This method may return synchronously or asynchoronously depending
+         * on whether a direct chat room with the respective person exists
+         * already. Instead of emitting a signal it executes the passed
+         * function object with the direct chat room as its parameter.
+         */
+        void doInDirectChat(const QString& userId,
+                            const std::function<void(Room*)>& operation);
+
+        /** Run an operation in a direct chat with the user
+         * This method may return synchronously or asynchoronously depending
+         * on whether a direct chat room with the respective person exists
+         * already. Instead of emitting a signal it executes the passed
+         * function object with the direct chat room as its parameter.
+         */
+        void doInDirectChat(User* u,
+                            const std::function<void(Room*)>& operation);
+
+        /** Create a direct chat with a single user, optional name and topic
+         * A room will always be created, unlike in requestDirectChat.
+         * It is advised to use requestDirectChat as a default way of getting
+         * one-on-one with a person, and only use createDirectChat when
+         * a new creation is explicitly desired.
+         */
+        CreateRoomJob* createDirectChat(const QString& userId,
+                                        const QString& topic = {},
+                                        const QString& name = {});
+
+        virtual JoinRoomJob* joinRoom(const QString& roomAlias,
+                                      const QStringList& serverNames = {});
+
+        /** Sends /forget to the server and also deletes room locally.
+         * This method is in Connection, not in Room, since it's a
+         * room lifecycle operation, and Connection is an acting room manager.
+         * It ensures that the local user is not a member of a room (running
+         * /leave, if necessary) then issues a /forget request and if that one
+         * doesn't fail deletion of the local Room object is ensured. \param id
+         * - the room id to forget \return - the ongoing /forget request to the
+         * server; note that the success() signal of this request is connected
+         * to deleteLater() of a respective room so by the moment this finishes,
+         * there might be no Room object anymore.
+         */
+        ForgetRoomJob* forgetRoom(const QString& id);
+
+        SendToDeviceJob*
+        sendToDevices(const QString& eventType,
+                      const UsersToDevicesToEvents& eventsMap) const;
+
+        /** \deprecated This method is experimental and may be removed any time
+         */
+        SendMessageJob* sendMessage(const QString& roomId,
+                                    const RoomEvent& event) const;
+
+        /** \deprecated Do not use this directly, use Room::leaveRoom() instead
+         */
+        virtual LeaveRoomJob* leaveRoom(Room* room);
+
+        // Old API that will be abolished any time soon. DO NOT USE.
+
+        /** @deprecated Use callApi<PostReceiptJob>() or Room::postReceipt()
+         * instead */
+        virtual PostReceiptJob* postReceipt(Room* room, RoomEvent* event) const;
         signals:
-            /**
-             * @deprecated
-             * This was a signal resulting from a successful resolveServer().
-             * Since Connection now provides setHomeserver(), the HS URL
-             * may change even without resolveServer() invocation. Use
-             * homeserverChanged() instead of resolved(). You can also use
-             * connectToServer and connectWithToken without the HS URL set in
-             * advance (i.e. without calling resolveServer), as they now trigger
-             * server name resolution from MXID if the server URL is not valid.
-             */
-            void resolved();
-            void resolveError(QString error);
-
-            void homeserverChanged(QUrl baseUrl);
-            void capabilitiesLoaded();
-
-            void connected();
-            void reconnected(); //< \deprecated Use connected() instead
-            void loggedOut();
-            /** Login data or state have changed
-             *
-             * This is a common change signal for userId, deviceId and
-             * accessToken - these properties normally only change at
-             * a successful login and logout and are constant at other times.
-             */
-            void stateChanged();
-            void loginError(QString message, QString details);
-
-            /** A network request (job) failed
-             *
-             * @param request - the pointer to the failed job
-             */
-            void requestFailed(BaseJob* request);
-
-            /** A network request (job) failed due to network problems
-             *
-             * This is _only_ emitted when the job will retry on its own;
-             * once it gives up, requestFailed() will be emitted.
-             *
-             * @param message - message about the network problem
-             * @param details - raw error details, if any available
-             * @param retriesTaken - how many retries have already been taken
-             * @param nextRetryInMilliseconds - when the job will retry again
-             */
-            void networkError(QString message, QString details,
-                              int retriesTaken, int nextRetryInMilliseconds);
-
-            void syncDone();
-            void syncError(QString message, QString details);
-
-            void newUser(User* user);
-
-            /**
-             * \group Signals emitted on room transitions
-             *
-             * Note: Rooms in Invite state are always stored separately from
-             * rooms in Join/Leave state, because of special treatment of
-             * invite_state in Matrix CS API (see The Spec on /sync for details).
-             * Therefore, objects below are: r - room in Join/Leave state;
-             * i - room in Invite state
-             *
-             * 1. none -> Invite: newRoom(r), invitedRoom(r,nullptr)
-             * 2. none -> Join: newRoom(r), joinedRoom(r,nullptr)
-             * 3. none -> Leave: newRoom(r), leftRoom(r,nullptr)
-             * 4. Invite -> Join:
-             *      newRoom(r), joinedRoom(r,i), aboutToDeleteRoom(i)
-             * 4a. Leave and Invite -> Join:
-             *      joinedRoom(r,i), aboutToDeleteRoom(i)
-             * 5. Invite -> Leave:
-             *      newRoom(r), leftRoom(r,i), aboutToDeleteRoom(i)
-             * 5a. Leave and Invite -> Leave:
-             *      leftRoom(r,i), aboutToDeleteRoom(i)
-             * 6. Join -> Leave: leftRoom(r)
-             * 7. Leave -> Invite: newRoom(i), invitedRoom(i,r)
-             * 8. Leave -> Join: joinedRoom(r)
-             * The following transitions are only possible via forgetRoom()
-             * so far; if a room gets forgotten externally, sync won't tell
-             * about it:
-             * 9. any -> none: as any -> Leave, then aboutToDeleteRoom(r)
-             */
-
-            /** A new room object has been created */
-            void newRoom(Room* room);
-
-            /** A room invitation is seen for the first time
-             *
-             * If the same room is in Left state, it's passed in prev. Beware
-             * that initial sync will trigger this signal for all rooms in
-             * Invite state.
-             */
-            void invitedRoom(Room* room, Room* prev);
-
-            /** A joined room is seen for the first time
-             *
-             * It's not the same as receiving a room in "join" section of sync
-             * response (rooms will be there even after joining); it's also
-             * not (exactly) the same as actual joining action of a user (all
-             * rooms coming in initial sync will trigger this signal too). If
-             * this room was in Invite state before, the respective object is
-             * passed in prev (and it will be deleted shortly afterwards).
-             */
-            void joinedRoom(Room* room, Room* prev);
-
-            /** A room has just been left
-             *
-             * If this room has been in Invite state (as in case of rejecting
-             * an invitation), the respective object will be passed in prev
-             * (and will be deleted shortly afterwards). Note that, similar
-             * to invitedRoom and joinedRoom, this signal is triggered for all
-             * Left rooms upon initial sync (not only those that were left
-             * right before the sync).
-             */
-            void leftRoom(Room* room, Room* prev);
-
-            /** The room object is about to be deleted */
-            void aboutToDeleteRoom(Room* room);
-
-            /** The room has just been created by createRoom or requestDirectChat
-             *
-             * This signal is not emitted in usual room state transitions,
-             * only as an outcome of room creation operations invoked by
-             * the client.
-             * \note requestDirectChat doesn't necessarily create a new chat;
-             *       use directChatAvailable signal if you just need to obtain
-             *       a direct chat room.
-             */
-            void createdRoom(Room* room);
-
-            /** The first sync for the room has been completed
-             *
-             * This signal is emitted after the room has been synced the first
-             * time. This is the right signal to connect to if you need to
-             * access the room state (name, aliases, members); state transition
-             * signals (newRoom, joinedRoom etc.) come earlier, when the room
-             * has just been created.
-             */
-            void loadedRoomState(Room* room);
-
-            /** Account data (except direct chats) have changed */
-            void accountDataChanged(QString type);
-
-            /** The direct chat room is ready for using
-             * This signal is emitted upon any successful outcome from
-             * requestDirectChat.
-             */
-            void directChatAvailable(Room* directChat);
-
-            /** The list of direct chats has changed
-             * This signal is emitted every time when the mapping of users
-             * to direct chat rooms is changed (because of either local updates
-             * or a different list arrived from the server).
-             */
-            void directChatsListChanged(DirectChatsMap additions,
-                                        DirectChatsMap removals);
-
-            void ignoredUsersListChanged(IgnoredUsersList additions,
-                                         IgnoredUsersList removals);
-
-            void cacheStateChanged();
-            void lazyLoadingChanged();
-            void turnServersChanged(const QJsonObject& servers);
+        /**
+         * @deprecated
+         * This was a signal resulting from a successful resolveServer().
+         * Since Connection now provides setHomeserver(), the HS URL
+         * may change even without resolveServer() invocation. Use
+         * homeserverChanged() instead of resolved(). You can also use
+         * connectToServer and connectWithToken without the HS URL set in
+         * advance (i.e. without calling resolveServer), as they now trigger
+         * server name resolution from MXID if the server URL is not valid.
+         */
+        void resolved();
+        void resolveError(QString error);
+
+        void homeserverChanged(QUrl baseUrl);
+        void capabilitiesLoaded();
+
+        void connected();
+        void reconnected(); //< \deprecated Use connected() instead
+        void loggedOut();
+        /** Login data or state have changed
+         *
+         * This is a common change signal for userId, deviceId and
+         * accessToken - these properties normally only change at
+         * a successful login and logout and are constant at other times.
+         */
+        void stateChanged();
+        void loginError(QString message, QString details);
+
+        /** A network request (job) failed
+         *
+         * @param request - the pointer to the failed job
+         */
+        void requestFailed(BaseJob* request);
+
+        /** A network request (job) failed due to network problems
+         *
+         * This is _only_ emitted when the job will retry on its own;
+         * once it gives up, requestFailed() will be emitted.
+         *
+         * @param message - message about the network problem
+         * @param details - raw error details, if any available
+         * @param retriesTaken - how many retries have already been taken
+         * @param nextRetryInMilliseconds - when the job will retry again
+         */
+        void networkError(QString message, QString details, int retriesTaken,
+                          int nextRetryInMilliseconds);
+
+        void syncDone();
+        void syncError(QString message, QString details);
+
+        void newUser(User* user);
+
+        /**
+         * \group Signals emitted on room transitions
+         *
+         * Note: Rooms in Invite state are always stored separately from
+         * rooms in Join/Leave state, because of special treatment of
+         * invite_state in Matrix CS API (see The Spec on /sync for details).
+         * Therefore, objects below are: r - room in Join/Leave state;
+         * i - room in Invite state
+         *
+         * 1. none -> Invite: newRoom(r), invitedRoom(r,nullptr)
+         * 2. none -> Join: newRoom(r), joinedRoom(r,nullptr)
+         * 3. none -> Leave: newRoom(r), leftRoom(r,nullptr)
+         * 4. Invite -> Join:
+         *      newRoom(r), joinedRoom(r,i), aboutToDeleteRoom(i)
+         * 4a. Leave and Invite -> Join:
+         *      joinedRoom(r,i), aboutToDeleteRoom(i)
+         * 5. Invite -> Leave:
+         *      newRoom(r), leftRoom(r,i), aboutToDeleteRoom(i)
+         * 5a. Leave and Invite -> Leave:
+         *      leftRoom(r,i), aboutToDeleteRoom(i)
+         * 6. Join -> Leave: leftRoom(r)
+         * 7. Leave -> Invite: newRoom(i), invitedRoom(i,r)
+         * 8. Leave -> Join: joinedRoom(r)
+         * The following transitions are only possible via forgetRoom()
+         * so far; if a room gets forgotten externally, sync won't tell
+         * about it:
+         * 9. any -> none: as any -> Leave, then aboutToDeleteRoom(r)
+         */
+
+        /** A new room object has been created */
+        void newRoom(Room* room);
+
+        /** A room invitation is seen for the first time
+         *
+         * If the same room is in Left state, it's passed in prev. Beware
+         * that initial sync will trigger this signal for all rooms in
+         * Invite state.
+         */
+        void invitedRoom(Room* room, Room* prev);
+
+        /** A joined room is seen for the first time
+         *
+         * It's not the same as receiving a room in "join" section of sync
+         * response (rooms will be there even after joining); it's also
+         * not (exactly) the same as actual joining action of a user (all
+         * rooms coming in initial sync will trigger this signal too). If
+         * this room was in Invite state before, the respective object is
+         * passed in prev (and it will be deleted shortly afterwards).
+         */
+        void joinedRoom(Room* room, Room* prev);
+
+        /** A room has just been left
+         *
+         * If this room has been in Invite state (as in case of rejecting
+         * an invitation), the respective object will be passed in prev
+         * (and will be deleted shortly afterwards). Note that, similar
+         * to invitedRoom and joinedRoom, this signal is triggered for all
+         * Left rooms upon initial sync (not only those that were left
+         * right before the sync).
+         */
+        void leftRoom(Room* room, Room* prev);
+
+        /** The room object is about to be deleted */
+        void aboutToDeleteRoom(Room* room);
+
+        /** The room has just been created by createRoom or requestDirectChat
+         *
+         * This signal is not emitted in usual room state transitions,
+         * only as an outcome of room creation operations invoked by
+         * the client.
+         * \note requestDirectChat doesn't necessarily create a new chat;
+         *       use directChatAvailable signal if you just need to obtain
+         *       a direct chat room.
+         */
+        void createdRoom(Room* room);
+
+        /** The first sync for the room has been completed
+         *
+         * This signal is emitted after the room has been synced the first
+         * time. This is the right signal to connect to if you need to
+         * access the room state (name, aliases, members); state transition
+         * signals (newRoom, joinedRoom etc.) come earlier, when the room
+         * has just been created.
+         */
+        void loadedRoomState(Room* room);
+
+        /** Account data (except direct chats) have changed */
+        void accountDataChanged(QString type);
+
+        /** The direct chat room is ready for using
+         * This signal is emitted upon any successful outcome from
+         * requestDirectChat.
+         */
+        void directChatAvailable(Room* directChat);
+
+        /** The list of direct chats has changed
+         * This signal is emitted every time when the mapping of users
+         * to direct chat rooms is changed (because of either local updates
+         * or a different list arrived from the server).
+         */
+        void directChatsListChanged(DirectChatsMap additions,
+                                    DirectChatsMap removals);
+
+        void ignoredUsersListChanged(IgnoredUsersList additions,
+                                     IgnoredUsersList removals);
+
+        void cacheStateChanged();
+        void lazyLoadingChanged();
+        void turnServersChanged(const QJsonObject& servers);
 
         protected:
-            /**
-             * @brief Access the underlying ConnectionData class
-             */
-            const ConnectionData* connectionData() const;
-
-            /** Get a Room object for the given id in the given state
-             *
-             * Use this method when you need a Room object in the local list
-             * of rooms, with the given state. Note that this does not interact
-             * with the server; in particular, does not automatically create
-             * rooms on the server. This call performs necessary join state
-             * transitions; e.g., if it finds a room in Invite but
-             * `joinState == JoinState::Join` then the Invite room object
-             * will be deleted and a new room object with Join state created.
-             * In contrast, switching between Join and Leave happens within
-             * the same object.
-             * \param roomId room id (not alias!)
-             * \param joinState desired (target) join state of the room; if
-             * omitted, any state will be found and return unchanged, or a
-             * new Join room created.
-             * @return a pointer to a Room object with the specified id and the
-             * specified state; nullptr if roomId is empty or if roomFactory()
-             * failed to create a Room object.
-             */
-            Room* provideRoom(const QString& roomId,
-                              Omittable<JoinState> joinState = none);
-
-            /**
-             * Completes loading sync data.
-             */
-            void onSyncSuccess(SyncData &&data, bool fromCache = false);
+        /**
+         * @brief Access the underlying ConnectionData class
+         */
+        const ConnectionData* connectionData() const;
+
+        /** Get a Room object for the given id in the given state
+         *
+         * Use this method when you need a Room object in the local list
+         * of rooms, with the given state. Note that this does not interact
+         * with the server; in particular, does not automatically create
+         * rooms on the server. This call performs necessary join state
+         * transitions; e.g., if it finds a room in Invite but
+         * `joinState == JoinState::Join` then the Invite room object
+         * will be deleted and a new room object with Join state created.
+         * In contrast, switching between Join and Leave happens within
+         * the same object.
+         * \param roomId room id (not alias!)
+         * \param joinState desired (target) join state of the room; if
+         * omitted, any state will be found and return unchanged, or a
+         * new Join room created.
+         * @return a pointer to a Room object with the specified id and the
+         * specified state; nullptr if roomId is empty or if roomFactory()
+         * failed to create a Room object.
+         */
+        Room* provideRoom(const QString& roomId,
+                          Omittable<JoinState> joinState = none);
+
+        /**
+         * Completes loading sync data.
+         */
+        void onSyncSuccess(SyncData&& data, bool fromCache = false);
 
         protected slots:
-            void syncLoopIteration();
+        void syncLoopIteration();
 
         private:
-            class Private;
-            std::unique_ptr<Private> d;
-
-            /**
-             * A single entry for functions that need to check whether the
-             * homeserver is valid before running. May either execute connectFn
-             * synchronously or asynchronously (if tryResolve is true and
-             * a DNS lookup is initiated); in case of errors, emits resolveError
-             * if the homeserver URL is not valid and cannot be resolved from
-             * userId.
-             *
-             * @param userId - fully-qualified MXID to resolve HS from
-             * @param connectFn - a function to execute once the HS URL is good
-             */
-            void checkAndConnect(const QString& userId,
-                                 std::function<void()> connectFn);
-            void doConnectToServer(const QString& user, const QString& password,
-                                   const QString& initialDeviceName,
-                                   const QString& deviceId = {});
-
-            static room_factory_t _roomFactory;
-            static user_factory_t _userFactory;
+        class Private;
+        std::unique_ptr<Private> d;
+
+        /**
+         * A single entry for functions that need to check whether the
+         * homeserver is valid before running. May either execute connectFn
+         * synchronously or asynchronously (if tryResolve is true and
+         * a DNS lookup is initiated); in case of errors, emits resolveError
+         * if the homeserver URL is not valid and cannot be resolved from
+         * userId.
+         *
+         * @param userId - fully-qualified MXID to resolve HS from
+         * @param connectFn - a function to execute once the HS URL is good
+         */
+        void checkAndConnect(const QString& userId,
+                             std::function<void()> connectFn);
+        void doConnectToServer(const QString& user, const QString& password,
+                               const QString& initialDeviceName,
+                               const QString& deviceId = {});
+
+        static room_factory_t _roomFactory;
+        static user_factory_t _userFactory;
     };
-}  // namespace QMatrixClient
+} // namespace QMatrixClient
 Q_DECLARE_METATYPE(QMatrixClient::Connection*)
diff --git a/lib/connectiondata.cpp b/lib/connectiondata.cpp
index eb516ef7..513e497e 100644
--- a/lib/connectiondata.cpp
+++ b/lib/connectiondata.cpp
@@ -13,19 +13,18 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "connectiondata.h"
 
-#include "networkaccessmanager.h"
 #include "logging.h"
+#include "networkaccessmanager.h"
 
 using namespace QMatrixClient;
 
-struct ConnectionData::Private
-{
-    explicit Private(const QUrl& url) : baseUrl(url) { }
+struct ConnectionData::Private {
+    explicit Private(const QUrl& url) : baseUrl(url) {}
 
     QUrl baseUrl;
     QByteArray accessToken;
@@ -38,19 +37,14 @@ struct ConnectionData::Private
 
 ConnectionData::ConnectionData(QUrl baseUrl)
     : d(std::make_unique<Private>(baseUrl))
-{ }
+{
+}
 
 ConnectionData::~ConnectionData() = default;
 
-QByteArray ConnectionData::accessToken() const
-{
-    return d->accessToken;
-}
+QByteArray ConnectionData::accessToken() const { return d->accessToken; }
 
-QUrl ConnectionData::baseUrl() const
-{
-    return d->baseUrl;
-}
+QUrl ConnectionData::baseUrl() const { return d->baseUrl; }
 
 QNetworkAccessManager* ConnectionData::nam() const
 {
@@ -80,10 +74,7 @@ void ConnectionData::setPort(int port)
     qCDebug(MAIN) << "updated baseUrl to" << d->baseUrl;
 }
 
-const QString& ConnectionData::deviceId() const
-{
-    return d->deviceId;
-}
+const QString& ConnectionData::deviceId() const { return d->deviceId; }
 
 void ConnectionData::setDeviceId(const QString& deviceId)
 {
@@ -91,10 +82,7 @@ void ConnectionData::setDeviceId(const QString& deviceId)
     qCDebug(MAIN) << "updated deviceId to" << d->deviceId;
 }
 
-QString ConnectionData::lastEvent() const
-{
-    return d->lastEvent;
-}
+QString ConnectionData::lastEvent() const { return d->lastEvent; }
 
 void ConnectionData::setLastEvent(QString identifier)
 {
@@ -103,6 +91,6 @@ void ConnectionData::setLastEvent(QString identifier)
 
 QByteArray ConnectionData::generateTxnId() const
 {
-    return QByteArray::number(d->id) + 'q' +
-            QByteArray::number(++d->txnCounter);
+    return QByteArray::number(d->id) + 'q'
+            + QByteArray::number(++d->txnCounter);
 }
diff --git a/lib/connectiondata.h b/lib/connectiondata.h
index 7a2f2e90..fcb67e2d 100644
--- a/lib/connectiondata.h
+++ b/lib/connectiondata.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
@@ -24,32 +24,31 @@
 
 class QNetworkAccessManager;
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     class ConnectionData
     {
         public:
-            explicit ConnectionData(QUrl baseUrl);
-            virtual ~ConnectionData();
+        explicit ConnectionData(QUrl baseUrl);
+        virtual ~ConnectionData();
 
-            QByteArray accessToken() const;
-            QUrl baseUrl() const;
-            const QString& deviceId() const;
+        QByteArray accessToken() const;
+        QUrl baseUrl() const;
+        const QString& deviceId() const;
 
-            QNetworkAccessManager* nam() const;
-            void setBaseUrl(QUrl baseUrl);
-            void setToken(QByteArray accessToken);
-            void setHost( QString host );
-            void setPort( int port );
-            void setDeviceId(const QString& deviceId);
+        QNetworkAccessManager* nam() const;
+        void setBaseUrl(QUrl baseUrl);
+        void setToken(QByteArray accessToken);
+        void setHost(QString host);
+        void setPort(int port);
+        void setDeviceId(const QString& deviceId);
 
-            QString lastEvent() const;
-            void setLastEvent( QString identifier );
+        QString lastEvent() const;
+        void setLastEvent(QString identifier);
 
-            QByteArray generateTxnId() const;
+        QByteArray generateTxnId() const;
 
         private:
-            struct Private;
-            std::unique_ptr<Private> d;
+        struct Private;
+        std::unique_ptr<Private> d;
     };
-}  // namespace QMatrixClient
+} // namespace QMatrixClient
diff --git a/lib/converters.cpp b/lib/converters.cpp
index 88f5267e..8f45ba3b 100644
--- a/lib/converters.cpp
+++ b/lib/converters.cpp
@@ -1,20 +1,20 @@
 /******************************************************************************
-* Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ * Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
 
 #include "converters.h"
 
@@ -36,20 +36,20 @@ QJsonObject JsonConverter<variant_map_t>::dump(const variant_map_t& map)
 {
     return
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
-        QJsonObject::fromVariantHash
+            QJsonObject::fromVariantHash
 #else
-        QJsonObject::fromVariantMap
+            QJsonObject::fromVariantMap
 #endif
-        (map);
+            (map);
 }
 
 variant_map_t JsonConverter<QVariantHash>::load(const QJsonValue& jv)
 {
     return jv.toObject().
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
-        toVariantHash
+            toVariantHash
 #else
-        toVariantMap
+            toVariantMap
 #endif
-        ();
+            ();
 }
diff --git a/lib/converters.h b/lib/converters.h
index af2be645..68a841cf 100644
--- a/lib/converters.h
+++ b/lib/converters.h
@@ -1,31 +1,31 @@
 /******************************************************************************
-* Copyright (C) 2017 Kitsune Ral <kitsune-ral@users.sf.net>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ * Copyright (C) 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
 
 #pragma once
 
 #include "util.h"
 
-#include <QtCore/QJsonObject>
+#include <QtCore/QDate>
 #include <QtCore/QJsonArray> // Includes <QtCore/QJsonValue>
 #include <QtCore/QJsonDocument>
-#include <QtCore/QDate>
-#include <QtCore/QUrlQuery>
+#include <QtCore/QJsonObject>
 #include <QtCore/QSet>
+#include <QtCore/QUrlQuery>
 #include <QtCore/QVector>
 
 #include <unordered_map>
@@ -38,35 +38,29 @@ using optional = std::experimental::optional<T>;
 #endif
 
 // Enable std::unordered_map<QString, T>
-namespace std
-{
-    template <> struct hash<QString>
-    {
+namespace std {
+    template <> struct hash<QString> {
         size_t operator()(const QString& s) const Q_DECL_NOEXCEPT
         {
             return qHash(s
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-                         , uint(qGlobalQHashSeed())
+                         ,
+                         uint(qGlobalQHashSeed())
 #endif
-                         );
+            );
         }
     };
 }
 
 class QVariant;
 
-namespace QMatrixClient
-{
-    template <typename T>
-    struct JsonObjectConverter
-    {
+namespace QMatrixClient {
+    template <typename T> struct JsonObjectConverter {
         static void dumpTo(QJsonObject& jo, const T& pod) { jo = pod; }
         static void fillFrom(const QJsonObject& jo, T& pod) { pod = jo; }
     };
 
-    template <typename T>
-    struct JsonConverter
-    {
+    template <typename T> struct JsonConverter {
         static QJsonObject dump(const T& pod)
         {
             QJsonObject jo;
@@ -83,39 +77,33 @@ namespace QMatrixClient
         static T load(const QJsonDocument& jd) { return doLoad(jd.object()); }
     };
 
-    template <typename T>
-    inline auto toJson(const T& pod)
+    template <typename T> inline auto toJson(const T& pod)
     {
         return JsonConverter<T>::dump(pod);
     }
 
-    template <typename T>
-    inline auto fillJson(QJsonObject& json, const T& data)
+    template <typename T> inline auto fillJson(QJsonObject& json, const T& data)
     {
         JsonObjectConverter<T>::dumpTo(json, data);
     }
 
-    template <typename T>
-    inline auto fromJson(const QJsonValue& jv)
+    template <typename T> inline auto fromJson(const QJsonValue& jv)
     {
         return JsonConverter<T>::load(jv);
     }
 
-    template <typename T>
-    inline T fromJson(const QJsonDocument& jd)
+    template <typename T> inline T fromJson(const QJsonDocument& jd)
     {
         return JsonConverter<T>::load(jd);
     }
 
-    template <typename T>
-    inline void fromJson(const QJsonValue& jv, T& pod)
+    template <typename T> inline void fromJson(const QJsonValue& jv, T& pod)
     {
         if (!jv.isUndefined())
             pod = fromJson<T>(jv);
     }
 
-    template <typename T>
-    inline void fromJson(const QJsonDocument& jd, T& pod)
+    template <typename T> inline void fromJson(const QJsonDocument& jd, T& pod)
     {
         pod = fromJson<T>(jd);
     }
@@ -130,8 +118,7 @@ namespace QMatrixClient
             pod = fromJson<T>(jv);
     }
 
-    template <typename T>
-    inline void fillFromJson(const QJsonValue& jv, T& pod)
+    template <typename T> inline void fillFromJson(const QJsonValue& jv, T& pod)
     {
         if (jv.isObject())
             JsonObjectConverter<T>::fillFrom(jv.toObject(), pod);
@@ -139,59 +126,49 @@ namespace QMatrixClient
 
     // JsonConverter<> specialisations
 
-    template <typename T>
-    struct TrivialJsonDumper
-    {
+    template <typename T> struct TrivialJsonDumper {
         // Works for: QJsonValue (and all things it can consume),
         // QJsonObject, QJsonArray
         static auto dump(const T& val) { return val; }
     };
 
-    template <> struct JsonConverter<bool> : public TrivialJsonDumper<bool>
-    {
+    template <> struct JsonConverter<bool> : public TrivialJsonDumper<bool> {
         static auto load(const QJsonValue& jv) { return jv.toBool(); }
     };
 
-    template <> struct JsonConverter<int> : public TrivialJsonDumper<int>
-    {
+    template <> struct JsonConverter<int> : public TrivialJsonDumper<int> {
         static auto load(const QJsonValue& jv) { return jv.toInt(); }
     };
 
-    template <> struct JsonConverter<double>
-        : public TrivialJsonDumper<double>
-    {
+    template <>
+    struct JsonConverter<double> : public TrivialJsonDumper<double> {
         static auto load(const QJsonValue& jv) { return jv.toDouble(); }
     };
 
-    template <> struct JsonConverter<float> : public TrivialJsonDumper<float>
-    {
+    template <> struct JsonConverter<float> : public TrivialJsonDumper<float> {
         static auto load(const QJsonValue& jv) { return float(jv.toDouble()); }
     };
 
-    template <> struct JsonConverter<qint64>
-        : public TrivialJsonDumper<qint64>
-    {
+    template <>
+    struct JsonConverter<qint64> : public TrivialJsonDumper<qint64> {
         static auto load(const QJsonValue& jv) { return qint64(jv.toDouble()); }
     };
 
-    template <> struct JsonConverter<QString>
-        : public TrivialJsonDumper<QString>
-    {
+    template <>
+    struct JsonConverter<QString> : public TrivialJsonDumper<QString> {
         static auto load(const QJsonValue& jv) { return jv.toString(); }
     };
 
-    template <> struct JsonConverter<QDateTime>
-    {
+    template <> struct JsonConverter<QDateTime> {
         static auto dump(const QDateTime& val) = delete; // not provided yet
         static auto load(const QJsonValue& jv)
         {
-            return QDateTime::fromMSecsSinceEpoch(
-                    fromJson<qint64>(jv), Qt::UTC);
+            return QDateTime::fromMSecsSinceEpoch(fromJson<qint64>(jv),
+                                                  Qt::UTC);
         }
     };
 
-    template <> struct JsonConverter<QDate>
-    {
+    template <> struct JsonConverter<QDate> {
         static auto dump(const QDate& val) = delete; // not provided yet
         static auto load(const QJsonValue& jv)
         {
@@ -199,14 +176,12 @@ namespace QMatrixClient
         }
     };
 
-    template <> struct JsonConverter<QJsonArray>
-        : public TrivialJsonDumper<QJsonArray>
-    {
+    template <>
+    struct JsonConverter<QJsonArray> : public TrivialJsonDumper<QJsonArray> {
         static auto load(const QJsonValue& jv) { return jv.toArray(); }
     };
 
-    template <> struct JsonConverter<QByteArray>
-    {
+    template <> struct JsonConverter<QByteArray> {
         static QString dump(const QByteArray& ba) { return ba.constData(); }
         static auto load(const QJsonValue& jv)
         {
@@ -214,19 +189,16 @@ namespace QMatrixClient
         }
     };
 
-    template <> struct JsonConverter<QVariant>
-    {
+    template <> struct JsonConverter<QVariant> {
         static QJsonValue dump(const QVariant& v);
         static QVariant load(const QJsonValue& jv);
     };
 
-    template <typename VectorT,
-              typename T = typename VectorT::value_type>
-    struct JsonArrayConverter
-    {
+    template <typename VectorT, typename T = typename VectorT::value_type>
+    struct JsonArrayConverter {
         static void dumpTo(QJsonArray& ar, const VectorT& vals)
         {
-            for (const auto& v: vals)
+            for (const auto& v : vals)
                 ar.push_back(toJson(v));
         }
         static auto dump(const VectorT& vals)
@@ -237,8 +209,9 @@ namespace QMatrixClient
         }
         static auto load(const QJsonArray& ja)
         {
-            VectorT vect; vect.reserve(typename VectorT::size_type(ja.size()));
-            for (const auto& i: ja)
+            VectorT vect;
+            vect.reserve(typename VectorT::size_type(ja.size()));
+            for (const auto& i : ja)
                 vect.push_back(fromJson<T>(i));
             return vect;
         }
@@ -246,33 +219,32 @@ namespace QMatrixClient
         static auto load(const QJsonDocument& jd) { return load(jd.array()); }
     };
 
-    template <typename T> struct JsonConverter<std::vector<T>>
-        : public JsonArrayConverter<std::vector<T>>
-    { };
+    template <typename T>
+    struct JsonConverter<std::vector<T>>
+        : public JsonArrayConverter<std::vector<T>> {
+    };
 
-    template <typename T> struct JsonConverter<QVector<T>>
-        : public JsonArrayConverter<QVector<T>>
-    { };
+    template <typename T>
+    struct JsonConverter<QVector<T>> : public JsonArrayConverter<QVector<T>> {
+    };
 
-    template <typename T> struct JsonConverter<QList<T>>
-        : public JsonArrayConverter<QList<T>>
-    { };
+    template <typename T>
+    struct JsonConverter<QList<T>> : public JsonArrayConverter<QList<T>> {
+    };
 
-    template <> struct JsonConverter<QStringList>
-        : public JsonConverter<QList<QString>>
-    {
+    template <>
+    struct JsonConverter<QStringList> : public JsonConverter<QList<QString>> {
         static auto dump(const QStringList& sl)
         {
             return QJsonArray::fromStringList(sl);
         }
     };
 
-    template <> struct JsonObjectConverter<QSet<QString>>
-    {
+    template <> struct JsonObjectConverter<QSet<QString>> {
         static void dumpTo(QJsonObject& json, const QSet<QString>& s)
         {
-            for (const auto& e: s)
-                json.insert(toJson(e), QJsonObject{});
+            for (const auto& e : s)
+                json.insert(toJson(e), QJsonObject {});
         }
         static auto fillFrom(const QJsonObject& json, QSet<QString>& s)
         {
@@ -283,9 +255,7 @@ namespace QMatrixClient
         }
     };
 
-    template <typename HashMapT>
-    struct HashMapFromJson
-    {
+    template <typename HashMapT> struct HashMapFromJson {
         static void dumpTo(QJsonObject& json, const HashMapT& hashMap)
         {
             for (auto it = hashMap.begin(); it != hashMap.end(); ++it)
@@ -296,19 +266,19 @@ namespace QMatrixClient
             h.reserve(jo.size());
             for (auto it = jo.begin(); it != jo.end(); ++it)
                 h[it.key()] =
-                    fromJson<typename HashMapT::mapped_type>(it.value());
+                        fromJson<typename HashMapT::mapped_type>(it.value());
         }
     };
 
     template <typename T>
     struct JsonObjectConverter<std::unordered_map<QString, T>>
-        : public HashMapFromJson<std::unordered_map<QString, T>>
-    { };
+        : public HashMapFromJson<std::unordered_map<QString, T>> {
+    };
 
     template <typename T>
     struct JsonObjectConverter<QHash<QString, T>>
-        : public HashMapFromJson<QHash<QString, T>>
-    { };
+        : public HashMapFromJson<QHash<QString, T>> {
+    };
 
     // We could use std::conditional<> below but QT_VERSION* macros in C++ code
     // cause (kinda valid but useless and noisy) compiler warnings about
@@ -319,35 +289,38 @@ namespace QMatrixClient
 #else
             QVariantMap;
 #endif
-    template <> struct JsonConverter<variant_map_t>
-    {
+    template <> struct JsonConverter<variant_map_t> {
         static QJsonObject dump(const variant_map_t& vh);
         static QVariantHash load(const QJsonValue& jv);
     };
 
     // Conditional insertion into a QJsonObject
 
-    namespace _impl
-    {
+    namespace _impl {
         template <typename ValT>
         inline void addTo(QJsonObject& o, const QString& k, ValT&& v)
-        { o.insert(k, toJson(v)); }
+        {
+            o.insert(k, toJson(v));
+        }
 
         template <typename ValT>
         inline void addTo(QUrlQuery& q, const QString& k, ValT&& v)
-        { q.addQueryItem(k, QStringLiteral("%1").arg(v)); }
+        {
+            q.addQueryItem(k, QStringLiteral("%1").arg(v));
+        }
 
         // OpenAPI is entirely JSON-based, which means representing bools as
         // textual true/false, rather than 1/0.
         inline void addTo(QUrlQuery& q, const QString& k, bool v)
         {
-            q.addQueryItem(k, v ? QStringLiteral("true")
-                                : QStringLiteral("false"));
+            q.addQueryItem(
+                    k, v ? QStringLiteral("true") : QStringLiteral("false"));
         }
 
-        inline void addTo(QUrlQuery& q, const QString& k, const QStringList& vals)
+        inline void addTo(QUrlQuery& q, const QString& k,
+                          const QStringList& vals)
         {
-            for (const auto& v: vals)
+            for (const auto& v : vals)
                 q.addQueryItem(k, v);
         }
 
@@ -359,8 +332,7 @@ namespace QMatrixClient
 
         // This one is for types that don't have isEmpty()
         template <typename ValT, bool Force = true, typename = bool>
-        struct AddNode
-        {
+        struct AddNode {
             template <typename ContT, typename ForwardedT>
             static void impl(ContT& container, const QString& key,
                              ForwardedT&& value)
@@ -371,31 +343,28 @@ namespace QMatrixClient
 
         // This one is for types that have isEmpty()
         template <typename ValT>
-        struct AddNode<ValT, false,
-                       decltype(std::declval<ValT>().isEmpty())>
-        {
+        struct AddNode<ValT, false, decltype(std::declval<ValT>().isEmpty())> {
             template <typename ContT, typename ForwardedT>
             static void impl(ContT& container, const QString& key,
                              ForwardedT&& value)
             {
                 if (!value.isEmpty())
-                    AddNode<ValT>::impl(container,
-                                        key, std::forward<ForwardedT>(value));
+                    AddNode<ValT>::impl(container, key,
+                                        std::forward<ForwardedT>(value));
             }
         };
 
         // This is a special one that unfolds Omittable<>
         template <typename ValT, bool Force>
-        struct AddNode<Omittable<ValT>, Force>
-        {
+        struct AddNode<Omittable<ValT>, Force> {
             template <typename ContT, typename OmittableT>
-            static void impl(ContT& container,
-                             const QString& key, const OmittableT& value)
+            static void impl(ContT& container, const QString& key,
+                             const OmittableT& value)
             {
                 if (!value.omitted())
                     AddNode<ValT>::impl(container, key, value.value());
                 else if (Force) // Edge case, no value but must put something
-                    AddNode<ValT>::impl(container, key, QString{});
+                    AddNode<ValT>::impl(container, key, QString {});
             }
         };
 
@@ -416,14 +385,14 @@ namespace QMatrixClient
         };
 #endif
 
-    }  // namespace _impl
+    } // namespace _impl
 
     static constexpr bool IfNotEmpty = false;
 
     template <bool Force = true, typename ContT, typename ValT>
     inline void addParam(ContT& container, const QString& key, ValT&& value)
     {
-        _impl::AddNode<std::decay_t<ValT>, Force>
-                ::impl(container, key, std::forward<ValT>(value));
+        _impl::AddNode<std::decay_t<ValT>, Force>::impl(
+                container, key, std::forward<ValT>(value));
     }
-}  // namespace QMatrixClient
+} // namespace QMatrixClient
diff --git a/lib/csapi/account-data.cpp b/lib/csapi/account-data.cpp
index 5021c73a..40388673 100644
--- a/lib/csapi/account-data.cpp
+++ b/lib/csapi/account-data.cpp
@@ -14,19 +14,24 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 static const auto SetAccountDataJobName = QStringLiteral("SetAccountDataJob");
 
-SetAccountDataJob::SetAccountDataJob(const QString& userId, const QString& type, const QJsonObject& content)
+SetAccountDataJob::SetAccountDataJob(const QString& userId, const QString& type,
+                                     const QJsonObject& content)
     : BaseJob(HttpVerb::Put, SetAccountDataJobName,
-        basePath % "/user/" % userId % "/account_data/" % type)
+              basePath % "/user/" % userId % "/account_data/" % type)
 {
     setRequestData(Data(toJson(content)));
 }
 
-static const auto SetAccountDataPerRoomJobName = QStringLiteral("SetAccountDataPerRoomJob");
+static const auto SetAccountDataPerRoomJobName =
+        QStringLiteral("SetAccountDataPerRoomJob");
 
-SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId, const QString& roomId, const QString& type, const QJsonObject& content)
+SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId,
+                                                   const QString& roomId,
+                                                   const QString& type,
+                                                   const QJsonObject& content)
     : BaseJob(HttpVerb::Put, SetAccountDataPerRoomJobName,
-        basePath % "/user/" % userId % "/rooms/" % roomId % "/account_data/" % type)
+              basePath % "/user/" % userId % "/rooms/" % roomId
+                      % "/account_data/" % type)
 {
     setRequestData(Data(toJson(content)));
 }
-
diff --git a/lib/csapi/account-data.h b/lib/csapi/account-data.h
index f3656a14..669a4e2c 100644
--- a/lib/csapi/account-data.h
+++ b/lib/csapi/account-data.h
@@ -8,51 +8,49 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Set some account_data for the user.
     ///
-    /// Set some account_data for the client. This config is only visible to the user
-    /// that set the account_data. The config will be synced to clients in the
-    /// top-level ``account_data``.
+    /// Set some account_data for the client. This config is only visible to the
+    /// user that set the account_data. The config will be synced to clients in
+    /// the top-level ``account_data``.
     class SetAccountDataJob : public BaseJob
     {
         public:
-            /*! Set some account_data for the user.
-             * \param userId
-             *   The id of the user to set account_data for. The access token must be
-             *   authorized to make requests for this user id.
-             * \param type
-             *   The event type of the account_data to set. Custom types should be
-             *   namespaced to avoid clashes.
-             * \param content
-             *   The content of the account_data
-             */
-            explicit SetAccountDataJob(const QString& userId, const QString& type, const QJsonObject& content = {});
+        /*! Set some account_data for the user.
+         * \param userId
+         *   The id of the user to set account_data for. The access token must
+         * be authorized to make requests for this user id. \param type The
+         * event type of the account_data to set. Custom types should be
+         *   namespaced to avoid clashes.
+         * \param content
+         *   The content of the account_data
+         */
+        explicit SetAccountDataJob(const QString& userId, const QString& type,
+                                   const QJsonObject& content = {});
     };
 
     /// Set some account_data for the user.
     ///
-    /// Set some account_data for the client on a given room. This config is only
-    /// visible to the user that set the account_data. The config will be synced to
-    /// clients in the per-room ``account_data``.
+    /// Set some account_data for the client on a given room. This config is
+    /// only visible to the user that set the account_data. The config will be
+    /// synced to clients in the per-room ``account_data``.
     class SetAccountDataPerRoomJob : public BaseJob
     {
         public:
-            /*! Set some account_data for the user.
-             * \param userId
-             *   The id of the user to set account_data for. The access token must be
-             *   authorized to make requests for this user id.
-             * \param roomId
-             *   The id of the room to set account_data on.
-             * \param type
-             *   The event type of the account_data to set. Custom types should be
-             *   namespaced to avoid clashes.
-             * \param content
-             *   The content of the account_data
-             */
-            explicit SetAccountDataPerRoomJob(const QString& userId, const QString& roomId, const QString& type, const QJsonObject& content = {});
+        /*! Set some account_data for the user.
+         * \param userId
+         *   The id of the user to set account_data for. The access token must
+         * be authorized to make requests for this user id. \param roomId The id
+         * of the room to set account_data on. \param type The event type of the
+         * account_data to set. Custom types should be namespaced to avoid
+         * clashes. \param content The content of the account_data
+         */
+        explicit SetAccountDataPerRoomJob(const QString& userId,
+                                          const QString& roomId,
+                                          const QString& type,
+                                          const QJsonObject& content = {});
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/admin.cpp b/lib/csapi/admin.cpp
index ce06a56d..7922ffe3 100644
--- a/lib/csapi/admin.cpp
+++ b/lib/csapi/admin.cpp
@@ -12,13 +12,12 @@ using namespace QMatrixClient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<GetWhoIsJob::ConnectionInfo>
-    {
-        static void fillFrom(const QJsonObject& jo, GetWhoIsJob::ConnectionInfo& result)
+    template <> struct JsonObjectConverter<GetWhoIsJob::ConnectionInfo> {
+        static void fillFrom(const QJsonObject& jo,
+                             GetWhoIsJob::ConnectionInfo& result)
         {
             fromJson(jo.value("ip"_ls), result.ip);
             fromJson(jo.value("last_seen"_ls), result.lastSeen);
@@ -26,17 +25,17 @@ namespace QMatrixClient
         }
     };
 
-    template <> struct JsonObjectConverter<GetWhoIsJob::SessionInfo>
-    {
-        static void fillFrom(const QJsonObject& jo, GetWhoIsJob::SessionInfo& result)
+    template <> struct JsonObjectConverter<GetWhoIsJob::SessionInfo> {
+        static void fillFrom(const QJsonObject& jo,
+                             GetWhoIsJob::SessionInfo& result)
         {
             fromJson(jo.value("connections"_ls), result.connections);
         }
     };
 
-    template <> struct JsonObjectConverter<GetWhoIsJob::DeviceInfo>
-    {
-        static void fillFrom(const QJsonObject& jo, GetWhoIsJob::DeviceInfo& result)
+    template <> struct JsonObjectConverter<GetWhoIsJob::DeviceInfo> {
+        static void fillFrom(const QJsonObject& jo,
+                             GetWhoIsJob::DeviceInfo& result)
         {
             fromJson(jo.value("sessions"_ls), result.sessions);
         }
@@ -46,31 +45,28 @@ namespace QMatrixClient
 class GetWhoIsJob::Private
 {
     public:
-        QString userId;
-        QHash<QString, DeviceInfo> devices;
+    QString userId;
+    QHash<QString, DeviceInfo> devices;
 };
 
 QUrl GetWhoIsJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/admin/whois/" % userId);
+                                   basePath % "/admin/whois/" % userId);
 }
 
 static const auto GetWhoIsJobName = QStringLiteral("GetWhoIsJob");
 
 GetWhoIsJob::GetWhoIsJob(const QString& userId)
     : BaseJob(HttpVerb::Get, GetWhoIsJobName,
-        basePath % "/admin/whois/" % userId)
-    , d(new Private)
+              basePath % "/admin/whois/" % userId),
+      d(new Private)
 {
 }
 
 GetWhoIsJob::~GetWhoIsJob() = default;
 
-const QString& GetWhoIsJob::userId() const
-{
-    return d->userId;
-}
+const QString& GetWhoIsJob::userId() const { return d->userId; }
 
 const QHash<QString, GetWhoIsJob::DeviceInfo>& GetWhoIsJob::devices() const
 {
@@ -84,4 +80,3 @@ BaseJob::Status GetWhoIsJob::parseJson(const QJsonDocument& data)
     fromJson(json.value("devices"_ls), d->devices);
     return Success;
 }
-
diff --git a/lib/csapi/admin.h b/lib/csapi/admin.h
index d35f3ee3..3c21e2cb 100644
--- a/lib/csapi/admin.h
+++ b/lib/csapi/admin.h
@@ -6,93 +6,90 @@
 
 #include "jobs/basejob.h"
 
-#include <QtCore/QVector>
-#include <QtCore/QHash>
 #include "converters.h"
+#include <QtCore/QHash>
+#include <QtCore/QVector>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Gets information about a particular user.
     ///
     /// Gets information about a particular user.
-    /// 
+    ///
     /// This API may be restricted to only be called by the user being looked
     /// up, or by a server admin. Server-local administrator privileges are not
     /// specified in this document.
     class GetWhoIsJob : public BaseJob
     {
         public:
-            // Inner data structures
-
-            /// Gets information about a particular user.
-            /// 
-            /// This API may be restricted to only be called by the user being looked
-            /// up, or by a server admin. Server-local administrator privileges are not
-            /// specified in this document.
-            struct ConnectionInfo
-            {
-                /// Most recently seen IP address of the session.
-                QString ip;
-                /// Unix timestamp that the session was last active.
-                Omittable<qint64> lastSeen;
-                /// User agent string last seen in the session.
-                QString userAgent;
-            };
-
-            /// Gets information about a particular user.
-            /// 
-            /// This API may be restricted to only be called by the user being looked
-            /// up, or by a server admin. Server-local administrator privileges are not
-            /// specified in this document.
-            struct SessionInfo
-            {
-                /// Information particular connections in the session.
-                QVector<ConnectionInfo> connections;
-            };
-
-            /// Gets information about a particular user.
-            /// 
-            /// This API may be restricted to only be called by the user being looked
-            /// up, or by a server admin. Server-local administrator privileges are not
-            /// specified in this document.
-            struct DeviceInfo
-            {
-                /// A user's sessions (i.e. what they did with an access token from one login).
-                QVector<SessionInfo> sessions;
-            };
-
-            // Construction/destruction
-
-            /*! Gets information about a particular user.
-             * \param userId
-             *   The user to look up.
-             */
-            explicit GetWhoIsJob(const QString& userId);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetWhoIsJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId);
-
-            ~GetWhoIsJob() override;
-
-            // Result properties
-
-            /// The Matrix user ID of the user.
-            const QString& userId() const;
-            /// Each key is an identitfier for one of the user's devices.
-            const QHash<QString, DeviceInfo>& devices() const;
+        // Inner data structures
+
+        /// Gets information about a particular user.
+        ///
+        /// This API may be restricted to only be called by the user being
+        /// looked up, or by a server admin. Server-local administrator
+        /// privileges are not specified in this document.
+        struct ConnectionInfo {
+            /// Most recently seen IP address of the session.
+            QString ip;
+            /// Unix timestamp that the session was last active.
+            Omittable<qint64> lastSeen;
+            /// User agent string last seen in the session.
+            QString userAgent;
+        };
+
+        /// Gets information about a particular user.
+        ///
+        /// This API may be restricted to only be called by the user being
+        /// looked up, or by a server admin. Server-local administrator
+        /// privileges are not specified in this document.
+        struct SessionInfo {
+            /// Information particular connections in the session.
+            QVector<ConnectionInfo> connections;
+        };
+
+        /// Gets information about a particular user.
+        ///
+        /// This API may be restricted to only be called by the user being
+        /// looked up, or by a server admin. Server-local administrator
+        /// privileges are not specified in this document.
+        struct DeviceInfo {
+            /// A user's sessions (i.e. what they did with an access token from
+            /// one login).
+            QVector<SessionInfo> sessions;
+        };
+
+        // Construction/destruction
+
+        /*! Gets information about a particular user.
+         * \param userId
+         *   The user to look up.
+         */
+        explicit GetWhoIsJob(const QString& userId);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetWhoIsJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId);
+
+        ~GetWhoIsJob() override;
+
+        // Result properties
+
+        /// The Matrix user ID of the user.
+        const QString& userId() const;
+        /// Each key is an identitfier for one of the user's devices.
+        const QHash<QString, DeviceInfo>& devices() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/administrative_contact.cpp b/lib/csapi/administrative_contact.cpp
index 11385dff..f64f2723 100644
--- a/lib/csapi/administrative_contact.cpp
+++ b/lib/csapi/administrative_contact.cpp
@@ -12,13 +12,13 @@ using namespace QMatrixClient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<GetAccount3PIDsJob::ThirdPartyIdentifier>
-    {
-        static void fillFrom(const QJsonObject& jo, GetAccount3PIDsJob::ThirdPartyIdentifier& result)
+    template <>
+    struct JsonObjectConverter<GetAccount3PIDsJob::ThirdPartyIdentifier> {
+        static void fillFrom(const QJsonObject& jo,
+                             GetAccount3PIDsJob::ThirdPartyIdentifier& result)
         {
             fromJson(jo.value("medium"_ls), result.medium);
             fromJson(jo.value("address"_ls), result.address);
@@ -31,27 +31,28 @@ namespace QMatrixClient
 class GetAccount3PIDsJob::Private
 {
     public:
-        QVector<ThirdPartyIdentifier> threepids;
+    QVector<ThirdPartyIdentifier> threepids;
 };
 
 QUrl GetAccount3PIDsJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/account/3pid");
+                                   basePath % "/account/3pid");
 }
 
 static const auto GetAccount3PIDsJobName = QStringLiteral("GetAccount3PIDsJob");
 
 GetAccount3PIDsJob::GetAccount3PIDsJob()
     : BaseJob(HttpVerb::Get, GetAccount3PIDsJobName,
-        basePath % "/account/3pid")
-    , d(new Private)
+              basePath % "/account/3pid"),
+      d(new Private)
 {
 }
 
 GetAccount3PIDsJob::~GetAccount3PIDsJob() = default;
 
-const QVector<GetAccount3PIDsJob::ThirdPartyIdentifier>& GetAccount3PIDsJob::threepids() const
+const QVector<GetAccount3PIDsJob::ThirdPartyIdentifier>&
+GetAccount3PIDsJob::threepids() const
 {
     return d->threepids;
 }
@@ -63,13 +64,12 @@ BaseJob::Status GetAccount3PIDsJob::parseJson(const QJsonDocument& data)
     return Success;
 }
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<Post3PIDsJob::ThreePidCredentials>
-    {
-        static void dumpTo(QJsonObject& jo, const Post3PIDsJob::ThreePidCredentials& pod)
+    template <> struct JsonObjectConverter<Post3PIDsJob::ThreePidCredentials> {
+        static void dumpTo(QJsonObject& jo,
+                           const Post3PIDsJob::ThreePidCredentials& pod)
         {
             addParam<>(jo, QStringLiteral("client_secret"), pod.clientSecret);
             addParam<>(jo, QStringLiteral("id_server"), pod.idServer);
@@ -80,9 +80,9 @@ namespace QMatrixClient
 
 static const auto Post3PIDsJobName = QStringLiteral("Post3PIDsJob");
 
-Post3PIDsJob::Post3PIDsJob(const ThreePidCredentials& threePidCreds, Omittable<bool> bind)
-    : BaseJob(HttpVerb::Post, Post3PIDsJobName,
-        basePath % "/account/3pid")
+Post3PIDsJob::Post3PIDsJob(const ThreePidCredentials& threePidCreds,
+                           Omittable<bool> bind)
+    : BaseJob(HttpVerb::Post, Post3PIDsJobName, basePath % "/account/3pid")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("three_pid_creds"), threePidCreds);
@@ -90,11 +90,13 @@ Post3PIDsJob::Post3PIDsJob(const ThreePidCredentials& threePidCreds, Omittable<b
     setRequestData(_data);
 }
 
-static const auto Delete3pidFromAccountJobName = QStringLiteral("Delete3pidFromAccountJob");
+static const auto Delete3pidFromAccountJobName =
+        QStringLiteral("Delete3pidFromAccountJob");
 
-Delete3pidFromAccountJob::Delete3pidFromAccountJob(const QString& medium, const QString& address)
+Delete3pidFromAccountJob::Delete3pidFromAccountJob(const QString& medium,
+                                                   const QString& address)
     : BaseJob(HttpVerb::Post, Delete3pidFromAccountJobName,
-        basePath % "/account/3pid/delete")
+              basePath % "/account/3pid/delete")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("medium"), medium);
@@ -105,15 +107,18 @@ Delete3pidFromAccountJob::Delete3pidFromAccountJob(const QString& medium, const
 class RequestTokenTo3PIDEmailJob::Private
 {
     public:
-        Sid data;
+    Sid data;
 };
 
-static const auto RequestTokenTo3PIDEmailJobName = QStringLiteral("RequestTokenTo3PIDEmailJob");
+static const auto RequestTokenTo3PIDEmailJobName =
+        QStringLiteral("RequestTokenTo3PIDEmailJob");
 
-RequestTokenTo3PIDEmailJob::RequestTokenTo3PIDEmailJob(const QString& clientSecret, const QString& email, int sendAttempt, const QString& idServer, const QString& nextLink)
+RequestTokenTo3PIDEmailJob::RequestTokenTo3PIDEmailJob(
+        const QString& clientSecret, const QString& email, int sendAttempt,
+        const QString& idServer, const QString& nextLink)
     : BaseJob(HttpVerb::Post, RequestTokenTo3PIDEmailJobName,
-        basePath % "/account/3pid/email/requestToken", false)
-    , d(new Private)
+              basePath % "/account/3pid/email/requestToken", false),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("client_secret"), clientSecret);
@@ -126,10 +131,7 @@ RequestTokenTo3PIDEmailJob::RequestTokenTo3PIDEmailJob(const QString& clientSecr
 
 RequestTokenTo3PIDEmailJob::~RequestTokenTo3PIDEmailJob() = default;
 
-const Sid& RequestTokenTo3PIDEmailJob::data() const
-{
-    return d->data;
-}
+const Sid& RequestTokenTo3PIDEmailJob::data() const { return d->data; }
 
 BaseJob::Status RequestTokenTo3PIDEmailJob::parseJson(const QJsonDocument& data)
 {
@@ -140,15 +142,19 @@ BaseJob::Status RequestTokenTo3PIDEmailJob::parseJson(const QJsonDocument& data)
 class RequestTokenTo3PIDMSISDNJob::Private
 {
     public:
-        Sid data;
+    Sid data;
 };
 
-static const auto RequestTokenTo3PIDMSISDNJobName = QStringLiteral("RequestTokenTo3PIDMSISDNJob");
+static const auto RequestTokenTo3PIDMSISDNJobName =
+        QStringLiteral("RequestTokenTo3PIDMSISDNJob");
 
-RequestTokenTo3PIDMSISDNJob::RequestTokenTo3PIDMSISDNJob(const QString& clientSecret, const QString& country, const QString& phoneNumber, int sendAttempt, const QString& idServer, const QString& nextLink)
+RequestTokenTo3PIDMSISDNJob::RequestTokenTo3PIDMSISDNJob(
+        const QString& clientSecret, const QString& country,
+        const QString& phoneNumber, int sendAttempt, const QString& idServer,
+        const QString& nextLink)
     : BaseJob(HttpVerb::Post, RequestTokenTo3PIDMSISDNJobName,
-        basePath % "/account/3pid/msisdn/requestToken", false)
-    , d(new Private)
+              basePath % "/account/3pid/msisdn/requestToken", false),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("client_secret"), clientSecret);
@@ -162,14 +168,11 @@ RequestTokenTo3PIDMSISDNJob::RequestTokenTo3PIDMSISDNJob(const QString& clientSe
 
 RequestTokenTo3PIDMSISDNJob::~RequestTokenTo3PIDMSISDNJob() = default;
 
-const Sid& RequestTokenTo3PIDMSISDNJob::data() const
-{
-    return d->data;
-}
+const Sid& RequestTokenTo3PIDMSISDNJob::data() const { return d->data; }
 
-BaseJob::Status RequestTokenTo3PIDMSISDNJob::parseJson(const QJsonDocument& data)
+BaseJob::Status
+RequestTokenTo3PIDMSISDNJob::parseJson(const QJsonDocument& data)
 {
     fromJson(data, d->data);
     return Success;
 }
-
diff --git a/lib/csapi/administrative_contact.h b/lib/csapi/administrative_contact.h
index 02aeee4d..d99fde42 100644
--- a/lib/csapi/administrative_contact.h
+++ b/lib/csapi/administrative_contact.h
@@ -6,82 +6,83 @@
 
 #include "jobs/basejob.h"
 
-#include "csapi/../identity/definitions/sid.h"
 #include "converters.h"
+#include "csapi/../identity/definitions/sid.h"
 #include <QtCore/QVector>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Gets a list of a user's third party identifiers.
     ///
     /// Gets a list of the third party identifiers that the homeserver has
     /// associated with the user's account.
-    /// 
+    ///
     /// This is *not* the same as the list of third party identifiers bound to
     /// the user's Matrix ID in identity servers.
-    /// 
+    ///
     /// Identifiers in this list may be used by the homeserver as, for example,
     /// identifiers that it will accept to reset the user's account password.
     class GetAccount3PIDsJob : public BaseJob
     {
         public:
-            // Inner data structures
-
-            /// Gets a list of the third party identifiers that the homeserver has
-            /// associated with the user's account.
-            /// 
-            /// This is *not* the same as the list of third party identifiers bound to
-            /// the user's Matrix ID in identity servers.
-            /// 
-            /// Identifiers in this list may be used by the homeserver as, for example,
-            /// identifiers that it will accept to reset the user's account password.
-            struct ThirdPartyIdentifier
-            {
-                /// The medium of the third party identifier.
-                QString medium;
-                /// The third party identifier address.
-                QString address;
-                /// The timestamp, in milliseconds, when the identifier was
-                /// validated by the identity server.
-                qint64 validatedAt;
-                /// The timestamp, in milliseconds, when the homeserver associated the third party identifier with the user.
-                qint64 addedAt;
-            };
-
-            // Construction/destruction
-
-            explicit GetAccount3PIDsJob();
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetAccount3PIDsJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl);
-
-            ~GetAccount3PIDsJob() override;
-
-            // Result properties
-
-            /// Gets a list of the third party identifiers that the homeserver has
-            /// associated with the user's account.
-            /// 
-            /// This is *not* the same as the list of third party identifiers bound to
-            /// the user's Matrix ID in identity servers.
-            /// 
-            /// Identifiers in this list may be used by the homeserver as, for example,
-            /// identifiers that it will accept to reset the user's account password.
-            const QVector<ThirdPartyIdentifier>& threepids() const;
+        // Inner data structures
+
+        /// Gets a list of the third party identifiers that the homeserver has
+        /// associated with the user's account.
+        ///
+        /// This is *not* the same as the list of third party identifiers bound
+        /// to the user's Matrix ID in identity servers.
+        ///
+        /// Identifiers in this list may be used by the homeserver as, for
+        /// example, identifiers that it will accept to reset the user's account
+        /// password.
+        struct ThirdPartyIdentifier {
+            /// The medium of the third party identifier.
+            QString medium;
+            /// The third party identifier address.
+            QString address;
+            /// The timestamp, in milliseconds, when the identifier was
+            /// validated by the identity server.
+            qint64 validatedAt;
+            /// The timestamp, in milliseconds, when the homeserver associated
+            /// the third party identifier with the user.
+            qint64 addedAt;
+        };
+
+        // Construction/destruction
+
+        explicit GetAccount3PIDsJob();
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetAccount3PIDsJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl);
+
+        ~GetAccount3PIDsJob() override;
+
+        // Result properties
+
+        /// Gets a list of the third party identifiers that the homeserver has
+        /// associated with the user's account.
+        ///
+        /// This is *not* the same as the list of third party identifiers bound
+        /// to the user's Matrix ID in identity servers.
+        ///
+        /// Identifiers in this list may be used by the homeserver as, for
+        /// example, identifiers that it will accept to reset the user's account
+        /// password.
+        const QVector<ThirdPartyIdentifier>& threepids() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Adds contact information to the user's account.
@@ -90,30 +91,30 @@ namespace QMatrixClient
     class Post3PIDsJob : public BaseJob
     {
         public:
-            // Inner data structures
-
-            /// The third party credentials to associate with the account.
-            struct ThreePidCredentials
-            {
-                /// The client secret used in the session with the identity server.
-                QString clientSecret;
-                /// The identity server to use.
-                QString idServer;
-                /// The session identifier given by the identity server.
-                QString sid;
-            };
-
-            // Construction/destruction
-
-            /*! Adds contact information to the user's account.
-             * \param threePidCreds
-             *   The third party credentials to associate with the account.
-             * \param bind
-             *   Whether the homeserver should also bind this third party
-             *   identifier to the account's Matrix ID with the passed identity
-             *   server. Default: ``false``.
-             */
-            explicit Post3PIDsJob(const ThreePidCredentials& threePidCreds, Omittable<bool> bind = none);
+        // Inner data structures
+
+        /// The third party credentials to associate with the account.
+        struct ThreePidCredentials {
+            /// The client secret used in the session with the identity server.
+            QString clientSecret;
+            /// The identity server to use.
+            QString idServer;
+            /// The session identifier given by the identity server.
+            QString sid;
+        };
+
+        // Construction/destruction
+
+        /*! Adds contact information to the user's account.
+         * \param threePidCreds
+         *   The third party credentials to associate with the account.
+         * \param bind
+         *   Whether the homeserver should also bind this third party
+         *   identifier to the account's Matrix ID with the passed identity
+         *   server. Default: ``false``.
+         */
+        explicit Post3PIDsJob(const ThreePidCredentials& threePidCreds,
+                              Omittable<bool> bind = none);
     };
 
     /// Deletes a third party identifier from the user's account
@@ -123,115 +124,126 @@ namespace QMatrixClient
     class Delete3pidFromAccountJob : public BaseJob
     {
         public:
-            /*! Deletes a third party identifier from the user's account
-             * \param medium
-             *   The medium of the third party identifier being removed.
-             * \param address
-             *   The third party address being removed.
-             */
-            explicit Delete3pidFromAccountJob(const QString& medium, const QString& address);
+        /*! Deletes a third party identifier from the user's account
+         * \param medium
+         *   The medium of the third party identifier being removed.
+         * \param address
+         *   The third party address being removed.
+         */
+        explicit Delete3pidFromAccountJob(const QString& medium,
+                                          const QString& address);
     };
 
-    /// Begins the validation process for an email address for association with the user's account.
+    /// Begins the validation process for an email address for association with
+    /// the user's account.
     ///
     /// Proxies the Identity Service API ``validate/email/requestToken``, but
     /// first checks that the given email address is **not** already associated
     /// with an account on this homeserver. This API should be used to request
     /// validation tokens when adding an email address to an account. This API's
-    /// parameters and response are identical to that of the |/register/email/requestToken|_
-    /// endpoint.
+    /// parameters and response are identical to that of the
+    /// |/register/email/requestToken|_ endpoint.
     class RequestTokenTo3PIDEmailJob : public BaseJob
     {
         public:
-            /*! Begins the validation process for an email address for association with the user's account.
-             * \param clientSecret
-             *   A unique string generated by the client, and used to identify the
-             *   validation attempt. It must be a string consisting of the characters
-             *   ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and it
-             *   must not be empty.
-             * \param email
-             *   The email address to validate.
-             * \param sendAttempt
-             *   The server will only send an email if the ``send_attempt``
-             *   is a number greater than the most recent one which it has seen,
-             *   scoped to that ``email`` + ``client_secret`` pair. This is to
-             *   avoid repeatedly sending the same email in the case of request
-             *   retries between the POSTing user and the identity server.
-             *   The client should increment this value if they desire a new
-             *   email (e.g. a reminder) to be sent.
-             * \param idServer
-             *   The hostname of the identity server to communicate with. May
-             *   optionally include a port.
-             * \param nextLink
-             *   Optional. When the validation is completed, the identity
-             *   server will redirect the user to this URL.
-             */
-            explicit RequestTokenTo3PIDEmailJob(const QString& clientSecret, const QString& email, int sendAttempt, const QString& idServer, const QString& nextLink = {});
-            ~RequestTokenTo3PIDEmailJob() override;
-
-            // Result properties
-
-            /// An email was sent to the given address.
-            const Sid& data() const;
+        /*! Begins the validation process for an email address for association with the user's account.
+         * \param clientSecret
+         *   A unique string generated by the client, and used to identify the
+         *   validation attempt. It must be a string consisting of the
+         * characters
+         *   ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and
+         * it must not be empty. \param email The email address to validate.
+         * \param sendAttempt
+         *   The server will only send an email if the ``send_attempt``
+         *   is a number greater than the most recent one which it has seen,
+         *   scoped to that ``email`` + ``client_secret`` pair. This is to
+         *   avoid repeatedly sending the same email in the case of request
+         *   retries between the POSTing user and the identity server.
+         *   The client should increment this value if they desire a new
+         *   email (e.g. a reminder) to be sent.
+         * \param idServer
+         *   The hostname of the identity server to communicate with. May
+         *   optionally include a port.
+         * \param nextLink
+         *   Optional. When the validation is completed, the identity
+         *   server will redirect the user to this URL.
+         */
+        explicit RequestTokenTo3PIDEmailJob(const QString& clientSecret,
+                                            const QString& email,
+                                            int sendAttempt,
+                                            const QString& idServer,
+                                            const QString& nextLink = {});
+        ~RequestTokenTo3PIDEmailJob() override;
+
+        // Result properties
+
+        /// An email was sent to the given address.
+        const Sid& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
-    /// Begins the validation process for a phone number for association with the user's account.
+    /// Begins the validation process for a phone number for association with
+    /// the user's account.
     ///
     /// Proxies the Identity Service API ``validate/msisdn/requestToken``, but
     /// first checks that the given phone number is **not** already associated
     /// with an account on this homeserver. This API should be used to request
     /// validation tokens when adding a phone number to an account. This API's
-    /// parameters and response are identical to that of the |/register/msisdn/requestToken|_
-    /// endpoint.
+    /// parameters and response are identical to that of the
+    /// |/register/msisdn/requestToken|_ endpoint.
     class RequestTokenTo3PIDMSISDNJob : public BaseJob
     {
         public:
-            /*! Begins the validation process for a phone number for association with the user's account.
-             * \param clientSecret
-             *   A unique string generated by the client, and used to identify the
-             *   validation attempt. It must be a string consisting of the characters
-             *   ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and it
-             *   must not be empty.
-             * \param country
-             *   The two-letter uppercase ISO country code that the number in
-             *   ``phone_number`` should be parsed as if it were dialled from.
-             * \param phoneNumber
-             *   The phone number to validate.
-             * \param sendAttempt
-             *   The server will only send an SMS if the ``send_attempt`` is a
-             *   number greater than the most recent one which it has seen,
-             *   scoped to that ``country`` + ``phone_number`` + ``client_secret``
-             *   triple. This is to avoid repeatedly sending the same SMS in
-             *   the case of request retries between the POSTing user and the
-             *   identity server. The client should increment this value if
-             *   they desire a new SMS (e.g. a reminder) to be sent.
-             * \param idServer
-             *   The hostname of the identity server to communicate with. May
-             *   optionally include a port.
-             * \param nextLink
-             *   Optional. When the validation is completed, the identity
-             *   server will redirect the user to this URL.
-             */
-            explicit RequestTokenTo3PIDMSISDNJob(const QString& clientSecret, const QString& country, const QString& phoneNumber, int sendAttempt, const QString& idServer, const QString& nextLink = {});
-            ~RequestTokenTo3PIDMSISDNJob() override;
-
-            // Result properties
-
-            /// An SMS message was sent to the given phone number.
-            const Sid& data() const;
+        /*! Begins the validation process for a phone number for association with the user's account.
+         * \param clientSecret
+         *   A unique string generated by the client, and used to identify the
+         *   validation attempt. It must be a string consisting of the
+         * characters
+         *   ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and
+         * it must not be empty. \param country The two-letter uppercase ISO
+         * country code that the number in
+         *   ``phone_number`` should be parsed as if it were dialled from.
+         * \param phoneNumber
+         *   The phone number to validate.
+         * \param sendAttempt
+         *   The server will only send an SMS if the ``send_attempt`` is a
+         *   number greater than the most recent one which it has seen,
+         *   scoped to that ``country`` + ``phone_number`` + ``client_secret``
+         *   triple. This is to avoid repeatedly sending the same SMS in
+         *   the case of request retries between the POSTing user and the
+         *   identity server. The client should increment this value if
+         *   they desire a new SMS (e.g. a reminder) to be sent.
+         * \param idServer
+         *   The hostname of the identity server to communicate with. May
+         *   optionally include a port.
+         * \param nextLink
+         *   Optional. When the validation is completed, the identity
+         *   server will redirect the user to this URL.
+         */
+        explicit RequestTokenTo3PIDMSISDNJob(const QString& clientSecret,
+                                             const QString& country,
+                                             const QString& phoneNumber,
+                                             int sendAttempt,
+                                             const QString& idServer,
+                                             const QString& nextLink = {});
+        ~RequestTokenTo3PIDMSISDNJob() override;
+
+        // Result properties
+
+        /// An SMS message was sent to the given phone number.
+        const Sid& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/appservice_room_directory.cpp b/lib/csapi/appservice_room_directory.cpp
index f40e2f05..cf76874c 100644
--- a/lib/csapi/appservice_room_directory.cpp
+++ b/lib/csapi/appservice_room_directory.cpp
@@ -12,14 +12,18 @@ using namespace QMatrixClient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
-static const auto UpdateAppserviceRoomDirectoryVsibilityJobName = QStringLiteral("UpdateAppserviceRoomDirectoryVsibilityJob");
+static const auto UpdateAppserviceRoomDirectoryVsibilityJobName =
+        QStringLiteral("UpdateAppserviceRoomDirectoryVsibilityJob");
 
-UpdateAppserviceRoomDirectoryVsibilityJob::UpdateAppserviceRoomDirectoryVsibilityJob(const QString& networkId, const QString& roomId, const QString& visibility)
+UpdateAppserviceRoomDirectoryVsibilityJob::
+        UpdateAppserviceRoomDirectoryVsibilityJob(const QString& networkId,
+                                                  const QString& roomId,
+                                                  const QString& visibility)
     : BaseJob(HttpVerb::Put, UpdateAppserviceRoomDirectoryVsibilityJobName,
-        basePath % "/directory/list/appservice/" % networkId % "/" % roomId)
+              basePath % "/directory/list/appservice/" % networkId % "/"
+                      % roomId)
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("visibility"), visibility);
     setRequestData(_data);
 }
-
diff --git a/lib/csapi/appservice_room_directory.h b/lib/csapi/appservice_room_directory.h
index f35198b3..2ee680c9 100644
--- a/lib/csapi/appservice_room_directory.h
+++ b/lib/csapi/appservice_room_directory.h
@@ -6,36 +6,37 @@
 
 #include "jobs/basejob.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Updates a room's visibility in the application service's room directory.
     ///
     /// Updates the visibility of a given room on the application service's room
     /// directory.
-    /// 
+    ///
     /// This API is similar to the room directory visibility API used by clients
     /// to update the homeserver's more general room directory.
-    /// 
-    /// This API requires the use of an application service access token (``as_token``)
-    /// instead of a typical client's access_token. This API cannot be invoked by
-    /// users who are not identified as application services.
+    ///
+    /// This API requires the use of an application service access token
+    /// (``as_token``) instead of a typical client's access_token. This API
+    /// cannot be invoked by users who are not identified as application
+    /// services.
     class UpdateAppserviceRoomDirectoryVsibilityJob : public BaseJob
     {
         public:
-            /*! Updates a room's visibility in the application service's room directory.
-             * \param networkId
-             *   The protocol (network) ID to update the room list for. This would
-             *   have been provided by the application service as being listed as
-             *   a supported protocol.
-             * \param roomId
-             *   The room ID to add to the directory.
-             * \param visibility
-             *   Whether the room should be visible (public) in the directory
-             *   or not (private).
-             */
-            explicit UpdateAppserviceRoomDirectoryVsibilityJob(const QString& networkId, const QString& roomId, const QString& visibility);
+        /*! Updates a room's visibility in the application service's room directory.
+         * \param networkId
+         *   The protocol (network) ID to update the room list for. This would
+         *   have been provided by the application service as being listed as
+         *   a supported protocol.
+         * \param roomId
+         *   The room ID to add to the directory.
+         * \param visibility
+         *   Whether the room should be visible (public) in the directory
+         *   or not (private).
+         */
+        explicit UpdateAppserviceRoomDirectoryVsibilityJob(
+                const QString& networkId, const QString& roomId,
+                const QString& visibility);
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/banning.cpp b/lib/csapi/banning.cpp
index 4065207b..201126c3 100644
--- a/lib/csapi/banning.cpp
+++ b/lib/csapi/banning.cpp
@@ -14,9 +14,10 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 static const auto BanJobName = QStringLiteral("BanJob");
 
-BanJob::BanJob(const QString& roomId, const QString& userId, const QString& reason)
+BanJob::BanJob(const QString& roomId, const QString& userId,
+               const QString& reason)
     : BaseJob(HttpVerb::Post, BanJobName,
-        basePath % "/rooms/" % roomId % "/ban")
+              basePath % "/rooms/" % roomId % "/ban")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("user_id"), userId);
@@ -28,10 +29,9 @@ static const auto UnbanJobName = QStringLiteral("UnbanJob");
 
 UnbanJob::UnbanJob(const QString& roomId, const QString& userId)
     : BaseJob(HttpVerb::Post, UnbanJobName,
-        basePath % "/rooms/" % roomId % "/unban")
+              basePath % "/rooms/" % roomId % "/unban")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("user_id"), userId);
     setRequestData(_data);
 }
-
diff --git a/lib/csapi/banning.h b/lib/csapi/banning.h
index 237bd2a0..e1886f0e 100644
--- a/lib/csapi/banning.h
+++ b/lib/csapi/banning.h
@@ -6,47 +6,51 @@
 
 #include "jobs/basejob.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Ban a user in the room.
     ///
-    /// Ban a user in the room. If the user is currently in the room, also kick them.
-    /// 
-    /// When a user is banned from a room, they may not join it or be invited to it until they are unbanned.
-    /// 
-    /// The caller must have the required power level in order to perform this operation.
+    /// Ban a user in the room. If the user is currently in the room, also kick
+    /// them.
+    ///
+    /// When a user is banned from a room, they may not join it or be invited to
+    /// it until they are unbanned.
+    ///
+    /// The caller must have the required power level in order to perform this
+    /// operation.
     class BanJob : public BaseJob
     {
         public:
-            /*! Ban a user in the room.
-             * \param roomId
-             *   The room identifier (not alias) from which the user should be banned.
-             * \param userId
-             *   The fully qualified user ID of the user being banned.
-             * \param reason
-             *   The reason the user has been banned. This will be supplied as the ``reason`` on the target's updated `m.room.member`_ event.
-             */
-            explicit BanJob(const QString& roomId, const QString& userId, const QString& reason = {});
+        /*! Ban a user in the room.
+         * \param roomId
+         *   The room identifier (not alias) from which the user should be
+         * banned. \param userId The fully qualified user ID of the user being
+         * banned. \param reason The reason the user has been banned. This will
+         * be supplied as the ``reason`` on the target's updated
+         * `m.room.member`_ event.
+         */
+        explicit BanJob(const QString& roomId, const QString& userId,
+                        const QString& reason = {});
     };
 
     /// Unban a user from the room.
     ///
     /// Unban a user from the room. This allows them to be invited to the room,
-    /// and join if they would otherwise be allowed to join according to its join rules.
-    /// 
-    /// The caller must have the required power level in order to perform this operation.
+    /// and join if they would otherwise be allowed to join according to its
+    /// join rules.
+    ///
+    /// The caller must have the required power level in order to perform this
+    /// operation.
     class UnbanJob : public BaseJob
     {
         public:
-            /*! Unban a user from the room.
-             * \param roomId
-             *   The room identifier (not alias) from which the user should be unbanned.
-             * \param userId
-             *   The fully qualified user ID of the user being unbanned.
-             */
-            explicit UnbanJob(const QString& roomId, const QString& userId);
+        /*! Unban a user from the room.
+         * \param roomId
+         *   The room identifier (not alias) from which the user should be
+         * unbanned. \param userId The fully qualified user ID of the user being
+         * unbanned.
+         */
+        explicit UnbanJob(const QString& roomId, const QString& userId);
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/capabilities.cpp b/lib/csapi/capabilities.cpp
index 210423f5..0fb9fbae 100644
--- a/lib/csapi/capabilities.cpp
+++ b/lib/csapi/capabilities.cpp
@@ -12,30 +12,32 @@ using namespace QMatrixClient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<GetCapabilitiesJob::ChangePasswordCapability>
-    {
-        static void fillFrom(const QJsonObject& jo, GetCapabilitiesJob::ChangePasswordCapability& result)
+    template <>
+    struct JsonObjectConverter<GetCapabilitiesJob::ChangePasswordCapability> {
+        static void
+        fillFrom(const QJsonObject& jo,
+                 GetCapabilitiesJob::ChangePasswordCapability& result)
         {
             fromJson(jo.value("enabled"_ls), result.enabled);
         }
     };
 
-    template <> struct JsonObjectConverter<GetCapabilitiesJob::RoomVersionsCapability>
-    {
-        static void fillFrom(const QJsonObject& jo, GetCapabilitiesJob::RoomVersionsCapability& result)
+    template <>
+    struct JsonObjectConverter<GetCapabilitiesJob::RoomVersionsCapability> {
+        static void fillFrom(const QJsonObject& jo,
+                             GetCapabilitiesJob::RoomVersionsCapability& result)
         {
             fromJson(jo.value("default"_ls), result.defaultVersion);
             fromJson(jo.value("available"_ls), result.available);
         }
     };
 
-    template <> struct JsonObjectConverter<GetCapabilitiesJob::Capabilities>
-    {
-        static void fillFrom(QJsonObject jo, GetCapabilitiesJob::Capabilities& result)
+    template <> struct JsonObjectConverter<GetCapabilitiesJob::Capabilities> {
+        static void fillFrom(QJsonObject jo,
+                             GetCapabilitiesJob::Capabilities& result)
         {
             fromJson(jo.take("m.change_password"_ls), result.changePassword);
             fromJson(jo.take("m.room_versions"_ls), result.roomVersions);
@@ -47,21 +49,21 @@ namespace QMatrixClient
 class GetCapabilitiesJob::Private
 {
     public:
-        Capabilities capabilities;
+    Capabilities capabilities;
 };
 
 QUrl GetCapabilitiesJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/capabilities");
+                                   basePath % "/capabilities");
 }
 
 static const auto GetCapabilitiesJobName = QStringLiteral("GetCapabilitiesJob");
 
 GetCapabilitiesJob::GetCapabilitiesJob()
     : BaseJob(HttpVerb::Get, GetCapabilitiesJobName,
-        basePath % "/capabilities")
-    , d(new Private)
+              basePath % "/capabilities"),
+      d(new Private)
 {
 }
 
@@ -77,8 +79,7 @@ BaseJob::Status GetCapabilitiesJob::parseJson(const QJsonDocument& data)
     auto json = data.object();
     if (!json.contains("capabilities"_ls))
         return { JsonParseError,
-            "The key 'capabilities' not found in the response" };
+                 "The key 'capabilities' not found in the response" };
     fromJson(json.value("capabilities"_ls), d->capabilities);
     return Success;
 }
-
diff --git a/lib/csapi/capabilities.h b/lib/csapi/capabilities.h
index 39e2f4d1..6282c2fd 100644
--- a/lib/csapi/capabilities.h
+++ b/lib/csapi/capabilities.h
@@ -6,12 +6,11 @@
 
 #include "jobs/basejob.h"
 
-#include <QtCore/QJsonObject>
 #include "converters.h"
 #include <QtCore/QHash>
+#include <QtCore/QJsonObject>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Gets information about the server's capabilities.
@@ -21,62 +20,59 @@ namespace QMatrixClient
     class GetCapabilitiesJob : public BaseJob
     {
         public:
-            // Inner data structures
-
+        // Inner data structures
+
+        /// Capability to indicate if the user can change their password.
+        struct ChangePasswordCapability {
+            /// True if the user can change their password, false otherwise.
+            bool enabled;
+        };
+
+        /// The room versions the server supports.
+        struct RoomVersionsCapability {
+            /// The default room version the server is using for new rooms.
+            QString defaultVersion;
+            /// A detailed description of the room versions the server supports.
+            QHash<QString, QString> available;
+        };
+
+        /// Gets information about the server's supported feature set
+        /// and other relevant capabilities.
+        struct Capabilities {
             /// Capability to indicate if the user can change their password.
-            struct ChangePasswordCapability
-            {
-                /// True if the user can change their password, false otherwise.
-                bool enabled;
-            };
-
+            Omittable<ChangePasswordCapability> changePassword;
             /// The room versions the server supports.
-            struct RoomVersionsCapability
-            {
-                /// The default room version the server is using for new rooms.
-                QString defaultVersion;
-                /// A detailed description of the room versions the server supports.
-                QHash<QString, QString> available;
-            };
-
-            /// Gets information about the server's supported feature set
-            /// and other relevant capabilities.
-            struct Capabilities
-            {
-                /// Capability to indicate if the user can change their password.
-                Omittable<ChangePasswordCapability> changePassword;
-                /// The room versions the server supports.
-                Omittable<RoomVersionsCapability> roomVersions;
-                /// The custom capabilities the server supports, using the
-                /// Java package naming convention.
-                QHash<QString, QJsonObject> additionalProperties;
-            };
-
-            // Construction/destruction
-
-            explicit GetCapabilitiesJob();
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetCapabilitiesJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl);
-
-            ~GetCapabilitiesJob() override;
-
-            // Result properties
-
-            /// Gets information about the server's supported feature set
-            /// and other relevant capabilities.
-            const Capabilities& capabilities() const;
+            Omittable<RoomVersionsCapability> roomVersions;
+            /// The custom capabilities the server supports, using the
+            /// Java package naming convention.
+            QHash<QString, QJsonObject> additionalProperties;
+        };
+
+        // Construction/destruction
+
+        explicit GetCapabilitiesJob();
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetCapabilitiesJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl);
+
+        ~GetCapabilitiesJob() override;
+
+        // Result properties
+
+        /// Gets information about the server's supported feature set
+        /// and other relevant capabilities.
+        const Capabilities& capabilities() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/content-repo.cpp b/lib/csapi/content-repo.cpp
index 22223985..d59449b9 100644
--- a/lib/csapi/content-repo.cpp
+++ b/lib/csapi/content-repo.cpp
@@ -6,8 +6,8 @@
 
 #include "converters.h"
 
-#include <QtNetwork/QNetworkReply>
 #include <QtCore/QStringBuilder>
+#include <QtNetwork/QNetworkReply>
 
 using namespace QMatrixClient;
 
@@ -16,7 +16,7 @@ static const auto basePath = QStringLiteral("/_matrix/media/r0");
 class UploadContentJob::Private
 {
     public:
-        QString contentUri;
+    QString contentUri;
 };
 
 BaseJob::Query queryToUploadContent(const QString& filename)
@@ -28,11 +28,11 @@ BaseJob::Query queryToUploadContent(const QString& filename)
 
 static const auto UploadContentJobName = QStringLiteral("UploadContentJob");
 
-UploadContentJob::UploadContentJob(QIODevice* content, const QString& filename, const QString& contentType)
-    : BaseJob(HttpVerb::Post, UploadContentJobName,
-        basePath % "/upload",
-        queryToUploadContent(filename))
-    , d(new Private)
+UploadContentJob::UploadContentJob(QIODevice* content, const QString& filename,
+                                   const QString& contentType)
+    : BaseJob(HttpVerb::Post, UploadContentJobName, basePath % "/upload",
+              queryToUploadContent(filename)),
+      d(new Private)
 {
     setRequestHeader("Content-Type", contentType.toLatin1());
 
@@ -41,17 +41,14 @@ UploadContentJob::UploadContentJob(QIODevice* content, const QString& filename,
 
 UploadContentJob::~UploadContentJob() = default;
 
-const QString& UploadContentJob::contentUri() const
-{
-    return d->contentUri;
-}
+const QString& UploadContentJob::contentUri() const { return d->contentUri; }
 
 BaseJob::Status UploadContentJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("content_uri"_ls))
         return { JsonParseError,
-            "The key 'content_uri' not found in the response" };
+                 "The key 'content_uri' not found in the response" };
     fromJson(json.value("content_uri"_ls), d->contentUri);
     return Success;
 }
@@ -59,9 +56,9 @@ BaseJob::Status UploadContentJob::parseJson(const QJsonDocument& data)
 class GetContentJob::Private
 {
     public:
-        QString contentType;
-        QString contentDisposition;
-        QIODevice* data;
+    QString contentType;
+    QString contentDisposition;
+    QIODevice* data;
 };
 
 BaseJob::Query queryToGetContent(bool allowRemote)
@@ -71,41 +68,37 @@ BaseJob::Query queryToGetContent(bool allowRemote)
     return _q;
 }
 
-QUrl GetContentJob::makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, bool allowRemote)
+QUrl GetContentJob::makeRequestUrl(QUrl baseUrl, const QString& serverName,
+                                   const QString& mediaId, bool allowRemote)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/download/" % serverName % "/" % mediaId,
-            queryToGetContent(allowRemote));
+                                   basePath % "/download/" % serverName % "/"
+                                           % mediaId,
+                                   queryToGetContent(allowRemote));
 }
 
 static const auto GetContentJobName = QStringLiteral("GetContentJob");
 
-GetContentJob::GetContentJob(const QString& serverName, const QString& mediaId, bool allowRemote)
+GetContentJob::GetContentJob(const QString& serverName, const QString& mediaId,
+                             bool allowRemote)
     : BaseJob(HttpVerb::Get, GetContentJobName,
-        basePath % "/download/" % serverName % "/" % mediaId,
-        queryToGetContent(allowRemote),
-        {}, false)
-    , d(new Private)
+              basePath % "/download/" % serverName % "/" % mediaId,
+              queryToGetContent(allowRemote), {}, false),
+      d(new Private)
 {
     setExpectedContentTypes({ "*/*" });
 }
 
 GetContentJob::~GetContentJob() = default;
 
-const QString& GetContentJob::contentType() const
-{
-    return d->contentType;
-}
+const QString& GetContentJob::contentType() const { return d->contentType; }
 
 const QString& GetContentJob::contentDisposition() const
 {
     return d->contentDisposition;
 }
 
-QIODevice* GetContentJob::data() const
-{
-    return d->data;
-}
+QIODevice* GetContentJob::data() const { return d->data; }
 
 BaseJob::Status GetContentJob::parseReply(QNetworkReply* reply)
 {
@@ -118,9 +111,9 @@ BaseJob::Status GetContentJob::parseReply(QNetworkReply* reply)
 class GetContentOverrideNameJob::Private
 {
     public:
-        QString contentType;
-        QString contentDisposition;
-        QIODevice* data;
+    QString contentType;
+    QString contentDisposition;
+    QIODevice* data;
 };
 
 BaseJob::Query queryToGetContentOverrideName(bool allowRemote)
@@ -130,21 +123,30 @@ BaseJob::Query queryToGetContentOverrideName(bool allowRemote)
     return _q;
 }
 
-QUrl GetContentOverrideNameJob::makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, const QString& fileName, bool allowRemote)
+QUrl GetContentOverrideNameJob::makeRequestUrl(QUrl baseUrl,
+                                               const QString& serverName,
+                                               const QString& mediaId,
+                                               const QString& fileName,
+                                               bool allowRemote)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/download/" % serverName % "/" % mediaId % "/" % fileName,
-            queryToGetContentOverrideName(allowRemote));
+                                   basePath % "/download/" % serverName % "/"
+                                           % mediaId % "/" % fileName,
+                                   queryToGetContentOverrideName(allowRemote));
 }
 
-static const auto GetContentOverrideNameJobName = QStringLiteral("GetContentOverrideNameJob");
+static const auto GetContentOverrideNameJobName =
+        QStringLiteral("GetContentOverrideNameJob");
 
-GetContentOverrideNameJob::GetContentOverrideNameJob(const QString& serverName, const QString& mediaId, const QString& fileName, bool allowRemote)
+GetContentOverrideNameJob::GetContentOverrideNameJob(const QString& serverName,
+                                                     const QString& mediaId,
+                                                     const QString& fileName,
+                                                     bool allowRemote)
     : BaseJob(HttpVerb::Get, GetContentOverrideNameJobName,
-        basePath % "/download/" % serverName % "/" % mediaId % "/" % fileName,
-        queryToGetContentOverrideName(allowRemote),
-        {}, false)
-    , d(new Private)
+              basePath % "/download/" % serverName % "/" % mediaId % "/"
+                      % fileName,
+              queryToGetContentOverrideName(allowRemote), {}, false),
+      d(new Private)
 {
     setExpectedContentTypes({ "*/*" });
 }
@@ -161,10 +163,7 @@ const QString& GetContentOverrideNameJob::contentDisposition() const
     return d->contentDisposition;
 }
 
-QIODevice* GetContentOverrideNameJob::data() const
-{
-    return d->data;
-}
+QIODevice* GetContentOverrideNameJob::data() const { return d->data; }
 
 BaseJob::Status GetContentOverrideNameJob::parseReply(QNetworkReply* reply)
 {
@@ -177,11 +176,13 @@ BaseJob::Status GetContentOverrideNameJob::parseReply(QNetworkReply* reply)
 class GetContentThumbnailJob::Private
 {
     public:
-        QString contentType;
-        QIODevice* data;
+    QString contentType;
+    QIODevice* data;
 };
 
-BaseJob::Query queryToGetContentThumbnail(int width, int height, const QString& method, bool allowRemote)
+BaseJob::Query queryToGetContentThumbnail(int width, int height,
+                                          const QString& method,
+                                          bool allowRemote)
 {
     BaseJob::Query _q;
     addParam<>(_q, QStringLiteral("width"), width);
@@ -191,21 +192,31 @@ BaseJob::Query queryToGetContentThumbnail(int width, int height, const QString&
     return _q;
 }
 
-QUrl GetContentThumbnailJob::makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, int width, int height, const QString& method, bool allowRemote)
+QUrl GetContentThumbnailJob::makeRequestUrl(QUrl baseUrl,
+                                            const QString& serverName,
+                                            const QString& mediaId, int width,
+                                            int height, const QString& method,
+                                            bool allowRemote)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
+    return BaseJob::makeRequestUrl(
+            std::move(baseUrl),
             basePath % "/thumbnail/" % serverName % "/" % mediaId,
             queryToGetContentThumbnail(width, height, method, allowRemote));
 }
 
-static const auto GetContentThumbnailJobName = QStringLiteral("GetContentThumbnailJob");
+static const auto GetContentThumbnailJobName =
+        QStringLiteral("GetContentThumbnailJob");
 
-GetContentThumbnailJob::GetContentThumbnailJob(const QString& serverName, const QString& mediaId, int width, int height, const QString& method, bool allowRemote)
+GetContentThumbnailJob::GetContentThumbnailJob(const QString& serverName,
+                                               const QString& mediaId,
+                                               int width, int height,
+                                               const QString& method,
+                                               bool allowRemote)
     : BaseJob(HttpVerb::Get, GetContentThumbnailJobName,
-        basePath % "/thumbnail/" % serverName % "/" % mediaId,
-        queryToGetContentThumbnail(width, height, method, allowRemote),
-        {}, false)
-    , d(new Private)
+              basePath % "/thumbnail/" % serverName % "/" % mediaId,
+              queryToGetContentThumbnail(width, height, method, allowRemote),
+              {}, false),
+      d(new Private)
 {
     setExpectedContentTypes({ "image/jpeg", "image/png" });
 }
@@ -217,10 +228,7 @@ const QString& GetContentThumbnailJob::contentType() const
     return d->contentType;
 }
 
-QIODevice* GetContentThumbnailJob::data() const
-{
-    return d->data;
-}
+QIODevice* GetContentThumbnailJob::data() const { return d->data; }
 
 BaseJob::Status GetContentThumbnailJob::parseReply(QNetworkReply* reply)
 {
@@ -232,8 +240,8 @@ BaseJob::Status GetContentThumbnailJob::parseReply(QNetworkReply* reply)
 class GetUrlPreviewJob::Private
 {
     public:
-        Omittable<qint64> matrixImageSize;
-        QString ogImage;
+    Omittable<qint64> matrixImageSize;
+    QString ogImage;
 };
 
 BaseJob::Query queryToGetUrlPreview(const QString& url, Omittable<qint64> ts)
@@ -244,20 +252,20 @@ BaseJob::Query queryToGetUrlPreview(const QString& url, Omittable<qint64> ts)
     return _q;
 }
 
-QUrl GetUrlPreviewJob::makeRequestUrl(QUrl baseUrl, const QString& url, Omittable<qint64> ts)
+QUrl GetUrlPreviewJob::makeRequestUrl(QUrl baseUrl, const QString& url,
+                                      Omittable<qint64> ts)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/preview_url",
-            queryToGetUrlPreview(url, ts));
+                                   basePath % "/preview_url",
+                                   queryToGetUrlPreview(url, ts));
 }
 
 static const auto GetUrlPreviewJobName = QStringLiteral("GetUrlPreviewJob");
 
 GetUrlPreviewJob::GetUrlPreviewJob(const QString& url, Omittable<qint64> ts)
-    : BaseJob(HttpVerb::Get, GetUrlPreviewJobName,
-        basePath % "/preview_url",
-        queryToGetUrlPreview(url, ts))
-    , d(new Private)
+    : BaseJob(HttpVerb::Get, GetUrlPreviewJobName, basePath % "/preview_url",
+              queryToGetUrlPreview(url, ts)),
+      d(new Private)
 {
 }
 
@@ -268,10 +276,7 @@ Omittable<qint64> GetUrlPreviewJob::matrixImageSize() const
     return d->matrixImageSize;
 }
 
-const QString& GetUrlPreviewJob::ogImage() const
-{
-    return d->ogImage;
-}
+const QString& GetUrlPreviewJob::ogImage() const { return d->ogImage; }
 
 BaseJob::Status GetUrlPreviewJob::parseJson(const QJsonDocument& data)
 {
@@ -284,30 +289,25 @@ BaseJob::Status GetUrlPreviewJob::parseJson(const QJsonDocument& data)
 class GetConfigJob::Private
 {
     public:
-        Omittable<qint64> uploadSize;
+    Omittable<qint64> uploadSize;
 };
 
 QUrl GetConfigJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/config");
+    return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/config");
 }
 
 static const auto GetConfigJobName = QStringLiteral("GetConfigJob");
 
 GetConfigJob::GetConfigJob()
-    : BaseJob(HttpVerb::Get, GetConfigJobName,
-        basePath % "/config")
-    , d(new Private)
+    : BaseJob(HttpVerb::Get, GetConfigJobName, basePath % "/config"),
+      d(new Private)
 {
 }
 
 GetConfigJob::~GetConfigJob() = default;
 
-Omittable<qint64> GetConfigJob::uploadSize() const
-{
-    return d->uploadSize;
-}
+Omittable<qint64> GetConfigJob::uploadSize() const { return d->uploadSize; }
 
 BaseJob::Status GetConfigJob::parseJson(const QJsonDocument& data)
 {
@@ -315,4 +315,3 @@ BaseJob::Status GetConfigJob::parseJson(const QJsonDocument& data)
     fromJson(json.value("m.upload.size"_ls), d->uploadSize);
     return Success;
 }
-
diff --git a/lib/csapi/content-repo.h b/lib/csapi/content-repo.h
index 5ef2e0d6..1bef6380 100644
--- a/lib/csapi/content-repo.h
+++ b/lib/csapi/content-repo.h
@@ -9,252 +9,271 @@
 #include "converters.h"
 #include <QtCore/QIODevice>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Upload some content to the content repository.
     class UploadContentJob : public BaseJob
     {
         public:
-            /*! Upload some content to the content repository.
-             * \param content
-             * \param filename
-             *   The name of the file being uploaded
-             * \param contentType
-             *   The content type of the file being uploaded
-             */
-            explicit UploadContentJob(QIODevice* content, const QString& filename = {}, const QString& contentType = {});
-            ~UploadContentJob() override;
-
-            // Result properties
-
-            /// The MXC URI to the uploaded content.
-            const QString& contentUri() const;
+        /*! Upload some content to the content repository.
+         * \param content
+         * \param filename
+         *   The name of the file being uploaded
+         * \param contentType
+         *   The content type of the file being uploaded
+         */
+        explicit UploadContentJob(QIODevice* content,
+                                  const QString& filename = {},
+                                  const QString& contentType = {});
+        ~UploadContentJob() override;
+
+        // Result properties
+
+        /// The MXC URI to the uploaded content.
+        const QString& contentUri() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Download content from the content repository.
     class GetContentJob : public BaseJob
     {
         public:
-            /*! Download content from the content repository.
-             * \param serverName
-             *   The server name from the ``mxc://`` URI (the authoritory component)
-             * \param mediaId
-             *   The media ID from the ``mxc://`` URI (the path component)
-             * \param allowRemote
-             *   Indicates to the server that it should not attempt to fetch the media if it is deemed
-             *   remote. This is to prevent routing loops where the server contacts itself. Defaults to 
-             *   true if not provided.
-             */
-            explicit GetContentJob(const QString& serverName, const QString& mediaId, bool allowRemote = true);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetContentJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, bool allowRemote = true);
-
-            ~GetContentJob() override;
-
-            // Result properties
-
-            /// The content type of the file that was previously uploaded.
-            const QString& contentType() const;
-            /// The name of the file that was previously uploaded, if set.
-            const QString& contentDisposition() const;
-            /// The content that was previously uploaded.
-            QIODevice* data() const;
+        /*! Download content from the content repository.
+         * \param serverName
+         *   The server name from the ``mxc://`` URI (the authoritory component)
+         * \param mediaId
+         *   The media ID from the ``mxc://`` URI (the path component)
+         * \param allowRemote
+         *   Indicates to the server that it should not attempt to fetch the
+         * media if it is deemed remote. This is to prevent routing loops where
+         * the server contacts itself. Defaults to true if not provided.
+         */
+        explicit GetContentJob(const QString& serverName,
+                               const QString& mediaId, bool allowRemote = true);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetContentJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& serverName,
+                                   const QString& mediaId,
+                                   bool allowRemote = true);
+
+        ~GetContentJob() override;
+
+        // Result properties
+
+        /// The content type of the file that was previously uploaded.
+        const QString& contentType() const;
+        /// The name of the file that was previously uploaded, if set.
+        const QString& contentDisposition() const;
+        /// The content that was previously uploaded.
+        QIODevice* data() const;
 
         protected:
-            Status parseReply(QNetworkReply* reply) override;
+        Status parseReply(QNetworkReply* reply) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Download content from the content repository as a given filename.
     class GetContentOverrideNameJob : public BaseJob
     {
         public:
-            /*! Download content from the content repository as a given filename.
-             * \param serverName
-             *   The server name from the ``mxc://`` URI (the authoritory component)
-             * \param mediaId
-             *   The media ID from the ``mxc://`` URI (the path component)
-             * \param fileName
-             *   The filename to give in the Content-Disposition
-             * \param allowRemote
-             *   Indicates to the server that it should not attempt to fetch the media if it is deemed
-             *   remote. This is to prevent routing loops where the server contacts itself. Defaults to 
-             *   true if not provided.
-             */
-            explicit GetContentOverrideNameJob(const QString& serverName, const QString& mediaId, const QString& fileName, bool allowRemote = true);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetContentOverrideNameJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, const QString& fileName, bool allowRemote = true);
-
-            ~GetContentOverrideNameJob() override;
-
-            // Result properties
-
-            /// The content type of the file that was previously uploaded.
-            const QString& contentType() const;
-            /// The name of file given in the request
-            const QString& contentDisposition() const;
-            /// The content that was previously uploaded.
-            QIODevice* data() const;
+        /*! Download content from the content repository as a given filename.
+         * \param serverName
+         *   The server name from the ``mxc://`` URI (the authoritory component)
+         * \param mediaId
+         *   The media ID from the ``mxc://`` URI (the path component)
+         * \param fileName
+         *   The filename to give in the Content-Disposition
+         * \param allowRemote
+         *   Indicates to the server that it should not attempt to fetch the
+         * media if it is deemed remote. This is to prevent routing loops where
+         * the server contacts itself. Defaults to true if not provided.
+         */
+        explicit GetContentOverrideNameJob(const QString& serverName,
+                                           const QString& mediaId,
+                                           const QString& fileName,
+                                           bool allowRemote = true);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetContentOverrideNameJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& serverName,
+                                   const QString& mediaId,
+                                   const QString& fileName,
+                                   bool allowRemote = true);
+
+        ~GetContentOverrideNameJob() override;
+
+        // Result properties
+
+        /// The content type of the file that was previously uploaded.
+        const QString& contentType() const;
+        /// The name of file given in the request
+        const QString& contentDisposition() const;
+        /// The content that was previously uploaded.
+        QIODevice* data() const;
 
         protected:
-            Status parseReply(QNetworkReply* reply) override;
+        Status parseReply(QNetworkReply* reply) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Download a thumbnail of the content from the content repository.
     class GetContentThumbnailJob : public BaseJob
     {
         public:
-            /*! Download a thumbnail of the content from the content repository.
-             * \param serverName
-             *   The server name from the ``mxc://`` URI (the authoritory component)
-             * \param mediaId
-             *   The media ID from the ``mxc://`` URI (the path component)
-             * \param width
-             *   The *desired* width of the thumbnail. The actual thumbnail may not
-             *   match the size specified.
-             * \param height
-             *   The *desired* height of the thumbnail. The actual thumbnail may not
-             *   match the size specified.
-             * \param method
-             *   The desired resizing method.
-             * \param allowRemote
-             *   Indicates to the server that it should not attempt to fetch the media if it is deemed
-             *   remote. This is to prevent routing loops where the server contacts itself. Defaults to 
-             *   true if not provided.
-             */
-            explicit GetContentThumbnailJob(const QString& serverName, const QString& mediaId, int width, int height, const QString& method = {}, bool allowRemote = true);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetContentThumbnailJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, int width, int height, const QString& method = {}, bool allowRemote = true);
-
-            ~GetContentThumbnailJob() override;
-
-            // Result properties
-
-            /// The content type of the thumbnail.
-            const QString& contentType() const;
-            /// A thumbnail of the requested content.
-            QIODevice* data() const;
+        /*! Download a thumbnail of the content from the content repository.
+         * \param serverName
+         *   The server name from the ``mxc://`` URI (the authoritory component)
+         * \param mediaId
+         *   The media ID from the ``mxc://`` URI (the path component)
+         * \param width
+         *   The *desired* width of the thumbnail. The actual thumbnail may not
+         *   match the size specified.
+         * \param height
+         *   The *desired* height of the thumbnail. The actual thumbnail may not
+         *   match the size specified.
+         * \param method
+         *   The desired resizing method.
+         * \param allowRemote
+         *   Indicates to the server that it should not attempt to fetch the
+         * media if it is deemed remote. This is to prevent routing loops where
+         * the server contacts itself. Defaults to true if not provided.
+         */
+        explicit GetContentThumbnailJob(const QString& serverName,
+                                        const QString& mediaId, int width,
+                                        int height, const QString& method = {},
+                                        bool allowRemote = true);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetContentThumbnailJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& serverName,
+                                   const QString& mediaId, int width,
+                                   int height, const QString& method = {},
+                                   bool allowRemote = true);
+
+        ~GetContentThumbnailJob() override;
+
+        // Result properties
+
+        /// The content type of the thumbnail.
+        const QString& contentType() const;
+        /// A thumbnail of the requested content.
+        QIODevice* data() const;
 
         protected:
-            Status parseReply(QNetworkReply* reply) override;
+        Status parseReply(QNetworkReply* reply) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Get information about a URL for a client
     class GetUrlPreviewJob : public BaseJob
     {
         public:
-            /*! Get information about a URL for a client
-             * \param url
-             *   The URL to get a preview of
-             * \param ts
-             *   The preferred point in time to return a preview for. The server may
-             *   return a newer version if it does not have the requested version
-             *   available.
-             */
-            explicit GetUrlPreviewJob(const QString& url, Omittable<qint64> ts = none);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetUrlPreviewJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& url, Omittable<qint64> ts = none);
-
-            ~GetUrlPreviewJob() override;
-
-            // Result properties
-
-            /// The byte-size of the image. Omitted if there is no image attached.
-            Omittable<qint64> matrixImageSize() const;
-            /// An MXC URI to the image. Omitted if there is no image.
-            const QString& ogImage() const;
+        /*! Get information about a URL for a client
+         * \param url
+         *   The URL to get a preview of
+         * \param ts
+         *   The preferred point in time to return a preview for. The server may
+         *   return a newer version if it does not have the requested version
+         *   available.
+         */
+        explicit GetUrlPreviewJob(const QString& url,
+                                  Omittable<qint64> ts = none);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetUrlPreviewJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& url,
+                                   Omittable<qint64> ts = none);
+
+        ~GetUrlPreviewJob() override;
+
+        // Result properties
+
+        /// The byte-size of the image. Omitted if there is no image attached.
+        Omittable<qint64> matrixImageSize() const;
+        /// An MXC URI to the image. Omitted if there is no image.
+        const QString& ogImage() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Get the configuration for the content repository.
     ///
-    /// This endpoint allows clients to retrieve the configuration of the content
-    /// repository, such as upload limitations.
-    /// Clients SHOULD use this as a guide when using content repository endpoints.
-    /// All values are intentionally left optional. Clients SHOULD follow
-    /// the advice given in the field description when the field is not available.
-    /// 
-    /// **NOTE:** Both clients and server administrators should be aware that proxies
-    /// between the client and the server may affect the apparent behaviour of content
-    /// repository APIs, for example, proxies may enforce a lower upload size limit
-    /// than is advertised by the server on this endpoint.
+    /// This endpoint allows clients to retrieve the configuration of the
+    /// content repository, such as upload limitations. Clients SHOULD use this
+    /// as a guide when using content repository endpoints. All values are
+    /// intentionally left optional. Clients SHOULD follow the advice given in
+    /// the field description when the field is not available.
+    ///
+    /// **NOTE:** Both clients and server administrators should be aware that
+    /// proxies between the client and the server may affect the apparent
+    /// behaviour of content repository APIs, for example, proxies may enforce a
+    /// lower upload size limit than is advertised by the server on this
+    /// endpoint.
     class GetConfigJob : public BaseJob
     {
         public:
-            explicit GetConfigJob();
+        explicit GetConfigJob();
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetConfigJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetConfigJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl);
 
-            ~GetConfigJob() override;
+        ~GetConfigJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The maximum size an upload can be in bytes.
-            /// Clients SHOULD use this as a guide when uploading content.
-            /// If not listed or null, the size limit should be treated as unknown.
-            Omittable<qint64> uploadSize() const;
+        /// The maximum size an upload can be in bytes.
+        /// Clients SHOULD use this as a guide when uploading content.
+        /// If not listed or null, the size limit should be treated as unknown.
+        Omittable<qint64> uploadSize() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/create_room.cpp b/lib/csapi/create_room.cpp
index 448547ae..47a13d8e 100644
--- a/lib/csapi/create_room.cpp
+++ b/lib/csapi/create_room.cpp
@@ -12,13 +12,12 @@ using namespace QMatrixClient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<CreateRoomJob::Invite3pid>
-    {
-        static void dumpTo(QJsonObject& jo, const CreateRoomJob::Invite3pid& pod)
+    template <> struct JsonObjectConverter<CreateRoomJob::Invite3pid> {
+        static void dumpTo(QJsonObject& jo,
+                           const CreateRoomJob::Invite3pid& pod)
         {
             addParam<>(jo, QStringLiteral("id_server"), pod.idServer);
             addParam<>(jo, QStringLiteral("medium"), pod.medium);
@@ -26,9 +25,9 @@ namespace QMatrixClient
         }
     };
 
-    template <> struct JsonObjectConverter<CreateRoomJob::StateEvent>
-    {
-        static void dumpTo(QJsonObject& jo, const CreateRoomJob::StateEvent& pod)
+    template <> struct JsonObjectConverter<CreateRoomJob::StateEvent> {
+        static void dumpTo(QJsonObject& jo,
+                           const CreateRoomJob::StateEvent& pod)
         {
             addParam<>(jo, QStringLiteral("type"), pod.type);
             addParam<IfNotEmpty>(jo, QStringLiteral("state_key"), pod.stateKey);
@@ -40,46 +39,52 @@ namespace QMatrixClient
 class CreateRoomJob::Private
 {
     public:
-        QString roomId;
+    QString roomId;
 };
 
 static const auto CreateRoomJobName = QStringLiteral("CreateRoomJob");
 
-CreateRoomJob::CreateRoomJob(const QString& visibility, const QString& roomAliasName, const QString& name, const QString& topic, const QStringList& invite, const QVector<Invite3pid>& invite3pid, const QString& roomVersion, const QJsonObject& creationContent, const QVector<StateEvent>& initialState, const QString& preset, Omittable<bool> isDirect, const QJsonObject& powerLevelContentOverride)
-    : BaseJob(HttpVerb::Post, CreateRoomJobName,
-        basePath % "/createRoom")
-    , d(new Private)
+CreateRoomJob::CreateRoomJob(const QString& visibility,
+                             const QString& roomAliasName, const QString& name,
+                             const QString& topic, const QStringList& invite,
+                             const QVector<Invite3pid>& invite3pid,
+                             const QString& roomVersion,
+                             const QJsonObject& creationContent,
+                             const QVector<StateEvent>& initialState,
+                             const QString& preset, Omittable<bool> isDirect,
+                             const QJsonObject& powerLevelContentOverride)
+    : BaseJob(HttpVerb::Post, CreateRoomJobName, basePath % "/createRoom"),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("visibility"), visibility);
-    addParam<IfNotEmpty>(_data, QStringLiteral("room_alias_name"), roomAliasName);
+    addParam<IfNotEmpty>(_data, QStringLiteral("room_alias_name"),
+                         roomAliasName);
     addParam<IfNotEmpty>(_data, QStringLiteral("name"), name);
     addParam<IfNotEmpty>(_data, QStringLiteral("topic"), topic);
     addParam<IfNotEmpty>(_data, QStringLiteral("invite"), invite);
     addParam<IfNotEmpty>(_data, QStringLiteral("invite_3pid"), invite3pid);
     addParam<IfNotEmpty>(_data, QStringLiteral("room_version"), roomVersion);
-    addParam<IfNotEmpty>(_data, QStringLiteral("creation_content"), creationContent);
+    addParam<IfNotEmpty>(_data, QStringLiteral("creation_content"),
+                         creationContent);
     addParam<IfNotEmpty>(_data, QStringLiteral("initial_state"), initialState);
     addParam<IfNotEmpty>(_data, QStringLiteral("preset"), preset);
     addParam<IfNotEmpty>(_data, QStringLiteral("is_direct"), isDirect);
-    addParam<IfNotEmpty>(_data, QStringLiteral("power_level_content_override"), powerLevelContentOverride);
+    addParam<IfNotEmpty>(_data, QStringLiteral("power_level_content_override"),
+                         powerLevelContentOverride);
     setRequestData(_data);
 }
 
 CreateRoomJob::~CreateRoomJob() = default;
 
-const QString& CreateRoomJob::roomId() const
-{
-    return d->roomId;
-}
+const QString& CreateRoomJob::roomId() const { return d->roomId; }
 
 BaseJob::Status CreateRoomJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("room_id"_ls))
         return { JsonParseError,
-            "The key 'room_id' not found in the response" };
+                 "The key 'room_id' not found in the response" };
     fromJson(json.value("room_id"_ls), d->roomId);
     return Success;
 }
-
diff --git a/lib/csapi/create_room.h b/lib/csapi/create_room.h
index d7c01d00..4348bd63 100644
--- a/lib/csapi/create_room.h
+++ b/lib/csapi/create_room.h
@@ -6,229 +6,267 @@
 
 #include "jobs/basejob.h"
 
-#include <QtCore/QJsonObject>
 #include "converters.h"
+#include <QtCore/QJsonObject>
 #include <QtCore/QVector>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Create a new room
     ///
     /// Create a new room with various configuration options.
-    /// 
+    ///
     /// The server MUST apply the normal state resolution rules when creating
     /// the new room, including checking power levels for each event. It MUST
     /// apply the events implied by the request in the following order:
-    /// 
+    ///
     /// 0. A default ``m.room.power_levels`` event, giving the room creator
     ///    (and not other members) permission to send state events. Overridden
     ///    by the ``power_level_content_override`` parameter.
-    /// 
-    /// 1. Events set by the ``preset``. Currently these are the ``m.room.join_rules``,
-    ///    ``m.room.history_visibility``, and ``m.room.guest_access`` state events.
-    /// 
+    ///
+    /// 1. Events set by the ``preset``. Currently these are the
+    /// ``m.room.join_rules``,
+    ///    ``m.room.history_visibility``, and ``m.room.guest_access`` state
+    ///    events.
+    ///
     /// 2. Events listed in ``initial_state``, in the order that they are
     ///    listed.
-    /// 
-    /// 3. Events implied by ``name`` and ``topic`` (``m.room.name`` and ``m.room.topic``
+    ///
+    /// 3. Events implied by ``name`` and ``topic`` (``m.room.name`` and
+    /// ``m.room.topic``
     ///    state events).
-    /// 
-    /// 4. Invite events implied by ``invite`` and ``invite_3pid`` (``m.room.member`` with
+    ///
+    /// 4. Invite events implied by ``invite`` and ``invite_3pid``
+    /// (``m.room.member`` with
     ///    ``membership: invite`` and ``m.room.third_party_invite``).
-    /// 
+    ///
     /// The available presets do the following with respect to room state:
-    /// 
-    /// ========================  ==============  ======================  ================  =========
-    ///          Preset           ``join_rules``  ``history_visibility``  ``guest_access``  Other
-    /// ========================  ==============  ======================  ================  =========
-    /// ``private_chat``          ``invite``      ``shared``              ``can_join``
-    /// ``trusted_private_chat``  ``invite``      ``shared``              ``can_join``      All invitees are given the same power level as the room creator.
-    /// ``public_chat``           ``public``      ``shared``              ``forbidden``
-    /// ========================  ==============  ======================  ================  =========
-    /// 
+    ///
+    /// ========================  ==============  ======================
+    /// ================  =========
+    ///          Preset           ``join_rules``  ``history_visibility``
+    ///          ``guest_access``  Other
+    /// ========================  ==============  ======================
+    /// ================  =========
+    /// ``private_chat``          ``invite``      ``shared`` ``can_join``
+    /// ``trusted_private_chat``  ``invite``      ``shared`` ``can_join`` All
+    /// invitees are given the same power level as the room creator.
+    /// ``public_chat``           ``public``      ``shared`` ``forbidden``
+    /// ========================  ==============  ======================
+    /// ================  =========
+    ///
     /// The server will create a ``m.room.create`` event in the room with the
     /// requesting user as the creator, alongside other keys provided in the
     /// ``creation_content``.
     class CreateRoomJob : public BaseJob
     {
         public:
-            // Inner data structures
+        // Inner data structures
 
-            /// Create a new room with various configuration options.
-            /// 
-            /// The server MUST apply the normal state resolution rules when creating
-            /// the new room, including checking power levels for each event. It MUST
-            /// apply the events implied by the request in the following order:
-            /// 
-            /// 0. A default ``m.room.power_levels`` event, giving the room creator
-            ///    (and not other members) permission to send state events. Overridden
-            ///    by the ``power_level_content_override`` parameter.
-            /// 
-            /// 1. Events set by the ``preset``. Currently these are the ``m.room.join_rules``,
-            ///    ``m.room.history_visibility``, and ``m.room.guest_access`` state events.
-            /// 
-            /// 2. Events listed in ``initial_state``, in the order that they are
-            ///    listed.
-            /// 
-            /// 3. Events implied by ``name`` and ``topic`` (``m.room.name`` and ``m.room.topic``
-            ///    state events).
-            /// 
-            /// 4. Invite events implied by ``invite`` and ``invite_3pid`` (``m.room.member`` with
-            ///    ``membership: invite`` and ``m.room.third_party_invite``).
-            /// 
-            /// The available presets do the following with respect to room state:
-            /// 
-            /// ========================  ==============  ======================  ================  =========
-            ///          Preset           ``join_rules``  ``history_visibility``  ``guest_access``  Other
-            /// ========================  ==============  ======================  ================  =========
-            /// ``private_chat``          ``invite``      ``shared``              ``can_join``
-            /// ``trusted_private_chat``  ``invite``      ``shared``              ``can_join``      All invitees are given the same power level as the room creator.
-            /// ``public_chat``           ``public``      ``shared``              ``forbidden``
-            /// ========================  ==============  ======================  ================  =========
-            /// 
-            /// The server will create a ``m.room.create`` event in the room with the
-            /// requesting user as the creator, alongside other keys provided in the
-            /// ``creation_content``.
-            struct Invite3pid
-            {
-                /// The hostname+port of the identity server which should be used for third party identifier lookups.
-                QString idServer;
-                /// The kind of address being passed in the address field, for example ``email``.
-                QString medium;
-                /// The invitee's third party identifier.
-                QString address;
-            };
+        /// Create a new room with various configuration options.
+        ///
+        /// The server MUST apply the normal state resolution rules when
+        /// creating the new room, including checking power levels for each
+        /// event. It MUST apply the events implied by the request in the
+        /// following order:
+        ///
+        /// 0. A default ``m.room.power_levels`` event, giving the room creator
+        ///    (and not other members) permission to send state events.
+        ///    Overridden by the ``power_level_content_override`` parameter.
+        ///
+        /// 1. Events set by the ``preset``. Currently these are the
+        /// ``m.room.join_rules``,
+        ///    ``m.room.history_visibility``, and ``m.room.guest_access`` state
+        ///    events.
+        ///
+        /// 2. Events listed in ``initial_state``, in the order that they are
+        ///    listed.
+        ///
+        /// 3. Events implied by ``name`` and ``topic`` (``m.room.name`` and
+        /// ``m.room.topic``
+        ///    state events).
+        ///
+        /// 4. Invite events implied by ``invite`` and ``invite_3pid``
+        /// (``m.room.member`` with
+        ///    ``membership: invite`` and ``m.room.third_party_invite``).
+        ///
+        /// The available presets do the following with respect to room state:
+        ///
+        /// ========================  ==============  ======================
+        /// ================  =========
+        ///          Preset           ``join_rules``  ``history_visibility``
+        ///          ``guest_access``  Other
+        /// ========================  ==============  ======================
+        /// ================  =========
+        /// ``private_chat``          ``invite``      ``shared`` ``can_join``
+        /// ``trusted_private_chat``  ``invite``      ``shared`` ``can_join``
+        /// All invitees are given the same power level as the room creator.
+        /// ``public_chat``           ``public``      ``shared`` ``forbidden``
+        /// ========================  ==============  ======================
+        /// ================  =========
+        ///
+        /// The server will create a ``m.room.create`` event in the room with
+        /// the requesting user as the creator, alongside other keys provided in
+        /// the
+        /// ``creation_content``.
+        struct Invite3pid {
+            /// The hostname+port of the identity server which should be used
+            /// for third party identifier lookups.
+            QString idServer;
+            /// The kind of address being passed in the address field, for
+            /// example ``email``.
+            QString medium;
+            /// The invitee's third party identifier.
+            QString address;
+        };
 
-            /// Create a new room with various configuration options.
-            /// 
-            /// The server MUST apply the normal state resolution rules when creating
-            /// the new room, including checking power levels for each event. It MUST
-            /// apply the events implied by the request in the following order:
-            /// 
-            /// 0. A default ``m.room.power_levels`` event, giving the room creator
-            ///    (and not other members) permission to send state events. Overridden
-            ///    by the ``power_level_content_override`` parameter.
-            /// 
-            /// 1. Events set by the ``preset``. Currently these are the ``m.room.join_rules``,
-            ///    ``m.room.history_visibility``, and ``m.room.guest_access`` state events.
-            /// 
-            /// 2. Events listed in ``initial_state``, in the order that they are
-            ///    listed.
-            /// 
-            /// 3. Events implied by ``name`` and ``topic`` (``m.room.name`` and ``m.room.topic``
-            ///    state events).
-            /// 
-            /// 4. Invite events implied by ``invite`` and ``invite_3pid`` (``m.room.member`` with
-            ///    ``membership: invite`` and ``m.room.third_party_invite``).
-            /// 
-            /// The available presets do the following with respect to room state:
-            /// 
-            /// ========================  ==============  ======================  ================  =========
-            ///          Preset           ``join_rules``  ``history_visibility``  ``guest_access``  Other
-            /// ========================  ==============  ======================  ================  =========
-            /// ``private_chat``          ``invite``      ``shared``              ``can_join``
-            /// ``trusted_private_chat``  ``invite``      ``shared``              ``can_join``      All invitees are given the same power level as the room creator.
-            /// ``public_chat``           ``public``      ``shared``              ``forbidden``
-            /// ========================  ==============  ======================  ================  =========
-            /// 
-            /// The server will create a ``m.room.create`` event in the room with the
-            /// requesting user as the creator, alongside other keys provided in the
-            /// ``creation_content``.
-            struct StateEvent
-            {
-                /// The type of event to send.
-                QString type;
-                /// The state_key of the state event. Defaults to an empty string.
-                QString stateKey;
-                /// The content of the event.
-                QJsonObject content;
-            };
+        /// Create a new room with various configuration options.
+        ///
+        /// The server MUST apply the normal state resolution rules when
+        /// creating the new room, including checking power levels for each
+        /// event. It MUST apply the events implied by the request in the
+        /// following order:
+        ///
+        /// 0. A default ``m.room.power_levels`` event, giving the room creator
+        ///    (and not other members) permission to send state events.
+        ///    Overridden by the ``power_level_content_override`` parameter.
+        ///
+        /// 1. Events set by the ``preset``. Currently these are the
+        /// ``m.room.join_rules``,
+        ///    ``m.room.history_visibility``, and ``m.room.guest_access`` state
+        ///    events.
+        ///
+        /// 2. Events listed in ``initial_state``, in the order that they are
+        ///    listed.
+        ///
+        /// 3. Events implied by ``name`` and ``topic`` (``m.room.name`` and
+        /// ``m.room.topic``
+        ///    state events).
+        ///
+        /// 4. Invite events implied by ``invite`` and ``invite_3pid``
+        /// (``m.room.member`` with
+        ///    ``membership: invite`` and ``m.room.third_party_invite``).
+        ///
+        /// The available presets do the following with respect to room state:
+        ///
+        /// ========================  ==============  ======================
+        /// ================  =========
+        ///          Preset           ``join_rules``  ``history_visibility``
+        ///          ``guest_access``  Other
+        /// ========================  ==============  ======================
+        /// ================  =========
+        /// ``private_chat``          ``invite``      ``shared`` ``can_join``
+        /// ``trusted_private_chat``  ``invite``      ``shared`` ``can_join``
+        /// All invitees are given the same power level as the room creator.
+        /// ``public_chat``           ``public``      ``shared`` ``forbidden``
+        /// ========================  ==============  ======================
+        /// ================  =========
+        ///
+        /// The server will create a ``m.room.create`` event in the room with
+        /// the requesting user as the creator, alongside other keys provided in
+        /// the
+        /// ``creation_content``.
+        struct StateEvent {
+            /// The type of event to send.
+            QString type;
+            /// The state_key of the state event. Defaults to an empty string.
+            QString stateKey;
+            /// The content of the event.
+            QJsonObject content;
+        };
 
-            // Construction/destruction
+        // Construction/destruction
 
-            /*! Create a new room
-             * \param visibility
-             *   A ``public`` visibility indicates that the room will be shown
-             *   in the published room list. A ``private`` visibility will hide
-             *   the room from the published room list. Rooms default to
-             *   ``private`` visibility if this key is not included. NB: This
-             *   should not be confused with ``join_rules`` which also uses the
-             *   word ``public``.
-             * \param roomAliasName
-             *   The desired room alias **local part**. If this is included, a
-             *   room alias will be created and mapped to the newly created
-             *   room. The alias will belong on the *same* homeserver which
-             *   created the room. For example, if this was set to "foo" and
-             *   sent to the homeserver "example.com" the complete room alias
-             *   would be ``#foo:example.com``.
-             *   
-             *   The complete room alias will become the canonical alias for
-             *   the room.
-             * \param name
-             *   If this is included, an ``m.room.name`` event will be sent
-             *   into the room to indicate the name of the room. See Room
-             *   Events for more information on ``m.room.name``.
-             * \param topic
-             *   If this is included, an ``m.room.topic`` event will be sent
-             *   into the room to indicate the topic for the room. See Room
-             *   Events for more information on ``m.room.topic``.
-             * \param invite
-             *   A list of user IDs to invite to the room. This will tell the
-             *   server to invite everyone in the list to the newly created room.
-             * \param invite3pid
-             *   A list of objects representing third party IDs to invite into
-             *   the room.
-             * \param roomVersion
-             *   The room version to set for the room. If not provided, the homeserver is
-             *   to use its configured default. If provided, the homeserver will return a
-             *   400 error with the errcode ``M_UNSUPPORTED_ROOM_VERSION`` if it does not
-             *   support the room version.
-             * \param creationContent
-             *   Extra keys, such as ``m.federate``, to be added to the content
-             *   of the `m.room.create`_ event. The server will clobber the following
-             *   keys: ``creator``, ``room_version``. Future versions of the specification
-             *   may allow the server to clobber other keys.
-             * \param initialState
-             *   A list of state events to set in the new room. This allows
-             *   the user to override the default state events set in the new
-             *   room. The expected format of the state events are an object
-             *   with type, state_key and content keys set.
-             *   
-             *   Takes precedence over events set by ``preset``, but gets
-             *   overriden by ``name`` and ``topic`` keys.
-             * \param preset
-             *   Convenience parameter for setting various default state events
-             *   based on a preset.
-             *   
-             *   If unspecified, the server should use the ``visibility`` to determine
-             *   which preset to use. A visbility of ``public`` equates to a preset of
-             *   ``public_chat`` and ``private`` visibility equates to a preset of
-             *   ``private_chat``.
-             * \param isDirect
-             *   This flag makes the server set the ``is_direct`` flag on the
-             *   ``m.room.member`` events sent to the users in ``invite`` and
-             *   ``invite_3pid``. See `Direct Messaging`_ for more information.
-             * \param powerLevelContentOverride
-             *   The power level content to override in the default power level
-             *   event. This object is applied on top of the generated `m.room.power_levels`_
-             *   event content prior to it being sent to the room. Defaults to
-             *   overriding nothing.
-             */
-            explicit CreateRoomJob(const QString& visibility = {}, const QString& roomAliasName = {}, const QString& name = {}, const QString& topic = {}, const QStringList& invite = {}, const QVector<Invite3pid>& invite3pid = {}, const QString& roomVersion = {}, const QJsonObject& creationContent = {}, const QVector<StateEvent>& initialState = {}, const QString& preset = {}, Omittable<bool> isDirect = none, const QJsonObject& powerLevelContentOverride = {});
-            ~CreateRoomJob() override;
+        /*! Create a new room
+         * \param visibility
+         *   A ``public`` visibility indicates that the room will be shown
+         *   in the published room list. A ``private`` visibility will hide
+         *   the room from the published room list. Rooms default to
+         *   ``private`` visibility if this key is not included. NB: This
+         *   should not be confused with ``join_rules`` which also uses the
+         *   word ``public``.
+         * \param roomAliasName
+         *   The desired room alias **local part**. If this is included, a
+         *   room alias will be created and mapped to the newly created
+         *   room. The alias will belong on the *same* homeserver which
+         *   created the room. For example, if this was set to "foo" and
+         *   sent to the homeserver "example.com" the complete room alias
+         *   would be ``#foo:example.com``.
+         *
+         *   The complete room alias will become the canonical alias for
+         *   the room.
+         * \param name
+         *   If this is included, an ``m.room.name`` event will be sent
+         *   into the room to indicate the name of the room. See Room
+         *   Events for more information on ``m.room.name``.
+         * \param topic
+         *   If this is included, an ``m.room.topic`` event will be sent
+         *   into the room to indicate the topic for the room. See Room
+         *   Events for more information on ``m.room.topic``.
+         * \param invite
+         *   A list of user IDs to invite to the room. This will tell the
+         *   server to invite everyone in the list to the newly created room.
+         * \param invite3pid
+         *   A list of objects representing third party IDs to invite into
+         *   the room.
+         * \param roomVersion
+         *   The room version to set for the room. If not provided, the
+         * homeserver is to use its configured default. If provided, the
+         * homeserver will return a 400 error with the errcode
+         * ``M_UNSUPPORTED_ROOM_VERSION`` if it does not support the room
+         * version. \param creationContent Extra keys, such as ``m.federate``,
+         * to be added to the content of the `m.room.create`_ event. The server
+         * will clobber the following keys: ``creator``, ``room_version``.
+         * Future versions of the specification may allow the server to clobber
+         * other keys. \param initialState A list of state events to set in the
+         * new room. This allows the user to override the default state events
+         * set in the new room. The expected format of the state events are an
+         * object with type, state_key and content keys set.
+         *
+         *   Takes precedence over events set by ``preset``, but gets
+         *   overriden by ``name`` and ``topic`` keys.
+         * \param preset
+         *   Convenience parameter for setting various default state events
+         *   based on a preset.
+         *
+         *   If unspecified, the server should use the ``visibility`` to
+         * determine which preset to use. A visbility of ``public`` equates to a
+         * preset of
+         *   ``public_chat`` and ``private`` visibility equates to a preset of
+         *   ``private_chat``.
+         * \param isDirect
+         *   This flag makes the server set the ``is_direct`` flag on the
+         *   ``m.room.member`` events sent to the users in ``invite`` and
+         *   ``invite_3pid``. See `Direct Messaging`_ for more information.
+         * \param powerLevelContentOverride
+         *   The power level content to override in the default power level
+         *   event. This object is applied on top of the generated
+         * `m.room.power_levels`_ event content prior to it being sent to the
+         * room. Defaults to overriding nothing.
+         */
+        explicit CreateRoomJob(
+                const QString& visibility = {},
+                const QString& roomAliasName = {}, const QString& name = {},
+                const QString& topic = {}, const QStringList& invite = {},
+                const QVector<Invite3pid>& invite3pid = {},
+                const QString& roomVersion = {},
+                const QJsonObject& creationContent = {},
+                const QVector<StateEvent>& initialState = {},
+                const QString& preset = {}, Omittable<bool> isDirect = none,
+                const QJsonObject& powerLevelContentOverride = {});
+        ~CreateRoomJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The created room's ID.
-            const QString& roomId() const;
+        /// The created room's ID.
+        const QString& roomId() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/definitions/auth_data.cpp b/lib/csapi/definitions/auth_data.cpp
index 006b8c7e..f40a3a90 100644
--- a/lib/csapi/definitions/auth_data.cpp
+++ b/lib/csapi/definitions/auth_data.cpp
@@ -15,11 +15,10 @@ void JsonObjectConverter<AuthenticationData>::dumpTo(
 }
 
 void JsonObjectConverter<AuthenticationData>::fillFrom(
-    QJsonObject jo, AuthenticationData& result)
+        QJsonObject jo, AuthenticationData& result)
 {
     fromJson(jo.take("type"_ls), result.type);
     fromJson(jo.take("session"_ls), result.session);
 
     fromJson(jo, result.authInfo);
 }
-
diff --git a/lib/csapi/definitions/auth_data.h b/lib/csapi/definitions/auth_data.h
index 26eb205c..e25dff7a 100644
--- a/lib/csapi/definitions/auth_data.h
+++ b/lib/csapi/definitions/auth_data.h
@@ -6,16 +6,15 @@
 
 #include "converters.h"
 
-#include <QtCore/QJsonObject>
 #include <QtCore/QHash>
+#include <QtCore/QJsonObject>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
-    /// Used by clients to submit authentication information to the interactive-authentication API
-    struct AuthenticationData
-    {
+    /// Used by clients to submit authentication information to the
+    /// interactive-authentication API
+    struct AuthenticationData {
         /// The login type that the client is attempting to complete.
         QString type;
         /// The value of the session key given by the homeserver.
@@ -23,8 +22,7 @@ namespace QMatrixClient
         /// Keys dependent on the login type
         QHash<QString, QJsonObject> authInfo;
     };
-    template <> struct JsonObjectConverter<AuthenticationData>
-    {
+    template <> struct JsonObjectConverter<AuthenticationData> {
         static void dumpTo(QJsonObject& jo, const AuthenticationData& pod);
         static void fillFrom(QJsonObject jo, AuthenticationData& pod);
     };
diff --git a/lib/csapi/definitions/client_device.cpp b/lib/csapi/definitions/client_device.cpp
index 752b806a..2ca58e2f 100644
--- a/lib/csapi/definitions/client_device.cpp
+++ b/lib/csapi/definitions/client_device.cpp
@@ -6,8 +6,7 @@
 
 using namespace QMatrixClient;
 
-void JsonObjectConverter<Device>::dumpTo(
-        QJsonObject& jo, const Device& pod)
+void JsonObjectConverter<Device>::dumpTo(QJsonObject& jo, const Device& pod)
 {
     addParam<>(jo, QStringLiteral("device_id"), pod.deviceId);
     addParam<IfNotEmpty>(jo, QStringLiteral("display_name"), pod.displayName);
@@ -15,12 +14,11 @@ void JsonObjectConverter<Device>::dumpTo(
     addParam<IfNotEmpty>(jo, QStringLiteral("last_seen_ts"), pod.lastSeenTs);
 }
 
-void JsonObjectConverter<Device>::fillFrom(
-    const QJsonObject& jo, Device& result)
+void JsonObjectConverter<Device>::fillFrom(const QJsonObject& jo,
+                                           Device& result)
 {
     fromJson(jo.value("device_id"_ls), result.deviceId);
     fromJson(jo.value("display_name"_ls), result.displayName);
     fromJson(jo.value("last_seen_ip"_ls), result.lastSeenIp);
     fromJson(jo.value("last_seen_ts"_ls), result.lastSeenTs);
 }
-
diff --git a/lib/csapi/definitions/client_device.h b/lib/csapi/definitions/client_device.h
index a6224f71..b473a037 100644
--- a/lib/csapi/definitions/client_device.h
+++ b/lib/csapi/definitions/client_device.h
@@ -8,28 +8,25 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
     /// A client device
-    struct Device
-    {
+    struct Device {
         /// Identifier of this device.
         QString deviceId;
-        /// Display name set by the user for this device. Absent if no name has been
-        /// set.
+        /// Display name set by the user for this device. Absent if no name has
+        /// been set.
         QString displayName;
-        /// The IP address where this device was last seen. (May be a few minutes out
-        /// of date, for efficiency reasons).
+        /// The IP address where this device was last seen. (May be a few
+        /// minutes out of date, for efficiency reasons).
         QString lastSeenIp;
-        /// The timestamp (in milliseconds since the unix epoch) when this devices
-        /// was last seen. (May be a few minutes out of date, for efficiency
-        /// reasons).
+        /// The timestamp (in milliseconds since the unix epoch) when this
+        /// devices was last seen. (May be a few minutes out of date, for
+        /// efficiency reasons).
         Omittable<qint64> lastSeenTs;
     };
-    template <> struct JsonObjectConverter<Device>
-    {
+    template <> struct JsonObjectConverter<Device> {
         static void dumpTo(QJsonObject& jo, const Device& pod);
         static void fillFrom(const QJsonObject& jo, Device& pod);
     };
diff --git a/lib/csapi/definitions/device_keys.cpp b/lib/csapi/definitions/device_keys.cpp
index 1e79499f..cc5262b7 100644
--- a/lib/csapi/definitions/device_keys.cpp
+++ b/lib/csapi/definitions/device_keys.cpp
@@ -6,8 +6,8 @@
 
 using namespace QMatrixClient;
 
-void JsonObjectConverter<DeviceKeys>::dumpTo(
-        QJsonObject& jo, const DeviceKeys& pod)
+void JsonObjectConverter<DeviceKeys>::dumpTo(QJsonObject& jo,
+                                             const DeviceKeys& pod)
 {
     addParam<>(jo, QStringLiteral("user_id"), pod.userId);
     addParam<>(jo, QStringLiteral("device_id"), pod.deviceId);
@@ -16,8 +16,8 @@ void JsonObjectConverter<DeviceKeys>::dumpTo(
     addParam<>(jo, QStringLiteral("signatures"), pod.signatures);
 }
 
-void JsonObjectConverter<DeviceKeys>::fillFrom(
-    const QJsonObject& jo, DeviceKeys& result)
+void JsonObjectConverter<DeviceKeys>::fillFrom(const QJsonObject& jo,
+                                               DeviceKeys& result)
 {
     fromJson(jo.value("user_id"_ls), result.userId);
     fromJson(jo.value("device_id"_ls), result.deviceId);
@@ -25,4 +25,3 @@ void JsonObjectConverter<DeviceKeys>::fillFrom(
     fromJson(jo.value("keys"_ls), result.keys);
     fromJson(jo.value("signatures"_ls), result.signatures);
 }
-
diff --git a/lib/csapi/definitions/device_keys.h b/lib/csapi/definitions/device_keys.h
index 8ebe1125..6c417ce7 100644
--- a/lib/csapi/definitions/device_keys.h
+++ b/lib/csapi/definitions/device_keys.h
@@ -8,18 +8,16 @@
 
 #include <QtCore/QHash>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
     /// Device identity keys
-    struct DeviceKeys
-    {
-        /// The ID of the user the device belongs to. Must match the user ID used
-        /// when logging in.
+    struct DeviceKeys {
+        /// The ID of the user the device belongs to. Must match the user ID
+        /// used when logging in.
         QString userId;
-        /// The ID of the device these keys belong to. Must match the device ID used
-        /// when logging in.
+        /// The ID of the device these keys belong to. Must match the device ID
+        /// used when logging in.
         QString deviceId;
         /// The encryption algorithms supported by this device.
         QStringList algorithms;
@@ -27,15 +25,15 @@ namespace QMatrixClient
         /// format ``<algorithm>:<device_id>``. The keys themselves should be
         /// encoded as specified by the key algorithm.
         QHash<QString, QString> keys;
-        /// Signatures for the device key object. A map from user ID, to a map from
+        /// Signatures for the device key object. A map from user ID, to a map
+        /// from
         /// ``<algorithm>:<device_id>`` to the signature.
-        /// 
+        ///
         /// The signature is calculated using the process described at `Signing
         /// JSON`_.
         QHash<QString, QHash<QString, QString>> signatures;
     };
-    template <> struct JsonObjectConverter<DeviceKeys>
-    {
+    template <> struct JsonObjectConverter<DeviceKeys> {
         static void dumpTo(QJsonObject& jo, const DeviceKeys& pod);
         static void fillFrom(const QJsonObject& jo, DeviceKeys& pod);
     };
diff --git a/lib/csapi/definitions/event_filter.cpp b/lib/csapi/definitions/event_filter.cpp
index b20d7807..9b2c7a33 100644
--- a/lib/csapi/definitions/event_filter.cpp
+++ b/lib/csapi/definitions/event_filter.cpp
@@ -6,8 +6,8 @@
 
 using namespace QMatrixClient;
 
-void JsonObjectConverter<EventFilter>::dumpTo(
-        QJsonObject& jo, const EventFilter& pod)
+void JsonObjectConverter<EventFilter>::dumpTo(QJsonObject& jo,
+                                              const EventFilter& pod)
 {
     addParam<IfNotEmpty>(jo, QStringLiteral("limit"), pod.limit);
     addParam<IfNotEmpty>(jo, QStringLiteral("not_senders"), pod.notSenders);
@@ -16,8 +16,8 @@ void JsonObjectConverter<EventFilter>::dumpTo(
     addParam<IfNotEmpty>(jo, QStringLiteral("types"), pod.types);
 }
 
-void JsonObjectConverter<EventFilter>::fillFrom(
-    const QJsonObject& jo, EventFilter& result)
+void JsonObjectConverter<EventFilter>::fillFrom(const QJsonObject& jo,
+                                                EventFilter& result)
 {
     fromJson(jo.value("limit"_ls), result.limit);
     fromJson(jo.value("not_senders"_ls), result.notSenders);
@@ -25,4 +25,3 @@ void JsonObjectConverter<EventFilter>::fillFrom(
     fromJson(jo.value("senders"_ls), result.senders);
     fromJson(jo.value("types"_ls), result.types);
 }
-
diff --git a/lib/csapi/definitions/event_filter.h b/lib/csapi/definitions/event_filter.h
index 6de1fe79..5a1a831b 100644
--- a/lib/csapi/definitions/event_filter.h
+++ b/lib/csapi/definitions/event_filter.h
@@ -8,25 +8,30 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
-    struct EventFilter
-    {
+    struct EventFilter {
         /// The maximum number of events to return.
         Omittable<int> limit;
-        /// A list of sender IDs to exclude. If this list is absent then no senders are excluded. A matching sender will be excluded even if it is listed in the ``'senders'`` filter.
+        /// A list of sender IDs to exclude. If this list is absent then no
+        /// senders are excluded. A matching sender will be excluded even if it
+        /// is listed in the ``'senders'`` filter.
         QStringList notSenders;
-        /// A list of event types to exclude. If this list is absent then no event types are excluded. A matching type will be excluded even if it is listed in the ``'types'`` filter. A '*' can be used as a wildcard to match any sequence of characters.
+        /// A list of event types to exclude. If this list is absent then no
+        /// event types are excluded. A matching type will be excluded even if
+        /// it is listed in the ``'types'`` filter. A '*' can be used as a
+        /// wildcard to match any sequence of characters.
         QStringList notTypes;
-        /// A list of senders IDs to include. If this list is absent then all senders are included.
+        /// A list of senders IDs to include. If this list is absent then all
+        /// senders are included.
         QStringList senders;
-        /// A list of event types to include. If this list is absent then all event types are included. A ``'*'`` can be used as a wildcard to match any sequence of characters.
+        /// A list of event types to include. If this list is absent then all
+        /// event types are included. A ``'*'`` can be used as a wildcard to
+        /// match any sequence of characters.
         QStringList types;
     };
-    template <> struct JsonObjectConverter<EventFilter>
-    {
+    template <> struct JsonObjectConverter<EventFilter> {
         static void dumpTo(QJsonObject& jo, const EventFilter& pod);
         static void fillFrom(const QJsonObject& jo, EventFilter& pod);
     };
diff --git a/lib/csapi/definitions/public_rooms_response.cpp b/lib/csapi/definitions/public_rooms_response.cpp
index 0d26662c..199a7a93 100644
--- a/lib/csapi/definitions/public_rooms_response.cpp
+++ b/lib/csapi/definitions/public_rooms_response.cpp
@@ -6,11 +6,12 @@
 
 using namespace QMatrixClient;
 
-void JsonObjectConverter<PublicRoomsChunk>::dumpTo(
-        QJsonObject& jo, const PublicRoomsChunk& pod)
+void JsonObjectConverter<PublicRoomsChunk>::dumpTo(QJsonObject& jo,
+                                                   const PublicRoomsChunk& pod)
 {
     addParam<IfNotEmpty>(jo, QStringLiteral("aliases"), pod.aliases);
-    addParam<IfNotEmpty>(jo, QStringLiteral("canonical_alias"), pod.canonicalAlias);
+    addParam<IfNotEmpty>(jo, QStringLiteral("canonical_alias"),
+                         pod.canonicalAlias);
     addParam<IfNotEmpty>(jo, QStringLiteral("name"), pod.name);
     addParam<>(jo, QStringLiteral("num_joined_members"), pod.numJoinedMembers);
     addParam<>(jo, QStringLiteral("room_id"), pod.roomId);
@@ -20,8 +21,8 @@ void JsonObjectConverter<PublicRoomsChunk>::dumpTo(
     addParam<IfNotEmpty>(jo, QStringLiteral("avatar_url"), pod.avatarUrl);
 }
 
-void JsonObjectConverter<PublicRoomsChunk>::fillFrom(
-    const QJsonObject& jo, PublicRoomsChunk& result)
+void JsonObjectConverter<PublicRoomsChunk>::fillFrom(const QJsonObject& jo,
+                                                     PublicRoomsChunk& result)
 {
     fromJson(jo.value("aliases"_ls), result.aliases);
     fromJson(jo.value("canonical_alias"_ls), result.canonicalAlias);
@@ -40,15 +41,16 @@ void JsonObjectConverter<PublicRoomsResponse>::dumpTo(
     addParam<>(jo, QStringLiteral("chunk"), pod.chunk);
     addParam<IfNotEmpty>(jo, QStringLiteral("next_batch"), pod.nextBatch);
     addParam<IfNotEmpty>(jo, QStringLiteral("prev_batch"), pod.prevBatch);
-    addParam<IfNotEmpty>(jo, QStringLiteral("total_room_count_estimate"), pod.totalRoomCountEstimate);
+    addParam<IfNotEmpty>(jo, QStringLiteral("total_room_count_estimate"),
+                         pod.totalRoomCountEstimate);
 }
 
 void JsonObjectConverter<PublicRoomsResponse>::fillFrom(
-    const QJsonObject& jo, PublicRoomsResponse& result)
+        const QJsonObject& jo, PublicRoomsResponse& result)
 {
     fromJson(jo.value("chunk"_ls), result.chunk);
     fromJson(jo.value("next_batch"_ls), result.nextBatch);
     fromJson(jo.value("prev_batch"_ls), result.prevBatch);
-    fromJson(jo.value("total_room_count_estimate"_ls), result.totalRoomCountEstimate);
+    fromJson(jo.value("total_room_count_estimate"_ls),
+             result.totalRoomCountEstimate);
 }
-
diff --git a/lib/csapi/definitions/public_rooms_response.h b/lib/csapi/definitions/public_rooms_response.h
index 4c54ac25..6d8caf98 100644
--- a/lib/csapi/definitions/public_rooms_response.h
+++ b/lib/csapi/definitions/public_rooms_response.h
@@ -6,15 +6,13 @@
 
 #include "converters.h"
 
-#include <QtCore/QVector>
 #include "converters.h"
+#include <QtCore/QVector>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
-    struct PublicRoomsChunk
-    {
+    struct PublicRoomsChunk {
         /// Aliases of the room. May be empty.
         QStringList aliases;
         /// The canonical alias of the room, if any.
@@ -36,15 +34,13 @@ namespace QMatrixClient
         /// The URL for the room's avatar, if one is set.
         QString avatarUrl;
     };
-    template <> struct JsonObjectConverter<PublicRoomsChunk>
-    {
+    template <> struct JsonObjectConverter<PublicRoomsChunk> {
         static void dumpTo(QJsonObject& jo, const PublicRoomsChunk& pod);
         static void fillFrom(const QJsonObject& jo, PublicRoomsChunk& pod);
     };
 
     /// A list of the rooms on the server.
-    struct PublicRoomsResponse
-    {
+    struct PublicRoomsResponse {
         /// A paginated chunk of public rooms.
         QVector<PublicRoomsChunk> chunk;
         /// A pagination token for the response. The absence of this token
@@ -59,8 +55,7 @@ namespace QMatrixClient
         /// server has an estimate.
         Omittable<int> totalRoomCountEstimate;
     };
-    template <> struct JsonObjectConverter<PublicRoomsResponse>
-    {
+    template <> struct JsonObjectConverter<PublicRoomsResponse> {
         static void dumpTo(QJsonObject& jo, const PublicRoomsResponse& pod);
         static void fillFrom(const QJsonObject& jo, PublicRoomsResponse& pod);
     };
diff --git a/lib/csapi/definitions/push_condition.cpp b/lib/csapi/definitions/push_condition.cpp
index ace02755..5bcb845e 100644
--- a/lib/csapi/definitions/push_condition.cpp
+++ b/lib/csapi/definitions/push_condition.cpp
@@ -6,8 +6,8 @@
 
 using namespace QMatrixClient;
 
-void JsonObjectConverter<PushCondition>::dumpTo(
-        QJsonObject& jo, const PushCondition& pod)
+void JsonObjectConverter<PushCondition>::dumpTo(QJsonObject& jo,
+                                                const PushCondition& pod)
 {
     addParam<>(jo, QStringLiteral("kind"), pod.kind);
     addParam<IfNotEmpty>(jo, QStringLiteral("key"), pod.key);
@@ -15,12 +15,11 @@ void JsonObjectConverter<PushCondition>::dumpTo(
     addParam<IfNotEmpty>(jo, QStringLiteral("is"), pod.is);
 }
 
-void JsonObjectConverter<PushCondition>::fillFrom(
-    const QJsonObject& jo, PushCondition& result)
+void JsonObjectConverter<PushCondition>::fillFrom(const QJsonObject& jo,
+                                                  PushCondition& result)
 {
     fromJson(jo.value("kind"_ls), result.kind);
     fromJson(jo.value("key"_ls), result.key);
     fromJson(jo.value("pattern"_ls), result.pattern);
     fromJson(jo.value("is"_ls), result.is);
 }
-
diff --git a/lib/csapi/definitions/push_condition.h b/lib/csapi/definitions/push_condition.h
index e45526d2..a4e44e93 100644
--- a/lib/csapi/definitions/push_condition.h
+++ b/lib/csapi/definitions/push_condition.h
@@ -6,16 +6,13 @@
 
 #include "converters.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
-    struct PushCondition
-    {
+    struct PushCondition {
         QString kind;
-        /// Required for ``event_match`` conditions. The dot-separated field of the
-        /// event to match.
+        /// Required for ``event_match`` conditions. The dot-separated field of
+        /// the event to match.
         QString key;
         /// Required for ``event_match`` conditions. The glob-style pattern to
         /// match against. Patterns with no special glob characters should be
@@ -23,13 +20,13 @@ namespace QMatrixClient
         /// condition.
         QString pattern;
         /// Required for ``room_member_count`` conditions. A decimal integer
-        /// optionally prefixed by one of, ==, <, >, >= or <=. A prefix of < matches
-        /// rooms where the member count is strictly less than the given number and
-        /// so forth. If no prefix is present, this parameter defaults to ==.
+        /// optionally prefixed by one of, ==, <, >, >= or <=. A prefix of <
+        /// matches rooms where the member count is strictly less than the given
+        /// number and so forth. If no prefix is present, this parameter
+        /// defaults to ==.
         QString is;
     };
-    template <> struct JsonObjectConverter<PushCondition>
-    {
+    template <> struct JsonObjectConverter<PushCondition> {
         static void dumpTo(QJsonObject& jo, const PushCondition& pod);
         static void fillFrom(const QJsonObject& jo, PushCondition& pod);
     };
diff --git a/lib/csapi/definitions/push_rule.cpp b/lib/csapi/definitions/push_rule.cpp
index abbb04b5..fc2be2c7 100644
--- a/lib/csapi/definitions/push_rule.cpp
+++ b/lib/csapi/definitions/push_rule.cpp
@@ -6,8 +6,7 @@
 
 using namespace QMatrixClient;
 
-void JsonObjectConverter<PushRule>::dumpTo(
-        QJsonObject& jo, const PushRule& pod)
+void JsonObjectConverter<PushRule>::dumpTo(QJsonObject& jo, const PushRule& pod)
 {
     addParam<>(jo, QStringLiteral("actions"), pod.actions);
     addParam<>(jo, QStringLiteral("default"), pod.isDefault);
@@ -17,8 +16,8 @@ void JsonObjectConverter<PushRule>::dumpTo(
     addParam<IfNotEmpty>(jo, QStringLiteral("pattern"), pod.pattern);
 }
 
-void JsonObjectConverter<PushRule>::fillFrom(
-    const QJsonObject& jo, PushRule& result)
+void JsonObjectConverter<PushRule>::fillFrom(const QJsonObject& jo,
+                                             PushRule& result)
 {
     fromJson(jo.value("actions"_ls), result.actions);
     fromJson(jo.value("default"_ls), result.isDefault);
@@ -27,4 +26,3 @@ void JsonObjectConverter<PushRule>::fillFrom(
     fromJson(jo.value("conditions"_ls), result.conditions);
     fromJson(jo.value("pattern"_ls), result.pattern);
 }
-
diff --git a/lib/csapi/definitions/push_rule.h b/lib/csapi/definitions/push_rule.h
index bea13e96..d8d2cc0f 100644
--- a/lib/csapi/definitions/push_rule.h
+++ b/lib/csapi/definitions/push_rule.h
@@ -6,18 +6,16 @@
 
 #include "converters.h"
 
+#include "converters.h"
 #include "csapi/definitions/push_condition.h"
 #include <QtCore/QJsonObject>
-#include <QtCore/QVector>
 #include <QtCore/QVariant>
-#include "converters.h"
+#include <QtCore/QVector>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
-    struct PushRule
-    {
+    struct PushRule {
         /// The actions to perform when this rule is matched.
         QVector<QVariant> actions;
         /// Whether this is a default rule, or has been set explicitly.
@@ -26,16 +24,15 @@ namespace QMatrixClient
         bool enabled;
         /// The ID of this rule.
         QString ruleId;
-        /// The conditions that must hold true for an event in order for a rule to be
-        /// applied to an event. A rule with no conditions always matches. Only
-        /// applicable to ``underride`` and ``override`` rules.
+        /// The conditions that must hold true for an event in order for a rule
+        /// to be applied to an event. A rule with no conditions always matches.
+        /// Only applicable to ``underride`` and ``override`` rules.
         QVector<PushCondition> conditions;
-        /// The glob-style pattern to match against.  Only applicable to ``content``
-        /// rules.
+        /// The glob-style pattern to match against.  Only applicable to
+        /// ``content`` rules.
         QString pattern;
     };
-    template <> struct JsonObjectConverter<PushRule>
-    {
+    template <> struct JsonObjectConverter<PushRule> {
         static void dumpTo(QJsonObject& jo, const PushRule& pod);
         static void fillFrom(const QJsonObject& jo, PushRule& pod);
     };
diff --git a/lib/csapi/definitions/push_ruleset.cpp b/lib/csapi/definitions/push_ruleset.cpp
index f1bad882..6f48d27b 100644
--- a/lib/csapi/definitions/push_ruleset.cpp
+++ b/lib/csapi/definitions/push_ruleset.cpp
@@ -6,8 +6,8 @@
 
 using namespace QMatrixClient;
 
-void JsonObjectConverter<PushRuleset>::dumpTo(
-        QJsonObject& jo, const PushRuleset& pod)
+void JsonObjectConverter<PushRuleset>::dumpTo(QJsonObject& jo,
+                                              const PushRuleset& pod)
 {
     addParam<IfNotEmpty>(jo, QStringLiteral("content"), pod.content);
     addParam<IfNotEmpty>(jo, QStringLiteral("override"), pod.override);
@@ -16,8 +16,8 @@ void JsonObjectConverter<PushRuleset>::dumpTo(
     addParam<IfNotEmpty>(jo, QStringLiteral("underride"), pod.underride);
 }
 
-void JsonObjectConverter<PushRuleset>::fillFrom(
-    const QJsonObject& jo, PushRuleset& result)
+void JsonObjectConverter<PushRuleset>::fillFrom(const QJsonObject& jo,
+                                                PushRuleset& result)
 {
     fromJson(jo.value("content"_ls), result.content);
     fromJson(jo.value("override"_ls), result.override);
@@ -25,4 +25,3 @@ void JsonObjectConverter<PushRuleset>::fillFrom(
     fromJson(jo.value("sender"_ls), result.sender);
     fromJson(jo.value("underride"_ls), result.underride);
 }
-
diff --git a/lib/csapi/definitions/push_ruleset.h b/lib/csapi/definitions/push_ruleset.h
index f2d937c0..b2f791c4 100644
--- a/lib/csapi/definitions/push_ruleset.h
+++ b/lib/csapi/definitions/push_ruleset.h
@@ -6,24 +6,21 @@
 
 #include "converters.h"
 
-#include <QtCore/QVector>
 #include "converters.h"
 #include "csapi/definitions/push_rule.h"
+#include <QtCore/QVector>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
-    struct PushRuleset
-    {
+    struct PushRuleset {
         QVector<PushRule> content;
         QVector<PushRule> override;
         QVector<PushRule> room;
         QVector<PushRule> sender;
         QVector<PushRule> underride;
     };
-    template <> struct JsonObjectConverter<PushRuleset>
-    {
+    template <> struct JsonObjectConverter<PushRuleset> {
         static void dumpTo(QJsonObject& jo, const PushRuleset& pod);
         static void fillFrom(const QJsonObject& jo, PushRuleset& pod);
     };
diff --git a/lib/csapi/definitions/room_event_filter.cpp b/lib/csapi/definitions/room_event_filter.cpp
index df92e684..bd38ebc7 100644
--- a/lib/csapi/definitions/room_event_filter.cpp
+++ b/lib/csapi/definitions/room_event_filter.cpp
@@ -6,8 +6,8 @@
 
 using namespace QMatrixClient;
 
-void JsonObjectConverter<RoomEventFilter>::dumpTo(
-        QJsonObject& jo, const RoomEventFilter& pod)
+void JsonObjectConverter<RoomEventFilter>::dumpTo(QJsonObject& jo,
+                                                  const RoomEventFilter& pod)
 {
     fillJson<EventFilter>(jo, pod);
     addParam<IfNotEmpty>(jo, QStringLiteral("not_rooms"), pod.notRooms);
@@ -15,12 +15,11 @@ void JsonObjectConverter<RoomEventFilter>::dumpTo(
     addParam<IfNotEmpty>(jo, QStringLiteral("contains_url"), pod.containsUrl);
 }
 
-void JsonObjectConverter<RoomEventFilter>::fillFrom(
-    const QJsonObject& jo, RoomEventFilter& result)
+void JsonObjectConverter<RoomEventFilter>::fillFrom(const QJsonObject& jo,
+                                                    RoomEventFilter& result)
 {
     fillFromJson<EventFilter>(jo, result);
     fromJson(jo.value("not_rooms"_ls), result.notRooms);
     fromJson(jo.value("rooms"_ls), result.rooms);
     fromJson(jo.value("contains_url"_ls), result.containsUrl);
 }
-
diff --git a/lib/csapi/definitions/room_event_filter.h b/lib/csapi/definitions/room_event_filter.h
index 6eb9a390..13c82341 100644
--- a/lib/csapi/definitions/room_event_filter.h
+++ b/lib/csapi/definitions/room_event_filter.h
@@ -6,24 +6,26 @@
 
 #include "converters.h"
 
-#include "csapi/definitions/event_filter.h"
 #include "converters.h"
+#include "csapi/definitions/event_filter.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
-    struct RoomEventFilter : EventFilter
-    {
-        /// A list of room IDs to exclude. If this list is absent then no rooms are excluded. A matching room will be excluded even if it is listed in the ``'rooms'`` filter.
+    struct RoomEventFilter : EventFilter {
+        /// A list of room IDs to exclude. If this list is absent then no rooms
+        /// are excluded. A matching room will be excluded even if it is listed
+        /// in the ``'rooms'`` filter.
         QStringList notRooms;
-        /// A list of room IDs to include. If this list is absent then all rooms are included.
+        /// A list of room IDs to include. If this list is absent then all rooms
+        /// are included.
         QStringList rooms;
-        /// If ``true``, includes only events with a ``url`` key in their content. If ``false``, excludes those events. If omitted, ``url`` key is not considered for filtering.
+        /// If ``true``, includes only events with a ``url`` key in their
+        /// content. If ``false``, excludes those events. If omitted, ``url``
+        /// key is not considered for filtering.
         Omittable<bool> containsUrl;
     };
-    template <> struct JsonObjectConverter<RoomEventFilter>
-    {
+    template <> struct JsonObjectConverter<RoomEventFilter> {
         static void dumpTo(QJsonObject& jo, const RoomEventFilter& pod);
         static void fillFrom(const QJsonObject& jo, RoomEventFilter& pod);
     };
diff --git a/lib/csapi/definitions/sync_filter.cpp b/lib/csapi/definitions/sync_filter.cpp
index 32752d1f..c06c16ca 100644
--- a/lib/csapi/definitions/sync_filter.cpp
+++ b/lib/csapi/definitions/sync_filter.cpp
@@ -6,24 +6,27 @@
 
 using namespace QMatrixClient;
 
-void JsonObjectConverter<StateFilter>::dumpTo(
-        QJsonObject& jo, const StateFilter& pod)
+void JsonObjectConverter<StateFilter>::dumpTo(QJsonObject& jo,
+                                              const StateFilter& pod)
 {
     fillJson<RoomEventFilter>(jo, pod);
-    addParam<IfNotEmpty>(jo, QStringLiteral("lazy_load_members"), pod.lazyLoadMembers);
-    addParam<IfNotEmpty>(jo, QStringLiteral("include_redundant_members"), pod.includeRedundantMembers);
+    addParam<IfNotEmpty>(jo, QStringLiteral("lazy_load_members"),
+                         pod.lazyLoadMembers);
+    addParam<IfNotEmpty>(jo, QStringLiteral("include_redundant_members"),
+                         pod.includeRedundantMembers);
 }
 
-void JsonObjectConverter<StateFilter>::fillFrom(
-    const QJsonObject& jo, StateFilter& result)
+void JsonObjectConverter<StateFilter>::fillFrom(const QJsonObject& jo,
+                                                StateFilter& result)
 {
     fillFromJson<RoomEventFilter>(jo, result);
     fromJson(jo.value("lazy_load_members"_ls), result.lazyLoadMembers);
-    fromJson(jo.value("include_redundant_members"_ls), result.includeRedundantMembers);
+    fromJson(jo.value("include_redundant_members"_ls),
+             result.includeRedundantMembers);
 }
 
-void JsonObjectConverter<RoomFilter>::dumpTo(
-        QJsonObject& jo, const RoomFilter& pod)
+void JsonObjectConverter<RoomFilter>::dumpTo(QJsonObject& jo,
+                                             const RoomFilter& pod)
 {
     addParam<IfNotEmpty>(jo, QStringLiteral("not_rooms"), pod.notRooms);
     addParam<IfNotEmpty>(jo, QStringLiteral("rooms"), pod.rooms);
@@ -34,8 +37,8 @@ void JsonObjectConverter<RoomFilter>::dumpTo(
     addParam<IfNotEmpty>(jo, QStringLiteral("account_data"), pod.accountData);
 }
 
-void JsonObjectConverter<RoomFilter>::fillFrom(
-    const QJsonObject& jo, RoomFilter& result)
+void JsonObjectConverter<RoomFilter>::fillFrom(const QJsonObject& jo,
+                                               RoomFilter& result)
 {
     fromJson(jo.value("not_rooms"_ls), result.notRooms);
     fromJson(jo.value("rooms"_ls), result.rooms);
@@ -46,8 +49,7 @@ void JsonObjectConverter<RoomFilter>::fillFrom(
     fromJson(jo.value("account_data"_ls), result.accountData);
 }
 
-void JsonObjectConverter<Filter>::dumpTo(
-        QJsonObject& jo, const Filter& pod)
+void JsonObjectConverter<Filter>::dumpTo(QJsonObject& jo, const Filter& pod)
 {
     addParam<IfNotEmpty>(jo, QStringLiteral("event_fields"), pod.eventFields);
     addParam<IfNotEmpty>(jo, QStringLiteral("event_format"), pod.eventFormat);
@@ -56,8 +58,8 @@ void JsonObjectConverter<Filter>::dumpTo(
     addParam<IfNotEmpty>(jo, QStringLiteral("room"), pod.room);
 }
 
-void JsonObjectConverter<Filter>::fillFrom(
-    const QJsonObject& jo, Filter& result)
+void JsonObjectConverter<Filter>::fillFrom(const QJsonObject& jo,
+                                           Filter& result)
 {
     fromJson(jo.value("event_fields"_ls), result.eventFields);
     fromJson(jo.value("event_format"_ls), result.eventFormat);
@@ -65,4 +67,3 @@ void JsonObjectConverter<Filter>::fillFrom(
     fromJson(jo.value("account_data"_ls), result.accountData);
     fromJson(jo.value("room"_ls), result.room);
 }
-
diff --git a/lib/csapi/definitions/sync_filter.h b/lib/csapi/definitions/sync_filter.h
index d94c74d7..d523c388 100644
--- a/lib/csapi/definitions/sync_filter.h
+++ b/lib/csapi/definitions/sync_filter.h
@@ -6,17 +6,15 @@
 
 #include "converters.h"
 
-#include "csapi/definitions/room_event_filter.h"
 #include "converters.h"
 #include "csapi/definitions/event_filter.h"
+#include "csapi/definitions/room_event_filter.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
     /// The state events to include for rooms.
-    struct StateFilter : RoomEventFilter
-    {
+    struct StateFilter : RoomEventFilter {
         /// If ``true``, the only ``m.room.member`` events returned in
         /// the ``state`` section of the ``/sync`` response are those
         /// which are definitely necessary for a client to display
@@ -39,20 +37,24 @@ namespace QMatrixClient
         /// If ``lazy_load_members`` is ``false`` this field is ignored.
         Omittable<bool> includeRedundantMembers;
     };
-    template <> struct JsonObjectConverter<StateFilter>
-    {
+    template <> struct JsonObjectConverter<StateFilter> {
         static void dumpTo(QJsonObject& jo, const StateFilter& pod);
         static void fillFrom(const QJsonObject& jo, StateFilter& pod);
     };
 
     /// Filters to be applied to room data.
-    struct RoomFilter
-    {
-        /// A list of room IDs to exclude. If this list is absent then no rooms are excluded. A matching room will be excluded even if it is listed in the ``'rooms'`` filter. This filter is applied before the filters in ``ephemeral``, ``state``, ``timeline`` or ``account_data``
+    struct RoomFilter {
+        /// A list of room IDs to exclude. If this list is absent then no rooms
+        /// are excluded. A matching room will be excluded even if it is listed
+        /// in the ``'rooms'`` filter. This filter is applied before the filters
+        /// in ``ephemeral``, ``state``, ``timeline`` or ``account_data``
         QStringList notRooms;
-        /// A list of room IDs to include. If this list is absent then all rooms are included. This filter is applied before the filters in ``ephemeral``, ``state``, ``timeline`` or ``account_data``
+        /// A list of room IDs to include. If this list is absent then all rooms
+        /// are included. This filter is applied before the filters in
+        /// ``ephemeral``, ``state``, ``timeline`` or ``account_data``
         QStringList rooms;
-        /// The events that aren't recorded in the room history, e.g. typing and receipts, to include for rooms.
+        /// The events that aren't recorded in the room history, e.g. typing and
+        /// receipts, to include for rooms.
         Omittable<RoomEventFilter> ephemeral;
         /// Include rooms that the user has left in the sync, default false
         Omittable<bool> includeLeave;
@@ -63,17 +65,22 @@ namespace QMatrixClient
         /// The per user account data to include for rooms.
         Omittable<RoomEventFilter> accountData;
     };
-    template <> struct JsonObjectConverter<RoomFilter>
-    {
+    template <> struct JsonObjectConverter<RoomFilter> {
         static void dumpTo(QJsonObject& jo, const RoomFilter& pod);
         static void fillFrom(const QJsonObject& jo, RoomFilter& pod);
     };
 
-    struct Filter
-    {
-        /// List of event fields to include. If this list is absent then all fields are included. The entries may include '.' charaters to indicate sub-fields. So ['content.body'] will include the 'body' field of the 'content' object. A literal '.' character in a field name may be escaped using a '\\'. A server may include more fields than were requested.
+    struct Filter {
+        /// List of event fields to include. If this list is absent then all
+        /// fields are included. The entries may include '.' charaters to
+        /// indicate sub-fields. So ['content.body'] will include the 'body'
+        /// field of the 'content' object. A literal '.' character in a field
+        /// name may be escaped using a '\\'. A server may include more fields
+        /// than were requested.
         QStringList eventFields;
-        /// The format to use for events. 'client' will return the events in a format suitable for clients. 'federation' will return the raw event as receieved over federation. The default is 'client'.
+        /// The format to use for events. 'client' will return the events in a
+        /// format suitable for clients. 'federation' will return the raw event
+        /// as receieved over federation. The default is 'client'.
         QString eventFormat;
         /// The presence updates to include.
         Omittable<EventFilter> presence;
@@ -82,8 +89,7 @@ namespace QMatrixClient
         /// Filters to be applied to room data.
         Omittable<RoomFilter> room;
     };
-    template <> struct JsonObjectConverter<Filter>
-    {
+    template <> struct JsonObjectConverter<Filter> {
         static void dumpTo(QJsonObject& jo, const Filter& pod);
         static void fillFrom(const QJsonObject& jo, Filter& pod);
     };
diff --git a/lib/csapi/definitions/user_identifier.cpp b/lib/csapi/definitions/user_identifier.cpp
index 05a27c1c..998f1b85 100644
--- a/lib/csapi/definitions/user_identifier.cpp
+++ b/lib/csapi/definitions/user_identifier.cpp
@@ -6,18 +6,17 @@
 
 using namespace QMatrixClient;
 
-void JsonObjectConverter<UserIdentifier>::dumpTo(
-        QJsonObject& jo, const UserIdentifier& pod)
+void JsonObjectConverter<UserIdentifier>::dumpTo(QJsonObject& jo,
+                                                 const UserIdentifier& pod)
 {
     fillJson(jo, pod.additionalProperties);
     addParam<>(jo, QStringLiteral("type"), pod.type);
 }
 
-void JsonObjectConverter<UserIdentifier>::fillFrom(
-    QJsonObject jo, UserIdentifier& result)
+void JsonObjectConverter<UserIdentifier>::fillFrom(QJsonObject jo,
+                                                   UserIdentifier& result)
 {
     fromJson(jo.take("type"_ls), result.type);
 
     fromJson(jo, result.additionalProperties);
 }
-
diff --git a/lib/csapi/definitions/user_identifier.h b/lib/csapi/definitions/user_identifier.h
index cbb1550f..4a9ce684 100644
--- a/lib/csapi/definitions/user_identifier.h
+++ b/lib/csapi/definitions/user_identifier.h
@@ -8,20 +8,18 @@
 
 #include <QtCore/QVariant>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
     /// Identification information for a user
-    struct UserIdentifier
-    {
-        /// The type of identification.  See `Identifier types`_ for supported values and additional property descriptions.
+    struct UserIdentifier {
+        /// The type of identification.  See `Identifier types`_ for supported
+        /// values and additional property descriptions.
         QString type;
         /// Identification information for a user
         QVariantHash additionalProperties;
     };
-    template <> struct JsonObjectConverter<UserIdentifier>
-    {
+    template <> struct JsonObjectConverter<UserIdentifier> {
         static void dumpTo(QJsonObject& jo, const UserIdentifier& pod);
         static void fillFrom(QJsonObject jo, UserIdentifier& pod);
     };
diff --git a/lib/csapi/definitions/wellknown/full.cpp b/lib/csapi/definitions/wellknown/full.cpp
index 5ecef34f..35c0df5b 100644
--- a/lib/csapi/definitions/wellknown/full.cpp
+++ b/lib/csapi/definitions/wellknown/full.cpp
@@ -11,15 +11,15 @@ void JsonObjectConverter<DiscoveryInformation>::dumpTo(
 {
     fillJson(jo, pod.additionalProperties);
     addParam<>(jo, QStringLiteral("m.homeserver"), pod.homeserver);
-    addParam<IfNotEmpty>(jo, QStringLiteral("m.identity_server"), pod.identityServer);
+    addParam<IfNotEmpty>(jo, QStringLiteral("m.identity_server"),
+                         pod.identityServer);
 }
 
 void JsonObjectConverter<DiscoveryInformation>::fillFrom(
-    QJsonObject jo, DiscoveryInformation& result)
+        QJsonObject jo, DiscoveryInformation& result)
 {
     fromJson(jo.take("m.homeserver"_ls), result.homeserver);
     fromJson(jo.take("m.identity_server"_ls), result.identityServer);
 
     fromJson(jo, result.additionalProperties);
 }
-
diff --git a/lib/csapi/definitions/wellknown/full.h b/lib/csapi/definitions/wellknown/full.h
index d9346acb..9b920eda 100644
--- a/lib/csapi/definitions/wellknown/full.h
+++ b/lib/csapi/definitions/wellknown/full.h
@@ -6,31 +6,28 @@
 
 #include "converters.h"
 
-#include <QtCore/QJsonObject>
 #include "converters.h"
 #include "csapi/definitions/wellknown/homeserver.h"
 #include "csapi/definitions/wellknown/identity_server.h"
 #include <QtCore/QHash>
+#include <QtCore/QJsonObject>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
     /// Used by clients to determine the homeserver, identity server, and other
     /// optional components they should be interacting with.
-    struct DiscoveryInformation
-    {
-        /// Used by clients to determine the homeserver, identity server, and other
-        /// optional components they should be interacting with.
+    struct DiscoveryInformation {
+        /// Used by clients to determine the homeserver, identity server, and
+        /// other optional components they should be interacting with.
         HomeserverInformation homeserver;
-        /// Used by clients to determine the homeserver, identity server, and other
-        /// optional components they should be interacting with.
+        /// Used by clients to determine the homeserver, identity server, and
+        /// other optional components they should be interacting with.
         Omittable<IdentityServerInformation> identityServer;
         /// Application-dependent keys using Java package naming convention.
         QHash<QString, QJsonObject> additionalProperties;
     };
-    template <> struct JsonObjectConverter<DiscoveryInformation>
-    {
+    template <> struct JsonObjectConverter<DiscoveryInformation> {
         static void dumpTo(QJsonObject& jo, const DiscoveryInformation& pod);
         static void fillFrom(QJsonObject jo, DiscoveryInformation& pod);
     };
diff --git a/lib/csapi/definitions/wellknown/homeserver.cpp b/lib/csapi/definitions/wellknown/homeserver.cpp
index 0783f11b..a7337520 100644
--- a/lib/csapi/definitions/wellknown/homeserver.cpp
+++ b/lib/csapi/definitions/wellknown/homeserver.cpp
@@ -13,8 +13,7 @@ void JsonObjectConverter<HomeserverInformation>::dumpTo(
 }
 
 void JsonObjectConverter<HomeserverInformation>::fillFrom(
-    const QJsonObject& jo, HomeserverInformation& result)
+        const QJsonObject& jo, HomeserverInformation& result)
 {
     fromJson(jo.value("base_url"_ls), result.baseUrl);
 }
-
diff --git a/lib/csapi/definitions/wellknown/homeserver.h b/lib/csapi/definitions/wellknown/homeserver.h
index f6761c30..8bd3c150 100644
--- a/lib/csapi/definitions/wellknown/homeserver.h
+++ b/lib/csapi/definitions/wellknown/homeserver.h
@@ -6,19 +6,15 @@
 
 #include "converters.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
     /// Used by clients to discover homeserver information.
-    struct HomeserverInformation
-    {
+    struct HomeserverInformation {
         /// The base URL for the homeserver for client-server connections.
         QString baseUrl;
     };
-    template <> struct JsonObjectConverter<HomeserverInformation>
-    {
+    template <> struct JsonObjectConverter<HomeserverInformation> {
         static void dumpTo(QJsonObject& jo, const HomeserverInformation& pod);
         static void fillFrom(const QJsonObject& jo, HomeserverInformation& pod);
     };
diff --git a/lib/csapi/definitions/wellknown/identity_server.cpp b/lib/csapi/definitions/wellknown/identity_server.cpp
index 99f36641..46a614d8 100644
--- a/lib/csapi/definitions/wellknown/identity_server.cpp
+++ b/lib/csapi/definitions/wellknown/identity_server.cpp
@@ -13,8 +13,7 @@ void JsonObjectConverter<IdentityServerInformation>::dumpTo(
 }
 
 void JsonObjectConverter<IdentityServerInformation>::fillFrom(
-    const QJsonObject& jo, IdentityServerInformation& result)
+        const QJsonObject& jo, IdentityServerInformation& result)
 {
     fromJson(jo.value("base_url"_ls), result.baseUrl);
 }
-
diff --git a/lib/csapi/definitions/wellknown/identity_server.h b/lib/csapi/definitions/wellknown/identity_server.h
index 67d8b08d..fd53dfc1 100644
--- a/lib/csapi/definitions/wellknown/identity_server.h
+++ b/lib/csapi/definitions/wellknown/identity_server.h
@@ -6,21 +6,19 @@
 
 #include "converters.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
     /// Used by clients to discover identity server information.
-    struct IdentityServerInformation
-    {
+    struct IdentityServerInformation {
         /// The base URL for the identity server for client-server connections.
         QString baseUrl;
     };
-    template <> struct JsonObjectConverter<IdentityServerInformation>
-    {
-        static void dumpTo(QJsonObject& jo, const IdentityServerInformation& pod);
-        static void fillFrom(const QJsonObject& jo, IdentityServerInformation& pod);
+    template <> struct JsonObjectConverter<IdentityServerInformation> {
+        static void dumpTo(QJsonObject& jo,
+                           const IdentityServerInformation& pod);
+        static void fillFrom(const QJsonObject& jo,
+                             IdentityServerInformation& pod);
     };
 
 } // namespace QMatrixClient
diff --git a/lib/csapi/device_management.cpp b/lib/csapi/device_management.cpp
index 9c31db5d..7d15bb2b 100644
--- a/lib/csapi/device_management.cpp
+++ b/lib/csapi/device_management.cpp
@@ -15,30 +15,25 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class GetDevicesJob::Private
 {
     public:
-        QVector<Device> devices;
+    QVector<Device> devices;
 };
 
 QUrl GetDevicesJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/devices");
+    return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/devices");
 }
 
 static const auto GetDevicesJobName = QStringLiteral("GetDevicesJob");
 
 GetDevicesJob::GetDevicesJob()
-    : BaseJob(HttpVerb::Get, GetDevicesJobName,
-        basePath % "/devices")
-    , d(new Private)
+    : BaseJob(HttpVerb::Get, GetDevicesJobName, basePath % "/devices"),
+      d(new Private)
 {
 }
 
 GetDevicesJob::~GetDevicesJob() = default;
 
-const QVector<Device>& GetDevicesJob::devices() const
-{
-    return d->devices;
-}
+const QVector<Device>& GetDevicesJob::devices() const { return d->devices; }
 
 BaseJob::Status GetDevicesJob::parseJson(const QJsonDocument& data)
 {
@@ -50,30 +45,27 @@ BaseJob::Status GetDevicesJob::parseJson(const QJsonDocument& data)
 class GetDeviceJob::Private
 {
     public:
-        Device data;
+    Device data;
 };
 
 QUrl GetDeviceJob::makeRequestUrl(QUrl baseUrl, const QString& deviceId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/devices/" % deviceId);
+                                   basePath % "/devices/" % deviceId);
 }
 
 static const auto GetDeviceJobName = QStringLiteral("GetDeviceJob");
 
 GetDeviceJob::GetDeviceJob(const QString& deviceId)
     : BaseJob(HttpVerb::Get, GetDeviceJobName,
-        basePath % "/devices/" % deviceId)
-    , d(new Private)
+              basePath % "/devices/" % deviceId),
+      d(new Private)
 {
 }
 
 GetDeviceJob::~GetDeviceJob() = default;
 
-const Device& GetDeviceJob::data() const
-{
-    return d->data;
-}
+const Device& GetDeviceJob::data() const { return d->data; }
 
 BaseJob::Status GetDeviceJob::parseJson(const QJsonDocument& data)
 {
@@ -83,9 +75,10 @@ BaseJob::Status GetDeviceJob::parseJson(const QJsonDocument& data)
 
 static const auto UpdateDeviceJobName = QStringLiteral("UpdateDeviceJob");
 
-UpdateDeviceJob::UpdateDeviceJob(const QString& deviceId, const QString& displayName)
+UpdateDeviceJob::UpdateDeviceJob(const QString& deviceId,
+                                 const QString& displayName)
     : BaseJob(HttpVerb::Put, UpdateDeviceJobName,
-        basePath % "/devices/" % deviceId)
+              basePath % "/devices/" % deviceId)
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("display_name"), displayName);
@@ -94,9 +87,10 @@ UpdateDeviceJob::UpdateDeviceJob(const QString& deviceId, const QString& display
 
 static const auto DeleteDeviceJobName = QStringLiteral("DeleteDeviceJob");
 
-DeleteDeviceJob::DeleteDeviceJob(const QString& deviceId, const Omittable<AuthenticationData>& auth)
+DeleteDeviceJob::DeleteDeviceJob(const QString& deviceId,
+                                 const Omittable<AuthenticationData>& auth)
     : BaseJob(HttpVerb::Delete, DeleteDeviceJobName,
-        basePath % "/devices/" % deviceId)
+              basePath % "/devices/" % deviceId)
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
@@ -105,13 +99,13 @@ DeleteDeviceJob::DeleteDeviceJob(const QString& deviceId, const Omittable<Authen
 
 static const auto DeleteDevicesJobName = QStringLiteral("DeleteDevicesJob");
 
-DeleteDevicesJob::DeleteDevicesJob(const QStringList& devices, const Omittable<AuthenticationData>& auth)
+DeleteDevicesJob::DeleteDevicesJob(const QStringList& devices,
+                                   const Omittable<AuthenticationData>& auth)
     : BaseJob(HttpVerb::Post, DeleteDevicesJobName,
-        basePath % "/delete_devices")
+              basePath % "/delete_devices")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("devices"), devices);
     addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
     setRequestData(_data);
 }
-
diff --git a/lib/csapi/device_management.h b/lib/csapi/device_management.h
index f41efdbc..628f26d2 100644
--- a/lib/csapi/device_management.h
+++ b/lib/csapi/device_management.h
@@ -6,13 +6,12 @@
 
 #include "jobs/basejob.h"
 
-#include "csapi/definitions/auth_data.h"
-#include <QtCore/QVector>
 #include "converters.h"
+#include "csapi/definitions/auth_data.h"
 #include "csapi/definitions/client_device.h"
+#include <QtCore/QVector>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// List registered devices for the current user
@@ -21,29 +20,29 @@ namespace QMatrixClient
     class GetDevicesJob : public BaseJob
     {
         public:
-            explicit GetDevicesJob();
+        explicit GetDevicesJob();
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetDevicesJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetDevicesJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl);
 
-            ~GetDevicesJob() override;
+        ~GetDevicesJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// A list of all registered devices for this user.
-            const QVector<Device>& devices() const;
+        /// A list of all registered devices for this user.
+        const QVector<Device>& devices() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Get a single device
@@ -52,33 +51,33 @@ namespace QMatrixClient
     class GetDeviceJob : public BaseJob
     {
         public:
-            /*! Get a single device
-             * \param deviceId
-             *   The device to retrieve.
-             */
-            explicit GetDeviceJob(const QString& deviceId);
+        /*! Get a single device
+         * \param deviceId
+         *   The device to retrieve.
+         */
+        explicit GetDeviceJob(const QString& deviceId);
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetDeviceJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& deviceId);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetDeviceJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& deviceId);
 
-            ~GetDeviceJob() override;
+        ~GetDeviceJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// Device information
-            const Device& data() const;
+        /// Device information
+        const Device& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Update a device
@@ -87,49 +86,56 @@ namespace QMatrixClient
     class UpdateDeviceJob : public BaseJob
     {
         public:
-            /*! Update a device
-             * \param deviceId
-             *   The device to update.
-             * \param displayName
-             *   The new display name for this device. If not given, the
-             *   display name is unchanged.
-             */
-            explicit UpdateDeviceJob(const QString& deviceId, const QString& displayName = {});
+        /*! Update a device
+         * \param deviceId
+         *   The device to update.
+         * \param displayName
+         *   The new display name for this device. If not given, the
+         *   display name is unchanged.
+         */
+        explicit UpdateDeviceJob(const QString& deviceId,
+                                 const QString& displayName = {});
     };
 
     /// Delete a device
     ///
     /// This API endpoint uses the `User-Interactive Authentication API`_.
-    /// 
-    /// Deletes the given device, and invalidates any access token associated with it.
+    ///
+    /// Deletes the given device, and invalidates any access token associated
+    /// with it.
     class DeleteDeviceJob : public BaseJob
     {
         public:
-            /*! Delete a device
-             * \param deviceId
-             *   The device to delete.
-             * \param auth
-             *   Additional authentication information for the
-             *   user-interactive authentication API.
-             */
-            explicit DeleteDeviceJob(const QString& deviceId, const Omittable<AuthenticationData>& auth = none);
+        /*! Delete a device
+         * \param deviceId
+         *   The device to delete.
+         * \param auth
+         *   Additional authentication information for the
+         *   user-interactive authentication API.
+         */
+        explicit DeleteDeviceJob(
+                const QString& deviceId,
+                const Omittable<AuthenticationData>& auth = none);
     };
 
     /// Bulk deletion of devices
     ///
     /// This API endpoint uses the `User-Interactive Authentication API`_.
-    /// 
-    /// Deletes the given devices, and invalidates any access token associated with them.
+    ///
+    /// Deletes the given devices, and invalidates any access token associated
+    /// with them.
     class DeleteDevicesJob : public BaseJob
     {
         public:
-            /*! Bulk deletion of devices
-             * \param devices
-             *   The list of device IDs to delete.
-             * \param auth
-             *   Additional authentication information for the
-             *   user-interactive authentication API.
-             */
-            explicit DeleteDevicesJob(const QStringList& devices, const Omittable<AuthenticationData>& auth = none);
+        /*! Bulk deletion of devices
+         * \param devices
+         *   The list of device IDs to delete.
+         * \param auth
+         *   Additional authentication information for the
+         *   user-interactive authentication API.
+         */
+        explicit DeleteDevicesJob(
+                const QStringList& devices,
+                const Omittable<AuthenticationData>& auth = none);
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/directory.cpp b/lib/csapi/directory.cpp
index 4af86f7b..b4282ffb 100644
--- a/lib/csapi/directory.cpp
+++ b/lib/csapi/directory.cpp
@@ -14,9 +14,10 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0/directory");
 
 static const auto SetRoomAliasJobName = QStringLiteral("SetRoomAliasJob");
 
-SetRoomAliasJob::SetRoomAliasJob(const QString& roomAlias, const QString& roomId)
+SetRoomAliasJob::SetRoomAliasJob(const QString& roomAlias,
+                                 const QString& roomId)
     : BaseJob(HttpVerb::Put, SetRoomAliasJobName,
-        basePath % "/room/" % roomAlias)
+              basePath % "/room/" % roomAlias)
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("room_id"), roomId);
@@ -26,36 +27,31 @@ SetRoomAliasJob::SetRoomAliasJob(const QString& roomAlias, const QString& roomId
 class GetRoomIdByAliasJob::Private
 {
     public:
-        QString roomId;
-        QStringList servers;
+    QString roomId;
+    QStringList servers;
 };
 
 QUrl GetRoomIdByAliasJob::makeRequestUrl(QUrl baseUrl, const QString& roomAlias)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/room/" % roomAlias);
+                                   basePath % "/room/" % roomAlias);
 }
 
-static const auto GetRoomIdByAliasJobName = QStringLiteral("GetRoomIdByAliasJob");
+static const auto GetRoomIdByAliasJobName =
+        QStringLiteral("GetRoomIdByAliasJob");
 
 GetRoomIdByAliasJob::GetRoomIdByAliasJob(const QString& roomAlias)
     : BaseJob(HttpVerb::Get, GetRoomIdByAliasJobName,
-        basePath % "/room/" % roomAlias, false)
-    , d(new Private)
+              basePath % "/room/" % roomAlias, false),
+      d(new Private)
 {
 }
 
 GetRoomIdByAliasJob::~GetRoomIdByAliasJob() = default;
 
-const QString& GetRoomIdByAliasJob::roomId() const
-{
-    return d->roomId;
-}
+const QString& GetRoomIdByAliasJob::roomId() const { return d->roomId; }
 
-const QStringList& GetRoomIdByAliasJob::servers() const
-{
-    return d->servers;
-}
+const QStringList& GetRoomIdByAliasJob::servers() const { return d->servers; }
 
 BaseJob::Status GetRoomIdByAliasJob::parseJson(const QJsonDocument& data)
 {
@@ -68,14 +64,13 @@ BaseJob::Status GetRoomIdByAliasJob::parseJson(const QJsonDocument& data)
 QUrl DeleteRoomAliasJob::makeRequestUrl(QUrl baseUrl, const QString& roomAlias)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/room/" % roomAlias);
+                                   basePath % "/room/" % roomAlias);
 }
 
 static const auto DeleteRoomAliasJobName = QStringLiteral("DeleteRoomAliasJob");
 
 DeleteRoomAliasJob::DeleteRoomAliasJob(const QString& roomAlias)
     : BaseJob(HttpVerb::Delete, DeleteRoomAliasJobName,
-        basePath % "/room/" % roomAlias)
+              basePath % "/room/" % roomAlias)
 {
 }
-
diff --git a/lib/csapi/directory.h b/lib/csapi/directory.h
index 39e86635..6bf5ad14 100644
--- a/lib/csapi/directory.h
+++ b/lib/csapi/directory.h
@@ -6,86 +6,86 @@
 
 #include "jobs/basejob.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Create a new mapping from room alias to room ID.
     class SetRoomAliasJob : public BaseJob
     {
         public:
-            /*! Create a new mapping from room alias to room ID.
-             * \param roomAlias
-             *   The room alias to set.
-             * \param roomId
-             *   The room ID to set.
-             */
-            explicit SetRoomAliasJob(const QString& roomAlias, const QString& roomId);
+        /*! Create a new mapping from room alias to room ID.
+         * \param roomAlias
+         *   The room alias to set.
+         * \param roomId
+         *   The room ID to set.
+         */
+        explicit SetRoomAliasJob(const QString& roomAlias,
+                                 const QString& roomId);
     };
 
     /// Get the room ID corresponding to this room alias.
     ///
     /// Requests that the server resolve a room alias to a room ID.
-    /// 
+    ///
     /// The server will use the federation API to resolve the alias if the
     /// domain part of the alias does not correspond to the server's own
     /// domain.
     class GetRoomIdByAliasJob : public BaseJob
     {
         public:
-            /*! Get the room ID corresponding to this room alias.
-             * \param roomAlias
-             *   The room alias.
-             */
-            explicit GetRoomIdByAliasJob(const QString& roomAlias);
+        /*! Get the room ID corresponding to this room alias.
+         * \param roomAlias
+         *   The room alias.
+         */
+        explicit GetRoomIdByAliasJob(const QString& roomAlias);
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetRoomIdByAliasJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomAlias);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetRoomIdByAliasJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomAlias);
 
-            ~GetRoomIdByAliasJob() override;
+        ~GetRoomIdByAliasJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The room ID for this room alias.
-            const QString& roomId() const;
-            /// A list of servers that are aware of this room alias.
-            const QStringList& servers() const;
+        /// The room ID for this room alias.
+        const QString& roomId() const;
+        /// A list of servers that are aware of this room alias.
+        const QStringList& servers() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Remove a mapping of room alias to room ID.
     ///
     /// Remove a mapping of room alias to room ID.
-    /// 
-    /// Servers may choose to implement additional access control checks here, for instance that room aliases can only be deleted by their creator or a server administrator.
+    ///
+    /// Servers may choose to implement additional access control checks here,
+    /// for instance that room aliases can only be deleted by their creator or a
+    /// server administrator.
     class DeleteRoomAliasJob : public BaseJob
     {
         public:
-            /*! Remove a mapping of room alias to room ID.
-             * \param roomAlias
-             *   The room alias to remove.
-             */
-            explicit DeleteRoomAliasJob(const QString& roomAlias);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * DeleteRoomAliasJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomAlias);
+        /*! Remove a mapping of room alias to room ID.
+         * \param roomAlias
+         *   The room alias to remove.
+         */
+        explicit DeleteRoomAliasJob(const QString& roomAlias);
 
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * DeleteRoomAliasJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomAlias);
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/event_context.cpp b/lib/csapi/event_context.cpp
index bb1f5301..9ead6ac6 100644
--- a/lib/csapi/event_context.cpp
+++ b/lib/csapi/event_context.cpp
@@ -15,12 +15,12 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class GetEventContextJob::Private
 {
     public:
-        QString begin;
-        QString end;
-        RoomEvents eventsBefore;
-        RoomEventPtr event;
-        RoomEvents eventsAfter;
-        StateEvents state;
+    QString begin;
+    QString end;
+    RoomEvents eventsBefore;
+    RoomEventPtr event;
+    RoomEvents eventsAfter;
+    StateEvents state;
 };
 
 BaseJob::Query queryToGetEventContext(Omittable<int> limit)
@@ -30,54 +30,47 @@ BaseJob::Query queryToGetEventContext(Omittable<int> limit)
     return _q;
 }
 
-QUrl GetEventContextJob::makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& eventId, Omittable<int> limit)
+QUrl GetEventContextJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
+                                        const QString& eventId,
+                                        Omittable<int> limit)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/rooms/" % roomId % "/context/" % eventId,
-            queryToGetEventContext(limit));
+                                   basePath % "/rooms/" % roomId % "/context/"
+                                           % eventId,
+                                   queryToGetEventContext(limit));
 }
 
 static const auto GetEventContextJobName = QStringLiteral("GetEventContextJob");
 
-GetEventContextJob::GetEventContextJob(const QString& roomId, const QString& eventId, Omittable<int> limit)
+GetEventContextJob::GetEventContextJob(const QString& roomId,
+                                       const QString& eventId,
+                                       Omittable<int> limit)
     : BaseJob(HttpVerb::Get, GetEventContextJobName,
-        basePath % "/rooms/" % roomId % "/context/" % eventId,
-        queryToGetEventContext(limit))
-    , d(new Private)
+              basePath % "/rooms/" % roomId % "/context/" % eventId,
+              queryToGetEventContext(limit)),
+      d(new Private)
 {
 }
 
 GetEventContextJob::~GetEventContextJob() = default;
 
-const QString& GetEventContextJob::begin() const
-{
-    return d->begin;
-}
+const QString& GetEventContextJob::begin() const { return d->begin; }
 
-const QString& GetEventContextJob::end() const
-{
-    return d->end;
-}
+const QString& GetEventContextJob::end() const { return d->end; }
 
 RoomEvents&& GetEventContextJob::eventsBefore()
 {
     return std::move(d->eventsBefore);
 }
 
-RoomEventPtr&& GetEventContextJob::event()
-{
-    return std::move(d->event);
-}
+RoomEventPtr&& GetEventContextJob::event() { return std::move(d->event); }
 
 RoomEvents&& GetEventContextJob::eventsAfter()
 {
     return std::move(d->eventsAfter);
 }
 
-StateEvents&& GetEventContextJob::state()
-{
-    return std::move(d->state);
-}
+StateEvents&& GetEventContextJob::state() { return std::move(d->state); }
 
 BaseJob::Status GetEventContextJob::parseJson(const QJsonDocument& data)
 {
@@ -90,4 +83,3 @@ BaseJob::Status GetEventContextJob::parseJson(const QJsonDocument& data)
     fromJson(json.value("state"_ls), d->state);
     return Success;
 }
-
diff --git a/lib/csapi/event_context.h b/lib/csapi/event_context.h
index a5fda7ea..cfefc550 100644
--- a/lib/csapi/event_context.h
+++ b/lib/csapi/event_context.h
@@ -6,11 +6,10 @@
 
 #include "jobs/basejob.h"
 
-#include "events/eventloader.h"
 #include "converters.h"
+#include "events/eventloader.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Get events and state around the specified event.
@@ -21,48 +20,52 @@ namespace QMatrixClient
     class GetEventContextJob : public BaseJob
     {
         public:
-            /*! Get events and state around the specified event.
-             * \param roomId
-             *   The room to get events from.
-             * \param eventId
-             *   The event to get context around.
-             * \param limit
-             *   The maximum number of events to return. Default: 10.
-             */
-            explicit GetEventContextJob(const QString& roomId, const QString& eventId, Omittable<int> limit = none);
+        /*! Get events and state around the specified event.
+         * \param roomId
+         *   The room to get events from.
+         * \param eventId
+         *   The event to get context around.
+         * \param limit
+         *   The maximum number of events to return. Default: 10.
+         */
+        explicit GetEventContextJob(const QString& roomId,
+                                    const QString& eventId,
+                                    Omittable<int> limit = none);
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetEventContextJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& eventId, Omittable<int> limit = none);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetEventContextJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId,
+                                   const QString& eventId,
+                                   Omittable<int> limit = none);
 
-            ~GetEventContextJob() override;
+        ~GetEventContextJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// A token that can be used to paginate backwards with.
-            const QString& begin() const;
-            /// A token that can be used to paginate forwards with.
-            const QString& end() const;
-            /// A list of room events that happened just before the
-            /// requested event, in reverse-chronological order.
-            RoomEvents&& eventsBefore();
-            /// Details of the requested event.
-            RoomEventPtr&& event();
-            /// A list of room events that happened just after the
-            /// requested event, in chronological order.
-            RoomEvents&& eventsAfter();
-            /// The state of the room at the last event returned.
-            StateEvents&& state();
+        /// A token that can be used to paginate backwards with.
+        const QString& begin() const;
+        /// A token that can be used to paginate forwards with.
+        const QString& end() const;
+        /// A list of room events that happened just before the
+        /// requested event, in reverse-chronological order.
+        RoomEvents&& eventsBefore();
+        /// Details of the requested event.
+        RoomEventPtr&& event();
+        /// A list of room events that happened just after the
+        /// requested event, in chronological order.
+        RoomEvents&& eventsAfter();
+        /// The state of the room at the last event returned.
+        StateEvents&& state();
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/filter.cpp b/lib/csapi/filter.cpp
index 982e60b5..40743de4 100644
--- a/lib/csapi/filter.cpp
+++ b/lib/csapi/filter.cpp
@@ -15,32 +15,29 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class DefineFilterJob::Private
 {
     public:
-        QString filterId;
+    QString filterId;
 };
 
 static const auto DefineFilterJobName = QStringLiteral("DefineFilterJob");
 
 DefineFilterJob::DefineFilterJob(const QString& userId, const Filter& filter)
     : BaseJob(HttpVerb::Post, DefineFilterJobName,
-        basePath % "/user/" % userId % "/filter")
-    , d(new Private)
+              basePath % "/user/" % userId % "/filter"),
+      d(new Private)
 {
     setRequestData(Data(toJson(filter)));
 }
 
 DefineFilterJob::~DefineFilterJob() = default;
 
-const QString& DefineFilterJob::filterId() const
-{
-    return d->filterId;
-}
+const QString& DefineFilterJob::filterId() const { return d->filterId; }
 
 BaseJob::Status DefineFilterJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("filter_id"_ls))
         return { JsonParseError,
-            "The key 'filter_id' not found in the response" };
+                 "The key 'filter_id' not found in the response" };
     fromJson(json.value("filter_id"_ls), d->filterId);
     return Success;
 }
@@ -48,34 +45,32 @@ BaseJob::Status DefineFilterJob::parseJson(const QJsonDocument& data)
 class GetFilterJob::Private
 {
     public:
-        Filter data;
+    Filter data;
 };
 
-QUrl GetFilterJob::makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& filterId)
+QUrl GetFilterJob::makeRequestUrl(QUrl baseUrl, const QString& userId,
+                                  const QString& filterId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/user/" % userId % "/filter/" % filterId);
+                                   basePath % "/user/" % userId % "/filter/"
+                                           % filterId);
 }
 
 static const auto GetFilterJobName = QStringLiteral("GetFilterJob");
 
 GetFilterJob::GetFilterJob(const QString& userId, const QString& filterId)
     : BaseJob(HttpVerb::Get, GetFilterJobName,
-        basePath % "/user/" % userId % "/filter/" % filterId)
-    , d(new Private)
+              basePath % "/user/" % userId % "/filter/" % filterId),
+      d(new Private)
 {
 }
 
 GetFilterJob::~GetFilterJob() = default;
 
-const Filter& GetFilterJob::data() const
-{
-    return d->data;
-}
+const Filter& GetFilterJob::data() const { return d->data; }
 
 BaseJob::Status GetFilterJob::parseJson(const QJsonDocument& data)
 {
     fromJson(data, d->data);
     return Success;
 }
-
diff --git a/lib/csapi/filter.h b/lib/csapi/filter.h
index 0ca7e953..85e05667 100644
--- a/lib/csapi/filter.h
+++ b/lib/csapi/filter.h
@@ -9,8 +9,7 @@
 #include "converters.h"
 #include "csapi/definitions/sync_filter.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Upload a new filter.
@@ -21,65 +20,66 @@ namespace QMatrixClient
     class DefineFilterJob : public BaseJob
     {
         public:
-            /*! Upload a new filter.
-             * \param userId
-             *   The id of the user uploading the filter. The access token must be authorized to make requests for this user id.
-             * \param filter
-             *   Uploads a new filter definition to the homeserver.
-             *   Returns a filter ID that may be used in future requests to
-             *   restrict which events are returned to the client.
-             */
-            explicit DefineFilterJob(const QString& userId, const Filter& filter);
-            ~DefineFilterJob() override;
-
-            // Result properties
-
-            /// The ID of the filter that was created. Cannot start
-            /// with a ``{`` as this character is used to determine
-            /// if the filter provided is inline JSON or a previously
-            /// declared filter by homeservers on some APIs.
-            const QString& filterId() const;
+        /*! Upload a new filter.
+         * \param userId
+         *   The id of the user uploading the filter. The access token must be
+         * authorized to make requests for this user id. \param filter Uploads a
+         * new filter definition to the homeserver. Returns a filter ID that may
+         * be used in future requests to restrict which events are returned to
+         * the client.
+         */
+        explicit DefineFilterJob(const QString& userId, const Filter& filter);
+        ~DefineFilterJob() override;
+
+        // Result properties
+
+        /// The ID of the filter that was created. Cannot start
+        /// with a ``{`` as this character is used to determine
+        /// if the filter provided is inline JSON or a previously
+        /// declared filter by homeservers on some APIs.
+        const QString& filterId() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Download a filter
     class GetFilterJob : public BaseJob
     {
         public:
-            /*! Download a filter
-             * \param userId
-             *   The user ID to download a filter for.
-             * \param filterId
-             *   The filter ID to download.
-             */
-            explicit GetFilterJob(const QString& userId, const QString& filterId);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetFilterJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& filterId);
-
-            ~GetFilterJob() override;
-
-            // Result properties
-
-            /// "The filter defintion"
-            const Filter& data() const;
+        /*! Download a filter
+         * \param userId
+         *   The user ID to download a filter for.
+         * \param filterId
+         *   The filter ID to download.
+         */
+        explicit GetFilterJob(const QString& userId, const QString& filterId);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetFilterJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId,
+                                   const QString& filterId);
+
+        ~GetFilterJob() override;
+
+        // Result properties
+
+        /// "The filter defintion"
+        const Filter& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/inviting.cpp b/lib/csapi/inviting.cpp
index 7dc33b18..4ddbe5d0 100644
--- a/lib/csapi/inviting.cpp
+++ b/lib/csapi/inviting.cpp
@@ -16,10 +16,9 @@ static const auto InviteUserJobName = QStringLiteral("InviteUserJob");
 
 InviteUserJob::InviteUserJob(const QString& roomId, const QString& userId)
     : BaseJob(HttpVerb::Post, InviteUserJobName,
-        basePath % "/rooms/" % roomId % "/invite")
+              basePath % "/rooms/" % roomId % "/invite")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("user_id"), userId);
     setRequestData(_data);
 }
-
diff --git a/lib/csapi/inviting.h b/lib/csapi/inviting.h
index 6d5d2e99..12cf1b58 100644
--- a/lib/csapi/inviting.h
+++ b/lib/csapi/inviting.h
@@ -6,40 +6,38 @@
 
 #include "jobs/basejob.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Invite a user to participate in a particular room.
     ///
     /// .. _invite-by-user-id-endpoint:
-    /// 
-    /// *Note that there are two forms of this API, which are documented separately.
-    /// This version of the API requires that the inviter knows the Matrix
-    /// identifier of the invitee. The other is documented in the*
-    /// `third party invites section`_.
-    /// 
+    ///
+    /// *Note that there are two forms of this API, which are documented
+    /// separately. This version of the API requires that the inviter knows the
+    /// Matrix identifier of the invitee. The other is documented in the* `third
+    /// party invites section`_.
+    ///
     /// This API invites a user to participate in a particular room.
     /// They do not start participating in the room until they actually join the
     /// room.
-    /// 
+    ///
     /// Only users currently in a particular room can invite other users to
     /// join that room.
-    /// 
+    ///
     /// If the user was invited to the room, the homeserver will append a
     /// ``m.room.member`` event to the room.
-    /// 
+    ///
     /// .. _third party invites section: `invite-by-third-party-id-endpoint`_
     class InviteUserJob : public BaseJob
     {
         public:
-            /*! Invite a user to participate in a particular room.
-             * \param roomId
-             *   The room identifier (not alias) to which to invite the user.
-             * \param userId
-             *   The fully qualified user ID of the invitee.
-             */
-            explicit InviteUserJob(const QString& roomId, const QString& userId);
+        /*! Invite a user to participate in a particular room.
+         * \param roomId
+         *   The room identifier (not alias) to which to invite the user.
+         * \param userId
+         *   The fully qualified user ID of the invitee.
+         */
+        explicit InviteUserJob(const QString& roomId, const QString& userId);
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/joining.cpp b/lib/csapi/joining.cpp
index 00d930fa..fe4c83e3 100644
--- a/lib/csapi/joining.cpp
+++ b/lib/csapi/joining.cpp
@@ -12,13 +12,12 @@ using namespace QMatrixClient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<JoinRoomByIdJob::ThirdPartySigned>
-    {
-        static void dumpTo(QJsonObject& jo, const JoinRoomByIdJob::ThirdPartySigned& pod)
+    template <> struct JsonObjectConverter<JoinRoomByIdJob::ThirdPartySigned> {
+        static void dumpTo(QJsonObject& jo,
+                           const JoinRoomByIdJob::ThirdPartySigned& pod)
         {
             addParam<>(jo, QStringLiteral("sender"), pod.sender);
             addParam<>(jo, QStringLiteral("mxid"), pod.mxid);
@@ -31,44 +30,42 @@ namespace QMatrixClient
 class JoinRoomByIdJob::Private
 {
     public:
-        QString roomId;
+    QString roomId;
 };
 
 static const auto JoinRoomByIdJobName = QStringLiteral("JoinRoomByIdJob");
 
-JoinRoomByIdJob::JoinRoomByIdJob(const QString& roomId, const Omittable<ThirdPartySigned>& thirdPartySigned)
+JoinRoomByIdJob::JoinRoomByIdJob(
+        const QString& roomId,
+        const Omittable<ThirdPartySigned>& thirdPartySigned)
     : BaseJob(HttpVerb::Post, JoinRoomByIdJobName,
-        basePath % "/rooms/" % roomId % "/join")
-    , d(new Private)
+              basePath % "/rooms/" % roomId % "/join"),
+      d(new Private)
 {
     QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("third_party_signed"), thirdPartySigned);
+    addParam<IfNotEmpty>(_data, QStringLiteral("third_party_signed"),
+                         thirdPartySigned);
     setRequestData(_data);
 }
 
 JoinRoomByIdJob::~JoinRoomByIdJob() = default;
 
-const QString& JoinRoomByIdJob::roomId() const
-{
-    return d->roomId;
-}
+const QString& JoinRoomByIdJob::roomId() const { return d->roomId; }
 
 BaseJob::Status JoinRoomByIdJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("room_id"_ls))
         return { JsonParseError,
-            "The key 'room_id' not found in the response" };
+                 "The key 'room_id' not found in the response" };
     fromJson(json.value("room_id"_ls), d->roomId);
     return Success;
 }
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<JoinRoomJob::Signed>
-    {
+    template <> struct JsonObjectConverter<JoinRoomJob::Signed> {
         static void dumpTo(QJsonObject& jo, const JoinRoomJob::Signed& pod)
         {
             addParam<>(jo, QStringLiteral("sender"), pod.sender);
@@ -78,9 +75,9 @@ namespace QMatrixClient
         }
     };
 
-    template <> struct JsonObjectConverter<JoinRoomJob::ThirdPartySigned>
-    {
-        static void dumpTo(QJsonObject& jo, const JoinRoomJob::ThirdPartySigned& pod)
+    template <> struct JsonObjectConverter<JoinRoomJob::ThirdPartySigned> {
+        static void dumpTo(QJsonObject& jo,
+                           const JoinRoomJob::ThirdPartySigned& pod)
         {
             addParam<>(jo, QStringLiteral("signed"), pod.signedData);
         }
@@ -90,7 +87,7 @@ namespace QMatrixClient
 class JoinRoomJob::Private
 {
     public:
-        QString roomId;
+    QString roomId;
 };
 
 BaseJob::Query queryToJoinRoom(const QStringList& serverName)
@@ -102,31 +99,29 @@ BaseJob::Query queryToJoinRoom(const QStringList& serverName)
 
 static const auto JoinRoomJobName = QStringLiteral("JoinRoomJob");
 
-JoinRoomJob::JoinRoomJob(const QString& roomIdOrAlias, const QStringList& serverName, const Omittable<ThirdPartySigned>& thirdPartySigned)
+JoinRoomJob::JoinRoomJob(const QString& roomIdOrAlias,
+                         const QStringList& serverName,
+                         const Omittable<ThirdPartySigned>& thirdPartySigned)
     : BaseJob(HttpVerb::Post, JoinRoomJobName,
-        basePath % "/join/" % roomIdOrAlias,
-        queryToJoinRoom(serverName))
-    , d(new Private)
+              basePath % "/join/" % roomIdOrAlias, queryToJoinRoom(serverName)),
+      d(new Private)
 {
     QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("third_party_signed"), thirdPartySigned);
+    addParam<IfNotEmpty>(_data, QStringLiteral("third_party_signed"),
+                         thirdPartySigned);
     setRequestData(_data);
 }
 
 JoinRoomJob::~JoinRoomJob() = default;
 
-const QString& JoinRoomJob::roomId() const
-{
-    return d->roomId;
-}
+const QString& JoinRoomJob::roomId() const { return d->roomId; }
 
 BaseJob::Status JoinRoomJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("room_id"_ls))
         return { JsonParseError,
-            "The key 'room_id' not found in the response" };
+                 "The key 'room_id' not found in the response" };
     fromJson(json.value("room_id"_ls), d->roomId);
     return Success;
 }
-
diff --git a/lib/csapi/joining.h b/lib/csapi/joining.h
index 52c8ea42..5d118dab 100644
--- a/lib/csapi/joining.h
+++ b/lib/csapi/joining.h
@@ -9,143 +9,156 @@
 #include "converters.h"
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Start the requesting user participating in a particular room.
     ///
-    /// *Note that this API requires a room ID, not alias.* ``/join/{roomIdOrAlias}`` *exists if you have a room alias.*
-    /// 
+    /// *Note that this API requires a room ID, not alias.*
+    /// ``/join/{roomIdOrAlias}`` *exists if you have a room alias.*
+    ///
     /// This API starts a user participating in a particular room, if that user
     /// is allowed to participate in that room. After this call, the client is
     /// allowed to see all current state events in the room, and all subsequent
     /// events associated with the room until the user leaves the room.
-    /// 
+    ///
     /// After a user has joined a room, the room will appear as an entry in the
     /// response of the |/initialSync|_ and |/sync|_ APIs.
-    /// 
+    ///
     /// If a ``third_party_signed`` was supplied, the homeserver must verify
     /// that it matches a pending ``m.room.third_party_invite`` event in the
     /// room, and perform key validity checking if required by the event.
     class JoinRoomByIdJob : public BaseJob
     {
         public:
-            // Inner data structures
-
-            /// A signature of an ``m.third_party_invite`` token to prove that this user owns a third party identity which has been invited to the room.
-            struct ThirdPartySigned
-            {
-                /// The Matrix ID of the user who issued the invite.
-                QString sender;
-                /// The Matrix ID of the invitee.
-                QString mxid;
-                /// The state key of the m.third_party_invite event.
-                QString token;
-                /// A signatures object containing a signature of the entire signed object.
-                QJsonObject signatures;
-            };
-
-            // Construction/destruction
-
-            /*! Start the requesting user participating in a particular room.
-             * \param roomId
-             *   The room identifier (not alias) to join.
-             * \param thirdPartySigned
-             *   A signature of an ``m.third_party_invite`` token to prove that this user owns a third party identity which has been invited to the room.
-             */
-            explicit JoinRoomByIdJob(const QString& roomId, const Omittable<ThirdPartySigned>& thirdPartySigned = none);
-            ~JoinRoomByIdJob() override;
-
-            // Result properties
-
-            /// The joined room ID.
-            const QString& roomId() const;
+        // Inner data structures
+
+        /// A signature of an ``m.third_party_invite`` token to prove that this
+        /// user owns a third party identity which has been invited to the room.
+        struct ThirdPartySigned {
+            /// The Matrix ID of the user who issued the invite.
+            QString sender;
+            /// The Matrix ID of the invitee.
+            QString mxid;
+            /// The state key of the m.third_party_invite event.
+            QString token;
+            /// A signatures object containing a signature of the entire signed
+            /// object.
+            QJsonObject signatures;
+        };
+
+        // Construction/destruction
+
+        /*! Start the requesting user participating in a particular room.
+         * \param roomId
+         *   The room identifier (not alias) to join.
+         * \param thirdPartySigned
+         *   A signature of an ``m.third_party_invite`` token to prove that this
+         * user owns a third party identity which has been invited to the room.
+         */
+        explicit JoinRoomByIdJob(
+                const QString& roomId,
+                const Omittable<ThirdPartySigned>& thirdPartySigned = none);
+        ~JoinRoomByIdJob() override;
+
+        // Result properties
+
+        /// The joined room ID.
+        const QString& roomId() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Start the requesting user participating in a particular room.
     ///
-    /// *Note that this API takes either a room ID or alias, unlike* ``/room/{roomId}/join``.
-    /// 
+    /// *Note that this API takes either a room ID or alias, unlike*
+    /// ``/room/{roomId}/join``.
+    ///
     /// This API starts a user participating in a particular room, if that user
     /// is allowed to participate in that room. After this call, the client is
     /// allowed to see all current state events in the room, and all subsequent
     /// events associated with the room until the user leaves the room.
-    /// 
+    ///
     /// After a user has joined a room, the room will appear as an entry in the
     /// response of the |/initialSync|_ and |/sync|_ APIs.
-    /// 
+    ///
     /// If a ``third_party_signed`` was supplied, the homeserver must verify
     /// that it matches a pending ``m.room.third_party_invite`` event in the
     /// room, and perform key validity checking if required by the event.
     class JoinRoomJob : public BaseJob
     {
         public:
-            // Inner data structures
-
-            /// *Note that this API takes either a room ID or alias, unlike* ``/room/{roomId}/join``.
-            /// 
-            /// This API starts a user participating in a particular room, if that user
-            /// is allowed to participate in that room. After this call, the client is
-            /// allowed to see all current state events in the room, and all subsequent
-            /// events associated with the room until the user leaves the room.
-            /// 
-            /// After a user has joined a room, the room will appear as an entry in the
-            /// response of the |/initialSync|_ and |/sync|_ APIs.
-            /// 
-            /// If a ``third_party_signed`` was supplied, the homeserver must verify
-            /// that it matches a pending ``m.room.third_party_invite`` event in the
-            /// room, and perform key validity checking if required by the event.
-            struct Signed
-            {
-                /// The Matrix ID of the user who issued the invite.
-                QString sender;
-                /// The Matrix ID of the invitee.
-                QString mxid;
-                /// The state key of the m.third_party_invite event.
-                QString token;
-                /// A signatures object containing a signature of the entire signed object.
-                QJsonObject signatures;
-            };
-
-            /// A signature of an ``m.third_party_invite`` token to prove that this user owns a third party identity which has been invited to the room.
-            struct ThirdPartySigned
-            {
-                /// A signature of an ``m.third_party_invite`` token to prove that this user owns a third party identity which has been invited to the room.
-                Signed signedData;
-            };
-
-            // Construction/destruction
-
-            /*! Start the requesting user participating in a particular room.
-             * \param roomIdOrAlias
-             *   The room identifier or alias to join.
-             * \param serverName
-             *   The servers to attempt to join the room through. One of the servers
-             *   must be participating in the room.
-             * \param thirdPartySigned
-             *   A signature of an ``m.third_party_invite`` token to prove that this user owns a third party identity which has been invited to the room.
-             */
-            explicit JoinRoomJob(const QString& roomIdOrAlias, const QStringList& serverName = {}, const Omittable<ThirdPartySigned>& thirdPartySigned = none);
-            ~JoinRoomJob() override;
-
-            // Result properties
-
-            /// The joined room ID.
-            const QString& roomId() const;
+        // Inner data structures
+
+        /// *Note that this API takes either a room ID or alias, unlike*
+        /// ``/room/{roomId}/join``.
+        ///
+        /// This API starts a user participating in a particular room, if that
+        /// user is allowed to participate in that room. After this call, the
+        /// client is allowed to see all current state events in the room, and
+        /// all subsequent events associated with the room until the user leaves
+        /// the room.
+        ///
+        /// After a user has joined a room, the room will appear as an entry in
+        /// the response of the |/initialSync|_ and |/sync|_ APIs.
+        ///
+        /// If a ``third_party_signed`` was supplied, the homeserver must verify
+        /// that it matches a pending ``m.room.third_party_invite`` event in the
+        /// room, and perform key validity checking if required by the event.
+        struct Signed {
+            /// The Matrix ID of the user who issued the invite.
+            QString sender;
+            /// The Matrix ID of the invitee.
+            QString mxid;
+            /// The state key of the m.third_party_invite event.
+            QString token;
+            /// A signatures object containing a signature of the entire signed
+            /// object.
+            QJsonObject signatures;
+        };
+
+        /// A signature of an ``m.third_party_invite`` token to prove that this
+        /// user owns a third party identity which has been invited to the room.
+        struct ThirdPartySigned {
+            /// A signature of an ``m.third_party_invite`` token to prove that
+            /// this user owns a third party identity which has been invited to
+            /// the room.
+            Signed signedData;
+        };
+
+        // Construction/destruction
+
+        /*! Start the requesting user participating in a particular room.
+         * \param roomIdOrAlias
+         *   The room identifier or alias to join.
+         * \param serverName
+         *   The servers to attempt to join the room through. One of the servers
+         *   must be participating in the room.
+         * \param thirdPartySigned
+         *   A signature of an ``m.third_party_invite`` token to prove that this
+         * user owns a third party identity which has been invited to the room.
+         */
+        explicit JoinRoomJob(
+                const QString& roomIdOrAlias,
+                const QStringList& serverName = {},
+                const Omittable<ThirdPartySigned>& thirdPartySigned = none);
+        ~JoinRoomJob() override;
+
+        // Result properties
+
+        /// The joined room ID.
+        const QString& roomId() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/keys.cpp b/lib/csapi/keys.cpp
index 6c16a8a3..862366a3 100644
--- a/lib/csapi/keys.cpp
+++ b/lib/csapi/keys.cpp
@@ -15,15 +15,15 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class UploadKeysJob::Private
 {
     public:
-        QHash<QString, int> oneTimeKeyCounts;
+    QHash<QString, int> oneTimeKeyCounts;
 };
 
 static const auto UploadKeysJobName = QStringLiteral("UploadKeysJob");
 
-UploadKeysJob::UploadKeysJob(const Omittable<DeviceKeys>& deviceKeys, const QHash<QString, QVariant>& oneTimeKeys)
-    : BaseJob(HttpVerb::Post, UploadKeysJobName,
-        basePath % "/keys/upload")
-    , d(new Private)
+UploadKeysJob::UploadKeysJob(const Omittable<DeviceKeys>& deviceKeys,
+                             const QHash<QString, QVariant>& oneTimeKeys)
+    : BaseJob(HttpVerb::Post, UploadKeysJobName, basePath % "/keys/upload"),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("device_keys"), deviceKeys);
@@ -43,29 +43,29 @@ BaseJob::Status UploadKeysJob::parseJson(const QJsonDocument& data)
     auto json = data.object();
     if (!json.contains("one_time_key_counts"_ls))
         return { JsonParseError,
-            "The key 'one_time_key_counts' not found in the response" };
+                 "The key 'one_time_key_counts' not found in the response" };
     fromJson(json.value("one_time_key_counts"_ls), d->oneTimeKeyCounts);
     return Success;
 }
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<QueryKeysJob::UnsignedDeviceInfo>
-    {
-        static void fillFrom(const QJsonObject& jo, QueryKeysJob::UnsignedDeviceInfo& result)
+    template <> struct JsonObjectConverter<QueryKeysJob::UnsignedDeviceInfo> {
+        static void fillFrom(const QJsonObject& jo,
+                             QueryKeysJob::UnsignedDeviceInfo& result)
         {
-            fromJson(jo.value("device_display_name"_ls), result.deviceDisplayName);
+            fromJson(jo.value("device_display_name"_ls),
+                     result.deviceDisplayName);
         }
     };
 
-    template <> struct JsonObjectConverter<QueryKeysJob::DeviceInformation>
-    {
-        static void fillFrom(const QJsonObject& jo, QueryKeysJob::DeviceInformation& result)
+    template <> struct JsonObjectConverter<QueryKeysJob::DeviceInformation> {
+        static void fillFrom(const QJsonObject& jo,
+                             QueryKeysJob::DeviceInformation& result)
         {
             fillFromJson<DeviceKeys>(jo, result);
-                    fromJson(jo.value("unsigned"_ls), result.unsignedData);
+            fromJson(jo.value("unsigned"_ls), result.unsignedData);
         }
     };
 } // namespace QMatrixClient
@@ -73,16 +73,16 @@ namespace QMatrixClient
 class QueryKeysJob::Private
 {
     public:
-        QHash<QString, QJsonObject> failures;
-        QHash<QString, QHash<QString, DeviceInformation>> deviceKeys;
+    QHash<QString, QJsonObject> failures;
+    QHash<QString, QHash<QString, DeviceInformation>> deviceKeys;
 };
 
 static const auto QueryKeysJobName = QStringLiteral("QueryKeysJob");
 
-QueryKeysJob::QueryKeysJob(const QHash<QString, QStringList>& deviceKeys, Omittable<int> timeout, const QString& token)
-    : BaseJob(HttpVerb::Post, QueryKeysJobName,
-        basePath % "/keys/query")
-    , d(new Private)
+QueryKeysJob::QueryKeysJob(const QHash<QString, QStringList>& deviceKeys,
+                           Omittable<int> timeout, const QString& token)
+    : BaseJob(HttpVerb::Post, QueryKeysJobName, basePath % "/keys/query"),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("timeout"), timeout);
@@ -98,7 +98,8 @@ const QHash<QString, QJsonObject>& QueryKeysJob::failures() const
     return d->failures;
 }
 
-const QHash<QString, QHash<QString, QueryKeysJob::DeviceInformation>>& QueryKeysJob::deviceKeys() const
+const QHash<QString, QHash<QString, QueryKeysJob::DeviceInformation>>&
+QueryKeysJob::deviceKeys() const
 {
     return d->deviceKeys;
 }
@@ -114,16 +115,17 @@ BaseJob::Status QueryKeysJob::parseJson(const QJsonDocument& data)
 class ClaimKeysJob::Private
 {
     public:
-        QHash<QString, QJsonObject> failures;
-        QHash<QString, QHash<QString, QVariant>> oneTimeKeys;
+    QHash<QString, QJsonObject> failures;
+    QHash<QString, QHash<QString, QVariant>> oneTimeKeys;
 };
 
 static const auto ClaimKeysJobName = QStringLiteral("ClaimKeysJob");
 
-ClaimKeysJob::ClaimKeysJob(const QHash<QString, QHash<QString, QString>>& oneTimeKeys, Omittable<int> timeout)
-    : BaseJob(HttpVerb::Post, ClaimKeysJobName,
-        basePath % "/keys/claim")
-    , d(new Private)
+ClaimKeysJob::ClaimKeysJob(
+        const QHash<QString, QHash<QString, QString>>& oneTimeKeys,
+        Omittable<int> timeout)
+    : BaseJob(HttpVerb::Post, ClaimKeysJobName, basePath % "/keys/claim"),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("timeout"), timeout);
@@ -138,7 +140,8 @@ const QHash<QString, QJsonObject>& ClaimKeysJob::failures() const
     return d->failures;
 }
 
-const QHash<QString, QHash<QString, QVariant>>& ClaimKeysJob::oneTimeKeys() const
+const QHash<QString, QHash<QString, QVariant>>&
+ClaimKeysJob::oneTimeKeys() const
 {
     return d->oneTimeKeys;
 }
@@ -154,8 +157,8 @@ BaseJob::Status ClaimKeysJob::parseJson(const QJsonDocument& data)
 class GetKeysChangesJob::Private
 {
     public:
-        QStringList changed;
-        QStringList left;
+    QStringList changed;
+    QStringList left;
 };
 
 BaseJob::Query queryToGetKeysChanges(const QString& from, const QString& to)
@@ -166,34 +169,28 @@ BaseJob::Query queryToGetKeysChanges(const QString& from, const QString& to)
     return _q;
 }
 
-QUrl GetKeysChangesJob::makeRequestUrl(QUrl baseUrl, const QString& from, const QString& to)
+QUrl GetKeysChangesJob::makeRequestUrl(QUrl baseUrl, const QString& from,
+                                       const QString& to)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/keys/changes",
-            queryToGetKeysChanges(from, to));
+                                   basePath % "/keys/changes",
+                                   queryToGetKeysChanges(from, to));
 }
 
 static const auto GetKeysChangesJobName = QStringLiteral("GetKeysChangesJob");
 
 GetKeysChangesJob::GetKeysChangesJob(const QString& from, const QString& to)
-    : BaseJob(HttpVerb::Get, GetKeysChangesJobName,
-        basePath % "/keys/changes",
-        queryToGetKeysChanges(from, to))
-    , d(new Private)
+    : BaseJob(HttpVerb::Get, GetKeysChangesJobName, basePath % "/keys/changes",
+              queryToGetKeysChanges(from, to)),
+      d(new Private)
 {
 }
 
 GetKeysChangesJob::~GetKeysChangesJob() = default;
 
-const QStringList& GetKeysChangesJob::changed() const
-{
-    return d->changed;
-}
+const QStringList& GetKeysChangesJob::changed() const { return d->changed; }
 
-const QStringList& GetKeysChangesJob::left() const
-{
-    return d->left;
-}
+const QStringList& GetKeysChangesJob::left() const { return d->left; }
 
 BaseJob::Status GetKeysChangesJob::parseJson(const QJsonDocument& data)
 {
@@ -202,4 +199,3 @@ BaseJob::Status GetKeysChangesJob::parseJson(const QJsonDocument& data)
     fromJson(json.value("left"_ls), d->left);
     return Success;
 }
-
diff --git a/lib/csapi/keys.h b/lib/csapi/keys.h
index e59b1dae..a01cd33b 100644
--- a/lib/csapi/keys.h
+++ b/lib/csapi/keys.h
@@ -6,14 +6,13 @@
 
 #include "jobs/basejob.h"
 
+#include "converters.h"
 #include "csapi/definitions/device_keys.h"
 #include <QtCore/QHash>
-#include "converters.h"
-#include <QtCore/QVariant>
 #include <QtCore/QJsonObject>
+#include <QtCore/QVariant>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Upload end-to-end encryption keys.
@@ -22,33 +21,35 @@ namespace QMatrixClient
     class UploadKeysJob : public BaseJob
     {
         public:
-            /*! Upload end-to-end encryption keys.
-             * \param deviceKeys
-             *   Identity keys for the device. May be absent if no new
-             *   identity keys are required.
-             * \param oneTimeKeys
-             *   One-time public keys for "pre-key" messages.  The names of
-             *   the properties should be in the format
-             *   ``<algorithm>:<key_id>``. The format of the key is determined
-             *   by the key algorithm.
-             *   
-             *   May be absent if no new one-time keys are required.
-             */
-            explicit UploadKeysJob(const Omittable<DeviceKeys>& deviceKeys = none, const QHash<QString, QVariant>& oneTimeKeys = {});
-            ~UploadKeysJob() override;
-
-            // Result properties
-
-            /// For each key algorithm, the number of unclaimed one-time keys
-            /// of that type currently held on the server for this device.
-            const QHash<QString, int>& oneTimeKeyCounts() const;
+        /*! Upload end-to-end encryption keys.
+         * \param deviceKeys
+         *   Identity keys for the device. May be absent if no new
+         *   identity keys are required.
+         * \param oneTimeKeys
+         *   One-time public keys for "pre-key" messages.  The names of
+         *   the properties should be in the format
+         *   ``<algorithm>:<key_id>``. The format of the key is determined
+         *   by the key algorithm.
+         *
+         *   May be absent if no new one-time keys are required.
+         */
+        explicit UploadKeysJob(
+                const Omittable<DeviceKeys>& deviceKeys = none,
+                const QHash<QString, QVariant>& oneTimeKeys = {});
+        ~UploadKeysJob() override;
+
+        // Result properties
+
+        /// For each key algorithm, the number of unclaimed one-time keys
+        /// of that type currently held on the server for this device.
+        const QHash<QString, int>& oneTimeKeyCounts() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Download device identity keys.
@@ -57,68 +58,70 @@ namespace QMatrixClient
     class QueryKeysJob : public BaseJob
     {
         public:
-            // Inner data structures
-
+        // Inner data structures
+
+        /// Additional data added to the device key information
+        /// by intermediate servers, and not covered by the
+        /// signatures.
+        struct UnsignedDeviceInfo {
+            /// The display name which the user set on the device.
+            QString deviceDisplayName;
+        };
+
+        /// Returns the current devices and identity keys for the given users.
+        struct DeviceInformation : DeviceKeys {
             /// Additional data added to the device key information
             /// by intermediate servers, and not covered by the
             /// signatures.
-            struct UnsignedDeviceInfo
-            {
-                /// The display name which the user set on the device.
-                QString deviceDisplayName;
-            };
-
-            /// Returns the current devices and identity keys for the given users.
-            struct DeviceInformation : DeviceKeys
-            {
-                /// Additional data added to the device key information
-                /// by intermediate servers, and not covered by the
-                /// signatures.
-                Omittable<UnsignedDeviceInfo> unsignedData;
-            };
-
-            // Construction/destruction
-
-            /*! Download device identity keys.
-             * \param deviceKeys
-             *   The keys to be downloaded. A map from user ID, to a list of
-             *   device IDs, or to an empty list to indicate all devices for the
-             *   corresponding user.
-             * \param timeout
-             *   The time (in milliseconds) to wait when downloading keys from
-             *   remote servers. 10 seconds is the recommended default.
-             * \param token
-             *   If the client is fetching keys as a result of a device update received
-             *   in a sync request, this should be the 'since' token of that sync request,
-             *   or any later sync token. This allows the server to ensure its response
-             *   contains the keys advertised by the notification in that sync.
-             */
-            explicit QueryKeysJob(const QHash<QString, QStringList>& deviceKeys, Omittable<int> timeout = none, const QString& token = {});
-            ~QueryKeysJob() override;
-
-            // Result properties
-
-            /// If any remote homeservers could not be reached, they are
-            /// recorded here. The names of the properties are the names of
-            /// the unreachable servers.
-            /// 
-            /// If the homeserver could be reached, but the user or device
-            /// was unknown, no failure is recorded. Instead, the corresponding
-            /// user or device is missing from the ``device_keys`` result.
-            const QHash<QString, QJsonObject>& failures() const;
-            /// Information on the queried devices. A map from user ID, to a
-            /// map from device ID to device information.  For each device,
-            /// the information returned will be the same as uploaded via
-            /// ``/keys/upload``, with the addition of an ``unsigned``
-            /// property.
-            const QHash<QString, QHash<QString, DeviceInformation>>& deviceKeys() const;
+            Omittable<UnsignedDeviceInfo> unsignedData;
+        };
+
+        // Construction/destruction
+
+        /*! Download device identity keys.
+         * \param deviceKeys
+         *   The keys to be downloaded. A map from user ID, to a list of
+         *   device IDs, or to an empty list to indicate all devices for the
+         *   corresponding user.
+         * \param timeout
+         *   The time (in milliseconds) to wait when downloading keys from
+         *   remote servers. 10 seconds is the recommended default.
+         * \param token
+         *   If the client is fetching keys as a result of a device update
+         * received in a sync request, this should be the 'since' token of that
+         * sync request, or any later sync token. This allows the server to
+         * ensure its response contains the keys advertised by the notification
+         * in that sync.
+         */
+        explicit QueryKeysJob(const QHash<QString, QStringList>& deviceKeys,
+                              Omittable<int> timeout = none,
+                              const QString& token = {});
+        ~QueryKeysJob() override;
+
+        // Result properties
+
+        /// If any remote homeservers could not be reached, they are
+        /// recorded here. The names of the properties are the names of
+        /// the unreachable servers.
+        ///
+        /// If the homeserver could be reached, but the user or device
+        /// was unknown, no failure is recorded. Instead, the corresponding
+        /// user or device is missing from the ``device_keys`` result.
+        const QHash<QString, QJsonObject>& failures() const;
+        /// Information on the queried devices. A map from user ID, to a
+        /// map from device ID to device information.  For each device,
+        /// the information returned will be the same as uploaded via
+        /// ``/keys/upload``, with the addition of an ``unsigned``
+        /// property.
+        const QHash<QString, QHash<QString, DeviceInformation>>&
+        deviceKeys() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Claim one-time encryption keys.
@@ -127,46 +130,49 @@ namespace QMatrixClient
     class ClaimKeysJob : public BaseJob
     {
         public:
-            /*! Claim one-time encryption keys.
-             * \param oneTimeKeys
-             *   The keys to be claimed. A map from user ID, to a map from
-             *   device ID to algorithm name.
-             * \param timeout
-             *   The time (in milliseconds) to wait when downloading keys from
-             *   remote servers. 10 seconds is the recommended default.
-             */
-            explicit ClaimKeysJob(const QHash<QString, QHash<QString, QString>>& oneTimeKeys, Omittable<int> timeout = none);
-            ~ClaimKeysJob() override;
-
-            // Result properties
-
-            /// If any remote homeservers could not be reached, they are
-            /// recorded here. The names of the properties are the names of
-            /// the unreachable servers.
-            /// 
-            /// If the homeserver could be reached, but the user or device
-            /// was unknown, no failure is recorded. Instead, the corresponding
-            /// user or device is missing from the ``one_time_keys`` result.
-            const QHash<QString, QJsonObject>& failures() const;
-            /// One-time keys for the queried devices. A map from user ID, to a
-            /// map from devices to a map from ``<algorithm>:<key_id>`` to the key object.
-            const QHash<QString, QHash<QString, QVariant>>& oneTimeKeys() const;
+        /*! Claim one-time encryption keys.
+         * \param oneTimeKeys
+         *   The keys to be claimed. A map from user ID, to a map from
+         *   device ID to algorithm name.
+         * \param timeout
+         *   The time (in milliseconds) to wait when downloading keys from
+         *   remote servers. 10 seconds is the recommended default.
+         */
+        explicit ClaimKeysJob(
+                const QHash<QString, QHash<QString, QString>>& oneTimeKeys,
+                Omittable<int> timeout = none);
+        ~ClaimKeysJob() override;
+
+        // Result properties
+
+        /// If any remote homeservers could not be reached, they are
+        /// recorded here. The names of the properties are the names of
+        /// the unreachable servers.
+        ///
+        /// If the homeserver could be reached, but the user or device
+        /// was unknown, no failure is recorded. Instead, the corresponding
+        /// user or device is missing from the ``one_time_keys`` result.
+        const QHash<QString, QJsonObject>& failures() const;
+        /// One-time keys for the queried devices. A map from user ID, to a
+        /// map from devices to a map from ``<algorithm>:<key_id>`` to the key
+        /// object.
+        const QHash<QString, QHash<QString, QVariant>>& oneTimeKeys() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Query users with recent device key updates.
     ///
     /// Gets a list of users who have updated their device identity keys since a
     /// previous sync token.
-    /// 
+    ///
     /// The server should include in the results any users who:
-    /// 
+    ///
     /// * currently share a room with the calling user (ie, both users have
     ///   membership state ``join``); *and*
     /// * added new device identity keys or removed an existing device with
@@ -174,46 +180,47 @@ namespace QMatrixClient
     class GetKeysChangesJob : public BaseJob
     {
         public:
-            /*! Query users with recent device key updates.
-             * \param from
-             *   The desired start point of the list. Should be the ``next_batch`` field
-             *   from a response to an earlier call to |/sync|. Users who have not
-             *   uploaded new device identity keys since this point, nor deleted
-             *   existing devices with identity keys since then, will be excluded
-             *   from the results.
-             * \param to
-             *   The desired end point of the list. Should be the ``next_batch``
-             *   field from a recent call to |/sync| - typically the most recent
-             *   such call. This may be used by the server as a hint to check its
-             *   caches are up to date.
-             */
-            explicit GetKeysChangesJob(const QString& from, const QString& to);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetKeysChangesJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& from, const QString& to);
-
-            ~GetKeysChangesJob() override;
-
-            // Result properties
-
-            /// The Matrix User IDs of all users who updated their device
-            /// identity keys.
-            const QStringList& changed() const;
-            /// The Matrix User IDs of all users who may have left all
-            /// the end-to-end encrypted rooms they previously shared
-            /// with the user.
-            const QStringList& left() const;
+        /*! Query users with recent device key updates.
+         * \param from
+         *   The desired start point of the list. Should be the ``next_batch``
+         * field from a response to an earlier call to |/sync|. Users who have
+         * not uploaded new device identity keys since this point, nor deleted
+         *   existing devices with identity keys since then, will be excluded
+         *   from the results.
+         * \param to
+         *   The desired end point of the list. Should be the ``next_batch``
+         *   field from a recent call to |/sync| - typically the most recent
+         *   such call. This may be used by the server as a hint to check its
+         *   caches are up to date.
+         */
+        explicit GetKeysChangesJob(const QString& from, const QString& to);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetKeysChangesJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& from,
+                                   const QString& to);
+
+        ~GetKeysChangesJob() override;
+
+        // Result properties
+
+        /// The Matrix User IDs of all users who updated their device
+        /// identity keys.
+        const QStringList& changed() const;
+        /// The Matrix User IDs of all users who may have left all
+        /// the end-to-end encrypted rooms they previously shared
+        /// with the user.
+        const QStringList& left() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/kicking.cpp b/lib/csapi/kicking.cpp
index 1d6d5543..05c4c581 100644
--- a/lib/csapi/kicking.cpp
+++ b/lib/csapi/kicking.cpp
@@ -14,13 +14,13 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 static const auto KickJobName = QStringLiteral("KickJob");
 
-KickJob::KickJob(const QString& roomId, const QString& userId, const QString& reason)
+KickJob::KickJob(const QString& roomId, const QString& userId,
+                 const QString& reason)
     : BaseJob(HttpVerb::Post, KickJobName,
-        basePath % "/rooms/" % roomId % "/kick")
+              basePath % "/rooms/" % roomId % "/kick")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("user_id"), userId);
     addParam<IfNotEmpty>(_data, QStringLiteral("reason"), reason);
     setRequestData(_data);
 }
-
diff --git a/lib/csapi/kicking.h b/lib/csapi/kicking.h
index 714079cf..d75b8df3 100644
--- a/lib/csapi/kicking.h
+++ b/lib/csapi/kicking.h
@@ -6,32 +6,32 @@
 
 #include "jobs/basejob.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Kick a user from the room.
     ///
     /// Kick a user from the room.
-    /// 
-    /// The caller must have the required power level in order to perform this operation.
-    /// 
-    /// Kicking a user adjusts the target member's membership state to be ``leave`` with an
-    /// optional ``reason``. Like with other membership changes, a user can directly adjust
-    /// the target member's state by making a request to ``/rooms/<room id>/state/m.room.member/<user id>``.
+    ///
+    /// The caller must have the required power level in order to perform this
+    /// operation.
+    ///
+    /// Kicking a user adjusts the target member's membership state to be
+    /// ``leave`` with an optional ``reason``. Like with other membership
+    /// changes, a user can directly adjust the target member's state by making
+    /// a request to ``/rooms/<room id>/state/m.room.member/<user id>``.
     class KickJob : public BaseJob
     {
         public:
-            /*! Kick a user from the room.
-             * \param roomId
-             *   The room identifier (not alias) from which the user should be kicked.
-             * \param userId
-             *   The fully qualified user ID of the user being kicked.
-             * \param reason
-             *   The reason the user has been kicked. This will be supplied as the 
-             *   ``reason`` on the target's updated `m.room.member`_ event.
-             */
-            explicit KickJob(const QString& roomId, const QString& userId, const QString& reason = {});
+        /*! Kick a user from the room.
+         * \param roomId
+         *   The room identifier (not alias) from which the user should be
+         * kicked. \param userId The fully qualified user ID of the user being
+         * kicked. \param reason The reason the user has been kicked. This will
+         * be supplied as the
+         *   ``reason`` on the target's updated `m.room.member`_ event.
+         */
+        explicit KickJob(const QString& roomId, const QString& userId,
+                         const QString& reason = {});
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/leaving.cpp b/lib/csapi/leaving.cpp
index 09e5f83b..c46567d7 100644
--- a/lib/csapi/leaving.cpp
+++ b/lib/csapi/leaving.cpp
@@ -15,28 +15,27 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 QUrl LeaveRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/rooms/" % roomId % "/leave");
+                                   basePath % "/rooms/" % roomId % "/leave");
 }
 
 static const auto LeaveRoomJobName = QStringLiteral("LeaveRoomJob");
 
 LeaveRoomJob::LeaveRoomJob(const QString& roomId)
     : BaseJob(HttpVerb::Post, LeaveRoomJobName,
-        basePath % "/rooms/" % roomId % "/leave")
+              basePath % "/rooms/" % roomId % "/leave")
 {
 }
 
 QUrl ForgetRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/rooms/" % roomId % "/forget");
+                                   basePath % "/rooms/" % roomId % "/forget");
 }
 
 static const auto ForgetRoomJobName = QStringLiteral("ForgetRoomJob");
 
 ForgetRoomJob::ForgetRoomJob(const QString& roomId)
     : BaseJob(HttpVerb::Post, ForgetRoomJobName,
-        basePath % "/rooms/" % roomId % "/forget")
+              basePath % "/rooms/" % roomId % "/forget")
 {
 }
-
diff --git a/lib/csapi/leaving.h b/lib/csapi/leaving.h
index 3a340034..374d27d4 100644
--- a/lib/csapi/leaving.h
+++ b/lib/csapi/leaving.h
@@ -6,70 +6,66 @@
 
 #include "jobs/basejob.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Stop the requesting user participating in a particular room.
     ///
     /// This API stops a user participating in a particular room.
-    /// 
+    ///
     /// If the user was already in the room, they will no longer be able to see
     /// new events in the room. If the room requires an invite to join, they
     /// will need to be re-invited before they can re-join.
-    /// 
+    ///
     /// If the user was invited to the room, but had not joined, this call
     /// serves to reject the invite.
-    /// 
+    ///
     /// The user will still be allowed to retrieve history from the room which
     /// they were previously allowed to see.
     class LeaveRoomJob : public BaseJob
     {
         public:
-            /*! Stop the requesting user participating in a particular room.
-             * \param roomId
-             *   The room identifier to leave.
-             */
-            explicit LeaveRoomJob(const QString& roomId);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * LeaveRoomJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId);
+        /*! Stop the requesting user participating in a particular room.
+         * \param roomId
+         *   The room identifier to leave.
+         */
+        explicit LeaveRoomJob(const QString& roomId);
 
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * LeaveRoomJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId);
     };
 
     /// Stop the requesting user remembering about a particular room.
     ///
     /// This API stops a user remembering about a particular room.
-    /// 
+    ///
     /// In general, history is a first class citizen in Matrix. After this API
     /// is called, however, a user will no longer be able to retrieve history
     /// for this room. If all users on a homeserver forget a room, the room is
     /// eligible for deletion from that homeserver.
-    /// 
+    ///
     /// If the user is currently joined to the room, they must leave the room
     /// before calling this API.
     class ForgetRoomJob : public BaseJob
     {
         public:
-            /*! Stop the requesting user remembering about a particular room.
-             * \param roomId
-             *   The room identifier to forget.
-             */
-            explicit ForgetRoomJob(const QString& roomId);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * ForgetRoomJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId);
+        /*! Stop the requesting user remembering about a particular room.
+         * \param roomId
+         *   The room identifier to forget.
+         */
+        explicit ForgetRoomJob(const QString& roomId);
 
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * ForgetRoomJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId);
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/list_joined_rooms.cpp b/lib/csapi/list_joined_rooms.cpp
index 85a9cae4..145e91ad 100644
--- a/lib/csapi/list_joined_rooms.cpp
+++ b/lib/csapi/list_joined_rooms.cpp
@@ -15,21 +15,20 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class GetJoinedRoomsJob::Private
 {
     public:
-        QStringList joinedRooms;
+    QStringList joinedRooms;
 };
 
 QUrl GetJoinedRoomsJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/joined_rooms");
+                                   basePath % "/joined_rooms");
 }
 
 static const auto GetJoinedRoomsJobName = QStringLiteral("GetJoinedRoomsJob");
 
 GetJoinedRoomsJob::GetJoinedRoomsJob()
-    : BaseJob(HttpVerb::Get, GetJoinedRoomsJobName,
-        basePath % "/joined_rooms")
-    , d(new Private)
+    : BaseJob(HttpVerb::Get, GetJoinedRoomsJobName, basePath % "/joined_rooms"),
+      d(new Private)
 {
 }
 
@@ -45,8 +44,7 @@ BaseJob::Status GetJoinedRoomsJob::parseJson(const QJsonDocument& data)
     auto json = data.object();
     if (!json.contains("joined_rooms"_ls))
         return { JsonParseError,
-            "The key 'joined_rooms' not found in the response" };
+                 "The key 'joined_rooms' not found in the response" };
     fromJson(json.value("joined_rooms"_ls), d->joinedRooms);
     return Success;
 }
-
diff --git a/lib/csapi/list_joined_rooms.h b/lib/csapi/list_joined_rooms.h
index 881a97b4..6f4169e8 100644
--- a/lib/csapi/list_joined_rooms.h
+++ b/lib/csapi/list_joined_rooms.h
@@ -6,9 +6,7 @@
 
 #include "jobs/basejob.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Lists the user's current rooms.
@@ -17,28 +15,28 @@ namespace QMatrixClient
     class GetJoinedRoomsJob : public BaseJob
     {
         public:
-            explicit GetJoinedRoomsJob();
+        explicit GetJoinedRoomsJob();
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetJoinedRoomsJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetJoinedRoomsJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl);
 
-            ~GetJoinedRoomsJob() override;
+        ~GetJoinedRoomsJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The ID of each room in which the user has ``joined`` membership.
-            const QStringList& joinedRooms() const;
+        /// The ID of each room in which the user has ``joined`` membership.
+        const QStringList& joinedRooms() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/list_public_rooms.cpp b/lib/csapi/list_public_rooms.cpp
index 71b3c541..2649b9f8 100644
--- a/lib/csapi/list_public_rooms.cpp
+++ b/lib/csapi/list_public_rooms.cpp
@@ -15,21 +15,24 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class GetRoomVisibilityOnDirectoryJob::Private
 {
     public:
-        QString visibility;
+    QString visibility;
 };
 
-QUrl GetRoomVisibilityOnDirectoryJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
+QUrl GetRoomVisibilityOnDirectoryJob::makeRequestUrl(QUrl baseUrl,
+                                                     const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/directory/list/room/" % roomId);
+                                   basePath % "/directory/list/room/" % roomId);
 }
 
-static const auto GetRoomVisibilityOnDirectoryJobName = QStringLiteral("GetRoomVisibilityOnDirectoryJob");
+static const auto GetRoomVisibilityOnDirectoryJobName =
+        QStringLiteral("GetRoomVisibilityOnDirectoryJob");
 
-GetRoomVisibilityOnDirectoryJob::GetRoomVisibilityOnDirectoryJob(const QString& roomId)
+GetRoomVisibilityOnDirectoryJob::GetRoomVisibilityOnDirectoryJob(
+        const QString& roomId)
     : BaseJob(HttpVerb::Get, GetRoomVisibilityOnDirectoryJobName,
-        basePath % "/directory/list/room/" % roomId, false)
-    , d(new Private)
+              basePath % "/directory/list/room/" % roomId, false),
+      d(new Private)
 {
 }
 
@@ -40,18 +43,21 @@ const QString& GetRoomVisibilityOnDirectoryJob::visibility() const
     return d->visibility;
 }
 
-BaseJob::Status GetRoomVisibilityOnDirectoryJob::parseJson(const QJsonDocument& data)
+BaseJob::Status
+GetRoomVisibilityOnDirectoryJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     fromJson(json.value("visibility"_ls), d->visibility);
     return Success;
 }
 
-static const auto SetRoomVisibilityOnDirectoryJobName = QStringLiteral("SetRoomVisibilityOnDirectoryJob");
+static const auto SetRoomVisibilityOnDirectoryJobName =
+        QStringLiteral("SetRoomVisibilityOnDirectoryJob");
 
-SetRoomVisibilityOnDirectoryJob::SetRoomVisibilityOnDirectoryJob(const QString& roomId, const QString& visibility)
+SetRoomVisibilityOnDirectoryJob::SetRoomVisibilityOnDirectoryJob(
+        const QString& roomId, const QString& visibility)
     : BaseJob(HttpVerb::Put, SetRoomVisibilityOnDirectoryJobName,
-        basePath % "/directory/list/room/" % roomId)
+              basePath % "/directory/list/room/" % roomId)
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("visibility"), visibility);
@@ -61,10 +67,11 @@ SetRoomVisibilityOnDirectoryJob::SetRoomVisibilityOnDirectoryJob(const QString&
 class GetPublicRoomsJob::Private
 {
     public:
-        PublicRoomsResponse data;
+    PublicRoomsResponse data;
 };
 
-BaseJob::Query queryToGetPublicRooms(Omittable<int> limit, const QString& since, const QString& server)
+BaseJob::Query queryToGetPublicRooms(Omittable<int> limit, const QString& since,
+                                     const QString& server)
 {
     BaseJob::Query _q;
     addParam<IfNotEmpty>(_q, QStringLiteral("limit"), limit);
@@ -73,30 +80,28 @@ BaseJob::Query queryToGetPublicRooms(Omittable<int> limit, const QString& since,
     return _q;
 }
 
-QUrl GetPublicRoomsJob::makeRequestUrl(QUrl baseUrl, Omittable<int> limit, const QString& since, const QString& server)
+QUrl GetPublicRoomsJob::makeRequestUrl(QUrl baseUrl, Omittable<int> limit,
+                                       const QString& since,
+                                       const QString& server)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/publicRooms",
-            queryToGetPublicRooms(limit, since, server));
+                                   basePath % "/publicRooms",
+                                   queryToGetPublicRooms(limit, since, server));
 }
 
 static const auto GetPublicRoomsJobName = QStringLiteral("GetPublicRoomsJob");
 
-GetPublicRoomsJob::GetPublicRoomsJob(Omittable<int> limit, const QString& since, const QString& server)
-    : BaseJob(HttpVerb::Get, GetPublicRoomsJobName,
-        basePath % "/publicRooms",
-        queryToGetPublicRooms(limit, since, server),
-        {}, false)
-    , d(new Private)
+GetPublicRoomsJob::GetPublicRoomsJob(Omittable<int> limit, const QString& since,
+                                     const QString& server)
+    : BaseJob(HttpVerb::Get, GetPublicRoomsJobName, basePath % "/publicRooms",
+              queryToGetPublicRooms(limit, since, server), {}, false),
+      d(new Private)
 {
 }
 
 GetPublicRoomsJob::~GetPublicRoomsJob() = default;
 
-const PublicRoomsResponse& GetPublicRoomsJob::data() const
-{
-    return d->data;
-}
+const PublicRoomsResponse& GetPublicRoomsJob::data() const { return d->data; }
 
 BaseJob::Status GetPublicRoomsJob::parseJson(const QJsonDocument& data)
 {
@@ -104,15 +109,15 @@ BaseJob::Status GetPublicRoomsJob::parseJson(const QJsonDocument& data)
     return Success;
 }
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<QueryPublicRoomsJob::Filter>
-    {
-        static void dumpTo(QJsonObject& jo, const QueryPublicRoomsJob::Filter& pod)
+    template <> struct JsonObjectConverter<QueryPublicRoomsJob::Filter> {
+        static void dumpTo(QJsonObject& jo,
+                           const QueryPublicRoomsJob::Filter& pod)
         {
-            addParam<IfNotEmpty>(jo, QStringLiteral("generic_search_term"), pod.genericSearchTerm);
+            addParam<IfNotEmpty>(jo, QStringLiteral("generic_search_term"),
+                                 pod.genericSearchTerm);
         }
     };
 } // namespace QMatrixClient
@@ -120,7 +125,7 @@ namespace QMatrixClient
 class QueryPublicRoomsJob::Private
 {
     public:
-        PublicRoomsResponse data;
+    PublicRoomsResponse data;
 };
 
 BaseJob::Query queryToQueryPublicRooms(const QString& server)
@@ -130,33 +135,36 @@ BaseJob::Query queryToQueryPublicRooms(const QString& server)
     return _q;
 }
 
-static const auto QueryPublicRoomsJobName = QStringLiteral("QueryPublicRoomsJob");
+static const auto QueryPublicRoomsJobName =
+        QStringLiteral("QueryPublicRoomsJob");
 
-QueryPublicRoomsJob::QueryPublicRoomsJob(const QString& server, Omittable<int> limit, const QString& since, const Omittable<Filter>& filter, Omittable<bool> includeAllNetworks, const QString& thirdPartyInstanceId)
+QueryPublicRoomsJob::QueryPublicRoomsJob(const QString& server,
+                                         Omittable<int> limit,
+                                         const QString& since,
+                                         const Omittable<Filter>& filter,
+                                         Omittable<bool> includeAllNetworks,
+                                         const QString& thirdPartyInstanceId)
     : BaseJob(HttpVerb::Post, QueryPublicRoomsJobName,
-        basePath % "/publicRooms",
-        queryToQueryPublicRooms(server))
-    , d(new Private)
+              basePath % "/publicRooms", queryToQueryPublicRooms(server)),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("limit"), limit);
     addParam<IfNotEmpty>(_data, QStringLiteral("since"), since);
     addParam<IfNotEmpty>(_data, QStringLiteral("filter"), filter);
-    addParam<IfNotEmpty>(_data, QStringLiteral("include_all_networks"), includeAllNetworks);
-    addParam<IfNotEmpty>(_data, QStringLiteral("third_party_instance_id"), thirdPartyInstanceId);
+    addParam<IfNotEmpty>(_data, QStringLiteral("include_all_networks"),
+                         includeAllNetworks);
+    addParam<IfNotEmpty>(_data, QStringLiteral("third_party_instance_id"),
+                         thirdPartyInstanceId);
     setRequestData(_data);
 }
 
 QueryPublicRoomsJob::~QueryPublicRoomsJob() = default;
 
-const PublicRoomsResponse& QueryPublicRoomsJob::data() const
-{
-    return d->data;
-}
+const PublicRoomsResponse& QueryPublicRoomsJob::data() const { return d->data; }
 
 BaseJob::Status QueryPublicRoomsJob::parseJson(const QJsonDocument& data)
 {
     fromJson(data, d->data);
     return Success;
 }
-
diff --git a/lib/csapi/list_public_rooms.h b/lib/csapi/list_public_rooms.h
index a6498745..1a0af880 100644
--- a/lib/csapi/list_public_rooms.h
+++ b/lib/csapi/list_public_rooms.h
@@ -6,169 +6,178 @@
 
 #include "jobs/basejob.h"
 
-#include "csapi/definitions/public_rooms_response.h"
 #include "converters.h"
+#include "csapi/definitions/public_rooms_response.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Gets the visibility of a room in the directory
     ///
-    /// Gets the visibility of a given room on the server's public room directory.
+    /// Gets the visibility of a given room on the server's public room
+    /// directory.
     class GetRoomVisibilityOnDirectoryJob : public BaseJob
     {
         public:
-            /*! Gets the visibility of a room in the directory
-             * \param roomId
-             *   The room ID.
-             */
-            explicit GetRoomVisibilityOnDirectoryJob(const QString& roomId);
+        /*! Gets the visibility of a room in the directory
+         * \param roomId
+         *   The room ID.
+         */
+        explicit GetRoomVisibilityOnDirectoryJob(const QString& roomId);
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetRoomVisibilityOnDirectoryJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetRoomVisibilityOnDirectoryJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId);
 
-            ~GetRoomVisibilityOnDirectoryJob() override;
+        ~GetRoomVisibilityOnDirectoryJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The visibility of the room in the directory.
-            const QString& visibility() const;
+        /// The visibility of the room in the directory.
+        const QString& visibility() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Sets the visibility of a room in the room directory
     ///
     /// Sets the visibility of a given room in the server's public room
     /// directory.
-    /// 
+    ///
     /// Servers may choose to implement additional access control checks
-    /// here, for instance that room visibility can only be changed by 
+    /// here, for instance that room visibility can only be changed by
     /// the room creator or a server administrator.
     class SetRoomVisibilityOnDirectoryJob : public BaseJob
     {
         public:
-            /*! Sets the visibility of a room in the room directory
-             * \param roomId
-             *   The room ID.
-             * \param visibility
-             *   The new visibility setting for the room. 
-             *   Defaults to 'public'.
-             */
-            explicit SetRoomVisibilityOnDirectoryJob(const QString& roomId, const QString& visibility = {});
+        /*! Sets the visibility of a room in the room directory
+         * \param roomId
+         *   The room ID.
+         * \param visibility
+         *   The new visibility setting for the room.
+         *   Defaults to 'public'.
+         */
+        explicit SetRoomVisibilityOnDirectoryJob(
+                const QString& roomId, const QString& visibility = {});
     };
 
     /// Lists the public rooms on the server.
     ///
     /// Lists the public rooms on the server.
-    /// 
-    /// This API returns paginated responses. The rooms are ordered by the number
-    /// of joined members, with the largest rooms first.
+    ///
+    /// This API returns paginated responses. The rooms are ordered by the
+    /// number of joined members, with the largest rooms first.
     class GetPublicRoomsJob : public BaseJob
     {
         public:
-            /*! Lists the public rooms on the server.
-             * \param limit
-             *   Limit the number of results returned.
-             * \param since
-             *   A pagination token from a previous request, allowing clients to
-             *   get the next (or previous) batch of rooms.
-             *   The direction of pagination is specified solely by which token
-             *   is supplied, rather than via an explicit flag.
-             * \param server
-             *   The server to fetch the public room lists from. Defaults to the
-             *   local server.
-             */
-            explicit GetPublicRoomsJob(Omittable<int> limit = none, const QString& since = {}, const QString& server = {});
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetPublicRoomsJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, Omittable<int> limit = none, const QString& since = {}, const QString& server = {});
-
-            ~GetPublicRoomsJob() override;
-
-            // Result properties
-
-            /// A list of the rooms on the server.
-            const PublicRoomsResponse& data() const;
+        /*! Lists the public rooms on the server.
+         * \param limit
+         *   Limit the number of results returned.
+         * \param since
+         *   A pagination token from a previous request, allowing clients to
+         *   get the next (or previous) batch of rooms.
+         *   The direction of pagination is specified solely by which token
+         *   is supplied, rather than via an explicit flag.
+         * \param server
+         *   The server to fetch the public room lists from. Defaults to the
+         *   local server.
+         */
+        explicit GetPublicRoomsJob(Omittable<int> limit = none,
+                                   const QString& since = {},
+                                   const QString& server = {});
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetPublicRoomsJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, Omittable<int> limit = none,
+                                   const QString& since = {},
+                                   const QString& server = {});
+
+        ~GetPublicRoomsJob() override;
+
+        // Result properties
+
+        /// A list of the rooms on the server.
+        const PublicRoomsResponse& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Lists the public rooms on the server with optional filter.
     ///
     /// Lists the public rooms on the server, with optional filter.
-    /// 
-    /// This API returns paginated responses. The rooms are ordered by the number
-    /// of joined members, with the largest rooms first.
+    ///
+    /// This API returns paginated responses. The rooms are ordered by the
+    /// number of joined members, with the largest rooms first.
     class QueryPublicRoomsJob : public BaseJob
     {
         public:
-            // Inner data structures
-
-            /// Filter to apply to the results.
-            struct Filter
-            {
-                /// A string to search for in the room metadata, e.g. name,
-                /// topic, canonical alias etc. (Optional).
-                QString genericSearchTerm;
-            };
-
-            // Construction/destruction
-
-            /*! Lists the public rooms on the server with optional filter.
-             * \param server
-             *   The server to fetch the public room lists from. Defaults to the
-             *   local server.
-             * \param limit
-             *   Limit the number of results returned.
-             * \param since
-             *   A pagination token from a previous request, allowing clients
-             *   to get the next (or previous) batch of rooms.  The direction
-             *   of pagination is specified solely by which token is supplied,
-             *   rather than via an explicit flag.
-             * \param filter
-             *   Filter to apply to the results.
-             * \param includeAllNetworks
-             *   Whether or not to include all known networks/protocols from
-             *   application services on the homeserver. Defaults to false.
-             * \param thirdPartyInstanceId
-             *   The specific third party network/protocol to request from the
-             *   homeserver. Can only be used if ``include_all_networks`` is false.
-             */
-            explicit QueryPublicRoomsJob(const QString& server = {}, Omittable<int> limit = none, const QString& since = {}, const Omittable<Filter>& filter = none, Omittable<bool> includeAllNetworks = none, const QString& thirdPartyInstanceId = {});
-            ~QueryPublicRoomsJob() override;
-
-            // Result properties
-
-            /// A list of the rooms on the server.
-            const PublicRoomsResponse& data() const;
+        // Inner data structures
+
+        /// Filter to apply to the results.
+        struct Filter {
+            /// A string to search for in the room metadata, e.g. name,
+            /// topic, canonical alias etc. (Optional).
+            QString genericSearchTerm;
+        };
+
+        // Construction/destruction
+
+        /*! Lists the public rooms on the server with optional filter.
+         * \param server
+         *   The server to fetch the public room lists from. Defaults to the
+         *   local server.
+         * \param limit
+         *   Limit the number of results returned.
+         * \param since
+         *   A pagination token from a previous request, allowing clients
+         *   to get the next (or previous) batch of rooms.  The direction
+         *   of pagination is specified solely by which token is supplied,
+         *   rather than via an explicit flag.
+         * \param filter
+         *   Filter to apply to the results.
+         * \param includeAllNetworks
+         *   Whether or not to include all known networks/protocols from
+         *   application services on the homeserver. Defaults to false.
+         * \param thirdPartyInstanceId
+         *   The specific third party network/protocol to request from the
+         *   homeserver. Can only be used if ``include_all_networks`` is false.
+         */
+        explicit QueryPublicRoomsJob(const QString& server = {},
+                                     Omittable<int> limit = none,
+                                     const QString& since = {},
+                                     const Omittable<Filter>& filter = none,
+                                     Omittable<bool> includeAllNetworks = none,
+                                     const QString& thirdPartyInstanceId = {});
+        ~QueryPublicRoomsJob() override;
+
+        // Result properties
+
+        /// A list of the rooms on the server.
+        const PublicRoomsResponse& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/login.cpp b/lib/csapi/login.cpp
index 5e369b9a..77652e64 100644
--- a/lib/csapi/login.cpp
+++ b/lib/csapi/login.cpp
@@ -12,13 +12,12 @@ using namespace QMatrixClient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<GetLoginFlowsJob::LoginFlow>
-    {
-        static void fillFrom(const QJsonObject& jo, GetLoginFlowsJob::LoginFlow& result)
+    template <> struct JsonObjectConverter<GetLoginFlowsJob::LoginFlow> {
+        static void fillFrom(const QJsonObject& jo,
+                             GetLoginFlowsJob::LoginFlow& result)
         {
             fromJson(jo.value("type"_ls), result.type);
         }
@@ -28,21 +27,19 @@ namespace QMatrixClient
 class GetLoginFlowsJob::Private
 {
     public:
-        QVector<LoginFlow> flows;
+    QVector<LoginFlow> flows;
 };
 
 QUrl GetLoginFlowsJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/login");
+    return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/login");
 }
 
 static const auto GetLoginFlowsJobName = QStringLiteral("GetLoginFlowsJob");
 
 GetLoginFlowsJob::GetLoginFlowsJob()
-    : BaseJob(HttpVerb::Get, GetLoginFlowsJobName,
-        basePath % "/login", false)
-    , d(new Private)
+    : BaseJob(HttpVerb::Get, GetLoginFlowsJobName, basePath % "/login", false),
+      d(new Private)
 {
 }
 
@@ -63,19 +60,23 @@ BaseJob::Status GetLoginFlowsJob::parseJson(const QJsonDocument& data)
 class LoginJob::Private
 {
     public:
-        QString userId;
-        QString accessToken;
-        QString homeServer;
-        QString deviceId;
-        Omittable<DiscoveryInformation> wellKnown;
+    QString userId;
+    QString accessToken;
+    QString homeServer;
+    QString deviceId;
+    Omittable<DiscoveryInformation> wellKnown;
 };
 
 static const auto LoginJobName = QStringLiteral("LoginJob");
 
-LoginJob::LoginJob(const QString& type, const Omittable<UserIdentifier>& identifier, const QString& password, const QString& token, const QString& deviceId, const QString& initialDeviceDisplayName, const QString& user, const QString& medium, const QString& address)
-    : BaseJob(HttpVerb::Post, LoginJobName,
-        basePath % "/login", false)
-    , d(new Private)
+LoginJob::LoginJob(const QString& type,
+                   const Omittable<UserIdentifier>& identifier,
+                   const QString& password, const QString& token,
+                   const QString& deviceId,
+                   const QString& initialDeviceDisplayName, const QString& user,
+                   const QString& medium, const QString& address)
+    : BaseJob(HttpVerb::Post, LoginJobName, basePath % "/login", false),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("type"), type);
@@ -83,7 +84,8 @@ LoginJob::LoginJob(const QString& type, const Omittable<UserIdentifier>& identif
     addParam<IfNotEmpty>(_data, QStringLiteral("password"), password);
     addParam<IfNotEmpty>(_data, QStringLiteral("token"), token);
     addParam<IfNotEmpty>(_data, QStringLiteral("device_id"), deviceId);
-    addParam<IfNotEmpty>(_data, QStringLiteral("initial_device_display_name"), initialDeviceDisplayName);
+    addParam<IfNotEmpty>(_data, QStringLiteral("initial_device_display_name"),
+                         initialDeviceDisplayName);
     addParam<IfNotEmpty>(_data, QStringLiteral("user"), user);
     addParam<IfNotEmpty>(_data, QStringLiteral("medium"), medium);
     addParam<IfNotEmpty>(_data, QStringLiteral("address"), address);
@@ -92,25 +94,13 @@ LoginJob::LoginJob(const QString& type, const Omittable<UserIdentifier>& identif
 
 LoginJob::~LoginJob() = default;
 
-const QString& LoginJob::userId() const
-{
-    return d->userId;
-}
+const QString& LoginJob::userId() const { return d->userId; }
 
-const QString& LoginJob::accessToken() const
-{
-    return d->accessToken;
-}
+const QString& LoginJob::accessToken() const { return d->accessToken; }
 
-const QString& LoginJob::homeServer() const
-{
-    return d->homeServer;
-}
+const QString& LoginJob::homeServer() const { return d->homeServer; }
 
-const QString& LoginJob::deviceId() const
-{
-    return d->deviceId;
-}
+const QString& LoginJob::deviceId() const { return d->deviceId; }
 
 const Omittable<DiscoveryInformation>& LoginJob::wellKnown() const
 {
@@ -127,4 +117,3 @@ BaseJob::Status LoginJob::parseJson(const QJsonDocument& data)
     fromJson(json.value("well_known"_ls), d->wellKnown);
     return Success;
 }
-
diff --git a/lib/csapi/login.h b/lib/csapi/login.h
index 648316df..89c8ca79 100644
--- a/lib/csapi/login.h
+++ b/lib/csapi/login.h
@@ -6,68 +6,68 @@
 
 #include "jobs/basejob.h"
 
-#include <QtCore/QVector>
-#include "csapi/definitions/wellknown/full.h"
-#include "csapi/definitions/user_identifier.h"
 #include "converters.h"
+#include "csapi/definitions/user_identifier.h"
+#include "csapi/definitions/wellknown/full.h"
+#include <QtCore/QVector>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Get the supported login types to authenticate users
     ///
-    /// Gets the homeserver's supported login types to authenticate users. Clients
-    /// should pick one of these and supply it as the ``type`` when logging in.
+    /// Gets the homeserver's supported login types to authenticate users.
+    /// Clients should pick one of these and supply it as the ``type`` when
+    /// logging in.
     class GetLoginFlowsJob : public BaseJob
     {
         public:
-            // Inner data structures
+        // Inner data structures
 
-            /// Gets the homeserver's supported login types to authenticate users. Clients
-            /// should pick one of these and supply it as the ``type`` when logging in.
-            struct LoginFlow
-            {
-                /// The login type. This is supplied as the ``type`` when
-                /// logging in.
-                QString type;
-            };
+        /// Gets the homeserver's supported login types to authenticate users.
+        /// Clients should pick one of these and supply it as the ``type`` when
+        /// logging in.
+        struct LoginFlow {
+            /// The login type. This is supplied as the ``type`` when
+            /// logging in.
+            QString type;
+        };
 
-            // Construction/destruction
+        // Construction/destruction
 
-            explicit GetLoginFlowsJob();
+        explicit GetLoginFlowsJob();
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetLoginFlowsJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetLoginFlowsJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl);
 
-            ~GetLoginFlowsJob() override;
+        ~GetLoginFlowsJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The homeserver's supported login types
-            const QVector<LoginFlow>& flows() const;
+        /// The homeserver's supported login types
+        const QVector<LoginFlow>& flows() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Authenticates the user.
     ///
     /// Authenticates the user, and issues an access token they can
     /// use to authorize themself in subsequent requests.
-    /// 
+    ///
     /// If the client does not supply a ``device_id``, the server must
     /// auto-generate one.
-    /// 
+    ///
     /// The returned access token must be associated with the ``device_id``
     /// supplied by the client or generated by the server. The server may
     /// invalidate any access token previously associated with that device. See
@@ -75,61 +75,69 @@ namespace QMatrixClient
     class LoginJob : public BaseJob
     {
         public:
-            /*! Authenticates the user.
-             * \param type
-             *   The login type being used.
-             * \param identifier
-             *   Identification information for the user.
-             * \param password
-             *   Required when ``type`` is ``m.login.password``. The user's
-             *   password.
-             * \param token
-             *   Required when ``type`` is ``m.login.token``. Part of `Token-based`_ login.
-             * \param deviceId
-             *   ID of the client device. If this does not correspond to a
-             *   known client device, a new device will be created. The server
-             *   will auto-generate a device_id if this is not specified.
-             * \param initialDeviceDisplayName
-             *   A display name to assign to the newly-created device. Ignored
-             *   if ``device_id`` corresponds to a known device.
-             * \param user
-             *   The fully qualified user ID or just local part of the user ID, to log in.  Deprecated in favour of ``identifier``.
-             * \param medium
-             *   When logging in using a third party identifier, the medium of the identifier. Must be 'email'.  Deprecated in favour of ``identifier``.
-             * \param address
-             *   Third party identifier for the user.  Deprecated in favour of ``identifier``.
-             */
-            explicit LoginJob(const QString& type, const Omittable<UserIdentifier>& identifier = none, const QString& password = {}, const QString& token = {}, const QString& deviceId = {}, const QString& initialDeviceDisplayName = {}, const QString& user = {}, const QString& medium = {}, const QString& address = {});
-            ~LoginJob() override;
-
-            // Result properties
-
-            /// The fully-qualified Matrix ID that has been registered.
-            const QString& userId() const;
-            /// An access token for the account.
-            /// This access token can then be used to authorize other requests.
-            const QString& accessToken() const;
-            /// The server_name of the homeserver on which the account has
-            /// been registered.
-            /// 
-            /// **Deprecated**. Clients should extract the server_name from
-            /// ``user_id`` (by splitting at the first colon) if they require
-            /// it. Note also that ``homeserver`` is not spelt this way.
-            const QString& homeServer() const;
-            /// ID of the logged-in device. Will be the same as the
-            /// corresponding parameter in the request, if one was specified.
-            const QString& deviceId() const;
-            /// Optional client configuration provided by the server. If present,
-            /// clients SHOULD use the provided object to reconfigure themselves,
-            /// optionally validating the URLs within. This object takes the same
-            /// form as the one returned from .well-known autodiscovery.
-            const Omittable<DiscoveryInformation>& wellKnown() const;
+        /*! Authenticates the user.
+         * \param type
+         *   The login type being used.
+         * \param identifier
+         *   Identification information for the user.
+         * \param password
+         *   Required when ``type`` is ``m.login.password``. The user's
+         *   password.
+         * \param token
+         *   Required when ``type`` is ``m.login.token``. Part of `Token-based`_
+         * login. \param deviceId ID of the client device. If this does not
+         * correspond to a known client device, a new device will be created.
+         * The server will auto-generate a device_id if this is not specified.
+         * \param initialDeviceDisplayName
+         *   A display name to assign to the newly-created device. Ignored
+         *   if ``device_id`` corresponds to a known device.
+         * \param user
+         *   The fully qualified user ID or just local part of the user ID, to
+         * log in.  Deprecated in favour of ``identifier``. \param medium When
+         * logging in using a third party identifier, the medium of the
+         * identifier. Must be 'email'.  Deprecated in favour of ``identifier``.
+         * \param address
+         *   Third party identifier for the user.  Deprecated in favour of
+         * ``identifier``.
+         */
+        explicit LoginJob(const QString& type,
+                          const Omittable<UserIdentifier>& identifier = none,
+                          const QString& password = {},
+                          const QString& token = {},
+                          const QString& deviceId = {},
+                          const QString& initialDeviceDisplayName = {},
+                          const QString& user = {}, const QString& medium = {},
+                          const QString& address = {});
+        ~LoginJob() override;
+
+        // Result properties
+
+        /// The fully-qualified Matrix ID that has been registered.
+        const QString& userId() const;
+        /// An access token for the account.
+        /// This access token can then be used to authorize other requests.
+        const QString& accessToken() const;
+        /// The server_name of the homeserver on which the account has
+        /// been registered.
+        ///
+        /// **Deprecated**. Clients should extract the server_name from
+        /// ``user_id`` (by splitting at the first colon) if they require
+        /// it. Note also that ``homeserver`` is not spelt this way.
+        const QString& homeServer() const;
+        /// ID of the logged-in device. Will be the same as the
+        /// corresponding parameter in the request, if one was specified.
+        const QString& deviceId() const;
+        /// Optional client configuration provided by the server. If present,
+        /// clients SHOULD use the provided object to reconfigure themselves,
+        /// optionally validating the URLs within. This object takes the same
+        /// form as the one returned from .well-known autodiscovery.
+        const Omittable<DiscoveryInformation>& wellKnown() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/logout.cpp b/lib/csapi/logout.cpp
index 6e209e07..f2d2e130 100644
--- a/lib/csapi/logout.cpp
+++ b/lib/csapi/logout.cpp
@@ -14,29 +14,25 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 QUrl LogoutJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/logout");
+    return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/logout");
 }
 
 static const auto LogoutJobName = QStringLiteral("LogoutJob");
 
 LogoutJob::LogoutJob()
-    : BaseJob(HttpVerb::Post, LogoutJobName,
-        basePath % "/logout")
+    : BaseJob(HttpVerb::Post, LogoutJobName, basePath % "/logout")
 {
 }
 
 QUrl LogoutAllJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/logout/all");
+                                   basePath % "/logout/all");
 }
 
 static const auto LogoutAllJobName = QStringLiteral("LogoutAllJob");
 
 LogoutAllJob::LogoutAllJob()
-    : BaseJob(HttpVerb::Post, LogoutAllJobName,
-        basePath % "/logout/all")
+    : BaseJob(HttpVerb::Post, LogoutAllJobName, basePath % "/logout/all")
 {
 }
-
diff --git a/lib/csapi/logout.h b/lib/csapi/logout.h
index 3ef3c656..4bbb8526 100644
--- a/lib/csapi/logout.h
+++ b/lib/csapi/logout.h
@@ -6,52 +6,50 @@
 
 #include "jobs/basejob.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Invalidates a user access token
     ///
-    /// Invalidates an existing access token, so that it can no longer be used for
-    /// authorization.
+    /// Invalidates an existing access token, so that it can no longer be used
+    /// for authorization.
     class LogoutJob : public BaseJob
     {
         public:
-            explicit LogoutJob();
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * LogoutJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl);
-
+        explicit LogoutJob();
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * LogoutJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl);
     };
 
     /// Invalidates all access tokens for a user
     ///
-    /// Invalidates all access tokens for a user, so that they can no longer be used for
-    /// authorization. This includes the access token that made this request. 
-    /// 
-    /// This endpoint does not require UI authorization because UI authorization is
-    /// designed to protect against attacks where the someone gets hold of a single access
-    /// token then takes over the account. This endpoint invalidates all access tokens for
-    /// the user, including the token used in the request, and therefore the attacker is
-    /// unable to take over the account in this way.
+    /// Invalidates all access tokens for a user, so that they can no longer be
+    /// used for authorization. This includes the access token that made this
+    /// request.
+    ///
+    /// This endpoint does not require UI authorization because UI authorization
+    /// is designed to protect against attacks where the someone gets hold of a
+    /// single access token then takes over the account. This endpoint
+    /// invalidates all access tokens for the user, including the token used in
+    /// the request, and therefore the attacker is unable to take over the
+    /// account in this way.
     class LogoutAllJob : public BaseJob
     {
         public:
-            explicit LogoutAllJob();
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * LogoutAllJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl);
-
+        explicit LogoutAllJob();
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * LogoutAllJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl);
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/message_pagination.cpp b/lib/csapi/message_pagination.cpp
index 9aca7ec9..272c1c20 100644
--- a/lib/csapi/message_pagination.cpp
+++ b/lib/csapi/message_pagination.cpp
@@ -15,12 +15,14 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class GetRoomEventsJob::Private
 {
     public:
-        QString begin;
-        QString end;
-        RoomEvents chunk;
+    QString begin;
+    QString end;
+    RoomEvents chunk;
 };
 
-BaseJob::Query queryToGetRoomEvents(const QString& from, const QString& to, const QString& dir, Omittable<int> limit, const QString& filter)
+BaseJob::Query queryToGetRoomEvents(const QString& from, const QString& to,
+                                    const QString& dir, Omittable<int> limit,
+                                    const QString& filter)
 {
     BaseJob::Query _q;
     addParam<>(_q, QStringLiteral("from"), from);
@@ -31,39 +33,35 @@ BaseJob::Query queryToGetRoomEvents(const QString& from, const QString& to, cons
     return _q;
 }
 
-QUrl GetRoomEventsJob::makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& from, const QString& dir, const QString& to, Omittable<int> limit, const QString& filter)
+QUrl GetRoomEventsJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
+                                      const QString& from, const QString& dir,
+                                      const QString& to, Omittable<int> limit,
+                                      const QString& filter)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/rooms/" % roomId % "/messages",
+    return BaseJob::makeRequestUrl(
+            std::move(baseUrl), basePath % "/rooms/" % roomId % "/messages",
             queryToGetRoomEvents(from, to, dir, limit, filter));
 }
 
 static const auto GetRoomEventsJobName = QStringLiteral("GetRoomEventsJob");
 
-GetRoomEventsJob::GetRoomEventsJob(const QString& roomId, const QString& from, const QString& dir, const QString& to, Omittable<int> limit, const QString& filter)
+GetRoomEventsJob::GetRoomEventsJob(const QString& roomId, const QString& from,
+                                   const QString& dir, const QString& to,
+                                   Omittable<int> limit, const QString& filter)
     : BaseJob(HttpVerb::Get, GetRoomEventsJobName,
-        basePath % "/rooms/" % roomId % "/messages",
-        queryToGetRoomEvents(from, to, dir, limit, filter))
-    , d(new Private)
+              basePath % "/rooms/" % roomId % "/messages",
+              queryToGetRoomEvents(from, to, dir, limit, filter)),
+      d(new Private)
 {
 }
 
 GetRoomEventsJob::~GetRoomEventsJob() = default;
 
-const QString& GetRoomEventsJob::begin() const
-{
-    return d->begin;
-}
+const QString& GetRoomEventsJob::begin() const { return d->begin; }
 
-const QString& GetRoomEventsJob::end() const
-{
-    return d->end;
-}
+const QString& GetRoomEventsJob::end() const { return d->end; }
 
-RoomEvents&& GetRoomEventsJob::chunk()
-{
-    return std::move(d->chunk);
-}
+RoomEvents&& GetRoomEventsJob::chunk() { return std::move(d->chunk); }
 
 BaseJob::Status GetRoomEventsJob::parseJson(const QJsonDocument& data)
 {
@@ -73,4 +71,3 @@ BaseJob::Status GetRoomEventsJob::parseJson(const QJsonDocument& data)
     fromJson(json.value("chunk"_ls), d->chunk);
     return Success;
 }
-
diff --git a/lib/csapi/message_pagination.h b/lib/csapi/message_pagination.h
index 12544f0c..8ce1962e 100644
--- a/lib/csapi/message_pagination.h
+++ b/lib/csapi/message_pagination.h
@@ -6,11 +6,10 @@
 
 #include "jobs/basejob.h"
 
-#include "events/eventloader.h"
 #include "converters.h"
+#include "events/eventloader.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Get a list of events for this room
@@ -20,54 +19,56 @@ namespace QMatrixClient
     class GetRoomEventsJob : public BaseJob
     {
         public:
-            /*! Get a list of events for this room
-             * \param roomId
-             *   The room to get events from.
-             * \param from
-             *   The token to start returning events from. This token can be obtained
-             *   from a ``prev_batch`` token returned for each room by the sync API,
-             *   or from a ``start`` or ``end`` token returned by a previous request
-             *   to this endpoint.
-             * \param dir
-             *   The direction to return events from.
-             * \param to
-             *   The token to stop returning events at. This token can be obtained from
-             *   a ``prev_batch`` token returned for each room by the sync endpoint,
-             *   or from a ``start`` or ``end`` token returned by a previous request to
-             *   this endpoint.
-             * \param limit
-             *   The maximum number of events to return. Default: 10.
-             * \param filter
-             *   A JSON RoomEventFilter to filter returned events with.
-             */
-            explicit GetRoomEventsJob(const QString& roomId, const QString& from, const QString& dir, const QString& to = {}, Omittable<int> limit = none, const QString& filter = {});
+        /*! Get a list of events for this room
+         * \param roomId
+         *   The room to get events from.
+         * \param from
+         *   The token to start returning events from. This token can be
+         * obtained from a ``prev_batch`` token returned for each room by the
+         * sync API, or from a ``start`` or ``end`` token returned by a previous
+         * request to this endpoint. \param dir The direction to return events
+         * from. \param to The token to stop returning events at. This token can
+         * be obtained from a ``prev_batch`` token returned for each room by the
+         * sync endpoint, or from a ``start`` or ``end`` token returned by a
+         * previous request to this endpoint. \param limit The maximum number of
+         * events to return. Default: 10. \param filter A JSON RoomEventFilter
+         * to filter returned events with.
+         */
+        explicit GetRoomEventsJob(const QString& roomId, const QString& from,
+                                  const QString& dir, const QString& to = {},
+                                  Omittable<int> limit = none,
+                                  const QString& filter = {});
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetRoomEventsJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& from, const QString& dir, const QString& to = {}, Omittable<int> limit = none, const QString& filter = {});
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetRoomEventsJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId,
+                                   const QString& from, const QString& dir,
+                                   const QString& to = {},
+                                   Omittable<int> limit = none,
+                                   const QString& filter = {});
 
-            ~GetRoomEventsJob() override;
+        ~GetRoomEventsJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The token the pagination starts from. If ``dir=b`` this will be
-            /// the token supplied in ``from``.
-            const QString& begin() const;
-            /// The token the pagination ends at. If ``dir=b`` this token should
-            /// be used again to request even earlier events.
-            const QString& end() const;
-            /// A list of room events.
-            RoomEvents&& chunk();
+        /// The token the pagination starts from. If ``dir=b`` this will be
+        /// the token supplied in ``from``.
+        const QString& begin() const;
+        /// The token the pagination ends at. If ``dir=b`` this token should
+        /// be used again to request even earlier events.
+        const QString& end() const;
+        /// A list of room events.
+        RoomEvents&& chunk();
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/notifications.cpp b/lib/csapi/notifications.cpp
index c00b7cb0..b7f252ac 100644
--- a/lib/csapi/notifications.cpp
+++ b/lib/csapi/notifications.cpp
@@ -12,13 +12,12 @@ using namespace QMatrixClient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<GetNotificationsJob::Notification>
-    {
-        static void fillFrom(const QJsonObject& jo, GetNotificationsJob::Notification& result)
+    template <> struct JsonObjectConverter<GetNotificationsJob::Notification> {
+        static void fillFrom(const QJsonObject& jo,
+                             GetNotificationsJob::Notification& result)
         {
             fromJson(jo.value("actions"_ls), result.actions);
             fromJson(jo.value("event"_ls), result.event);
@@ -33,11 +32,13 @@ namespace QMatrixClient
 class GetNotificationsJob::Private
 {
     public:
-        QString nextToken;
-        std::vector<Notification> notifications;
+    QString nextToken;
+    std::vector<Notification> notifications;
 };
 
-BaseJob::Query queryToGetNotifications(const QString& from, Omittable<int> limit, const QString& only)
+BaseJob::Query queryToGetNotifications(const QString& from,
+                                       Omittable<int> limit,
+                                       const QString& only)
 {
     BaseJob::Query _q;
     addParam<IfNotEmpty>(_q, QStringLiteral("from"), from);
@@ -46,31 +47,34 @@ BaseJob::Query queryToGetNotifications(const QString& from, Omittable<int> limit
     return _q;
 }
 
-QUrl GetNotificationsJob::makeRequestUrl(QUrl baseUrl, const QString& from, Omittable<int> limit, const QString& only)
+QUrl GetNotificationsJob::makeRequestUrl(QUrl baseUrl, const QString& from,
+                                         Omittable<int> limit,
+                                         const QString& only)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/notifications",
-            queryToGetNotifications(from, limit, only));
+                                   basePath % "/notifications",
+                                   queryToGetNotifications(from, limit, only));
 }
 
-static const auto GetNotificationsJobName = QStringLiteral("GetNotificationsJob");
+static const auto GetNotificationsJobName =
+        QStringLiteral("GetNotificationsJob");
 
-GetNotificationsJob::GetNotificationsJob(const QString& from, Omittable<int> limit, const QString& only)
+GetNotificationsJob::GetNotificationsJob(const QString& from,
+                                         Omittable<int> limit,
+                                         const QString& only)
     : BaseJob(HttpVerb::Get, GetNotificationsJobName,
-        basePath % "/notifications",
-        queryToGetNotifications(from, limit, only))
-    , d(new Private)
+              basePath % "/notifications",
+              queryToGetNotifications(from, limit, only)),
+      d(new Private)
 {
 }
 
 GetNotificationsJob::~GetNotificationsJob() = default;
 
-const QString& GetNotificationsJob::nextToken() const
-{
-    return d->nextToken;
-}
+const QString& GetNotificationsJob::nextToken() const { return d->nextToken; }
 
-std::vector<GetNotificationsJob::Notification>&& GetNotificationsJob::notifications()
+std::vector<GetNotificationsJob::Notification>&&
+GetNotificationsJob::notifications()
 {
     return std::move(d->notifications);
 }
@@ -81,8 +85,7 @@ BaseJob::Status GetNotificationsJob::parseJson(const QJsonDocument& data)
     fromJson(json.value("next_token"_ls), d->nextToken);
     if (!json.contains("notifications"_ls))
         return { JsonParseError,
-            "The key 'notifications' not found in the response" };
+                 "The key 'notifications' not found in the response" };
     fromJson(json.value("notifications"_ls), d->notifications);
     return Success;
 }
-
diff --git a/lib/csapi/notifications.h b/lib/csapi/notifications.h
index 898b5154..49bc33e9 100644
--- a/lib/csapi/notifications.h
+++ b/lib/csapi/notifications.h
@@ -6,14 +6,13 @@
 
 #include "jobs/basejob.h"
 
-#include "events/eventloader.h"
 #include "converters.h"
-#include <QtCore/QVector>
-#include <QtCore/QVariant>
+#include "events/eventloader.h"
 #include <QtCore/QJsonObject>
+#include <QtCore/QVariant>
+#include <QtCore/QVector>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Gets a list of events that the user has been notified about
@@ -23,67 +22,70 @@ namespace QMatrixClient
     class GetNotificationsJob : public BaseJob
     {
         public:
-            // Inner data structures
+        // Inner data structures
 
-            /// This API is used to paginate through the list of events that the
-            /// user has been, or would have been notified about.
-            struct Notification
-            {
-                /// The action(s) to perform when the conditions for this rule are met.
-                /// See `Push Rules: API`_.
-                QVector<QVariant> actions;
-                /// The Event object for the event that triggered the notification.
-                EventPtr event;
-                /// The profile tag of the rule that matched this event.
-                QString profileTag;
-                /// Indicates whether the user has sent a read receipt indicating
-                /// that they have read this message.
-                bool read;
-                /// The ID of the room in which the event was posted.
-                QString roomId;
-                /// The unix timestamp at which the event notification was sent,
-                /// in milliseconds.
-                int ts;
-            };
+        /// This API is used to paginate through the list of events that the
+        /// user has been, or would have been notified about.
+        struct Notification {
+            /// The action(s) to perform when the conditions for this rule are
+            /// met. See `Push Rules: API`_.
+            QVector<QVariant> actions;
+            /// The Event object for the event that triggered the notification.
+            EventPtr event;
+            /// The profile tag of the rule that matched this event.
+            QString profileTag;
+            /// Indicates whether the user has sent a read receipt indicating
+            /// that they have read this message.
+            bool read;
+            /// The ID of the room in which the event was posted.
+            QString roomId;
+            /// The unix timestamp at which the event notification was sent,
+            /// in milliseconds.
+            int ts;
+        };
 
-            // Construction/destruction
+        // Construction/destruction
 
-            /*! Gets a list of events that the user has been notified about
-             * \param from
-             *   Pagination token given to retrieve the next set of events.
-             * \param limit
-             *   Limit on the number of events to return in this request.
-             * \param only
-             *   Allows basic filtering of events returned. Supply ``highlight``
-             *   to return only events where the notification had the highlight
-             *   tweak set.
-             */
-            explicit GetNotificationsJob(const QString& from = {}, Omittable<int> limit = none, const QString& only = {});
+        /*! Gets a list of events that the user has been notified about
+         * \param from
+         *   Pagination token given to retrieve the next set of events.
+         * \param limit
+         *   Limit on the number of events to return in this request.
+         * \param only
+         *   Allows basic filtering of events returned. Supply ``highlight``
+         *   to return only events where the notification had the highlight
+         *   tweak set.
+         */
+        explicit GetNotificationsJob(const QString& from = {},
+                                     Omittable<int> limit = none,
+                                     const QString& only = {});
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetNotificationsJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& from = {}, Omittable<int> limit = none, const QString& only = {});
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetNotificationsJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& from = {},
+                                   Omittable<int> limit = none,
+                                   const QString& only = {});
 
-            ~GetNotificationsJob() override;
+        ~GetNotificationsJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The token to supply in the ``from`` param of the next
-            /// ``/notifications`` request in order to request more
-            /// events. If this is absent, there are no more results.
-            const QString& nextToken() const;
-            /// The list of events that triggered notifications.
-            std::vector<Notification>&& notifications();
+        /// The token to supply in the ``from`` param of the next
+        /// ``/notifications`` request in order to request more
+        /// events. If this is absent, there are no more results.
+        const QString& nextToken() const;
+        /// The list of events that triggered notifications.
+        std::vector<Notification>&& notifications();
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/openid.cpp b/lib/csapi/openid.cpp
index b27fe0b8..82a3b055 100644
--- a/lib/csapi/openid.cpp
+++ b/lib/csapi/openid.cpp
@@ -15,18 +15,20 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class RequestOpenIdTokenJob::Private
 {
     public:
-        QString accessToken;
-        QString tokenType;
-        QString matrixServerName;
-        int expiresIn;
+    QString accessToken;
+    QString tokenType;
+    QString matrixServerName;
+    int expiresIn;
 };
 
-static const auto RequestOpenIdTokenJobName = QStringLiteral("RequestOpenIdTokenJob");
+static const auto RequestOpenIdTokenJobName =
+        QStringLiteral("RequestOpenIdTokenJob");
 
-RequestOpenIdTokenJob::RequestOpenIdTokenJob(const QString& userId, const QJsonObject& body)
+RequestOpenIdTokenJob::RequestOpenIdTokenJob(const QString& userId,
+                                             const QJsonObject& body)
     : BaseJob(HttpVerb::Post, RequestOpenIdTokenJobName,
-        basePath % "/user/" % userId % "/openid/request_token")
-    , d(new Private)
+              basePath % "/user/" % userId % "/openid/request_token"),
+      d(new Private)
 {
     setRequestData(Data(toJson(body)));
 }
@@ -38,40 +40,33 @@ const QString& RequestOpenIdTokenJob::accessToken() const
     return d->accessToken;
 }
 
-const QString& RequestOpenIdTokenJob::tokenType() const
-{
-    return d->tokenType;
-}
+const QString& RequestOpenIdTokenJob::tokenType() const { return d->tokenType; }
 
 const QString& RequestOpenIdTokenJob::matrixServerName() const
 {
     return d->matrixServerName;
 }
 
-int RequestOpenIdTokenJob::expiresIn() const
-{
-    return d->expiresIn;
-}
+int RequestOpenIdTokenJob::expiresIn() const { return d->expiresIn; }
 
 BaseJob::Status RequestOpenIdTokenJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("access_token"_ls))
         return { JsonParseError,
-            "The key 'access_token' not found in the response" };
+                 "The key 'access_token' not found in the response" };
     fromJson(json.value("access_token"_ls), d->accessToken);
     if (!json.contains("token_type"_ls))
         return { JsonParseError,
-            "The key 'token_type' not found in the response" };
+                 "The key 'token_type' not found in the response" };
     fromJson(json.value("token_type"_ls), d->tokenType);
     if (!json.contains("matrix_server_name"_ls))
         return { JsonParseError,
-            "The key 'matrix_server_name' not found in the response" };
+                 "The key 'matrix_server_name' not found in the response" };
     fromJson(json.value("matrix_server_name"_ls), d->matrixServerName);
     if (!json.contains("expires_in"_ls))
         return { JsonParseError,
-            "The key 'expires_in' not found in the response" };
+                 "The key 'expires_in' not found in the response" };
     fromJson(json.value("expires_in"_ls), d->expiresIn);
     return Success;
 }
-
diff --git a/lib/csapi/openid.h b/lib/csapi/openid.h
index 807801fb..6e3c744d 100644
--- a/lib/csapi/openid.h
+++ b/lib/csapi/openid.h
@@ -9,8 +9,7 @@
 #include "converters.h"
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Get an OpenID token object to verify the requester's identity.
@@ -19,43 +18,44 @@ namespace QMatrixClient
     /// service to verify their identity in Matrix. The generated token is only
     /// valid for exchanging for user information from the federation API for
     /// OpenID.
-    /// 
+    ///
     /// The access token generated is only valid for the OpenID API. It cannot
     /// be used to request another OpenID access token or call ``/sync``, for
     /// example.
     class RequestOpenIdTokenJob : public BaseJob
     {
         public:
-            /*! Get an OpenID token object to verify the requester's identity.
-             * \param userId
-             *   The user to request and OpenID token for. Should be the user who
-             *   is authenticated for the request.
-             * \param body
-             *   An empty object. Reserved for future expansion.
-             */
-            explicit RequestOpenIdTokenJob(const QString& userId, const QJsonObject& body = {});
-            ~RequestOpenIdTokenJob() override;
-
-            // Result properties
-
-            /// An access token the consumer may use to verify the identity of
-            /// the person who generated the token. This is given to the federation
-            /// API ``GET /openid/userinfo``.
-            const QString& accessToken() const;
-            /// The string ``Bearer``.
-            const QString& tokenType() const;
-            /// The homeserver domain the consumer should use when attempting to
-            /// verify the user's identity.
-            const QString& matrixServerName() const;
-            /// The number of seconds before this token expires and a new one must
-            /// be generated.
-            int expiresIn() const;
+        /*! Get an OpenID token object to verify the requester's identity.
+         * \param userId
+         *   The user to request and OpenID token for. Should be the user who
+         *   is authenticated for the request.
+         * \param body
+         *   An empty object. Reserved for future expansion.
+         */
+        explicit RequestOpenIdTokenJob(const QString& userId,
+                                       const QJsonObject& body = {});
+        ~RequestOpenIdTokenJob() override;
+
+        // Result properties
+
+        /// An access token the consumer may use to verify the identity of
+        /// the person who generated the token. This is given to the federation
+        /// API ``GET /openid/userinfo``.
+        const QString& accessToken() const;
+        /// The string ``Bearer``.
+        const QString& tokenType() const;
+        /// The homeserver domain the consumer should use when attempting to
+        /// verify the user's identity.
+        const QString& matrixServerName() const;
+        /// The number of seconds before this token expires and a new one must
+        /// be generated.
+        int expiresIn() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/peeking_events.cpp b/lib/csapi/peeking_events.cpp
index 3208d48d..d48eca3f 100644
--- a/lib/csapi/peeking_events.cpp
+++ b/lib/csapi/peeking_events.cpp
@@ -15,12 +15,13 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class PeekEventsJob::Private
 {
     public:
-        QString begin;
-        QString end;
-        RoomEvents chunk;
+    QString begin;
+    QString end;
+    RoomEvents chunk;
 };
 
-BaseJob::Query queryToPeekEvents(const QString& from, Omittable<int> timeout, const QString& roomId)
+BaseJob::Query queryToPeekEvents(const QString& from, Omittable<int> timeout,
+                                 const QString& roomId)
 {
     BaseJob::Query _q;
     addParam<IfNotEmpty>(_q, QStringLiteral("from"), from);
@@ -29,39 +30,31 @@ BaseJob::Query queryToPeekEvents(const QString& from, Omittable<int> timeout, co
     return _q;
 }
 
-QUrl PeekEventsJob::makeRequestUrl(QUrl baseUrl, const QString& from, Omittable<int> timeout, const QString& roomId)
+QUrl PeekEventsJob::makeRequestUrl(QUrl baseUrl, const QString& from,
+                                   Omittable<int> timeout,
+                                   const QString& roomId)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/events",
-            queryToPeekEvents(from, timeout, roomId));
+    return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/events",
+                                   queryToPeekEvents(from, timeout, roomId));
 }
 
 static const auto PeekEventsJobName = QStringLiteral("PeekEventsJob");
 
-PeekEventsJob::PeekEventsJob(const QString& from, Omittable<int> timeout, const QString& roomId)
-    : BaseJob(HttpVerb::Get, PeekEventsJobName,
-        basePath % "/events",
-        queryToPeekEvents(from, timeout, roomId))
-    , d(new Private)
+PeekEventsJob::PeekEventsJob(const QString& from, Omittable<int> timeout,
+                             const QString& roomId)
+    : BaseJob(HttpVerb::Get, PeekEventsJobName, basePath % "/events",
+              queryToPeekEvents(from, timeout, roomId)),
+      d(new Private)
 {
 }
 
 PeekEventsJob::~PeekEventsJob() = default;
 
-const QString& PeekEventsJob::begin() const
-{
-    return d->begin;
-}
+const QString& PeekEventsJob::begin() const { return d->begin; }
 
-const QString& PeekEventsJob::end() const
-{
-    return d->end;
-}
+const QString& PeekEventsJob::end() const { return d->end; }
 
-RoomEvents&& PeekEventsJob::chunk()
-{
-    return std::move(d->chunk);
-}
+RoomEvents&& PeekEventsJob::chunk() { return std::move(d->chunk); }
 
 BaseJob::Status PeekEventsJob::parseJson(const QJsonDocument& data)
 {
@@ -71,4 +64,3 @@ BaseJob::Status PeekEventsJob::parseJson(const QJsonDocument& data)
     fromJson(json.value("chunk"_ls), d->chunk);
     return Success;
 }
-
diff --git a/lib/csapi/peeking_events.h b/lib/csapi/peeking_events.h
index 5a6e513c..00552af0 100644
--- a/lib/csapi/peeking_events.h
+++ b/lib/csapi/peeking_events.h
@@ -6,11 +6,10 @@
 
 #include "jobs/basejob.h"
 
-#include "events/eventloader.h"
 #include "converters.h"
+#include "events/eventloader.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Listen on the event stream.
@@ -18,53 +17,57 @@ namespace QMatrixClient
     /// This will listen for new events related to a particular room and return
     /// them to the caller. This will block until an event is received, or until
     /// the ``timeout`` is reached.
-    /// 
+    ///
     /// This API is the same as the normal ``/events`` endpoint, but can be
     /// called by users who have not joined the room.
-    /// 
+    ///
     /// Note that the normal ``/events`` endpoint has been deprecated. This
     /// API will also be deprecated at some point, but its replacement is not
     /// yet known.
     class PeekEventsJob : public BaseJob
     {
         public:
-            /*! Listen on the event stream.
-             * \param from
-             *   The token to stream from. This token is either from a previous
-             *   request to this API or from the initial sync API.
-             * \param timeout
-             *   The maximum time in milliseconds to wait for an event.
-             * \param roomId
-             *   The room ID for which events should be returned.
-             */
-            explicit PeekEventsJob(const QString& from = {}, Omittable<int> timeout = none, const QString& roomId = {});
+        /*! Listen on the event stream.
+         * \param from
+         *   The token to stream from. This token is either from a previous
+         *   request to this API or from the initial sync API.
+         * \param timeout
+         *   The maximum time in milliseconds to wait for an event.
+         * \param roomId
+         *   The room ID for which events should be returned.
+         */
+        explicit PeekEventsJob(const QString& from = {},
+                               Omittable<int> timeout = none,
+                               const QString& roomId = {});
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * PeekEventsJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& from = {}, Omittable<int> timeout = none, const QString& roomId = {});
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * PeekEventsJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& from = {},
+                                   Omittable<int> timeout = none,
+                                   const QString& roomId = {});
 
-            ~PeekEventsJob() override;
+        ~PeekEventsJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// A token which correlates to the first value in ``chunk``. This
-            /// is usually the same token supplied to ``from=``.
-            const QString& begin() const;
-            /// A token which correlates to the last value in ``chunk``. This
-            /// token should be used in the next request to ``/events``.
-            const QString& end() const;
-            /// An array of events.
-            RoomEvents&& chunk();
+        /// A token which correlates to the first value in ``chunk``. This
+        /// is usually the same token supplied to ``from=``.
+        const QString& begin() const;
+        /// A token which correlates to the last value in ``chunk``. This
+        /// token should be used in the next request to ``/events``.
+        const QString& end() const;
+        /// An array of events.
+        RoomEvents&& chunk();
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/presence.cpp b/lib/csapi/presence.cpp
index 024d7a34..4f9b9c78 100644
--- a/lib/csapi/presence.cpp
+++ b/lib/csapi/presence.cpp
@@ -14,9 +14,10 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 static const auto SetPresenceJobName = QStringLiteral("SetPresenceJob");
 
-SetPresenceJob::SetPresenceJob(const QString& userId, const QString& presence, const QString& statusMsg)
+SetPresenceJob::SetPresenceJob(const QString& userId, const QString& presence,
+                               const QString& statusMsg)
     : BaseJob(HttpVerb::Put, SetPresenceJobName,
-        basePath % "/presence/" % userId % "/status")
+              basePath % "/presence/" % userId % "/status")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("presence"), presence);
@@ -27,43 +28,37 @@ SetPresenceJob::SetPresenceJob(const QString& userId, const QString& presence, c
 class GetPresenceJob::Private
 {
     public:
-        QString presence;
-        Omittable<int> lastActiveAgo;
-        QString statusMsg;
-        Omittable<bool> currentlyActive;
+    QString presence;
+    Omittable<int> lastActiveAgo;
+    QString statusMsg;
+    Omittable<bool> currentlyActive;
 };
 
 QUrl GetPresenceJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/presence/" % userId % "/status");
+    return BaseJob::makeRequestUrl(
+            std::move(baseUrl), basePath % "/presence/" % userId % "/status");
 }
 
 static const auto GetPresenceJobName = QStringLiteral("GetPresenceJob");
 
 GetPresenceJob::GetPresenceJob(const QString& userId)
     : BaseJob(HttpVerb::Get, GetPresenceJobName,
-        basePath % "/presence/" % userId % "/status")
-    , d(new Private)
+              basePath % "/presence/" % userId % "/status"),
+      d(new Private)
 {
 }
 
 GetPresenceJob::~GetPresenceJob() = default;
 
-const QString& GetPresenceJob::presence() const
-{
-    return d->presence;
-}
+const QString& GetPresenceJob::presence() const { return d->presence; }
 
 Omittable<int> GetPresenceJob::lastActiveAgo() const
 {
     return d->lastActiveAgo;
 }
 
-const QString& GetPresenceJob::statusMsg() const
-{
-    return d->statusMsg;
-}
+const QString& GetPresenceJob::statusMsg() const { return d->statusMsg; }
 
 Omittable<bool> GetPresenceJob::currentlyActive() const
 {
@@ -75,11 +70,10 @@ BaseJob::Status GetPresenceJob::parseJson(const QJsonDocument& data)
     auto json = data.object();
     if (!json.contains("presence"_ls))
         return { JsonParseError,
-            "The key 'presence' not found in the response" };
+                 "The key 'presence' not found in the response" };
     fromJson(json.value("presence"_ls), d->presence);
     fromJson(json.value("last_active_ago"_ls), d->lastActiveAgo);
     fromJson(json.value("status_msg"_ls), d->statusMsg);
     fromJson(json.value("currently_active"_ls), d->currentlyActive);
     return Success;
 }
-
diff --git a/lib/csapi/presence.h b/lib/csapi/presence.h
index 5e132d24..881d9d5e 100644
--- a/lib/csapi/presence.h
+++ b/lib/csapi/presence.h
@@ -8,8 +8,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Update this user's presence state.
@@ -21,15 +20,16 @@ namespace QMatrixClient
     class SetPresenceJob : public BaseJob
     {
         public:
-            /*! Update this user's presence state.
-             * \param userId
-             *   The user whose presence state to update.
-             * \param presence
-             *   The new presence state.
-             * \param statusMsg
-             *   The status message to attach to this state.
-             */
-            explicit SetPresenceJob(const QString& userId, const QString& presence, const QString& statusMsg = {});
+        /*! Update this user's presence state.
+         * \param userId
+         *   The user whose presence state to update.
+         * \param presence
+         *   The new presence state.
+         * \param statusMsg
+         *   The status message to attach to this state.
+         */
+        explicit SetPresenceJob(const QString& userId, const QString& presence,
+                                const QString& statusMsg = {});
     };
 
     /// Get this user's presence state.
@@ -38,39 +38,39 @@ namespace QMatrixClient
     class GetPresenceJob : public BaseJob
     {
         public:
-            /*! Get this user's presence state.
-             * \param userId
-             *   The user whose presence state to get.
-             */
-            explicit GetPresenceJob(const QString& userId);
+        /*! Get this user's presence state.
+         * \param userId
+         *   The user whose presence state to get.
+         */
+        explicit GetPresenceJob(const QString& userId);
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetPresenceJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetPresenceJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId);
 
-            ~GetPresenceJob() override;
+        ~GetPresenceJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// This user's presence.
-            const QString& presence() const;
-            /// The length of time in milliseconds since an action was performed
-            /// by this user.
-            Omittable<int> lastActiveAgo() const;
-            /// The state message for this user if one was set.
-            const QString& statusMsg() const;
-            /// Whether the user is currently active
-            Omittable<bool> currentlyActive() const;
+        /// This user's presence.
+        const QString& presence() const;
+        /// The length of time in milliseconds since an action was performed
+        /// by this user.
+        Omittable<int> lastActiveAgo() const;
+        /// The state message for this user if one was set.
+        const QString& statusMsg() const;
+        /// Whether the user is currently active
+        Omittable<bool> currentlyActive() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/profile.cpp b/lib/csapi/profile.cpp
index 4ed3ad9b..fefc18f2 100644
--- a/lib/csapi/profile.cpp
+++ b/lib/csapi/profile.cpp
@@ -14,9 +14,10 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 static const auto SetDisplayNameJobName = QStringLiteral("SetDisplayNameJob");
 
-SetDisplayNameJob::SetDisplayNameJob(const QString& userId, const QString& displayname)
+SetDisplayNameJob::SetDisplayNameJob(const QString& userId,
+                                     const QString& displayname)
     : BaseJob(HttpVerb::Put, SetDisplayNameJobName,
-        basePath % "/profile/" % userId % "/displayname")
+              basePath % "/profile/" % userId % "/displayname")
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("displayname"), displayname);
@@ -26,30 +27,28 @@ SetDisplayNameJob::SetDisplayNameJob(const QString& userId, const QString& displ
 class GetDisplayNameJob::Private
 {
     public:
-        QString displayname;
+    QString displayname;
 };
 
 QUrl GetDisplayNameJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/profile/" % userId % "/displayname");
+                                   basePath % "/profile/" % userId
+                                           % "/displayname");
 }
 
 static const auto GetDisplayNameJobName = QStringLiteral("GetDisplayNameJob");
 
 GetDisplayNameJob::GetDisplayNameJob(const QString& userId)
     : BaseJob(HttpVerb::Get, GetDisplayNameJobName,
-        basePath % "/profile/" % userId % "/displayname", false)
-    , d(new Private)
+              basePath % "/profile/" % userId % "/displayname", false),
+      d(new Private)
 {
 }
 
 GetDisplayNameJob::~GetDisplayNameJob() = default;
 
-const QString& GetDisplayNameJob::displayname() const
-{
-    return d->displayname;
-}
+const QString& GetDisplayNameJob::displayname() const { return d->displayname; }
 
 BaseJob::Status GetDisplayNameJob::parseJson(const QJsonDocument& data)
 {
@@ -60,9 +59,10 @@ BaseJob::Status GetDisplayNameJob::parseJson(const QJsonDocument& data)
 
 static const auto SetAvatarUrlJobName = QStringLiteral("SetAvatarUrlJob");
 
-SetAvatarUrlJob::SetAvatarUrlJob(const QString& userId, const QString& avatarUrl)
+SetAvatarUrlJob::SetAvatarUrlJob(const QString& userId,
+                                 const QString& avatarUrl)
     : BaseJob(HttpVerb::Put, SetAvatarUrlJobName,
-        basePath % "/profile/" % userId % "/avatar_url")
+              basePath % "/profile/" % userId % "/avatar_url")
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("avatar_url"), avatarUrl);
@@ -72,30 +72,28 @@ SetAvatarUrlJob::SetAvatarUrlJob(const QString& userId, const QString& avatarUrl
 class GetAvatarUrlJob::Private
 {
     public:
-        QString avatarUrl;
+    QString avatarUrl;
 };
 
 QUrl GetAvatarUrlJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/profile/" % userId % "/avatar_url");
+                                   basePath % "/profile/" % userId
+                                           % "/avatar_url");
 }
 
 static const auto GetAvatarUrlJobName = QStringLiteral("GetAvatarUrlJob");
 
 GetAvatarUrlJob::GetAvatarUrlJob(const QString& userId)
     : BaseJob(HttpVerb::Get, GetAvatarUrlJobName,
-        basePath % "/profile/" % userId % "/avatar_url", false)
-    , d(new Private)
+              basePath % "/profile/" % userId % "/avatar_url", false),
+      d(new Private)
 {
 }
 
 GetAvatarUrlJob::~GetAvatarUrlJob() = default;
 
-const QString& GetAvatarUrlJob::avatarUrl() const
-{
-    return d->avatarUrl;
-}
+const QString& GetAvatarUrlJob::avatarUrl() const { return d->avatarUrl; }
 
 BaseJob::Status GetAvatarUrlJob::parseJson(const QJsonDocument& data)
 {
@@ -107,36 +105,30 @@ BaseJob::Status GetAvatarUrlJob::parseJson(const QJsonDocument& data)
 class GetUserProfileJob::Private
 {
     public:
-        QString avatarUrl;
-        QString displayname;
+    QString avatarUrl;
+    QString displayname;
 };
 
 QUrl GetUserProfileJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/profile/" % userId);
+                                   basePath % "/profile/" % userId);
 }
 
 static const auto GetUserProfileJobName = QStringLiteral("GetUserProfileJob");
 
 GetUserProfileJob::GetUserProfileJob(const QString& userId)
     : BaseJob(HttpVerb::Get, GetUserProfileJobName,
-        basePath % "/profile/" % userId, false)
-    , d(new Private)
+              basePath % "/profile/" % userId, false),
+      d(new Private)
 {
 }
 
 GetUserProfileJob::~GetUserProfileJob() = default;
 
-const QString& GetUserProfileJob::avatarUrl() const
-{
-    return d->avatarUrl;
-}
+const QString& GetUserProfileJob::avatarUrl() const { return d->avatarUrl; }
 
-const QString& GetUserProfileJob::displayname() const
-{
-    return d->displayname;
-}
+const QString& GetUserProfileJob::displayname() const { return d->displayname; }
 
 BaseJob::Status GetUserProfileJob::parseJson(const QJsonDocument& data)
 {
@@ -145,4 +137,3 @@ BaseJob::Status GetUserProfileJob::parseJson(const QJsonDocument& data)
     fromJson(json.value("displayname"_ls), d->displayname);
     return Success;
 }
-
diff --git a/lib/csapi/profile.h b/lib/csapi/profile.h
index 23094aff..9a6ab56b 100644
--- a/lib/csapi/profile.h
+++ b/lib/csapi/profile.h
@@ -6,25 +6,25 @@
 
 #include "jobs/basejob.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Set the user's display name.
     ///
     /// This API sets the given user's display name. You must have permission to
-    /// set this user's display name, e.g. you need to have their ``access_token``.
+    /// set this user's display name, e.g. you need to have their
+    /// ``access_token``.
     class SetDisplayNameJob : public BaseJob
     {
         public:
-            /*! Set the user's display name.
-             * \param userId
-             *   The user whose display name to set.
-             * \param displayname
-             *   The new display name for this user.
-             */
-            explicit SetDisplayNameJob(const QString& userId, const QString& displayname = {});
+        /*! Set the user's display name.
+         * \param userId
+         *   The user whose display name to set.
+         * \param displayname
+         *   The new display name for this user.
+         */
+        explicit SetDisplayNameJob(const QString& userId,
+                                   const QString& displayname = {});
     };
 
     /// Get the user's display name.
@@ -35,49 +35,51 @@ namespace QMatrixClient
     class GetDisplayNameJob : public BaseJob
     {
         public:
-            /*! Get the user's display name.
-             * \param userId
-             *   The user whose display name to get.
-             */
-            explicit GetDisplayNameJob(const QString& userId);
+        /*! Get the user's display name.
+         * \param userId
+         *   The user whose display name to get.
+         */
+        explicit GetDisplayNameJob(const QString& userId);
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetDisplayNameJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetDisplayNameJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId);
 
-            ~GetDisplayNameJob() override;
+        ~GetDisplayNameJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The user's display name if they have set one, otherwise not present.
-            const QString& displayname() const;
+        /// The user's display name if they have set one, otherwise not present.
+        const QString& displayname() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Set the user's avatar URL.
     ///
     /// This API sets the given user's avatar URL. You must have permission to
-    /// set this user's avatar URL, e.g. you need to have their ``access_token``.
+    /// set this user's avatar URL, e.g. you need to have their
+    /// ``access_token``.
     class SetAvatarUrlJob : public BaseJob
     {
         public:
-            /*! Set the user's avatar URL.
-             * \param userId
-             *   The user whose avatar URL to set.
-             * \param avatarUrl
-             *   The new avatar URL for this user.
-             */
-            explicit SetAvatarUrlJob(const QString& userId, const QString& avatarUrl = {});
+        /*! Set the user's avatar URL.
+         * \param userId
+         *   The user whose avatar URL to set.
+         * \param avatarUrl
+         *   The new avatar URL for this user.
+         */
+        explicit SetAvatarUrlJob(const QString& userId,
+                                 const QString& avatarUrl = {});
     };
 
     /// Get the user's avatar URL.
@@ -88,33 +90,33 @@ namespace QMatrixClient
     class GetAvatarUrlJob : public BaseJob
     {
         public:
-            /*! Get the user's avatar URL.
-             * \param userId
-             *   The user whose avatar URL to get.
-             */
-            explicit GetAvatarUrlJob(const QString& userId);
+        /*! Get the user's avatar URL.
+         * \param userId
+         *   The user whose avatar URL to get.
+         */
+        explicit GetAvatarUrlJob(const QString& userId);
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetAvatarUrlJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetAvatarUrlJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId);
 
-            ~GetAvatarUrlJob() override;
+        ~GetAvatarUrlJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The user's avatar URL if they have set one, otherwise not present.
-            const QString& avatarUrl() const;
+        /// The user's avatar URL if they have set one, otherwise not present.
+        const QString& avatarUrl() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Get this user's profile information.
@@ -126,34 +128,34 @@ namespace QMatrixClient
     class GetUserProfileJob : public BaseJob
     {
         public:
-            /*! Get this user's profile information.
-             * \param userId
-             *   The user whose profile information to get.
-             */
-            explicit GetUserProfileJob(const QString& userId);
+        /*! Get this user's profile information.
+         * \param userId
+         *   The user whose profile information to get.
+         */
+        explicit GetUserProfileJob(const QString& userId);
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetUserProfileJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetUserProfileJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId);
 
-            ~GetUserProfileJob() override;
+        ~GetUserProfileJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The user's avatar URL if they have set one, otherwise not present.
-            const QString& avatarUrl() const;
-            /// The user's display name if they have set one, otherwise not present.
-            const QString& displayname() const;
+        /// The user's avatar URL if they have set one, otherwise not present.
+        const QString& avatarUrl() const;
+        /// The user's display name if they have set one, otherwise not present.
+        const QString& displayname() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/pusher.cpp b/lib/csapi/pusher.cpp
index 664959f4..86b36c6d 100644
--- a/lib/csapi/pusher.cpp
+++ b/lib/csapi/pusher.cpp
@@ -12,28 +12,28 @@ using namespace QMatrixClient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<GetPushersJob::PusherData>
-    {
-        static void fillFrom(const QJsonObject& jo, GetPushersJob::PusherData& result)
+    template <> struct JsonObjectConverter<GetPushersJob::PusherData> {
+        static void fillFrom(const QJsonObject& jo,
+                             GetPushersJob::PusherData& result)
         {
             fromJson(jo.value("url"_ls), result.url);
             fromJson(jo.value("format"_ls), result.format);
         }
     };
 
-    template <> struct JsonObjectConverter<GetPushersJob::Pusher>
-    {
-        static void fillFrom(const QJsonObject& jo, GetPushersJob::Pusher& result)
+    template <> struct JsonObjectConverter<GetPushersJob::Pusher> {
+        static void fillFrom(const QJsonObject& jo,
+                             GetPushersJob::Pusher& result)
         {
             fromJson(jo.value("pushkey"_ls), result.pushkey);
             fromJson(jo.value("kind"_ls), result.kind);
             fromJson(jo.value("app_id"_ls), result.appId);
             fromJson(jo.value("app_display_name"_ls), result.appDisplayName);
-            fromJson(jo.value("device_display_name"_ls), result.deviceDisplayName);
+            fromJson(jo.value("device_display_name"_ls),
+                     result.deviceDisplayName);
             fromJson(jo.value("profile_tag"_ls), result.profileTag);
             fromJson(jo.value("lang"_ls), result.lang);
             fromJson(jo.value("data"_ls), result.data);
@@ -44,21 +44,19 @@ namespace QMatrixClient
 class GetPushersJob::Private
 {
     public:
-        QVector<Pusher> pushers;
+    QVector<Pusher> pushers;
 };
 
 QUrl GetPushersJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/pushers");
+    return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/pushers");
 }
 
 static const auto GetPushersJobName = QStringLiteral("GetPushersJob");
 
 GetPushersJob::GetPushersJob()
-    : BaseJob(HttpVerb::Get, GetPushersJobName,
-        basePath % "/pushers")
-    , d(new Private)
+    : BaseJob(HttpVerb::Get, GetPushersJobName, basePath % "/pushers"),
+      d(new Private)
 {
 }
 
@@ -76,13 +74,12 @@ BaseJob::Status GetPushersJob::parseJson(const QJsonDocument& data)
     return Success;
 }
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<PostPusherJob::PusherData>
-    {
-        static void dumpTo(QJsonObject& jo, const PostPusherJob::PusherData& pod)
+    template <> struct JsonObjectConverter<PostPusherJob::PusherData> {
+        static void dumpTo(QJsonObject& jo,
+                           const PostPusherJob::PusherData& pod)
         {
             addParam<IfNotEmpty>(jo, QStringLiteral("url"), pod.url);
             addParam<IfNotEmpty>(jo, QStringLiteral("format"), pod.format);
@@ -92,9 +89,13 @@ namespace QMatrixClient
 
 static const auto PostPusherJobName = QStringLiteral("PostPusherJob");
 
-PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag, Omittable<bool> append)
-    : BaseJob(HttpVerb::Post, PostPusherJobName,
-        basePath % "/pushers/set")
+PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind,
+                             const QString& appId,
+                             const QString& appDisplayName,
+                             const QString& deviceDisplayName,
+                             const QString& lang, const PusherData& data,
+                             const QString& profileTag, Omittable<bool> append)
+    : BaseJob(HttpVerb::Post, PostPusherJobName, basePath % "/pushers/set")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("pushkey"), pushkey);
@@ -108,4 +109,3 @@ PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind, const
     addParam<IfNotEmpty>(_data, QStringLiteral("append"), append);
     setRequestData(_data);
 }
-
diff --git a/lib/csapi/pusher.h b/lib/csapi/pusher.h
index da3303fe..947d7fc8 100644
--- a/lib/csapi/pusher.h
+++ b/lib/csapi/pusher.h
@@ -6,11 +6,10 @@
 
 #include "jobs/basejob.h"
 
-#include <QtCore/QVector>
 #include "converters.h"
+#include <QtCore/QVector>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Gets the current pushers for the authenticated user
@@ -19,151 +18,154 @@ namespace QMatrixClient
     class GetPushersJob : public BaseJob
     {
         public:
-            // Inner data structures
-
+        // Inner data structures
+
+        /// A dictionary of information for the pusher implementation
+        /// itself.
+        struct PusherData {
+            /// Required if ``kind`` is ``http``. The URL to use to send
+            /// notifications to.
+            QString url;
+            /// The format to use when sending notifications to the Push
+            /// Gateway.
+            QString format;
+        };
+
+        /// Gets all currently active pushers for the authenticated user.
+        struct Pusher {
+            /// This is a unique identifier for this pusher. See ``/set`` for
+            /// more detail.
+            /// Max length, 512 bytes.
+            QString pushkey;
+            /// The kind of pusher. ``"http"`` is a pusher that
+            /// sends HTTP pokes.
+            QString kind;
+            /// This is a reverse-DNS style identifier for the application.
+            /// Max length, 64 chars.
+            QString appId;
+            /// A string that will allow the user to identify what application
+            /// owns this pusher.
+            QString appDisplayName;
+            /// A string that will allow the user to identify what device owns
+            /// this pusher.
+            QString deviceDisplayName;
+            /// This string determines which set of device specific rules this
+            /// pusher executes.
+            QString profileTag;
+            /// The preferred language for receiving notifications (e.g. 'en'
+            /// or 'en-US')
+            QString lang;
             /// A dictionary of information for the pusher implementation
             /// itself.
-            struct PusherData
-            {
-                /// Required if ``kind`` is ``http``. The URL to use to send
-                /// notifications to.
-                QString url;
-                /// The format to use when sending notifications to the Push
-                /// Gateway.
-                QString format;
-            };
-
-            /// Gets all currently active pushers for the authenticated user.
-            struct Pusher
-            {
-                /// This is a unique identifier for this pusher. See ``/set`` for
-                /// more detail.
-                /// Max length, 512 bytes.
-                QString pushkey;
-                /// The kind of pusher. ``"http"`` is a pusher that
-                /// sends HTTP pokes.
-                QString kind;
-                /// This is a reverse-DNS style identifier for the application.
-                /// Max length, 64 chars.
-                QString appId;
-                /// A string that will allow the user to identify what application
-                /// owns this pusher.
-                QString appDisplayName;
-                /// A string that will allow the user to identify what device owns
-                /// this pusher.
-                QString deviceDisplayName;
-                /// This string determines which set of device specific rules this
-                /// pusher executes.
-                QString profileTag;
-                /// The preferred language for receiving notifications (e.g. 'en'
-                /// or 'en-US')
-                QString lang;
-                /// A dictionary of information for the pusher implementation
-                /// itself.
-                PusherData data;
-            };
-
-            // Construction/destruction
-
-            explicit GetPushersJob();
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetPushersJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl);
-
-            ~GetPushersJob() override;
-
-            // Result properties
-
-            /// An array containing the current pushers for the user
-            const QVector<Pusher>& pushers() const;
+            PusherData data;
+        };
+
+        // Construction/destruction
+
+        explicit GetPushersJob();
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetPushersJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl);
+
+        ~GetPushersJob() override;
+
+        // Result properties
+
+        /// An array containing the current pushers for the user
+        const QVector<Pusher>& pushers() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Modify a pusher for this user on the homeserver.
     ///
-    /// This endpoint allows the creation, modification and deletion of `pushers`_
-    /// for this user ID. The behaviour of this endpoint varies depending on the
-    /// values in the JSON body.
+    /// This endpoint allows the creation, modification and deletion of
+    /// `pushers`_ for this user ID. The behaviour of this endpoint varies
+    /// depending on the values in the JSON body.
     class PostPusherJob : public BaseJob
     {
         public:
-            // Inner data structures
-
-            /// A dictionary of information for the pusher implementation
-            /// itself. If ``kind`` is ``http``, this should contain ``url``
-            /// which is the URL to use to send notifications to.
-            struct PusherData
-            {
-                /// Required if ``kind`` is ``http``. The URL to use to send
-                /// notifications to. MUST be an HTTPS URL with a path of 
-                /// ``/_matrix/push/v1/notify``.
-                QString url;
-                /// The format to send notifications in to Push Gateways if the
-                /// ``kind`` is ``http``. The details about what fields the
-                /// homeserver should send to the push gateway are defined in the
-                /// `Push Gateway Specification`_. Currently the only format
-                /// available is 'event_id_only'.
-                QString format;
-            };
-
-            // Construction/destruction
-
-            /*! Modify a pusher for this user on the homeserver.
-             * \param pushkey
-             *   This is a unique identifier for this pusher. The value you
-             *   should use for this is the routing or destination address
-             *   information for the notification, for example, the APNS token
-             *   for APNS or the Registration ID for GCM. If your notification
-             *   client has no such concept, use any unique identifier.
-             *   Max length, 512 bytes.
-             *   
-             *   If the ``kind`` is ``"email"``, this is the email address to
-             *   send notifications to.
-             * \param kind
-             *   The kind of pusher to configure. ``"http"`` makes a pusher that
-             *   sends HTTP pokes. ``"email"`` makes a pusher that emails the
-             *   user with unread notifications. ``null`` deletes the pusher.
-             * \param appId
-             *   This is a reverse-DNS style identifier for the application.
-             *   It is recommended that this end with the platform, such that
-             *   different platform versions get different app identifiers.
-             *   Max length, 64 chars.
-             *   
-             *   If the ``kind`` is ``"email"``, this is ``"m.email"``.
-             * \param appDisplayName
-             *   A string that will allow the user to identify what application
-             *   owns this pusher.
-             * \param deviceDisplayName
-             *   A string that will allow the user to identify what device owns
-             *   this pusher.
-             * \param lang
-             *   The preferred language for receiving notifications (e.g. 'en'
-             *   or 'en-US').
-             * \param data
-             *   A dictionary of information for the pusher implementation
-             *   itself. If ``kind`` is ``http``, this should contain ``url``
-             *   which is the URL to use to send notifications to.
-             * \param profileTag
-             *   This string determines which set of device specific rules this
-             *   pusher executes.
-             * \param append
-             *   If true, the homeserver should add another pusher with the
-             *   given pushkey and App ID in addition to any others with
-             *   different user IDs. Otherwise, the homeserver must remove any
-             *   other pushers with the same App ID and pushkey for different
-             *   users. The default is ``false``.
-             */
-            explicit PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag = {}, Omittable<bool> append = none);
+        // Inner data structures
+
+        /// A dictionary of information for the pusher implementation
+        /// itself. If ``kind`` is ``http``, this should contain ``url``
+        /// which is the URL to use to send notifications to.
+        struct PusherData {
+            /// Required if ``kind`` is ``http``. The URL to use to send
+            /// notifications to. MUST be an HTTPS URL with a path of
+            /// ``/_matrix/push/v1/notify``.
+            QString url;
+            /// The format to send notifications in to Push Gateways if the
+            /// ``kind`` is ``http``. The details about what fields the
+            /// homeserver should send to the push gateway are defined in the
+            /// `Push Gateway Specification`_. Currently the only format
+            /// available is 'event_id_only'.
+            QString format;
+        };
+
+        // Construction/destruction
+
+        /*! Modify a pusher for this user on the homeserver.
+         * \param pushkey
+         *   This is a unique identifier for this pusher. The value you
+         *   should use for this is the routing or destination address
+         *   information for the notification, for example, the APNS token
+         *   for APNS or the Registration ID for GCM. If your notification
+         *   client has no such concept, use any unique identifier.
+         *   Max length, 512 bytes.
+         *
+         *   If the ``kind`` is ``"email"``, this is the email address to
+         *   send notifications to.
+         * \param kind
+         *   The kind of pusher to configure. ``"http"`` makes a pusher that
+         *   sends HTTP pokes. ``"email"`` makes a pusher that emails the
+         *   user with unread notifications. ``null`` deletes the pusher.
+         * \param appId
+         *   This is a reverse-DNS style identifier for the application.
+         *   It is recommended that this end with the platform, such that
+         *   different platform versions get different app identifiers.
+         *   Max length, 64 chars.
+         *
+         *   If the ``kind`` is ``"email"``, this is ``"m.email"``.
+         * \param appDisplayName
+         *   A string that will allow the user to identify what application
+         *   owns this pusher.
+         * \param deviceDisplayName
+         *   A string that will allow the user to identify what device owns
+         *   this pusher.
+         * \param lang
+         *   The preferred language for receiving notifications (e.g. 'en'
+         *   or 'en-US').
+         * \param data
+         *   A dictionary of information for the pusher implementation
+         *   itself. If ``kind`` is ``http``, this should contain ``url``
+         *   which is the URL to use to send notifications to.
+         * \param profileTag
+         *   This string determines which set of device specific rules this
+         *   pusher executes.
+         * \param append
+         *   If true, the homeserver should add another pusher with the
+         *   given pushkey and App ID in addition to any others with
+         *   different user IDs. Otherwise, the homeserver must remove any
+         *   other pushers with the same App ID and pushkey for different
+         *   users. The default is ``false``.
+         */
+        explicit PostPusherJob(const QString& pushkey, const QString& kind,
+                               const QString& appId,
+                               const QString& appDisplayName,
+                               const QString& deviceDisplayName,
+                               const QString& lang, const PusherData& data,
+                               const QString& profileTag = {},
+                               Omittable<bool> append = none);
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/pushrules.cpp b/lib/csapi/pushrules.cpp
index b91d18f7..e70cbbde 100644
--- a/lib/csapi/pushrules.cpp
+++ b/lib/csapi/pushrules.cpp
@@ -15,37 +15,31 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class GetPushRulesJob::Private
 {
     public:
-        PushRuleset global;
+    PushRuleset global;
 };
 
 QUrl GetPushRulesJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/pushrules");
+    return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/pushrules");
 }
 
 static const auto GetPushRulesJobName = QStringLiteral("GetPushRulesJob");
 
 GetPushRulesJob::GetPushRulesJob()
-    : BaseJob(HttpVerb::Get, GetPushRulesJobName,
-        basePath % "/pushrules")
-    , d(new Private)
+    : BaseJob(HttpVerb::Get, GetPushRulesJobName, basePath % "/pushrules"),
+      d(new Private)
 {
 }
 
 GetPushRulesJob::~GetPushRulesJob() = default;
 
-const PushRuleset& GetPushRulesJob::global() const
-{
-    return d->global;
-}
+const PushRuleset& GetPushRulesJob::global() const { return d->global; }
 
 BaseJob::Status GetPushRulesJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("global"_ls))
-        return { JsonParseError,
-            "The key 'global' not found in the response" };
+        return { JsonParseError, "The key 'global' not found in the response" };
     fromJson(json.value("global"_ls), d->global);
     return Success;
 }
@@ -53,30 +47,30 @@ BaseJob::Status GetPushRulesJob::parseJson(const QJsonDocument& data)
 class GetPushRuleJob::Private
 {
     public:
-        PushRule data;
+    PushRule data;
 };
 
-QUrl GetPushRuleJob::makeRequestUrl(QUrl baseUrl, const QString& scope, const QString& kind, const QString& ruleId)
+QUrl GetPushRuleJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
+                                    const QString& kind, const QString& ruleId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId);
+                                   basePath % "/pushrules/" % scope % "/" % kind
+                                           % "/" % ruleId);
 }
 
 static const auto GetPushRuleJobName = QStringLiteral("GetPushRuleJob");
 
-GetPushRuleJob::GetPushRuleJob(const QString& scope, const QString& kind, const QString& ruleId)
+GetPushRuleJob::GetPushRuleJob(const QString& scope, const QString& kind,
+                               const QString& ruleId)
     : BaseJob(HttpVerb::Get, GetPushRuleJobName,
-        basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId)
-    , d(new Private)
+              basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId),
+      d(new Private)
 {
 }
 
 GetPushRuleJob::~GetPushRuleJob() = default;
 
-const PushRule& GetPushRuleJob::data() const
-{
-    return d->data;
-}
+const PushRule& GetPushRuleJob::data() const { return d->data; }
 
 BaseJob::Status GetPushRuleJob::parseJson(const QJsonDocument& data)
 {
@@ -84,17 +78,21 @@ BaseJob::Status GetPushRuleJob::parseJson(const QJsonDocument& data)
     return Success;
 }
 
-QUrl DeletePushRuleJob::makeRequestUrl(QUrl baseUrl, const QString& scope, const QString& kind, const QString& ruleId)
+QUrl DeletePushRuleJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
+                                       const QString& kind,
+                                       const QString& ruleId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId);
+                                   basePath % "/pushrules/" % scope % "/" % kind
+                                           % "/" % ruleId);
 }
 
 static const auto DeletePushRuleJobName = QStringLiteral("DeletePushRuleJob");
 
-DeletePushRuleJob::DeletePushRuleJob(const QString& scope, const QString& kind, const QString& ruleId)
+DeletePushRuleJob::DeletePushRuleJob(const QString& scope, const QString& kind,
+                                     const QString& ruleId)
     : BaseJob(HttpVerb::Delete, DeletePushRuleJobName,
-        basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId)
+              basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId)
 {
 }
 
@@ -108,10 +106,15 @@ BaseJob::Query queryToSetPushRule(const QString& before, const QString& after)
 
 static const auto SetPushRuleJobName = QStringLiteral("SetPushRuleJob");
 
-SetPushRuleJob::SetPushRuleJob(const QString& scope, const QString& kind, const QString& ruleId, const QStringList& actions, const QString& before, const QString& after, const QVector<PushCondition>& conditions, const QString& pattern)
+SetPushRuleJob::SetPushRuleJob(const QString& scope, const QString& kind,
+                               const QString& ruleId,
+                               const QStringList& actions,
+                               const QString& before, const QString& after,
+                               const QVector<PushCondition>& conditions,
+                               const QString& pattern)
     : BaseJob(HttpVerb::Put, SetPushRuleJobName,
-        basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId,
-        queryToSetPushRule(before, after))
+              basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId,
+              queryToSetPushRule(before, after))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("actions"), actions);
@@ -123,46 +126,55 @@ SetPushRuleJob::SetPushRuleJob(const QString& scope, const QString& kind, const
 class IsPushRuleEnabledJob::Private
 {
     public:
-        bool enabled;
+    bool enabled;
 };
 
-QUrl IsPushRuleEnabledJob::makeRequestUrl(QUrl baseUrl, const QString& scope, const QString& kind, const QString& ruleId)
+QUrl IsPushRuleEnabledJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
+                                          const QString& kind,
+                                          const QString& ruleId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId % "/enabled");
+                                   basePath % "/pushrules/" % scope % "/" % kind
+                                           % "/" % ruleId % "/enabled");
 }
 
-static const auto IsPushRuleEnabledJobName = QStringLiteral("IsPushRuleEnabledJob");
+static const auto IsPushRuleEnabledJobName =
+        QStringLiteral("IsPushRuleEnabledJob");
 
-IsPushRuleEnabledJob::IsPushRuleEnabledJob(const QString& scope, const QString& kind, const QString& ruleId)
+IsPushRuleEnabledJob::IsPushRuleEnabledJob(const QString& scope,
+                                           const QString& kind,
+                                           const QString& ruleId)
     : BaseJob(HttpVerb::Get, IsPushRuleEnabledJobName,
-        basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId % "/enabled")
-    , d(new Private)
+              basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId
+                      % "/enabled"),
+      d(new Private)
 {
 }
 
 IsPushRuleEnabledJob::~IsPushRuleEnabledJob() = default;
 
-bool IsPushRuleEnabledJob::enabled() const
-{
-    return d->enabled;
-}
+bool IsPushRuleEnabledJob::enabled() const { return d->enabled; }
 
 BaseJob::Status IsPushRuleEnabledJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("enabled"_ls))
         return { JsonParseError,
-            "The key 'enabled' not found in the response" };
+                 "The key 'enabled' not found in the response" };
     fromJson(json.value("enabled"_ls), d->enabled);
     return Success;
 }
 
-static const auto SetPushRuleEnabledJobName = QStringLiteral("SetPushRuleEnabledJob");
+static const auto SetPushRuleEnabledJobName =
+        QStringLiteral("SetPushRuleEnabledJob");
 
-SetPushRuleEnabledJob::SetPushRuleEnabledJob(const QString& scope, const QString& kind, const QString& ruleId, bool enabled)
+SetPushRuleEnabledJob::SetPushRuleEnabledJob(const QString& scope,
+                                             const QString& kind,
+                                             const QString& ruleId,
+                                             bool enabled)
     : BaseJob(HttpVerb::Put, SetPushRuleEnabledJobName,
-        basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId % "/enabled")
+              basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId
+                      % "/enabled")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("enabled"), enabled);
@@ -172,49 +184,57 @@ SetPushRuleEnabledJob::SetPushRuleEnabledJob(const QString& scope, const QString
 class GetPushRuleActionsJob::Private
 {
     public:
-        QStringList actions;
+    QStringList actions;
 };
 
-QUrl GetPushRuleActionsJob::makeRequestUrl(QUrl baseUrl, const QString& scope, const QString& kind, const QString& ruleId)
+QUrl GetPushRuleActionsJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
+                                           const QString& kind,
+                                           const QString& ruleId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId % "/actions");
+                                   basePath % "/pushrules/" % scope % "/" % kind
+                                           % "/" % ruleId % "/actions");
 }
 
-static const auto GetPushRuleActionsJobName = QStringLiteral("GetPushRuleActionsJob");
+static const auto GetPushRuleActionsJobName =
+        QStringLiteral("GetPushRuleActionsJob");
 
-GetPushRuleActionsJob::GetPushRuleActionsJob(const QString& scope, const QString& kind, const QString& ruleId)
+GetPushRuleActionsJob::GetPushRuleActionsJob(const QString& scope,
+                                             const QString& kind,
+                                             const QString& ruleId)
     : BaseJob(HttpVerb::Get, GetPushRuleActionsJobName,
-        basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId % "/actions")
-    , d(new Private)
+              basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId
+                      % "/actions"),
+      d(new Private)
 {
 }
 
 GetPushRuleActionsJob::~GetPushRuleActionsJob() = default;
 
-const QStringList& GetPushRuleActionsJob::actions() const
-{
-    return d->actions;
-}
+const QStringList& GetPushRuleActionsJob::actions() const { return d->actions; }
 
 BaseJob::Status GetPushRuleActionsJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("actions"_ls))
         return { JsonParseError,
-            "The key 'actions' not found in the response" };
+                 "The key 'actions' not found in the response" };
     fromJson(json.value("actions"_ls), d->actions);
     return Success;
 }
 
-static const auto SetPushRuleActionsJobName = QStringLiteral("SetPushRuleActionsJob");
+static const auto SetPushRuleActionsJobName =
+        QStringLiteral("SetPushRuleActionsJob");
 
-SetPushRuleActionsJob::SetPushRuleActionsJob(const QString& scope, const QString& kind, const QString& ruleId, const QStringList& actions)
+SetPushRuleActionsJob::SetPushRuleActionsJob(const QString& scope,
+                                             const QString& kind,
+                                             const QString& ruleId,
+                                             const QStringList& actions)
     : BaseJob(HttpVerb::Put, SetPushRuleActionsJobName,
-        basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId % "/actions")
+              basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId
+                      % "/actions")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("actions"), actions);
     setRequestData(_data);
 }
-
diff --git a/lib/csapi/pushrules.h b/lib/csapi/pushrules.h
index c038401c..5191d129 100644
--- a/lib/csapi/pushrules.h
+++ b/lib/csapi/pushrules.h
@@ -6,14 +6,13 @@
 
 #include "jobs/basejob.h"
 
-#include "csapi/definitions/push_ruleset.h"
 #include "converters.h"
+#include "csapi/definitions/push_condition.h"
 #include "csapi/definitions/push_rule.h"
+#include "csapi/definitions/push_ruleset.h"
 #include <QtCore/QVector>
-#include "csapi/definitions/push_condition.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Retrieve all push rulesets.
@@ -25,29 +24,29 @@ namespace QMatrixClient
     class GetPushRulesJob : public BaseJob
     {
         public:
-            explicit GetPushRulesJob();
+        explicit GetPushRulesJob();
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetPushRulesJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetPushRulesJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl);
 
-            ~GetPushRulesJob() override;
+        ~GetPushRulesJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The global ruleset.
-            const PushRuleset& global() const;
+        /// The global ruleset.
+        const PushRuleset& global() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Retrieve a push rule.
@@ -56,37 +55,39 @@ namespace QMatrixClient
     class GetPushRuleJob : public BaseJob
     {
         public:
-            /*! Retrieve a push rule.
-             * \param scope
-             *   ``global`` to specify global rules.
-             * \param kind
-             *   The kind of rule
-             * \param ruleId
-             *   The identifier for the rule.
-             */
-            explicit GetPushRuleJob(const QString& scope, const QString& kind, const QString& ruleId);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetPushRuleJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& scope, const QString& kind, const QString& ruleId);
-
-            ~GetPushRuleJob() override;
-
-            // Result properties
-
-            /// The push rule.
-            const PushRule& data() const;
+        /*! Retrieve a push rule.
+         * \param scope
+         *   ``global`` to specify global rules.
+         * \param kind
+         *   The kind of rule
+         * \param ruleId
+         *   The identifier for the rule.
+         */
+        explicit GetPushRuleJob(const QString& scope, const QString& kind,
+                                const QString& ruleId);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetPushRuleJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& scope,
+                                   const QString& kind, const QString& ruleId);
+
+        ~GetPushRuleJob() override;
+
+        // Result properties
+
+        /// The push rule.
+        const PushRule& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Delete a push rule.
@@ -95,24 +96,25 @@ namespace QMatrixClient
     class DeletePushRuleJob : public BaseJob
     {
         public:
-            /*! Delete a push rule.
-             * \param scope
-             *   ``global`` to specify global rules.
-             * \param kind
-             *   The kind of rule
-             * \param ruleId
-             *   The identifier for the rule.
-             */
-            explicit DeletePushRuleJob(const QString& scope, const QString& kind, const QString& ruleId);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * DeletePushRuleJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& scope, const QString& kind, const QString& ruleId);
-
+        /*! Delete a push rule.
+         * \param scope
+         *   ``global`` to specify global rules.
+         * \param kind
+         *   The kind of rule
+         * \param ruleId
+         *   The identifier for the rule.
+         */
+        explicit DeletePushRuleJob(const QString& scope, const QString& kind,
+                                   const QString& ruleId);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * DeletePushRuleJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& scope,
+                                   const QString& kind, const QString& ruleId);
     };
 
     /// Add or change a push rule.
@@ -120,36 +122,40 @@ namespace QMatrixClient
     /// This endpoint allows the creation, modification and deletion of pushers
     /// for this user ID. The behaviour of this endpoint varies depending on the
     /// values in the JSON body.
-    /// 
+    ///
     /// When creating push rules, they MUST be enabled by default.
     class SetPushRuleJob : public BaseJob
     {
         public:
-            /*! Add or change a push rule.
-             * \param scope
-             *   ``global`` to specify global rules.
-             * \param kind
-             *   The kind of rule
-             * \param ruleId
-             *   The identifier for the rule.
-             * \param actions
-             *   The action(s) to perform when the conditions for this rule are met.
-             * \param before
-             *   Use 'before' with a ``rule_id`` as its value to make the new rule the
-             *   next-most important rule with respect to the given user defined rule.
-             *   It is not possible to add a rule relative to a predefined server rule.
-             * \param after
-             *   This makes the new rule the next-less important rule relative to the
-             *   given user defined rule. It is not possible to add a rule relative
-             *   to a predefined server rule.
-             * \param conditions
-             *   The conditions that must hold true for an event in order for a
-             *   rule to be applied to an event. A rule with no conditions
-             *   always matches. Only applicable to ``underride`` and ``override`` rules.
-             * \param pattern
-             *   Only applicable to ``content`` rules. The glob-style pattern to match against.
-             */
-            explicit SetPushRuleJob(const QString& scope, const QString& kind, const QString& ruleId, const QStringList& actions, const QString& before = {}, const QString& after = {}, const QVector<PushCondition>& conditions = {}, const QString& pattern = {});
+        /*! Add or change a push rule.
+         * \param scope
+         *   ``global`` to specify global rules.
+         * \param kind
+         *   The kind of rule
+         * \param ruleId
+         *   The identifier for the rule.
+         * \param actions
+         *   The action(s) to perform when the conditions for this rule are met.
+         * \param before
+         *   Use 'before' with a ``rule_id`` as its value to make the new rule
+         * the next-most important rule with respect to the given user defined
+         * rule. It is not possible to add a rule relative to a predefined
+         * server rule. \param after This makes the new rule the next-less
+         * important rule relative to the given user defined rule. It is not
+         * possible to add a rule relative to a predefined server rule. \param
+         * conditions The conditions that must hold true for an event in order
+         * for a rule to be applied to an event. A rule with no conditions
+         *   always matches. Only applicable to ``underride`` and ``override``
+         * rules. \param pattern Only applicable to ``content`` rules. The
+         * glob-style pattern to match against.
+         */
+        explicit SetPushRuleJob(const QString& scope, const QString& kind,
+                                const QString& ruleId,
+                                const QStringList& actions,
+                                const QString& before = {},
+                                const QString& after = {},
+                                const QVector<PushCondition>& conditions = {},
+                                const QString& pattern = {});
     };
 
     /// Get whether a push rule is enabled
@@ -158,57 +164,62 @@ namespace QMatrixClient
     class IsPushRuleEnabledJob : public BaseJob
     {
         public:
-            /*! Get whether a push rule is enabled
-             * \param scope
-             *   Either ``global`` or ``device/<profile_tag>`` to specify global
-             *   rules or device rules for the given ``profile_tag``.
-             * \param kind
-             *   The kind of rule
-             * \param ruleId
-             *   The identifier for the rule.
-             */
-            explicit IsPushRuleEnabledJob(const QString& scope, const QString& kind, const QString& ruleId);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * IsPushRuleEnabledJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& scope, const QString& kind, const QString& ruleId);
-
-            ~IsPushRuleEnabledJob() override;
-
-            // Result properties
-
-            /// Whether the push rule is enabled or not.
-            bool enabled() const;
+        /*! Get whether a push rule is enabled
+         * \param scope
+         *   Either ``global`` or ``device/<profile_tag>`` to specify global
+         *   rules or device rules for the given ``profile_tag``.
+         * \param kind
+         *   The kind of rule
+         * \param ruleId
+         *   The identifier for the rule.
+         */
+        explicit IsPushRuleEnabledJob(const QString& scope, const QString& kind,
+                                      const QString& ruleId);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * IsPushRuleEnabledJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& scope,
+                                   const QString& kind, const QString& ruleId);
+
+        ~IsPushRuleEnabledJob() override;
+
+        // Result properties
+
+        /// Whether the push rule is enabled or not.
+        bool enabled() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Enable or disable a push rule.
     ///
-    /// This endpoint allows clients to enable or disable the specified push rule.
+    /// This endpoint allows clients to enable or disable the specified push
+    /// rule.
     class SetPushRuleEnabledJob : public BaseJob
     {
         public:
-            /*! Enable or disable a push rule.
-             * \param scope
-             *   ``global`` to specify global rules.
-             * \param kind
-             *   The kind of rule
-             * \param ruleId
-             *   The identifier for the rule.
-             * \param enabled
-             *   Whether the push rule is enabled or not.
-             */
-            explicit SetPushRuleEnabledJob(const QString& scope, const QString& kind, const QString& ruleId, bool enabled);
+        /*! Enable or disable a push rule.
+         * \param scope
+         *   ``global`` to specify global rules.
+         * \param kind
+         *   The kind of rule
+         * \param ruleId
+         *   The identifier for the rule.
+         * \param enabled
+         *   Whether the push rule is enabled or not.
+         */
+        explicit SetPushRuleEnabledJob(const QString& scope,
+                                       const QString& kind,
+                                       const QString& ruleId, bool enabled);
     };
 
     /// The actions for a push rule
@@ -217,38 +228,41 @@ namespace QMatrixClient
     class GetPushRuleActionsJob : public BaseJob
     {
         public:
-            /*! The actions for a push rule
-             * \param scope
-             *   Either ``global`` or ``device/<profile_tag>`` to specify global
-             *   rules or device rules for the given ``profile_tag``.
-             * \param kind
-             *   The kind of rule
-             * \param ruleId
-             *   The identifier for the rule.
-             */
-            explicit GetPushRuleActionsJob(const QString& scope, const QString& kind, const QString& ruleId);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetPushRuleActionsJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& scope, const QString& kind, const QString& ruleId);
-
-            ~GetPushRuleActionsJob() override;
-
-            // Result properties
-
-            /// The action(s) to perform for this rule.
-            const QStringList& actions() const;
+        /*! The actions for a push rule
+         * \param scope
+         *   Either ``global`` or ``device/<profile_tag>`` to specify global
+         *   rules or device rules for the given ``profile_tag``.
+         * \param kind
+         *   The kind of rule
+         * \param ruleId
+         *   The identifier for the rule.
+         */
+        explicit GetPushRuleActionsJob(const QString& scope,
+                                       const QString& kind,
+                                       const QString& ruleId);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetPushRuleActionsJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& scope,
+                                   const QString& kind, const QString& ruleId);
+
+        ~GetPushRuleActionsJob() override;
+
+        // Result properties
+
+        /// The action(s) to perform for this rule.
+        const QStringList& actions() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Set the actions for a push rule.
@@ -258,16 +272,19 @@ namespace QMatrixClient
     class SetPushRuleActionsJob : public BaseJob
     {
         public:
-            /*! Set the actions for a push rule.
-             * \param scope
-             *   ``global`` to specify global rules.
-             * \param kind
-             *   The kind of rule
-             * \param ruleId
-             *   The identifier for the rule.
-             * \param actions
-             *   The action(s) to perform for this rule.
-             */
-            explicit SetPushRuleActionsJob(const QString& scope, const QString& kind, const QString& ruleId, const QStringList& actions);
+        /*! Set the actions for a push rule.
+         * \param scope
+         *   ``global`` to specify global rules.
+         * \param kind
+         *   The kind of rule
+         * \param ruleId
+         *   The identifier for the rule.
+         * \param actions
+         *   The action(s) to perform for this rule.
+         */
+        explicit SetPushRuleActionsJob(const QString& scope,
+                                       const QString& kind,
+                                       const QString& ruleId,
+                                       const QStringList& actions);
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/read_markers.cpp b/lib/csapi/read_markers.cpp
index 1bc67ba0..5ea45f88 100644
--- a/lib/csapi/read_markers.cpp
+++ b/lib/csapi/read_markers.cpp
@@ -14,13 +14,14 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 static const auto SetReadMarkerJobName = QStringLiteral("SetReadMarkerJob");
 
-SetReadMarkerJob::SetReadMarkerJob(const QString& roomId, const QString& mFullyRead, const QString& mRead)
+SetReadMarkerJob::SetReadMarkerJob(const QString& roomId,
+                                   const QString& mFullyRead,
+                                   const QString& mRead)
     : BaseJob(HttpVerb::Post, SetReadMarkerJobName,
-        basePath % "/rooms/" % roomId % "/read_markers")
+              basePath % "/rooms/" % roomId % "/read_markers")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("m.fully_read"), mFullyRead);
     addParam<IfNotEmpty>(_data, QStringLiteral("m.read"), mRead);
     setRequestData(_data);
 }
-
diff --git a/lib/csapi/read_markers.h b/lib/csapi/read_markers.h
index d982b477..6afa5572 100644
--- a/lib/csapi/read_markers.h
+++ b/lib/csapi/read_markers.h
@@ -6,9 +6,7 @@
 
 #include "jobs/basejob.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Set the position of the read marker for a room.
@@ -18,17 +16,19 @@ namespace QMatrixClient
     class SetReadMarkerJob : public BaseJob
     {
         public:
-            /*! Set the position of the read marker for a room.
-             * \param roomId
-             *   The room ID to set the read marker in for the user.
-             * \param mFullyRead
-             *   The event ID the read marker should be located at. The
-             *   event MUST belong to the room.
-             * \param mRead
-             *   The event ID to set the read receipt location at. This is
-             *   equivalent to calling ``/receipt/m.read/$elsewhere:example.org``
-             *   and is provided here to save that extra call.
-             */
-            explicit SetReadMarkerJob(const QString& roomId, const QString& mFullyRead, const QString& mRead = {});
+        /*! Set the position of the read marker for a room.
+         * \param roomId
+         *   The room ID to set the read marker in for the user.
+         * \param mFullyRead
+         *   The event ID the read marker should be located at. The
+         *   event MUST belong to the room.
+         * \param mRead
+         *   The event ID to set the read receipt location at. This is
+         *   equivalent to calling ``/receipt/m.read/$elsewhere:example.org``
+         *   and is provided here to save that extra call.
+         */
+        explicit SetReadMarkerJob(const QString& roomId,
+                                  const QString& mFullyRead,
+                                  const QString& mRead = {});
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/receipts.cpp b/lib/csapi/receipts.cpp
index b78ba533..25d0dd8e 100644
--- a/lib/csapi/receipts.cpp
+++ b/lib/csapi/receipts.cpp
@@ -14,10 +14,13 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 static const auto PostReceiptJobName = QStringLiteral("PostReceiptJob");
 
-PostReceiptJob::PostReceiptJob(const QString& roomId, const QString& receiptType, const QString& eventId, const QJsonObject& receipt)
+PostReceiptJob::PostReceiptJob(const QString& roomId,
+                               const QString& receiptType,
+                               const QString& eventId,
+                               const QJsonObject& receipt)
     : BaseJob(HttpVerb::Post, PostReceiptJobName,
-        basePath % "/rooms/" % roomId % "/receipt/" % receiptType % "/" % eventId)
+              basePath % "/rooms/" % roomId % "/receipt/" % receiptType % "/"
+                      % eventId)
 {
     setRequestData(Data(toJson(receipt)));
 }
-
diff --git a/lib/csapi/receipts.h b/lib/csapi/receipts.h
index 47e2f3c7..4e40188a 100644
--- a/lib/csapi/receipts.h
+++ b/lib/csapi/receipts.h
@@ -8,8 +8,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Send a receipt for the given event ID.
@@ -19,17 +18,20 @@ namespace QMatrixClient
     class PostReceiptJob : public BaseJob
     {
         public:
-            /*! Send a receipt for the given event ID.
-             * \param roomId
-             *   The room in which to send the event.
-             * \param receiptType
-             *   The type of receipt to send.
-             * \param eventId
-             *   The event ID to acknowledge up to.
-             * \param receipt
-             *   Extra receipt information to attach to ``content`` if any. The
-             *   server will automatically set the ``ts`` field.
-             */
-            explicit PostReceiptJob(const QString& roomId, const QString& receiptType, const QString& eventId, const QJsonObject& receipt = {});
+        /*! Send a receipt for the given event ID.
+         * \param roomId
+         *   The room in which to send the event.
+         * \param receiptType
+         *   The type of receipt to send.
+         * \param eventId
+         *   The event ID to acknowledge up to.
+         * \param receipt
+         *   Extra receipt information to attach to ``content`` if any. The
+         *   server will automatically set the ``ts`` field.
+         */
+        explicit PostReceiptJob(const QString& roomId,
+                                const QString& receiptType,
+                                const QString& eventId,
+                                const QJsonObject& receipt = {});
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/redaction.cpp b/lib/csapi/redaction.cpp
index 1d54e36d..713c5102 100644
--- a/lib/csapi/redaction.cpp
+++ b/lib/csapi/redaction.cpp
@@ -15,15 +15,17 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class RedactEventJob::Private
 {
     public:
-        QString eventId;
+    QString eventId;
 };
 
 static const auto RedactEventJobName = QStringLiteral("RedactEventJob");
 
-RedactEventJob::RedactEventJob(const QString& roomId, const QString& eventId, const QString& txnId, const QString& reason)
+RedactEventJob::RedactEventJob(const QString& roomId, const QString& eventId,
+                               const QString& txnId, const QString& reason)
     : BaseJob(HttpVerb::Put, RedactEventJobName,
-        basePath % "/rooms/" % roomId % "/redact/" % eventId % "/" % txnId)
-    , d(new Private)
+              basePath % "/rooms/" % roomId % "/redact/" % eventId % "/"
+                      % txnId),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("reason"), reason);
@@ -32,10 +34,7 @@ RedactEventJob::RedactEventJob(const QString& roomId, const QString& eventId, co
 
 RedactEventJob::~RedactEventJob() = default;
 
-const QString& RedactEventJob::eventId() const
-{
-    return d->eventId;
-}
+const QString& RedactEventJob::eventId() const { return d->eventId; }
 
 BaseJob::Status RedactEventJob::parseJson(const QJsonDocument& data)
 {
@@ -43,4 +42,3 @@ BaseJob::Status RedactEventJob::parseJson(const QJsonDocument& data)
     fromJson(json.value("event_id"_ls), d->eventId);
     return Success;
 }
-
diff --git a/lib/csapi/redaction.h b/lib/csapi/redaction.h
index d02abfd0..ab235b31 100644
--- a/lib/csapi/redaction.h
+++ b/lib/csapi/redaction.h
@@ -6,48 +6,47 @@
 
 #include "jobs/basejob.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Strips all non-integrity-critical information out of an event.
     ///
     /// Strips all information out of an event which isn't critical to the
     /// integrity of the server-side representation of the room.
-    /// 
+    ///
     /// This cannot be undone.
-    /// 
+    ///
     /// Users may redact their own events, and any user with a power level
     /// greater than or equal to the `redact` power level of the room may
     /// redact events there.
     class RedactEventJob : public BaseJob
     {
         public:
-            /*! Strips all non-integrity-critical information out of an event.
-             * \param roomId
-             *   The room from which to redact the event.
-             * \param eventId
-             *   The ID of the event to redact
-             * \param txnId
-             *   The transaction ID for this event. Clients should generate a
-             *   unique ID; it will be used by the server to ensure idempotency of requests.
-             * \param reason
-             *   The reason for the event being redacted.
-             */
-            explicit RedactEventJob(const QString& roomId, const QString& eventId, const QString& txnId, const QString& reason = {});
-            ~RedactEventJob() override;
-
-            // Result properties
-
-            /// A unique identifier for the event.
-            const QString& eventId() const;
+        /*! Strips all non-integrity-critical information out of an event.
+         * \param roomId
+         *   The room from which to redact the event.
+         * \param eventId
+         *   The ID of the event to redact
+         * \param txnId
+         *   The transaction ID for this event. Clients should generate a
+         *   unique ID; it will be used by the server to ensure idempotency of
+         * requests. \param reason The reason for the event being redacted.
+         */
+        explicit RedactEventJob(const QString& roomId, const QString& eventId,
+                                const QString& txnId,
+                                const QString& reason = {});
+        ~RedactEventJob() override;
+
+        // Result properties
+
+        /// A unique identifier for the event.
+        const QString& eventId() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/registration.cpp b/lib/csapi/registration.cpp
index 5dc9c1e5..b5e7d985 100644
--- a/lib/csapi/registration.cpp
+++ b/lib/csapi/registration.cpp
@@ -15,10 +15,10 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class RegisterJob::Private
 {
     public:
-        QString userId;
-        QString accessToken;
-        QString homeServer;
-        QString deviceId;
+    QString userId;
+    QString accessToken;
+    QString homeServer;
+    QString deviceId;
 };
 
 BaseJob::Query queryToRegister(const QString& kind)
@@ -30,12 +30,15 @@ BaseJob::Query queryToRegister(const QString& kind)
 
 static const auto RegisterJobName = QStringLiteral("RegisterJob");
 
-RegisterJob::RegisterJob(const QString& kind, const Omittable<AuthenticationData>& auth, Omittable<bool> bindEmail, const QString& username, const QString& password, const QString& deviceId, const QString& initialDeviceDisplayName, Omittable<bool> inhibitLogin)
-    : BaseJob(HttpVerb::Post, RegisterJobName,
-        basePath % "/register",
-        queryToRegister(kind),
-        {}, false)
-    , d(new Private)
+RegisterJob::RegisterJob(const QString& kind,
+                         const Omittable<AuthenticationData>& auth,
+                         Omittable<bool> bindEmail, const QString& username,
+                         const QString& password, const QString& deviceId,
+                         const QString& initialDeviceDisplayName,
+                         Omittable<bool> inhibitLogin)
+    : BaseJob(HttpVerb::Post, RegisterJobName, basePath % "/register",
+              queryToRegister(kind), {}, false),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
@@ -43,39 +46,28 @@ RegisterJob::RegisterJob(const QString& kind, const Omittable<AuthenticationData
     addParam<IfNotEmpty>(_data, QStringLiteral("username"), username);
     addParam<IfNotEmpty>(_data, QStringLiteral("password"), password);
     addParam<IfNotEmpty>(_data, QStringLiteral("device_id"), deviceId);
-    addParam<IfNotEmpty>(_data, QStringLiteral("initial_device_display_name"), initialDeviceDisplayName);
+    addParam<IfNotEmpty>(_data, QStringLiteral("initial_device_display_name"),
+                         initialDeviceDisplayName);
     addParam<IfNotEmpty>(_data, QStringLiteral("inhibit_login"), inhibitLogin);
     setRequestData(_data);
 }
 
 RegisterJob::~RegisterJob() = default;
 
-const QString& RegisterJob::userId() const
-{
-    return d->userId;
-}
+const QString& RegisterJob::userId() const { return d->userId; }
 
-const QString& RegisterJob::accessToken() const
-{
-    return d->accessToken;
-}
+const QString& RegisterJob::accessToken() const { return d->accessToken; }
 
-const QString& RegisterJob::homeServer() const
-{
-    return d->homeServer;
-}
+const QString& RegisterJob::homeServer() const { return d->homeServer; }
 
-const QString& RegisterJob::deviceId() const
-{
-    return d->deviceId;
-}
+const QString& RegisterJob::deviceId() const { return d->deviceId; }
 
 BaseJob::Status RegisterJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("user_id"_ls))
         return { JsonParseError,
-            "The key 'user_id' not found in the response" };
+                 "The key 'user_id' not found in the response" };
     fromJson(json.value("user_id"_ls), d->userId);
     fromJson(json.value("access_token"_ls), d->accessToken);
     fromJson(json.value("home_server"_ls), d->homeServer);
@@ -86,15 +78,18 @@ BaseJob::Status RegisterJob::parseJson(const QJsonDocument& data)
 class RequestTokenToRegisterEmailJob::Private
 {
     public:
-        Sid data;
+    Sid data;
 };
 
-static const auto RequestTokenToRegisterEmailJobName = QStringLiteral("RequestTokenToRegisterEmailJob");
+static const auto RequestTokenToRegisterEmailJobName =
+        QStringLiteral("RequestTokenToRegisterEmailJob");
 
-RequestTokenToRegisterEmailJob::RequestTokenToRegisterEmailJob(const QString& clientSecret, const QString& email, int sendAttempt, const QString& idServer, const QString& nextLink)
+RequestTokenToRegisterEmailJob::RequestTokenToRegisterEmailJob(
+        const QString& clientSecret, const QString& email, int sendAttempt,
+        const QString& idServer, const QString& nextLink)
     : BaseJob(HttpVerb::Post, RequestTokenToRegisterEmailJobName,
-        basePath % "/register/email/requestToken", false)
-    , d(new Private)
+              basePath % "/register/email/requestToken", false),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("client_secret"), clientSecret);
@@ -107,12 +102,10 @@ RequestTokenToRegisterEmailJob::RequestTokenToRegisterEmailJob(const QString& cl
 
 RequestTokenToRegisterEmailJob::~RequestTokenToRegisterEmailJob() = default;
 
-const Sid& RequestTokenToRegisterEmailJob::data() const
-{
-    return d->data;
-}
+const Sid& RequestTokenToRegisterEmailJob::data() const { return d->data; }
 
-BaseJob::Status RequestTokenToRegisterEmailJob::parseJson(const QJsonDocument& data)
+BaseJob::Status
+RequestTokenToRegisterEmailJob::parseJson(const QJsonDocument& data)
 {
     fromJson(data, d->data);
     return Success;
@@ -121,15 +114,19 @@ BaseJob::Status RequestTokenToRegisterEmailJob::parseJson(const QJsonDocument& d
 class RequestTokenToRegisterMSISDNJob::Private
 {
     public:
-        Sid data;
+    Sid data;
 };
 
-static const auto RequestTokenToRegisterMSISDNJobName = QStringLiteral("RequestTokenToRegisterMSISDNJob");
+static const auto RequestTokenToRegisterMSISDNJobName =
+        QStringLiteral("RequestTokenToRegisterMSISDNJob");
 
-RequestTokenToRegisterMSISDNJob::RequestTokenToRegisterMSISDNJob(const QString& clientSecret, const QString& country, const QString& phoneNumber, int sendAttempt, const QString& idServer, const QString& nextLink)
+RequestTokenToRegisterMSISDNJob::RequestTokenToRegisterMSISDNJob(
+        const QString& clientSecret, const QString& country,
+        const QString& phoneNumber, int sendAttempt, const QString& idServer,
+        const QString& nextLink)
     : BaseJob(HttpVerb::Post, RequestTokenToRegisterMSISDNJobName,
-        basePath % "/register/msisdn/requestToken", false)
-    , d(new Private)
+              basePath % "/register/msisdn/requestToken", false),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("client_secret"), clientSecret);
@@ -143,12 +140,10 @@ RequestTokenToRegisterMSISDNJob::RequestTokenToRegisterMSISDNJob(const QString&
 
 RequestTokenToRegisterMSISDNJob::~RequestTokenToRegisterMSISDNJob() = default;
 
-const Sid& RequestTokenToRegisterMSISDNJob::data() const
-{
-    return d->data;
-}
+const Sid& RequestTokenToRegisterMSISDNJob::data() const { return d->data; }
 
-BaseJob::Status RequestTokenToRegisterMSISDNJob::parseJson(const QJsonDocument& data)
+BaseJob::Status
+RequestTokenToRegisterMSISDNJob::parseJson(const QJsonDocument& data)
 {
     fromJson(data, d->data);
     return Success;
@@ -156,9 +151,10 @@ BaseJob::Status RequestTokenToRegisterMSISDNJob::parseJson(const QJsonDocument&
 
 static const auto ChangePasswordJobName = QStringLiteral("ChangePasswordJob");
 
-ChangePasswordJob::ChangePasswordJob(const QString& newPassword, const Omittable<AuthenticationData>& auth)
+ChangePasswordJob::ChangePasswordJob(const QString& newPassword,
+                                     const Omittable<AuthenticationData>& auth)
     : BaseJob(HttpVerb::Post, ChangePasswordJobName,
-        basePath % "/account/password")
+              basePath % "/account/password")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("new_password"), newPassword);
@@ -169,15 +165,18 @@ ChangePasswordJob::ChangePasswordJob(const QString& newPassword, const Omittable
 class RequestTokenToResetPasswordEmailJob::Private
 {
     public:
-        Sid data;
+    Sid data;
 };
 
-static const auto RequestTokenToResetPasswordEmailJobName = QStringLiteral("RequestTokenToResetPasswordEmailJob");
+static const auto RequestTokenToResetPasswordEmailJobName =
+        QStringLiteral("RequestTokenToResetPasswordEmailJob");
 
-RequestTokenToResetPasswordEmailJob::RequestTokenToResetPasswordEmailJob(const QString& clientSecret, const QString& email, int sendAttempt, const QString& idServer, const QString& nextLink)
+RequestTokenToResetPasswordEmailJob::RequestTokenToResetPasswordEmailJob(
+        const QString& clientSecret, const QString& email, int sendAttempt,
+        const QString& idServer, const QString& nextLink)
     : BaseJob(HttpVerb::Post, RequestTokenToResetPasswordEmailJobName,
-        basePath % "/account/password/email/requestToken", false)
-    , d(new Private)
+              basePath % "/account/password/email/requestToken", false),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("client_secret"), clientSecret);
@@ -188,14 +187,13 @@ RequestTokenToResetPasswordEmailJob::RequestTokenToResetPasswordEmailJob(const Q
     setRequestData(_data);
 }
 
-RequestTokenToResetPasswordEmailJob::~RequestTokenToResetPasswordEmailJob() = default;
+RequestTokenToResetPasswordEmailJob::~RequestTokenToResetPasswordEmailJob() =
+        default;
 
-const Sid& RequestTokenToResetPasswordEmailJob::data() const
-{
-    return d->data;
-}
+const Sid& RequestTokenToResetPasswordEmailJob::data() const { return d->data; }
 
-BaseJob::Status RequestTokenToResetPasswordEmailJob::parseJson(const QJsonDocument& data)
+BaseJob::Status
+RequestTokenToResetPasswordEmailJob::parseJson(const QJsonDocument& data)
 {
     fromJson(data, d->data);
     return Success;
@@ -204,15 +202,19 @@ BaseJob::Status RequestTokenToResetPasswordEmailJob::parseJson(const QJsonDocume
 class RequestTokenToResetPasswordMSISDNJob::Private
 {
     public:
-        Sid data;
+    Sid data;
 };
 
-static const auto RequestTokenToResetPasswordMSISDNJobName = QStringLiteral("RequestTokenToResetPasswordMSISDNJob");
+static const auto RequestTokenToResetPasswordMSISDNJobName =
+        QStringLiteral("RequestTokenToResetPasswordMSISDNJob");
 
-RequestTokenToResetPasswordMSISDNJob::RequestTokenToResetPasswordMSISDNJob(const QString& clientSecret, const QString& country, const QString& phoneNumber, int sendAttempt, const QString& idServer, const QString& nextLink)
+RequestTokenToResetPasswordMSISDNJob::RequestTokenToResetPasswordMSISDNJob(
+        const QString& clientSecret, const QString& country,
+        const QString& phoneNumber, int sendAttempt, const QString& idServer,
+        const QString& nextLink)
     : BaseJob(HttpVerb::Post, RequestTokenToResetPasswordMSISDNJobName,
-        basePath % "/account/password/msisdn/requestToken", false)
-    , d(new Private)
+              basePath % "/account/password/msisdn/requestToken", false),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("client_secret"), clientSecret);
@@ -224,24 +226,28 @@ RequestTokenToResetPasswordMSISDNJob::RequestTokenToResetPasswordMSISDNJob(const
     setRequestData(_data);
 }
 
-RequestTokenToResetPasswordMSISDNJob::~RequestTokenToResetPasswordMSISDNJob() = default;
+RequestTokenToResetPasswordMSISDNJob::~RequestTokenToResetPasswordMSISDNJob() =
+        default;
 
 const Sid& RequestTokenToResetPasswordMSISDNJob::data() const
 {
     return d->data;
 }
 
-BaseJob::Status RequestTokenToResetPasswordMSISDNJob::parseJson(const QJsonDocument& data)
+BaseJob::Status
+RequestTokenToResetPasswordMSISDNJob::parseJson(const QJsonDocument& data)
 {
     fromJson(data, d->data);
     return Success;
 }
 
-static const auto DeactivateAccountJobName = QStringLiteral("DeactivateAccountJob");
+static const auto DeactivateAccountJobName =
+        QStringLiteral("DeactivateAccountJob");
 
-DeactivateAccountJob::DeactivateAccountJob(const Omittable<AuthenticationData>& auth)
+DeactivateAccountJob::DeactivateAccountJob(
+        const Omittable<AuthenticationData>& auth)
     : BaseJob(HttpVerb::Post, DeactivateAccountJobName,
-        basePath % "/account/deactivate")
+              basePath % "/account/deactivate")
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
@@ -251,7 +257,7 @@ DeactivateAccountJob::DeactivateAccountJob(const Omittable<AuthenticationData>&
 class CheckUsernameAvailabilityJob::Private
 {
     public:
-        Omittable<bool> available;
+    Omittable<bool> available;
 };
 
 BaseJob::Query queryToCheckUsernameAvailability(const QString& username)
@@ -261,21 +267,23 @@ BaseJob::Query queryToCheckUsernameAvailability(const QString& username)
     return _q;
 }
 
-QUrl CheckUsernameAvailabilityJob::makeRequestUrl(QUrl baseUrl, const QString& username)
+QUrl CheckUsernameAvailabilityJob::makeRequestUrl(QUrl baseUrl,
+                                                  const QString& username)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/register/available",
-            queryToCheckUsernameAvailability(username));
+                                   basePath % "/register/available",
+                                   queryToCheckUsernameAvailability(username));
 }
 
-static const auto CheckUsernameAvailabilityJobName = QStringLiteral("CheckUsernameAvailabilityJob");
+static const auto CheckUsernameAvailabilityJobName =
+        QStringLiteral("CheckUsernameAvailabilityJob");
 
-CheckUsernameAvailabilityJob::CheckUsernameAvailabilityJob(const QString& username)
+CheckUsernameAvailabilityJob::CheckUsernameAvailabilityJob(
+        const QString& username)
     : BaseJob(HttpVerb::Get, CheckUsernameAvailabilityJobName,
-        basePath % "/register/available",
-        queryToCheckUsernameAvailability(username),
-        {}, false)
-    , d(new Private)
+              basePath % "/register/available",
+              queryToCheckUsernameAvailability(username), {}, false),
+      d(new Private)
 {
 }
 
@@ -286,10 +294,10 @@ Omittable<bool> CheckUsernameAvailabilityJob::available() const
     return d->available;
 }
 
-BaseJob::Status CheckUsernameAvailabilityJob::parseJson(const QJsonDocument& data)
+BaseJob::Status
+CheckUsernameAvailabilityJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     fromJson(json.value("available"_ls), d->available);
     return Success;
 }
-
diff --git a/lib/csapi/registration.h b/lib/csapi/registration.h
index ca1a1c21..02f4ddaf 100644
--- a/lib/csapi/registration.h
+++ b/lib/csapi/registration.h
@@ -6,42 +6,43 @@
 
 #include "jobs/basejob.h"
 
-#include "csapi/../identity/definitions/sid.h"
 #include "converters.h"
+#include "csapi/../identity/definitions/sid.h"
 #include "csapi/definitions/auth_data.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Register for an account on this homeserver.
     ///
     /// This API endpoint uses the `User-Interactive Authentication API`_.
-    /// 
+    ///
     /// Register for an account on this homeserver.
-    /// 
+    ///
     /// There are two kinds of user account:
-    /// 
-    /// - `user` accounts. These accounts may use the full API described in this specification.
-    /// 
-    /// - `guest` accounts. These accounts may have limited permissions and may not be supported by all servers.
-    /// 
+    ///
+    /// - `user` accounts. These accounts may use the full API described in this
+    /// specification.
+    ///
+    /// - `guest` accounts. These accounts may have limited permissions and may
+    /// not be supported by all servers.
+    ///
     /// If registration is successful, this endpoint will issue an access token
     /// the client can use to authorize itself in subsequent requests.
-    /// 
+    ///
     /// If the client does not supply a ``device_id``, the server must
     /// auto-generate one.
-    /// 
+    ///
     /// The server SHOULD register an account with a User ID based on the
     /// ``username`` provided, if any. Note that the grammar of Matrix User ID
     /// localparts is restricted, so the server MUST either map the provided
     /// ``username`` onto a ``user_id`` in a logical manner, or reject
     /// ``username``\s which do not comply to the grammar, with
     /// ``M_INVALID_USERNAME``.
-    /// 
+    ///
     /// Matrix clients MUST NOT assume that localpart of the registered
     /// ``user_id`` matches the provided ``username``.
-    /// 
+    ///
     /// The returned access token must be associated with the ``device_id``
     /// supplied by the client or generated by the server. The server may
     /// invalidate any access token previously associated with that device. See
@@ -49,72 +50,81 @@ namespace QMatrixClient
     class RegisterJob : public BaseJob
     {
         public:
-            /*! Register for an account on this homeserver.
-             * \param kind
-             *   The kind of account to register. Defaults to `user`.
-             * \param auth
-             *   Additional authentication information for the
-             *   user-interactive authentication API. Note that this
-             *   information is *not* used to define how the registered user
-             *   should be authenticated, but is instead used to
-             *   authenticate the ``register`` call itself. It should be
-             *   left empty, or omitted, unless an earlier call returned an
-             *   response with status code 401.
-             * \param bindEmail
-             *   If true, the server binds the email used for authentication to
-             *   the Matrix ID with the identity server.
-             * \param username
-             *   The basis for the localpart of the desired Matrix ID. If omitted,
-             *   the homeserver MUST generate a Matrix ID local part.
-             * \param password
-             *   The desired password for the account.
-             * \param deviceId
-             *   ID of the client device. If this does not correspond to a
-             *   known client device, a new device will be created. The server
-             *   will auto-generate a device_id if this is not specified.
-             * \param initialDeviceDisplayName
-             *   A display name to assign to the newly-created device. Ignored
-             *   if ``device_id`` corresponds to a known device.
-             * \param inhibitLogin
-             *   If true, an ``access_token`` and ``device_id`` should not be
-             *   returned from this call, therefore preventing an automatic
-             *   login. Defaults to false.
-             */
-            explicit RegisterJob(const QString& kind = QStringLiteral("user"), const Omittable<AuthenticationData>& auth = none, Omittable<bool> bindEmail = none, const QString& username = {}, const QString& password = {}, const QString& deviceId = {}, const QString& initialDeviceDisplayName = {}, Omittable<bool> inhibitLogin = none);
-            ~RegisterJob() override;
-
-            // Result properties
-
-            /// The fully-qualified Matrix user ID (MXID) that has been registered.
-            /// 
-            /// Any user ID returned by this API must conform to the grammar given in the
-            /// `Matrix specification <https://matrix.org/docs/spec/appendices.html#user-identifiers>`_.
-            const QString& userId() const;
-            /// An access token for the account.
-            /// This access token can then be used to authorize other requests.
-            /// Required if the ``inhibit_login`` option is false.
-            const QString& accessToken() const;
-            /// The server_name of the homeserver on which the account has
-            /// been registered.
-            /// 
-            /// **Deprecated**. Clients should extract the server_name from
-            /// ``user_id`` (by splitting at the first colon) if they require
-            /// it. Note also that ``homeserver`` is not spelt this way.
-            const QString& homeServer() const;
-            /// ID of the registered device. Will be the same as the
-            /// corresponding parameter in the request, if one was specified.
-            /// Required if the ``inhibit_login`` option is false.
-            const QString& deviceId() const;
+        /*! Register for an account on this homeserver.
+         * \param kind
+         *   The kind of account to register. Defaults to `user`.
+         * \param auth
+         *   Additional authentication information for the
+         *   user-interactive authentication API. Note that this
+         *   information is *not* used to define how the registered user
+         *   should be authenticated, but is instead used to
+         *   authenticate the ``register`` call itself. It should be
+         *   left empty, or omitted, unless an earlier call returned an
+         *   response with status code 401.
+         * \param bindEmail
+         *   If true, the server binds the email used for authentication to
+         *   the Matrix ID with the identity server.
+         * \param username
+         *   The basis for the localpart of the desired Matrix ID. If omitted,
+         *   the homeserver MUST generate a Matrix ID local part.
+         * \param password
+         *   The desired password for the account.
+         * \param deviceId
+         *   ID of the client device. If this does not correspond to a
+         *   known client device, a new device will be created. The server
+         *   will auto-generate a device_id if this is not specified.
+         * \param initialDeviceDisplayName
+         *   A display name to assign to the newly-created device. Ignored
+         *   if ``device_id`` corresponds to a known device.
+         * \param inhibitLogin
+         *   If true, an ``access_token`` and ``device_id`` should not be
+         *   returned from this call, therefore preventing an automatic
+         *   login. Defaults to false.
+         */
+        explicit RegisterJob(const QString& kind = QStringLiteral("user"),
+                             const Omittable<AuthenticationData>& auth = none,
+                             Omittable<bool> bindEmail = none,
+                             const QString& username = {},
+                             const QString& password = {},
+                             const QString& deviceId = {},
+                             const QString& initialDeviceDisplayName = {},
+                             Omittable<bool> inhibitLogin = none);
+        ~RegisterJob() override;
+
+        // Result properties
+
+        /// The fully-qualified Matrix user ID (MXID) that has been registered.
+        ///
+        /// Any user ID returned by this API must conform to the grammar given
+        /// in the `Matrix specification
+        /// <https://matrix.org/docs/spec/appendices.html#user-identifiers>`_.
+        const QString& userId() const;
+        /// An access token for the account.
+        /// This access token can then be used to authorize other requests.
+        /// Required if the ``inhibit_login`` option is false.
+        const QString& accessToken() const;
+        /// The server_name of the homeserver on which the account has
+        /// been registered.
+        ///
+        /// **Deprecated**. Clients should extract the server_name from
+        /// ``user_id`` (by splitting at the first colon) if they require
+        /// it. Note also that ``homeserver`` is not spelt this way.
+        const QString& homeServer() const;
+        /// ID of the registered device. Will be the same as the
+        /// corresponding parameter in the request, if one was specified.
+        /// Required if the ``inhibit_login`` option is false.
+        const QString& deviceId() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
-    /// Begins the validation process for an email to be used during registration.
+    /// Begins the validation process for an email to be used during
+    /// registration.
     ///
     /// Proxies the Identity Service API ``validate/email/requestToken``, but
     /// first checks that the given email address is not already associated
@@ -123,48 +133,52 @@ namespace QMatrixClient
     class RequestTokenToRegisterEmailJob : public BaseJob
     {
         public:
-            /*! Begins the validation process for an email to be used during registration.
-             * \param clientSecret
-             *   A unique string generated by the client, and used to identify the
-             *   validation attempt. It must be a string consisting of the characters
-             *   ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and it
-             *   must not be empty.
-             * \param email
-             *   The email address to validate.
-             * \param sendAttempt
-             *   The server will only send an email if the ``send_attempt``
-             *   is a number greater than the most recent one which it has seen,
-             *   scoped to that ``email`` + ``client_secret`` pair. This is to
-             *   avoid repeatedly sending the same email in the case of request
-             *   retries between the POSTing user and the identity server.
-             *   The client should increment this value if they desire a new
-             *   email (e.g. a reminder) to be sent.
-             * \param idServer
-             *   The hostname of the identity server to communicate with. May
-             *   optionally include a port.
-             * \param nextLink
-             *   Optional. When the validation is completed, the identity
-             *   server will redirect the user to this URL.
-             */
-            explicit RequestTokenToRegisterEmailJob(const QString& clientSecret, const QString& email, int sendAttempt, const QString& idServer, const QString& nextLink = {});
-            ~RequestTokenToRegisterEmailJob() override;
-
-            // Result properties
-
-            /// An email has been sent to the specified address.
-            /// Note that this may be an email containing the validation token or it may be informing
-            /// the user of an error.
-            const Sid& data() const;
+        /*! Begins the validation process for an email to be used during registration.
+         * \param clientSecret
+         *   A unique string generated by the client, and used to identify the
+         *   validation attempt. It must be a string consisting of the
+         * characters
+         *   ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and
+         * it must not be empty. \param email The email address to validate.
+         * \param sendAttempt
+         *   The server will only send an email if the ``send_attempt``
+         *   is a number greater than the most recent one which it has seen,
+         *   scoped to that ``email`` + ``client_secret`` pair. This is to
+         *   avoid repeatedly sending the same email in the case of request
+         *   retries between the POSTing user and the identity server.
+         *   The client should increment this value if they desire a new
+         *   email (e.g. a reminder) to be sent.
+         * \param idServer
+         *   The hostname of the identity server to communicate with. May
+         *   optionally include a port.
+         * \param nextLink
+         *   Optional. When the validation is completed, the identity
+         *   server will redirect the user to this URL.
+         */
+        explicit RequestTokenToRegisterEmailJob(const QString& clientSecret,
+                                                const QString& email,
+                                                int sendAttempt,
+                                                const QString& idServer,
+                                                const QString& nextLink = {});
+        ~RequestTokenToRegisterEmailJob() override;
+
+        // Result properties
+
+        /// An email has been sent to the specified address.
+        /// Note that this may be an email containing the validation token or it
+        /// may be informing the user of an error.
+        const Sid& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
-    /// Requests a validation token be sent to the given phone number for the purpose of registering an account
+    /// Requests a validation token be sent to the given phone number for the
+    /// purpose of registering an account
     ///
     /// Proxies the Identity Service API ``validate/msisdn/requestToken``, but
     /// first checks that the given phone number is not already associated
@@ -173,258 +187,280 @@ namespace QMatrixClient
     class RequestTokenToRegisterMSISDNJob : public BaseJob
     {
         public:
-            /*! Requests a validation token be sent to the given phone number for the purpose of registering an account
-             * \param clientSecret
-             *   A unique string generated by the client, and used to identify the
-             *   validation attempt. It must be a string consisting of the characters
-             *   ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and it
-             *   must not be empty.
-             * \param country
-             *   The two-letter uppercase ISO country code that the number in
-             *   ``phone_number`` should be parsed as if it were dialled from.
-             * \param phoneNumber
-             *   The phone number to validate.
-             * \param sendAttempt
-             *   The server will only send an SMS if the ``send_attempt`` is a
-             *   number greater than the most recent one which it has seen,
-             *   scoped to that ``country`` + ``phone_number`` + ``client_secret``
-             *   triple. This is to avoid repeatedly sending the same SMS in
-             *   the case of request retries between the POSTing user and the
-             *   identity server. The client should increment this value if
-             *   they desire a new SMS (e.g. a reminder) to be sent.
-             * \param idServer
-             *   The hostname of the identity server to communicate with. May
-             *   optionally include a port.
-             * \param nextLink
-             *   Optional. When the validation is completed, the identity
-             *   server will redirect the user to this URL.
-             */
-            explicit RequestTokenToRegisterMSISDNJob(const QString& clientSecret, const QString& country, const QString& phoneNumber, int sendAttempt, const QString& idServer, const QString& nextLink = {});
-            ~RequestTokenToRegisterMSISDNJob() override;
-
-            // Result properties
-
-            /// An SMS message has been sent to the specified phone number.
-            /// Note that this may be an SMS message containing the validation token or it may be informing
-            /// the user of an error.
-            const Sid& data() const;
+        /*! Requests a validation token be sent to the given phone number for the purpose of registering an account
+         * \param clientSecret
+         *   A unique string generated by the client, and used to identify the
+         *   validation attempt. It must be a string consisting of the
+         * characters
+         *   ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and
+         * it must not be empty. \param country The two-letter uppercase ISO
+         * country code that the number in
+         *   ``phone_number`` should be parsed as if it were dialled from.
+         * \param phoneNumber
+         *   The phone number to validate.
+         * \param sendAttempt
+         *   The server will only send an SMS if the ``send_attempt`` is a
+         *   number greater than the most recent one which it has seen,
+         *   scoped to that ``country`` + ``phone_number`` + ``client_secret``
+         *   triple. This is to avoid repeatedly sending the same SMS in
+         *   the case of request retries between the POSTing user and the
+         *   identity server. The client should increment this value if
+         *   they desire a new SMS (e.g. a reminder) to be sent.
+         * \param idServer
+         *   The hostname of the identity server to communicate with. May
+         *   optionally include a port.
+         * \param nextLink
+         *   Optional. When the validation is completed, the identity
+         *   server will redirect the user to this URL.
+         */
+        explicit RequestTokenToRegisterMSISDNJob(const QString& clientSecret,
+                                                 const QString& country,
+                                                 const QString& phoneNumber,
+                                                 int sendAttempt,
+                                                 const QString& idServer,
+                                                 const QString& nextLink = {});
+        ~RequestTokenToRegisterMSISDNJob() override;
+
+        // Result properties
+
+        /// An SMS message has been sent to the specified phone number.
+        /// Note that this may be an SMS message containing the validation token
+        /// or it may be informing the user of an error.
+        const Sid& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Changes a user's password.
     ///
     /// Changes the password for an account on this homeserver.
-    /// 
+    ///
     /// This API endpoint uses the `User-Interactive Authentication API`_.
-    /// 
+    ///
     /// An access token should be submitted to this endpoint if the client has
     /// an active session.
-    /// 
+    ///
     /// The homeserver may change the flows available depending on whether a
     /// valid access token is provided.
     class ChangePasswordJob : public BaseJob
     {
         public:
-            /*! Changes a user's password.
-             * \param newPassword
-             *   The new password for the account.
-             * \param auth
-             *   Additional authentication information for the user-interactive authentication API.
-             */
-            explicit ChangePasswordJob(const QString& newPassword, const Omittable<AuthenticationData>& auth = none);
+        /*! Changes a user's password.
+         * \param newPassword
+         *   The new password for the account.
+         * \param auth
+         *   Additional authentication information for the user-interactive
+         * authentication API.
+         */
+        explicit ChangePasswordJob(
+                const QString& newPassword,
+                const Omittable<AuthenticationData>& auth = none);
     };
 
-    /// Requests a validation token be sent to the given email address for the purpose of resetting a user's password
+    /// Requests a validation token be sent to the given email address for the
+    /// purpose of resetting a user's password
     ///
     /// Proxies the Identity Service API ``validate/email/requestToken``, but
-    /// first checks that the given email address **is** associated with an account
-    /// on this homeserver. This API should be used to request
+    /// first checks that the given email address **is** associated with an
+    /// account on this homeserver. This API should be used to request
     /// validation tokens when authenticating for the
     /// `account/password` endpoint. This API's parameters and response are
-    /// identical to that of the HS API |/register/email/requestToken|_ except that
-    /// `M_THREEPID_NOT_FOUND` may be returned if no account matching the
+    /// identical to that of the HS API |/register/email/requestToken|_ except
+    /// that `M_THREEPID_NOT_FOUND` may be returned if no account matching the
     /// given email address could be found. The server may instead send an
     /// email to the given address prompting the user to create an account.
     /// `M_THREEPID_IN_USE` may not be returned.
-    /// 
-    /// .. |/register/email/requestToken| replace:: ``/register/email/requestToken``
-    /// 
-    /// .. _/register/email/requestToken: #post-matrix-client-r0-register-email-requesttoken
+    ///
+    /// .. |/register/email/requestToken| replace::
+    /// ``/register/email/requestToken``
+    ///
+    /// .. _/register/email/requestToken:
+    /// #post-matrix-client-r0-register-email-requesttoken
     class RequestTokenToResetPasswordEmailJob : public BaseJob
     {
         public:
-            /*! Requests a validation token be sent to the given email address for the purpose of resetting a user's password
-             * \param clientSecret
-             *   A unique string generated by the client, and used to identify the
-             *   validation attempt. It must be a string consisting of the characters
-             *   ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and it
-             *   must not be empty.
-             * \param email
-             *   The email address to validate.
-             * \param sendAttempt
-             *   The server will only send an email if the ``send_attempt``
-             *   is a number greater than the most recent one which it has seen,
-             *   scoped to that ``email`` + ``client_secret`` pair. This is to
-             *   avoid repeatedly sending the same email in the case of request
-             *   retries between the POSTing user and the identity server.
-             *   The client should increment this value if they desire a new
-             *   email (e.g. a reminder) to be sent.
-             * \param idServer
-             *   The hostname of the identity server to communicate with. May
-             *   optionally include a port.
-             * \param nextLink
-             *   Optional. When the validation is completed, the identity
-             *   server will redirect the user to this URL.
-             */
-            explicit RequestTokenToResetPasswordEmailJob(const QString& clientSecret, const QString& email, int sendAttempt, const QString& idServer, const QString& nextLink = {});
-            ~RequestTokenToResetPasswordEmailJob() override;
-
-            // Result properties
-
-            /// An email was sent to the given address.
-            const Sid& data() const;
+        /*! Requests a validation token be sent to the given email address for the purpose of resetting a user's password
+         * \param clientSecret
+         *   A unique string generated by the client, and used to identify the
+         *   validation attempt. It must be a string consisting of the
+         * characters
+         *   ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and
+         * it must not be empty. \param email The email address to validate.
+         * \param sendAttempt
+         *   The server will only send an email if the ``send_attempt``
+         *   is a number greater than the most recent one which it has seen,
+         *   scoped to that ``email`` + ``client_secret`` pair. This is to
+         *   avoid repeatedly sending the same email in the case of request
+         *   retries between the POSTing user and the identity server.
+         *   The client should increment this value if they desire a new
+         *   email (e.g. a reminder) to be sent.
+         * \param idServer
+         *   The hostname of the identity server to communicate with. May
+         *   optionally include a port.
+         * \param nextLink
+         *   Optional. When the validation is completed, the identity
+         *   server will redirect the user to this URL.
+         */
+        explicit RequestTokenToResetPasswordEmailJob(
+                const QString& clientSecret, const QString& email,
+                int sendAttempt, const QString& idServer,
+                const QString& nextLink = {});
+        ~RequestTokenToResetPasswordEmailJob() override;
+
+        // Result properties
+
+        /// An email was sent to the given address.
+        const Sid& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
-    /// Requests a validation token be sent to the given phone number for the purpose of resetting a user's password.
+    /// Requests a validation token be sent to the given phone number for the
+    /// purpose of resetting a user's password.
     ///
     /// Proxies the Identity Service API ``validate/msisdn/requestToken``, but
-    /// first checks that the given phone number **is** associated with an account
-    /// on this homeserver. This API should be used to request
+    /// first checks that the given phone number **is** associated with an
+    /// account on this homeserver. This API should be used to request
     /// validation tokens when authenticating for the
     /// `account/password` endpoint. This API's parameters and response are
-    /// identical to that of the HS API |/register/msisdn/requestToken|_ except that
-    /// `M_THREEPID_NOT_FOUND` may be returned if no account matching the
+    /// identical to that of the HS API |/register/msisdn/requestToken|_ except
+    /// that `M_THREEPID_NOT_FOUND` may be returned if no account matching the
     /// given phone number could be found. The server may instead send an
-    /// SMS message to the given address prompting the user to create an account.
-    /// `M_THREEPID_IN_USE` may not be returned.
-    /// 
-    /// .. |/register/msisdn/requestToken| replace:: ``/register/msisdn/requestToken``
-    /// 
-    /// .. _/register/msisdn/requestToken: #post-matrix-client-r0-register-email-requesttoken
+    /// SMS message to the given address prompting the user to create an
+    /// account. `M_THREEPID_IN_USE` may not be returned.
+    ///
+    /// .. |/register/msisdn/requestToken| replace::
+    /// ``/register/msisdn/requestToken``
+    ///
+    /// .. _/register/msisdn/requestToken:
+    /// #post-matrix-client-r0-register-email-requesttoken
     class RequestTokenToResetPasswordMSISDNJob : public BaseJob
     {
         public:
-            /*! Requests a validation token be sent to the given phone number for the purpose of resetting a user's password.
-             * \param clientSecret
-             *   A unique string generated by the client, and used to identify the
-             *   validation attempt. It must be a string consisting of the characters
-             *   ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and it
-             *   must not be empty.
-             * \param country
-             *   The two-letter uppercase ISO country code that the number in
-             *   ``phone_number`` should be parsed as if it were dialled from.
-             * \param phoneNumber
-             *   The phone number to validate.
-             * \param sendAttempt
-             *   The server will only send an SMS if the ``send_attempt`` is a
-             *   number greater than the most recent one which it has seen,
-             *   scoped to that ``country`` + ``phone_number`` + ``client_secret``
-             *   triple. This is to avoid repeatedly sending the same SMS in
-             *   the case of request retries between the POSTing user and the
-             *   identity server. The client should increment this value if
-             *   they desire a new SMS (e.g. a reminder) to be sent.
-             * \param idServer
-             *   The hostname of the identity server to communicate with. May
-             *   optionally include a port.
-             * \param nextLink
-             *   Optional. When the validation is completed, the identity
-             *   server will redirect the user to this URL.
-             */
-            explicit RequestTokenToResetPasswordMSISDNJob(const QString& clientSecret, const QString& country, const QString& phoneNumber, int sendAttempt, const QString& idServer, const QString& nextLink = {});
-            ~RequestTokenToResetPasswordMSISDNJob() override;
-
-            // Result properties
-
-            /// An SMS message was sent to the given phone number.
-            const Sid& data() const;
+        /*! Requests a validation token be sent to the given phone number for the purpose of resetting a user's password.
+         * \param clientSecret
+         *   A unique string generated by the client, and used to identify the
+         *   validation attempt. It must be a string consisting of the
+         * characters
+         *   ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and
+         * it must not be empty. \param country The two-letter uppercase ISO
+         * country code that the number in
+         *   ``phone_number`` should be parsed as if it were dialled from.
+         * \param phoneNumber
+         *   The phone number to validate.
+         * \param sendAttempt
+         *   The server will only send an SMS if the ``send_attempt`` is a
+         *   number greater than the most recent one which it has seen,
+         *   scoped to that ``country`` + ``phone_number`` + ``client_secret``
+         *   triple. This is to avoid repeatedly sending the same SMS in
+         *   the case of request retries between the POSTing user and the
+         *   identity server. The client should increment this value if
+         *   they desire a new SMS (e.g. a reminder) to be sent.
+         * \param idServer
+         *   The hostname of the identity server to communicate with. May
+         *   optionally include a port.
+         * \param nextLink
+         *   Optional. When the validation is completed, the identity
+         *   server will redirect the user to this URL.
+         */
+        explicit RequestTokenToResetPasswordMSISDNJob(
+                const QString& clientSecret, const QString& country,
+                const QString& phoneNumber, int sendAttempt,
+                const QString& idServer, const QString& nextLink = {});
+        ~RequestTokenToResetPasswordMSISDNJob() override;
+
+        // Result properties
+
+        /// An SMS message was sent to the given phone number.
+        const Sid& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Deactivate a user's account.
     ///
     /// Deactivate the user's account, removing all ability for the user to
     /// login again.
-    /// 
+    ///
     /// This API endpoint uses the `User-Interactive Authentication API`_.
-    /// 
+    ///
     /// An access token should be submitted to this endpoint if the client has
     /// an active session.
-    /// 
+    ///
     /// The homeserver may change the flows available depending on whether a
     /// valid access token is provided.
     class DeactivateAccountJob : public BaseJob
     {
         public:
-            /*! Deactivate a user's account.
-             * \param auth
-             *   Additional authentication information for the user-interactive authentication API.
-             */
-            explicit DeactivateAccountJob(const Omittable<AuthenticationData>& auth = none);
+        /*! Deactivate a user's account.
+         * \param auth
+         *   Additional authentication information for the user-interactive
+         * authentication API.
+         */
+        explicit DeactivateAccountJob(
+                const Omittable<AuthenticationData>& auth = none);
     };
 
     /// Checks to see if a username is available on the server.
     ///
     /// Checks to see if a username is available, and valid, for the server.
-    /// 
+    ///
     /// The server should check to ensure that, at the time of the request, the
     /// username requested is available for use. This includes verifying that an
     /// application service has not claimed the username and that the username
-    /// fits the server's desired requirements (for example, a server could dictate
-    /// that it does not permit usernames with underscores).
-    /// 
-    /// Matrix clients may wish to use this API prior to attempting registration,
-    /// however the clients must also be aware that using this API does not normally
-    /// reserve the username. This can mean that the username becomes unavailable
-    /// between checking its availability and attempting to register it.
+    /// fits the server's desired requirements (for example, a server could
+    /// dictate that it does not permit usernames with underscores).
+    ///
+    /// Matrix clients may wish to use this API prior to attempting
+    /// registration, however the clients must also be aware that using this API
+    /// does not normally reserve the username. This can mean that the username
+    /// becomes unavailable between checking its availability and attempting to
+    /// register it.
     class CheckUsernameAvailabilityJob : public BaseJob
     {
         public:
-            /*! Checks to see if a username is available on the server.
-             * \param username
-             *   The username to check the availability of.
-             */
-            explicit CheckUsernameAvailabilityJob(const QString& username);
+        /*! Checks to see if a username is available on the server.
+         * \param username
+         *   The username to check the availability of.
+         */
+        explicit CheckUsernameAvailabilityJob(const QString& username);
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * CheckUsernameAvailabilityJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& username);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * CheckUsernameAvailabilityJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& username);
 
-            ~CheckUsernameAvailabilityJob() override;
+        ~CheckUsernameAvailabilityJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// A flag to indicate that the username is available. This should always
-            /// be ``true`` when the server replies with 200 OK.
-            Omittable<bool> available() const;
+        /// A flag to indicate that the username is available. This should
+        /// always be ``true`` when the server replies with 200 OK.
+        Omittable<bool> available() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/report_content.cpp b/lib/csapi/report_content.cpp
index a79d4dad..f7b74834 100644
--- a/lib/csapi/report_content.cpp
+++ b/lib/csapi/report_content.cpp
@@ -14,13 +14,14 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 static const auto ReportContentJobName = QStringLiteral("ReportContentJob");
 
-ReportContentJob::ReportContentJob(const QString& roomId, const QString& eventId, int score, const QString& reason)
+ReportContentJob::ReportContentJob(const QString& roomId,
+                                   const QString& eventId, int score,
+                                   const QString& reason)
     : BaseJob(HttpVerb::Post, ReportContentJobName,
-        basePath % "/rooms/" % roomId % "/report/" % eventId)
+              basePath % "/rooms/" % roomId % "/report/" % eventId)
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("score"), score);
     addParam<>(_data, QStringLiteral("reason"), reason);
     setRequestData(_data);
 }
-
diff --git a/lib/csapi/report_content.h b/lib/csapi/report_content.h
index a20c6838..aca5b30b 100644
--- a/lib/csapi/report_content.h
+++ b/lib/csapi/report_content.h
@@ -8,8 +8,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Reports an event as inappropriate.
@@ -19,17 +18,18 @@ namespace QMatrixClient
     class ReportContentJob : public BaseJob
     {
         public:
-            /*! Reports an event as inappropriate.
-             * \param roomId
-             *   The room in which the event being reported is located.
-             * \param eventId
-             *   The event to report.
-             * \param score
-             *   The score to rate this content as where -100 is most offensive
-             *   and 0 is inoffensive.
-             * \param reason
-             *   The reason the content is being reported. May be blank.
-             */
-            explicit ReportContentJob(const QString& roomId, const QString& eventId, int score, const QString& reason);
+        /*! Reports an event as inappropriate.
+         * \param roomId
+         *   The room in which the event being reported is located.
+         * \param eventId
+         *   The event to report.
+         * \param score
+         *   The score to rate this content as where -100 is most offensive
+         *   and 0 is inoffensive.
+         * \param reason
+         *   The reason the content is being reported. May be blank.
+         */
+        explicit ReportContentJob(const QString& roomId, const QString& eventId,
+                                  int score, const QString& reason);
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/room_send.cpp b/lib/csapi/room_send.cpp
index 0d25eb69..2bf42522 100644
--- a/lib/csapi/room_send.cpp
+++ b/lib/csapi/room_send.cpp
@@ -15,25 +15,24 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class SendMessageJob::Private
 {
     public:
-        QString eventId;
+    QString eventId;
 };
 
 static const auto SendMessageJobName = QStringLiteral("SendMessageJob");
 
-SendMessageJob::SendMessageJob(const QString& roomId, const QString& eventType, const QString& txnId, const QJsonObject& body)
+SendMessageJob::SendMessageJob(const QString& roomId, const QString& eventType,
+                               const QString& txnId, const QJsonObject& body)
     : BaseJob(HttpVerb::Put, SendMessageJobName,
-        basePath % "/rooms/" % roomId % "/send/" % eventType % "/" % txnId)
-    , d(new Private)
+              basePath % "/rooms/" % roomId % "/send/" % eventType % "/"
+                      % txnId),
+      d(new Private)
 {
     setRequestData(Data(toJson(body)));
 }
 
 SendMessageJob::~SendMessageJob() = default;
 
-const QString& SendMessageJob::eventId() const
-{
-    return d->eventId;
-}
+const QString& SendMessageJob::eventId() const { return d->eventId; }
 
 BaseJob::Status SendMessageJob::parseJson(const QJsonDocument& data)
 {
@@ -41,4 +40,3 @@ BaseJob::Status SendMessageJob::parseJson(const QJsonDocument& data)
     fromJson(json.value("event_id"_ls), d->eventId);
     return Success;
 }
-
diff --git a/lib/csapi/room_send.h b/lib/csapi/room_send.h
index 85c298e0..38e246e1 100644
--- a/lib/csapi/room_send.h
+++ b/lib/csapi/room_send.h
@@ -8,8 +8,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Send a message event to the given room.
@@ -17,44 +16,46 @@ namespace QMatrixClient
     /// This endpoint is used to send a message event to a room. Message events
     /// allow access to historical events and pagination, making them suited
     /// for "once-off" activity in a room.
-    /// 
+    ///
     /// The body of the request should be the content object of the event; the
     /// fields in this object will vary depending on the type of event. See
     /// `Room Events`_ for the m. event specification.
     class SendMessageJob : public BaseJob
     {
         public:
-            /*! Send a message event to the given room.
-             * \param roomId
-             *   The room to send the event to.
-             * \param eventType
-             *   The type of event to send.
-             * \param txnId
-             *   The transaction ID for this event. Clients should generate an
-             *   ID unique across requests with the same access token; it will be
-             *   used by the server to ensure idempotency of requests.
-             * \param body
-             *   This endpoint is used to send a message event to a room. Message events
-             *   allow access to historical events and pagination, making them suited
-             *   for "once-off" activity in a room.
-             *   
-             *   The body of the request should be the content object of the event; the
-             *   fields in this object will vary depending on the type of event. See
-             *   `Room Events`_ for the m. event specification.
-             */
-            explicit SendMessageJob(const QString& roomId, const QString& eventType, const QString& txnId, const QJsonObject& body = {});
-            ~SendMessageJob() override;
-
-            // Result properties
-
-            /// A unique identifier for the event.
-            const QString& eventId() const;
+        /*! Send a message event to the given room.
+         * \param roomId
+         *   The room to send the event to.
+         * \param eventType
+         *   The type of event to send.
+         * \param txnId
+         *   The transaction ID for this event. Clients should generate an
+         *   ID unique across requests with the same access token; it will be
+         *   used by the server to ensure idempotency of requests.
+         * \param body
+         *   This endpoint is used to send a message event to a room. Message
+         * events allow access to historical events and pagination, making them
+         * suited for "once-off" activity in a room.
+         *
+         *   The body of the request should be the content object of the event;
+         * the fields in this object will vary depending on the type of event.
+         * See `Room Events`_ for the m. event specification.
+         */
+        explicit SendMessageJob(const QString& roomId, const QString& eventType,
+                                const QString& txnId,
+                                const QJsonObject& body = {});
+        ~SendMessageJob() override;
+
+        // Result properties
+
+        /// A unique identifier for the event.
+        const QString& eventId() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/room_state.cpp b/lib/csapi/room_state.cpp
index 3aa7d736..668a2931 100644
--- a/lib/csapi/room_state.cpp
+++ b/lib/csapi/room_state.cpp
@@ -15,25 +15,27 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class SetRoomStateWithKeyJob::Private
 {
     public:
-        QString eventId;
+    QString eventId;
 };
 
-static const auto SetRoomStateWithKeyJobName = QStringLiteral("SetRoomStateWithKeyJob");
+static const auto SetRoomStateWithKeyJobName =
+        QStringLiteral("SetRoomStateWithKeyJob");
 
-SetRoomStateWithKeyJob::SetRoomStateWithKeyJob(const QString& roomId, const QString& eventType, const QString& stateKey, const QJsonObject& body)
+SetRoomStateWithKeyJob::SetRoomStateWithKeyJob(const QString& roomId,
+                                               const QString& eventType,
+                                               const QString& stateKey,
+                                               const QJsonObject& body)
     : BaseJob(HttpVerb::Put, SetRoomStateWithKeyJobName,
-        basePath % "/rooms/" % roomId % "/state/" % eventType % "/" % stateKey)
-    , d(new Private)
+              basePath % "/rooms/" % roomId % "/state/" % eventType % "/"
+                      % stateKey),
+      d(new Private)
 {
     setRequestData(Data(toJson(body)));
 }
 
 SetRoomStateWithKeyJob::~SetRoomStateWithKeyJob() = default;
 
-const QString& SetRoomStateWithKeyJob::eventId() const
-{
-    return d->eventId;
-}
+const QString& SetRoomStateWithKeyJob::eventId() const { return d->eventId; }
 
 BaseJob::Status SetRoomStateWithKeyJob::parseJson(const QJsonDocument& data)
 {
@@ -45,25 +47,24 @@ BaseJob::Status SetRoomStateWithKeyJob::parseJson(const QJsonDocument& data)
 class SetRoomStateJob::Private
 {
     public:
-        QString eventId;
+    QString eventId;
 };
 
 static const auto SetRoomStateJobName = QStringLiteral("SetRoomStateJob");
 
-SetRoomStateJob::SetRoomStateJob(const QString& roomId, const QString& eventType, const QJsonObject& body)
+SetRoomStateJob::SetRoomStateJob(const QString& roomId,
+                                 const QString& eventType,
+                                 const QJsonObject& body)
     : BaseJob(HttpVerb::Put, SetRoomStateJobName,
-        basePath % "/rooms/" % roomId % "/state/" % eventType)
-    , d(new Private)
+              basePath % "/rooms/" % roomId % "/state/" % eventType),
+      d(new Private)
 {
     setRequestData(Data(toJson(body)));
 }
 
 SetRoomStateJob::~SetRoomStateJob() = default;
 
-const QString& SetRoomStateJob::eventId() const
-{
-    return d->eventId;
-}
+const QString& SetRoomStateJob::eventId() const { return d->eventId; }
 
 BaseJob::Status SetRoomStateJob::parseJson(const QJsonDocument& data)
 {
@@ -71,4 +72,3 @@ BaseJob::Status SetRoomStateJob::parseJson(const QJsonDocument& data)
     fromJson(json.value("event_id"_ls), d->eventId);
     return Success;
 }
-
diff --git a/lib/csapi/room_state.h b/lib/csapi/room_state.h
index 67420545..07407af2 100644
--- a/lib/csapi/room_state.h
+++ b/lib/csapi/room_state.h
@@ -8,8 +8,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Send a state event to the given room.
@@ -17,51 +16,55 @@ namespace QMatrixClient
     /// State events can be sent using this endpoint.  These events will be
     /// overwritten if ``<room id>``, ``<event type>`` and ``<state key>`` all
     /// match.
-    /// 
+    ///
     /// Requests to this endpoint **cannot use transaction IDs**
     /// like other ``PUT`` paths because they cannot be differentiated from the
     /// ``state_key``. Furthermore, ``POST`` is unsupported on state paths.
-    /// 
+    ///
     /// The body of the request should be the content object of the event; the
     /// fields in this object will vary depending on the type of event. See
     /// `Room Events`_ for the ``m.`` event specification.
     class SetRoomStateWithKeyJob : public BaseJob
     {
         public:
-            /*! Send a state event to the given room.
-             * \param roomId
-             *   The room to set the state in
-             * \param eventType
-             *   The type of event to send.
-             * \param stateKey
-             *   The state_key for the state to send. Defaults to the empty string.
-             * \param body
-             *   State events can be sent using this endpoint.  These events will be
-             *   overwritten if ``<room id>``, ``<event type>`` and ``<state key>`` all
-             *   match.
-             *   
-             *   Requests to this endpoint **cannot use transaction IDs**
-             *   like other ``PUT`` paths because they cannot be differentiated from the
-             *   ``state_key``. Furthermore, ``POST`` is unsupported on state paths.
-             *   
-             *   The body of the request should be the content object of the event; the
-             *   fields in this object will vary depending on the type of event. See
-             *   `Room Events`_ for the ``m.`` event specification.
-             */
-            explicit SetRoomStateWithKeyJob(const QString& roomId, const QString& eventType, const QString& stateKey, const QJsonObject& body = {});
-            ~SetRoomStateWithKeyJob() override;
+        /*! Send a state event to the given room.
+         * \param roomId
+         *   The room to set the state in
+         * \param eventType
+         *   The type of event to send.
+         * \param stateKey
+         *   The state_key for the state to send. Defaults to the empty string.
+         * \param body
+         *   State events can be sent using this endpoint.  These events will be
+         *   overwritten if ``<room id>``, ``<event type>`` and ``<state key>``
+         * all match.
+         *
+         *   Requests to this endpoint **cannot use transaction IDs**
+         *   like other ``PUT`` paths because they cannot be differentiated from
+         * the
+         *   ``state_key``. Furthermore, ``POST`` is unsupported on state paths.
+         *
+         *   The body of the request should be the content object of the event;
+         * the fields in this object will vary depending on the type of event.
+         * See `Room Events`_ for the ``m.`` event specification.
+         */
+        explicit SetRoomStateWithKeyJob(const QString& roomId,
+                                        const QString& eventType,
+                                        const QString& stateKey,
+                                        const QJsonObject& body = {});
+        ~SetRoomStateWithKeyJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// A unique identifier for the event.
-            const QString& eventId() const;
+        /// A unique identifier for the event.
+        const QString& eventId() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Send a state event to the given room.
@@ -69,50 +72,56 @@ namespace QMatrixClient
     /// State events can be sent using this endpoint. This endpoint is
     /// equivalent to calling `/rooms/{roomId}/state/{eventType}/{stateKey}`
     /// with an empty `stateKey`. Previous state events with matching
-    /// `<roomId>` and `<eventType>`, and empty `<stateKey>`, will be overwritten.
-    /// 
+    /// `<roomId>` and `<eventType>`, and empty `<stateKey>`, will be
+    /// overwritten.
+    ///
     /// Requests to this endpoint **cannot use transaction IDs**
     /// like other ``PUT`` paths because they cannot be differentiated from the
     /// ``state_key``. Furthermore, ``POST`` is unsupported on state paths.
-    /// 
+    ///
     /// The body of the request should be the content object of the event; the
     /// fields in this object will vary depending on the type of event. See
     /// `Room Events`_ for the ``m.`` event specification.
     class SetRoomStateJob : public BaseJob
     {
         public:
-            /*! Send a state event to the given room.
-             * \param roomId
-             *   The room to set the state in
-             * \param eventType
-             *   The type of event to send.
-             * \param body
-             *   State events can be sent using this endpoint. This endpoint is
-             *   equivalent to calling `/rooms/{roomId}/state/{eventType}/{stateKey}`
-             *   with an empty `stateKey`. Previous state events with matching
-             *   `<roomId>` and `<eventType>`, and empty `<stateKey>`, will be overwritten.
-             *   
-             *   Requests to this endpoint **cannot use transaction IDs**
-             *   like other ``PUT`` paths because they cannot be differentiated from the
-             *   ``state_key``. Furthermore, ``POST`` is unsupported on state paths.
-             *   
-             *   The body of the request should be the content object of the event; the
-             *   fields in this object will vary depending on the type of event. See
-             *   `Room Events`_ for the ``m.`` event specification.
-             */
-            explicit SetRoomStateJob(const QString& roomId, const QString& eventType, const QJsonObject& body = {});
-            ~SetRoomStateJob() override;
+        /*! Send a state event to the given room.
+         * \param roomId
+         *   The room to set the state in
+         * \param eventType
+         *   The type of event to send.
+         * \param body
+         *   State events can be sent using this endpoint. This endpoint is
+         *   equivalent to calling
+         * `/rooms/{roomId}/state/{eventType}/{stateKey}` with an empty
+         * `stateKey`. Previous state events with matching
+         *   `<roomId>` and `<eventType>`, and empty `<stateKey>`, will be
+         * overwritten.
+         *
+         *   Requests to this endpoint **cannot use transaction IDs**
+         *   like other ``PUT`` paths because they cannot be differentiated from
+         * the
+         *   ``state_key``. Furthermore, ``POST`` is unsupported on state paths.
+         *
+         *   The body of the request should be the content object of the event;
+         * the fields in this object will vary depending on the type of event.
+         * See `Room Events`_ for the ``m.`` event specification.
+         */
+        explicit SetRoomStateJob(const QString& roomId,
+                                 const QString& eventType,
+                                 const QJsonObject& body = {});
+        ~SetRoomStateJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// A unique identifier for the event.
-            const QString& eventId() const;
+        /// A unique identifier for the event.
+        const QString& eventId() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/room_upgrades.cpp b/lib/csapi/room_upgrades.cpp
index f58fd675..b9f285e8 100644
--- a/lib/csapi/room_upgrades.cpp
+++ b/lib/csapi/room_upgrades.cpp
@@ -15,15 +15,15 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class UpgradeRoomJob::Private
 {
     public:
-        QString replacementRoom;
+    QString replacementRoom;
 };
 
 static const auto UpgradeRoomJobName = QStringLiteral("UpgradeRoomJob");
 
 UpgradeRoomJob::UpgradeRoomJob(const QString& roomId, const QString& newVersion)
     : BaseJob(HttpVerb::Post, UpgradeRoomJobName,
-        basePath % "/rooms/" % roomId % "/upgrade")
-    , d(new Private)
+              basePath % "/rooms/" % roomId % "/upgrade"),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("new_version"), newVersion);
@@ -42,8 +42,7 @@ BaseJob::Status UpgradeRoomJob::parseJson(const QJsonDocument& data)
     auto json = data.object();
     if (!json.contains("replacement_room"_ls))
         return { JsonParseError,
-            "The key 'replacement_room' not found in the response" };
+                 "The key 'replacement_room' not found in the response" };
     fromJson(json.value("replacement_room"_ls), d->replacementRoom);
     return Success;
 }
-
diff --git a/lib/csapi/room_upgrades.h b/lib/csapi/room_upgrades.h
index 6f712f10..df30a562 100644
--- a/lib/csapi/room_upgrades.h
+++ b/lib/csapi/room_upgrades.h
@@ -6,38 +6,37 @@
 
 #include "jobs/basejob.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Upgrades a room to a new room version.
     ///
     /// Upgrades the given room to a particular room version, migrating as much
-    /// data as possible over to the new room. See the `room_upgrades <#room-upgrades>`_
-    /// module for more information on what this entails.
+    /// data as possible over to the new room. See the `room_upgrades
+    /// <#room-upgrades>`_ module for more information on what this entails.
     class UpgradeRoomJob : public BaseJob
     {
         public:
-            /*! Upgrades a room to a new room version.
-             * \param roomId
-             *   The ID of the room to upgrade.
-             * \param newVersion
-             *   The new version for the room.
-             */
-            explicit UpgradeRoomJob(const QString& roomId, const QString& newVersion);
-            ~UpgradeRoomJob() override;
+        /*! Upgrades a room to a new room version.
+         * \param roomId
+         *   The ID of the room to upgrade.
+         * \param newVersion
+         *   The new version for the room.
+         */
+        explicit UpgradeRoomJob(const QString& roomId,
+                                const QString& newVersion);
+        ~UpgradeRoomJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The ID of the new room.
-            const QString& replacementRoom() const;
+        /// The ID of the new room.
+        const QString& replacementRoom() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/rooms.cpp b/lib/csapi/rooms.cpp
index 0b08ccec..b9de276c 100644
--- a/lib/csapi/rooms.cpp
+++ b/lib/csapi/rooms.cpp
@@ -15,30 +15,30 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class GetOneRoomEventJob::Private
 {
     public:
-        EventPtr data;
+    EventPtr data;
 };
 
-QUrl GetOneRoomEventJob::makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& eventId)
+QUrl GetOneRoomEventJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
+                                        const QString& eventId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/rooms/" % roomId % "/event/" % eventId);
+                                   basePath % "/rooms/" % roomId % "/event/"
+                                           % eventId);
 }
 
 static const auto GetOneRoomEventJobName = QStringLiteral("GetOneRoomEventJob");
 
-GetOneRoomEventJob::GetOneRoomEventJob(const QString& roomId, const QString& eventId)
+GetOneRoomEventJob::GetOneRoomEventJob(const QString& roomId,
+                                       const QString& eventId)
     : BaseJob(HttpVerb::Get, GetOneRoomEventJobName,
-        basePath % "/rooms/" % roomId % "/event/" % eventId)
-    , d(new Private)
+              basePath % "/rooms/" % roomId % "/event/" % eventId),
+      d(new Private)
 {
 }
 
 GetOneRoomEventJob::~GetOneRoomEventJob() = default;
 
-EventPtr&& GetOneRoomEventJob::data()
-{
-    return std::move(d->data);
-}
+EventPtr&& GetOneRoomEventJob::data() { return std::move(d->data); }
 
 BaseJob::Status GetOneRoomEventJob::parseJson(const QJsonDocument& data)
 {
@@ -46,61 +46,69 @@ BaseJob::Status GetOneRoomEventJob::parseJson(const QJsonDocument& data)
     return Success;
 }
 
-QUrl GetRoomStateWithKeyJob::makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& eventType, const QString& stateKey)
+QUrl GetRoomStateWithKeyJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
+                                            const QString& eventType,
+                                            const QString& stateKey)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/rooms/" % roomId % "/state/" % eventType % "/" % stateKey);
+                                   basePath % "/rooms/" % roomId % "/state/"
+                                           % eventType % "/" % stateKey);
 }
 
-static const auto GetRoomStateWithKeyJobName = QStringLiteral("GetRoomStateWithKeyJob");
+static const auto GetRoomStateWithKeyJobName =
+        QStringLiteral("GetRoomStateWithKeyJob");
 
-GetRoomStateWithKeyJob::GetRoomStateWithKeyJob(const QString& roomId, const QString& eventType, const QString& stateKey)
+GetRoomStateWithKeyJob::GetRoomStateWithKeyJob(const QString& roomId,
+                                               const QString& eventType,
+                                               const QString& stateKey)
     : BaseJob(HttpVerb::Get, GetRoomStateWithKeyJobName,
-        basePath % "/rooms/" % roomId % "/state/" % eventType % "/" % stateKey)
+              basePath % "/rooms/" % roomId % "/state/" % eventType % "/"
+                      % stateKey)
 {
 }
 
-QUrl GetRoomStateByTypeJob::makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& eventType)
+QUrl GetRoomStateByTypeJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
+                                           const QString& eventType)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/rooms/" % roomId % "/state/" % eventType);
+                                   basePath % "/rooms/" % roomId % "/state/"
+                                           % eventType);
 }
 
-static const auto GetRoomStateByTypeJobName = QStringLiteral("GetRoomStateByTypeJob");
+static const auto GetRoomStateByTypeJobName =
+        QStringLiteral("GetRoomStateByTypeJob");
 
-GetRoomStateByTypeJob::GetRoomStateByTypeJob(const QString& roomId, const QString& eventType)
+GetRoomStateByTypeJob::GetRoomStateByTypeJob(const QString& roomId,
+                                             const QString& eventType)
     : BaseJob(HttpVerb::Get, GetRoomStateByTypeJobName,
-        basePath % "/rooms/" % roomId % "/state/" % eventType)
+              basePath % "/rooms/" % roomId % "/state/" % eventType)
 {
 }
 
 class GetRoomStateJob::Private
 {
     public:
-        StateEvents data;
+    StateEvents data;
 };
 
 QUrl GetRoomStateJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/rooms/" % roomId % "/state");
+                                   basePath % "/rooms/" % roomId % "/state");
 }
 
 static const auto GetRoomStateJobName = QStringLiteral("GetRoomStateJob");
 
 GetRoomStateJob::GetRoomStateJob(const QString& roomId)
     : BaseJob(HttpVerb::Get, GetRoomStateJobName,
-        basePath % "/rooms/" % roomId % "/state")
-    , d(new Private)
+              basePath % "/rooms/" % roomId % "/state"),
+      d(new Private)
 {
 }
 
 GetRoomStateJob::~GetRoomStateJob() = default;
 
-StateEvents&& GetRoomStateJob::data()
-{
-    return std::move(d->data);
-}
+StateEvents&& GetRoomStateJob::data() { return std::move(d->data); }
 
 BaseJob::Status GetRoomStateJob::parseJson(const QJsonDocument& data)
 {
@@ -111,10 +119,12 @@ BaseJob::Status GetRoomStateJob::parseJson(const QJsonDocument& data)
 class GetMembersByRoomJob::Private
 {
     public:
-        EventsArray<RoomMemberEvent> chunk;
+    EventsArray<RoomMemberEvent> chunk;
 };
 
-BaseJob::Query queryToGetMembersByRoom(const QString& at, const QString& membership, const QString& notMembership)
+BaseJob::Query queryToGetMembersByRoom(const QString& at,
+                                       const QString& membership,
+                                       const QString& notMembership)
 {
     BaseJob::Query _q;
     addParam<IfNotEmpty>(_q, QStringLiteral("at"), at);
@@ -123,20 +133,27 @@ BaseJob::Query queryToGetMembersByRoom(const QString& at, const QString& members
     return _q;
 }
 
-QUrl GetMembersByRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& at, const QString& membership, const QString& notMembership)
+QUrl GetMembersByRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
+                                         const QString& at,
+                                         const QString& membership,
+                                         const QString& notMembership)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/rooms/" % roomId % "/members",
+    return BaseJob::makeRequestUrl(
+            std::move(baseUrl), basePath % "/rooms/" % roomId % "/members",
             queryToGetMembersByRoom(at, membership, notMembership));
 }
 
-static const auto GetMembersByRoomJobName = QStringLiteral("GetMembersByRoomJob");
+static const auto GetMembersByRoomJobName =
+        QStringLiteral("GetMembersByRoomJob");
 
-GetMembersByRoomJob::GetMembersByRoomJob(const QString& roomId, const QString& at, const QString& membership, const QString& notMembership)
+GetMembersByRoomJob::GetMembersByRoomJob(const QString& roomId,
+                                         const QString& at,
+                                         const QString& membership,
+                                         const QString& notMembership)
     : BaseJob(HttpVerb::Get, GetMembersByRoomJobName,
-        basePath % "/rooms/" % roomId % "/members",
-        queryToGetMembersByRoom(at, membership, notMembership))
-    , d(new Private)
+              basePath % "/rooms/" % roomId % "/members",
+              queryToGetMembersByRoom(at, membership, notMembership)),
+      d(new Private)
 {
 }
 
@@ -154,13 +171,13 @@ BaseJob::Status GetMembersByRoomJob::parseJson(const QJsonDocument& data)
     return Success;
 }
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<GetJoinedMembersByRoomJob::RoomMember>
-    {
-        static void fillFrom(const QJsonObject& jo, GetJoinedMembersByRoomJob::RoomMember& result)
+    template <>
+    struct JsonObjectConverter<GetJoinedMembersByRoomJob::RoomMember> {
+        static void fillFrom(const QJsonObject& jo,
+                             GetJoinedMembersByRoomJob::RoomMember& result)
         {
             fromJson(jo.value("display_name"_ls), result.displayName);
             fromJson(jo.value("avatar_url"_ls), result.avatarUrl);
@@ -171,27 +188,31 @@ namespace QMatrixClient
 class GetJoinedMembersByRoomJob::Private
 {
     public:
-        QHash<QString, RoomMember> joined;
+    QHash<QString, RoomMember> joined;
 };
 
-QUrl GetJoinedMembersByRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
+QUrl GetJoinedMembersByRoomJob::makeRequestUrl(QUrl baseUrl,
+                                               const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/rooms/" % roomId % "/joined_members");
+                                   basePath % "/rooms/" % roomId
+                                           % "/joined_members");
 }
 
-static const auto GetJoinedMembersByRoomJobName = QStringLiteral("GetJoinedMembersByRoomJob");
+static const auto GetJoinedMembersByRoomJobName =
+        QStringLiteral("GetJoinedMembersByRoomJob");
 
 GetJoinedMembersByRoomJob::GetJoinedMembersByRoomJob(const QString& roomId)
     : BaseJob(HttpVerb::Get, GetJoinedMembersByRoomJobName,
-        basePath % "/rooms/" % roomId % "/joined_members")
-    , d(new Private)
+              basePath % "/rooms/" % roomId % "/joined_members"),
+      d(new Private)
 {
 }
 
 GetJoinedMembersByRoomJob::~GetJoinedMembersByRoomJob() = default;
 
-const QHash<QString, GetJoinedMembersByRoomJob::RoomMember>& GetJoinedMembersByRoomJob::joined() const
+const QHash<QString, GetJoinedMembersByRoomJob::RoomMember>&
+GetJoinedMembersByRoomJob::joined() const
 {
     return d->joined;
 }
@@ -202,4 +223,3 @@ BaseJob::Status GetJoinedMembersByRoomJob::parseJson(const QJsonDocument& data)
     fromJson(json.value("joined"_ls), d->joined);
     return Success;
 }
-
diff --git a/lib/csapi/rooms.h b/lib/csapi/rooms.h
index b4d3d9b6..20bdd20e 100644
--- a/lib/csapi/rooms.h
+++ b/lib/csapi/rooms.h
@@ -6,51 +6,53 @@
 
 #include "jobs/basejob.h"
 
-#include "events/roommemberevent.h"
+#include "converters.h"
 #include "events/eventloader.h"
+#include "events/roommemberevent.h"
 #include <QtCore/QHash>
-#include "converters.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Get a single event by event ID.
     ///
-    /// Get a single event based on ``roomId/eventId``. You must have permission to
-    /// retrieve this event e.g. by being a member in the room for this event.
+    /// Get a single event based on ``roomId/eventId``. You must have permission
+    /// to retrieve this event e.g. by being a member in the room for this
+    /// event.
     class GetOneRoomEventJob : public BaseJob
     {
         public:
-            /*! Get a single event by event ID.
-             * \param roomId
-             *   The ID of the room the event is in.
-             * \param eventId
-             *   The event ID to get.
-             */
-            explicit GetOneRoomEventJob(const QString& roomId, const QString& eventId);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetOneRoomEventJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& eventId);
-
-            ~GetOneRoomEventJob() override;
-
-            // Result properties
-
-            /// The full event.
-            EventPtr&& data();
+        /*! Get a single event by event ID.
+         * \param roomId
+         *   The ID of the room the event is in.
+         * \param eventId
+         *   The event ID to get.
+         */
+        explicit GetOneRoomEventJob(const QString& roomId,
+                                    const QString& eventId);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetOneRoomEventJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId,
+                                   const QString& eventId);
+
+        ~GetOneRoomEventJob() override;
+
+        // Result properties
+
+        /// The full event.
+        EventPtr&& data();
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Get the state identified by the type and key.
@@ -62,24 +64,27 @@ namespace QMatrixClient
     class GetRoomStateWithKeyJob : public BaseJob
     {
         public:
-            /*! Get the state identified by the type and key.
-             * \param roomId
-             *   The room to look up the state in.
-             * \param eventType
-             *   The type of state to look up.
-             * \param stateKey
-             *   The key of the state to look up.
-             */
-            explicit GetRoomStateWithKeyJob(const QString& roomId, const QString& eventType, const QString& stateKey);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetRoomStateWithKeyJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& eventType, const QString& stateKey);
-
+        /*! Get the state identified by the type and key.
+         * \param roomId
+         *   The room to look up the state in.
+         * \param eventType
+         *   The type of state to look up.
+         * \param stateKey
+         *   The key of the state to look up.
+         */
+        explicit GetRoomStateWithKeyJob(const QString& roomId,
+                                        const QString& eventType,
+                                        const QString& stateKey);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetRoomStateWithKeyJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId,
+                                   const QString& eventType,
+                                   const QString& stateKey);
     };
 
     /// Get the state identified by the type, with the empty state key.
@@ -88,27 +93,28 @@ namespace QMatrixClient
     /// joined to the room then the state is taken from the current
     /// state of the room. If the user has left the room then the state is
     /// taken from the state of the room when they left.
-    /// 
+    ///
     /// This looks up the state event with the empty state key.
     class GetRoomStateByTypeJob : public BaseJob
     {
         public:
-            /*! Get the state identified by the type, with the empty state key.
-             * \param roomId
-             *   The room to look up the state in.
-             * \param eventType
-             *   The type of state to look up.
-             */
-            explicit GetRoomStateByTypeJob(const QString& roomId, const QString& eventType);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetRoomStateByTypeJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& eventType);
-
+        /*! Get the state identified by the type, with the empty state key.
+         * \param roomId
+         *   The room to look up the state in.
+         * \param eventType
+         *   The type of state to look up.
+         */
+        explicit GetRoomStateByTypeJob(const QString& roomId,
+                                       const QString& eventType);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetRoomStateByTypeJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId,
+                                   const QString& eventType);
     };
 
     /// Get all state events in the current state of a room.
@@ -117,36 +123,36 @@ namespace QMatrixClient
     class GetRoomStateJob : public BaseJob
     {
         public:
-            /*! Get all state events in the current state of a room.
-             * \param roomId
-             *   The room to look up the state for.
-             */
-            explicit GetRoomStateJob(const QString& roomId);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetRoomStateJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId);
-
-            ~GetRoomStateJob() override;
-
-            // Result properties
-
-            /// If the user is a member of the room this will be the
-            /// current state of the room as a list of events. If the user
-            /// has left the room then this will be the state of the room
-            /// when they left as a list of events.
-            StateEvents&& data();
+        /*! Get all state events in the current state of a room.
+         * \param roomId
+         *   The room to look up the state for.
+         */
+        explicit GetRoomStateJob(const QString& roomId);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetRoomStateJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId);
+
+        ~GetRoomStateJob() override;
+
+        // Result properties
+
+        /// If the user is a member of the room this will be the
+        /// current state of the room as a list of events. If the user
+        /// has left the room then this will be the state of the room
+        /// when they left as a list of events.
+        StateEvents&& data();
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Get the m.room.member events for the room.
@@ -155,89 +161,104 @@ namespace QMatrixClient
     class GetMembersByRoomJob : public BaseJob
     {
         public:
-            /*! Get the m.room.member events for the room.
-             * \param roomId
-             *   The room to get the member events for.
-             * \param at
-             *   The token defining the timeline position as-of which to return
-             *   the list of members. This token can be obtained from a batch token
-             *   returned for each room by the sync API, or from
-             *   a ``start``/``end`` token returned by a ``/messages`` request.
-             * \param membership
-             *   Only return users with the specified membership
-             * \param notMembership
-             *   Only return users with membership state other than specified
-             */
-            explicit GetMembersByRoomJob(const QString& roomId, const QString& at = {}, const QString& membership = {}, const QString& notMembership = {});
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetMembersByRoomJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& at = {}, const QString& membership = {}, const QString& notMembership = {});
-
-            ~GetMembersByRoomJob() override;
-
-            // Result properties
-
-            /// Get the list of members for this room.
-            EventsArray<RoomMemberEvent>&& chunk();
+        /*! Get the m.room.member events for the room.
+         * \param roomId
+         *   The room to get the member events for.
+         * \param at
+         *   The token defining the timeline position as-of which to return
+         *   the list of members. This token can be obtained from a batch token
+         *   returned for each room by the sync API, or from
+         *   a ``start``/``end`` token returned by a ``/messages`` request.
+         * \param membership
+         *   Only return users with the specified membership
+         * \param notMembership
+         *   Only return users with membership state other than specified
+         */
+        explicit GetMembersByRoomJob(const QString& roomId,
+                                     const QString& at = {},
+                                     const QString& membership = {},
+                                     const QString& notMembership = {});
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetMembersByRoomJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId,
+                                   const QString& at = {},
+                                   const QString& membership = {},
+                                   const QString& notMembership = {});
+
+        ~GetMembersByRoomJob() override;
+
+        // Result properties
+
+        /// Get the list of members for this room.
+        EventsArray<RoomMemberEvent>&& chunk();
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Gets the list of currently joined users and their profile data.
     ///
-    /// This API returns a map of MXIDs to member info objects for members of the room. The current user must be in the room for it to work, unless it is an Application Service in which case any of the AS's users must be in the room. This API is primarily for Application Services and should be faster to respond than ``/members`` as it can be implemented more efficiently on the server.
+    /// This API returns a map of MXIDs to member info objects for members of
+    /// the room. The current user must be in the room for it to work, unless it
+    /// is an Application Service in which case any of the AS's users must be in
+    /// the room. This API is primarily for Application Services and should be
+    /// faster to respond than ``/members`` as it can be implemented more
+    /// efficiently on the server.
     class GetJoinedMembersByRoomJob : public BaseJob
     {
         public:
-            // Inner data structures
-
-            /// This API returns a map of MXIDs to member info objects for members of the room. The current user must be in the room for it to work, unless it is an Application Service in which case any of the AS's users must be in the room. This API is primarily for Application Services and should be faster to respond than ``/members`` as it can be implemented more efficiently on the server.
-            struct RoomMember
-            {
-                /// The display name of the user this object is representing.
-                QString displayName;
-                /// The mxc avatar url of the user this object is representing.
-                QString avatarUrl;
-            };
-
-            // Construction/destruction
-
-            /*! Gets the list of currently joined users and their profile data.
-             * \param roomId
-             *   The room to get the members of.
-             */
-            explicit GetJoinedMembersByRoomJob(const QString& roomId);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetJoinedMembersByRoomJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId);
-
-            ~GetJoinedMembersByRoomJob() override;
-
-            // Result properties
-
-            /// A map from user ID to a RoomMember object.
-            const QHash<QString, RoomMember>& joined() const;
+        // Inner data structures
+
+        /// This API returns a map of MXIDs to member info objects for members
+        /// of the room. The current user must be in the room for it to work,
+        /// unless it is an Application Service in which case any of the AS's
+        /// users must be in the room. This API is primarily for Application
+        /// Services and should be faster to respond than ``/members`` as it can
+        /// be implemented more efficiently on the server.
+        struct RoomMember {
+            /// The display name of the user this object is representing.
+            QString displayName;
+            /// The mxc avatar url of the user this object is representing.
+            QString avatarUrl;
+        };
+
+        // Construction/destruction
+
+        /*! Gets the list of currently joined users and their profile data.
+         * \param roomId
+         *   The room to get the members of.
+         */
+        explicit GetJoinedMembersByRoomJob(const QString& roomId);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetJoinedMembersByRoomJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId);
+
+        ~GetJoinedMembersByRoomJob() override;
+
+        // Result properties
+
+        /// A map from user ID to a RoomMember object.
+        const QHash<QString, RoomMember>& joined() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/search.cpp b/lib/csapi/search.cpp
index a5f83c79..22aaf616 100644
--- a/lib/csapi/search.cpp
+++ b/lib/csapi/search.cpp
@@ -12,70 +12,73 @@ using namespace QMatrixClient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<SearchJob::IncludeEventContext>
-    {
-        static void dumpTo(QJsonObject& jo, const SearchJob::IncludeEventContext& pod)
+    template <> struct JsonObjectConverter<SearchJob::IncludeEventContext> {
+        static void dumpTo(QJsonObject& jo,
+                           const SearchJob::IncludeEventContext& pod)
         {
-            addParam<IfNotEmpty>(jo, QStringLiteral("before_limit"), pod.beforeLimit);
-            addParam<IfNotEmpty>(jo, QStringLiteral("after_limit"), pod.afterLimit);
-            addParam<IfNotEmpty>(jo, QStringLiteral("include_profile"), pod.includeProfile);
+            addParam<IfNotEmpty>(jo, QStringLiteral("before_limit"),
+                                 pod.beforeLimit);
+            addParam<IfNotEmpty>(jo, QStringLiteral("after_limit"),
+                                 pod.afterLimit);
+            addParam<IfNotEmpty>(jo, QStringLiteral("include_profile"),
+                                 pod.includeProfile);
         }
     };
 
-    template <> struct JsonObjectConverter<SearchJob::Group>
-    {
+    template <> struct JsonObjectConverter<SearchJob::Group> {
         static void dumpTo(QJsonObject& jo, const SearchJob::Group& pod)
         {
             addParam<IfNotEmpty>(jo, QStringLiteral("key"), pod.key);
         }
     };
 
-    template <> struct JsonObjectConverter<SearchJob::Groupings>
-    {
+    template <> struct JsonObjectConverter<SearchJob::Groupings> {
         static void dumpTo(QJsonObject& jo, const SearchJob::Groupings& pod)
         {
             addParam<IfNotEmpty>(jo, QStringLiteral("group_by"), pod.groupBy);
         }
     };
 
-    template <> struct JsonObjectConverter<SearchJob::RoomEventsCriteria>
-    {
-        static void dumpTo(QJsonObject& jo, const SearchJob::RoomEventsCriteria& pod)
+    template <> struct JsonObjectConverter<SearchJob::RoomEventsCriteria> {
+        static void dumpTo(QJsonObject& jo,
+                           const SearchJob::RoomEventsCriteria& pod)
         {
             addParam<>(jo, QStringLiteral("search_term"), pod.searchTerm);
             addParam<IfNotEmpty>(jo, QStringLiteral("keys"), pod.keys);
             addParam<IfNotEmpty>(jo, QStringLiteral("filter"), pod.filter);
             addParam<IfNotEmpty>(jo, QStringLiteral("order_by"), pod.orderBy);
-            addParam<IfNotEmpty>(jo, QStringLiteral("event_context"), pod.eventContext);
-            addParam<IfNotEmpty>(jo, QStringLiteral("include_state"), pod.includeState);
-            addParam<IfNotEmpty>(jo, QStringLiteral("groupings"), pod.groupings);
+            addParam<IfNotEmpty>(jo, QStringLiteral("event_context"),
+                                 pod.eventContext);
+            addParam<IfNotEmpty>(jo, QStringLiteral("include_state"),
+                                 pod.includeState);
+            addParam<IfNotEmpty>(jo, QStringLiteral("groupings"),
+                                 pod.groupings);
         }
     };
 
-    template <> struct JsonObjectConverter<SearchJob::Categories>
-    {
+    template <> struct JsonObjectConverter<SearchJob::Categories> {
         static void dumpTo(QJsonObject& jo, const SearchJob::Categories& pod)
         {
-            addParam<IfNotEmpty>(jo, QStringLiteral("room_events"), pod.roomEvents);
+            addParam<IfNotEmpty>(jo, QStringLiteral("room_events"),
+                                 pod.roomEvents);
         }
     };
 
-    template <> struct JsonObjectConverter<SearchJob::UserProfile>
-    {
-        static void fillFrom(const QJsonObject& jo, SearchJob::UserProfile& result)
+    template <> struct JsonObjectConverter<SearchJob::UserProfile> {
+        static void fillFrom(const QJsonObject& jo,
+                             SearchJob::UserProfile& result)
         {
             fromJson(jo.value("displayname"_ls), result.displayname);
             fromJson(jo.value("avatar_url"_ls), result.avatarUrl);
         }
     };
 
-    template <> struct JsonObjectConverter<SearchJob::EventContext>
-    {
-        static void fillFrom(const QJsonObject& jo, SearchJob::EventContext& result)
+    template <> struct JsonObjectConverter<SearchJob::EventContext> {
+        static void fillFrom(const QJsonObject& jo,
+                             SearchJob::EventContext& result)
         {
             fromJson(jo.value("start"_ls), result.begin);
             fromJson(jo.value("end"_ls), result.end);
@@ -85,8 +88,7 @@ namespace QMatrixClient
         }
     };
 
-    template <> struct JsonObjectConverter<SearchJob::Result>
-    {
+    template <> struct JsonObjectConverter<SearchJob::Result> {
         static void fillFrom(const QJsonObject& jo, SearchJob::Result& result)
         {
             fromJson(jo.value("rank"_ls), result.rank);
@@ -95,9 +97,9 @@ namespace QMatrixClient
         }
     };
 
-    template <> struct JsonObjectConverter<SearchJob::GroupValue>
-    {
-        static void fillFrom(const QJsonObject& jo, SearchJob::GroupValue& result)
+    template <> struct JsonObjectConverter<SearchJob::GroupValue> {
+        static void fillFrom(const QJsonObject& jo,
+                             SearchJob::GroupValue& result)
         {
             fromJson(jo.value("next_batch"_ls), result.nextBatch);
             fromJson(jo.value("order"_ls), result.order);
@@ -105,9 +107,9 @@ namespace QMatrixClient
         }
     };
 
-    template <> struct JsonObjectConverter<SearchJob::ResultRoomEvents>
-    {
-        static void fillFrom(const QJsonObject& jo, SearchJob::ResultRoomEvents& result)
+    template <> struct JsonObjectConverter<SearchJob::ResultRoomEvents> {
+        static void fillFrom(const QJsonObject& jo,
+                             SearchJob::ResultRoomEvents& result)
         {
             fromJson(jo.value("count"_ls), result.count);
             fromJson(jo.value("highlights"_ls), result.highlights);
@@ -118,9 +120,9 @@ namespace QMatrixClient
         }
     };
 
-    template <> struct JsonObjectConverter<SearchJob::ResultCategories>
-    {
-        static void fillFrom(const QJsonObject& jo, SearchJob::ResultCategories& result)
+    template <> struct JsonObjectConverter<SearchJob::ResultCategories> {
+        static void fillFrom(const QJsonObject& jo,
+                             SearchJob::ResultCategories& result)
         {
             fromJson(jo.value("room_events"_ls), result.roomEvents);
         }
@@ -130,7 +132,7 @@ namespace QMatrixClient
 class SearchJob::Private
 {
     public:
-        ResultCategories searchCategories;
+    ResultCategories searchCategories;
 };
 
 BaseJob::Query queryToSearch(const QString& nextBatch)
@@ -142,11 +144,11 @@ BaseJob::Query queryToSearch(const QString& nextBatch)
 
 static const auto SearchJobName = QStringLiteral("SearchJob");
 
-SearchJob::SearchJob(const Categories& searchCategories, const QString& nextBatch)
-    : BaseJob(HttpVerb::Post, SearchJobName,
-        basePath % "/search",
-        queryToSearch(nextBatch))
-    , d(new Private)
+SearchJob::SearchJob(const Categories& searchCategories,
+                     const QString& nextBatch)
+    : BaseJob(HttpVerb::Post, SearchJobName, basePath % "/search",
+              queryToSearch(nextBatch)),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("search_categories"), searchCategories);
@@ -165,8 +167,7 @@ BaseJob::Status SearchJob::parseJson(const QJsonDocument& data)
     auto json = data.object();
     if (!json.contains("search_categories"_ls))
         return { JsonParseError,
-            "The key 'search_categories' not found in the response" };
+                 "The key 'search_categories' not found in the response" };
     fromJson(json.value("search_categories"_ls), d->searchCategories);
     return Success;
 }
-
diff --git a/lib/csapi/search.h b/lib/csapi/search.h
index 86a0ee92..41761030 100644
--- a/lib/csapi/search.h
+++ b/lib/csapi/search.h
@@ -6,15 +6,14 @@
 
 #include "jobs/basejob.h"
 
-#include "csapi/definitions/room_event_filter.h"
 #include "converters.h"
-#include <QtCore/QVector>
+#include "csapi/definitions/room_event_filter.h"
 #include "events/eventloader.h"
-#include <unordered_map>
 #include <QtCore/QHash>
+#include <QtCore/QVector>
+#include <unordered_map>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Perform a server-side search.
@@ -23,183 +22,175 @@ namespace QMatrixClient
     class SearchJob : public BaseJob
     {
         public:
-            // Inner data structures
-
+        // Inner data structures
+
+        /// Configures whether any context for the events
+        /// returned are included in the response.
+        struct IncludeEventContext {
+            /// How many events before the result are
+            /// returned. By default, this is ``5``.
+            Omittable<int> beforeLimit;
+            /// How many events after the result are
+            /// returned. By default, this is ``5``.
+            Omittable<int> afterLimit;
+            /// Requests that the server returns the
+            /// historic profile information for the users
+            /// that sent the events that were returned.
+            /// By default, this is ``false``.
+            Omittable<bool> includeProfile;
+        };
+
+        /// Configuration for group.
+        struct Group {
+            /// Key that defines the group.
+            QString key;
+        };
+
+        /// Requests that the server partitions the result set
+        /// based on the provided list of keys.
+        struct Groupings {
+            /// List of groups to request.
+            QVector<Group> groupBy;
+        };
+
+        /// Mapping of category name to search criteria.
+        struct RoomEventsCriteria {
+            /// The string to search events for
+            QString searchTerm;
+            /// The keys to search. Defaults to all.
+            QStringList keys;
+            /// This takes a `filter`_.
+            Omittable<RoomEventFilter> filter;
+            /// The order in which to search for results.
+            /// By default, this is ``"rank"``.
+            QString orderBy;
             /// Configures whether any context for the events
             /// returned are included in the response.
-            struct IncludeEventContext
-            {
-                /// How many events before the result are
-                /// returned. By default, this is ``5``.
-                Omittable<int> beforeLimit;
-                /// How many events after the result are
-                /// returned. By default, this is ``5``.
-                Omittable<int> afterLimit;
-                /// Requests that the server returns the
-                /// historic profile information for the users
-                /// that sent the events that were returned.
-                /// By default, this is ``false``.
-                Omittable<bool> includeProfile;
-            };
-
-            /// Configuration for group.
-            struct Group
-            {
-                /// Key that defines the group.
-                QString key;
-            };
-
+            Omittable<IncludeEventContext> eventContext;
+            /// Requests the server return the current state for
+            /// each room returned.
+            Omittable<bool> includeState;
             /// Requests that the server partitions the result set
             /// based on the provided list of keys.
-            struct Groupings
-            {
-                /// List of groups to request.
-                QVector<Group> groupBy;
-            };
+            Omittable<Groupings> groupings;
+        };
 
+        /// Describes which categories to search in and their criteria.
+        struct Categories {
             /// Mapping of category name to search criteria.
-            struct RoomEventsCriteria
-            {
-                /// The string to search events for
-                QString searchTerm;
-                /// The keys to search. Defaults to all.
-                QStringList keys;
-                /// This takes a `filter`_.
-                Omittable<RoomEventFilter> filter;
-                /// The order in which to search for results.
-                /// By default, this is ``"rank"``.
-                QString orderBy;
-                /// Configures whether any context for the events
-                /// returned are included in the response.
-                Omittable<IncludeEventContext> eventContext;
-                /// Requests the server return the current state for
-                /// each room returned.
-                Omittable<bool> includeState;
-                /// Requests that the server partitions the result set
-                /// based on the provided list of keys.
-                Omittable<Groupings> groupings;
-            };
-
-            /// Describes which categories to search in and their criteria.
-            struct Categories
-            {
-                /// Mapping of category name to search criteria.
-                Omittable<RoomEventsCriteria> roomEvents;
-            };
+            Omittable<RoomEventsCriteria> roomEvents;
+        };
 
+        /// Performs a full text search across different categories.
+        struct UserProfile {
             /// Performs a full text search across different categories.
-            struct UserProfile
-            {
-                /// Performs a full text search across different categories.
-                QString displayname;
-                /// Performs a full text search across different categories.
-                QString avatarUrl;
-            };
-
+            QString displayname;
+            /// Performs a full text search across different categories.
+            QString avatarUrl;
+        };
+
+        /// Context for result, if requested.
+        struct EventContext {
+            /// Pagination token for the start of the chunk
+            QString begin;
+            /// Pagination token for the end of the chunk
+            QString end;
+            /// The historic profile information of the
+            /// users that sent the events returned.
+            ///
+            /// The ``string`` key is the user ID for which
+            /// the profile belongs to.
+            QHash<QString, UserProfile> profileInfo;
+            /// Events just before the result.
+            RoomEvents eventsBefore;
+            /// Events just after the result.
+            RoomEvents eventsAfter;
+        };
+
+        /// The result object.
+        struct Result {
+            /// A number that describes how closely this result matches the
+            /// search. Higher is closer.
+            Omittable<double> rank;
+            /// The event that matched.
+            RoomEventPtr result;
             /// Context for result, if requested.
-            struct EventContext
-            {
-                /// Pagination token for the start of the chunk
-                QString begin;
-                /// Pagination token for the end of the chunk
-                QString end;
-                /// The historic profile information of the
-                /// users that sent the events returned.
-                /// 
-                /// The ``string`` key is the user ID for which
-                /// the profile belongs to.
-                QHash<QString, UserProfile> profileInfo;
-                /// Events just before the result.
-                RoomEvents eventsBefore;
-                /// Events just after the result.
-                RoomEvents eventsAfter;
-            };
-
-            /// The result object.
-            struct Result
-            {
-                /// A number that describes how closely this result matches the search. Higher is closer.
-                Omittable<double> rank;
-                /// The event that matched.
-                RoomEventPtr result;
-                /// Context for result, if requested.
-                Omittable<EventContext> context;
-            };
-
-            /// The results for a particular group value.
-            struct GroupValue
-            {
-                /// Token that can be used to get the next batch
-                /// of results in the group, by passing as the
-                /// `next_batch` parameter to the next call. If
-                /// this field is absent, there are no more
-                /// results in this group.
-                QString nextBatch;
-                /// Key that can be used to order different
-                /// groups.
-                Omittable<int> order;
-                /// Which results are in this group.
-                QStringList results;
-            };
-
+            Omittable<EventContext> context;
+        };
+
+        /// The results for a particular group value.
+        struct GroupValue {
+            /// Token that can be used to get the next batch
+            /// of results in the group, by passing as the
+            /// `next_batch` parameter to the next call. If
+            /// this field is absent, there are no more
+            /// results in this group.
+            QString nextBatch;
+            /// Key that can be used to order different
+            /// groups.
+            Omittable<int> order;
+            /// Which results are in this group.
+            QStringList results;
+        };
+
+        /// Mapping of category name to search criteria.
+        struct ResultRoomEvents {
+            /// An approximate count of the total number of results found.
+            Omittable<int> count;
+            /// List of words which should be highlighted, useful for stemming
+            /// which may change the query terms.
+            QStringList highlights;
+            /// List of results in the requested order.
+            std::vector<Result> results;
+            /// The current state for every room in the results.
+            /// This is included if the request had the
+            /// ``include_state`` key set with a value of ``true``.
+            ///
+            /// The ``string`` key is the room ID for which the ``State
+            /// Event`` array belongs to.
+            std::unordered_map<QString, StateEvents> state;
+            /// Any groups that were requested.
+            ///
+            /// The outer ``string`` key is the group key requested (eg:
+            /// ``room_id`` or ``sender``). The inner ``string`` key is the
+            /// grouped value (eg: a room's ID or a user's ID).
+            QHash<QString, QHash<QString, GroupValue>> groups;
+            /// Token that can be used to get the next batch of
+            /// results, by passing as the `next_batch` parameter to
+            /// the next call. If this field is absent, there are no
+            /// more results.
+            QString nextBatch;
+        };
+
+        /// Describes which categories to search in and their criteria.
+        struct ResultCategories {
             /// Mapping of category name to search criteria.
-            struct ResultRoomEvents
-            {
-                /// An approximate count of the total number of results found.
-                Omittable<int> count;
-                /// List of words which should be highlighted, useful for stemming which may change the query terms.
-                QStringList highlights;
-                /// List of results in the requested order.
-                std::vector<Result> results;
-                /// The current state for every room in the results.
-                /// This is included if the request had the
-                /// ``include_state`` key set with a value of ``true``.
-                /// 
-                /// The ``string`` key is the room ID for which the ``State
-                /// Event`` array belongs to.
-                std::unordered_map<QString, StateEvents> state;
-                /// Any groups that were requested.
-                /// 
-                /// The outer ``string`` key is the group key requested (eg: ``room_id``
-                /// or ``sender``). The inner ``string`` key is the grouped value (eg: 
-                /// a room's ID or a user's ID).
-                QHash<QString, QHash<QString, GroupValue>> groups;
-                /// Token that can be used to get the next batch of
-                /// results, by passing as the `next_batch` parameter to
-                /// the next call. If this field is absent, there are no
-                /// more results.
-                QString nextBatch;
-            };
-
-            /// Describes which categories to search in and their criteria.
-            struct ResultCategories
-            {
-                /// Mapping of category name to search criteria.
-                Omittable<ResultRoomEvents> roomEvents;
-            };
-
-            // Construction/destruction
-
-            /*! Perform a server-side search.
-             * \param searchCategories
-             *   Describes which categories to search in and their criteria.
-             * \param nextBatch
-             *   The point to return events from. If given, this should be a
-             *   ``next_batch`` result from a previous call to this endpoint.
-             */
-            explicit SearchJob(const Categories& searchCategories, const QString& nextBatch = {});
-            ~SearchJob() override;
-
-            // Result properties
-
-            /// Describes which categories to search in and their criteria.
-            const ResultCategories& searchCategories() const;
+            Omittable<ResultRoomEvents> roomEvents;
+        };
+
+        // Construction/destruction
+
+        /*! Perform a server-side search.
+         * \param searchCategories
+         *   Describes which categories to search in and their criteria.
+         * \param nextBatch
+         *   The point to return events from. If given, this should be a
+         *   ``next_batch`` result from a previous call to this endpoint.
+         */
+        explicit SearchJob(const Categories& searchCategories,
+                           const QString& nextBatch = {});
+        ~SearchJob() override;
+
+        // Result properties
+
+        /// Describes which categories to search in and their criteria.
+        const ResultCategories& searchCategories() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/sso_login_redirect.cpp b/lib/csapi/sso_login_redirect.cpp
index 7323951c..92084d52 100644
--- a/lib/csapi/sso_login_redirect.cpp
+++ b/lib/csapi/sso_login_redirect.cpp
@@ -22,17 +22,15 @@ BaseJob::Query queryToRedirectToSSO(const QString& redirectUrl)
 QUrl RedirectToSSOJob::makeRequestUrl(QUrl baseUrl, const QString& redirectUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/login/sso/redirect",
-            queryToRedirectToSSO(redirectUrl));
+                                   basePath % "/login/sso/redirect",
+                                   queryToRedirectToSSO(redirectUrl));
 }
 
 static const auto RedirectToSSOJobName = QStringLiteral("RedirectToSSOJob");
 
 RedirectToSSOJob::RedirectToSSOJob(const QString& redirectUrl)
     : BaseJob(HttpVerb::Get, RedirectToSSOJobName,
-        basePath % "/login/sso/redirect",
-        queryToRedirectToSSO(redirectUrl),
-        {}, false)
+              basePath % "/login/sso/redirect",
+              queryToRedirectToSSO(redirectUrl), {}, false)
 {
 }
-
diff --git a/lib/csapi/sso_login_redirect.h b/lib/csapi/sso_login_redirect.h
index c09365b0..2b0d3f65 100644
--- a/lib/csapi/sso_login_redirect.h
+++ b/lib/csapi/sso_login_redirect.h
@@ -6,34 +6,31 @@
 
 #include "jobs/basejob.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Redirect the user's browser to the SSO interface.
     ///
     /// A web-based Matrix client should instruct the user's browser to
     /// navigate to this endpoint in order to log in via SSO.
-    /// 
+    ///
     /// The server MUST respond with an HTTP redirect to the SSO interface.
     class RedirectToSSOJob : public BaseJob
     {
         public:
-            /*! Redirect the user's browser to the SSO interface.
-             * \param redirectUrl
-             *   URI to which the user will be redirected after the homeserver has
-             *   authenticated the user with SSO.
-             */
-            explicit RedirectToSSOJob(const QString& redirectUrl);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * RedirectToSSOJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& redirectUrl);
+        /*! Redirect the user's browser to the SSO interface.
+         * \param redirectUrl
+         *   URI to which the user will be redirected after the homeserver has
+         *   authenticated the user with SSO.
+         */
+        explicit RedirectToSSOJob(const QString& redirectUrl);
 
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * RedirectToSSOJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& redirectUrl);
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/tags.cpp b/lib/csapi/tags.cpp
index 94026bb9..9f591447 100644
--- a/lib/csapi/tags.cpp
+++ b/lib/csapi/tags.cpp
@@ -12,12 +12,10 @@ using namespace QMatrixClient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<GetRoomTagsJob::Tag>
-    {
+    template <> struct JsonObjectConverter<GetRoomTagsJob::Tag> {
         static void fillFrom(QJsonObject jo, GetRoomTagsJob::Tag& result)
         {
             fromJson(jo.take("order"_ls), result.order);
@@ -29,21 +27,23 @@ namespace QMatrixClient
 class GetRoomTagsJob::Private
 {
     public:
-        QHash<QString, Tag> tags;
+    QHash<QString, Tag> tags;
 };
 
-QUrl GetRoomTagsJob::makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId)
+QUrl GetRoomTagsJob::makeRequestUrl(QUrl baseUrl, const QString& userId,
+                                    const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/user/" % userId % "/rooms/" % roomId % "/tags");
+                                   basePath % "/user/" % userId % "/rooms/"
+                                           % roomId % "/tags");
 }
 
 static const auto GetRoomTagsJobName = QStringLiteral("GetRoomTagsJob");
 
 GetRoomTagsJob::GetRoomTagsJob(const QString& userId, const QString& roomId)
     : BaseJob(HttpVerb::Get, GetRoomTagsJobName,
-        basePath % "/user/" % userId % "/rooms/" % roomId % "/tags")
-    , d(new Private)
+              basePath % "/user/" % userId % "/rooms/" % roomId % "/tags"),
+      d(new Private)
 {
 }
 
@@ -63,26 +63,31 @@ BaseJob::Status GetRoomTagsJob::parseJson(const QJsonDocument& data)
 
 static const auto SetRoomTagJobName = QStringLiteral("SetRoomTagJob");
 
-SetRoomTagJob::SetRoomTagJob(const QString& userId, const QString& roomId, const QString& tag, Omittable<float> order)
+SetRoomTagJob::SetRoomTagJob(const QString& userId, const QString& roomId,
+                             const QString& tag, Omittable<float> order)
     : BaseJob(HttpVerb::Put, SetRoomTagJobName,
-        basePath % "/user/" % userId % "/rooms/" % roomId % "/tags/" % tag)
+              basePath % "/user/" % userId % "/rooms/" % roomId % "/tags/"
+                      % tag)
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("order"), order);
     setRequestData(_data);
 }
 
-QUrl DeleteRoomTagJob::makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId, const QString& tag)
+QUrl DeleteRoomTagJob::makeRequestUrl(QUrl baseUrl, const QString& userId,
+                                      const QString& roomId, const QString& tag)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/user/" % userId % "/rooms/" % roomId % "/tags/" % tag);
+                                   basePath % "/user/" % userId % "/rooms/"
+                                           % roomId % "/tags/" % tag);
 }
 
 static const auto DeleteRoomTagJobName = QStringLiteral("DeleteRoomTagJob");
 
-DeleteRoomTagJob::DeleteRoomTagJob(const QString& userId, const QString& roomId, const QString& tag)
+DeleteRoomTagJob::DeleteRoomTagJob(const QString& userId, const QString& roomId,
+                                   const QString& tag)
     : BaseJob(HttpVerb::Delete, DeleteRoomTagJobName,
-        basePath % "/user/" % userId % "/rooms/" % roomId % "/tags/" % tag)
+              basePath % "/user/" % userId % "/rooms/" % roomId % "/tags/"
+                      % tag)
 {
 }
-
diff --git a/lib/csapi/tags.h b/lib/csapi/tags.h
index 2c20c2a2..dc683ef7 100644
--- a/lib/csapi/tags.h
+++ b/lib/csapi/tags.h
@@ -6,12 +6,11 @@
 
 #include "jobs/basejob.h"
 
-#include <QtCore/QVariant>
-#include <QtCore/QHash>
 #include "converters.h"
+#include <QtCore/QHash>
+#include <QtCore/QVariant>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// List the tags for a room.
@@ -20,50 +19,50 @@ namespace QMatrixClient
     class GetRoomTagsJob : public BaseJob
     {
         public:
-            // Inner data structures
+        // Inner data structures
 
+        /// List the tags set by a user on a room.
+        struct Tag {
+            /// A number in a range ``[0,1]`` describing a relative
+            /// position of the room under the given tag.
+            Omittable<float> order;
             /// List the tags set by a user on a room.
-            struct Tag
-            {
-                /// A number in a range ``[0,1]`` describing a relative
-                /// position of the room under the given tag.
-                Omittable<float> order;
-                /// List the tags set by a user on a room.
-                QVariantHash additionalProperties;
-            };
-
-            // Construction/destruction
-
-            /*! List the tags for a room.
-             * \param userId
-             *   The id of the user to get tags for. The access token must be
-             *   authorized to make requests for this user ID.
-             * \param roomId
-             *   The ID of the room to get tags for.
-             */
-            explicit GetRoomTagsJob(const QString& userId, const QString& roomId);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetRoomTagsJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId);
-
-            ~GetRoomTagsJob() override;
-
-            // Result properties
+            QVariantHash additionalProperties;
+        };
 
-            /// List the tags set by a user on a room.
-            const QHash<QString, Tag>& tags() const;
+        // Construction/destruction
+
+        /*! List the tags for a room.
+         * \param userId
+         *   The id of the user to get tags for. The access token must be
+         *   authorized to make requests for this user ID.
+         * \param roomId
+         *   The ID of the room to get tags for.
+         */
+        explicit GetRoomTagsJob(const QString& userId, const QString& roomId);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetRoomTagsJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId,
+                                   const QString& roomId);
+
+        ~GetRoomTagsJob() override;
+
+        // Result properties
+
+        /// List the tags set by a user on a room.
+        const QHash<QString, Tag>& tags() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Add a tag to a room.
@@ -72,19 +71,21 @@ namespace QMatrixClient
     class SetRoomTagJob : public BaseJob
     {
         public:
-            /*! Add a tag to a room.
-             * \param userId
-             *   The id of the user to add a tag for. The access token must be
-             *   authorized to make requests for this user ID.
-             * \param roomId
-             *   The ID of the room to add a tag to.
-             * \param tag
-             *   The tag to add.
-             * \param order
-             *   A number in a range ``[0,1]`` describing a relative
-             *   position of the room under the given tag.
-             */
-            explicit SetRoomTagJob(const QString& userId, const QString& roomId, const QString& tag, Omittable<float> order = none);
+        /*! Add a tag to a room.
+         * \param userId
+         *   The id of the user to add a tag for. The access token must be
+         *   authorized to make requests for this user ID.
+         * \param roomId
+         *   The ID of the room to add a tag to.
+         * \param tag
+         *   The tag to add.
+         * \param order
+         *   A number in a range ``[0,1]`` describing a relative
+         *   position of the room under the given tag.
+         */
+        explicit SetRoomTagJob(const QString& userId, const QString& roomId,
+                               const QString& tag,
+                               Omittable<float> order = none);
     };
 
     /// Remove a tag from the room.
@@ -93,24 +94,25 @@ namespace QMatrixClient
     class DeleteRoomTagJob : public BaseJob
     {
         public:
-            /*! Remove a tag from the room.
-             * \param userId
-             *   The id of the user to remove a tag for. The access token must be
-             *   authorized to make requests for this user ID.
-             * \param roomId
-             *   The ID of the room to remove a tag from.
-             * \param tag
-             *   The tag to remove.
-             */
-            explicit DeleteRoomTagJob(const QString& userId, const QString& roomId, const QString& tag);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * DeleteRoomTagJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId, const QString& tag);
-
+        /*! Remove a tag from the room.
+         * \param userId
+         *   The id of the user to remove a tag for. The access token must be
+         *   authorized to make requests for this user ID.
+         * \param roomId
+         *   The ID of the room to remove a tag from.
+         * \param tag
+         *   The tag to remove.
+         */
+        explicit DeleteRoomTagJob(const QString& userId, const QString& roomId,
+                                  const QString& tag);
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * DeleteRoomTagJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId,
+                                   const QString& roomId, const QString& tag);
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/third_party_lookup.cpp b/lib/csapi/third_party_lookup.cpp
index 12cb7c59..339a0d90 100644
--- a/lib/csapi/third_party_lookup.cpp
+++ b/lib/csapi/third_party_lookup.cpp
@@ -15,21 +15,21 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class GetProtocolsJob::Private
 {
     public:
-        QHash<QString, ThirdPartyProtocol> data;
+    QHash<QString, ThirdPartyProtocol> data;
 };
 
 QUrl GetProtocolsJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/thirdparty/protocols");
+                                   basePath % "/thirdparty/protocols");
 }
 
 static const auto GetProtocolsJobName = QStringLiteral("GetProtocolsJob");
 
 GetProtocolsJob::GetProtocolsJob()
     : BaseJob(HttpVerb::Get, GetProtocolsJobName,
-        basePath % "/thirdparty/protocols")
-    , d(new Private)
+              basePath % "/thirdparty/protocols"),
+      d(new Private)
 {
 }
 
@@ -49,21 +49,23 @@ BaseJob::Status GetProtocolsJob::parseJson(const QJsonDocument& data)
 class GetProtocolMetadataJob::Private
 {
     public:
-        ThirdPartyProtocol data;
+    ThirdPartyProtocol data;
 };
 
-QUrl GetProtocolMetadataJob::makeRequestUrl(QUrl baseUrl, const QString& protocol)
+QUrl GetProtocolMetadataJob::makeRequestUrl(QUrl baseUrl,
+                                            const QString& protocol)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/thirdparty/protocol/" % protocol);
+    return BaseJob::makeRequestUrl(
+            std::move(baseUrl), basePath % "/thirdparty/protocol/" % protocol);
 }
 
-static const auto GetProtocolMetadataJobName = QStringLiteral("GetProtocolMetadataJob");
+static const auto GetProtocolMetadataJobName =
+        QStringLiteral("GetProtocolMetadataJob");
 
 GetProtocolMetadataJob::GetProtocolMetadataJob(const QString& protocol)
     : BaseJob(HttpVerb::Get, GetProtocolMetadataJobName,
-        basePath % "/thirdparty/protocol/" % protocol)
-    , d(new Private)
+              basePath % "/thirdparty/protocol/" % protocol),
+      d(new Private)
 {
 }
 
@@ -83,7 +85,7 @@ BaseJob::Status GetProtocolMetadataJob::parseJson(const QJsonDocument& data)
 class QueryLocationByProtocolJob::Private
 {
     public:
-        QVector<ThirdPartyLocation> data;
+    QVector<ThirdPartyLocation> data;
 };
 
 BaseJob::Query queryToQueryLocationByProtocol(const QString& searchFields)
@@ -93,20 +95,24 @@ BaseJob::Query queryToQueryLocationByProtocol(const QString& searchFields)
     return _q;
 }
 
-QUrl QueryLocationByProtocolJob::makeRequestUrl(QUrl baseUrl, const QString& protocol, const QString& searchFields)
+QUrl QueryLocationByProtocolJob::makeRequestUrl(QUrl baseUrl,
+                                                const QString& protocol,
+                                                const QString& searchFields)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/thirdparty/location/" % protocol,
+    return BaseJob::makeRequestUrl(
+            std::move(baseUrl), basePath % "/thirdparty/location/" % protocol,
             queryToQueryLocationByProtocol(searchFields));
 }
 
-static const auto QueryLocationByProtocolJobName = QStringLiteral("QueryLocationByProtocolJob");
+static const auto QueryLocationByProtocolJobName =
+        QStringLiteral("QueryLocationByProtocolJob");
 
-QueryLocationByProtocolJob::QueryLocationByProtocolJob(const QString& protocol, const QString& searchFields)
+QueryLocationByProtocolJob::QueryLocationByProtocolJob(
+        const QString& protocol, const QString& searchFields)
     : BaseJob(HttpVerb::Get, QueryLocationByProtocolJobName,
-        basePath % "/thirdparty/location/" % protocol,
-        queryToQueryLocationByProtocol(searchFields))
-    , d(new Private)
+              basePath % "/thirdparty/location/" % protocol,
+              queryToQueryLocationByProtocol(searchFields)),
+      d(new Private)
 {
 }
 
@@ -126,7 +132,7 @@ BaseJob::Status QueryLocationByProtocolJob::parseJson(const QJsonDocument& data)
 class QueryUserByProtocolJob::Private
 {
     public:
-        QVector<ThirdPartyUser> data;
+    QVector<ThirdPartyUser> data;
 };
 
 BaseJob::Query queryToQueryUserByProtocol(const QString& fields)
@@ -136,20 +142,24 @@ BaseJob::Query queryToQueryUserByProtocol(const QString& fields)
     return _q;
 }
 
-QUrl QueryUserByProtocolJob::makeRequestUrl(QUrl baseUrl, const QString& protocol, const QString& fields)
+QUrl QueryUserByProtocolJob::makeRequestUrl(QUrl baseUrl,
+                                            const QString& protocol,
+                                            const QString& fields)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/thirdparty/user/" % protocol,
-            queryToQueryUserByProtocol(fields));
+                                   basePath % "/thirdparty/user/" % protocol,
+                                   queryToQueryUserByProtocol(fields));
 }
 
-static const auto QueryUserByProtocolJobName = QStringLiteral("QueryUserByProtocolJob");
+static const auto QueryUserByProtocolJobName =
+        QStringLiteral("QueryUserByProtocolJob");
 
-QueryUserByProtocolJob::QueryUserByProtocolJob(const QString& protocol, const QString& fields)
+QueryUserByProtocolJob::QueryUserByProtocolJob(const QString& protocol,
+                                               const QString& fields)
     : BaseJob(HttpVerb::Get, QueryUserByProtocolJobName,
-        basePath % "/thirdparty/user/" % protocol,
-        queryToQueryUserByProtocol(fields))
-    , d(new Private)
+              basePath % "/thirdparty/user/" % protocol,
+              queryToQueryUserByProtocol(fields)),
+      d(new Private)
 {
 }
 
@@ -169,7 +179,7 @@ BaseJob::Status QueryUserByProtocolJob::parseJson(const QJsonDocument& data)
 class QueryLocationByAliasJob::Private
 {
     public:
-        QVector<ThirdPartyLocation> data;
+    QVector<ThirdPartyLocation> data;
 };
 
 BaseJob::Query queryToQueryLocationByAlias(const QString& alias)
@@ -182,17 +192,18 @@ BaseJob::Query queryToQueryLocationByAlias(const QString& alias)
 QUrl QueryLocationByAliasJob::makeRequestUrl(QUrl baseUrl, const QString& alias)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/thirdparty/location",
-            queryToQueryLocationByAlias(alias));
+                                   basePath % "/thirdparty/location",
+                                   queryToQueryLocationByAlias(alias));
 }
 
-static const auto QueryLocationByAliasJobName = QStringLiteral("QueryLocationByAliasJob");
+static const auto QueryLocationByAliasJobName =
+        QStringLiteral("QueryLocationByAliasJob");
 
 QueryLocationByAliasJob::QueryLocationByAliasJob(const QString& alias)
     : BaseJob(HttpVerb::Get, QueryLocationByAliasJobName,
-        basePath % "/thirdparty/location",
-        queryToQueryLocationByAlias(alias))
-    , d(new Private)
+              basePath % "/thirdparty/location",
+              queryToQueryLocationByAlias(alias)),
+      d(new Private)
 {
 }
 
@@ -212,7 +223,7 @@ BaseJob::Status QueryLocationByAliasJob::parseJson(const QJsonDocument& data)
 class QueryUserByIDJob::Private
 {
     public:
-        QVector<ThirdPartyUser> data;
+    QVector<ThirdPartyUser> data;
 };
 
 BaseJob::Query queryToQueryUserByID(const QString& userid)
@@ -225,17 +236,16 @@ BaseJob::Query queryToQueryUserByID(const QString& userid)
 QUrl QueryUserByIDJob::makeRequestUrl(QUrl baseUrl, const QString& userid)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/thirdparty/user",
-            queryToQueryUserByID(userid));
+                                   basePath % "/thirdparty/user",
+                                   queryToQueryUserByID(userid));
 }
 
 static const auto QueryUserByIDJobName = QStringLiteral("QueryUserByIDJob");
 
 QueryUserByIDJob::QueryUserByIDJob(const QString& userid)
     : BaseJob(HttpVerb::Get, QueryUserByIDJobName,
-        basePath % "/thirdparty/user",
-        queryToQueryUserByID(userid))
-    , d(new Private)
+              basePath % "/thirdparty/user", queryToQueryUserByID(userid)),
+      d(new Private)
 {
 }
 
@@ -251,4 +261,3 @@ BaseJob::Status QueryUserByIDJob::parseJson(const QJsonDocument& data)
     fromJson(data, d->data);
     return Success;
 }
-
diff --git a/lib/csapi/third_party_lookup.h b/lib/csapi/third_party_lookup.h
index 3a60432b..91bc79e5 100644
--- a/lib/csapi/third_party_lookup.h
+++ b/lib/csapi/third_party_lookup.h
@@ -6,15 +6,14 @@
 
 #include "jobs/basejob.h"
 
-#include "csapi/../application-service/definitions/user.h"
+#include "converters.h"
 #include "csapi/../application-service/definitions/location.h"
+#include "csapi/../application-service/definitions/protocol.h"
+#include "csapi/../application-service/definitions/user.h"
 #include <QtCore/QHash>
 #include <QtCore/QVector>
-#include "converters.h"
-#include "csapi/../application-service/definitions/protocol.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Retrieve metadata about all protocols that a homeserver supports.
@@ -25,64 +24,66 @@ namespace QMatrixClient
     class GetProtocolsJob : public BaseJob
     {
         public:
-            explicit GetProtocolsJob();
+        explicit GetProtocolsJob();
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetProtocolsJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetProtocolsJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl);
 
-            ~GetProtocolsJob() override;
+        ~GetProtocolsJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The protocols supported by the homeserver.
-            const QHash<QString, ThirdPartyProtocol>& data() const;
+        /// The protocols supported by the homeserver.
+        const QHash<QString, ThirdPartyProtocol>& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
-    /// Retrieve metadata about a specific protocol that the homeserver supports.
+    /// Retrieve metadata about a specific protocol that the homeserver
+    /// supports.
     ///
-    /// Fetches the metadata from the homeserver about a particular third party protocol.
+    /// Fetches the metadata from the homeserver about a particular third party
+    /// protocol.
     class GetProtocolMetadataJob : public BaseJob
     {
         public:
-            /*! Retrieve metadata about a specific protocol that the homeserver supports.
-             * \param protocol
-             *   The name of the protocol.
-             */
-            explicit GetProtocolMetadataJob(const QString& protocol);
+        /*! Retrieve metadata about a specific protocol that the homeserver supports.
+         * \param protocol
+         *   The name of the protocol.
+         */
+        explicit GetProtocolMetadataJob(const QString& protocol);
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetProtocolMetadataJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& protocol);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetProtocolMetadataJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& protocol);
 
-            ~GetProtocolMetadataJob() override;
+        ~GetProtocolMetadataJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The protocol was found and metadata returned.
-            const ThirdPartyProtocol& data() const;
+        /// The protocol was found and metadata returned.
+        const ThirdPartyProtocol& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Retrieve Matrix-side portals rooms leading to a third party location.
@@ -98,74 +99,79 @@ namespace QMatrixClient
     class QueryLocationByProtocolJob : public BaseJob
     {
         public:
-            /*! Retrieve Matrix-side portals rooms leading to a third party location.
-             * \param protocol
-             *   The protocol used to communicate to the third party network.
-             * \param searchFields
-             *   One or more custom fields to help identify the third party
-             *   location.
-             */
-            explicit QueryLocationByProtocolJob(const QString& protocol, const QString& searchFields = {});
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * QueryLocationByProtocolJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& protocol, const QString& searchFields = {});
-
-            ~QueryLocationByProtocolJob() override;
-
-            // Result properties
-
-            /// At least one portal room was found.
-            const QVector<ThirdPartyLocation>& data() const;
+        /*! Retrieve Matrix-side portals rooms leading to a third party location.
+         * \param protocol
+         *   The protocol used to communicate to the third party network.
+         * \param searchFields
+         *   One or more custom fields to help identify the third party
+         *   location.
+         */
+        explicit QueryLocationByProtocolJob(const QString& protocol,
+                                            const QString& searchFields = {});
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * QueryLocationByProtocolJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& protocol,
+                                   const QString& searchFields = {});
+
+        ~QueryLocationByProtocolJob() override;
+
+        // Result properties
+
+        /// At least one portal room was found.
+        const QVector<ThirdPartyLocation>& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Retrieve the Matrix User ID of a corresponding third party user.
     ///
-    /// Retrieve a Matrix User ID linked to a user on the third party service, given
-    /// a set of user parameters.
+    /// Retrieve a Matrix User ID linked to a user on the third party service,
+    /// given a set of user parameters.
     class QueryUserByProtocolJob : public BaseJob
     {
         public:
-            /*! Retrieve the Matrix User ID of a corresponding third party user.
-             * \param protocol
-             *   The name of the protocol.
-             * \param fields
-             *   One or more custom fields that are passed to the AS to help identify the user.
-             */
-            explicit QueryUserByProtocolJob(const QString& protocol, const QString& fields = {});
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * QueryUserByProtocolJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& protocol, const QString& fields = {});
-
-            ~QueryUserByProtocolJob() override;
-
-            // Result properties
-
-            /// The Matrix User IDs found with the given parameters.
-            const QVector<ThirdPartyUser>& data() const;
+        /*! Retrieve the Matrix User ID of a corresponding third party user.
+         * \param protocol
+         *   The name of the protocol.
+         * \param fields
+         *   One or more custom fields that are passed to the AS to help
+         * identify the user.
+         */
+        explicit QueryUserByProtocolJob(const QString& protocol,
+                                        const QString& fields = {});
+
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * QueryUserByProtocolJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& protocol,
+                                   const QString& fields = {});
+
+        ~QueryUserByProtocolJob() override;
+
+        // Result properties
+
+        /// The Matrix User IDs found with the given parameters.
+        const QVector<ThirdPartyUser>& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Reverse-lookup third party locations given a Matrix room alias.
@@ -175,33 +181,33 @@ namespace QMatrixClient
     class QueryLocationByAliasJob : public BaseJob
     {
         public:
-            /*! Reverse-lookup third party locations given a Matrix room alias.
-             * \param alias
-             *   The Matrix room alias to look up.
-             */
-            explicit QueryLocationByAliasJob(const QString& alias);
+        /*! Reverse-lookup third party locations given a Matrix room alias.
+         * \param alias
+         *   The Matrix room alias to look up.
+         */
+        explicit QueryLocationByAliasJob(const QString& alias);
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * QueryLocationByAliasJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& alias);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * QueryLocationByAliasJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& alias);
 
-            ~QueryLocationByAliasJob() override;
+        ~QueryLocationByAliasJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// All found third party locations.
-            const QVector<ThirdPartyLocation>& data() const;
+        /// All found third party locations.
+        const QVector<ThirdPartyLocation>& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     /// Reverse-lookup third party users given a Matrix User ID.
@@ -210,32 +216,32 @@ namespace QMatrixClient
     class QueryUserByIDJob : public BaseJob
     {
         public:
-            /*! Reverse-lookup third party users given a Matrix User ID.
-             * \param userid
-             *   The Matrix User ID to look up.
-             */
-            explicit QueryUserByIDJob(const QString& userid);
+        /*! Reverse-lookup third party users given a Matrix User ID.
+         * \param userid
+         *   The Matrix User ID to look up.
+         */
+        explicit QueryUserByIDJob(const QString& userid);
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * QueryUserByIDJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& userid);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * QueryUserByIDJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& userid);
 
-            ~QueryUserByIDJob() override;
+        ~QueryUserByIDJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// An array of third party users.
-            const QVector<ThirdPartyUser>& data() const;
+        /// An array of third party users.
+        const QVector<ThirdPartyUser>& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/third_party_membership.cpp b/lib/csapi/third_party_membership.cpp
index c1683338..9fe702aa 100644
--- a/lib/csapi/third_party_membership.cpp
+++ b/lib/csapi/third_party_membership.cpp
@@ -14,9 +14,10 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 static const auto InviteBy3PIDJobName = QStringLiteral("InviteBy3PIDJob");
 
-InviteBy3PIDJob::InviteBy3PIDJob(const QString& roomId, const QString& idServer, const QString& medium, const QString& address)
+InviteBy3PIDJob::InviteBy3PIDJob(const QString& roomId, const QString& idServer,
+                                 const QString& medium, const QString& address)
     : BaseJob(HttpVerb::Post, InviteBy3PIDJobName,
-        basePath % "/rooms/" % roomId % "/invite")
+              basePath % "/rooms/" % roomId % "/invite")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("id_server"), idServer);
@@ -24,4 +25,3 @@ InviteBy3PIDJob::InviteBy3PIDJob(const QString& roomId, const QString& idServer,
     addParam<>(_data, QStringLiteral("address"), address);
     setRequestData(_data);
 }
-
diff --git a/lib/csapi/third_party_membership.h b/lib/csapi/third_party_membership.h
index d18fe554..d1261567 100644
--- a/lib/csapi/third_party_membership.h
+++ b/lib/csapi/third_party_membership.h
@@ -6,33 +6,31 @@
 
 #include "jobs/basejob.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Invite a user to participate in a particular room.
     ///
     /// .. _invite-by-third-party-id-endpoint:
-    /// 
-    /// *Note that there are two forms of this API, which are documented separately.
-    /// This version of the API does not require that the inviter know the Matrix
-    /// identifier of the invitee, and instead relies on third party identifiers.
-    /// The homeserver uses an identity server to perform the mapping from
-    /// third party identifier to a Matrix identifier. The other is documented in the*
-    /// `joining rooms section`_.
-    /// 
+    ///
+    /// *Note that there are two forms of this API, which are documented
+    /// separately. This version of the API does not require that the inviter
+    /// know the Matrix identifier of the invitee, and instead relies on third
+    /// party identifiers. The homeserver uses an identity server to perform the
+    /// mapping from third party identifier to a Matrix identifier. The other is
+    /// documented in the* `joining rooms section`_.
+    ///
     /// This API invites a user to participate in a particular room.
     /// They do not start participating in the room until they actually join the
     /// room.
-    /// 
+    ///
     /// Only users currently in a particular room can invite other users to
     /// join that room.
-    /// 
+    ///
     /// If the identity server did know the Matrix user identifier for the
     /// third party identifier, the homeserver will append a ``m.room.member``
     /// event to the room.
-    /// 
+    ///
     /// If the identity server does not know a Matrix user identifier for the
     /// passed third party identifier, the homeserver will issue an invitation
     /// which can be accepted upon providing proof of ownership of the third
@@ -40,36 +38,37 @@ namespace QMatrixClient
     /// token, which it gives to the inviting homeserver. The homeserver will
     /// add an ``m.room.third_party_invite`` event into the graph for the room,
     /// containing that token.
-    /// 
+    ///
     /// When the invitee binds the invited third party identifier to a Matrix
     /// user ID, the identity server will give the user a list of pending
     /// invitations, each containing:
-    /// 
+    ///
     /// - The room ID to which they were invited
-    /// 
+    ///
     /// - The token given to the homeserver
-    /// 
-    /// - A signature of the token, signed with the identity server's private key
-    /// 
+    ///
+    /// - A signature of the token, signed with the identity server's private
+    /// key
+    ///
     /// - The matrix user ID who invited them to the room
-    /// 
+    ///
     /// If a token is requested from the identity server, the homeserver will
     /// append a ``m.room.third_party_invite`` event to the room.
-    /// 
+    ///
     /// .. _joining rooms section: `invite-by-user-id-endpoint`_
     class InviteBy3PIDJob : public BaseJob
     {
         public:
-            /*! Invite a user to participate in a particular room.
-             * \param roomId
-             *   The room identifier (not alias) to which to invite the user.
-             * \param idServer
-             *   The hostname+port of the identity server which should be used for third party identifier lookups.
-             * \param medium
-             *   The kind of address being passed in the address field, for example ``email``.
-             * \param address
-             *   The invitee's third party identifier.
-             */
-            explicit InviteBy3PIDJob(const QString& roomId, const QString& idServer, const QString& medium, const QString& address);
+        /*! Invite a user to participate in a particular room.
+         * \param roomId
+         *   The room identifier (not alias) to which to invite the user.
+         * \param idServer
+         *   The hostname+port of the identity server which should be used for
+         * third party identifier lookups. \param medium The kind of address
+         * being passed in the address field, for example ``email``. \param
+         * address The invitee's third party identifier.
+         */
+        explicit InviteBy3PIDJob(const QString& roomId, const QString& idServer,
+                                 const QString& medium, const QString& address);
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/to_device.cpp b/lib/csapi/to_device.cpp
index 7c7f495a..241869f3 100644
--- a/lib/csapi/to_device.cpp
+++ b/lib/csapi/to_device.cpp
@@ -14,12 +14,13 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 static const auto SendToDeviceJobName = QStringLiteral("SendToDeviceJob");
 
-SendToDeviceJob::SendToDeviceJob(const QString& eventType, const QString& txnId, const QHash<QString, QHash<QString, QJsonObject>>& messages)
+SendToDeviceJob::SendToDeviceJob(
+        const QString& eventType, const QString& txnId,
+        const QHash<QString, QHash<QString, QJsonObject>>& messages)
     : BaseJob(HttpVerb::Put, SendToDeviceJobName,
-        basePath % "/sendToDevice/" % eventType % "/" % txnId)
+              basePath % "/sendToDevice/" % eventType % "/" % txnId)
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("messages"), messages);
     setRequestData(_data);
 }
-
diff --git a/lib/csapi/to_device.h b/lib/csapi/to_device.h
index 10f6b971..83df13b7 100644
--- a/lib/csapi/to_device.h
+++ b/lib/csapi/to_device.h
@@ -6,11 +6,10 @@
 
 #include "jobs/basejob.h"
 
-#include <QtCore/QJsonObject>
 #include <QtCore/QHash>
+#include <QtCore/QJsonObject>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Send an event to a given set of devices.
@@ -20,18 +19,21 @@ namespace QMatrixClient
     class SendToDeviceJob : public BaseJob
     {
         public:
-            /*! Send an event to a given set of devices.
-             * \param eventType
-             *   The type of event to send.
-             * \param txnId
-             *   The transaction ID for this event. Clients should generate an
-             *   ID unique across requests with the same access token; it will be
-             *   used by the server to ensure idempotency of requests.
-             * \param messages
-             *   The messages to send. A map from user ID, to a map from
-             *   device ID to message body. The device ID may also be `*`,
-             *   meaning all known devices for the user.
-             */
-            explicit SendToDeviceJob(const QString& eventType, const QString& txnId, const QHash<QString, QHash<QString, QJsonObject>>& messages = {});
+        /*! Send an event to a given set of devices.
+         * \param eventType
+         *   The type of event to send.
+         * \param txnId
+         *   The transaction ID for this event. Clients should generate an
+         *   ID unique across requests with the same access token; it will be
+         *   used by the server to ensure idempotency of requests.
+         * \param messages
+         *   The messages to send. A map from user ID, to a map from
+         *   device ID to message body. The device ID may also be `*`,
+         *   meaning all known devices for the user.
+         */
+        explicit SendToDeviceJob(
+                const QString& eventType, const QString& txnId,
+                const QHash<QString, QHash<QString, QJsonObject>>&
+                        messages = {});
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/typing.cpp b/lib/csapi/typing.cpp
index bf10912b..03499c76 100644
--- a/lib/csapi/typing.cpp
+++ b/lib/csapi/typing.cpp
@@ -14,13 +14,13 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 static const auto SetTypingJobName = QStringLiteral("SetTypingJob");
 
-SetTypingJob::SetTypingJob(const QString& userId, const QString& roomId, bool typing, Omittable<int> timeout)
+SetTypingJob::SetTypingJob(const QString& userId, const QString& roomId,
+                           bool typing, Omittable<int> timeout)
     : BaseJob(HttpVerb::Put, SetTypingJobName,
-        basePath % "/rooms/" % roomId % "/typing/" % userId)
+              basePath % "/rooms/" % roomId % "/typing/" % userId)
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("typing"), typing);
     addParam<IfNotEmpty>(_data, QStringLiteral("timeout"), timeout);
     setRequestData(_data);
 }
-
diff --git a/lib/csapi/typing.h b/lib/csapi/typing.h
index c6201440..1f32a8e5 100644
--- a/lib/csapi/typing.h
+++ b/lib/csapi/typing.h
@@ -8,8 +8,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Informs the server that the user has started or stopped typing.
@@ -21,17 +20,18 @@ namespace QMatrixClient
     class SetTypingJob : public BaseJob
     {
         public:
-            /*! Informs the server that the user has started or stopped typing.
-             * \param userId
-             *   The user who has started to type.
-             * \param roomId
-             *   The room in which the user is typing.
-             * \param typing
-             *   Whether the user is typing or not. If ``false``, the ``timeout``
-             *   key can be omitted.
-             * \param timeout
-             *   The length of time in milliseconds to mark this user as typing.
-             */
-            explicit SetTypingJob(const QString& userId, const QString& roomId, bool typing, Omittable<int> timeout = none);
+        /*! Informs the server that the user has started or stopped typing.
+         * \param userId
+         *   The user who has started to type.
+         * \param roomId
+         *   The room in which the user is typing.
+         * \param typing
+         *   Whether the user is typing or not. If ``false``, the ``timeout``
+         *   key can be omitted.
+         * \param timeout
+         *   The length of time in milliseconds to mark this user as typing.
+         */
+        explicit SetTypingJob(const QString& userId, const QString& roomId,
+                              bool typing, Omittable<int> timeout = none);
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/users.cpp b/lib/csapi/users.cpp
index 97d8962d..6d005915 100644
--- a/lib/csapi/users.cpp
+++ b/lib/csapi/users.cpp
@@ -12,13 +12,12 @@ using namespace QMatrixClient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<SearchUserDirectoryJob::User>
-    {
-        static void fillFrom(const QJsonObject& jo, SearchUserDirectoryJob::User& result)
+    template <> struct JsonObjectConverter<SearchUserDirectoryJob::User> {
+        static void fillFrom(const QJsonObject& jo,
+                             SearchUserDirectoryJob::User& result)
         {
             fromJson(jo.value("user_id"_ls), result.userId);
             fromJson(jo.value("display_name"_ls), result.displayName);
@@ -30,16 +29,18 @@ namespace QMatrixClient
 class SearchUserDirectoryJob::Private
 {
     public:
-        QVector<User> results;
-        bool limited;
+    QVector<User> results;
+    bool limited;
 };
 
-static const auto SearchUserDirectoryJobName = QStringLiteral("SearchUserDirectoryJob");
+static const auto SearchUserDirectoryJobName =
+        QStringLiteral("SearchUserDirectoryJob");
 
-SearchUserDirectoryJob::SearchUserDirectoryJob(const QString& searchTerm, Omittable<int> limit)
+SearchUserDirectoryJob::SearchUserDirectoryJob(const QString& searchTerm,
+                                               Omittable<int> limit)
     : BaseJob(HttpVerb::Post, SearchUserDirectoryJobName,
-        basePath % "/user_directory/search")
-    , d(new Private)
+              basePath % "/user_directory/search"),
+      d(new Private)
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("search_term"), searchTerm);
@@ -49,27 +50,24 @@ SearchUserDirectoryJob::SearchUserDirectoryJob(const QString& searchTerm, Omitta
 
 SearchUserDirectoryJob::~SearchUserDirectoryJob() = default;
 
-const QVector<SearchUserDirectoryJob::User>& SearchUserDirectoryJob::results() const
+const QVector<SearchUserDirectoryJob::User>&
+SearchUserDirectoryJob::results() const
 {
     return d->results;
 }
 
-bool SearchUserDirectoryJob::limited() const
-{
-    return d->limited;
-}
+bool SearchUserDirectoryJob::limited() const { return d->limited; }
 
 BaseJob::Status SearchUserDirectoryJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("results"_ls))
         return { JsonParseError,
-            "The key 'results' not found in the response" };
+                 "The key 'results' not found in the response" };
     fromJson(json.value("results"_ls), d->results);
     if (!json.contains("limited"_ls))
         return { JsonParseError,
-            "The key 'limited' not found in the response" };
+                 "The key 'limited' not found in the response" };
     fromJson(json.value("limited"_ls), d->limited);
     return Success;
 }
-
diff --git a/lib/csapi/users.h b/lib/csapi/users.h
index 1e355b8f..7754b82a 100644
--- a/lib/csapi/users.h
+++ b/lib/csapi/users.h
@@ -6,11 +6,10 @@
 
 #include "jobs/basejob.h"
 
-#include <QtCore/QVector>
 #include "converters.h"
+#include <QtCore/QVector>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Searches the user directory.
@@ -18,61 +17,61 @@ namespace QMatrixClient
     /// Performs a search for users on the homeserver. The homeserver may
     /// determine which subset of users are searched, however the homeserver
     /// MUST at a minimum consider the users the requesting user shares a
-    /// room with and those who reside in public rooms (known to the homeserver).
-    /// The search MUST consider local users to the homeserver, and SHOULD
-    /// query remote users as part of the search.
-    /// 
+    /// room with and those who reside in public rooms (known to the
+    /// homeserver). The search MUST consider local users to the homeserver, and
+    /// SHOULD query remote users as part of the search.
+    ///
     /// The search is performed case-insensitively on user IDs and display
-    /// names preferably using a collation determined based upon the 
+    /// names preferably using a collation determined based upon the
     /// ``Accept-Language`` header provided in the request, if present.
     class SearchUserDirectoryJob : public BaseJob
     {
         public:
-            // Inner data structures
+        // Inner data structures
 
-            /// Performs a search for users on the homeserver. The homeserver may
-            /// determine which subset of users are searched, however the homeserver
-            /// MUST at a minimum consider the users the requesting user shares a
-            /// room with and those who reside in public rooms (known to the homeserver).
-            /// The search MUST consider local users to the homeserver, and SHOULD
-            /// query remote users as part of the search.
-            /// 
-            /// The search is performed case-insensitively on user IDs and display
-            /// names preferably using a collation determined based upon the 
-            /// ``Accept-Language`` header provided in the request, if present.
-            struct User
-            {
-                /// The user's matrix user ID.
-                QString userId;
-                /// The display name of the user, if one exists.
-                QString displayName;
-                /// The avatar url, as an MXC, if one exists.
-                QString avatarUrl;
-            };
+        /// Performs a search for users on the homeserver. The homeserver may
+        /// determine which subset of users are searched, however the homeserver
+        /// MUST at a minimum consider the users the requesting user shares a
+        /// room with and those who reside in public rooms (known to the
+        /// homeserver). The search MUST consider local users to the homeserver,
+        /// and SHOULD query remote users as part of the search.
+        ///
+        /// The search is performed case-insensitively on user IDs and display
+        /// names preferably using a collation determined based upon the
+        /// ``Accept-Language`` header provided in the request, if present.
+        struct User {
+            /// The user's matrix user ID.
+            QString userId;
+            /// The display name of the user, if one exists.
+            QString displayName;
+            /// The avatar url, as an MXC, if one exists.
+            QString avatarUrl;
+        };
 
-            // Construction/destruction
+        // Construction/destruction
 
-            /*! Searches the user directory.
-             * \param searchTerm
-             *   The term to search for
-             * \param limit
-             *   The maximum number of results to return. Defaults to 10.
-             */
-            explicit SearchUserDirectoryJob(const QString& searchTerm, Omittable<int> limit = none);
-            ~SearchUserDirectoryJob() override;
+        /*! Searches the user directory.
+         * \param searchTerm
+         *   The term to search for
+         * \param limit
+         *   The maximum number of results to return. Defaults to 10.
+         */
+        explicit SearchUserDirectoryJob(const QString& searchTerm,
+                                        Omittable<int> limit = none);
+        ~SearchUserDirectoryJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// Ordered by rank and then whether or not profile info is available.
-            const QVector<User>& results() const;
-            /// Indicates if the result list has been truncated by the limit.
-            bool limited() const;
+        /// Ordered by rank and then whether or not profile info is available.
+        const QVector<User>& results() const;
+        /// Indicates if the result list has been truncated by the limit.
+        bool limited() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/versions.cpp b/lib/csapi/versions.cpp
index 6ee6725d..13e3be15 100644
--- a/lib/csapi/versions.cpp
+++ b/lib/csapi/versions.cpp
@@ -15,31 +15,26 @@ static const auto basePath = QStringLiteral("/_matrix/client");
 class GetVersionsJob::Private
 {
     public:
-        QStringList versions;
-        QHash<QString, bool> unstableFeatures;
+    QStringList versions;
+    QHash<QString, bool> unstableFeatures;
 };
 
 QUrl GetVersionsJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/versions");
+    return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/versions");
 }
 
 static const auto GetVersionsJobName = QStringLiteral("GetVersionsJob");
 
 GetVersionsJob::GetVersionsJob()
-    : BaseJob(HttpVerb::Get, GetVersionsJobName,
-        basePath % "/versions", false)
-    , d(new Private)
+    : BaseJob(HttpVerb::Get, GetVersionsJobName, basePath % "/versions", false),
+      d(new Private)
 {
 }
 
 GetVersionsJob::~GetVersionsJob() = default;
 
-const QStringList& GetVersionsJob::versions() const
-{
-    return d->versions;
-}
+const QStringList& GetVersionsJob::versions() const { return d->versions; }
 
 const QHash<QString, bool>& GetVersionsJob::unstableFeatures() const
 {
@@ -51,9 +46,8 @@ BaseJob::Status GetVersionsJob::parseJson(const QJsonDocument& data)
     auto json = data.object();
     if (!json.contains("versions"_ls))
         return { JsonParseError,
-            "The key 'versions' not found in the response" };
+                 "The key 'versions' not found in the response" };
     fromJson(json.value("versions"_ls), d->versions);
     fromJson(json.value("unstable_features"_ls), d->unstableFeatures);
     return Success;
 }
-
diff --git a/lib/csapi/versions.h b/lib/csapi/versions.h
index b56f293f..d017708a 100644
--- a/lib/csapi/versions.h
+++ b/lib/csapi/versions.h
@@ -6,22 +6,22 @@
 
 #include "jobs/basejob.h"
 
-#include <QtCore/QHash>
 #include "converters.h"
+#include <QtCore/QHash>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Gets the versions of the specification supported by the server.
     ///
     /// Gets the versions of the specification supported by the server.
-    /// 
+    ///
     /// Values will take the form ``rX.Y.Z``.
-    /// 
-    /// Only the latest ``Z`` value will be reported for each supported ``X.Y`` value.
-    /// i.e. if the server implements ``r0.0.0``, ``r0.0.1``, and ``r1.2.0``, it will report ``r0.0.1`` and ``r1.2.0``.
-    /// 
+    ///
+    /// Only the latest ``Z`` value will be reported for each supported ``X.Y``
+    /// value. i.e. if the server implements ``r0.0.0``, ``r0.0.1``, and
+    /// ``r1.2.0``, it will report ``r0.0.1`` and ``r1.2.0``.
+    ///
     /// The server may additionally advertise experimental features it supports
     /// through ``unstable_features``. These features should be namespaced and
     /// may optionally include version information within their name if desired.
@@ -37,32 +37,32 @@ namespace QMatrixClient
     class GetVersionsJob : public BaseJob
     {
         public:
-            explicit GetVersionsJob();
+        explicit GetVersionsJob();
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetVersionsJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetVersionsJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl);
 
-            ~GetVersionsJob() override;
+        ~GetVersionsJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The supported versions.
-            const QStringList& versions() const;
-            /// Experimental features the server supports. Features not listed here,
-            /// or the lack of this property all together, indicate that a feature is
-            /// not supported.
-            const QHash<QString, bool>& unstableFeatures() const;
+        /// The supported versions.
+        const QStringList& versions() const;
+        /// Experimental features the server supports. Features not listed here,
+        /// or the lack of this property all together, indicate that a feature
+        /// is not supported.
+        const QHash<QString, bool>& unstableFeatures() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/voip.cpp b/lib/csapi/voip.cpp
index e8158723..ee511906 100644
--- a/lib/csapi/voip.cpp
+++ b/lib/csapi/voip.cpp
@@ -15,34 +15,30 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class GetTurnServerJob::Private
 {
     public:
-        QJsonObject data;
+    QJsonObject data;
 };
 
 QUrl GetTurnServerJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/voip/turnServer");
+                                   basePath % "/voip/turnServer");
 }
 
 static const auto GetTurnServerJobName = QStringLiteral("GetTurnServerJob");
 
 GetTurnServerJob::GetTurnServerJob()
     : BaseJob(HttpVerb::Get, GetTurnServerJobName,
-        basePath % "/voip/turnServer")
-    , d(new Private)
+              basePath % "/voip/turnServer"),
+      d(new Private)
 {
 }
 
 GetTurnServerJob::~GetTurnServerJob() = default;
 
-const QJsonObject& GetTurnServerJob::data() const
-{
-    return d->data;
-}
+const QJsonObject& GetTurnServerJob::data() const { return d->data; }
 
 BaseJob::Status GetTurnServerJob::parseJson(const QJsonDocument& data)
 {
     fromJson(data, d->data);
     return Success;
 }
-
diff --git a/lib/csapi/voip.h b/lib/csapi/voip.h
index bb858499..3b011651 100644
--- a/lib/csapi/voip.h
+++ b/lib/csapi/voip.h
@@ -8,8 +8,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Obtain TURN server credentials.
@@ -19,28 +18,28 @@ namespace QMatrixClient
     class GetTurnServerJob : public BaseJob
     {
         public:
-            explicit GetTurnServerJob();
+        explicit GetTurnServerJob();
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetTurnServerJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetTurnServerJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl);
 
-            ~GetTurnServerJob() override;
+        ~GetTurnServerJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The TURN server credentials.
-            const QJsonObject& data() const;
+        /// The TURN server credentials.
+        const QJsonObject& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/wellknown.cpp b/lib/csapi/wellknown.cpp
index a6107f86..8543c519 100644
--- a/lib/csapi/wellknown.cpp
+++ b/lib/csapi/wellknown.cpp
@@ -15,34 +15,30 @@ static const auto basePath = QStringLiteral("/.well-known");
 class GetWellknownJob::Private
 {
     public:
-        DiscoveryInformation data;
+    DiscoveryInformation data;
 };
 
 QUrl GetWellknownJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/matrix/client");
+                                   basePath % "/matrix/client");
 }
 
 static const auto GetWellknownJobName = QStringLiteral("GetWellknownJob");
 
 GetWellknownJob::GetWellknownJob()
-    : BaseJob(HttpVerb::Get, GetWellknownJobName,
-        basePath % "/matrix/client", false)
-    , d(new Private)
+    : BaseJob(HttpVerb::Get, GetWellknownJobName, basePath % "/matrix/client",
+              false),
+      d(new Private)
 {
 }
 
 GetWellknownJob::~GetWellknownJob() = default;
 
-const DiscoveryInformation& GetWellknownJob::data() const
-{
-    return d->data;
-}
+const DiscoveryInformation& GetWellknownJob::data() const { return d->data; }
 
 BaseJob::Status GetWellknownJob::parseJson(const QJsonDocument& data)
 {
     fromJson(data, d->data);
     return Success;
 }
-
diff --git a/lib/csapi/wellknown.h b/lib/csapi/wellknown.h
index 8da9ce9f..1df524ce 100644
--- a/lib/csapi/wellknown.h
+++ b/lib/csapi/wellknown.h
@@ -6,11 +6,10 @@
 
 #include "jobs/basejob.h"
 
-#include "csapi/definitions/wellknown/full.h"
 #include "converters.h"
+#include "csapi/definitions/wellknown/full.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Gets Matrix server discovery information about the domain.
@@ -20,34 +19,34 @@ namespace QMatrixClient
     /// e.g. ``com.example.myapp.property``. This ensures property names are
     /// suitably namespaced for each application and reduces the risk of
     /// clashes.
-    /// 
+    ///
     /// Note that this endpoint is not necessarily handled by the homeserver,
     /// but by another webserver, to be used for discovering the homeserver URL.
     class GetWellknownJob : public BaseJob
     {
         public:
-            explicit GetWellknownJob();
+        explicit GetWellknownJob();
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetWellknownJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetWellknownJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl);
 
-            ~GetWellknownJob() override;
+        ~GetWellknownJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// Server discovery information.
-            const DiscoveryInformation& data() const;
+        /// Server discovery information.
+        const DiscoveryInformation& data() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/whoami.cpp b/lib/csapi/whoami.cpp
index aebdf5d3..f0a77aee 100644
--- a/lib/csapi/whoami.cpp
+++ b/lib/csapi/whoami.cpp
@@ -15,38 +15,34 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 class GetTokenOwnerJob::Private
 {
     public:
-        QString userId;
+    QString userId;
 };
 
 QUrl GetTokenOwnerJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/account/whoami");
+                                   basePath % "/account/whoami");
 }
 
 static const auto GetTokenOwnerJobName = QStringLiteral("GetTokenOwnerJob");
 
 GetTokenOwnerJob::GetTokenOwnerJob()
     : BaseJob(HttpVerb::Get, GetTokenOwnerJobName,
-        basePath % "/account/whoami")
-    , d(new Private)
+              basePath % "/account/whoami"),
+      d(new Private)
 {
 }
 
 GetTokenOwnerJob::~GetTokenOwnerJob() = default;
 
-const QString& GetTokenOwnerJob::userId() const
-{
-    return d->userId;
-}
+const QString& GetTokenOwnerJob::userId() const { return d->userId; }
 
 BaseJob::Status GetTokenOwnerJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("user_id"_ls))
         return { JsonParseError,
-            "The key 'user_id' not found in the response" };
+                 "The key 'user_id' not found in the response" };
     fromJson(json.value("user_id"_ls), d->userId);
     return Success;
 }
-
diff --git a/lib/csapi/whoami.h b/lib/csapi/whoami.h
index 71e9d532..8f191351 100644
--- a/lib/csapi/whoami.h
+++ b/lib/csapi/whoami.h
@@ -6,46 +6,44 @@
 
 #include "jobs/basejob.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Operations
 
     /// Gets information about the owner of an access token.
     ///
-    /// Gets information about the owner of a given access token. 
-    /// 
-    /// Note that, as with the rest of the Client-Server API, 
-    /// Application Services may masquerade as users within their 
-    /// namespace by giving a ``user_id`` query parameter. In this 
+    /// Gets information about the owner of a given access token.
+    ///
+    /// Note that, as with the rest of the Client-Server API,
+    /// Application Services may masquerade as users within their
+    /// namespace by giving a ``user_id`` query parameter. In this
     /// situation, the server should verify that the given ``user_id``
-    /// is registered by the appservice, and return it in the response 
+    /// is registered by the appservice, and return it in the response
     /// body.
     class GetTokenOwnerJob : public BaseJob
     {
         public:
-            explicit GetTokenOwnerJob();
+        explicit GetTokenOwnerJob();
 
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetTokenOwnerJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl);
+        /*! Construct a URL without creating a full-fledged job object
+         *
+         * This function can be used when a URL for
+         * GetTokenOwnerJob is necessary but the job
+         * itself isn't.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl);
 
-            ~GetTokenOwnerJob() override;
+        ~GetTokenOwnerJob() override;
 
-            // Result properties
+        // Result properties
 
-            /// The user id that owns the access token.
-            const QString& userId() const;
+        /// The user id that owns the access token.
+        const QString& userId() const;
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/eventitem.cpp b/lib/eventitem.cpp
index 8ec3fe48..f3f18854 100644
--- a/lib/eventitem.cpp
+++ b/lib/eventitem.cpp
@@ -13,13 +13,13 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "eventitem.h"
 
-#include "events/roommessageevent.h"
 #include "events/roomavatarevent.h"
+#include "events/roommessageevent.h"
 
 using namespace QMatrixClient;
 
@@ -27,17 +27,15 @@ void PendingEventItem::setFileUploaded(const QUrl& remoteUrl)
 {
     // TODO: eventually we might introduce hasFileContent to RoomEvent,
     // and unify the code below.
-    if (auto* rme = getAs<RoomMessageEvent>())
-    {
+    if (auto* rme = getAs<RoomMessageEvent>()) {
         Q_ASSERT(rme->hasFileContent());
-        rme->editContent([remoteUrl] (EventContent::TypedBase& ec) {
+        rme->editContent([remoteUrl](EventContent::TypedBase& ec) {
             ec.fileInfo()->url = remoteUrl;
         });
     }
-    if (auto* rae = getAs<RoomAvatarEvent>())
-    {
+    if (auto* rae = getAs<RoomAvatarEvent>()) {
         Q_ASSERT(rae->content().fileInfo());
-        rae->editContent([remoteUrl] (EventContent::FileInfo& fi) {
+        rae->editContent([remoteUrl](EventContent::FileInfo& fi) {
             fi.url = remoteUrl;
         });
     }
diff --git a/lib/eventitem.h b/lib/eventitem.h
index 36ed2132..8b863d67 100644
--- a/lib/eventitem.h
+++ b/lib/eventitem.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
@@ -22,87 +22,92 @@
 
 #include <utility>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     class StateEventBase;
 
     class EventStatus
     {
-            Q_GADGET
+        Q_GADGET
         public:
-            /** Special marks an event can assume
-             *
-             * This is used to hint at a special status of some events in UI.
-             * All values except Redacted and Hidden are mutually exclusive.
-             */
-            enum Code {
-                Normal = 0x0,         //< No special designation
-                Submitted = 0x01,     //< The event has just been submitted for sending
-                FileUploaded = 0x02,  //< The file attached to the event has been uploaded to the server
-                Departed = 0x03,      //< The event has left the client
-                ReachedServer = 0x04, //< The server has received the event
-                SendingFailed = 0x05, //< The server could not receive the event
-                Redacted = 0x08,      //< The event has been redacted
-                Hidden = 0x10,        //< The event should not be shown in the timeline
-            };
-            Q_DECLARE_FLAGS(Status, Code)
-            Q_FLAG(Status)
+        /** Special marks an event can assume
+         *
+         * This is used to hint at a special status of some events in UI.
+         * All values except Redacted and Hidden are mutually exclusive.
+         */
+        enum Code {
+            Normal = 0x0, //< No special designation
+            Submitted = 0x01, //< The event has just been submitted for sending
+            FileUploaded = 0x02, //< The file attached to the event has been
+                                 //uploaded to the server
+            Departed = 0x03, //< The event has left the client
+            ReachedServer = 0x04, //< The server has received the event
+            SendingFailed = 0x05, //< The server could not receive the event
+            Redacted = 0x08, //< The event has been redacted
+            Hidden = 0x10, //< The event should not be shown in the timeline
+        };
+        Q_DECLARE_FLAGS(Status, Code)
+        Q_FLAG(Status)
     };
 
     class EventItemBase
     {
         public:
-            explicit EventItemBase(RoomEventPtr&& e)
-                : evt(std::move(e))
-            {
-                Q_ASSERT(evt);
-            }
-
-            const RoomEvent* event() const { return rawPtr(evt); }
-            const RoomEvent* get() const { return event(); }
-            template <typename EventT>
-            const EventT* viewAs() const { return eventCast<const EventT>(evt); }
-            const RoomEventPtr& operator->() const { return evt; }
-            const RoomEvent& operator*() const { return *evt; }
-
-            // Used for event redaction
-            RoomEventPtr replaceEvent(RoomEventPtr&& other)
-            {
-                return std::exchange(evt, move(other));
-            }
+        explicit EventItemBase(RoomEventPtr&& e) : evt(std::move(e))
+        {
+            Q_ASSERT(evt);
+        }
+
+        const RoomEvent* event() const { return rawPtr(evt); }
+        const RoomEvent* get() const { return event(); }
+        template <typename EventT> const EventT* viewAs() const
+        {
+            return eventCast<const EventT>(evt);
+        }
+        const RoomEventPtr& operator->() const { return evt; }
+        const RoomEvent& operator*() const { return *evt; }
+
+        // Used for event redaction
+        RoomEventPtr replaceEvent(RoomEventPtr&& other)
+        {
+            return std::exchange(evt, move(other));
+        }
 
         protected:
-            template <typename EventT>
-            EventT* getAs() { return eventCast<EventT>(evt); }
+        template <typename EventT> EventT* getAs()
+        {
+            return eventCast<EventT>(evt);
+        }
+
         private:
-            RoomEventPtr evt;
+        RoomEventPtr evt;
     };
 
     class TimelineItem : public EventItemBase
     {
         public:
-            // For compatibility with Qt containers, even though we use
-            // a std:: container now for the room timeline
-            using index_t = int;
+        // For compatibility with Qt containers, even though we use
+        // a std:: container now for the room timeline
+        using index_t = int;
 
-            TimelineItem(RoomEventPtr&& e, index_t number)
-                : EventItemBase(std::move(e)), idx(number)
-            { }
+        TimelineItem(RoomEventPtr&& e, index_t number)
+            : EventItemBase(std::move(e)), idx(number)
+        {
+        }
 
-            index_t index() const { return idx; }
+        index_t index() const { return idx; }
 
         private:
-            index_t idx;
+        index_t idx;
     };
 
-    template<>
+    template <>
     inline const StateEventBase* EventItemBase::viewAs<StateEventBase>() const
     {
         return evt->isStateEvent() ? weakPtrCast<const StateEventBase>(evt)
                                    : nullptr;
     }
 
-    template<>
+    template <>
     inline const CallEventBase* EventItemBase::viewAs<CallEventBase>() const
     {
         return evt->isCallEvent() ? weakPtrCast<const CallEventBase>(evt)
@@ -111,39 +116,39 @@ namespace QMatrixClient
 
     class PendingEventItem : public EventItemBase
     {
-            Q_GADGET
+        Q_GADGET
         public:
-            using EventItemBase::EventItemBase;
-
-            EventStatus::Code deliveryStatus() const { return _status; }
-            QDateTime lastUpdated() const { return _lastUpdated; }
-            QString annotation() const { return _annotation; }
-
-            void setDeparted() { setStatus(EventStatus::Departed); }
-            void setFileUploaded(const QUrl& remoteUrl);
-            void setReachedServer(const QString& eventId)
-            {
-                setStatus(EventStatus::ReachedServer);
-                (*this)->addId(eventId);
-            }
-            void setSendingFailed(QString errorText)
-            {
-                setStatus(EventStatus::SendingFailed);
-                _annotation = std::move(errorText);
-            }
-            void resetStatus() { setStatus(EventStatus::Submitted); }
+        using EventItemBase::EventItemBase;
+
+        EventStatus::Code deliveryStatus() const { return _status; }
+        QDateTime lastUpdated() const { return _lastUpdated; }
+        QString annotation() const { return _annotation; }
+
+        void setDeparted() { setStatus(EventStatus::Departed); }
+        void setFileUploaded(const QUrl& remoteUrl);
+        void setReachedServer(const QString& eventId)
+        {
+            setStatus(EventStatus::ReachedServer);
+            (*this)->addId(eventId);
+        }
+        void setSendingFailed(QString errorText)
+        {
+            setStatus(EventStatus::SendingFailed);
+            _annotation = std::move(errorText);
+        }
+        void resetStatus() { setStatus(EventStatus::Submitted); }
 
         private:
-            EventStatus::Code _status = EventStatus::Submitted;
-            QDateTime _lastUpdated = QDateTime::currentDateTimeUtc();
-            QString _annotation;
-
-            void setStatus(EventStatus::Code status)
-            {
-                _status = status;
-                _lastUpdated = QDateTime::currentDateTimeUtc();
-                _annotation.clear();
-            }
+        EventStatus::Code _status = EventStatus::Submitted;
+        QDateTime _lastUpdated = QDateTime::currentDateTimeUtc();
+        QString _annotation;
+
+        void setStatus(EventStatus::Code status)
+        {
+            _status = status;
+            _lastUpdated = QDateTime::currentDateTimeUtc();
+            _annotation.clear();
+        }
     };
 
     inline QDebug& operator<<(QDebug& d, const TimelineItem& ti)
diff --git a/lib/events/accountdataevents.h b/lib/events/accountdataevents.h
index a99d85ac..0cf2dc60 100644
--- a/lib/events/accountdataevents.h
+++ b/lib/events/accountdataevents.h
@@ -15,38 +15,37 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
+#include "converters.h"
 #include "event.h"
 #include "eventcontent.h"
-#include "converters.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     constexpr const char* FavouriteTag = "m.favourite";
     constexpr const char* LowPriorityTag = "m.lowpriority";
 
-    struct TagRecord
-    {
+    struct TagRecord {
         using order_type = Omittable<float>;
 
         order_type order;
 
-        TagRecord (order_type order = none) : order(order) { }
+        TagRecord(order_type order = none) : order(order) {}
 
         bool operator<(const TagRecord& other) const
         {
-            // Per The Spec, rooms with no order should be after those with order
-            return !order.omitted() &&
-                        (other.order.omitted() || order.value() < other.order.value());
+            // Per The Spec, rooms with no order should be after those with
+            // order
+            return !order.omitted()
+                    && (other.order.omitted()
+                        || order.value() < other.order.value());
         }
     };
 
-    template <> struct JsonObjectConverter<TagRecord>
-    {
+    template <> struct JsonObjectConverter<TagRecord> {
         static void fillFrom(const QJsonObject& jo, TagRecord& rec)
         {
             // Parse a float both from JSON double and JSON string because
@@ -54,8 +53,7 @@ namespace QMatrixClient
             const auto orderJv = jo.value("order"_ls);
             if (orderJv.isDouble())
                 rec.order = fromJson<float>(orderJv);
-            if (orderJv.isString())
-            {
+            if (orderJv.isString()) {
                 bool ok;
                 rec.order = orderJv.toString().toFloat(&ok);
                 if (!ok)
@@ -70,30 +68,31 @@ namespace QMatrixClient
 
     using TagsMap = QHash<QString, TagRecord>;
 
-#define DEFINE_SIMPLE_EVENT(_Name, _TypeId, _ContentType, _ContentKey) \
-    class _Name : public Event \
-    { \
-        public: \
-            using content_type = _ContentType; \
-            DEFINE_EVENT_TYPEID(_TypeId, _Name) \
-            explicit _Name(QJsonObject obj) \
-                : Event(typeId(), std::move(obj)) \
-            { } \
-            explicit _Name(_ContentType content) \
-                : Event(typeId(), matrixTypeId(), \
-                        QJsonObject { { QStringLiteral(#_ContentKey), \
-                                        toJson(std::move(content)) } }) \
-            { } \
-            auto _ContentKey() const \
-            { return fromJson<content_type>(contentJson()[#_ContentKey##_ls]); } \
-    }; \
-    REGISTER_EVENT_TYPE(_Name) \
+#define DEFINE_SIMPLE_EVENT(_Name, _TypeId, _ContentType, _ContentKey)         \
+    class _Name : public Event                                                 \
+    {                                                                          \
+        public:                                                                \
+        using content_type = _ContentType;                                     \
+        DEFINE_EVENT_TYPEID(_TypeId, _Name)                                    \
+        explicit _Name(QJsonObject obj) : Event(typeId(), std::move(obj)) {}   \
+        explicit _Name(_ContentType content)                                   \
+            : Event(typeId(), matrixTypeId(),                                  \
+                    QJsonObject { { QStringLiteral(#_ContentKey),              \
+                                    toJson(std::move(content)) } })            \
+        {                                                                      \
+        }                                                                      \
+        auto _ContentKey() const                                               \
+        {                                                                      \
+            return fromJson<content_type>(contentJson()[#_ContentKey##_ls]);   \
+        }                                                                      \
+    };                                                                         \
+    REGISTER_EVENT_TYPE(_Name)                                                 \
     // End of macro
 
     DEFINE_SIMPLE_EVENT(TagEvent, "m.tag", TagsMap, tags)
     DEFINE_SIMPLE_EVENT(ReadMarkerEvent, "m.fully_read", QString, event_id)
-    DEFINE_SIMPLE_EVENT(IgnoredUsersEvent, "m.ignored_user_list",
-                        QSet<QString>, ignored_users)
+    DEFINE_SIMPLE_EVENT(IgnoredUsersEvent, "m.ignored_user_list", QSet<QString>,
+                        ignored_users)
 
     DEFINE_EVENTTYPE_ALIAS(Tag, TagEvent)
     DEFINE_EVENTTYPE_ALIAS(ReadMarker, ReadMarkerEvent)
diff --git a/lib/events/callanswerevent.cpp b/lib/events/callanswerevent.cpp
index d2862241..91e164ad 100644
--- a/lib/events/callanswerevent.cpp
+++ b/lib/events/callanswerevent.cpp
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "callanswerevent.h"
@@ -56,17 +56,19 @@ CallAnswerEvent::CallAnswerEvent(const QJsonObject& obj)
 CallAnswerEvent::CallAnswerEvent(const QString& callId, const int lifetime,
                                  const QString& sdp)
     : CallEventBase(typeId(), matrixTypeId(), callId, 0,
-                    { { QStringLiteral("lifetime"), lifetime }
-                    , { QStringLiteral("answer"), QJsonObject {
-                        { QStringLiteral("type"), QStringLiteral("answer") },
-                        { QStringLiteral("sdp"), sdp } } }
-                    })
-{ }
+                    { { QStringLiteral("lifetime"), lifetime },
+                      { QStringLiteral("answer"),
+                        QJsonObject { { QStringLiteral("type"),
+                                        QStringLiteral("answer") },
+                                      { QStringLiteral("sdp"), sdp } } } })
+{
+}
 
 CallAnswerEvent::CallAnswerEvent(const QString& callId, const QString& sdp)
     : CallEventBase(typeId(), matrixTypeId(), callId, 0,
-                    { { QStringLiteral("answer"), QJsonObject {
-                        { QStringLiteral("type"), QStringLiteral("answer") },
-                        { QStringLiteral("sdp"), sdp } } }
-                    })
-{ }
+                    { { QStringLiteral("answer"),
+                        QJsonObject { { QStringLiteral("type"),
+                                        QStringLiteral("answer") },
+                                      { QStringLiteral("sdp"), sdp } } } })
+{
+}
diff --git a/lib/events/callanswerevent.h b/lib/events/callanswerevent.h
index 2d9e5bb0..f222803b 100644
--- a/lib/events/callanswerevent.h
+++ b/lib/events/callanswerevent.h
@@ -13,18 +13,17 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
 #include "roomevent.h"
 
-namespace QMatrixClient
-{
-    class CallAnswerEvent: public CallEventBase
+namespace QMatrixClient {
+    class CallAnswerEvent : public CallEventBase
     {
-    public:
+        public:
         DEFINE_EVENT_TYPEID("m.call.answer", CallAnswerEvent)
 
         explicit CallAnswerEvent(const QJsonObject& obj);
@@ -33,10 +32,16 @@ namespace QMatrixClient
                                  const QString& sdp);
         explicit CallAnswerEvent(const QString& callId, const QString& sdp);
 
-        int lifetime() const { return content<int>("lifetime"_ls); } // FIXME: Omittable<>?
-        QString sdp() const {
-            return contentJson()["answer"_ls].toObject()
-                    .value("sdp"_ls).toString();
+        int lifetime() const
+        {
+            return content<int>("lifetime"_ls);
+        } // FIXME: Omittable<>?
+        QString sdp() const
+        {
+            return contentJson()["answer"_ls]
+                    .toObject()
+                    .value("sdp"_ls)
+                    .toString();
         }
     };
 
diff --git a/lib/events/callcandidatesevent.cpp b/lib/events/callcandidatesevent.cpp
index 52cd1856..24f0dd46 100644
--- a/lib/events/callcandidatesevent.cpp
+++ b/lib/events/callcandidatesevent.cpp
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "callcandidatesevent.h"
@@ -26,9 +26,8 @@ m.call.candidates
         "call_id": "12345",
         "candidates": [
             {
-                "candidate": "candidate:863018703 1 udp 2122260223 10.9.64.156 43670 typ host generation 0",
-                "sdpMLineIndex": 0,
-                "sdpMid": "audio"
+                "candidate": "candidate:863018703 1 udp 2122260223 10.9.64.156
+43670 typ host generation 0", "sdpMLineIndex": 0, "sdpMid": "audio"
             }
         ],
         "version": 0
diff --git a/lib/events/callcandidatesevent.h b/lib/events/callcandidatesevent.h
index 4618832c..e66e0c09 100644
--- a/lib/events/callcandidatesevent.h
+++ b/lib/events/callcandidatesevent.h
@@ -13,34 +13,35 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
 #include "roomevent.h"
 
-namespace QMatrixClient
-{
-    class CallCandidatesEvent: public CallEventBase
+namespace QMatrixClient {
+    class CallCandidatesEvent : public CallEventBase
     {
         public:
-            DEFINE_EVENT_TYPEID("m.call.candidates", CallCandidatesEvent)
+        DEFINE_EVENT_TYPEID("m.call.candidates", CallCandidatesEvent)
 
-            explicit CallCandidatesEvent(const QJsonObject& obj)
-                : CallEventBase(typeId(), obj)
-            { }
+        explicit CallCandidatesEvent(const QJsonObject& obj)
+            : CallEventBase(typeId(), obj)
+        {
+        }
 
-            explicit CallCandidatesEvent(const QString& callId,
-                                         const QJsonArray& candidates)
-                : CallEventBase(typeId(), matrixTypeId(), callId, 0,
-                                {{ QStringLiteral("candidates"), candidates }})
-            { }
+        explicit CallCandidatesEvent(const QString& callId,
+                                     const QJsonArray& candidates)
+            : CallEventBase(typeId(), matrixTypeId(), callId, 0,
+                            { { QStringLiteral("candidates"), candidates } })
+        {
+        }
 
-            QJsonArray candidates() const
-            {
-                return content<QJsonArray>("candidates"_ls);
-            }
+        QJsonArray candidates() const
+        {
+            return content<QJsonArray>("candidates"_ls);
+        }
     };
 
     REGISTER_EVENT_TYPE(CallCandidatesEvent)
diff --git a/lib/events/callhangupevent.cpp b/lib/events/callhangupevent.cpp
index b1154806..80844f2d 100644
--- a/lib/events/callhangupevent.cpp
+++ b/lib/events/callhangupevent.cpp
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "callhangupevent.h"
@@ -42,7 +42,6 @@ m.call.hangup
 
 using namespace QMatrixClient;
 
-
 CallHangupEvent::CallHangupEvent(const QJsonObject& obj)
     : CallEventBase(typeId(), obj)
 {
@@ -51,4 +50,5 @@ CallHangupEvent::CallHangupEvent(const QJsonObject& obj)
 
 CallHangupEvent::CallHangupEvent(const QString& callId)
     : CallEventBase(typeId(), matrixTypeId(), callId, 0)
-{ }
+{
+}
diff --git a/lib/events/callhangupevent.h b/lib/events/callhangupevent.h
index c74e20d5..3c3910be 100644
--- a/lib/events/callhangupevent.h
+++ b/lib/events/callhangupevent.h
@@ -13,20 +13,19 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
 #include "roomevent.h"
 
-namespace QMatrixClient
-{
-    class CallHangupEvent: public CallEventBase
+namespace QMatrixClient {
+    class CallHangupEvent : public CallEventBase
     {
-    public:
+        public:
         DEFINE_EVENT_TYPEID("m.call.hangup", CallHangupEvent)
-        
+
         explicit CallHangupEvent(const QJsonObject& obj);
         explicit CallHangupEvent(const QString& callId);
     };
diff --git a/lib/events/callinviteevent.cpp b/lib/events/callinviteevent.cpp
index bca3f296..2459c093 100644
--- a/lib/events/callinviteevent.cpp
+++ b/lib/events/callinviteevent.cpp
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "callinviteevent.h"
@@ -56,9 +56,10 @@ CallInviteEvent::CallInviteEvent(const QJsonObject& obj)
 CallInviteEvent::CallInviteEvent(const QString& callId, const int lifetime,
                                  const QString& sdp)
     : CallEventBase(typeId(), matrixTypeId(), callId, lifetime,
-                    { { QStringLiteral("lifetime"), lifetime }
-                    , { QStringLiteral("offer"), QJsonObject {
-                        { QStringLiteral("type"), QStringLiteral("offer") },
-                        { QStringLiteral("sdp"), sdp } }
-                    }})
-{ }
+                    { { QStringLiteral("lifetime"), lifetime },
+                      { QStringLiteral("offer"),
+                        QJsonObject { { QStringLiteral("type"),
+                                        QStringLiteral("offer") },
+                                      { QStringLiteral("sdp"), sdp } } } })
+{
+}
diff --git a/lib/events/callinviteevent.h b/lib/events/callinviteevent.h
index d5315309..911ccf96 100644
--- a/lib/events/callinviteevent.h
+++ b/lib/events/callinviteevent.h
@@ -13,29 +13,34 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
 #include "roomevent.h"
 
-namespace QMatrixClient
-{
-    class CallInviteEvent: public CallEventBase
+namespace QMatrixClient {
+    class CallInviteEvent : public CallEventBase
     {
-    public:
+        public:
         DEFINE_EVENT_TYPEID("m.call.invite", CallInviteEvent)
-          
+
         explicit CallInviteEvent(const QJsonObject& obj);
 
         explicit CallInviteEvent(const QString& callId, const int lifetime,
                                  const QString& sdp);
 
-        int lifetime() const { return content<int>("lifetime"_ls); } // FIXME: Omittable<>?
-        QString sdp() const {
-            return contentJson()["offer"_ls].toObject()
-                    .value("sdp"_ls).toString();
+        int lifetime() const
+        {
+            return content<int>("lifetime"_ls);
+        } // FIXME: Omittable<>?
+        QString sdp() const
+        {
+            return contentJson()["offer"_ls]
+                    .toObject()
+                    .value("sdp"_ls)
+                    .toString();
         }
     };
 
diff --git a/lib/events/directchatevent.cpp b/lib/events/directchatevent.cpp
index 266d60d8..4ba098c2 100644
--- a/lib/events/directchatevent.cpp
+++ b/lib/events/directchatevent.cpp
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "directchatevent.h"
@@ -26,13 +26,12 @@ QMultiHash<QString, QString> DirectChatEvent::usersToDirectChats() const
 {
     QMultiHash<QString, QString> result;
     const auto& json = contentJson();
-    for (auto it = json.begin(); it != json.end(); ++it)
-    {
+    for (auto it = json.begin(); it != json.end(); ++it) {
         // Beware of range-for's over temporary returned from temporary
         // (see the bottom of
         // http://en.cppreference.com/w/cpp/language/range-for#Explanation)
         const auto roomIds = it.value().toArray();
-        for (const auto& roomIdValue: roomIds)
+        for (const auto& roomIdValue : roomIds)
             result.insert(it.key(), roomIdValue.toString());
     }
     return result;
diff --git a/lib/events/directchatevent.h b/lib/events/directchatevent.h
index 7559796b..0d8b8f74 100644
--- a/lib/events/directchatevent.h
+++ b/lib/events/directchatevent.h
@@ -13,25 +13,24 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
 #include "event.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     class DirectChatEvent : public Event
     {
         public:
-            DEFINE_EVENT_TYPEID("m.direct", DirectChatEvent)
+        DEFINE_EVENT_TYPEID("m.direct", DirectChatEvent)
 
-            explicit DirectChatEvent(const QJsonObject& obj)
-                : Event(typeId(), obj)
-            { }
+        explicit DirectChatEvent(const QJsonObject& obj) : Event(typeId(), obj)
+        {
+        }
 
-            QMultiHash<QString, QString> usersToDirectChats() const;
+        QMultiHash<QString, QString> usersToDirectChats() const;
     };
     REGISTER_EVENT_TYPE(DirectChatEvent)
     DEFINE_EVENTTYPE_ALIAS(DirectChat, DirectChatEvent)
diff --git a/lib/events/event.cpp b/lib/events/event.cpp
index c98dfbb6..f44b1e5d 100644
--- a/lib/events/event.cpp
+++ b/lib/events/event.cpp
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "event.h"
@@ -31,8 +31,8 @@ event_type_t EventTypeRegistry::initializeTypeId(event_mtype_t matrixTypeId)
     if (strncmp(matrixTypeId, "", 1) == 0)
         qDebug(EVENTS) << "Initialized unknown event type with id" << id;
     else
-        qDebug(EVENTS) << "Initialized event type" << matrixTypeId
-                       << "with id" << id;
+        qDebug(EVENTS) << "Initialized event type" << matrixTypeId << "with id"
+                       << id;
     return id;
 }
 
@@ -41,32 +41,26 @@ QString EventTypeRegistry::getMatrixType(event_type_t typeId)
     return typeId < get().eventTypes.size() ? get().eventTypes[typeId] : "";
 }
 
-Event::Event(Type type, const QJsonObject& json)
-    : _type(type), _json(json)
+Event::Event(Type type, const QJsonObject& json) : _type(type), _json(json)
 {
-    if (!json.contains(ContentKeyL) &&
-            !json.value(UnsignedKeyL).toObject().contains(RedactedCauseKeyL))
-    {
+    if (!json.contains(ContentKeyL)
+        && !json.value(UnsignedKeyL).toObject().contains(RedactedCauseKeyL)) {
         qCWarning(EVENTS) << "Event without 'content' node";
         qCWarning(EVENTS) << formatJson << json;
     }
 }
 
-Event::Event(Type type, event_mtype_t matrixType, const QJsonObject& contentJson)
+Event::Event(Type type, event_mtype_t matrixType,
+             const QJsonObject& contentJson)
     : Event(type, basicEventJson(matrixType, contentJson))
-{ }
+{
+}
 
 Event::~Event() = default;
 
-QString Event::matrixType() const
-{
-    return fullJson()[TypeKeyL].toString();
-}
+QString Event::matrixType() const { return fullJson()[TypeKeyL].toString(); }
 
-QByteArray Event::originalJson() const
-{
-    return QJsonDocument(_json).toJson();
-}
+QByteArray Event::originalJson() const { return QJsonDocument(_json).toJson(); }
 
 const QJsonObject Event::contentJson() const
 {
diff --git a/lib/events/event.h b/lib/events/event.h
index d7ac4292..a0f12b75 100644
--- a/lib/events/event.h
+++ b/lib/events/event.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
@@ -25,12 +25,10 @@
 #define USE_EVENTTYPE_ALIAS 1
 #endif
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // === event_ptr_tt<> and type casting facilities ===
 
-    template <typename EventT>
-    using event_ptr_tt = std::unique_ptr<EventT>;
+    template <typename EventT> using event_ptr_tt = std::unique_ptr<EventT>;
 
     template <typename EventT>
     inline EventT* rawPtr(const event_ptr_tt<EventT>& ptr) // unwrap
@@ -80,50 +78,46 @@ namespace QMatrixClient
     class EventTypeRegistry
     {
         public:
-            ~EventTypeRegistry() = default;
+        ~EventTypeRegistry() = default;
 
-            static event_type_t initializeTypeId(event_mtype_t matrixTypeId);
+        static event_type_t initializeTypeId(event_mtype_t matrixTypeId);
 
-            template <typename EventT>
-            static inline event_type_t initializeTypeId()
-            {
-                return initializeTypeId(EventT::matrixTypeId());
-            }
+        template <typename EventT> static inline event_type_t initializeTypeId()
+        {
+            return initializeTypeId(EventT::matrixTypeId());
+        }
 
-            static QString getMatrixType(event_type_t typeId);
+        static QString getMatrixType(event_type_t typeId);
 
         private:
-            EventTypeRegistry() = default;
-            Q_DISABLE_COPY(EventTypeRegistry)
-            DISABLE_MOVE(EventTypeRegistry)
+        EventTypeRegistry() = default;
+        Q_DISABLE_COPY(EventTypeRegistry)
+        DISABLE_MOVE(EventTypeRegistry)
 
-            static EventTypeRegistry& get()
-            {
-                static EventTypeRegistry etr;
-                return etr;
-            }
+        static EventTypeRegistry& get()
+        {
+            static EventTypeRegistry etr;
+            return etr;
+        }
 
-            std::vector<event_mtype_t> eventTypes;
+        std::vector<event_mtype_t> eventTypes;
     };
 
-    template <>
-    inline event_type_t EventTypeRegistry::initializeTypeId<void>()
+    template <> inline event_type_t EventTypeRegistry::initializeTypeId<void>()
     {
         return initializeTypeId("");
     }
 
-    template <typename EventT>
-    struct EventTypeTraits
-    {
+    template <typename EventT> struct EventTypeTraits {
         static event_type_t id()
         {
-            static const auto id = EventTypeRegistry::initializeTypeId<EventT>();
+            static const auto id =
+                    EventTypeRegistry::initializeTypeId<EventT>();
             return id;
         }
     };
 
-    template <typename EventT>
-    inline event_type_t typeId()
+    template <typename EventT> inline event_type_t typeId()
     {
         return EventTypeTraits<std::decay_t<EventT>>::id();
     }
@@ -139,49 +133,45 @@ namespace QMatrixClient
         return std::make_unique<EventT>(std::forward<ArgTs>(args)...);
     }
 
-    template <typename BaseEventT>
-    class EventFactory
+    template <typename BaseEventT> class EventFactory
     {
         public:
-            template <typename FnT>
-            static auto addMethod(FnT&& method)
-            {
-                factories().emplace_back(std::forward<FnT>(method));
-                return 0;
-            }
-
-            /** Chain two type factories
-             * Adds the factory class of EventT2 (EventT2::factory_t) to
-             * the list in factory class of EventT1 (EventT1::factory_t) so
-             * that when EventT1::factory_t::make() is invoked, types of
-             * EventT2 factory are looked through as well. This is used
-             * to include RoomEvent types into the more general Event factory,
-             * and state event types into the RoomEvent factory.
-             */
-            template <typename EventT>
-            static auto chainFactory()
-            {
-                return addMethod(&EventT::factory_t::make);
-            }
-
-            static event_ptr_tt<BaseEventT> make(const QJsonObject& json,
-                                                 const QString& matrixType)
-            {
-                for (const auto& f: factories())
-                    if (auto e = f(json, matrixType))
-                        return e;
-                return nullptr;
-            }
+        template <typename FnT> static auto addMethod(FnT&& method)
+        {
+            factories().emplace_back(std::forward<FnT>(method));
+            return 0;
+        }
+
+        /** Chain two type factories
+         * Adds the factory class of EventT2 (EventT2::factory_t) to
+         * the list in factory class of EventT1 (EventT1::factory_t) so
+         * that when EventT1::factory_t::make() is invoked, types of
+         * EventT2 factory are looked through as well. This is used
+         * to include RoomEvent types into the more general Event factory,
+         * and state event types into the RoomEvent factory.
+         */
+        template <typename EventT> static auto chainFactory()
+        {
+            return addMethod(&EventT::factory_t::make);
+        }
+
+        static event_ptr_tt<BaseEventT> make(const QJsonObject& json,
+                                             const QString& matrixType)
+        {
+            for (const auto& f : factories())
+                if (auto e = f(json, matrixType))
+                    return e;
+            return nullptr;
+        }
 
         private:
-            static auto& factories()
-            {
-                using inner_factory_tt =
-                    std::function<event_ptr_tt<BaseEventT>(const QJsonObject&,
-                                                           const QString&)>;
-                static std::vector<inner_factory_tt> _factories {};
-                return _factories;
-            }
+        static auto& factories()
+        {
+            using inner_factory_tt = std::function<event_ptr_tt<BaseEventT>(
+                    const QJsonObject&, const QString&)>;
+            static std::vector<inner_factory_tt> _factories {};
+            return _factories;
+        }
     };
 
     /** Add a type to its default factory
@@ -193,20 +183,18 @@ namespace QMatrixClient
      * \return the registered type id
      * \sa loadEvent, Event::type
      */
-    template <typename EventT>
-    inline auto setupFactory()
+    template <typename EventT> inline auto setupFactory()
     {
         qDebug(EVENTS) << "Adding factory method for" << EventT::matrixTypeId();
         return EventT::factory_t::addMethod(
-            [] (const QJsonObject& json, const QString& jsonMatrixType)
-            {
-                return EventT::matrixTypeId() == jsonMatrixType
-                        ? makeEvent<EventT>(json) : nullptr;
-            });
+                [](const QJsonObject& json, const QString& jsonMatrixType) {
+                    return EventT::matrixTypeId() == jsonMatrixType
+                            ? makeEvent<EventT>(json)
+                            : nullptr;
+                });
     }
 
-    template <typename EventT>
-    inline auto registerEventType()
+    template <typename EventT> inline auto registerEventType()
     {
         // Initialise exactly once, even if this function is called twice for
         // the same type (for whatever reason - you never know the ways of
@@ -219,66 +207,64 @@ namespace QMatrixClient
 
     class Event
     {
-            Q_GADGET
-            Q_PROPERTY(Type type READ type CONSTANT)
-            Q_PROPERTY(QJsonObject contentJson READ contentJson CONSTANT)
+        Q_GADGET
+        Q_PROPERTY(Type type READ type CONSTANT)
+        Q_PROPERTY(QJsonObject contentJson READ contentJson CONSTANT)
         public:
-            using Type = event_type_t;
-            using factory_t = EventFactory<Event>;
-
-            explicit Event(Type type, const QJsonObject& json);
-            explicit Event(Type type, event_mtype_t matrixType,
-                           const QJsonObject& contentJson = {});
-            Q_DISABLE_COPY(Event)
-            Event(Event&&) = default;
-            Event& operator=(Event&&) = delete;
-            virtual ~Event();
-
-            Type type() const { return _type; }
-            QString matrixType() const;
-            QByteArray originalJson() const;
-            QJsonObject originalJsonObject() const { return fullJson(); }
-
-            const QJsonObject& fullJson() const { return _json; }
-
-            // According to the CS API spec, every event also has
-            // a "content" object; but since its structure is different for
-            // different types, we're implementing it per-event type.
-
-            const QJsonObject contentJson() const;
-            const QJsonObject unsignedJson() const;
-
-            template <typename T>
-            T content(const QString& key) const
-            {
-                return fromJson<T>(contentJson()[key]);
-            }
-
-            template <typename T>
-            T content(const QLatin1String& key) const
-            {
-                return fromJson<T>(contentJson()[key]);
-            }
-
-            friend QDebug operator<<(QDebug dbg, const Event& e)
-            {
-                QDebugStateSaver _dss { dbg };
-                dbg.noquote().nospace()
-                        << e.matrixType() << '(' << e.type() << "): ";
-                e.dumpTo(dbg);
-                return dbg;
-            }
-
-            virtual bool isStateEvent() const { return false; }
-            virtual bool isCallEvent() const { return false; }
-            virtual void dumpTo(QDebug dbg) const;
+        using Type = event_type_t;
+        using factory_t = EventFactory<Event>;
+
+        explicit Event(Type type, const QJsonObject& json);
+        explicit Event(Type type, event_mtype_t matrixType,
+                       const QJsonObject& contentJson = {});
+        Q_DISABLE_COPY(Event)
+        Event(Event&&) = default;
+        Event& operator=(Event&&) = delete;
+        virtual ~Event();
+
+        Type type() const { return _type; }
+        QString matrixType() const;
+        QByteArray originalJson() const;
+        QJsonObject originalJsonObject() const { return fullJson(); }
+
+        const QJsonObject& fullJson() const { return _json; }
+
+        // According to the CS API spec, every event also has
+        // a "content" object; but since its structure is different for
+        // different types, we're implementing it per-event type.
+
+        const QJsonObject contentJson() const;
+        const QJsonObject unsignedJson() const;
+
+        template <typename T> T content(const QString& key) const
+        {
+            return fromJson<T>(contentJson()[key]);
+        }
+
+        template <typename T> T content(const QLatin1String& key) const
+        {
+            return fromJson<T>(contentJson()[key]);
+        }
+
+        friend QDebug operator<<(QDebug dbg, const Event& e)
+        {
+            QDebugStateSaver _dss { dbg };
+            dbg.noquote().nospace()
+                    << e.matrixType() << '(' << e.type() << "): ";
+            e.dumpTo(dbg);
+            return dbg;
+        }
+
+        virtual bool isStateEvent() const { return false; }
+        virtual bool isCallEvent() const { return false; }
+        virtual void dumpTo(QDebug dbg) const;
 
         protected:
-            QJsonObject& editJson() { return _json; }
+        QJsonObject& editJson() { return _json; }
 
         private:
-            Type _type;
-            QJsonObject _json;
+        Type _type;
+        QJsonObject _json;
     };
     using EventPtr = event_ptr_tt<Event>;
 
@@ -290,24 +276,23 @@ namespace QMatrixClient
 
     // This macro should be used in a public section of an event class to
     // provide matrixTypeId() and typeId().
-#define DEFINE_EVENT_TYPEID(_Id, _Type) \
-    static constexpr event_mtype_t matrixTypeId() { return _Id; } \
-    static auto typeId() { return QMatrixClient::typeId<_Type>(); } \
+#define DEFINE_EVENT_TYPEID(_Id, _Type)                                        \
+    static constexpr event_mtype_t matrixTypeId() { return _Id; }              \
+    static auto typeId() { return QMatrixClient::typeId<_Type>(); }            \
     // End of macro
 
     // This macro should be put after an event class definition (in .h or .cpp)
     // to enable its deserialisation from a /sync and other
     // polymorphic event arrays
-#define REGISTER_EVENT_TYPE(_Type) \
-    namespace { \
-        [[gnu::unused]] \
-        static const auto _factoryAdded##_Type = registerEventType<_Type>(); \
-    } \
+#define REGISTER_EVENT_TYPE(_Type)                                             \
+    namespace {                                                                \
+        [[gnu::unused]] static const auto _factoryAdded##_Type =               \
+                registerEventType<_Type>();                                    \
+    }                                                                          \
     // End of macro
 
 #ifdef USE_EVENTTYPE_ALIAS
-    namespace EventType
-    {
+    namespace EventType {
         inline event_type_t logEventType(event_type_t id, const char* idName)
         {
             qDebug(EVENTS) << "Using id" << id << "for" << idName;
@@ -317,12 +302,12 @@ namespace QMatrixClient
 
     // This macro provides constants in EventType:: namespace for
     // back-compatibility with libQMatrixClient 0.3 event type system.
-#define DEFINE_EVENTTYPE_ALIAS(_Id, _Type) \
-    namespace EventType \
-    { \
-        [[deprecated("Use is<>(), eventCast<>() or visit<>()")]] \
-        static const auto _Id = logEventType(typeId<_Type>(), #_Id); \
-    } \
+#define DEFINE_EVENTTYPE_ALIAS(_Id, _Type)                                     \
+    namespace EventType {                                                      \
+        [[deprecated(                                                          \
+                "Use is<>(), eventCast<>() or visit<>()")]] static const auto  \
+                _Id = logEventType(typeId<_Type>(), #_Id);                     \
+    }                                                                          \
     // End of macro
 #else
 #define DEFINE_EVENTTYPE_ALIAS(_Id, _Type) // Nothing
@@ -330,46 +315,48 @@ namespace QMatrixClient
 
     // === is<>(), eventCast<>() and visit<>() ===
 
-    template <typename EventT>
-    inline bool is(const Event& e) { return e.type() == typeId<EventT>(); }
+    template <typename EventT> inline bool is(const Event& e)
+    {
+        return e.type() == typeId<EventT>();
+    }
 
-    inline bool isUnknown(const Event& e) { return e.type() == unknownEventTypeId(); }
+    inline bool isUnknown(const Event& e)
+    {
+        return e.type() == unknownEventTypeId();
+    }
 
     template <typename EventT, typename BasePtrT>
     inline auto eventCast(const BasePtrT& eptr)
-        -> decltype(static_cast<EventT*>(&*eptr))
+            -> decltype(static_cast<EventT*>(&*eptr))
     {
         Q_ASSERT(eptr);
-        return is<std::decay_t<EventT>>(*eptr)
-               ? static_cast<EventT*>(&*eptr) : nullptr;
+        return is<std::decay_t<EventT>>(*eptr) ? static_cast<EventT*>(&*eptr)
+                                               : nullptr;
     }
 
     // A single generic catch-all visitor
     template <typename BaseEventT, typename FnT>
     inline auto visit(const BaseEventT& event, FnT&& visitor)
-        -> decltype(visitor(event))
+            -> decltype(visitor(event))
     {
         return visitor(event);
     }
 
-    template <typename T>
-    constexpr auto is_event()
+    template <typename T> constexpr auto is_event()
     {
         return std::is_base_of<Event, std::decay_t<T>>::value;
     }
 
-    template <typename T, typename FnT>
-    constexpr auto needs_cast()
+    template <typename T, typename FnT> constexpr auto needs_cast()
     {
         return !std::is_convertible<T, fn_arg_t<FnT>>::value;
     }
 
     // A single type-specific void visitor
     template <typename BaseEventT, typename FnT>
-    inline
-    std::enable_if_t<
-        is_event<BaseEventT>() && needs_cast<BaseEventT, FnT>() &&
-        std::is_void<fn_return_t<FnT>>::value>
+    inline std::enable_if_t<is_event<BaseEventT>()
+                            && needs_cast<BaseEventT, FnT>()
+                            && std::is_void<fn_return_t<FnT>>::value>
     visit(const BaseEventT& event, FnT&& visitor)
     {
         using event_type = fn_arg_t<FnT>;
@@ -379,10 +366,9 @@ namespace QMatrixClient
 
     // A single type-specific non-void visitor with an optional default value
     template <typename BaseEventT, typename FnT>
-    inline
-    std::enable_if_t<
-        is_event<BaseEventT>() && needs_cast<BaseEventT, FnT>(),
-        fn_return_t<FnT>> // non-voidness is guarded by defaultValue type
+    inline std::enable_if_t<
+            is_event<BaseEventT>() && needs_cast<BaseEventT, FnT>(),
+            fn_return_t<FnT>> // non-voidness is guarded by defaultValue type
     visit(const BaseEventT& event, FnT&& visitor,
           fn_return_t<FnT>&& defaultValue = {})
     {
@@ -393,9 +379,9 @@ namespace QMatrixClient
     }
 
     // A chain of 2 or more visitors
-    template <typename BaseEventT, typename FnT1, typename FnT2, typename... FnTs>
-    inline
-    std::enable_if_t<is_event<BaseEventT>(), fn_return_t<FnT1>>
+    template <typename BaseEventT, typename FnT1, typename FnT2,
+              typename... FnTs>
+    inline std::enable_if_t<is_event<BaseEventT>(), fn_return_t<FnT1>>
     visit(const BaseEventT& event, FnT1&& visitor1, FnT2&& visitor2,
           FnTs&&... visitors)
     {
@@ -405,6 +391,6 @@ namespace QMatrixClient
         return visit(event, std::forward<FnT2>(visitor2),
                      std::forward<FnTs>(visitors)...);
     }
-}  // namespace QMatrixClient
+} // namespace QMatrixClient
 Q_DECLARE_METATYPE(QMatrixClient::Event*)
 Q_DECLARE_METATYPE(const QMatrixClient::Event*)
diff --git a/lib/events/eventcontent.cpp b/lib/events/eventcontent.cpp
index 9a5e872c..cc31fea5 100644
--- a/lib/events/eventcontent.cpp
+++ b/lib/events/eventcontent.cpp
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "eventcontent.h"
@@ -34,17 +34,21 @@ QJsonObject Base::toJson() const
 
 FileInfo::FileInfo(const QUrl& u, qint64 payloadSize, const QMimeType& mimeType,
                    const QString& originalFilename)
-    : mimeType(mimeType), url(u), payloadSize(payloadSize)
-    , originalName(originalFilename)
-{ }
+    : mimeType(mimeType),
+      url(u),
+      payloadSize(payloadSize),
+      originalName(originalFilename)
+{
+}
 
 FileInfo::FileInfo(const QUrl& u, const QJsonObject& infoJson,
                    const QString& originalFilename)
-    : originalInfoJson(infoJson)
-    , mimeType(QMimeDatabase().mimeTypeForName(infoJson["mimetype"_ls].toString()))
-    , url(u)
-    , payloadSize(fromJson<qint64>(infoJson["size"_ls]))
-    , originalName(originalFilename)
+    : originalInfoJson(infoJson),
+      mimeType(QMimeDatabase().mimeTypeForName(
+              infoJson["mimetype"_ls].toString())),
+      url(u),
+      payloadSize(fromJson<qint64>(infoJson["size"_ls])),
+      originalName(originalFilename)
 {
     if (!mimeType.isValid())
         mimeType = QMimeDatabase().mimeTypeForData(QByteArray());
@@ -62,13 +66,15 @@ void FileInfo::fillInfoJson(QJsonObject* infoJson) const
 ImageInfo::ImageInfo(const QUrl& u, qint64 fileSize, QMimeType mimeType,
                      const QSize& imageSize, const QString& originalFilename)
     : FileInfo(u, fileSize, mimeType, originalFilename), imageSize(imageSize)
-{ }
+{
+}
 
 ImageInfo::ImageInfo(const QUrl& u, const QJsonObject& infoJson,
                      const QString& originalFilename)
-    : FileInfo(u, infoJson, originalFilename)
-    , imageSize(infoJson["w"_ls].toInt(), infoJson["h"_ls].toInt())
-{ }
+    : FileInfo(u, infoJson, originalFilename),
+      imageSize(infoJson["w"_ls].toInt(), infoJson["h"_ls].toInt())
+{
+}
 
 void ImageInfo::fillInfoJson(QJsonObject* infoJson) const
 {
@@ -82,7 +88,8 @@ void ImageInfo::fillInfoJson(QJsonObject* infoJson) const
 Thumbnail::Thumbnail(const QJsonObject& infoJson)
     : ImageInfo(infoJson["thumbnail_url"_ls].toString(),
                 infoJson["thumbnail_info"_ls].toObject())
-{ }
+{
+}
 
 void Thumbnail::fillInfoJson(QJsonObject* infoJson) const
 {
diff --git a/lib/events/eventcontent.h b/lib/events/eventcontent.h
index 0588c0e2..857e7369 100644
--- a/lib/events/eventcontent.h
+++ b/lib/events/eventcontent.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
@@ -23,13 +23,11 @@
 
 #include <QtCore/QJsonObject>
 #include <QtCore/QMimeType>
-#include <QtCore/QUrl>
 #include <QtCore/QSize>
+#include <QtCore/QUrl>
 
-namespace QMatrixClient
-{
-    namespace EventContent
-    {
+namespace QMatrixClient {
+    namespace EventContent {
         /**
          * A base class for all content types that can be stored
          * in a RoomMessageEvent
@@ -43,17 +41,17 @@ namespace QMatrixClient
         class Base
         {
             public:
-                explicit Base (QJsonObject o = {}) : originalJson(std::move(o)) { }
-                virtual ~Base() = default;
+            explicit Base(QJsonObject o = {}) : originalJson(std::move(o)) {}
+            virtual ~Base() = default;
 
-                // FIXME: make toJson() from converters.* work on base classes
-                QJsonObject toJson() const;
+            // FIXME: make toJson() from converters.* work on base classes
+            QJsonObject toJson() const;
 
             public:
-                QJsonObject originalJson;
+            QJsonObject originalJson;
 
             protected:
-                virtual void fillJson(QJsonObject* o) const = 0;
+            virtual void fillJson(QJsonObject* o) const = 0;
         };
 
         // The below structures fairly follow CS spec 11.2.1.6. The overall
@@ -81,40 +79,40 @@ namespace QMatrixClient
          * JSON content, as well as contents of "url" (or a similar key) and
          * optionally "filename" node from the main JSON content. Assuming you
          * don't do unusual things, you should use \p UrlBasedContent<> instead
-         * of doing multiple inheritance and overriding Base::fillJson() by hand.
+         * of doing multiple inheritance and overriding Base::fillJson() by
+         * hand.
          *
          * This class is not polymorphic.
          */
         class FileInfo
         {
             public:
-                explicit FileInfo(const QUrl& u, qint64 payloadSize = -1,
-                                  const QMimeType& mimeType = {},
-                                  const QString& originalFilename = {});
-                FileInfo(const QUrl& u, const QJsonObject& infoJson,
-                         const QString& originalFilename = {});
+            explicit FileInfo(const QUrl& u, qint64 payloadSize = -1,
+                              const QMimeType& mimeType = {},
+                              const QString& originalFilename = {});
+            FileInfo(const QUrl& u, const QJsonObject& infoJson,
+                     const QString& originalFilename = {});
 
-                void fillInfoJson(QJsonObject* infoJson) const;
+            void fillInfoJson(QJsonObject* infoJson) const;
 
-                /**
-                 * \brief Extract media id from the URL
-                 *
-                 * This can be used, e.g., to construct a QML-facing image://
-                 * URI as follows:
-                 * \code "image://provider/" + info.mediaId() \endcode
-                 */
-                QString mediaId() const { return url.authority() + url.path(); }
+            /**
+             * \brief Extract media id from the URL
+             *
+             * This can be used, e.g., to construct a QML-facing image://
+             * URI as follows:
+             * \code "image://provider/" + info.mediaId() \endcode
+             */
+            QString mediaId() const { return url.authority() + url.path(); }
 
             public:
-                QJsonObject originalInfoJson;
-                QMimeType mimeType;
-                QUrl url;
-                qint64 payloadSize;
-                QString originalName;
+            QJsonObject originalInfoJson;
+            QMimeType mimeType;
+            QUrl url;
+            qint64 payloadSize;
+            QString originalName;
         };
 
-        template <typename InfoT>
-        QJsonObject toInfoJson(const InfoT& info)
+        template <typename InfoT> QJsonObject toInfoJson(const InfoT& info)
         {
             QJsonObject infoJson;
             info.fillInfoJson(&infoJson);
@@ -127,17 +125,17 @@ namespace QMatrixClient
         class ImageInfo : public FileInfo
         {
             public:
-                explicit ImageInfo(const QUrl& u, qint64 fileSize = -1,
-                                   QMimeType mimeType = {},
-                                   const QSize& imageSize = {},
-                                   const QString& originalFilename = {});
-                ImageInfo(const QUrl& u, const QJsonObject& infoJson,
-                          const QString& originalFilename = {});
+            explicit ImageInfo(const QUrl& u, qint64 fileSize = -1,
+                               QMimeType mimeType = {},
+                               const QSize& imageSize = {},
+                               const QString& originalFilename = {});
+            ImageInfo(const QUrl& u, const QJsonObject& infoJson,
+                      const QString& originalFilename = {});
 
-                void fillInfoJson(QJsonObject* infoJson) const;
+            void fillInfoJson(QJsonObject* infoJson) const;
 
             public:
-                QSize imageSize;
+            QSize imageSize;
         };
 
         /**
@@ -150,26 +148,26 @@ namespace QMatrixClient
         class Thumbnail : public ImageInfo
         {
             public:
-                Thumbnail() : ImageInfo(QUrl()) { } // To allow empty thumbnails
-                Thumbnail(const QJsonObject& infoJson);
-                Thumbnail(const ImageInfo& info) : ImageInfo(info) { }
-                using ImageInfo::ImageInfo;
+            Thumbnail() : ImageInfo(QUrl()) {} // To allow empty thumbnails
+            Thumbnail(const QJsonObject& infoJson);
+            Thumbnail(const ImageInfo& info) : ImageInfo(info) {}
+            using ImageInfo::ImageInfo;
 
-                /**
-                 * Writes thumbnail information to "thumbnail_info" subobject
-                 * and thumbnail URL to "thumbnail_url" node inside "info".
-                 */
-                void fillInfoJson(QJsonObject* infoJson) const;
+            /**
+             * Writes thumbnail information to "thumbnail_info" subobject
+             * and thumbnail URL to "thumbnail_url" node inside "info".
+             */
+            void fillInfoJson(QJsonObject* infoJson) const;
         };
 
-        class TypedBase: public Base
+        class TypedBase : public Base
         {
             public:
-                explicit TypedBase(const QJsonObject& o = {}) : Base(o) { }
-                virtual QMimeType type() const = 0;
-                virtual const FileInfo* fileInfo() const { return nullptr; }
-                virtual FileInfo* fileInfo() { return nullptr; }
-                virtual const Thumbnail* thumbnailInfo() const { return nullptr; }
+            explicit TypedBase(const QJsonObject& o = {}) : Base(o) {}
+            virtual QMimeType type() const = 0;
+            virtual const FileInfo* fileInfo() const { return nullptr; }
+            virtual FileInfo* fileInfo() { return nullptr; }
+            virtual const Thumbnail* thumbnailInfo() const { return nullptr; }
         };
 
         /**
@@ -186,59 +184,61 @@ namespace QMatrixClient
         class UrlBasedContent : public TypedBase, public InfoT
         {
             public:
-                using InfoT::InfoT;
-                explicit UrlBasedContent(const QJsonObject& json)
-                    : TypedBase(json)
-                    , InfoT(json["url"].toString(), json["info"].toObject(),
-                            json["filename"].toString())
-                {
-                    // A small hack to facilitate links creation in QML.
-                    originalJson.insert("mediaId", InfoT::mediaId());
-                }
+            using InfoT::InfoT;
+            explicit UrlBasedContent(const QJsonObject& json)
+                : TypedBase(json),
+                  InfoT(json["url"].toString(), json["info"].toObject(),
+                        json["filename"].toString())
+            {
+                // A small hack to facilitate links creation in QML.
+                originalJson.insert("mediaId", InfoT::mediaId());
+            }
 
-                QMimeType type() const override { return InfoT::mimeType; }
-                const FileInfo* fileInfo() const override { return this; }
-                FileInfo* fileInfo() override { return this; }
+            QMimeType type() const override { return InfoT::mimeType; }
+            const FileInfo* fileInfo() const override { return this; }
+            FileInfo* fileInfo() override { return this; }
 
             protected:
-                void fillJson(QJsonObject* json) const override
-                {
-                    Q_ASSERT(json);
-                    json->insert("url", InfoT::url.toString());
-                    if (!InfoT::originalName.isEmpty())
-                        json->insert("filename", InfoT::originalName);
-                    json->insert("info", toInfoJson<InfoT>(*this));
-                }
+            void fillJson(QJsonObject* json) const override
+            {
+                Q_ASSERT(json);
+                json->insert("url", InfoT::url.toString());
+                if (!InfoT::originalName.isEmpty())
+                    json->insert("filename", InfoT::originalName);
+                json->insert("info", toInfoJson<InfoT>(*this));
+            }
         };
 
         template <typename InfoT>
         class UrlWithThumbnailContent : public UrlBasedContent<InfoT>
         {
             public:
-                using UrlBasedContent<InfoT>::UrlBasedContent;
-                explicit UrlWithThumbnailContent(const QJsonObject& json)
-                    : UrlBasedContent<InfoT>(json)
-                    , thumbnail(InfoT::originalInfoJson)
-                {
-                    // Another small hack, to simplify making a thumbnail link
-                    UrlBasedContent<InfoT>::originalJson.insert(
-                                "thumbnailMediaId", thumbnail.mediaId());
-                }
+            using UrlBasedContent<InfoT>::UrlBasedContent;
+            explicit UrlWithThumbnailContent(const QJsonObject& json)
+                : UrlBasedContent<InfoT>(json),
+                  thumbnail(InfoT::originalInfoJson)
+            {
+                // Another small hack, to simplify making a thumbnail link
+                UrlBasedContent<InfoT>::originalJson.insert(
+                        "thumbnailMediaId", thumbnail.mediaId());
+            }
 
-                const Thumbnail* thumbnailInfo() const override
-                { return &thumbnail; }
+            const Thumbnail* thumbnailInfo() const override
+            {
+                return &thumbnail;
+            }
 
             public:
-                Thumbnail thumbnail;
+            Thumbnail thumbnail;
 
             protected:
-                void fillJson(QJsonObject* json) const override
-                {
-                    UrlBasedContent<InfoT>::fillJson(json);
-                    auto infoJson = json->take("info").toObject();
-                    thumbnail.fillInfoJson(&infoJson);
-                    json->insert("info", infoJson);
-                }
+            void fillJson(QJsonObject* json) const override
+            {
+                UrlBasedContent<InfoT>::fillJson(json);
+                auto infoJson = json->take("info").toObject();
+                thumbnail.fillInfoJson(&infoJson);
+                json->insert("info", infoJson);
+            }
         };
 
         /**
@@ -278,5 +278,5 @@ namespace QMatrixClient
          *   - thumbnail.imageSize (QSize for "h" and "w" in JSON)
          */
         using FileContent = UrlWithThumbnailContent<FileInfo>;
-    }  // namespace EventContent
-}  // namespace QMatrixClient
+    } // namespace EventContent
+} // namespace QMatrixClient
diff --git a/lib/events/eventloader.h b/lib/events/eventloader.h
index da663392..a19a83b6 100644
--- a/lib/events/eventloader.h
+++ b/lib/events/eventloader.h
@@ -1,20 +1,20 @@
 /******************************************************************************
-* Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ * Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
 
 #pragma once
 
@@ -57,8 +57,7 @@ namespace QMatrixClient {
                                             matrixType);
     }
 
-    template <typename EventT> struct JsonConverter<event_ptr_tt<EventT>>
-    {
+    template <typename EventT> struct JsonConverter<event_ptr_tt<EventT>> {
         static auto load(const QJsonValue& jv)
         {
             return loadEvent<EventT>(jv.toObject());
diff --git a/lib/events/receiptevent.cpp b/lib/events/receiptevent.cpp
index 47e1398c..76c7b6e4 100644
--- a/lib/events/receiptevent.cpp
+++ b/lib/events/receiptevent.cpp
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 /*
@@ -40,30 +40,27 @@ Example of a Receipt Event:
 
 using namespace QMatrixClient;
 
-ReceiptEvent::ReceiptEvent(const QJsonObject& obj)
-    : Event(typeId(), obj)
+ReceiptEvent::ReceiptEvent(const QJsonObject& obj) : Event(typeId(), obj)
 {
     const auto& contents = contentJson();
     _eventsWithReceipts.reserve(contents.size());
-    for( auto eventIt = contents.begin(); eventIt != contents.end(); ++eventIt )
-    {
-        if (eventIt.key().isEmpty())
-        {
-            qCWarning(EPHEMERAL) << "ReceiptEvent has an empty event id, skipping";
+    for (auto eventIt = contents.begin(); eventIt != contents.end();
+         ++eventIt) {
+        if (eventIt.key().isEmpty()) {
+            qCWarning(EPHEMERAL)
+                    << "ReceiptEvent has an empty event id, skipping";
             qCDebug(EPHEMERAL) << "ReceiptEvent content follows:\n" << contents;
             continue;
         }
-        const QJsonObject reads = eventIt.value().toObject()
-                                    .value("m.read"_ls).toObject();
+        const QJsonObject reads =
+                eventIt.value().toObject().value("m.read"_ls).toObject();
         QVector<Receipt> receipts;
         receipts.reserve(reads.size());
-        for( auto userIt = reads.begin(); userIt != reads.end(); ++userIt )
-        {
+        for (auto userIt = reads.begin(); userIt != reads.end(); ++userIt) {
             const QJsonObject user = userIt.value().toObject();
-            receipts.push_back({userIt.key(),
-                                fromJson<QDateTime>(user["ts"_ls])});
+            receipts.push_back(
+                    { userIt.key(), fromJson<QDateTime>(user["ts"_ls]) });
         }
-        _eventsWithReceipts.push_back({eventIt.key(), std::move(receipts)});
+        _eventsWithReceipts.push_back({ eventIt.key(), std::move(receipts) });
     }
 }
-
diff --git a/lib/events/receiptevent.h b/lib/events/receiptevent.h
index c15a01c2..fca38bba 100644
--- a/lib/events/receiptevent.h
+++ b/lib/events/receiptevent.h
@@ -13,42 +13,41 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
 #include "event.h"
 
-#include <QtCore/QVector>
 #include <QtCore/QDateTime>
+#include <QtCore/QVector>
 
-namespace QMatrixClient
-{
-    struct Receipt
-    {
+namespace QMatrixClient {
+    struct Receipt {
         QString userId;
         QDateTime timestamp;
     };
-    struct ReceiptsForEvent
-    {
+    struct ReceiptsForEvent {
         QString evtId;
         QVector<Receipt> receipts;
     };
     using EventsWithReceipts = QVector<ReceiptsForEvent>;
 
-    class ReceiptEvent: public Event
+    class ReceiptEvent : public Event
     {
         public:
-            DEFINE_EVENT_TYPEID("m.receipt", ReceiptEvent)
-            explicit ReceiptEvent(const QJsonObject& obj);
+        DEFINE_EVENT_TYPEID("m.receipt", ReceiptEvent)
+        explicit ReceiptEvent(const QJsonObject& obj);
 
-            const EventsWithReceipts& eventsWithReceipts() const
-            { return _eventsWithReceipts; }
+        const EventsWithReceipts& eventsWithReceipts() const
+        {
+            return _eventsWithReceipts;
+        }
 
         private:
-            EventsWithReceipts _eventsWithReceipts;
+        EventsWithReceipts _eventsWithReceipts;
     };
     REGISTER_EVENT_TYPE(ReceiptEvent)
     DEFINE_EVENTTYPE_ALIAS(Receipt, ReceiptEvent)
-}  // namespace QMatrixClient
+} // namespace QMatrixClient
diff --git a/lib/events/redactionevent.h b/lib/events/redactionevent.h
index a72a8ff9..4187291c 100644
--- a/lib/events/redactionevent.h
+++ b/lib/events/redactionevent.h
@@ -13,28 +13,29 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
 #include "roomevent.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     class RedactionEvent : public RoomEvent
     {
         public:
-            DEFINE_EVENT_TYPEID("m.room.redaction", RedactionEvent)
+        DEFINE_EVENT_TYPEID("m.room.redaction", RedactionEvent)
 
-            explicit RedactionEvent(const QJsonObject& obj)
-                : RoomEvent(typeId(), obj)
-            { }
+        explicit RedactionEvent(const QJsonObject& obj)
+            : RoomEvent(typeId(), obj)
+        {
+        }
 
-            QString redactedEvent() const
-            { return fullJson()["redacts"_ls].toString(); }
-            QString reason() const
-            { return contentJson()["reason"_ls].toString(); }
+        QString redactedEvent() const
+        {
+            return fullJson()["redacts"_ls].toString();
+        }
+        QString reason() const { return contentJson()["reason"_ls].toString(); }
     };
     REGISTER_EVENT_TYPE(RedactionEvent)
     DEFINE_EVENTTYPE_ALIAS(Redaction, RedactionEvent)
diff --git a/lib/events/roomavatarevent.h b/lib/events/roomavatarevent.h
index a43d3a85..69cd1f9d 100644
--- a/lib/events/roomavatarevent.h
+++ b/lib/events/roomavatarevent.h
@@ -13,29 +13,29 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
-#include "stateevent.h"
 #include "eventcontent.h"
+#include "stateevent.h"
 
-namespace QMatrixClient
-{
-    class RoomAvatarEvent: public StateEvent<EventContent::ImageContent>
+namespace QMatrixClient {
+    class RoomAvatarEvent : public StateEvent<EventContent::ImageContent>
     {
-            // It's a bit of an overkill to use a full-fledged ImageContent
-            // because in reality m.room.avatar usually only has a single URL,
-            // without a thumbnail. But The Spec says there be thumbnails, and
-            // we follow The Spec.
+        // It's a bit of an overkill to use a full-fledged ImageContent
+        // because in reality m.room.avatar usually only has a single URL,
+        // without a thumbnail. But The Spec says there be thumbnails, and
+        // we follow The Spec.
         public:
-            DEFINE_EVENT_TYPEID("m.room.avatar", RoomAvatarEvent)
-            explicit RoomAvatarEvent(const QJsonObject& obj)
-                : StateEvent(typeId(), obj)
-            { }
-            QUrl url() const { return content().url; }
+        DEFINE_EVENT_TYPEID("m.room.avatar", RoomAvatarEvent)
+        explicit RoomAvatarEvent(const QJsonObject& obj)
+            : StateEvent(typeId(), obj)
+        {
+        }
+        QUrl url() const { return content().url; }
     };
     REGISTER_EVENT_TYPE(RoomAvatarEvent)
     DEFINE_EVENTTYPE_ALIAS(RoomAvatar, RoomAvatarEvent)
-}  // namespace QMatrixClient
+} // namespace QMatrixClient
diff --git a/lib/events/roomcreateevent.cpp b/lib/events/roomcreateevent.cpp
index 8fd0f1de..cb575f24 100644
--- a/lib/events/roomcreateevent.cpp
+++ b/lib/events/roomcreateevent.cpp
@@ -1,20 +1,20 @@
 /******************************************************************************
-* Copyright (C) 2019 QMatrixClient project
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ * Copyright (C) 2019 QMatrixClient project
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
 
 #include "roomcreateevent.h"
 
@@ -33,10 +33,8 @@ QString RoomCreateEvent::version() const
 RoomCreateEvent::Predecessor RoomCreateEvent::predecessor() const
 {
     const auto predJson = contentJson()["predecessor"_ls].toObject();
-    return {
-        fromJson<QString>(predJson["room_id"_ls]),
-        fromJson<QString>(predJson["event_id"_ls])
-    };
+    return { fromJson<QString>(predJson["room_id"_ls]),
+             fromJson<QString>(predJson["event_id"_ls]) };
 }
 
 bool RoomCreateEvent::isUpgrade() const
diff --git a/lib/events/roomcreateevent.h b/lib/events/roomcreateevent.h
index 0a8f27cc..fbfb33ca 100644
--- a/lib/events/roomcreateevent.h
+++ b/lib/events/roomcreateevent.h
@@ -1,49 +1,46 @@
 /******************************************************************************
-* Copyright (C) 2019 QMatrixClient project
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ * Copyright (C) 2019 QMatrixClient project
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
 
 #pragma once
 
 #include "stateevent.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     class RoomCreateEvent : public StateEventBase
     {
         public:
-            DEFINE_EVENT_TYPEID("m.room.create", RoomCreateEvent)
+        DEFINE_EVENT_TYPEID("m.room.create", RoomCreateEvent)
 
-            explicit RoomCreateEvent()
-                : StateEventBase(typeId(), matrixTypeId())
-            { }
-            explicit RoomCreateEvent(const QJsonObject& obj)
-                : StateEventBase(typeId(), obj)
-            { }
+        explicit RoomCreateEvent() : StateEventBase(typeId(), matrixTypeId()) {}
+        explicit RoomCreateEvent(const QJsonObject& obj)
+            : StateEventBase(typeId(), obj)
+        {
+        }
 
-            struct Predecessor
-            {
-                QString roomId;
-                QString eventId;
-            };
+        struct Predecessor {
+            QString roomId;
+            QString eventId;
+        };
 
-            bool isFederated() const;
-            QString version() const;
-            Predecessor predecessor() const;
-            bool isUpgrade() const;
+        bool isFederated() const;
+        QString version() const;
+        Predecessor predecessor() const;
+        bool isUpgrade() const;
     };
     REGISTER_EVENT_TYPE(RoomCreateEvent)
 }
diff --git a/lib/events/roomevent.cpp b/lib/events/roomevent.cpp
index 3d03509f..221a3a61 100644
--- a/lib/events/roomevent.cpp
+++ b/lib/events/roomevent.cpp
@@ -1,26 +1,26 @@
 /******************************************************************************
-* Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ * Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
 
 #include "roomevent.h"
 
-#include "redactionevent.h"
 #include "converters.h"
 #include "logging.h"
+#include "redactionevent.h"
 
 using namespace QMatrixClient;
 
@@ -30,15 +30,14 @@ using namespace QMatrixClient;
 RoomEvent::RoomEvent(Type type, event_mtype_t matrixType,
                      const QJsonObject& contentJson)
     : Event(type, matrixType, contentJson)
-{ }
+{
+}
 
-RoomEvent::RoomEvent(Type type, const QJsonObject& json)
-    : Event(type, json)
+RoomEvent::RoomEvent(Type type, const QJsonObject& json) : Event(type, json)
 {
     const auto unsignedData = json[UnsignedKeyL].toObject();
     const auto redaction = unsignedData[RedactedCauseKeyL];
-    if (redaction.isObject())
-    {
+    if (redaction.isObject()) {
         _redactedBecause = makeEvent<RedactionEvent>(redaction.toObject());
         return;
     }
@@ -46,14 +45,12 @@ RoomEvent::RoomEvent(Type type, const QJsonObject& json)
 
 RoomEvent::~RoomEvent() = default; // Let the smart pointer do its job
 
-QString RoomEvent::id() const
-{
-    return fullJson()[EventIdKeyL].toString();
-}
+QString RoomEvent::id() const { return fullJson()[EventIdKeyL].toString(); }
 
 QDateTime RoomEvent::timestamp() const
 {
-    return QMatrixClient::fromJson<QDateTime>(fullJson()["origin_server_ts"_ls]);
+    return QMatrixClient::fromJson<QDateTime>(
+            fullJson()["origin_server_ts"_ls]);
 }
 
 QString RoomEvent::roomId() const
@@ -68,7 +65,7 @@ QString RoomEvent::senderId() const
 
 QString RoomEvent::redactionReason() const
 {
-    return isRedacted() ? _redactedBecause->reason() : QString{};
+    return isRedacted() ? _redactedBecause->reason() : QString {};
 }
 
 QString RoomEvent::transactionId() const
@@ -91,7 +88,8 @@ void RoomEvent::setTransactionId(const QString& txnId)
 
 void RoomEvent::addId(const QString& newId)
 {
-    Q_ASSERT(id().isEmpty()); Q_ASSERT(!newId.isEmpty());
+    Q_ASSERT(id().isEmpty());
+    Q_ASSERT(!newId.isEmpty());
     editJson().insert(EventIdKey, newId);
     qCDebug(EVENTS) << "Event txnId -> id:" << transactionId() << "->" << id();
     Q_ASSERT(id() == newId);
@@ -110,7 +108,8 @@ CallEventBase::CallEventBase(Type type, event_mtype_t matrixType,
                              const QJsonObject& contentJson)
     : RoomEvent(type, matrixType,
                 makeCallContentJson(callId, version, contentJson))
-{ }
+{
+}
 
 CallEventBase::CallEventBase(Event::Type type, const QJsonObject& json)
     : RoomEvent(type, json)
diff --git a/lib/events/roomevent.h b/lib/events/roomevent.h
index ce96174e..746e9173 100644
--- a/lib/events/roomevent.h
+++ b/lib/events/roomevent.h
@@ -1,20 +1,20 @@
 /******************************************************************************
-* Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ * Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
 
 #pragma once
 
@@ -22,84 +22,84 @@
 
 #include <QtCore/QDateTime>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     class RedactionEvent;
 
     /** This class corresponds to m.room.* events */
     class RoomEvent : public Event
     {
-            Q_GADGET
-            Q_PROPERTY(QString id READ id)
-            Q_PROPERTY(QDateTime timestamp READ timestamp CONSTANT)
-            Q_PROPERTY(QString roomId READ roomId CONSTANT)
-            Q_PROPERTY(QString senderId READ senderId CONSTANT)
-            Q_PROPERTY(QString redactionReason READ redactionReason)
-            Q_PROPERTY(bool isRedacted READ isRedacted)
-            Q_PROPERTY(QString transactionId READ transactionId WRITE setTransactionId)
+        Q_GADGET
+        Q_PROPERTY(QString id READ id)
+        Q_PROPERTY(QDateTime timestamp READ timestamp CONSTANT)
+        Q_PROPERTY(QString roomId READ roomId CONSTANT)
+        Q_PROPERTY(QString senderId READ senderId CONSTANT)
+        Q_PROPERTY(QString redactionReason READ redactionReason)
+        Q_PROPERTY(bool isRedacted READ isRedacted)
+        Q_PROPERTY(
+                QString transactionId READ transactionId WRITE setTransactionId)
         public:
-            using factory_t = EventFactory<RoomEvent>;
+        using factory_t = EventFactory<RoomEvent>;
 
-            // RedactionEvent is an incomplete type here so we cannot inline
-            // constructors and destructors and we cannot use 'using'.
-            RoomEvent(Type type, event_mtype_t matrixType,
-                      const QJsonObject& contentJson = {});
-            RoomEvent(Type type, const QJsonObject& json);
-            ~RoomEvent() override;
+        // RedactionEvent is an incomplete type here so we cannot inline
+        // constructors and destructors and we cannot use 'using'.
+        RoomEvent(Type type, event_mtype_t matrixType,
+                  const QJsonObject& contentJson = {});
+        RoomEvent(Type type, const QJsonObject& json);
+        ~RoomEvent() override;
 
-            QString id() const;
-            QDateTime timestamp() const;
-            QString roomId() const;
-            QString senderId() const;
-            bool isRedacted() const { return bool(_redactedBecause); }
-            const event_ptr_tt<RedactionEvent>& redactedBecause() const
-            {
-                return _redactedBecause;
-            }
-            QString redactionReason() const;
-            QString transactionId() const;
-            QString stateKey() const;
+        QString id() const;
+        QDateTime timestamp() const;
+        QString roomId() const;
+        QString senderId() const;
+        bool isRedacted() const { return bool(_redactedBecause); }
+        const event_ptr_tt<RedactionEvent>& redactedBecause() const
+        {
+            return _redactedBecause;
+        }
+        QString redactionReason() const;
+        QString transactionId() const;
+        QString stateKey() const;
 
-            /**
-             * Sets the transaction id for locally created events. This should be
-             * done before the event is exposed to any code using the respective
-             * Q_PROPERTY.
-             *
-             * \param txnId - transaction id, normally obtained from
-             * Connection::generateTxnId()
-             */
-            void setTransactionId(const QString& txnId);
+        /**
+         * Sets the transaction id for locally created events. This should be
+         * done before the event is exposed to any code using the respective
+         * Q_PROPERTY.
+         *
+         * \param txnId - transaction id, normally obtained from
+         * Connection::generateTxnId()
+         */
+        void setTransactionId(const QString& txnId);
 
-            /**
-             * Sets event id for locally created events
-             *
-             * When a new event is created locally, it has no server id yet.
-             * This function allows to add the id once the confirmation from
-             * the server is received. There should be no id set previously
-             * in the event. It's the responsibility of the code calling addId()
-             * to notify clients that use Q_PROPERTY(id) about its change
-             */
-            void addId(const QString& newId);
+        /**
+         * Sets event id for locally created events
+         *
+         * When a new event is created locally, it has no server id yet.
+         * This function allows to add the id once the confirmation from
+         * the server is received. There should be no id set previously
+         * in the event. It's the responsibility of the code calling addId()
+         * to notify clients that use Q_PROPERTY(id) about its change
+         */
+        void addId(const QString& newId);
 
         private:
-            event_ptr_tt<RedactionEvent> _redactedBecause;
+        event_ptr_tt<RedactionEvent> _redactedBecause;
     };
     using RoomEventPtr = event_ptr_tt<RoomEvent>;
     using RoomEvents = EventsArray<RoomEvent>;
     using RoomEventsRange = Range<RoomEvents>;
 
-    class CallEventBase: public RoomEvent
+    class CallEventBase : public RoomEvent
     {
         public:
-            CallEventBase(Type type, event_mtype_t matrixType,
-                          const QString& callId, int version,
-                          const QJsonObject& contentJson = {});
-            CallEventBase(Type type, const QJsonObject& json);
-            ~CallEventBase() override = default;
-            bool isCallEvent() const override { return true; }
+        CallEventBase(Type type, event_mtype_t matrixType,
+                      const QString& callId, int version,
+                      const QJsonObject& contentJson = {});
+        CallEventBase(Type type, const QJsonObject& json);
+        ~CallEventBase() override = default;
+        bool isCallEvent() const override { return true; }
 
-            QString callId() const { return content<QString>("call_id"_ls); }
-            int version() const { return content<int>("version"_ls); }
+        QString callId() const { return content<QString>("call_id"_ls); }
+        int version() const { return content<int>("version"_ls); }
     };
 } // namespace QMatrixClient
 Q_DECLARE_METATYPE(QMatrixClient::RoomEvent*)
diff --git a/lib/events/roommemberevent.cpp b/lib/events/roommemberevent.cpp
index a5ac3c5f..53203873 100644
--- a/lib/events/roommemberevent.cpp
+++ b/lib/events/roommemberevent.cpp
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "roommemberevent.h"
@@ -23,21 +23,18 @@
 
 #include <array>
 
-static const std::array<QString, 5> membershipStrings = { {
-    QStringLiteral("invite"), QStringLiteral("join"),
-    QStringLiteral("knock"), QStringLiteral("leave"),
-    QStringLiteral("ban")
-} };
+static const std::array<QString, 5> membershipStrings = {
+    { QStringLiteral("invite"), QStringLiteral("join"), QStringLiteral("knock"),
+      QStringLiteral("leave"), QStringLiteral("ban") }
+};
 
 namespace QMatrixClient {
-    template <>
-    struct JsonConverter<MembershipType>
-    {
+    template <> struct JsonConverter<MembershipType> {
         static MembershipType load(const QJsonValue& jv)
         {
             const auto& membershipString = jv.toString();
             for (auto it = membershipStrings.begin();
-                    it != membershipStrings.end(); ++it)
+                 it != membershipStrings.end(); ++it)
                 if (membershipString == *it)
                     return MembershipType(it - membershipStrings.begin());
 
@@ -50,17 +47,18 @@ namespace QMatrixClient {
 using namespace QMatrixClient;
 
 MemberEventContent::MemberEventContent(const QJsonObject& json)
-    : membership(fromJson<MembershipType>(json["membership"_ls]))
-    , isDirect(json["is_direct"_ls].toBool())
-    , displayName(json["displayname"_ls].toString())
-    , avatarUrl(json["avatar_url"_ls].toString())
-{ }
+    : membership(fromJson<MembershipType>(json["membership"_ls])),
+      isDirect(json["is_direct"_ls].toBool()),
+      displayName(json["displayname"_ls].toString()),
+      avatarUrl(json["avatar_url"_ls].toString())
+{
+}
 
 void MemberEventContent::fillJson(QJsonObject* o) const
 {
     Q_ASSERT(o);
     Q_ASSERT_X(membership != MembershipType::Undefined, __FUNCTION__,
-             "The key 'membership' must be explicit in MemberEventContent");
+               "The key 'membership' must be explicit in MemberEventContent");
     if (membership != MembershipType::Undefined)
         o->insert(QStringLiteral("membership"), membershipStrings[membership]);
     o->insert(QStringLiteral("displayname"), displayName);
@@ -70,21 +68,21 @@ void MemberEventContent::fillJson(QJsonObject* o) const
 
 bool RoomMemberEvent::isInvite() const
 {
-    return membership() == MembershipType::Invite &&
-            (!prevContent() || prevContent()->membership != membership());
+    return membership() == MembershipType::Invite
+            && (!prevContent() || prevContent()->membership != membership());
 }
 
 bool RoomMemberEvent::isJoin() const
 {
-    return membership() == MembershipType::Join &&
-            (!prevContent() || prevContent()->membership != membership());
+    return membership() == MembershipType::Join
+            && (!prevContent() || prevContent()->membership != membership());
 }
 
 bool RoomMemberEvent::isLeave() const
 {
-    return membership() == MembershipType::Leave &&
-            prevContent() && prevContent()->membership != membership() &&
-            prevContent()->membership != MembershipType::Ban;
+    return membership() == MembershipType::Leave && prevContent()
+            && prevContent()->membership != membership()
+            && prevContent()->membership != MembershipType::Ban;
 }
 
 bool RoomMemberEvent::isRename() const
diff --git a/lib/events/roommemberevent.h b/lib/events/roommemberevent.h
index b8224033..55f419d8 100644
--- a/lib/events/roommemberevent.h
+++ b/lib/events/roommemberevent.h
@@ -13,94 +13,100 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
-#include "stateevent.h"
 #include "eventcontent.h"
+#include "stateevent.h"
 
-namespace QMatrixClient
-{
-    class MemberEventContent: public EventContent::Base
+namespace QMatrixClient {
+    class MemberEventContent : public EventContent::Base
     {
         public:
-            enum MembershipType : size_t { Invite = 0, Join, Knock, Leave, Ban,
-                                           Undefined };
+        enum MembershipType : size_t {
+            Invite = 0,
+            Join,
+            Knock,
+            Leave,
+            Ban,
+            Undefined
+        };
 
-            explicit MemberEventContent(MembershipType mt = Join)
-                : membership(mt)
-            { }
-            explicit MemberEventContent(const QJsonObject& json);
+        explicit MemberEventContent(MembershipType mt = Join) : membership(mt)
+        {
+        }
+        explicit MemberEventContent(const QJsonObject& json);
 
-            MembershipType membership;
-            bool isDirect = false;
-            QString displayName;
-            QUrl avatarUrl;
+        MembershipType membership;
+        bool isDirect = false;
+        QString displayName;
+        QUrl avatarUrl;
 
         protected:
-            void fillJson(QJsonObject* o) const override;
+        void fillJson(QJsonObject* o) const override;
     };
 
     using MembershipType = MemberEventContent::MembershipType;
 
-    class RoomMemberEvent: public StateEvent<MemberEventContent>
+    class RoomMemberEvent : public StateEvent<MemberEventContent>
     {
-            Q_GADGET
+        Q_GADGET
         public:
-            DEFINE_EVENT_TYPEID("m.room.member", RoomMemberEvent)
+        DEFINE_EVENT_TYPEID("m.room.member", RoomMemberEvent)
 
-            using MembershipType = MemberEventContent::MembershipType;
+        using MembershipType = MemberEventContent::MembershipType;
 
-            explicit RoomMemberEvent(const QJsonObject& obj)
-                : StateEvent(typeId(), obj)
-            { }
-            RoomMemberEvent(MemberEventContent&& c)
-                : StateEvent(typeId(), matrixTypeId(), c)
-            { }
+        explicit RoomMemberEvent(const QJsonObject& obj)
+            : StateEvent(typeId(), obj)
+        {
+        }
+        RoomMemberEvent(MemberEventContent&& c)
+            : StateEvent(typeId(), matrixTypeId(), c)
+        {
+        }
 
-            /// A special constructor to create unknown RoomMemberEvents
-            /**
-             * This is needed in order to use RoomMemberEvent as a "base event
-             * class" in cases like GetMembersByRoomJob when RoomMemberEvents
-             * (rather than RoomEvents or StateEvents) are resolved from JSON.
-             * For such cases loadEvent<> requires an underlying class to be
-             * constructible with unknownTypeId() instead of its genuine id.
-             * Don't use it directly.
-             * \sa GetMembersByRoomJob, loadEvent, unknownTypeId
-             */
-            RoomMemberEvent(Type type, const QJsonObject& fullJson)
-                : StateEvent(type, fullJson)
-            { }
+        /// A special constructor to create unknown RoomMemberEvents
+        /**
+         * This is needed in order to use RoomMemberEvent as a "base event
+         * class" in cases like GetMembersByRoomJob when RoomMemberEvents
+         * (rather than RoomEvents or StateEvents) are resolved from JSON.
+         * For such cases loadEvent<> requires an underlying class to be
+         * constructible with unknownTypeId() instead of its genuine id.
+         * Don't use it directly.
+         * \sa GetMembersByRoomJob, loadEvent, unknownTypeId
+         */
+        RoomMemberEvent(Type type, const QJsonObject& fullJson)
+            : StateEvent(type, fullJson)
+        {
+        }
 
-            MembershipType membership() const  { return content().membership; }
-            QString userId() const
-                { return fullJson()["state_key"_ls].toString(); }
-            bool isDirect() const { return content().isDirect; }
-            QString displayName() const { return content().displayName; }
-            QUrl avatarUrl() const      { return content().avatarUrl; }
-            bool isInvite() const;
-            bool isJoin() const;
-            bool isLeave() const;
-            bool isRename() const;
-            bool isAvatarUpdate() const;
+        MembershipType membership() const { return content().membership; }
+        QString userId() const { return fullJson()["state_key"_ls].toString(); }
+        bool isDirect() const { return content().isDirect; }
+        QString displayName() const { return content().displayName; }
+        QUrl avatarUrl() const { return content().avatarUrl; }
+        bool isInvite() const;
+        bool isJoin() const;
+        bool isLeave() const;
+        bool isRename() const;
+        bool isAvatarUpdate() const;
 
         private:
-            REGISTER_ENUM(MembershipType)
+        REGISTER_ENUM(MembershipType)
     };
 
-    template <>
-    class EventFactory<RoomMemberEvent>
+    template <> class EventFactory<RoomMemberEvent>
     {
         public:
-            static event_ptr_tt<RoomMemberEvent> make(const QJsonObject& json,
-                                                      const QString&)
-            {
-                return makeEvent<RoomMemberEvent>(json);
-            }
+        static event_ptr_tt<RoomMemberEvent> make(const QJsonObject& json,
+                                                  const QString&)
+        {
+            return makeEvent<RoomMemberEvent>(json);
+        }
     };
 
     REGISTER_EVENT_TYPE(RoomMemberEvent)
     DEFINE_EVENTTYPE_ALIAS(RoomMember, RoomMemberEvent)
-}  // namespace QMatrixClient
+} // namespace QMatrixClient
diff --git a/lib/events/roommessageevent.cpp b/lib/events/roommessageevent.cpp
index 8f4e0ebc..0af02eb0 100644
--- a/lib/events/roommessageevent.cpp
+++ b/lib/events/roommessageevent.cpp
@@ -13,15 +13,15 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "roommessageevent.h"
 
 #include "logging.h"
 
-#include <QtCore/QMimeDatabase>
 #include <QtCore/QFileInfo>
+#include <QtCore/QMimeDatabase>
 #include <QtGui/QImageReader>
 #include <QtMultimedia/QMediaResource>
 
@@ -40,41 +40,40 @@ static const auto NoticeTypeKey = "m.notice";
 
 static const auto HtmlContentTypeId = QStringLiteral("org.matrix.custom.html");
 
-template <typename ContentT>
-TypedBase* make(const QJsonObject& json)
+template <typename ContentT> TypedBase* make(const QJsonObject& json)
 {
     return new ContentT(json);
 }
 
-template <>
-TypedBase* make<TextContent>(const QJsonObject& json)
+template <> TypedBase* make<TextContent>(const QJsonObject& json)
 {
     return json.contains(FormattedBodyKey) || json.contains(RelatesToKey)
-            ? new TextContent(json) : nullptr;
+            ? new TextContent(json)
+            : nullptr;
 }
 
-struct MsgTypeDesc
-{
+struct MsgTypeDesc {
     QString matrixType;
     MsgType enumType;
     TypedBase* (*maker)(const QJsonObject&);
 };
 
-const std::vector<MsgTypeDesc> msgTypes =
-    { { TextTypeKey, MsgType::Text, make<TextContent> }
-    , { QStringLiteral("m.emote"), MsgType::Emote, make<TextContent> }
-    , { NoticeTypeKey, MsgType::Notice, make<TextContent> }
-    , { QStringLiteral("m.image"), MsgType::Image, make<ImageContent> }
-    , { QStringLiteral("m.file"), MsgType::File, make<FileContent> }
-    , { QStringLiteral("m.location"), MsgType::Location, make<LocationContent> }
-    , { QStringLiteral("m.video"), MsgType::Video, make<VideoContent> }
-    , { QStringLiteral("m.audio"), MsgType::Audio, make<AudioContent> }
-    };
+const std::vector<MsgTypeDesc> msgTypes = {
+    { TextTypeKey, MsgType::Text, make<TextContent> },
+    { QStringLiteral("m.emote"), MsgType::Emote, make<TextContent> },
+    { NoticeTypeKey, MsgType::Notice, make<TextContent> },
+    { QStringLiteral("m.image"), MsgType::Image, make<ImageContent> },
+    { QStringLiteral("m.file"), MsgType::File, make<FileContent> },
+    { QStringLiteral("m.location"), MsgType::Location, make<LocationContent> },
+    { QStringLiteral("m.video"), MsgType::Video, make<VideoContent> },
+    { QStringLiteral("m.audio"), MsgType::Audio, make<AudioContent> }
+};
 
 QString msgTypeToJson(MsgType enumType)
 {
-    auto it = std::find_if(msgTypes.begin(), msgTypes.end(),
-        [=](const MsgTypeDesc& mtd) { return mtd.enumType == enumType; });
+    auto it = std::find_if(
+            msgTypes.begin(), msgTypes.end(),
+            [=](const MsgTypeDesc& mtd) { return mtd.enumType == enumType; });
     if (it != msgTypes.end())
         return it->matrixType;
 
@@ -84,7 +83,9 @@ QString msgTypeToJson(MsgType enumType)
 MsgType jsonToMsgType(const QString& matrixType)
 {
     auto it = std::find_if(msgTypes.begin(), msgTypes.end(),
-        [=](const MsgTypeDesc& mtd) { return mtd.matrixType == matrixType; });
+                           [=](const MsgTypeDesc& mtd) {
+                               return mtd.matrixType == matrixType;
+                           });
     if (it != msgTypes.end())
         return it->enumType;
 
@@ -92,12 +93,12 @@ MsgType jsonToMsgType(const QString& matrixType)
 }
 
 QJsonObject RoomMessageEvent::assembleContentJson(const QString& plainBody,
-                const QString& jsonMsgType, TypedBase* content)
+                                                  const QString& jsonMsgType,
+                                                  TypedBase* content)
 {
     auto json = content ? content->toJson() : QJsonObject();
-    if (jsonMsgType != TextTypeKey && jsonMsgType != NoticeTypeKey &&
-            json.contains(RelatesToKey))
-    {
+    if (jsonMsgType != TextTypeKey && jsonMsgType != NoticeTypeKey
+        && json.contains(RelatesToKey)) {
         json.remove(RelatesToKey);
         qCWarning(EVENTS) << RelatesToKey << "cannot be used in" << jsonMsgType
                           << "messages; the relation has been stripped off";
@@ -108,24 +109,26 @@ QJsonObject RoomMessageEvent::assembleContentJson(const QString& plainBody,
 }
 
 RoomMessageEvent::RoomMessageEvent(const QString& plainBody,
-        const QString& jsonMsgType, TypedBase* content)
+                                   const QString& jsonMsgType,
+                                   TypedBase* content)
     : RoomEvent(typeId(), matrixTypeId(),
-                assembleContentJson(plainBody, jsonMsgType, content))
-    , _content(content)
-{ }
+                assembleContentJson(plainBody, jsonMsgType, content)),
+      _content(content)
+{
+}
 
-RoomMessageEvent::RoomMessageEvent(const QString& plainBody,
-                                   MsgType msgType, TypedBase* content)
+RoomMessageEvent::RoomMessageEvent(const QString& plainBody, MsgType msgType,
+                                   TypedBase* content)
     : RoomMessageEvent(plainBody, msgTypeToJson(msgType), content)
-{ }
+{
+}
 
 TypedBase* contentFromFile(const QFileInfo& file, bool asGenericFile)
 {
     auto filePath = file.absoluteFilePath();
     auto localUrl = QUrl::fromLocalFile(filePath);
     auto mimeType = QMimeDatabase().mimeTypeForFile(file);
-    if (!asGenericFile)
-    {
+    if (!asGenericFile) {
         auto mimeTypeName = mimeType.name();
         if (mimeTypeName.startsWith("image/"))
             return new ImageContent(localUrl, file.size(), mimeType,
@@ -147,11 +150,13 @@ TypedBase* contentFromFile(const QFileInfo& file, bool asGenericFile)
 }
 
 RoomMessageEvent::RoomMessageEvent(const QString& plainBody,
-        const QFileInfo& file, bool asGenericFile)
+                                   const QFileInfo& file, bool asGenericFile)
     : RoomMessageEvent(plainBody,
-        asGenericFile ? QStringLiteral("m.file") : rawMsgTypeForFile(file),
-        contentFromFile(file, asGenericFile))
-{ }
+                       asGenericFile ? QStringLiteral("m.file")
+                                     : rawMsgTypeForFile(file),
+                       contentFromFile(file, asGenericFile))
+{
+}
 
 RoomMessageEvent::RoomMessageEvent(const QJsonObject& obj)
     : RoomEvent(typeId(), obj), _content(nullptr)
@@ -159,26 +164,21 @@ RoomMessageEvent::RoomMessageEvent(const QJsonObject& obj)
     if (isRedacted())
         return;
     const QJsonObject content = contentJson();
-    if ( content.contains(MsgTypeKey) && content.contains(BodyKey) )
-    {
+    if (content.contains(MsgTypeKey) && content.contains(BodyKey)) {
         auto msgtype = content[MsgTypeKey].toString();
         bool msgTypeFound = false;
-        for (const auto& mt: msgTypes)
-            if (mt.matrixType == msgtype)
-            {
+        for (const auto& mt : msgTypes)
+            if (mt.matrixType == msgtype) {
                 _content.reset(mt.maker(content));
                 msgTypeFound = true;
             }
 
-        if (!msgTypeFound)
-        {
+        if (!msgTypeFound) {
             qCWarning(EVENTS) << "RoomMessageEvent: unknown msg_type,"
                               << " full content dump follows";
             qCWarning(EVENTS) << formatJson << content;
         }
-    }
-    else
-    {
+    } else {
         qCWarning(EVENTS) << "No body or msgtype in room message event";
         qCWarning(EVENTS) << formatJson << obj;
     }
@@ -208,9 +208,9 @@ QMimeType RoomMessageEvent::mimeType() const
 
 bool RoomMessageEvent::hasTextContent() const
 {
-    return !content() ||
-        (msgtype() == MsgType::Text || msgtype() == MsgType::Emote ||
-         msgtype() == MsgType::Notice);
+    return !content()
+            || (msgtype() == MsgType::Text || msgtype() == MsgType::Emote
+                || msgtype() == MsgType::Notice);
 }
 
 bool RoomMessageEvent::hasFileContent() const
@@ -226,10 +226,11 @@ bool RoomMessageEvent::hasThumbnail() const
 QString rawMsgTypeForMimeType(const QMimeType& mimeType)
 {
     auto name = mimeType.name();
-    return name.startsWith("image/") ? QStringLiteral("m.image") :
-            name.startsWith("video/") ? QStringLiteral("m.video") :
-            name.startsWith("audio/") ? QStringLiteral("m.audio") :
-            QStringLiteral("m.file");
+    return name.startsWith("image/") ? QStringLiteral("m.image")
+                                     : name.startsWith("video/")
+                    ? QStringLiteral("m.video")
+                    : name.startsWith("audio/") ? QStringLiteral("m.audio")
+                                                : QStringLiteral("m.file");
 }
 
 QString RoomMessageEvent::rawMsgTypeForUrl(const QUrl& url)
@@ -244,8 +245,9 @@ QString RoomMessageEvent::rawMsgTypeForFile(const QFileInfo& fi)
 
 TextContent::TextContent(const QString& text, const QString& contentType,
                          Omittable<RelatesTo> relatesTo)
-    : mimeType(QMimeDatabase().mimeTypeForName(contentType)), body(text)
-    , relatesTo(std::move(relatesTo))
+    : mimeType(QMimeDatabase().mimeTypeForName(contentType)),
+      body(text),
+      relatesTo(std::move(relatesTo))
 {
     if (contentType == HtmlContentTypeId)
         mimeType = QMimeDatabase().mimeTypeForName("text/html");
@@ -259,8 +261,7 @@ TextContent::TextContent(const QJsonObject& json)
 
     // Special-casing the custom matrix.org's (actually, Riot's) way
     // of sending HTML messages.
-    if (json["format"_ls].toString() == HtmlContentTypeId)
-    {
+    if (json["format"_ls].toString() == HtmlContentTypeId) {
         mimeType = HtmlMimeType;
         body = json[FormattedBodyKey].toString();
     } else {
@@ -269,8 +270,10 @@ TextContent::TextContent(const QJsonObject& json)
         mimeType = PlainTextMimeType;
         body = json[BodyKey].toString();
     }
-    const auto replyJson = json[RelatesToKey].toObject()
-                           .value(RelatesTo::ReplyTypeId()).toObject();
+    const auto replyJson = json[RelatesToKey]
+                                   .toObject()
+                                   .value(RelatesTo::ReplyTypeId())
+                                   .toObject();
     if (!replyJson.isEmpty())
         relatesTo = replyTo(fromJson<QString>(replyJson[EventIdKeyL]));
 }
@@ -278,26 +281,27 @@ TextContent::TextContent(const QJsonObject& json)
 void TextContent::fillJson(QJsonObject* json) const
 {
     Q_ASSERT(json);
-    if (mimeType.inherits("text/html"))
-    {
+    if (mimeType.inherits("text/html")) {
         json->insert(QStringLiteral("format"), HtmlContentTypeId);
         json->insert(QStringLiteral("formatted_body"), body);
     }
     if (!relatesTo.omitted())
         json->insert(QStringLiteral("m.relates_to"),
-            QJsonObject { { relatesTo->type, relatesTo->eventId } });
+                     QJsonObject { { relatesTo->type, relatesTo->eventId } });
 }
 
 LocationContent::LocationContent(const QString& geoUri,
                                  const Thumbnail& thumbnail)
     : geoUri(geoUri), thumbnail(thumbnail)
-{ }
+{
+}
 
 LocationContent::LocationContent(const QJsonObject& json)
-    : TypedBase(json)
-    , geoUri(json["geo_uri"_ls].toString())
-    , thumbnail(json["info"_ls].toObject())
-{ }
+    : TypedBase(json),
+      geoUri(json["geo_uri"_ls].toString()),
+      thumbnail(json["info"_ls].toObject())
+{
+}
 
 QMimeType LocationContent::type() const
 {
diff --git a/lib/events/roommessageevent.h b/lib/events/roommessageevent.h
index c2e075eb..bd1b7c83 100644
--- a/lib/events/roommessageevent.h
+++ b/lib/events/roommessageevent.h
@@ -13,88 +13,94 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
-#include "roomevent.h"
 #include "eventcontent.h"
+#include "roomevent.h"
 
 class QFileInfo;
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     namespace MessageEventContent = EventContent; // Back-compatibility
 
     /**
      * The event class corresponding to m.room.message events
      */
-    class RoomMessageEvent: public RoomEvent
+    class RoomMessageEvent : public RoomEvent
     {
-            Q_GADGET
-            Q_PROPERTY(QString msgType READ rawMsgtype CONSTANT)
-            Q_PROPERTY(QString plainBody READ plainBody CONSTANT)
-            Q_PROPERTY(QMimeType mimeType READ mimeType STORED false CONSTANT)
-            Q_PROPERTY(EventContent::TypedBase* content READ content CONSTANT)
+        Q_GADGET
+        Q_PROPERTY(QString msgType READ rawMsgtype CONSTANT)
+        Q_PROPERTY(QString plainBody READ plainBody CONSTANT)
+        Q_PROPERTY(QMimeType mimeType READ mimeType STORED false CONSTANT)
+        Q_PROPERTY(EventContent::TypedBase* content READ content CONSTANT)
         public:
-            DEFINE_EVENT_TYPEID("m.room.message", RoomMessageEvent)
+        DEFINE_EVENT_TYPEID("m.room.message", RoomMessageEvent)
+
+        enum class MsgType {
+            Text,
+            Emote,
+            Notice,
+            Image,
+            File,
+            Location,
+            Video,
+            Audio,
+            Unknown
+        };
 
-            enum class MsgType
-            {
-                Text, Emote, Notice, Image, File, Location, Video, Audio, Unknown
-            };
-
-            RoomMessageEvent(const QString& plainBody,
-                             const QString& jsonMsgType,
-                             EventContent::TypedBase* content = nullptr);
-            explicit RoomMessageEvent(const QString& plainBody,
-                                      MsgType msgType = MsgType::Text,
-                                      EventContent::TypedBase* content = nullptr);
-            explicit RoomMessageEvent(const QString& plainBody,
-                                      const QFileInfo& file,
-                                      bool asGenericFile = false);
-            explicit RoomMessageEvent(const QJsonObject& obj);
-
-            MsgType msgtype() const;
-            QString rawMsgtype() const;
-            QString plainBody() const;
-            EventContent::TypedBase* content() const
-                                             { return _content.data(); }
-            template <typename VisitorT>
-            void editContent(VisitorT visitor)
-            {
-                visitor(*_content);
-                editJson()[ContentKeyL] =
+        RoomMessageEvent(const QString& plainBody, const QString& jsonMsgType,
+                         EventContent::TypedBase* content = nullptr);
+        explicit RoomMessageEvent(const QString& plainBody,
+                                  MsgType msgType = MsgType::Text,
+                                  EventContent::TypedBase* content = nullptr);
+        explicit RoomMessageEvent(const QString& plainBody,
+                                  const QFileInfo& file,
+                                  bool asGenericFile = false);
+        explicit RoomMessageEvent(const QJsonObject& obj);
+
+        MsgType msgtype() const;
+        QString rawMsgtype() const;
+        QString plainBody() const;
+        EventContent::TypedBase* content() const { return _content.data(); }
+        template <typename VisitorT> void editContent(VisitorT visitor)
+        {
+            visitor(*_content);
+            editJson()[ContentKeyL] =
                     assembleContentJson(plainBody(), rawMsgtype(), content());
-            }
-            QMimeType mimeType() const;
-            bool hasTextContent() const;
-            bool hasFileContent() const;
-            bool hasThumbnail() const;
+        }
+        QMimeType mimeType() const;
+        bool hasTextContent() const;
+        bool hasFileContent() const;
+        bool hasThumbnail() const;
 
-            static QString rawMsgTypeForUrl(const QUrl& url);
-            static QString rawMsgTypeForFile(const QFileInfo& fi);
+        static QString rawMsgTypeForUrl(const QUrl& url);
+        static QString rawMsgTypeForFile(const QFileInfo& fi);
 
         private:
-            QScopedPointer<EventContent::TypedBase> _content;
+        QScopedPointer<EventContent::TypedBase> _content;
 
-            static QJsonObject assembleContentJson(const QString& plainBody,
-                const QString& jsonMsgType, EventContent::TypedBase* content);
+        static QJsonObject
+        assembleContentJson(const QString& plainBody,
+                            const QString& jsonMsgType,
+                            EventContent::TypedBase* content);
 
-            REGISTER_ENUM(MsgType)
+        REGISTER_ENUM(MsgType)
     };
     REGISTER_EVENT_TYPE(RoomMessageEvent)
     DEFINE_EVENTTYPE_ALIAS(RoomMessage, RoomMessageEvent)
     using MessageEventType = RoomMessageEvent::MsgType;
 
-    namespace EventContent
-    {
+    namespace EventContent {
         // Additional event content types
 
-        struct RelatesTo
-        {
-            static constexpr const char* ReplyTypeId() { return "m.in_reply_to"; }
+        struct RelatesTo {
+            static constexpr const char* ReplyTypeId()
+            {
+                return "m.in_reply_to";
+            }
             QString type; // The only supported relation so far
             QString eventId;
         };
@@ -109,21 +115,21 @@ namespace QMatrixClient
          * Available fields: mimeType, body. The body can be either rich text
          * or plain text, depending on what mimeType specifies.
          */
-        class TextContent: public TypedBase
+        class TextContent : public TypedBase
         {
             public:
-                TextContent(const QString& text, const QString& contentType,
-                            Omittable<RelatesTo> relatesTo = none);
-                explicit TextContent(const QJsonObject& json);
+            TextContent(const QString& text, const QString& contentType,
+                        Omittable<RelatesTo> relatesTo = none);
+            explicit TextContent(const QJsonObject& json);
 
-                QMimeType type() const override { return mimeType; }
+            QMimeType type() const override { return mimeType; }
 
-                QMimeType mimeType;
-                QString body;
-                Omittable<RelatesTo> relatesTo;
+            QMimeType mimeType;
+            QString body;
+            Omittable<RelatesTo> relatesTo;
 
             protected:
-                void fillJson(QJsonObject* json) const override;
+            void fillJson(QJsonObject* json) const override;
         };
 
         /**
@@ -139,47 +145,47 @@ namespace QMatrixClient
          *   - thumbnail.mimeType
          *   - thumbnail.imageSize
          */
-        class LocationContent: public TypedBase
+        class LocationContent : public TypedBase
         {
             public:
-                LocationContent(const QString& geoUri,
-                                const Thumbnail& thumbnail = {});
-                explicit LocationContent(const QJsonObject& json);
+            LocationContent(const QString& geoUri,
+                            const Thumbnail& thumbnail = {});
+            explicit LocationContent(const QJsonObject& json);
 
-                QMimeType type() const override;
+            QMimeType type() const override;
 
             public:
-                QString geoUri;
-                Thumbnail thumbnail;
+            QString geoUri;
+            Thumbnail thumbnail;
 
             protected:
-                void fillJson(QJsonObject* o) const override;
+            void fillJson(QJsonObject* o) const override;
         };
 
         /**
          * A base class for info types that include duration: audio and video
          */
-        template <typename ContentT>
-        class PlayableContent : public ContentT
+        template <typename ContentT> class PlayableContent : public ContentT
         {
             public:
-                using ContentT::ContentT;
-                PlayableContent(const QJsonObject& json)
-                    : ContentT(json)
-                    , duration(ContentT::originalInfoJson["duration"_ls].toInt())
-                { }
+            using ContentT::ContentT;
+            PlayableContent(const QJsonObject& json)
+                : ContentT(json),
+                  duration(ContentT::originalInfoJson["duration"_ls].toInt())
+            {
+            }
 
             protected:
-                void fillJson(QJsonObject* json) const override
-                {
-                    ContentT::fillJson(json);
-                    auto infoJson = json->take("info"_ls).toObject();
-                    infoJson.insert(QStringLiteral("duration"), duration);
-                    json->insert(QStringLiteral("info"), infoJson);
-                }
+            void fillJson(QJsonObject* json) const override
+            {
+                ContentT::fillJson(json);
+                auto infoJson = json->take("info"_ls).toObject();
+                infoJson.insert(QStringLiteral("duration"), duration);
+                json->insert(QStringLiteral("info"), infoJson);
+            }
 
             public:
-                int duration;
+            int duration;
         };
 
         /**
@@ -201,7 +207,8 @@ namespace QMatrixClient
          *   - mimeType
          *   - imageSize
          */
-        using VideoContent = PlayableContent<UrlWithThumbnailContent<ImageInfo>>;
+        using VideoContent =
+                PlayableContent<UrlWithThumbnailContent<ImageInfo>>;
 
         /**
          * Content class for m.audio
@@ -216,5 +223,5 @@ namespace QMatrixClient
          *   - duration
          */
         using AudioContent = PlayableContent<UrlBasedContent<FileInfo>>;
-    }  // namespace EventContent
-}  // namespace QMatrixClient
+    } // namespace EventContent
+} // namespace QMatrixClient
diff --git a/lib/events/roomtombstoneevent.cpp b/lib/events/roomtombstoneevent.cpp
index 9c3bafd4..a74bb367 100644
--- a/lib/events/roomtombstoneevent.cpp
+++ b/lib/events/roomtombstoneevent.cpp
@@ -1,20 +1,20 @@
 /******************************************************************************
-* Copyright (C) 2019 QMatrixClient project
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ * Copyright (C) 2019 QMatrixClient project
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
 
 #include "roomtombstoneevent.h"
 
diff --git a/lib/events/roomtombstoneevent.h b/lib/events/roomtombstoneevent.h
index c7008ec4..5b7ade76 100644
--- a/lib/events/roomtombstoneevent.h
+++ b/lib/events/roomtombstoneevent.h
@@ -1,41 +1,41 @@
 /******************************************************************************
-* Copyright (C) 2019 QMatrixClient project
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ * Copyright (C) 2019 QMatrixClient project
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
 
 #pragma once
 
 #include "stateevent.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     class RoomTombstoneEvent : public StateEventBase
     {
         public:
-            DEFINE_EVENT_TYPEID("m.room.tombstone", RoomTombstoneEvent)
+        DEFINE_EVENT_TYPEID("m.room.tombstone", RoomTombstoneEvent)
 
-            explicit RoomTombstoneEvent()
-                : StateEventBase(typeId(), matrixTypeId())
-            { }
-            explicit RoomTombstoneEvent(const QJsonObject& obj)
-                : StateEventBase(typeId(), obj)
-            { }
+        explicit RoomTombstoneEvent() : StateEventBase(typeId(), matrixTypeId())
+        {
+        }
+        explicit RoomTombstoneEvent(const QJsonObject& obj)
+            : StateEventBase(typeId(), obj)
+        {
+        }
 
-            QString serverMessage() const;
-            QString successorRoomId() const;
+        QString serverMessage() const;
+        QString successorRoomId() const;
     };
     REGISTER_EVENT_TYPE(RoomTombstoneEvent)
 }
diff --git a/lib/events/simplestateevents.h b/lib/events/simplestateevents.h
index 2c23d9ca..430eacb0 100644
--- a/lib/events/simplestateevents.h
+++ b/lib/events/simplestateevents.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
@@ -22,71 +22,70 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
-{
-    namespace EventContent
-    {
-        template <typename T>
-        class SimpleContent
+namespace QMatrixClient {
+    namespace EventContent {
+        template <typename T> class SimpleContent
         {
             public:
-                using value_type = T;
+            using value_type = T;
 
-                // The constructor is templated to enable perfect forwarding
-                template <typename TT>
-                SimpleContent(QString keyName, TT&& value)
-                    : value(std::forward<TT>(value)), key(std::move(keyName))
-                { }
-                SimpleContent(const QJsonObject& json, QString keyName)
-                    : value(fromJson<T>(json[keyName]))
-                    , key(std::move(keyName))
-                { }
-                QJsonObject toJson() const
-                {
-                    return { { key, QMatrixClient::toJson(value) } };
-                }
+            // The constructor is templated to enable perfect forwarding
+            template <typename TT>
+            SimpleContent(QString keyName, TT&& value)
+                : value(std::forward<TT>(value)), key(std::move(keyName))
+            {
+            }
+            SimpleContent(const QJsonObject& json, QString keyName)
+                : value(fromJson<T>(json[keyName])), key(std::move(keyName))
+            {
+            }
+            QJsonObject toJson() const
+            {
+                return { { key, QMatrixClient::toJson(value) } };
+            }
 
             public:
-                T value;
+            T value;
 
             protected:
-                QString key;
+            QString key;
         };
     } // namespace EventContent
 
-#define DEFINE_SIMPLE_STATE_EVENT(_Name, _TypeId, _ValueType, _ContentKey) \
-    class _Name : public StateEvent<EventContent::SimpleContent<_ValueType>> \
-    { \
-        public: \
-            using value_type = content_type::value_type; \
-            DEFINE_EVENT_TYPEID(_TypeId, _Name) \
-            explicit _Name() : _Name(value_type()) { } \
-            template <typename T> \
-            explicit _Name(T&& value) \
-                : StateEvent(typeId(), matrixTypeId(), \
-                             QStringLiteral(#_ContentKey), \
-                             std::forward<T>(value)) \
-            { } \
-            explicit _Name(QJsonObject obj) \
-                : StateEvent(typeId(), std::move(obj), \
-                             QStringLiteral(#_ContentKey)) \
-            { } \
-            auto _ContentKey() const { return content().value; } \
-    }; \
-    REGISTER_EVENT_TYPE(_Name) \
+#define DEFINE_SIMPLE_STATE_EVENT(_Name, _TypeId, _ValueType, _ContentKey)     \
+    class _Name : public StateEvent<EventContent::SimpleContent<_ValueType>>   \
+    {                                                                          \
+        public:                                                                \
+        using value_type = content_type::value_type;                           \
+        DEFINE_EVENT_TYPEID(_TypeId, _Name)                                    \
+        explicit _Name() : _Name(value_type()) {}                              \
+        template <typename T>                                                  \
+        explicit _Name(T&& value)                                              \
+            : StateEvent(typeId(), matrixTypeId(),                             \
+                         QStringLiteral(#_ContentKey), std::forward<T>(value)) \
+        {                                                                      \
+        }                                                                      \
+        explicit _Name(QJsonObject obj)                                        \
+            : StateEvent(typeId(), std::move(obj),                             \
+                         QStringLiteral(#_ContentKey))                         \
+        {                                                                      \
+        }                                                                      \
+        auto _ContentKey() const { return content().value; }                   \
+    };                                                                         \
+    REGISTER_EVENT_TYPE(_Name)                                                 \
     // End of macro
 
     DEFINE_SIMPLE_STATE_EVENT(RoomNameEvent, "m.room.name", QString, name)
     DEFINE_EVENTTYPE_ALIAS(RoomName, RoomNameEvent)
-    DEFINE_SIMPLE_STATE_EVENT(RoomAliasesEvent, "m.room.aliases",
-                              QStringList, aliases)
+    DEFINE_SIMPLE_STATE_EVENT(RoomAliasesEvent, "m.room.aliases", QStringList,
+                              aliases)
     DEFINE_EVENTTYPE_ALIAS(RoomAliases, RoomAliasesEvent)
     DEFINE_SIMPLE_STATE_EVENT(RoomCanonicalAliasEvent, "m.room.canonical_alias",
                               QString, alias)
     DEFINE_EVENTTYPE_ALIAS(RoomCanonicalAlias, RoomCanonicalAliasEvent)
     DEFINE_SIMPLE_STATE_EVENT(RoomTopicEvent, "m.room.topic", QString, topic)
     DEFINE_EVENTTYPE_ALIAS(RoomTopic, RoomTopicEvent)
-    DEFINE_SIMPLE_STATE_EVENT(EncryptionEvent, "m.room.encryption",
-                              QString, algorithm)
+    DEFINE_SIMPLE_STATE_EVENT(EncryptionEvent, "m.room.encryption", QString,
+                              algorithm)
     DEFINE_EVENTTYPE_ALIAS(RoomEncryption, EncryptionEvent)
 } // namespace QMatrixClient
diff --git a/lib/events/stateevent.cpp b/lib/events/stateevent.cpp
index e96614d2..f172edb6 100644
--- a/lib/events/stateevent.cpp
+++ b/lib/events/stateevent.cpp
@@ -1,20 +1,20 @@
 /******************************************************************************
-* Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ * Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
 
 #include "stateevent.h"
 
@@ -24,9 +24,9 @@ using namespace QMatrixClient;
 // StateEventBase itself can be instantiated if there's a state_key JSON key
 // but the event type is unknown.
 [[gnu::unused]] static auto stateEventTypeInitialised =
-    RoomEvent::factory_t::addMethod(
-        [] (const QJsonObject& json, const QString& matrixType) -> StateEventPtr
-        {
+        RoomEvent::factory_t::addMethod([](const QJsonObject& json,
+                                           const QString& matrixType)
+                                                -> StateEventPtr {
             if (!json.contains("state_key"))
                 return nullptr;
 
@@ -53,6 +53,7 @@ void StateEventBase::dumpTo(QDebug dbg) const
         dbg << '<' << stateKey() << "> ";
     if (unsignedJson().contains(PrevContentKeyL))
         dbg << QJsonDocument(unsignedJson()[PrevContentKeyL].toObject())
-               .toJson(QJsonDocument::Compact) << " -> ";
+                        .toJson(QJsonDocument::Compact)
+            << " -> ";
     RoomEvent::dumpTo(dbg);
 }
diff --git a/lib/events/stateevent.h b/lib/events/stateevent.h
index 3f54f7bf..1a02646b 100644
--- a/lib/events/stateevent.h
+++ b/lib/events/stateevent.h
@@ -1,119 +1,127 @@
 /******************************************************************************
-* Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ * Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
 
 #pragma once
 
 #include "roomevent.h"
 
 namespace QMatrixClient {
-    class StateEventBase: public RoomEvent
+    class StateEventBase : public RoomEvent
     {
         public:
-            using factory_t = EventFactory<StateEventBase>;
+        using factory_t = EventFactory<StateEventBase>;
 
-            using RoomEvent::RoomEvent;
-            ~StateEventBase() override = default;
+        using RoomEvent::RoomEvent;
+        ~StateEventBase() override = default;
 
-            bool isStateEvent() const override { return true; }
-            QString replacedState() const;
-            void dumpTo(QDebug dbg) const override;
+        bool isStateEvent() const override { return true; }
+        QString replacedState() const;
+        void dumpTo(QDebug dbg) const override;
 
-            virtual bool repeatsState() const;
+        virtual bool repeatsState() const;
     };
     using StateEventPtr = event_ptr_tt<StateEventBase>;
     using StateEvents = EventsArray<StateEventBase>;
 
-    template <>
-    inline bool is<StateEventBase>(const Event& e) { return e.isStateEvent(); }
+    template <> inline bool is<StateEventBase>(const Event& e)
+    {
+        return e.isStateEvent();
+    }
 
     /**
      * A combination of event type and state key uniquely identifies a piece
      * of state in Matrix.
-     * \sa https://matrix.org/docs/spec/client_server/unstable.html#types-of-room-events
+     * \sa
+     * https://matrix.org/docs/spec/client_server/unstable.html#types-of-room-events
      */
     using StateEventKey = QPair<QString, QString>;
 
-    template <typename ContentT>
-    struct Prev
-    {
+    template <typename ContentT> struct Prev {
         template <typename... ContentParamTs>
         explicit Prev(const QJsonObject& unsignedJson,
                       ContentParamTs&&... contentParams)
-            : senderId(unsignedJson.value("prev_sender"_ls).toString())
-            , content(unsignedJson.value(PrevContentKeyL).toObject(),
-                       std::forward<ContentParamTs>(contentParams)...)
-        { }
+            : senderId(unsignedJson.value("prev_sender"_ls).toString()),
+              content(unsignedJson.value(PrevContentKeyL).toObject(),
+                      std::forward<ContentParamTs>(contentParams)...)
+        {
+        }
 
         QString senderId;
         ContentT content;
     };
 
-    template <typename ContentT>
-    class StateEvent: public StateEventBase
+    template <typename ContentT> class StateEvent : public StateEventBase
     {
         public:
-            using content_type = ContentT;
+        using content_type = ContentT;
 
-            template <typename... ContentParamTs>
-            explicit StateEvent(Type type, const QJsonObject& fullJson,
-                                ContentParamTs&&... contentParams)
-                : StateEventBase(type, fullJson)
-                , _content(contentJson(),
-                           std::forward<ContentParamTs>(contentParams)...)
-            {
-                const auto& unsignedData = unsignedJson();
-                if (unsignedData.contains(PrevContentKeyL))
-                    _prev = std::make_unique<Prev<ContentT>>(unsignedData,
-                                std::forward<ContentParamTs>(contentParams)...);
-            }
-            template <typename... ContentParamTs>
-            explicit StateEvent(Type type, event_mtype_t matrixType,
-                                ContentParamTs&&... contentParams)
-                : StateEventBase(type, matrixType)
-                , _content(std::forward<ContentParamTs>(contentParams)...)
-            {
-                editJson().insert(ContentKey, _content.toJson());
-            }
+        template <typename... ContentParamTs>
+        explicit StateEvent(Type type, const QJsonObject& fullJson,
+                            ContentParamTs&&... contentParams)
+            : StateEventBase(type, fullJson),
+              _content(contentJson(),
+                       std::forward<ContentParamTs>(contentParams)...)
+        {
+            const auto& unsignedData = unsignedJson();
+            if (unsignedData.contains(PrevContentKeyL))
+                _prev = std::make_unique<Prev<ContentT>>(
+                        unsignedData,
+                        std::forward<ContentParamTs>(contentParams)...);
+        }
+        template <typename... ContentParamTs>
+        explicit StateEvent(Type type, event_mtype_t matrixType,
+                            ContentParamTs&&... contentParams)
+            : StateEventBase(type, matrixType),
+              _content(std::forward<ContentParamTs>(contentParams)...)
+        {
+            editJson().insert(ContentKey, _content.toJson());
+        }
 
-            const ContentT& content() const { return _content; }
-            template <typename VisitorT>
-            void editContent(VisitorT&& visitor)
-            {
-                visitor(_content);
-                editJson()[ContentKeyL] = _content.toJson();
-            }
-            [[deprecated("Use prevContent instead")]]
-            const ContentT* prev_content() const { return prevContent(); }
-            const ContentT* prevContent() const
-            { return _prev ? &_prev->content : nullptr; }
-            QString prevSenderId() const
-                { return _prev ? _prev->senderId : QString(); }
+        const ContentT& content() const { return _content; }
+        template <typename VisitorT> void editContent(VisitorT&& visitor)
+        {
+            visitor(_content);
+            editJson()[ContentKeyL] = _content.toJson();
+        }
+        [[deprecated("Use prevContent instead")]] const ContentT*
+        prev_content() const
+        {
+            return prevContent();
+        }
+        const ContentT* prevContent() const
+        {
+            return _prev ? &_prev->content : nullptr;
+        }
+        QString prevSenderId() const
+        {
+            return _prev ? _prev->senderId : QString();
+        }
 
         private:
-            ContentT _content;
-            std::unique_ptr<Prev<ContentT>> _prev;
+        ContentT _content;
+        std::unique_ptr<Prev<ContentT>> _prev;
     };
 } // namespace QMatrixClient
 
 namespace std {
-    template <> struct hash<QMatrixClient::StateEventKey>
-    {
-        size_t operator()(const QMatrixClient::StateEventKey& k) const Q_DECL_NOEXCEPT
+    template <> struct hash<QMatrixClient::StateEventKey> {
+        size_t
+        operator()(const QMatrixClient::StateEventKey& k) const Q_DECL_NOEXCEPT
         {
             return qHash(k);
         }
diff --git a/lib/events/typingevent.cpp b/lib/events/typingevent.cpp
index 0d39d1be..ee3d6b67 100644
--- a/lib/events/typingevent.cpp
+++ b/lib/events/typingevent.cpp
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "typingevent.h"
@@ -22,11 +22,9 @@
 
 using namespace QMatrixClient;
 
-TypingEvent::TypingEvent(const QJsonObject& obj)
-    : Event(typeId(), obj)
+TypingEvent::TypingEvent(const QJsonObject& obj) : Event(typeId(), obj)
 {
     const auto& array = contentJson()["user_ids"_ls].toArray();
-    for(const auto& user: array )
+    for (const auto& user : array)
         _users.push_back(user.toString());
 }
-
diff --git a/lib/events/typingevent.h b/lib/events/typingevent.h
index 27b668b4..f66a1fbc 100644
--- a/lib/events/typingevent.h
+++ b/lib/events/typingevent.h
@@ -13,27 +13,26 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
 #include "event.h"
 
-namespace QMatrixClient
-{
-    class TypingEvent: public Event
+namespace QMatrixClient {
+    class TypingEvent : public Event
     {
         public:
-            DEFINE_EVENT_TYPEID("m.typing", TypingEvent)
+        DEFINE_EVENT_TYPEID("m.typing", TypingEvent)
 
-            TypingEvent(const QJsonObject& obj);
+        TypingEvent(const QJsonObject& obj);
 
-            const QStringList& users() const { return _users; }
+        const QStringList& users() const { return _users; }
 
         private:
-            QStringList _users;
+        QStringList _users;
     };
     REGISTER_EVENT_TYPE(TypingEvent)
     DEFINE_EVENTTYPE_ALIAS(Typing, TypingEvent)
-}  // namespace QMatrixClient
+} // namespace QMatrixClient
diff --git a/lib/identity/definitions/request_email_validation.cpp b/lib/identity/definitions/request_email_validation.cpp
index 47463a8b..a2d0a707 100644
--- a/lib/identity/definitions/request_email_validation.cpp
+++ b/lib/identity/definitions/request_email_validation.cpp
@@ -16,11 +16,10 @@ void JsonObjectConverter<RequestEmailValidation>::dumpTo(
 }
 
 void JsonObjectConverter<RequestEmailValidation>::fillFrom(
-    const QJsonObject& jo, RequestEmailValidation& result)
+        const QJsonObject& jo, RequestEmailValidation& result)
 {
     fromJson(jo.value("client_secret"_ls), result.clientSecret);
     fromJson(jo.value("email"_ls), result.email);
     fromJson(jo.value("send_attempt"_ls), result.sendAttempt);
     fromJson(jo.value("next_link"_ls), result.nextLink);
 }
-
diff --git a/lib/identity/definitions/request_email_validation.h b/lib/identity/definitions/request_email_validation.h
index eb7d8ed6..51369039 100644
--- a/lib/identity/definitions/request_email_validation.h
+++ b/lib/identity/definitions/request_email_validation.h
@@ -8,16 +8,14 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
-    struct RequestEmailValidation
-    {
+    struct RequestEmailValidation {
         /// A unique string generated by the client, and used to identify the
         /// validation attempt. It must be a string consisting of the characters
-        /// ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and it
-        /// must not be empty.
+        /// ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and
+        /// it must not be empty.
         QString clientSecret;
         /// The email address to validate.
         QString email;
@@ -33,10 +31,10 @@ namespace QMatrixClient
         /// server will redirect the user to this URL.
         QString nextLink;
     };
-    template <> struct JsonObjectConverter<RequestEmailValidation>
-    {
+    template <> struct JsonObjectConverter<RequestEmailValidation> {
         static void dumpTo(QJsonObject& jo, const RequestEmailValidation& pod);
-        static void fillFrom(const QJsonObject& jo, RequestEmailValidation& pod);
+        static void fillFrom(const QJsonObject& jo,
+                             RequestEmailValidation& pod);
     };
 
 } // namespace QMatrixClient
diff --git a/lib/identity/definitions/request_msisdn_validation.cpp b/lib/identity/definitions/request_msisdn_validation.cpp
index a123d326..9facbf7e 100644
--- a/lib/identity/definitions/request_msisdn_validation.cpp
+++ b/lib/identity/definitions/request_msisdn_validation.cpp
@@ -17,7 +17,7 @@ void JsonObjectConverter<RequestMsisdnValidation>::dumpTo(
 }
 
 void JsonObjectConverter<RequestMsisdnValidation>::fillFrom(
-    const QJsonObject& jo, RequestMsisdnValidation& result)
+        const QJsonObject& jo, RequestMsisdnValidation& result)
 {
     fromJson(jo.value("client_secret"_ls), result.clientSecret);
     fromJson(jo.value("country"_ls), result.country);
@@ -25,4 +25,3 @@ void JsonObjectConverter<RequestMsisdnValidation>::fillFrom(
     fromJson(jo.value("send_attempt"_ls), result.sendAttempt);
     fromJson(jo.value("next_link"_ls), result.nextLink);
 }
-
diff --git a/lib/identity/definitions/request_msisdn_validation.h b/lib/identity/definitions/request_msisdn_validation.h
index b48ed6d5..c4fe479e 100644
--- a/lib/identity/definitions/request_msisdn_validation.h
+++ b/lib/identity/definitions/request_msisdn_validation.h
@@ -8,16 +8,14 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
-    struct RequestMsisdnValidation
-    {
+    struct RequestMsisdnValidation {
         /// A unique string generated by the client, and used to identify the
         /// validation attempt. It must be a string consisting of the characters
-        /// ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and it
-        /// must not be empty.
+        /// ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and
+        /// it must not be empty.
         QString clientSecret;
         /// The two-letter uppercase ISO country code that the number in
         /// ``phone_number`` should be parsed as if it were dialled from.
@@ -36,10 +34,10 @@ namespace QMatrixClient
         /// server will redirect the user to this URL.
         QString nextLink;
     };
-    template <> struct JsonObjectConverter<RequestMsisdnValidation>
-    {
+    template <> struct JsonObjectConverter<RequestMsisdnValidation> {
         static void dumpTo(QJsonObject& jo, const RequestMsisdnValidation& pod);
-        static void fillFrom(const QJsonObject& jo, RequestMsisdnValidation& pod);
+        static void fillFrom(const QJsonObject& jo,
+                             RequestMsisdnValidation& pod);
     };
 
 } // namespace QMatrixClient
diff --git a/lib/identity/definitions/sid.cpp b/lib/identity/definitions/sid.cpp
index 1ba4b3b5..cc6973f2 100644
--- a/lib/identity/definitions/sid.cpp
+++ b/lib/identity/definitions/sid.cpp
@@ -6,15 +6,12 @@
 
 using namespace QMatrixClient;
 
-void JsonObjectConverter<Sid>::dumpTo(
-        QJsonObject& jo, const Sid& pod)
+void JsonObjectConverter<Sid>::dumpTo(QJsonObject& jo, const Sid& pod)
 {
     addParam<>(jo, QStringLiteral("sid"), pod.sid);
 }
 
-void JsonObjectConverter<Sid>::fillFrom(
-    const QJsonObject& jo, Sid& result)
+void JsonObjectConverter<Sid>::fillFrom(const QJsonObject& jo, Sid& result)
 {
     fromJson(jo.value("sid"_ls), result.sid);
 }
-
diff --git a/lib/identity/definitions/sid.h b/lib/identity/definitions/sid.h
index ac8c4130..85462b46 100644
--- a/lib/identity/definitions/sid.h
+++ b/lib/identity/definitions/sid.h
@@ -6,21 +6,17 @@
 
 #include "converters.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
-    struct Sid
-    {
-        /// The session ID. Session IDs are opaque strings generated by the identity
-        /// server. They must consist entirely of the characters
-        /// ``[0-9a-zA-Z.=_-]``. Their length must not exceed 255 characters and they
-        /// must not be empty.
+    struct Sid {
+        /// The session ID. Session IDs are opaque strings generated by the
+        /// identity server. They must consist entirely of the characters
+        /// ``[0-9a-zA-Z.=_-]``. Their length must not exceed 255 characters and
+        /// they must not be empty.
         QString sid;
     };
-    template <> struct JsonObjectConverter<Sid>
-    {
+    template <> struct JsonObjectConverter<Sid> {
         static void dumpTo(QJsonObject& jo, const Sid& pod);
         static void fillFrom(const QJsonObject& jo, Sid& pod);
     };
diff --git a/lib/jobs/basejob.cpp b/lib/jobs/basejob.cpp
index 8c3381ae..a023d4f7 100644
--- a/lib/jobs/basejob.cpp
+++ b/lib/jobs/basejob.cpp
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "basejob.h"
@@ -21,19 +21,18 @@
 #include "connectiondata.h"
 #include "util.h"
 
+#include <QtCore/QJsonObject>
+#include <QtCore/QRegularExpression>
+#include <QtCore/QTimer>
 #include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QNetworkReply>
-#include <QtCore/QTimer>
-#include <QtCore/QRegularExpression>
-#include <QtCore/QJsonObject>
+#include <QtNetwork/QNetworkRequest>
 
 #include <array>
 
 using namespace QMatrixClient;
 
-struct NetworkReplyDeleter : public QScopedPointerDeleteLater
-{
+struct NetworkReplyDeleter : public QScopedPointerDeleteLater {
     static inline void cleanup(QNetworkReply* reply)
     {
         if (reply && reply->isRunning())
@@ -45,51 +44,58 @@ struct NetworkReplyDeleter : public QScopedPointerDeleteLater
 class BaseJob::Private
 {
     public:
-        // Using an idiom from clang-tidy:
-        // http://clang.llvm.org/extra/clang-tidy/checks/modernize-pass-by-value.html
-        Private(HttpVerb v, QString endpoint, const QUrlQuery& q,
-                Data&& data, bool nt)
-            : verb(v), apiEndpoint(std::move(endpoint)), requestQuery(q)
-            , requestData(std::move(data)), needsToken(nt)
-        { }
-        
-        void sendRequest(bool inBackground);
-        const JobTimeoutConfig& getCurrentTimeoutConfig() const;
-
-        const ConnectionData* connection = nullptr;
-
-        // Contents for the network request
-        HttpVerb verb;
-        QString apiEndpoint;
-        QHash<QByteArray, QByteArray> requestHeaders;
-        QUrlQuery requestQuery;
-        Data requestData;
-        bool needsToken;
-
-        // There's no use of QMimeType here because we don't want to match
-        // content types against the known MIME type hierarchy; and at the same
-        // type QMimeType is of little help with MIME type globs (`text/*` etc.)
-        QByteArrayList expectedContentTypes;
-
-        QScopedPointer<QNetworkReply, NetworkReplyDeleter> reply;
-        Status status = Pending;
-        QByteArray rawResponse;
-        QUrl errorUrl; //< May contain a URL to help with some errors
-
-        QTimer timer;
-        QTimer retryTimer;
-
-        QVector<JobTimeoutConfig> errorStrategy =
-            { { 90, 5 }, { 90, 10 }, { 120, 30 } };
-        int maxRetries = errorStrategy.size();
-        int retriesTaken = 0;
-
-        LoggingCategory logCat = JOBS;
+    // Using an idiom from clang-tidy:
+    // http://clang.llvm.org/extra/clang-tidy/checks/modernize-pass-by-value.html
+    Private(HttpVerb v, QString endpoint, const QUrlQuery& q, Data&& data,
+            bool nt)
+        : verb(v),
+          apiEndpoint(std::move(endpoint)),
+          requestQuery(q),
+          requestData(std::move(data)),
+          needsToken(nt)
+    {
+    }
+
+    void sendRequest(bool inBackground);
+    const JobTimeoutConfig& getCurrentTimeoutConfig() const;
+
+    const ConnectionData* connection = nullptr;
+
+    // Contents for the network request
+    HttpVerb verb;
+    QString apiEndpoint;
+    QHash<QByteArray, QByteArray> requestHeaders;
+    QUrlQuery requestQuery;
+    Data requestData;
+    bool needsToken;
+
+    // There's no use of QMimeType here because we don't want to match
+    // content types against the known MIME type hierarchy; and at the same
+    // type QMimeType is of little help with MIME type globs (`text/*` etc.)
+    QByteArrayList expectedContentTypes;
+
+    QScopedPointer<QNetworkReply, NetworkReplyDeleter> reply;
+    Status status = Pending;
+    QByteArray rawResponse;
+    QUrl errorUrl; //< May contain a URL to help with some errors
+
+    QTimer timer;
+    QTimer retryTimer;
+
+    QVector<JobTimeoutConfig> errorStrategy = { { 90, 5 },
+                                                { 90, 10 },
+                                                { 120, 30 } };
+    int maxRetries = errorStrategy.size();
+    int retriesTaken = 0;
+
+    LoggingCategory logCat = JOBS;
 };
 
-BaseJob::BaseJob(HttpVerb verb, const QString& name, const QString& endpoint, bool needsToken)
-    : BaseJob(verb, name, endpoint, Query { }, Data { }, needsToken)
-{ }
+BaseJob::BaseJob(HttpVerb verb, const QString& name, const QString& endpoint,
+                 bool needsToken)
+    : BaseJob(verb, name, endpoint, Query {}, Data {}, needsToken)
+{
+}
 
 BaseJob::BaseJob(HttpVerb verb, const QString& name, const QString& endpoint,
                  const Query& query, Data&& data, bool needsToken)
@@ -98,7 +104,7 @@ BaseJob::BaseJob(HttpVerb verb, const QString& name, const QString& endpoint,
     setObjectName(name);
     setExpectedContentTypes({ "application/json" });
     d->timer.setSingleShot(true);
-    connect (&d->timer, &QTimer::timeout, this, &BaseJob::timeout);
+    connect(&d->timer, &QTimer::timeout, this, &BaseJob::timeout);
 }
 
 BaseJob::~BaseJob()
@@ -114,21 +120,20 @@ QUrl BaseJob::requestUrl() const
 
 bool BaseJob::isBackground() const
 {
-    return d->reply && d->reply->request().attribute(
-                        QNetworkRequest::BackgroundRequestAttribute).toBool();
+    return d->reply
+            && d->reply->request()
+                       .attribute(QNetworkRequest::BackgroundRequestAttribute)
+                       .toBool();
 }
 
-const QString& BaseJob::apiEndpoint() const
-{
-    return d->apiEndpoint;
-}
+const QString& BaseJob::apiEndpoint() const { return d->apiEndpoint; }
 
 void BaseJob::setApiEndpoint(const QString& apiEndpoint)
 {
     d->apiEndpoint = apiEndpoint;
 }
 
-const BaseJob::headers_t&BaseJob::requestHeaders() const
+const BaseJob::headers_t& BaseJob::requestHeaders() const
 {
     return d->requestHeaders;
 }
@@ -144,25 +149,16 @@ void BaseJob::setRequestHeaders(const BaseJob::headers_t& headers)
     d->requestHeaders = headers;
 }
 
-const QUrlQuery& BaseJob::query() const
-{
-    return d->requestQuery;
-}
+const QUrlQuery& BaseJob::query() const { return d->requestQuery; }
 
 void BaseJob::setRequestQuery(const QUrlQuery& query)
 {
     d->requestQuery = query;
 }
 
-const BaseJob::Data& BaseJob::requestData() const
-{
-    return d->requestData;
-}
+const BaseJob::Data& BaseJob::requestData() const { return d->requestData; }
 
-void BaseJob::setRequestData(Data&& data)
-{
-    std::swap(d->requestData, data);
-}
+void BaseJob::setRequestData(Data&& data) { std::swap(d->requestData, data); }
 
 const QByteArrayList& BaseJob::expectedContentTypes() const
 {
@@ -179,22 +175,22 @@ void BaseJob::setExpectedContentTypes(const QByteArrayList& contentTypes)
     d->expectedContentTypes = contentTypes;
 }
 
-QUrl BaseJob::makeRequestUrl(QUrl baseUrl,
-                             const QString& path, const QUrlQuery& query)
+QUrl BaseJob::makeRequestUrl(QUrl baseUrl, const QString& path,
+                             const QUrlQuery& query)
 {
     auto pathBase = baseUrl.path();
     if (!pathBase.endsWith('/') && !path.startsWith('/'))
         pathBase.push_back('/');
 
-    baseUrl.setPath( pathBase + path );
+    baseUrl.setPath(pathBase + path);
     baseUrl.setQuery(query);
     return baseUrl;
 }
 
 void BaseJob::Private::sendRequest(bool inBackground)
 {
-    QNetworkRequest req
-        { makeRequestUrl(connection->baseUrl(), apiEndpoint, requestQuery) };
+    QNetworkRequest req { makeRequestUrl(connection->baseUrl(), apiEndpoint,
+                                         requestQuery) };
     if (!requestHeaders.contains("Content-Type"))
         req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
     req.setRawHeader("Authorization",
@@ -211,38 +207,34 @@ void BaseJob::Private::sendRequest(bool inBackground)
 #endif
     for (auto it = requestHeaders.cbegin(); it != requestHeaders.cend(); ++it)
         req.setRawHeader(it.key(), it.value());
-    switch( verb )
-    {
-        case HttpVerb::Get:
-            reply.reset( connection->nam()->get(req) );
-            break;
-        case HttpVerb::Post:
-            reply.reset( connection->nam()->post(req, requestData.source()) );
-            break;
-        case HttpVerb::Put:
-            reply.reset( connection->nam()->put(req, requestData.source()) );
-            break;
-        case HttpVerb::Delete:
-            reply.reset( connection->nam()->deleteResource(req) );
-            break;
+    switch (verb) {
+    case HttpVerb::Get:
+        reply.reset(connection->nam()->get(req));
+        break;
+    case HttpVerb::Post:
+        reply.reset(connection->nam()->post(req, requestData.source()));
+        break;
+    case HttpVerb::Put:
+        reply.reset(connection->nam()->put(req, requestData.source()));
+        break;
+    case HttpVerb::Delete:
+        reply.reset(connection->nam()->deleteResource(req));
+        break;
     }
 }
 
-void BaseJob::beforeStart(const ConnectionData*)
-{ }
+void BaseJob::beforeStart(const ConnectionData*) {}
 
-void BaseJob::afterStart(const ConnectionData*, QNetworkReply*)
-{ }
+void BaseJob::afterStart(const ConnectionData*, QNetworkReply*) {}
 
-void BaseJob::beforeAbandon(QNetworkReply*)
-{ }
+void BaseJob::beforeAbandon(QNetworkReply*) {}
 
 void BaseJob::start(const ConnectionData* connData, bool inBackground)
 {
     d->connection = connData;
     d->retryTimer.setSingleShot(true);
-    connect (&d->retryTimer, &QTimer::timeout,
-             this, [this,inBackground] { sendRequest(inBackground); });
+    connect(&d->retryTimer, &QTimer::timeout, this,
+            [this, inBackground] { sendRequest(inBackground); });
 
     beforeStart(connData);
     if (status().good())
@@ -261,27 +253,23 @@ void BaseJob::sendRequest(bool inBackground)
     if (!d->requestQuery.isEmpty())
         qCDebug(d->logCat) << "  query:" << d->requestQuery.toString();
     d->sendRequest(inBackground);
-    connect( d->reply.data(), &QNetworkReply::finished, this, &BaseJob::gotReply );
-    if (d->reply->isRunning())
-    {
-        connect( d->reply.data(), &QNetworkReply::metaDataChanged,
-                 this, &BaseJob::checkReply);
-        connect( d->reply.data(), &QNetworkReply::uploadProgress,
-                 this, &BaseJob::uploadProgress);
-        connect( d->reply.data(), &QNetworkReply::downloadProgress,
-                 this, &BaseJob::downloadProgress);
+    connect(d->reply.data(), &QNetworkReply::finished, this,
+            &BaseJob::gotReply);
+    if (d->reply->isRunning()) {
+        connect(d->reply.data(), &QNetworkReply::metaDataChanged, this,
+                &BaseJob::checkReply);
+        connect(d->reply.data(), &QNetworkReply::uploadProgress, this,
+                &BaseJob::uploadProgress);
+        connect(d->reply.data(), &QNetworkReply::downloadProgress, this,
+                &BaseJob::downloadProgress);
         d->timer.start(getCurrentTimeout());
         qCDebug(d->logCat) << this << "request has been sent";
         emit started();
-    }
-    else
+    } else
         qCWarning(d->logCat) << this << "request could not start";
 }
 
-void BaseJob::checkReply()
-{
-    setStatus(doCheckReply(d->reply.data()));
-}
+void BaseJob::checkReply() { setStatus(doCheckReply(d->reply.data())); }
 
 void BaseJob::gotReply()
 {
@@ -293,20 +281,18 @@ void BaseJob::gotReply()
         d->rawResponse = d->reply->readAll();
         const auto jsonBody =
                 d->reply->rawHeader("Content-Type") == "application/json";
-        qCDebug(d->logCat).noquote()
-                << "Error body (truncated if long):" << d->rawResponse.left(500);
-        if (jsonBody)
-        {
+        qCDebug(d->logCat).noquote() << "Error body (truncated if long):"
+                                     << d->rawResponse.left(500);
+        if (jsonBody) {
             auto json = QJsonDocument::fromJson(d->rawResponse).object();
             const auto errCode = json.value("errcode"_ls).toString();
-            if (error() == TooManyRequestsError ||
-                    errCode == "M_LIMIT_EXCEEDED")
-            {
+            if (error() == TooManyRequestsError
+                || errCode == "M_LIMIT_EXCEEDED") {
                 QString msg = tr("Too many requests");
                 auto retryInterval = json.value("retry_after_ms"_ls).toInt(-1);
                 if (retryInterval != -1)
                     msg += tr(", next retry advised after %1 ms")
-                            .arg(retryInterval);
+                                   .arg(retryInterval);
                 else // We still have to figure some reasonable interval
                     retryInterval = getNextRetryInterval();
 
@@ -320,19 +306,16 @@ void BaseJob::gotReply()
                 emit retryScheduled(d->retriesTaken, retryInterval);
                 return;
             }
-            if (errCode == "M_CONSENT_NOT_GIVEN")
-            {
+            if (errCode == "M_CONSENT_NOT_GIVEN") {
                 d->status.code = UserConsentRequiredError;
                 d->errorUrl = json.value("consent_uri"_ls).toString();
-            }
-            else if (errCode == "M_UNSUPPORTED_ROOM_VERSION" ||
-                     errCode == "M_INCOMPATIBLE_ROOM_VERSION")
-            {
+            } else if (errCode == "M_UNSUPPORTED_ROOM_VERSION"
+                       || errCode == "M_INCOMPATIBLE_ROOM_VERSION") {
                 d->status.code = UnsupportedRoomVersionError;
                 if (json.contains("room_version"))
                     d->status.message =
-                        tr("Requested room version: %1")
-                        .arg(json.value("room_version").toString());
+                            tr("Requested room version: %1")
+                                    .arg(json.value("room_version").toString());
             } else if (!json.isEmpty()) // Not localisable on the client side
                 setStatus(IncorrectRequestError,
                           json.value("error"_ls).toString());
@@ -350,18 +333,18 @@ bool checkContentType(const QByteArray& type, const QByteArrayList& patterns)
     // ignore possible appendixes of the content type
     const auto ctype = type.split(';').front();
 
-    for (const auto& pattern: patterns)
-    {
+    for (const auto& pattern : patterns) {
         if (pattern.startsWith('*') || ctype == pattern) // Fast lane
             return true;
 
         auto patternParts = pattern.split('/');
         Q_ASSERT_X(patternParts.size() <= 2, __FUNCTION__,
-            "BaseJob: Expected content type should have up to two"
-            " /-separated parts; violating pattern: " + pattern);
+                   "BaseJob: Expected content type should have up to two"
+                   " /-separated parts; violating pattern: "
+                           + pattern);
 
-        if (ctype.split('/').front() == patternParts.front() &&
-                patternParts.back() == "*")
+        if (ctype.split('/').front() == patternParts.front()
+            && patternParts.back() == "*")
             return true; // Exact match already went on fast lane
     }
 
@@ -376,24 +359,26 @@ BaseJob::Status BaseJob::doCheckReply(QNetworkReply* reply) const
     // https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
     const auto httpCodeHeader =
             reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
-    if (!httpCodeHeader.isValid())
-    {
+    if (!httpCodeHeader.isValid()) {
         qCWarning(d->logCat) << this << "didn't get valid HTTP headers";
         return { NetworkError, reply->errorString() };
     }
 
-    const QString replyState = reply->isRunning() ?
-                QStringLiteral("(tentative)") : QStringLiteral("(final)");
+    const QString replyState = reply->isRunning()
+            ? QStringLiteral("(tentative)")
+            : QStringLiteral("(final)");
     const auto urlString = '|' + d->reply->url().toDisplayString();
     const auto httpCode = httpCodeHeader.toInt();
     const auto reason =
-        reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString();
+            reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute)
+                    .toString();
     if (httpCode / 100 == 2) // 2xx
     {
         qCDebug(d->logCat).noquote().nospace() << this << urlString;
-        qCDebug(d->logCat).noquote() << "  " << httpCode << reason << replyState;
+        qCDebug(d->logCat).noquote()
+                << "  " << httpCode << reason << replyState;
         if (!checkContentType(reply->rawHeader("Content-Type"),
-                             d->expectedContentTypes))
+                              d->expectedContentTypes))
             return { UnexpectedResponseTypeWarning,
                      "Unexpected content type of the response" };
         return NoError;
@@ -402,29 +387,37 @@ BaseJob::Status BaseJob::doCheckReply(QNetworkReply* reply) const
     qCWarning(d->logCat).noquote().nospace() << this << urlString;
     qCWarning(d->logCat).noquote() << "  " << httpCode << reason << replyState;
     return { [httpCode]() -> StatusCode {
-            if (httpCode / 10 == 41)
-                return httpCode == 410 ? IncorrectRequestError : NotFoundError;
-            switch (httpCode)
-            {
-                case 401: case 403: case 407:
+                if (httpCode / 10 == 41)
+                    return httpCode == 410 ? IncorrectRequestError
+                                           : NotFoundError;
+                switch (httpCode) {
+                case 401:
+                case 403:
+                case 407:
                     return ContentAccessError;
                 case 404:
                     return NotFoundError;
-                case 400: case 405: case 406: case 426: case 428:
+                case 400:
+                case 405:
+                case 406:
+                case 426:
+                case 428:
                 case 505:
                 case 494: // Unofficial nginx "Request header too large"
                 case 497: // Unofficial nginx "HTTP request sent to HTTPS port"
                     return IncorrectRequestError;
                 case 429:
                     return TooManyRequestsError;
-                case 501: case 510:
+                case 501:
+                case 510:
                     return RequestNotImplementedError;
                 case 511:
                     return NetworkAuthRequiredError;
                 default:
                     return NetworkError;
-            }
-        }(), reply->errorString() };
+                }
+            }(),
+             reply->errorString() };
 }
 
 BaseJob::Status BaseJob::parseReply(QNetworkReply* reply)
@@ -432,30 +425,25 @@ BaseJob::Status BaseJob::parseReply(QNetworkReply* reply)
     d->rawResponse = reply->readAll();
     QJsonParseError error;
     const auto& json = QJsonDocument::fromJson(d->rawResponse, &error);
-    if( error.error == QJsonParseError::NoError )
+    if (error.error == QJsonParseError::NoError)
         return parseJson(json);
 
     return { IncorrectResponseError, error.errorString() };
 }
 
-BaseJob::Status BaseJob::parseJson(const QJsonDocument&)
-{
-    return Success;
-}
+BaseJob::Status BaseJob::parseJson(const QJsonDocument&) { return Success; }
 
 void BaseJob::stop()
 {
     d->timer.stop();
-    if (d->reply)
-    {
+    if (d->reply) {
         d->reply->disconnect(this); // Ignore whatever comes from the reply
-        if (d->reply->isRunning())
-        {
-            qCWarning(d->logCat) << this << "stopped without ready network reply";
+        if (d->reply->isRunning()) {
+            qCWarning(d->logCat)
+                    << this << "stopped without ready network reply";
             d->reply->abort();
         }
-    }
-    else
+    } else
         qCWarning(d->logCat) << this << "stopped with empty network reply";
 }
 
@@ -463,16 +451,16 @@ void BaseJob::finishJob()
 {
     stop();
     if ((error() == NetworkError || error() == TimeoutError)
-            && d->retriesTaken < d->maxRetries)
-    {
+        && d->retriesTaken < d->maxRetries) {
         // TODO: The whole retrying thing should be put to ConnectionManager
         // otherwise independently retrying jobs make a bit of notification
         // storm towards the UI.
         const auto retryInterval =
                 error() == TimeoutError ? 0 : getNextRetryInterval();
         ++d->retriesTaken;
-        qCWarning(d->logCat).nospace() << this << ": retry #" << d->retriesTaken
-                   << " in " << retryInterval/1000 << " s";
+        qCWarning(d->logCat).nospace()
+                << this << ": retry #" << d->retriesTaken << " in "
+                << retryInterval / 1000 << " s";
         d->retryTimer.start(retryInterval);
         emit retryScheduled(d->retriesTaken, retryInterval);
         return;
@@ -510,93 +498,78 @@ BaseJob::duration_t BaseJob::millisToRetry() const
     return d->retryTimer.isActive() ? d->retryTimer.remainingTime() : 0;
 }
 
-int BaseJob::maxRetries() const
-{
-    return d->maxRetries;
-}
+int BaseJob::maxRetries() const { return d->maxRetries; }
 
 void BaseJob::setMaxRetries(int newMaxRetries)
 {
     d->maxRetries = newMaxRetries;
 }
 
-BaseJob::Status BaseJob::status() const
-{
-    return d->status;
-}
+BaseJob::Status BaseJob::status() const { return d->status; }
 
 QByteArray BaseJob::rawData(int bytesAtMost) const
 {
     return bytesAtMost > 0 && d->rawResponse.size() > bytesAtMost
-            ? d->rawResponse.left(bytesAtMost) : d->rawResponse;
+            ? d->rawResponse.left(bytesAtMost)
+            : d->rawResponse;
 }
 
 QString BaseJob::rawDataSample(int bytesAtMost) const
 {
     auto data = rawData(bytesAtMost);
     Q_ASSERT(data.size() <= d->rawResponse.size());
-    return data.size() == d->rawResponse.size()
-            ? data : data + tr("...(truncated, %Ln bytes in total)",
-                               "Comes after trimmed raw network response",
-                               d->rawResponse.size());
-
+    return data.size() == d->rawResponse.size() ? data
+                                                : data
+                    + tr("...(truncated, %Ln bytes in total)",
+                         "Comes after trimmed raw network response",
+                         d->rawResponse.size());
 }
 
 QString BaseJob::statusCaption() const
 {
-    switch (d->status.code)
-    {
-        case Success:
-            return tr("Success");
-        case Pending:
-            return tr("Request still pending response");
-        case UnexpectedResponseTypeWarning:
-            return tr("Warning: Unexpected response type");
-        case Abandoned:
-            return tr("Request was abandoned");
-        case NetworkError:
-            return tr("Network problems");
-        case JsonParseError:
-            return tr("Response could not be parsed");
-        case TimeoutError:
-            return tr("Request timed out");
-        case ContentAccessError:
-            return tr("Access error");
-        case NotFoundError:
-            return tr("Not found");
-        case IncorrectRequestError:
-            return tr("Invalid request");
-        case IncorrectResponseError:
-            return tr("Response could not be parsed");
-        case TooManyRequestsError:
-            return tr("Too many requests");
-        case RequestNotImplementedError:
-            return tr("Function not implemented by the server");
-        case NetworkAuthRequiredError:
-            return tr("Network authentication required");
-        case UserConsentRequiredError:
-            return tr("User consent required");
-        case UnsupportedRoomVersionError:
-            return tr("The server does not support the needed room version");
-        default:
-            return tr("Request failed");
+    switch (d->status.code) {
+    case Success:
+        return tr("Success");
+    case Pending:
+        return tr("Request still pending response");
+    case UnexpectedResponseTypeWarning:
+        return tr("Warning: Unexpected response type");
+    case Abandoned:
+        return tr("Request was abandoned");
+    case NetworkError:
+        return tr("Network problems");
+    case JsonParseError:
+        return tr("Response could not be parsed");
+    case TimeoutError:
+        return tr("Request timed out");
+    case ContentAccessError:
+        return tr("Access error");
+    case NotFoundError:
+        return tr("Not found");
+    case IncorrectRequestError:
+        return tr("Invalid request");
+    case IncorrectResponseError:
+        return tr("Response could not be parsed");
+    case TooManyRequestsError:
+        return tr("Too many requests");
+    case RequestNotImplementedError:
+        return tr("Function not implemented by the server");
+    case NetworkAuthRequiredError:
+        return tr("Network authentication required");
+    case UserConsentRequiredError:
+        return tr("User consent required");
+    case UnsupportedRoomVersionError:
+        return tr("The server does not support the needed room version");
+    default:
+        return tr("Request failed");
     }
 }
 
-int BaseJob::error() const
-{
-    return d->status.code;
-}
+int BaseJob::error() const { return d->status.code; }
 
-QString BaseJob::errorString() const
-{
-    return d->status.message;
-}
+QString BaseJob::errorString() const { return d->status.message; }
 
-QUrl BaseJob::errorUrl() const
-{
-    return d->errorUrl;
-}
+QUrl BaseJob::errorUrl() const { return d->errorUrl; }
 
 void BaseJob::setStatus(Status s)
 {
@@ -629,11 +602,8 @@ void BaseJob::abandon()
 
 void BaseJob::timeout()
 {
-    setStatus( TimeoutError, "The job has timed out" );
+    setStatus(TimeoutError, "The job has timed out");
     finishJob();
 }
 
-void BaseJob::setLoggingCategory(LoggingCategory lcf)
-{
-    d->logCat = lcf;
-}
+void BaseJob::setLoggingCategory(LoggingCategory lcf) { d->logCat = lcf; }
diff --git a/lib/jobs/basejob.h b/lib/jobs/basejob.h
index 4c1c7706..8ff25d42 100644
--- a/lib/jobs/basejob.h
+++ b/lib/jobs/basejob.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
@@ -21,332 +21,336 @@
 #include "../logging.h"
 #include "requestdata.h"
 
+#include <QtCore/QJsonDocument>
 #include <QtCore/QObject>
 #include <QtCore/QUrlQuery>
-#include <QtCore/QJsonDocument>
 
 class QNetworkReply;
 class QSslError;
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     class ConnectionData;
 
     enum class HttpVerb { Get, Put, Post, Delete };
 
-    struct JobTimeoutConfig
-    {
+    struct JobTimeoutConfig {
         int jobTimeout;
         int nextRetryInterval;
     };
 
-    class BaseJob: public QObject
+    class BaseJob : public QObject
     {
-            Q_OBJECT
-            Q_PROPERTY(QUrl requestUrl READ requestUrl CONSTANT)
-            Q_PROPERTY(int maxRetries READ maxRetries WRITE setMaxRetries)
+        Q_OBJECT
+        Q_PROPERTY(QUrl requestUrl READ requestUrl CONSTANT)
+        Q_PROPERTY(int maxRetries READ maxRetries WRITE setMaxRetries)
         public:
-            /* Just in case, the values are compatible with KJob
-             * (which BaseJob used to inherit from). */
-            enum StatusCode { NoError = 0 // To be compatible with Qt conventions
-                , Success = 0
-                , Pending = 1
-                , WarningLevel = 20
-                , UnexpectedResponseTypeWarning = 21
-                , Abandoned = 50 //< A very brief period between abandoning and object deletion
-                , ErrorLevel = 100 //< Errors have codes starting from this
-                , NetworkError = 100
-                , JsonParseError // TODO: Merge into IncorrectResponseError
-                , TimeoutError
-                , ContentAccessError
-                , NotFoundError
-                , IncorrectRequestError
-                , IncorrectResponseError
-                , TooManyRequestsError
-                , RequestNotImplementedError
-                , UnsupportedRoomVersionError
-                , NetworkAuthRequiredError
-                , UserConsentRequiredError
-                , UserDefinedError = 200
-            };
-
-            /**
-             * A simple wrapper around QUrlQuery that allows its creation from
-             * a list of string pairs
-             */
-            class Query : public QUrlQuery
+        /* Just in case, the values are compatible with KJob
+         * (which BaseJob used to inherit from). */
+        enum StatusCode {
+            NoError = 0 // To be compatible with Qt conventions
+            ,
+            Success = 0,
+            Pending = 1,
+            WarningLevel = 20,
+            UnexpectedResponseTypeWarning = 21,
+            Abandoned = 50 //< A very brief period between abandoning and object
+                           //deletion
+            ,
+            ErrorLevel = 100 //< Errors have codes starting from this
+            ,
+            NetworkError = 100,
+            JsonParseError // TODO: Merge into IncorrectResponseError
+            ,
+            TimeoutError,
+            ContentAccessError,
+            NotFoundError,
+            IncorrectRequestError,
+            IncorrectResponseError,
+            TooManyRequestsError,
+            RequestNotImplementedError,
+            UnsupportedRoomVersionError,
+            NetworkAuthRequiredError,
+            UserConsentRequiredError,
+            UserDefinedError = 200
+        };
+
+        /**
+         * A simple wrapper around QUrlQuery that allows its creation from
+         * a list of string pairs
+         */
+        class Query : public QUrlQuery
+        {
+            public:
+            using QUrlQuery::QUrlQuery;
+            Query() = default;
+            Query(const std::initializer_list<QPair<QString, QString>>& l)
             {
-                public:
-                    using QUrlQuery::QUrlQuery;
-                    Query() = default;
-                    Query(const std::initializer_list< QPair<QString, QString> >& l)
-                    {
-                        setQueryItems(l);
-                    }
-            };
-
-            using Data = RequestData;
-
-            /**
-             * This structure stores the status of a server call job. The status consists
-             * of a code, that is described (but not delimited) by the respective enum,
-             * and a freeform message.
-             *
-             * To extend the list of error codes, define an (anonymous) enum
-             * along the lines of StatusCode, with additional values
-             * starting at UserDefinedError
-             */
-            class Status
+                setQueryItems(l);
+            }
+        };
+
+        using Data = RequestData;
+
+        /**
+         * This structure stores the status of a server call job. The status
+         * consists of a code, that is described (but not delimited) by the
+         * respective enum, and a freeform message.
+         *
+         * To extend the list of error codes, define an (anonymous) enum
+         * along the lines of StatusCode, with additional values
+         * starting at UserDefinedError
+         */
+        class Status
+        {
+            public:
+            Status(StatusCode c) : code(c) {}
+            Status(int c, QString m) : code(c), message(std::move(m)) {}
+
+            bool good() const { return code < ErrorLevel; }
+            friend QDebug operator<<(QDebug dbg, const Status& s)
             {
-                public:
-                    Status(StatusCode c) : code(c) { }
-                    Status(int c, QString m) : code(c), message(std::move(m)) { }
-
-                    bool good() const { return code < ErrorLevel; }
-                    friend QDebug operator<<(QDebug dbg, const Status& s)
-                    {
-                        QDebugStateSaver _s(dbg);
-                        return dbg.noquote().nospace()
-                                << s.code << ": " << s.message;
-                    }
-
-                    bool operator==(const Status& other) const
-                    {
-                        return code == other.code && message == other.message;
-                    }
-                    bool operator!=(const Status& other) const
-                    {
-                        return !operator==(other);
-                    }
-
-                    int code;
-                    QString message;
-            };
-
-            using duration_t = int; // milliseconds
+                QDebugStateSaver _s(dbg);
+                return dbg.noquote().nospace() << s.code << ": " << s.message;
+            }
 
-        public:
-            BaseJob(HttpVerb verb, const QString& name, const QString& endpoint,
-                    bool needsToken = true);
-            BaseJob(HttpVerb verb, const QString& name, const QString& endpoint,
-                    const Query& query, Data&& data = {},
-                    bool needsToken = true);
-
-            QUrl requestUrl() const;
-            bool isBackground() const;
-
-            /** Current status of the job */
-            Status status() const;
-            /** Short human-friendly message on the job status */
-            QString statusCaption() const;
-            /** Get raw response body as received from the server
-             * \param bytesAtMost return this number of leftmost bytes, or -1
-             *                    to return the entire response
-             */
-            QByteArray rawData(int bytesAtMost = -1) const;
-            /** Get UI-friendly sample of raw data
-             *
-             * This is almost the same as rawData but appends the "truncated"
-             * suffix if not all data fit in bytesAtMost. This call is
-             * recommended to present a sample of raw data as "details" next to
-             * error messages. Note that the default \p bytesAtMost value is
-             * also tailored to UI cases.
-             */
-            QString rawDataSample(int bytesAtMost = 65535) const;
-
-            /** Error (more generally, status) code
-             * Equivalent to status().code
-             * \sa status
-             */
-            int error() const;
-            /** Error-specific message, as returned by the server */
-            virtual QString errorString() const;
-            /** A URL to help/clarify the error, if provided by the server */
-            QUrl errorUrl() const;
-
-            int maxRetries() const;
-            void setMaxRetries(int newMaxRetries);
-
-            Q_INVOKABLE duration_t getCurrentTimeout() const;
-            Q_INVOKABLE duration_t getNextRetryInterval() const;
-            Q_INVOKABLE duration_t millisToRetry() const;
-
-            friend QDebug operator<<(QDebug dbg, const BaseJob* j)
+            bool operator==(const Status& other) const
             {
-                return dbg << j->objectName();
+                return code == other.code && message == other.message;
             }
+            bool operator!=(const Status& other) const
+            {
+                return !operator==(other);
+            }
+
+            int code;
+            QString message;
+        };
+
+        using duration_t = int; // milliseconds
+
+        public:
+        BaseJob(HttpVerb verb, const QString& name, const QString& endpoint,
+                bool needsToken = true);
+        BaseJob(HttpVerb verb, const QString& name, const QString& endpoint,
+                const Query& query, Data&& data = {}, bool needsToken = true);
+
+        QUrl requestUrl() const;
+        bool isBackground() const;
+
+        /** Current status of the job */
+        Status status() const;
+        /** Short human-friendly message on the job status */
+        QString statusCaption() const;
+        /** Get raw response body as received from the server
+         * \param bytesAtMost return this number of leftmost bytes, or -1
+         *                    to return the entire response
+         */
+        QByteArray rawData(int bytesAtMost = -1) const;
+        /** Get UI-friendly sample of raw data
+         *
+         * This is almost the same as rawData but appends the "truncated"
+         * suffix if not all data fit in bytesAtMost. This call is
+         * recommended to present a sample of raw data as "details" next to
+         * error messages. Note that the default \p bytesAtMost value is
+         * also tailored to UI cases.
+         */
+        QString rawDataSample(int bytesAtMost = 65535) const;
+
+        /** Error (more generally, status) code
+         * Equivalent to status().code
+         * \sa status
+         */
+        int error() const;
+        /** Error-specific message, as returned by the server */
+        virtual QString errorString() const;
+        /** A URL to help/clarify the error, if provided by the server */
+        QUrl errorUrl() const;
+
+        int maxRetries() const;
+        void setMaxRetries(int newMaxRetries);
+
+        Q_INVOKABLE duration_t getCurrentTimeout() const;
+        Q_INVOKABLE duration_t getNextRetryInterval() const;
+        Q_INVOKABLE duration_t millisToRetry() const;
+
+        friend QDebug operator<<(QDebug dbg, const BaseJob* j)
+        {
+            return dbg << j->objectName();
+        }
 
         public slots:
-            void start(const ConnectionData* connData,
-                       bool inBackground = false);
-
-            /**
-             * Abandons the result of this job, arrived or unarrived.
-             *
-             * This aborts waiting for a reply from the server (if there was
-             * any pending) and deletes the job object. No result signals
-             * (result, success, failure) are emitted.
-             */
-            void abandon();
+        void start(const ConnectionData* connData, bool inBackground = false);
+
+        /**
+         * Abandons the result of this job, arrived or unarrived.
+         *
+         * This aborts waiting for a reply from the server (if there was
+         * any pending) and deletes the job object. No result signals
+         * (result, success, failure) are emitted.
+         */
+        void abandon();
 
         signals:
-            /** The job is about to send a network request */
-            void aboutToStart();
-
-            /** The job has sent a network request */
-            void started();
-
-            /** The job has changed its status */
-            void statusChanged(Status newStatus);
-
-            /**
-             * The previous network request has failed; the next attempt will
-             * be done in the specified time
-             * @param nextAttempt the 1-based number of attempt (will always be more than 1)
-             * @param inMilliseconds the interval after which the next attempt will be taken
-             */
-            void retryScheduled(int nextAttempt, int inMilliseconds);
-
-            /**
-             * Emitted when the job is finished, in any case. It is used to notify
-             * observers that the job is terminated and that progress can be hidden.
-             *
-             * This should not be emitted directly by subclasses;
-             * use finishJob() instead.
-             *
-             * In general, to be notified of a job's completion, client code
-             * should connect to result(), success(), or failure()
-             * rather than finished(). However if you need to track the job's
-             * lifecycle you should connect to this instead of result();
-             * in particular, only this signal will be emitted on abandoning.
-             *
-             * @param job the job that emitted this signal
-             *
-             * @see result, success, failure
-             */
-            void finished(BaseJob* job);
-
-            /**
-             * Emitted when the job is finished (except when abandoned).
-             *
-             * Use error() to know if the job was finished with error.
-             *
-             * @param job the job that emitted this signal
-             *
-             * @see success, failure
-             */
-            void result(BaseJob* job);
-
-            /**
-             * Emitted together with result() in case there's no error.
-             *
-             * @see result, failure
-             */
-            void success(BaseJob*);
-
-            /**
-             * Emitted together with result() if there's an error.
-             * Similar to result(), this won't be emitted in case of abandon().
-             *
-             * @see result, success
-             */
-            void failure(BaseJob*);
-
-            void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
-            void uploadProgress(qint64 bytesSent, qint64 bytesTotal);
+        /** The job is about to send a network request */
+        void aboutToStart();
+
+        /** The job has sent a network request */
+        void started();
+
+        /** The job has changed its status */
+        void statusChanged(Status newStatus);
+
+        /**
+         * The previous network request has failed; the next attempt will
+         * be done in the specified time
+         * @param nextAttempt the 1-based number of attempt (will always be more
+         * than 1)
+         * @param inMilliseconds the interval after which the next attempt will
+         * be taken
+         */
+        void retryScheduled(int nextAttempt, int inMilliseconds);
+
+        /**
+         * Emitted when the job is finished, in any case. It is used to notify
+         * observers that the job is terminated and that progress can be hidden.
+         *
+         * This should not be emitted directly by subclasses;
+         * use finishJob() instead.
+         *
+         * In general, to be notified of a job's completion, client code
+         * should connect to result(), success(), or failure()
+         * rather than finished(). However if you need to track the job's
+         * lifecycle you should connect to this instead of result();
+         * in particular, only this signal will be emitted on abandoning.
+         *
+         * @param job the job that emitted this signal
+         *
+         * @see result, success, failure
+         */
+        void finished(BaseJob* job);
+
+        /**
+         * Emitted when the job is finished (except when abandoned).
+         *
+         * Use error() to know if the job was finished with error.
+         *
+         * @param job the job that emitted this signal
+         *
+         * @see success, failure
+         */
+        void result(BaseJob* job);
+
+        /**
+         * Emitted together with result() in case there's no error.
+         *
+         * @see result, failure
+         */
+        void success(BaseJob*);
+
+        /**
+         * Emitted together with result() if there's an error.
+         * Similar to result(), this won't be emitted in case of abandon().
+         *
+         * @see result, success
+         */
+        void failure(BaseJob*);
+
+        void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
+        void uploadProgress(qint64 bytesSent, qint64 bytesTotal);
 
         protected:
-            using headers_t = QHash<QByteArray, QByteArray>;
-
-            const QString& apiEndpoint() const;
-            void setApiEndpoint(const QString& apiEndpoint);
-            const headers_t& requestHeaders() const;
-            void setRequestHeader(const headers_t::key_type& headerName,
-                                  const headers_t::mapped_type& headerValue);
-            void setRequestHeaders(const headers_t& headers);
-            const QUrlQuery& query() const;
-            void setRequestQuery(const QUrlQuery& query);
-            const Data& requestData() const;
-            void setRequestData(Data&& data);
-            const QByteArrayList& expectedContentTypes() const;
-            void addExpectedContentType(const QByteArray& contentType);
-            void setExpectedContentTypes(const QByteArrayList& contentTypes);
-
-            /** Construct a URL out of baseUrl, path and query
-             * The function automatically adds '/' between baseUrl's path and
-             * \p path if necessary. The query component of \p baseUrl
-             * is ignored.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& path,
-                                       const QUrlQuery& query = {});
-
-            virtual void beforeStart(const ConnectionData* connData);
-            virtual void afterStart(const ConnectionData* connData,
-                                    QNetworkReply* reply);
-            virtual void beforeAbandon(QNetworkReply*);
-
-            /**
-             * Used by gotReply() to check the received reply for general
-             * issues such as network errors or access denial.
-             * Returning anything except NoError/Success prevents
-             * further parseReply()/parseJson() invocation.
-             *
-             * @param reply the reply received from the server
-             * @return the result of checking the reply
-             *
-             * @see gotReply
-             */
-            virtual Status doCheckReply(QNetworkReply* reply) const;
-
-            /**
-             * Processes the reply. By default, parses the reply into
-             * a QJsonDocument and calls parseJson() if it's a valid JSON.
-             *
-             * @param reply raw contents of a HTTP reply from the server (without headers)
-             *
-             * @see gotReply, parseJson
-             */
-            virtual Status parseReply(QNetworkReply* reply);
-
-            /**
-             * Processes the JSON document received from the Matrix server.
-             * By default returns succesful status without analysing the JSON.
-             *
-             * @param json valid JSON document received from the server
-             *
-             * @see parseReply
-             */
-            virtual Status parseJson(const QJsonDocument&);
-
-            void setStatus(Status s);
-            void setStatus(int code, QString message);
-
-            // Q_DECLARE_LOGGING_CATEGORY return different function types
-            // in different versions
-            using LoggingCategory = decltype(JOBS)*;
-            void setLoggingCategory(LoggingCategory lcf);
-
-            // Job objects should only be deleted via QObject::deleteLater
-            ~BaseJob() override;
+        using headers_t = QHash<QByteArray, QByteArray>;
+
+        const QString& apiEndpoint() const;
+        void setApiEndpoint(const QString& apiEndpoint);
+        const headers_t& requestHeaders() const;
+        void setRequestHeader(const headers_t::key_type& headerName,
+                              const headers_t::mapped_type& headerValue);
+        void setRequestHeaders(const headers_t& headers);
+        const QUrlQuery& query() const;
+        void setRequestQuery(const QUrlQuery& query);
+        const Data& requestData() const;
+        void setRequestData(Data&& data);
+        const QByteArrayList& expectedContentTypes() const;
+        void addExpectedContentType(const QByteArray& contentType);
+        void setExpectedContentTypes(const QByteArrayList& contentTypes);
+
+        /** Construct a URL out of baseUrl, path and query
+         * The function automatically adds '/' between baseUrl's path and
+         * \p path if necessary. The query component of \p baseUrl
+         * is ignored.
+         */
+        static QUrl makeRequestUrl(QUrl baseUrl, const QString& path,
+                                   const QUrlQuery& query = {});
+
+        virtual void beforeStart(const ConnectionData* connData);
+        virtual void afterStart(const ConnectionData* connData,
+                                QNetworkReply* reply);
+        virtual void beforeAbandon(QNetworkReply*);
+
+        /**
+         * Used by gotReply() to check the received reply for general
+         * issues such as network errors or access denial.
+         * Returning anything except NoError/Success prevents
+         * further parseReply()/parseJson() invocation.
+         *
+         * @param reply the reply received from the server
+         * @return the result of checking the reply
+         *
+         * @see gotReply
+         */
+        virtual Status doCheckReply(QNetworkReply* reply) const;
+
+        /**
+         * Processes the reply. By default, parses the reply into
+         * a QJsonDocument and calls parseJson() if it's a valid JSON.
+         *
+         * @param reply raw contents of a HTTP reply from the server (without
+         * headers)
+         *
+         * @see gotReply, parseJson
+         */
+        virtual Status parseReply(QNetworkReply* reply);
+
+        /**
+         * Processes the JSON document received from the Matrix server.
+         * By default returns succesful status without analysing the JSON.
+         *
+         * @param json valid JSON document received from the server
+         *
+         * @see parseReply
+         */
+        virtual Status parseJson(const QJsonDocument&);
+
+        void setStatus(Status s);
+        void setStatus(int code, QString message);
+
+        // Q_DECLARE_LOGGING_CATEGORY return different function types
+        // in different versions
+        using LoggingCategory = decltype(JOBS)*;
+        void setLoggingCategory(LoggingCategory lcf);
+
+        // Job objects should only be deleted via QObject::deleteLater
+        ~BaseJob() override;
 
         protected slots:
-            void timeout();
+        void timeout();
 
         private slots:
-            void sendRequest(bool inBackground);
-            void checkReply();
-            void gotReply();
+        void sendRequest(bool inBackground);
+        void checkReply();
+        void gotReply();
 
         private:
-            void stop();
-            void finishJob();
+        void stop();
+        void finishJob();
 
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 
     inline bool isJobRunning(BaseJob* job)
     {
         return job && job->error() == BaseJob::Pending;
     }
-}  // namespace QMatrixClient
+} // namespace QMatrixClient
diff --git a/lib/jobs/downloadfilejob.cpp b/lib/jobs/downloadfilejob.cpp
index 2bf9dd8f..12aacb8b 100644
--- a/lib/jobs/downloadfilejob.cpp
+++ b/lib/jobs/downloadfilejob.cpp
@@ -1,23 +1,24 @@
 #include "downloadfilejob.h"
 
-#include <QtNetwork/QNetworkReply>
 #include <QtCore/QFile>
 #include <QtCore/QTemporaryFile>
+#include <QtNetwork/QNetworkReply>
 
 using namespace QMatrixClient;
 
 class DownloadFileJob::Private
 {
     public:
-        Private() : tempFile(new QTemporaryFile()) { }
+    Private() : tempFile(new QTemporaryFile()) {}
 
-        explicit Private(const QString& localFilename)
-            : targetFile(new QFile(localFilename))
-            , tempFile(new QFile(targetFile->fileName() + ".qmcdownload"))
-        { }
+    explicit Private(const QString& localFilename)
+        : targetFile(new QFile(localFilename)),
+          tempFile(new QFile(targetFile->fileName() + ".qmcdownload"))
+    {
+    }
 
-        QScopedPointer<QFile> targetFile;
-        QScopedPointer<QFile> tempFile;
+    QScopedPointer<QFile> targetFile;
+    QScopedPointer<QFile> tempFile;
 };
 
 QUrl DownloadFileJob::makeRequestUrl(QUrl baseUrl, const QUrl& mxcUri)
@@ -28,8 +29,8 @@ QUrl DownloadFileJob::makeRequestUrl(QUrl baseUrl, const QUrl& mxcUri)
 DownloadFileJob::DownloadFileJob(const QString& serverName,
                                  const QString& mediaId,
                                  const QString& localFilename)
-    : GetContentJob(serverName, mediaId)
-    , d(localFilename.isEmpty() ? new Private : new Private(localFilename))
+    : GetContentJob(serverName, mediaId),
+      d(localFilename.isEmpty() ? new Private : new Private(localFilename))
 {
     setObjectName("DownloadFileJob");
 }
@@ -41,16 +42,15 @@ QString DownloadFileJob::targetFileName() const
 
 void DownloadFileJob::beforeStart(const ConnectionData*)
 {
-    if (d->targetFile && !d->targetFile->isReadable() &&
-            !d->targetFile->open(QIODevice::WriteOnly))
-    {
-        qCWarning(JOBS) << "Couldn't open the file"
-                        << d->targetFile->fileName() << "for writing";
+    if (d->targetFile && !d->targetFile->isReadable()
+        && !d->targetFile->open(QIODevice::WriteOnly)) {
+        qCWarning(JOBS) << "Couldn't open the file" << d->targetFile->fileName()
+                        << "for writing";
         setStatus(FileError, "Could not open the target file for writing");
         return;
     }
-    if (!d->tempFile->isReadable() && !d->tempFile->open(QIODevice::WriteOnly))
-    {
+    if (!d->tempFile->isReadable()
+        && !d->tempFile->open(QIODevice::WriteOnly)) {
         qCWarning(JOBS) << "Couldn't open the temporary file"
                         << d->tempFile->fileName() << "for writing";
         setStatus(FileError, "Could not open the temporary download file");
@@ -61,16 +61,14 @@ void DownloadFileJob::beforeStart(const ConnectionData*)
 
 void DownloadFileJob::afterStart(const ConnectionData*, QNetworkReply* reply)
 {
-    connect(reply, &QNetworkReply::metaDataChanged, this, [this,reply] {
+    connect(reply, &QNetworkReply::metaDataChanged, this, [this, reply] {
         if (!status().good())
             return;
         auto sizeHeader = reply->header(QNetworkRequest::ContentLengthHeader);
-        if (sizeHeader.isValid())
-        {
+        if (sizeHeader.isValid()) {
             auto targetSize = sizeHeader.value<qint64>();
             if (targetSize != -1)
-                if (!d->tempFile->resize(targetSize))
-                {
+                if (!d->tempFile->resize(targetSize)) {
                     qCWarning(JOBS) << "Failed to allocate" << targetSize
                                     << "bytes for" << d->tempFile->fileName();
                     setStatus(FileError,
@@ -78,16 +76,15 @@ void DownloadFileJob::afterStart(const ConnectionData*, QNetworkReply* reply)
                 }
         }
     });
-    connect(reply, &QIODevice::readyRead, this, [this,reply] {
+    connect(reply, &QIODevice::readyRead, this, [this, reply] {
         if (!status().good())
             return;
         auto bytes = reply->read(reply->bytesAvailable());
         if (!bytes.isEmpty())
             d->tempFile->write(bytes);
         else
-            qCWarning(JOBS)
-                    << "Unexpected empty chunk when downloading from"
-                    << reply->url() << "to" << d->tempFile->fileName();
+            qCWarning(JOBS) << "Unexpected empty chunk when downloading from"
+                            << reply->url() << "to" << d->tempFile->fileName();
     });
 }
 
@@ -100,22 +97,18 @@ void DownloadFileJob::beforeAbandon(QNetworkReply*)
 
 BaseJob::Status DownloadFileJob::parseReply(QNetworkReply*)
 {
-    if (d->targetFile)
-    {
+    if (d->targetFile) {
         d->targetFile->close();
-        if (!d->targetFile->remove())
-        {
+        if (!d->targetFile->remove()) {
             qCWarning(JOBS) << "Failed to remove the target file placeholder";
             return { FileError, "Couldn't finalise the download" };
         }
-        if (!d->tempFile->rename(d->targetFile->fileName()))
-        {
+        if (!d->tempFile->rename(d->targetFile->fileName())) {
             qCWarning(JOBS) << "Failed to rename" << d->tempFile->fileName()
                             << "to" << d->targetFile->fileName();
             return { FileError, "Couldn't finalise the download" };
         }
-    }
-    else
+    } else
         d->tempFile->close();
     qCDebug(JOBS) << "Saved a file as" << targetFileName();
     return Success;
diff --git a/lib/jobs/downloadfilejob.h b/lib/jobs/downloadfilejob.h
index ce47ab1c..fd34ba5a 100644
--- a/lib/jobs/downloadfilejob.h
+++ b/lib/jobs/downloadfilejob.h
@@ -2,29 +2,27 @@
 
 #include "csapi/content-repo.h"
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     class DownloadFileJob : public GetContentJob
     {
         public:
-            enum { FileError = BaseJob::UserDefinedError + 1 };
+        enum { FileError = BaseJob::UserDefinedError + 1 };
 
-            using GetContentJob::makeRequestUrl;
-            static QUrl makeRequestUrl(QUrl baseUrl, const QUrl& mxcUri);
+        using GetContentJob::makeRequestUrl;
+        static QUrl makeRequestUrl(QUrl baseUrl, const QUrl& mxcUri);
 
-            DownloadFileJob(const QString& serverName, const QString& mediaId,
-                            const QString& localFilename = {});
+        DownloadFileJob(const QString& serverName, const QString& mediaId,
+                        const QString& localFilename = {});
 
-            QString targetFileName() const;
+        QString targetFileName() const;
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
 
-            void beforeStart(const ConnectionData*) override;
-            void afterStart(const ConnectionData*,
-                            QNetworkReply* reply) override;
-            void beforeAbandon(QNetworkReply*) override;
-            Status parseReply(QNetworkReply*) override;
+        void beforeStart(const ConnectionData*) override;
+        void afterStart(const ConnectionData*, QNetworkReply* reply) override;
+        void beforeAbandon(QNetworkReply*) override;
+        Status parseReply(QNetworkReply*) override;
     };
 }
diff --git a/lib/jobs/mediathumbnailjob.cpp b/lib/jobs/mediathumbnailjob.cpp
index aeb49839..d3370f1f 100644
--- a/lib/jobs/mediathumbnailjob.cpp
+++ b/lib/jobs/mediathumbnailjob.cpp
@@ -13,41 +13,42 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "mediathumbnailjob.h"
 
 using namespace QMatrixClient;
 
-QUrl MediaThumbnailJob::makeRequestUrl(QUrl baseUrl,
-                                       const QUrl& mxcUri, QSize requestedSize)
+QUrl MediaThumbnailJob::makeRequestUrl(QUrl baseUrl, const QUrl& mxcUri,
+                                       QSize requestedSize)
 {
-    return makeRequestUrl(std::move(baseUrl),
-                          mxcUri.authority(), mxcUri.path().mid(1),
-                          requestedSize.width(), requestedSize.height());
+    return makeRequestUrl(std::move(baseUrl), mxcUri.authority(),
+                          mxcUri.path().mid(1), requestedSize.width(),
+                          requestedSize.height());
 }
 
 MediaThumbnailJob::MediaThumbnailJob(const QString& serverName,
-                                     const QString& mediaId, QSize requestedSize)
-    : GetContentThumbnailJob(serverName, mediaId,
-                             requestedSize.width(), requestedSize.height())
-{ }
+                                     const QString& mediaId,
+                                     QSize requestedSize)
+    : GetContentThumbnailJob(serverName, mediaId, requestedSize.width(),
+                             requestedSize.height())
+{
+}
 
 MediaThumbnailJob::MediaThumbnailJob(const QUrl& mxcUri, QSize requestedSize)
-    : MediaThumbnailJob(mxcUri.authority(), mxcUri.path().mid(1), // sans leading '/'
+    : MediaThumbnailJob(mxcUri.authority(),
+                        mxcUri.path().mid(1), // sans leading '/'
                         requestedSize)
-{ }
-
-QImage MediaThumbnailJob::thumbnail() const
 {
-    return _thumbnail;
 }
 
+QImage MediaThumbnailJob::thumbnail() const { return _thumbnail; }
+
 QImage MediaThumbnailJob::scaledThumbnail(QSize toSize) const
 {
-    return _thumbnail.scaled(toSize,
-                             Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    return _thumbnail.scaled(toSize, Qt::KeepAspectRatio,
+                             Qt::SmoothTransformation);
 }
 
 BaseJob::Status MediaThumbnailJob::parseReply(QNetworkReply* reply)
@@ -56,7 +57,7 @@ BaseJob::Status MediaThumbnailJob::parseReply(QNetworkReply* reply)
     if (!result.good())
         return result;
 
-    if( _thumbnail.loadFromData(data()->readAll()) )
+    if (_thumbnail.loadFromData(data()->readAll()))
         return Success;
 
     return { IncorrectResponseError, "Could not read image data" };
diff --git a/lib/jobs/mediathumbnailjob.h b/lib/jobs/mediathumbnailjob.h
index 7963796e..1dcf8ccb 100644
--- a/lib/jobs/mediathumbnailjob.h
+++ b/lib/jobs/mediathumbnailjob.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
@@ -22,26 +22,25 @@
 
 #include <QtGui/QPixmap>
 
-namespace QMatrixClient
-{
-    class MediaThumbnailJob: public GetContentThumbnailJob
+namespace QMatrixClient {
+    class MediaThumbnailJob : public GetContentThumbnailJob
     {
         public:
-            using GetContentThumbnailJob::makeRequestUrl;
-            static QUrl makeRequestUrl(QUrl baseUrl,
-                                       const QUrl& mxcUri, QSize requestedSize);
+        using GetContentThumbnailJob::makeRequestUrl;
+        static QUrl makeRequestUrl(QUrl baseUrl, const QUrl& mxcUri,
+                                   QSize requestedSize);
 
-            MediaThumbnailJob(const QString& serverName, const QString& mediaId,
-                              QSize requestedSize);
-            MediaThumbnailJob(const QUrl& mxcUri, QSize requestedSize);
+        MediaThumbnailJob(const QString& serverName, const QString& mediaId,
+                          QSize requestedSize);
+        MediaThumbnailJob(const QUrl& mxcUri, QSize requestedSize);
 
-            QImage thumbnail() const;
-            QImage scaledThumbnail(QSize toSize) const;
+        QImage thumbnail() const;
+        QImage scaledThumbnail(QSize toSize) const;
 
         protected:
-            Status parseReply(QNetworkReply* reply) override;
+        Status parseReply(QNetworkReply* reply) override;
 
         private:
-            QImage _thumbnail;
+        QImage _thumbnail;
     };
-}  // namespace QMatrixClient
+} // namespace QMatrixClient
diff --git a/lib/jobs/postreadmarkersjob.h b/lib/jobs/postreadmarkersjob.h
index 63a8e1d0..3c5cac89 100644
--- a/lib/jobs/postreadmarkersjob.h
+++ b/lib/jobs/postreadmarkersjob.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
@@ -27,13 +27,13 @@ using namespace QMatrixClient;
 class PostReadMarkersJob : public BaseJob
 {
     public:
-        explicit PostReadMarkersJob(const QString& roomId,
-                                    const QString& readUpToEventId)
-            : BaseJob(HttpVerb::Post, "PostReadMarkersJob",
-                      QStringLiteral("_matrix/client/r0/rooms/%1/read_markers")
-                      .arg(roomId))
-        {
-            setRequestData(QJsonObject {{
-                QStringLiteral("m.fully_read"), readUpToEventId }});
-        }
+    explicit PostReadMarkersJob(const QString& roomId,
+                                const QString& readUpToEventId)
+        : BaseJob(HttpVerb::Post, "PostReadMarkersJob",
+                  QStringLiteral("_matrix/client/r0/rooms/%1/read_markers")
+                          .arg(roomId))
+    {
+        setRequestData(QJsonObject {
+                { QStringLiteral("m.fully_read"), readUpToEventId } });
+    }
 };
diff --git a/lib/jobs/requestdata.cpp b/lib/jobs/requestdata.cpp
index 5cb62221..477f49e7 100644
--- a/lib/jobs/requestdata.cpp
+++ b/lib/jobs/requestdata.cpp
@@ -1,10 +1,10 @@
 #include "requestdata.h"
 
+#include <QtCore/QBuffer>
 #include <QtCore/QByteArray>
-#include <QtCore/QJsonObject>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
-#include <QtCore/QBuffer>
+#include <QtCore/QJsonObject>
 
 using namespace QMatrixClient;
 
@@ -17,22 +17,15 @@ auto fromData(const QByteArray& data)
     return source;
 }
 
-template <typename JsonDataT>
-inline auto fromJson(const JsonDataT& jdata)
+template <typename JsonDataT> inline auto fromJson(const JsonDataT& jdata)
 {
     return fromData(QJsonDocument(jdata).toJson(QJsonDocument::Compact));
 }
 
-RequestData::RequestData(const QByteArray& a)
-    : _source(fromData(a))
-{ }
+RequestData::RequestData(const QByteArray& a) : _source(fromData(a)) {}
 
-RequestData::RequestData(const QJsonObject& jo)
-    : _source(fromJson(jo))
-{ }
+RequestData::RequestData(const QJsonObject& jo) : _source(fromJson(jo)) {}
 
-RequestData::RequestData(const QJsonArray& ja)
-    : _source(fromJson(ja))
-{ }
+RequestData::RequestData(const QJsonArray& ja) : _source(fromJson(ja)) {}
 
 RequestData::~RequestData() = default;
diff --git a/lib/jobs/requestdata.h b/lib/jobs/requestdata.h
index db011b61..207ff731 100644
--- a/lib/jobs/requestdata.h
+++ b/lib/jobs/requestdata.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
@@ -26,8 +26,7 @@ class QJsonArray;
 class QJsonDocument;
 class QIODevice;
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     /**
      * A simple wrapper that represents the request body.
      * Provides a unified interface to dump an unstructured byte stream
@@ -37,25 +36,23 @@ namespace QMatrixClient
     class RequestData
     {
         public:
-            RequestData() = default;
-            RequestData(const QByteArray& a);
-            RequestData(const QJsonObject& jo);
-            RequestData(const QJsonArray& ja);
-            RequestData(QIODevice* source)
-                : _source(std::unique_ptr<QIODevice>(source))
-            { }
-            RequestData(const RequestData&) = delete;
-            RequestData& operator=(const RequestData&) = delete;
-            RequestData(RequestData&&) = default;
-            RequestData& operator=(RequestData&&) = default;
-            ~RequestData();
+        RequestData() = default;
+        RequestData(const QByteArray& a);
+        RequestData(const QJsonObject& jo);
+        RequestData(const QJsonArray& ja);
+        RequestData(QIODevice* source)
+            : _source(std::unique_ptr<QIODevice>(source))
+        {
+        }
+        RequestData(const RequestData&) = delete;
+        RequestData& operator=(const RequestData&) = delete;
+        RequestData(RequestData&&) = default;
+        RequestData& operator=(RequestData&&) = default;
+        ~RequestData();
 
-            QIODevice* source() const
-            {
-                return _source.get();
-            }
+        QIODevice* source() const { return _source.get(); }
 
         private:
-            std::unique_ptr<QIODevice> _source;
+        std::unique_ptr<QIODevice> _source;
     };
 } // namespace QMatrixClient
diff --git a/lib/jobs/syncjob.cpp b/lib/jobs/syncjob.cpp
index 84385b55..db11005a 100644
--- a/lib/jobs/syncjob.cpp
+++ b/lib/jobs/syncjob.cpp
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "syncjob.h"
@@ -29,25 +29,26 @@ SyncJob::SyncJob(const QString& since, const QString& filter, int timeout,
 {
     setLoggingCategory(SYNCJOB);
     QUrlQuery query;
-    if( !filter.isEmpty() )
+    if (!filter.isEmpty())
         query.addQueryItem(QStringLiteral("filter"), filter);
-    if( !presence.isEmpty() )
+    if (!presence.isEmpty())
         query.addQueryItem(QStringLiteral("set_presence"), presence);
-    if( timeout >= 0 )
+    if (timeout >= 0)
         query.addQueryItem(QStringLiteral("timeout"), QString::number(timeout));
-    if( !since.isEmpty() )
+    if (!since.isEmpty())
         query.addQueryItem(QStringLiteral("since"), since);
     setRequestQuery(query);
 
     setMaxRetries(std::numeric_limits<int>::max());
 }
 
-SyncJob::SyncJob(const QString& since, const Filter& filter,
-                 int timeout, const QString& presence)
+SyncJob::SyncJob(const QString& since, const Filter& filter, int timeout,
+                 const QString& presence)
     : SyncJob(since,
               QJsonDocument(toJson(filter)).toJson(QJsonDocument::Compact),
               timeout, presence)
-{ }
+{
+}
 
 BaseJob::Status SyncJob::parseJson(const QJsonDocument& data)
 {
@@ -59,4 +60,3 @@ BaseJob::Status SyncJob::parseJson(const QJsonDocument& data)
                                << d.unresolvedRooms().join(',');
     return BaseJob::IncorrectResponseError;
 }
-
diff --git a/lib/jobs/syncjob.h b/lib/jobs/syncjob.h
index 036b25d0..2afaf0f7 100644
--- a/lib/jobs/syncjob.h
+++ b/lib/jobs/syncjob.h
@@ -13,33 +13,31 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
 #include "basejob.h"
 
-#include "../syncdata.h"
 #include "../csapi/definitions/sync_filter.h"
+#include "../syncdata.h"
 
-namespace QMatrixClient
-{
-    class SyncJob: public BaseJob
+namespace QMatrixClient {
+    class SyncJob : public BaseJob
     {
         public:
-            explicit SyncJob(const QString& since = {},
-                             const QString& filter = {},
-                             int timeout = -1, const QString& presence = {});
-            explicit SyncJob(const QString& since, const Filter& filter,
-                             int timeout = -1, const QString& presence = {});
+        explicit SyncJob(const QString& since = {}, const QString& filter = {},
+                         int timeout = -1, const QString& presence = {});
+        explicit SyncJob(const QString& since, const Filter& filter,
+                         int timeout = -1, const QString& presence = {});
 
-            SyncData &&takeData() { return std::move(d); }
+        SyncData&& takeData() { return std::move(d); }
 
         protected:
-            Status parseJson(const QJsonDocument& data) override;
+        Status parseJson(const QJsonDocument& data) override;
 
         private:
-            SyncData d;
+        SyncData d;
     };
-}  // namespace QMatrixClient
+} // namespace QMatrixClient
diff --git a/lib/joinstate.h b/lib/joinstate.h
index 379183f6..ddaba9a5 100644
--- a/lib/joinstate.h
+++ b/lib/joinstate.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
@@ -22,10 +22,8 @@
 
 #include <array>
 
-namespace QMatrixClient
-{
-    enum class JoinState : unsigned int
-    {
+namespace QMatrixClient {
+    enum class JoinState : unsigned int {
         Join = 0x1,
         Invite = 0x2,
         Leave = 0x4,
@@ -35,14 +33,16 @@ namespace QMatrixClient
 
     // We cannot use REGISTER_ENUM outside of a Q_OBJECT and besides, we want
     // to use strings that match respective JSON keys.
-    static const std::array<const char*, 3> JoinStateStrings
-        { { "join", "invite", "leave" } };
+    static const std::array<const char*, 3> JoinStateStrings {
+        { "join", "invite", "leave" }
+    };
 
     inline const char* toCString(JoinState js)
     {
         size_t state = size_t(js), index = 0;
-        while (state >>= 1) ++index;
+        while (state >>= 1)
+            ++index;
         return JoinStateStrings[index];
     }
-}  // namespace QMatrixClient
+} // namespace QMatrixClient
 Q_DECLARE_OPERATORS_FOR_FLAGS(QMatrixClient::JoinStates)
diff --git a/lib/logging.cpp b/lib/logging.cpp
index 7476781f..5d70ba36 100644
--- a/lib/logging.cpp
+++ b/lib/logging.cpp
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "logging.h"
diff --git a/lib/logging.h b/lib/logging.h
index a3a65887..06603322 100644
--- a/lib/logging.h
+++ b/lib/logging.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
@@ -28,8 +28,7 @@ Q_DECLARE_LOGGING_CATEGORY(EPHEMERAL)
 Q_DECLARE_LOGGING_CATEGORY(JOBS)
 Q_DECLARE_LOGGING_CATEGORY(SYNCJOB)
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // QDebug manipulators
 
     using QDebugManip = QDebug (*)(QDebug);
@@ -47,9 +46,9 @@ namespace QMatrixClient
     inline QDebug formatJson(QDebug debug_object)
     {
 #if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-            return debug_object;
+        return debug_object;
 #else
-            return debug_object.noquote();
+        return debug_object.noquote();
 #endif
     }
 
@@ -61,7 +60,7 @@ namespace QMatrixClient
      * @param qdm a QDebug manipulator
      * @return a copy of debug_object that has its mode altered by qdm
      */
-    inline QDebug operator<< (QDebug debug_object, QDebugManip qdm)
+    inline QDebug operator<<(QDebug debug_object, QDebugManip qdm)
     {
         return qdm(debug_object);
     }
@@ -70,15 +69,15 @@ namespace QMatrixClient
     {
         return
 #ifdef PROFILER_LOG_USECS
-            PROFILER_LOG_USECS
+                PROFILER_LOG_USECS
 #else
-            200
+                200
 #endif
-        * 1000;
+                * 1000;
     }
 }
 
-inline QDebug operator<< (QDebug debug_object, const QElapsedTimer& et)
+inline QDebug operator<<(QDebug debug_object, const QElapsedTimer& et)
 {
     auto val = et.nsecsElapsed() / 1000;
     if (val < 1000)
diff --git a/lib/networkaccessmanager.cpp b/lib/networkaccessmanager.cpp
index 89967a8a..174ac16e 100644
--- a/lib/networkaccessmanager.cpp
+++ b/lib/networkaccessmanager.cpp
@@ -13,24 +13,26 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "networkaccessmanager.h"
 
-#include <QtNetwork/QNetworkReply>
 #include <QtCore/QCoreApplication>
+#include <QtNetwork/QNetworkReply>
 
 using namespace QMatrixClient;
 
 class NetworkAccessManager::Private
 {
     public:
-        QList<QSslError> ignoredSslErrors;
+    QList<QSslError> ignoredSslErrors;
 };
 
-NetworkAccessManager::NetworkAccessManager(QObject* parent) : d(std::make_unique<Private>())
-{ }
+NetworkAccessManager::NetworkAccessManager(QObject* parent)
+    : d(std::make_unique<Private>())
+{
+}
 
 QList<QSslError> NetworkAccessManager::ignoredSslErrors() const
 {
@@ -52,8 +54,9 @@ static NetworkAccessManager* createNam()
     auto nam = new NetworkAccessManager(QCoreApplication::instance());
     // See #109. Once Qt bearer management gets better, this workaround
     // should become unnecessary.
-    nam->connect(nam, &QNetworkAccessManager::networkAccessibleChanged,
-        [nam] { nam->setNetworkAccessible(QNetworkAccessManager::Accessible); });
+    nam->connect(nam, &QNetworkAccessManager::networkAccessibleChanged, [nam] {
+        nam->setNetworkAccessible(QNetworkAccessManager::Accessible);
+    });
     return nam;
 }
 
@@ -65,8 +68,8 @@ NetworkAccessManager* NetworkAccessManager::instance()
 
 NetworkAccessManager::~NetworkAccessManager() = default;
 
-QNetworkReply* NetworkAccessManager::createRequest(Operation op,
-    const QNetworkRequest& request, QIODevice* outgoingData)
+QNetworkReply* NetworkAccessManager::createRequest(
+        Operation op, const QNetworkRequest& request, QIODevice* outgoingData)
 {
     auto reply =
             QNetworkAccessManager::createRequest(op, request, outgoingData);
diff --git a/lib/networkaccessmanager.h b/lib/networkaccessmanager.h
index ae847582..ebaaa5b2 100644
--- a/lib/networkaccessmanager.h
+++ b/lib/networkaccessmanager.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
@@ -22,28 +22,27 @@
 
 #include <memory>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     class NetworkAccessManager : public QNetworkAccessManager
     {
-            Q_OBJECT
+        Q_OBJECT
         public:
-            NetworkAccessManager(QObject* parent = nullptr);
-            ~NetworkAccessManager() override;
+        NetworkAccessManager(QObject* parent = nullptr);
+        ~NetworkAccessManager() override;
 
-            QList<QSslError> ignoredSslErrors() const;
-            void addIgnoredSslError(const QSslError& error);
-            void clearIgnoredSslErrors();
+        QList<QSslError> ignoredSslErrors() const;
+        void addIgnoredSslError(const QSslError& error);
+        void clearIgnoredSslErrors();
 
-            /** Get a pointer to the singleton */
-            static NetworkAccessManager* instance();
+        /** Get a pointer to the singleton */
+        static NetworkAccessManager* instance();
 
         private:
-            QNetworkReply * createRequest(Operation op,
-                                const QNetworkRequest &request,
-                                QIODevice *outgoingData = Q_NULLPTR) override;
+        QNetworkReply*
+        createRequest(Operation op, const QNetworkRequest& request,
+                      QIODevice* outgoingData = Q_NULLPTR) override;
 
-            class Private;
-            std::unique_ptr<Private> d;
+        class Private;
+        std::unique_ptr<Private> d;
     };
 } // namespace QMatrixClient
diff --git a/lib/networksettings.cpp b/lib/networksettings.cpp
index 48bd09f3..de333884 100644
--- a/lib/networksettings.cpp
+++ b/lib/networksettings.cpp
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "networksettings.h"
@@ -23,9 +23,12 @@ using namespace QMatrixClient;
 void NetworkSettings::setupApplicationProxy() const
 {
     QNetworkProxy::setApplicationProxy(
-        { proxyType(), proxyHostName(), proxyPort() });
+            { proxyType(), proxyHostName(), proxyPort() });
 }
 
-QMC_DEFINE_SETTING(NetworkSettings, QNetworkProxy::ProxyType, proxyType, "proxy_type", QNetworkProxy::DefaultProxy, setProxyType)
-QMC_DEFINE_SETTING(NetworkSettings, QString, proxyHostName, "proxy_hostname", "", setProxyHostName)
-QMC_DEFINE_SETTING(NetworkSettings, quint16, proxyPort, "proxy_port", -1, setProxyPort)
+QMC_DEFINE_SETTING(NetworkSettings, QNetworkProxy::ProxyType, proxyType,
+                   "proxy_type", QNetworkProxy::DefaultProxy, setProxyType)
+QMC_DEFINE_SETTING(NetworkSettings, QString, proxyHostName, "proxy_hostname",
+                   "", setProxyHostName)
+QMC_DEFINE_SETTING(NetworkSettings, quint16, proxyPort, "proxy_port", -1,
+                   setProxyPort)
diff --git a/lib/networksettings.h b/lib/networksettings.h
index 83613060..ca9c7dfc 100644
--- a/lib/networksettings.h
+++ b/lib/networksettings.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
@@ -25,20 +25,21 @@
 Q_DECLARE_METATYPE(QNetworkProxy::ProxyType)
 
 namespace QMatrixClient {
-    class NetworkSettings: public SettingsGroup
+    class NetworkSettings : public SettingsGroup
     {
-            Q_OBJECT
-            QMC_DECLARE_SETTING(QNetworkProxy::ProxyType, proxyType, setProxyType)
-            QMC_DECLARE_SETTING(QString, proxyHostName, setProxyHostName)
-            QMC_DECLARE_SETTING(quint16, proxyPort, setProxyPort)
-            Q_PROPERTY(QString proxyHost READ proxyHostName WRITE setProxyHostName)
+        Q_OBJECT
+        QMC_DECLARE_SETTING(QNetworkProxy::ProxyType, proxyType, setProxyType)
+        QMC_DECLARE_SETTING(QString, proxyHostName, setProxyHostName)
+        QMC_DECLARE_SETTING(quint16, proxyPort, setProxyPort)
+        Q_PROPERTY(QString proxyHost READ proxyHostName WRITE setProxyHostName)
         public:
-            template <typename... ArgTs>
-            explicit NetworkSettings(ArgTs... qsettingsArgs)
-                : SettingsGroup(QStringLiteral("Network"), qsettingsArgs...)
-            { }
-            ~NetworkSettings() override = default;
+        template <typename... ArgTs>
+        explicit NetworkSettings(ArgTs... qsettingsArgs)
+            : SettingsGroup(QStringLiteral("Network"), qsettingsArgs...)
+        {
+        }
+        ~NetworkSettings() override = default;
 
-            Q_INVOKABLE void setupApplicationProxy() const;
+        Q_INVOKABLE void setupApplicationProxy() const;
     };
 }
diff --git a/lib/qt_connection_util.h b/lib/qt_connection_util.h
index c2bde8df..0f36424f 100644
--- a/lib/qt_connection_util.h
+++ b/lib/qt_connection_util.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
@@ -24,11 +24,12 @@
 
 namespace QMatrixClient {
     namespace _impl {
-        template <typename SenderT, typename SignalT,
-                  typename ContextT, typename... ArgTs>
-        inline QMetaObject::Connection connectUntil(
-                SenderT* sender, SignalT signal, ContextT* context,
-                std::function<bool(ArgTs...)> slot, Qt::ConnectionType connType)
+        template <typename SenderT, typename SignalT, typename ContextT,
+                  typename... ArgTs>
+        inline QMetaObject::Connection
+        connectUntil(SenderT* sender, SignalT signal, ContextT* context,
+                     std::function<bool(ArgTs...)> slot,
+                     Qt::ConnectionType connType)
         {
             // See https://bugreports.qt.io/browse/QTBUG-60339
 #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
@@ -37,23 +38,27 @@ namespace QMatrixClient {
             auto pc = std::make_unique<QMetaObject::Connection>();
 #endif
             auto& c = *pc; // Resolve a reference before pc is moved to lambda
-            c = QObject::connect(sender, signal, context,
-                [pc=std::move(pc),slot] (ArgTs... args) {
-                    Q_ASSERT(*pc); // If it's been triggered, it should exist
-                    if (slot(std::forward<ArgTs>(args)...))
-                        QObject::disconnect(*pc);
-            }, connType);
+            c = QObject::connect(
+                    sender, signal, context,
+                    [pc = std::move(pc), slot](ArgTs... args) {
+                        Q_ASSERT(
+                                *pc); // If it's been triggered, it should exist
+                        if (slot(std::forward<ArgTs>(args)...))
+                            QObject::disconnect(*pc);
+                    },
+                    connType);
             return c;
         }
     }
 
-    template <typename SenderT, typename SignalT,
-              typename ContextT, typename FunctorT>
+    template <typename SenderT, typename SignalT, typename ContextT,
+              typename FunctorT>
     inline auto connectUntil(SenderT* sender, SignalT signal, ContextT* context,
                              const FunctorT& slot,
                              Qt::ConnectionType connType = Qt::AutoConnection)
     {
-        return _impl::connectUntil(sender, signal, context,
+        return _impl::connectUntil(
+                sender, signal, context,
                 typename function_traits<FunctorT>::function_type(slot),
                 connType);
     }
@@ -63,8 +68,8 @@ namespace QMatrixClient {
      *
      * Only supports DirectConnection type.
      */
-    template <typename SenderT, typename SignalT,
-              typename ReceiverT, typename SlotT>
+    template <typename SenderT, typename SignalT, typename ReceiverT,
+              typename SlotT>
     inline auto connectSingleShot(SenderT* sender, SignalT signal,
                                   ReceiverT* receiver, SlotT slot)
     {
@@ -84,24 +89,24 @@ namespace QMatrixClient {
      * disconnected from signals of the underlying pointer upon the guard's
      * destruction.
      */
-    template <typename T>
-    class ConnectionsGuard : public QPointer<T>
+    template <typename T> class ConnectionsGuard : public QPointer<T>
     {
         public:
-            ConnectionsGuard(T* publisher, QObject* subscriber)
-                : QPointer<T>(publisher), subscriber(subscriber)
-            { }
-            ~ConnectionsGuard()
-            {
-                if (*this)
-                    (*this)->disconnect(subscriber);
-            }
-            ConnectionsGuard(ConnectionsGuard&&) = default;
-            ConnectionsGuard& operator=(ConnectionsGuard&&) = default;
-            Q_DISABLE_COPY(ConnectionsGuard)
-            using QPointer<T>::operator=;
+        ConnectionsGuard(T* publisher, QObject* subscriber)
+            : QPointer<T>(publisher), subscriber(subscriber)
+        {
+        }
+        ~ConnectionsGuard()
+        {
+            if (*this)
+                (*this)->disconnect(subscriber);
+        }
+        ConnectionsGuard(ConnectionsGuard&&) = default;
+        ConnectionsGuard& operator=(ConnectionsGuard&&) = default;
+        Q_DISABLE_COPY(ConnectionsGuard)
+        using QPointer<T>::operator=;
 
         private:
-            QObject* subscriber;
+        QObject* subscriber;
     };
 }
diff --git a/lib/room.cpp b/lib/room.cpp
index 5da9373e..c7c94fe5 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -13,55 +13,55 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "room.h"
 
-#include "csapi/kicking.h"
-#include "csapi/inviting.h"
+#include "avatar.h"
+#include "connection.h"
+#include "converters.h"
+#include "csapi/account-data.h"
 #include "csapi/banning.h"
+#include "csapi/inviting.h"
+#include "csapi/kicking.h"
 #include "csapi/leaving.h"
 #include "csapi/receipts.h"
 #include "csapi/redaction.h"
-#include "csapi/account-data.h"
-#include "csapi/room_state.h"
 #include "csapi/room_send.h"
+#include "csapi/room_state.h"
+#include "csapi/room_upgrades.h"
 #include "csapi/rooms.h"
 #include "csapi/tags.h"
-#include "csapi/room_upgrades.h"
-#include "events/simplestateevents.h"
-#include "events/roomcreateevent.h"
-#include "events/roomtombstoneevent.h"
-#include "events/roomavatarevent.h"
-#include "events/roommemberevent.h"
-#include "events/typingevent.h"
-#include "events/receiptevent.h"
-#include "events/callinviteevent.h"
-#include "events/callcandidatesevent.h"
 #include "events/callanswerevent.h"
+#include "events/callcandidatesevent.h"
 #include "events/callhangupevent.h"
+#include "events/callinviteevent.h"
+#include "events/receiptevent.h"
 #include "events/redactionevent.h"
-#include "jobs/mediathumbnailjob.h"
+#include "events/roomavatarevent.h"
+#include "events/roomcreateevent.h"
+#include "events/roommemberevent.h"
+#include "events/roomtombstoneevent.h"
+#include "events/simplestateevents.h"
+#include "events/typingevent.h"
 #include "jobs/downloadfilejob.h"
+#include "jobs/mediathumbnailjob.h"
 #include "jobs/postreadmarkersjob.h"
-#include "avatar.h"
-#include "connection.h"
-#include "user.h"
-#include "converters.h"
 #include "syncdata.h"
+#include "user.h"
 
+#include <QtCore/QDir>
 #include <QtCore/QHash>
-#include <QtCore/QStringBuilder> // for efficient string concats (operator%)
+#include <QtCore/QMimeDatabase>
 #include <QtCore/QPointer>
-#include <QtCore/QDir>
-#include <QtCore/QTemporaryFile>
 #include <QtCore/QRegularExpression>
-#include <QtCore/QMimeDatabase>
+#include <QtCore/QStringBuilder> // for efficient string concats (operator%)
+#include <QtCore/QTemporaryFile>
 
 #include <array>
-#include <functional>
 #include <cmath>
+#include <functional>
 
 using namespace QMatrixClient;
 using namespace std::placeholders;
@@ -75,239 +75,235 @@ enum EventsPlacement : int { Older = -1, Newer = 1 };
 class Room::Private
 {
     public:
-        /** Map of user names to users. User names potentially duplicate, hence a multi-hashmap. */
-        using members_map_t = QMultiHash<QString, User*>;
-
-        Private(Connection* c, QString id_, JoinState initialJoinState)
-            : q(nullptr), connection(c), id(move(id_))
-            , joinState(initialJoinState)
-        { }
-
-        Room* q;
-
-        Connection* connection;
-        QString id;
-        JoinState joinState;
-        RoomSummary summary = { none, 0, none };
-        /// The state of the room at timeline position before-0
-        /// \sa timelineBase
-        std::unordered_map<StateEventKey, StateEventPtr> baseState;
-        /// The state of the room at timeline position after-maxTimelineIndex()
-        /// \sa Room::syncEdge
-        QHash<StateEventKey, const StateEventBase*> currentState;
-        Timeline timeline;
-        PendingEvents unsyncedEvents;
-        QHash<QString, TimelineItem::index_t> eventsIndex;
-        QString displayname;
-        Avatar avatar;
-        int highlightCount = 0;
-        int notificationCount = 0;
-        members_map_t membersMap;
-        QList<User*> usersTyping;
-        QMultiHash<QString, User*> eventIdReadUsers;
-        QList<User*> membersLeft;
-        int unreadMessages = 0;
-        bool displayed = false;
-        QString firstDisplayedEventId;
-        QString lastDisplayedEventId;
-        QHash<const User*, QString> lastReadEventIds;
-        QString serverReadMarker;
-        TagsMap tags;
-        std::unordered_map<QString, EventPtr> accountData;
-        QString prevBatch;
-        QPointer<GetRoomEventsJob> eventsHistoryJob;
-        QPointer<GetMembersByRoomJob> allMembersJob;
-
-        struct FileTransferPrivateInfo
+    /** Map of user names to users. User names potentially duplicate, hence a
+     * multi-hashmap. */
+    using members_map_t = QMultiHash<QString, User*>;
+
+    Private(Connection* c, QString id_, JoinState initialJoinState)
+        : q(nullptr), connection(c), id(move(id_)), joinState(initialJoinState)
+    {
+    }
+
+    Room* q;
+
+    Connection* connection;
+    QString id;
+    JoinState joinState;
+    RoomSummary summary = { none, 0, none };
+    /// The state of the room at timeline position before-0
+    /// \sa timelineBase
+    std::unordered_map<StateEventKey, StateEventPtr> baseState;
+    /// The state of the room at timeline position after-maxTimelineIndex()
+    /// \sa Room::syncEdge
+    QHash<StateEventKey, const StateEventBase*> currentState;
+    Timeline timeline;
+    PendingEvents unsyncedEvents;
+    QHash<QString, TimelineItem::index_t> eventsIndex;
+    QString displayname;
+    Avatar avatar;
+    int highlightCount = 0;
+    int notificationCount = 0;
+    members_map_t membersMap;
+    QList<User*> usersTyping;
+    QMultiHash<QString, User*> eventIdReadUsers;
+    QList<User*> membersLeft;
+    int unreadMessages = 0;
+    bool displayed = false;
+    QString firstDisplayedEventId;
+    QString lastDisplayedEventId;
+    QHash<const User*, QString> lastReadEventIds;
+    QString serverReadMarker;
+    TagsMap tags;
+    std::unordered_map<QString, EventPtr> accountData;
+    QString prevBatch;
+    QPointer<GetRoomEventsJob> eventsHistoryJob;
+    QPointer<GetMembersByRoomJob> allMembersJob;
+
+    struct FileTransferPrivateInfo {
+        FileTransferPrivateInfo() = default;
+        FileTransferPrivateInfo(BaseJob* j, const QString& fileName,
+                                bool isUploading = false)
+            : status(FileTransferInfo::Started),
+              job(j),
+              localFileInfo(fileName),
+              isUpload(isUploading)
         {
-            FileTransferPrivateInfo() = default;
-            FileTransferPrivateInfo(BaseJob* j, const QString& fileName,
-                                    bool isUploading = false)
-                : status(FileTransferInfo::Started), job(j)
-                , localFileInfo(fileName), isUpload(isUploading)
-            { }
-
-            FileTransferInfo::Status status = FileTransferInfo::None;
-            QPointer<BaseJob> job = nullptr;
-            QFileInfo localFileInfo { };
-            bool isUpload = false;
-            qint64 progress = 0;
-            qint64 total = -1;
-
-            void update(qint64 p, qint64 t)
-            {
-                if (t == 0)
-                {
-                    t = -1;
-                    if (p == 0)
-                        p = -1;
-                }
-                if (p != -1)
-                    qCDebug(PROFILER) << "Transfer progress:" << p << "/" << t
-                        << "=" << llround(double(p) / t * 100) << "%";
-                progress = p; total = t;
-            }
-        };
-        void failedTransfer(const QString& tid, const QString& errorMessage = {})
+        }
+
+        FileTransferInfo::Status status = FileTransferInfo::None;
+        QPointer<BaseJob> job = nullptr;
+        QFileInfo localFileInfo {};
+        bool isUpload = false;
+        qint64 progress = 0;
+        qint64 total = -1;
+
+        void update(qint64 p, qint64 t)
         {
-            qCWarning(MAIN) << "File transfer failed for id" << tid;
-            if (!errorMessage.isEmpty())
-                qCWarning(MAIN) << "Message:" << errorMessage;
-            fileTransfers[tid].status = FileTransferInfo::Failed;
-            emit q->fileTransferFailed(tid, errorMessage);
+            if (t == 0) {
+                t = -1;
+                if (p == 0)
+                    p = -1;
+            }
+            if (p != -1)
+                qCDebug(PROFILER) << "Transfer progress:" << p << "/" << t
+                                  << "=" << llround(double(p) / t * 100) << "%";
+            progress = p;
+            total = t;
         }
-        /// A map from event/txn ids to information about the long operation;
-        /// used for both download and upload operations
-        QHash<QString, FileTransferPrivateInfo> fileTransfers;
+    };
+    void failedTransfer(const QString& tid, const QString& errorMessage = {})
+    {
+        qCWarning(MAIN) << "File transfer failed for id" << tid;
+        if (!errorMessage.isEmpty())
+            qCWarning(MAIN) << "Message:" << errorMessage;
+        fileTransfers[tid].status = FileTransferInfo::Failed;
+        emit q->fileTransferFailed(tid, errorMessage);
+    }
+    /// A map from event/txn ids to information about the long operation;
+    /// used for both download and upload operations
+    QHash<QString, FileTransferPrivateInfo> fileTransfers;
 
-        const RoomMessageEvent* getEventWithFile(const QString& eventId) const;
-        QString fileNameToDownload(const RoomMessageEvent* event) const;
+    const RoomMessageEvent* getEventWithFile(const QString& eventId) const;
+    QString fileNameToDownload(const RoomMessageEvent* event) const;
 
-        Changes setSummary(RoomSummary&& newSummary);
+    Changes setSummary(RoomSummary&& newSummary);
 
-        //void inviteUser(User* u); // We might get it at some point in time.
-        void insertMemberIntoMap(User* u);
-        void renameMember(User* u, QString oldName);
-        void removeMemberFromMap(const QString& username, User* u);
+    // void inviteUser(User* u); // We might get it at some point in time.
+    void insertMemberIntoMap(User* u);
+    void renameMember(User* u, QString oldName);
+    void removeMemberFromMap(const QString& username, User* u);
 
-        // This updates the room displayname field (which is the way a room
-        // should be shown in the room list); called whenever the list of
-        // members, the room name (m.room.name) or canonical alias change.
-        void updateDisplayname();
-        // This is used by updateDisplayname() but only calculates the new name
-        // without any updates.
-        QString calculateDisplayname() const;
+    // This updates the room displayname field (which is the way a room
+    // should be shown in the room list); called whenever the list of
+    // members, the room name (m.room.name) or canonical alias change.
+    void updateDisplayname();
+    // This is used by updateDisplayname() but only calculates the new name
+    // without any updates.
+    QString calculateDisplayname() const;
 
-        /// A point in the timeline corresponding to baseState
-        rev_iter_t timelineBase() const { return q->findInTimeline(-1); }
+    /// A point in the timeline corresponding to baseState
+    rev_iter_t timelineBase() const { return q->findInTimeline(-1); }
 
-        void getPreviousContent(int limit = 10);
+    void getPreviousContent(int limit = 10);
 
-        template <typename EventT>
-        const EventT* getCurrentState(QString stateKey = {}) const
-        {
-            static const EventT empty;
-            const auto* evt =
-                currentState.value({EventT::matrixTypeId(), stateKey}, &empty);
-            Q_ASSERT(evt->type() == EventT::typeId() &&
-                     evt->matrixType() == EventT::matrixTypeId());
-            return static_cast<const EventT*>(evt);
-        }
+    template <typename EventT>
+    const EventT* getCurrentState(QString stateKey = {}) const
+    {
+        static const EventT empty;
+        const auto* evt = currentState.value(
+                { EventT::matrixTypeId(), stateKey }, &empty);
+        Q_ASSERT(evt->type() == EventT::typeId()
+                 && evt->matrixType() == EventT::matrixTypeId());
+        return static_cast<const EventT*>(evt);
+    }
 
-        bool isEventNotable(const TimelineItem& ti) const
-        {
-            return !ti->isRedacted() &&
-                ti->senderId() != connection->userId() &&
-                is<RoomMessageEvent>(*ti);
-        }
+    bool isEventNotable(const TimelineItem& ti) const
+    {
+        return !ti->isRedacted() && ti->senderId() != connection->userId()
+                && is<RoomMessageEvent>(*ti);
+    }
 
-        template <typename EventArrayT>
-        Changes updateStateFrom(EventArrayT&& events)
-        {
-            Changes changes = NoChange;
-            if (!events.empty())
-            {
-                QElapsedTimer et; et.start();
-                for (auto&& eptr: events)
-                {
-                    const auto& evt = *eptr;
-                    Q_ASSERT(evt.isStateEvent());
-                    // Update baseState afterwards to make sure that the old state
-                    // is valid and usable inside processStateEvent
-                    changes |= q->processStateEvent(evt);
-                    baseState[{evt.matrixType(),evt.stateKey()}] = move(eptr);
-                }
-                if (events.size() > 9 || et.nsecsElapsed() >= profilerMinNsecs())
-                    qCDebug(PROFILER) << "*** Room::Private::updateStateFrom():"
-                                      << events.size() << "event(s)," << et;
+    template <typename EventArrayT>
+    Changes updateStateFrom(EventArrayT&& events)
+    {
+        Changes changes = NoChange;
+        if (!events.empty()) {
+            QElapsedTimer et;
+            et.start();
+            for (auto&& eptr : events) {
+                const auto& evt = *eptr;
+                Q_ASSERT(evt.isStateEvent());
+                // Update baseState afterwards to make sure that the old state
+                // is valid and usable inside processStateEvent
+                changes |= q->processStateEvent(evt);
+                baseState[{ evt.matrixType(), evt.stateKey() }] = move(eptr);
             }
-            return changes;
-        }
-        Changes addNewMessageEvents(RoomEvents&& events);
-        void addHistoricalMessageEvents(RoomEvents&& events);
-
-        /** Move events into the timeline
-         *
-         * Insert events into the timeline, either new or historical.
-         * Pointers in the original container become empty, the ownership
-         * is passed to the timeline container.
-         * @param events - the range of events to be inserted
-         * @param placement - position and direction of insertion: Older for
-         *                    historical messages, Newer for new ones
-         */
-        Timeline::difference_type moveEventsToTimeline(RoomEventsRange events,
-                                                       EventsPlacement placement);
-
-        /**
-         * Remove events from the passed container that are already in the timeline
-         */
-        void dropDuplicateEvents(RoomEvents& events) const;
-
-        Changes setLastReadEvent(User* u, QString eventId);
-        void updateUnreadCount(rev_iter_t from, rev_iter_t to);
-        Changes promoteReadMarker(User* u, rev_iter_t newMarker,
-                                  bool force = false);
-
-        Changes markMessagesAsRead(rev_iter_t upToMarker);
-
-        void getAllMembers();
-
-        QString sendEvent(RoomEventPtr&& event);
-
-        template <typename EventT, typename... ArgTs>
-        QString sendEvent(ArgTs&&... eventArgs)
-        {
-            return sendEvent(makeEvent<EventT>(std::forward<ArgTs>(eventArgs)...));
+            if (events.size() > 9 || et.nsecsElapsed() >= profilerMinNsecs())
+                qCDebug(PROFILER) << "*** Room::Private::updateStateFrom():"
+                                  << events.size() << "event(s)," << et;
         }
+        return changes;
+    }
+    Changes addNewMessageEvents(RoomEvents&& events);
+    void addHistoricalMessageEvents(RoomEvents&& events);
+
+    /** Move events into the timeline
+     *
+     * Insert events into the timeline, either new or historical.
+     * Pointers in the original container become empty, the ownership
+     * is passed to the timeline container.
+     * @param events - the range of events to be inserted
+     * @param placement - position and direction of insertion: Older for
+     *                    historical messages, Newer for new ones
+     */
+    Timeline::difference_type moveEventsToTimeline(RoomEventsRange events,
+                                                   EventsPlacement placement);
+
+    /**
+     * Remove events from the passed container that are already in the timeline
+     */
+    void dropDuplicateEvents(RoomEvents& events) const;
+
+    Changes setLastReadEvent(User* u, QString eventId);
+    void updateUnreadCount(rev_iter_t from, rev_iter_t to);
+    Changes promoteReadMarker(User* u, rev_iter_t newMarker,
+                              bool force = false);
+
+    Changes markMessagesAsRead(rev_iter_t upToMarker);
+
+    void getAllMembers();
+
+    QString sendEvent(RoomEventPtr&& event);
+
+    template <typename EventT, typename... ArgTs>
+    QString sendEvent(ArgTs&&... eventArgs)
+    {
+        return sendEvent(makeEvent<EventT>(std::forward<ArgTs>(eventArgs)...));
+    }
 
-        RoomEvent* addAsPending(RoomEventPtr&& event);
+    RoomEvent* addAsPending(RoomEventPtr&& event);
 
-        QString doSendEvent(const RoomEvent* pEvent);
-        void onEventSendingFailure(const QString& txnId, BaseJob* call = nullptr);
+    QString doSendEvent(const RoomEvent* pEvent);
+    void onEventSendingFailure(const QString& txnId, BaseJob* call = nullptr);
 
-        template <typename EvT>
-        SetRoomStateWithKeyJob* requestSetState(const QString& stateKey,
-                                                const EvT& event)
-        {
-            if (q->successorId().isEmpty())
-            {
-                // TODO: Queue up state events sending (see #133).
-                return connection->callApi<SetRoomStateWithKeyJob>(
-                        id, EvT::matrixTypeId(), stateKey, event.contentJson());
-            }
-            qCWarning(MAIN) << q << "has been upgraded, state won't be set";
-            return nullptr;
+    template <typename EvT>
+    SetRoomStateWithKeyJob* requestSetState(const QString& stateKey,
+                                            const EvT& event)
+    {
+        if (q->successorId().isEmpty()) {
+            // TODO: Queue up state events sending (see #133).
+            return connection->callApi<SetRoomStateWithKeyJob>(
+                    id, EvT::matrixTypeId(), stateKey, event.contentJson());
         }
+        qCWarning(MAIN) << q << "has been upgraded, state won't be set";
+        return nullptr;
+    }
 
-        template <typename EvT>
-        auto requestSetState(const EvT& event)
-        {
-            return connection->callApi<SetRoomStateJob>(
-                        id, EvT::matrixTypeId(), event.contentJson());
-        }
+    template <typename EvT> auto requestSetState(const EvT& event)
+    {
+        return connection->callApi<SetRoomStateJob>(id, EvT::matrixTypeId(),
+                                                    event.contentJson());
+    }
 
-        /**
-         * @brief Apply redaction to the timeline
-         *
-         * Tries to find an event in the timeline and redact it; deletes the
-         * redaction event whether the redacted event was found or not.
-         */
-        bool processRedaction(const RedactionEvent& redaction);
+    /**
+     * @brief Apply redaction to the timeline
+     *
+     * Tries to find an event in the timeline and redact it; deletes the
+     * redaction event whether the redacted event was found or not.
+     */
+    bool processRedaction(const RedactionEvent& redaction);
 
-        void setTags(TagsMap newTags);
+    void setTags(TagsMap newTags);
 
-        QJsonObject toJson() const;
+    QJsonObject toJson() const;
 
     private:
-        using users_shortlist_t = std::array<User*, 3>;
-        template<typename ContT>
-        users_shortlist_t buildShortlist(const ContT& users) const;
-        users_shortlist_t buildShortlist(const QStringList& userIds) const;
+    using users_shortlist_t = std::array<User*, 3>;
+    template <typename ContT>
+    users_shortlist_t buildShortlist(const ContT& users) const;
+    users_shortlist_t buildShortlist(const QStringList& userIds) const;
 
-        bool isLocalUser(const User* u) const
-        {
-            return u == q->localUser();
-        }
+    bool isLocalUser(const User* u) const { return u == q->localUser(); }
 };
 
 Room::Room(Connection* connection, QString id, JoinState initialJoinState)
@@ -318,24 +314,18 @@ Room::Room(Connection* connection, QString id, JoinState initialJoinState)
     // https://marcmutz.wordpress.com/translated-articles/pimp-my-pimpl-%E2%80%94-reloaded/
     d->q = this;
     d->displayname = d->calculateDisplayname(); // Set initial "Empty room" name
-    connectUntil(connection, &Connection::loadedRoomState, this,
-        [this] (Room* r) {
-            if (this == r)
-                emit baseStateLoaded();
-            return this == r; // loadedRoomState fires only once per room
-        });
+    connectUntil(
+            connection, &Connection::loadedRoomState, this, [this](Room* r) {
+                if (this == r)
+                    emit baseStateLoaded();
+                return this == r; // loadedRoomState fires only once per room
+            });
     qCDebug(MAIN) << "New" << toCString(initialJoinState) << "Room:" << id;
 }
 
-Room::~Room()
-{
-    delete d;
-}
+Room::~Room() { delete d; }
 
-const QString& Room::id() const
-{
-    return d->id;
-}
+const QString& Room::id() const { return d->id; }
 
 QString Room::version() const
 {
@@ -345,8 +335,8 @@ QString Room::version() const
 
 bool Room::isUnstable() const
 {
-    return !connection()->loadingCapabilities() &&
-            !connection()->stableRoomVersions().contains(version());
+    return !connection()->loadingCapabilities()
+            && !connection()->stableRoomVersions().contains(version());
 }
 
 QString Room::predecessorId() const
@@ -359,10 +349,7 @@ QString Room::successorId() const
     return d->getCurrentState<RoomTombstoneEvent>()->successorRoomId();
 }
 
-const Room::Timeline& Room::messageEvents() const
-{
-    return d->timeline;
-}
+const Room::Timeline& Room::messageEvents() const { return d->timeline; }
 
 const Room::PendingEvents& Room::pendingEvents() const
 {
@@ -384,35 +371,20 @@ QString Room::canonicalAlias() const
     return d->getCurrentState<RoomCanonicalAliasEvent>()->alias();
 }
 
-QString Room::displayName() const
-{
-    return d->displayname;
-}
+QString Room::displayName() const { return d->displayname; }
 
 QString Room::topic() const
 {
     return d->getCurrentState<RoomTopicEvent>()->topic();
 }
 
-QString Room::avatarMediaId() const
-{
-    return d->avatar.mediaId();
-}
+QString Room::avatarMediaId() const { return d->avatar.mediaId(); }
 
-QUrl Room::avatarUrl() const
-{
-    return d->avatar.url();
-}
+QUrl Room::avatarUrl() const { return d->avatar.url(); }
 
-const Avatar& Room::avatarObject() const
-{
-    return d->avatar;
-}
+const Avatar& Room::avatarObject() const { return d->avatar; }
 
-QImage Room::avatar(int dimension)
-{
-    return avatar(dimension, dimension);
-}
+QImage Room::avatar(int dimension) { return avatar(dimension, dimension); }
 
 QImage Room::avatar(int width, int height)
 {
@@ -422,9 +394,10 @@ QImage Room::avatar(int width, int height)
 
     // Use the first (excluding self) user's avatar for direct chats
     const auto dcUsers = directChatUsers();
-    for (auto* u: dcUsers)
+    for (auto* u : dcUsers)
         if (u != localUser())
-            return u->avatar(width, height, this, [=] { emit avatarChanged(); });
+            return u->avatar(width, height, this,
+                             [=] { emit avatarChanged(); });
 
     return {};
 }
@@ -436,24 +409,20 @@ User* Room::user(const QString& userId) const
 
 JoinState Room::memberJoinState(User* user) const
 {
-    return
-        d->membersMap.contains(user->name(this), user) ? JoinState::Join :
-        JoinState::Leave;
+    return d->membersMap.contains(user->name(this), user) ? JoinState::Join
+                                                          : JoinState::Leave;
 }
 
-JoinState Room::joinState() const
-{
-    return d->joinState;
-}
+JoinState Room::joinState() const { return d->joinState; }
 
 void Room::setJoinState(JoinState state)
 {
     JoinState oldState = d->joinState;
-    if( state == oldState )
+    if (state == oldState)
         return;
     d->joinState = state;
-    qCDebug(MAIN) << "Room" << id() << "changed state: "
-                  << int(oldState) << "->" << int(state);
+    qCDebug(MAIN) << "Room" << id() << "changed state: " << int(oldState)
+                  << "->" << int(state);
     emit changed(Change::JoinStateChange);
     emit joinStateChanged(oldState, state);
 }
@@ -468,8 +437,7 @@ Room::Changes Room::Private::setLastReadEvent(User* u, QString eventId)
     swap(storedId, eventId);
     emit q->lastReadEventChanged(u);
     emit q->readMarkerForUserMoved(u, eventId, storedId);
-    if (isLocalUser(u))
-    {
+    if (isLocalUser(u)) {
         if (storedId != serverReadMarker)
             connection->callApi<PostReadMarkersJob>(id, storedId);
         emit q->readMarkerMoved(eventId, storedId);
@@ -488,32 +456,33 @@ void Room::Private::updateUnreadCount(rev_iter_t from, rev_iter_t to)
     // unreadMessages and might need to promote the read marker further
     // over local-origin messages.
     const auto readMarker = q->readMarker();
-    if (readMarker >= from && readMarker < to)
-    {
+    if (readMarker >= from && readMarker < to) {
         promoteReadMarker(q->localUser(), readMarker, true);
         return;
     }
 
     Q_ASSERT(to <= readMarker);
 
-    QElapsedTimer et; et.start();
-    const auto newUnreadMessages = count_if(from, to,
-            std::bind(&Room::Private::isEventNotable, this, _1));
+    QElapsedTimer et;
+    et.start();
+    const auto newUnreadMessages = count_if(
+            from, to, std::bind(&Room::Private::isEventNotable, this, _1));
     if (et.nsecsElapsed() > profilerMinNsecs() / 10)
         qCDebug(PROFILER) << "Counting gained unread messages took" << et;
 
-    if(newUnreadMessages > 0)
-    {
-        // See https://github.com/QMatrixClient/libqmatrixclient/wiki/unread_count
+    if (newUnreadMessages > 0) {
+        // See
+        // https://github.com/QMatrixClient/libqmatrixclient/wiki/unread_count
         if (unreadMessages < 0)
             unreadMessages = 0;
 
         unreadMessages += newUnreadMessages;
         qCDebug(MAIN) << "Room" << q->objectName() << "has gained"
-            << newUnreadMessages << "unread message(s),"
-            << (q->readMarker() == timeline.crend() ?
-                    "in total at least" : "in total")
-            << unreadMessages << "unread message(s)";
+                      << newUnreadMessages << "unread message(s),"
+                      << (q->readMarker() == timeline.crend()
+                                  ? "in total at least"
+                                  : "in total")
+                      << unreadMessages << "unread message(s)";
         emit q->unreadMessagesChanged(q);
     }
 }
@@ -525,34 +494,36 @@ Room::Changes Room::Private::promoteReadMarker(User* u, rev_iter_t newMarker,
     Q_ASSERT(newMarker >= timeline.crbegin() && newMarker <= timeline.crend());
 
     const auto prevMarker = q->readMarker(u);
-    if (!force && prevMarker <= newMarker) // Remember, we deal with reverse iterators
+    if (!force
+        && prevMarker <= newMarker) // Remember, we deal with reverse iterators
         return Change::NoChange;
 
     Q_ASSERT(newMarker < timeline.crend());
 
     // Try to auto-promote the read marker over the user's own messages
     // (switch to direct iterators for that).
-    auto eagerMarker = find_if(newMarker.base(), timeline.cend(),
-          [=](const TimelineItem& ti) { return ti->senderId() != u->id(); });
+    auto eagerMarker = find_if(
+            newMarker.base(), timeline.cend(),
+            [=](const TimelineItem& ti) { return ti->senderId() != u->id(); });
 
     auto changes = setLastReadEvent(u, (*(eagerMarker - 1))->id());
-    if (isLocalUser(u))
-    {
+    if (isLocalUser(u)) {
         const auto oldUnreadCount = unreadMessages;
-        QElapsedTimer et; et.start();
-        unreadMessages = count_if(eagerMarker, timeline.cend(),
-                    std::bind(&Room::Private::isEventNotable, this, _1));
+        QElapsedTimer et;
+        et.start();
+        unreadMessages =
+                count_if(eagerMarker, timeline.cend(),
+                         std::bind(&Room::Private::isEventNotable, this, _1));
         if (et.nsecsElapsed() > profilerMinNsecs() / 10)
             qCDebug(PROFILER) << "Recounting unread messages took" << et;
 
-        // See https://github.com/QMatrixClient/libqmatrixclient/wiki/unread_count
+        // See
+        // https://github.com/QMatrixClient/libqmatrixclient/wiki/unread_count
         if (unreadMessages == 0)
             unreadMessages = -1;
 
-        if (force || unreadMessages != oldUnreadCount)
-        {
-            if (unreadMessages == -1)
-            {
+        if (force || unreadMessages != oldUnreadCount) {
+            if (unreadMessages == -1) {
                 qCDebug(MAIN) << "Room" << displayname
                               << "has no more unread messages";
             } else
@@ -575,10 +546,8 @@ Room::Changes Room::Private::markMessagesAsRead(rev_iter_t upToMarker)
     // We shouldn't send read receipts for the local user's own messages - so
     // search earlier messages for the latest message not from the local user
     // until the previous last-read message, whichever comes first.
-    for (; upToMarker < prevMarker; ++upToMarker)
-    {
-        if ((*upToMarker)->senderId() != q->localUser()->id())
-        {
+    for (; upToMarker < prevMarker; ++upToMarker) {
+        if ((*upToMarker)->senderId() != q->localUser()->id()) {
             connection->callApi<PostReceiptJob>(id, "m.read",
                                                 (*upToMarker)->id());
             break;
@@ -601,47 +570,36 @@ void Room::markAllMessagesAsRead()
 bool Room::canSwitchVersions() const
 {
     // TODO, #276: m.room.power_levels
-    const auto* plEvt =
-            d->currentState.value({"m.room.power_levels", ""});
+    const auto* plEvt = d->currentState.value({ "m.room.power_levels", "" });
     if (!plEvt)
         return true;
 
     const auto plJson = plEvt->contentJson();
     const auto currentUserLevel =
-        plJson.value("users"_ls).toObject()
-        .value(localUser()->id()).toInt(
-            plJson.value("users_default"_ls).toInt());
+            plJson.value("users"_ls)
+                    .toObject()
+                    .value(localUser()->id())
+                    .toInt(plJson.value("users_default"_ls).toInt());
     const auto tombstonePowerLevel =
-        plJson.value("events").toObject()
-        .value("m.room.tombstone"_ls).toInt(
-            plJson.value("state_default"_ls).toInt());
+            plJson.value("events")
+                    .toObject()
+                    .value("m.room.tombstone"_ls)
+                    .toInt(plJson.value("state_default"_ls).toInt());
     return currentUserLevel >= tombstonePowerLevel;
 }
 
-bool Room::hasUnreadMessages() const
-{
-    return unreadCount() >= 0;
-}
+bool Room::hasUnreadMessages() const { return unreadCount() >= 0; }
 
-int Room::unreadCount() const
-{
-    return d->unreadMessages;
-}
+int Room::unreadCount() const { return d->unreadMessages; }
 
-Room::rev_iter_t Room::historyEdge() const
-{
-    return d->timeline.crend();
-}
+Room::rev_iter_t Room::historyEdge() const { return d->timeline.crend(); }
 
 Room::Timeline::const_iterator Room::syncEdge() const
 {
     return d->timeline.cend();
 }
 
-Room::rev_iter_t Room::timelineEdge() const
-{
-    return historyEdge();
-}
+Room::rev_iter_t Room::timelineEdge() const { return historyEdge(); }
 
 TimelineItem::index_t Room::minTimelineIndex() const
 {
@@ -655,21 +613,19 @@ TimelineItem::index_t Room::maxTimelineIndex() const
 
 bool Room::isValidIndex(TimelineItem::index_t timelineIndex) const
 {
-    return !d->timeline.empty() &&
-           timelineIndex >= minTimelineIndex() &&
-           timelineIndex <= maxTimelineIndex();
+    return !d->timeline.empty() && timelineIndex >= minTimelineIndex()
+            && timelineIndex <= maxTimelineIndex();
 }
 
 Room::rev_iter_t Room::findInTimeline(TimelineItem::index_t index) const
 {
-    return timelineEdge() -
-            (isValidIndex(index) ? index - minTimelineIndex() + 1 : 0);
+    return timelineEdge()
+            - (isValidIndex(index) ? index - minTimelineIndex() + 1 : 0);
 }
 
 Room::rev_iter_t Room::findInTimeline(const QString& evtId) const
 {
-    if (!d->timeline.empty() && d->eventsIndex.contains(evtId))
-    {
+    if (!d->timeline.empty() && d->eventsIndex.contains(evtId)) {
         auto it = findInTimeline(d->eventsIndex.value(evtId));
         Q_ASSERT((*it)->id() == evtId);
         return it;
@@ -680,14 +636,18 @@ Room::rev_iter_t Room::findInTimeline(const QString& evtId) const
 Room::PendingEvents::iterator Room::findPendingEvent(const QString& txnId)
 {
     return std::find_if(d->unsyncedEvents.begin(), d->unsyncedEvents.end(),
-            [txnId] (const auto& item) { return item->transactionId() == txnId; });
+                        [txnId](const auto& item) {
+                            return item->transactionId() == txnId;
+                        });
 }
 
 Room::PendingEvents::const_iterator
 Room::findPendingEvent(const QString& txnId) const
 {
     return std::find_if(d->unsyncedEvents.cbegin(), d->unsyncedEvents.cend(),
-            [txnId] (const auto& item) { return item->transactionId() == txnId; });
+                        [txnId](const auto& item) {
+                            return item->transactionId() == txnId;
+                        });
 }
 
 void Room::Private::getAllMembers()
@@ -697,28 +657,25 @@ void Room::Private::getAllMembers()
         return;
 
     allMembersJob = connection->callApi<GetMembersByRoomJob>(
-                                    id, connection->nextBatchToken(), "join");
+            id, connection->nextBatchToken(), "join");
     auto nextIndex = timeline.empty() ? 0 : timeline.back().index() + 1;
-    connect( allMembersJob, &BaseJob::success, q, [=] {
+    connect(allMembersJob, &BaseJob::success, q, [=] {
         Q_ASSERT(timeline.empty() || nextIndex <= q->maxTimelineIndex() + 1);
         auto roomChanges = updateStateFrom(allMembersJob->chunk());
         // Replay member events that arrived after the point for which
         // the full members list was requested.
-        if (!timeline.empty() )
+        if (!timeline.empty())
             for (auto it = q->findInTimeline(nextIndex).base();
                  it != timeline.cend(); ++it)
                 if (is<RoomMemberEvent>(**it))
                     roomChanges |= q->processStateEvent(**it);
-        if (roomChanges&MembersChange)
+        if (roomChanges & MembersChange)
             emit q->memberListChanged();
         emit q->allMembersLoaded();
     });
 }
 
-bool Room::displayed() const
-{
-    return d->displayed;
-}
+bool Room::displayed() const { return d->displayed; }
 
 void Room::setDisplayed(bool displayed)
 {
@@ -727,18 +684,14 @@ void Room::setDisplayed(bool displayed)
 
     d->displayed = displayed;
     emit displayedChanged(displayed);
-    if( displayed )
-    {
+    if (displayed) {
         resetHighlightCount();
         resetNotificationCount();
         d->getAllMembers();
     }
 }
 
-QString Room::firstDisplayedEventId() const
-{
-    return d->firstDisplayedEventId;
-}
+QString Room::firstDisplayedEventId() const { return d->firstDisplayedEventId; }
 
 Room::rev_iter_t Room::firstDisplayedMarker() const
 {
@@ -760,10 +713,7 @@ void Room::setFirstDisplayedEvent(TimelineItem::index_t index)
     setFirstDisplayedEventId(findInTimeline(index)->event()->id());
 }
 
-QString Room::lastDisplayedEventId() const
-{
-    return d->lastDisplayedEventId;
-}
+QString Room::lastDisplayedEventId() const { return d->lastDisplayedEventId; }
 
 Room::rev_iter_t Room::lastDisplayedMarker() const
 {
@@ -791,41 +741,33 @@ Room::rev_iter_t Room::readMarker(const User* user) const
     return findInTimeline(d->lastReadEventIds.value(user));
 }
 
-Room::rev_iter_t Room::readMarker() const
-{
-    return readMarker(localUser());
-}
+Room::rev_iter_t Room::readMarker() const { return readMarker(localUser()); }
 
 QString Room::readMarkerEventId() const
 {
     return d->lastReadEventIds.value(localUser());
 }
 
-QList<User*> Room::usersAtEventId(const QString& eventId) {
+QList<User*> Room::usersAtEventId(const QString& eventId)
+{
     return d->eventIdReadUsers.values(eventId);
 }
 
-int Room::notificationCount() const
-{
-    return d->notificationCount;
-}
+int Room::notificationCount() const { return d->notificationCount; }
 
 void Room::resetNotificationCount()
 {
-    if( d->notificationCount == 0 )
+    if (d->notificationCount == 0)
         return;
     d->notificationCount = 0;
     emit notificationCountChanged(this);
 }
 
-int Room::highlightCount() const
-{
-    return d->highlightCount;
-}
+int Room::highlightCount() const { return d->highlightCount; }
 
 void Room::resetHighlightCount()
 {
-    if( d->highlightCount == 0 )
+    if (d->highlightCount == 0)
         return;
     d->highlightCount = 0;
     emit highlightCountChanged(this);
@@ -834,9 +776,8 @@ void Room::resetHighlightCount()
 void Room::switchVersion(QString newVersion)
 {
     auto* job = connection()->callApi<UpgradeRoomJob>(id(), newVersion);
-    connect(job, &BaseJob::failure, this, [this,job] {
-        emit upgradeFailed(job->errorString());
-    });
+    connect(job, &BaseJob::failure, this,
+            [this, job] { emit upgradeFailed(job->errorString()); });
 }
 
 bool Room::hasAccountData(const QString& type) const
@@ -851,20 +792,11 @@ const EventPtr& Room::accountData(const QString& type) const
     return it != d->accountData.end() ? it->second : NoEventPtr;
 }
 
-QStringList Room::tagNames() const
-{
-    return d->tags.keys();
-}
+QStringList Room::tagNames() const { return d->tags.keys(); }
 
-TagsMap Room::tags() const
-{
-    return d->tags;
-}
+TagsMap Room::tags() const { return d->tags; }
 
-TagRecord Room::tag(const QString& name) const
-{
-    return d->tags.value(name);
-}
+TagRecord Room::tag(const QString& name) const { return d->tags.value(name); }
 
 std::pair<bool, QString> validatedTag(QString name)
 {
@@ -882,8 +814,8 @@ std::pair<bool, QString> validatedTag(QString name)
 void Room::addTag(const QString& name, const TagRecord& record)
 {
     const auto& checkRes = validatedTag(name);
-    if (d->tags.contains(name) ||
-            (checkRes.first && d->tags.contains(checkRes.second)))
+    if (d->tags.contains(name)
+        || (checkRes.first && d->tags.contains(checkRes.second)))
         return;
 
     emit tagsAboutToChange();
@@ -895,13 +827,12 @@ void Room::addTag(const QString& name, const TagRecord& record)
 
 void Room::addTag(const QString& name, float order)
 {
-    addTag(name, TagRecord{order});
+    addTag(name, TagRecord { order });
 }
 
 void Room::removeTag(const QString& name)
 {
-    if (d->tags.contains(name))
-    {
+    if (d->tags.contains(name)) {
         emit tagsAboutToChange();
         d->tags.remove(name);
         emit tagsChanged();
@@ -918,18 +849,16 @@ void Room::setTags(TagsMap newTags)
     d->setTags(move(newTags));
     connection()->callApi<SetAccountDataPerRoomJob>(
             localUser()->id(), id(), TagEvent::matrixTypeId(),
-                TagEvent(d->tags).contentJson());
+            TagEvent(d->tags).contentJson());
 }
 
 void Room::Private::setTags(TagsMap newTags)
 {
     emit q->tagsAboutToChange();
     const auto keys = newTags.keys();
-    for (const auto& k: keys)
-    {
+    for (const auto& k : keys) {
         const auto& checkRes = validatedTag(k);
-        if (checkRes.first)
-        {
+        if (checkRes.first) {
             if (newTags.contains(checkRes.second))
                 newTags.remove(k);
             else
@@ -942,20 +871,11 @@ void Room::Private::setTags(TagsMap newTags)
     emit q->tagsChanged();
 }
 
-bool Room::isFavourite() const
-{
-    return d->tags.contains(FavouriteTag);
-}
+bool Room::isFavourite() const { return d->tags.contains(FavouriteTag); }
 
-bool Room::isLowPriority() const
-{
-    return d->tags.contains(LowPriorityTag);
-}
+bool Room::isLowPriority() const { return d->tags.contains(LowPriorityTag); }
 
-bool Room::isDirectChat() const
-{
-    return connection()->isDirectChat(id());
-}
+bool Room::isDirectChat() const { return connection()->isDirectChat(id()); }
 
 QList<User*> Room::directChatUsers() const
 {
@@ -966,8 +886,7 @@ const RoomMessageEvent*
 Room::Private::getEventWithFile(const QString& eventId) const
 {
     auto evtIt = q->findInTimeline(eventId);
-    if (evtIt != timeline.rend() && is<RoomMessageEvent>(**evtIt))
-    {
+    if (evtIt != timeline.rend() && is<RoomMessageEvent>(**evtIt)) {
         auto* event = evtIt->viewAs<RoomMessageEvent>();
         if (event->hasFileContent())
             return event;
@@ -981,12 +900,9 @@ QString Room::Private::fileNameToDownload(const RoomMessageEvent* event) const
     Q_ASSERT(event->hasFileContent());
     const auto* fileInfo = event->content()->fileInfo();
     QString fileName;
-    if (!fileInfo->originalName.isEmpty())
-    {
+    if (!fileInfo->originalName.isEmpty()) {
         fileName = QFileInfo(fileInfo->originalName).fileName();
-    }
-    else if (!event->plainBody().isEmpty())
-    {
+    } else if (!event->plainBody().isEmpty()) {
         // Having no better options, assume that the body has
         // the original file URL or at least the file name.
         QUrl u { event->plainBody() };
@@ -997,13 +913,13 @@ QString Room::Private::fileNameToDownload(const RoomMessageEvent* event) const
     if (fileName.isEmpty() || !QTemporaryFile(fileName).open())
         return "file." % fileInfo->mimeType.preferredSuffix();
 
-    if (QSysInfo::productType() == "windows")
-    {
+    if (QSysInfo::productType() == "windows") {
         const auto& suffixes = fileInfo->mimeType.suffixes();
-        if (!suffixes.isEmpty() &&
-                std::none_of(suffixes.begin(), suffixes.end(),
-                    [&fileName] (const QString& s) {
-                        return fileName.endsWith(s); }))
+        if (!suffixes.isEmpty()
+            && std::none_of(suffixes.begin(), suffixes.end(),
+                            [&fileName](const QString& s) {
+                                return fileName.endsWith(s);
+                            }))
             return fileName % '.' % fileInfo->mimeType.preferredSuffix();
     }
     return fileName;
@@ -1012,12 +928,12 @@ QString Room::Private::fileNameToDownload(const RoomMessageEvent* event) const
 QUrl Room::urlToThumbnail(const QString& eventId) const
 {
     if (auto* event = d->getEventWithFile(eventId))
-        if (event->hasThumbnail())
-        {
+        if (event->hasThumbnail()) {
             auto* thumbnail = event->content()->thumbnailInfo();
             Q_ASSERT(thumbnail != nullptr);
             return MediaThumbnailJob::makeRequestUrl(connection()->homeserver(),
-                    thumbnail->url, thumbnail->imageSize);
+                                                     thumbnail->url,
+                                                     thumbnail->imageSize);
         }
     qDebug() << "Event" << eventId << "has no thumbnail";
     return {};
@@ -1025,8 +941,7 @@ QUrl Room::urlToThumbnail(const QString& eventId) const
 
 QUrl Room::urlToDownload(const QString& eventId) const
 {
-    if (auto* event = d->getEventWithFile(eventId))
-    {
+    if (auto* event = d->getEventWithFile(eventId)) {
         auto* fileInfo = event->content()->fileInfo();
         Q_ASSERT(fileInfo != nullptr);
         return DownloadFileJob::makeRequestUrl(connection()->homeserver(),
@@ -1053,8 +968,7 @@ FileTransferInfo Room::fileTransferInfo(const QString& id) const
 
     qint64 progress = infoIt->progress;
     qint64 total = infoIt->total;
-    if (total > INT_MAX)
-    {
+    if (total > INT_MAX) {
         // JavaScript doesn't deal with 64-bit integers; scale down if necessary
         progress = llround(double(progress) / total * INT_MAX);
         total = INT_MAX;
@@ -1066,13 +980,16 @@ FileTransferInfo Room::fileTransferInfo(const QString& id) const
     fti.progress = int(progress);
     fti.total = int(total);
     fti.localDir = QUrl::fromLocalFile(infoIt->localFileInfo.absolutePath());
-    fti.localPath = QUrl::fromLocalFile(infoIt->localFileInfo.absoluteFilePath());
+    fti.localPath =
+            QUrl::fromLocalFile(infoIt->localFileInfo.absoluteFilePath());
     return fti;
 #else
-    return { infoIt->status, infoIt->isUpload, int(progress), int(total),
-        QUrl::fromLocalFile(infoIt->localFileInfo.absolutePath()),
-        QUrl::fromLocalFile(infoIt->localFileInfo.absoluteFilePath())
-    };
+    return { infoIt->status,
+             infoIt->isUpload,
+             int(progress),
+             int(total),
+             QUrl::fromLocalFile(infoIt->localFileInfo.absolutePath()),
+             QUrl::fromLocalFile(infoIt->localFileInfo.absoluteFilePath()) };
 #endif
 }
 
@@ -1096,39 +1013,24 @@ QString Room::prettyPrint(const QString& plainText) const
     return QMatrixClient::prettyPrint(plainText);
 }
 
-QList< User* > Room::usersTyping() const
-{
-    return d->usersTyping;
-}
+QList<User*> Room::usersTyping() const { return d->usersTyping; }
 
-QList< User* > Room::membersLeft() const
-{
-    return d->membersLeft;
-}
+QList<User*> Room::membersLeft() const { return d->membersLeft; }
 
-QList< User* > Room::users() const
-{
-    return d->membersMap.values();
-}
+QList<User*> Room::users() const { return d->membersMap.values(); }
 
 QStringList Room::memberNames() const
 {
     QStringList res;
     for (auto u : qAsConst(d->membersMap))
-        res.append( roomMembername(u) );
+        res.append(roomMembername(u));
 
     return res;
 }
 
-int Room::memberCount() const
-{
-    return d->membersMap.size();
-}
+int Room::memberCount() const { return d->membersMap.size(); }
 
-int Room::timelineSize() const
-{
-    return int(d->timeline.size());
-}
+int Room::timelineSize() const { return int(d->timeline.size()); }
 
 bool Room::usesEncryption() const
 {
@@ -1149,31 +1051,25 @@ int Room::invitedCount() const
     return d->summary.invitedMemberCount.value();
 }
 
-int Room::totalMemberCount() const
-{
-    return joinedCount() + invitedCount();
-}
+int Room::totalMemberCount() const { return joinedCount() + invitedCount(); }
 
-GetRoomEventsJob* Room::eventsHistoryJob() const
-{
-    return d->eventsHistoryJob;
-}
+GetRoomEventsJob* Room::eventsHistoryJob() const { return d->eventsHistoryJob; }
 
 Room::Changes Room::Private::setSummary(RoomSummary&& newSummary)
 {
     if (!summary.merge(newSummary))
         return Change::NoChange;
-    qCDebug(MAIN).nospace().noquote()
-        << "Updated room summary for " << q->objectName() << ": " << summary;
+    qCDebug(MAIN).nospace().noquote() << "Updated room summary for "
+                                      << q->objectName() << ": " << summary;
     emit q->memberListChanged();
     return Change::SummaryChange;
 }
 
-void Room::Private::insertMemberIntoMap(User *u)
+void Room::Private::insertMemberIntoMap(User* u)
 {
     const auto userName = u->name(q);
-    // If there is exactly one namesake of the added user, signal member renaming
-    // for that other one because the two should be disambiguated now.
+    // If there is exactly one namesake of the added user, signal member
+    // renaming for that other one because the two should be disambiguated now.
     auto namesakes = membersMap.values(userName);
     if (namesakes.size() == 1)
         emit q->memberAboutToRename(namesakes.front(),
@@ -1185,14 +1081,11 @@ void Room::Private::insertMemberIntoMap(User *u)
 
 void Room::Private::renameMember(User* u, QString oldName)
 {
-    if (u->name(q) == oldName)
-    {
+    if (u->name(q) == oldName) {
         qCWarning(MAIN) << "Room::Private::renameMember(): the user "
                         << u->fullName(q)
                         << "is already known in the room under a new name.";
-    }
-    else if (membersMap.contains(oldName, u))
-    {
+    } else if (membersMap.contains(oldName, u)) {
         removeMemberFromMap(oldName, u);
         insertMemberIntoMap(u);
     }
@@ -1203,15 +1096,15 @@ void Room::Private::removeMemberFromMap(const QString& username, User* u)
 {
     User* namesake = nullptr;
     auto namesakes = membersMap.values(username);
-    if (namesakes.size() == 2)
-    {
-        namesake = namesakes.front() == u ? namesakes.back() : namesakes.front();
+    if (namesakes.size() == 2) {
+        namesake =
+                namesakes.front() == u ? namesakes.back() : namesakes.front();
         Q_ASSERT_X(namesake != u, __FUNCTION__, "Room members list is broken");
         emit q->memberAboutToRename(namesake, username);
     }
     membersMap.remove(username, u);
-    // If there was one namesake besides the removed user, signal member renaming
-    // for it because it doesn't need to be disambiguated anymore.
+    // If there was one namesake besides the removed user, signal member
+    // renaming for it because it doesn't need to be disambiguated anymore.
     // TODO: Think about left users.
     if (namesake)
         emit q->memberRenamed(namesake);
@@ -1222,27 +1115,31 @@ inline auto makeErrorStr(const Event& e, QByteArray msg)
     return msg.append("; event dump follows:\n").append(e.originalJson());
 }
 
-Room::Timeline::difference_type Room::Private::moveEventsToTimeline(
-    RoomEventsRange events, EventsPlacement placement)
+Room::Timeline::difference_type
+Room::Private::moveEventsToTimeline(RoomEventsRange events,
+                                    EventsPlacement placement)
 {
     Q_ASSERT(!events.empty());
     // Historical messages arrive in newest-to-oldest order, so the process for
     // them is almost symmetric to the one for new messages. New messages get
     // appended from index 0; old messages go backwards from index -1.
-    auto index = timeline.empty() ? -((placement+1)/2) /* 1 -> -1; -1 -> 0 */ :
-                 placement == Older ? timeline.front().index() :
-                 timeline.back().index();
+    auto index = timeline.empty()
+            ? -((placement + 1) / 2) /* 1 -> -1; -1 -> 0 */
+            : placement == Older ? timeline.front().index()
+                                 : timeline.back().index();
     auto baseIndex = index;
-    for (auto&& e: events)
-    {
+    for (auto&& e : events) {
         const auto eId = e->id();
         Q_ASSERT_X(e, __FUNCTION__, "Attempt to add nullptr to timeline");
-        Q_ASSERT_X(!eId.isEmpty(), __FUNCTION__,
-                   makeErrorStr(*e,
-                    "Event with empty id cannot be in the timeline"));
-        Q_ASSERT_X(!eventsIndex.contains(eId), __FUNCTION__,
-                   makeErrorStr(*e, "Event is already in the timeline; "
-                       "incoming events were not properly deduplicated"));
+        Q_ASSERT_X(
+                !eId.isEmpty(), __FUNCTION__,
+                makeErrorStr(*e,
+                             "Event with empty id cannot be in the timeline"));
+        Q_ASSERT_X(
+                !eventsIndex.contains(eId), __FUNCTION__,
+                makeErrorStr(*e,
+                             "Event is already in the timeline; "
+                             "incoming events were not properly deduplicated"));
         if (placement == Older)
             timeline.emplace_front(move(e), --index);
         else
@@ -1279,8 +1176,7 @@ QString Room::roomMembername(const User* u) const
     // (extension to the spec)
     QVector<QString> bridges;
     for (; namesakesIt != d->membersMap.cend() && namesakesIt.key() == username;
-         ++namesakesIt)
-    {
+         ++namesakesIt) {
         const auto bridgeName = (*namesakesIt)->bridged();
         if (bridges.contains(bridgeName)) // Two accounts on the same bridge
             return u->fullName(this); // Disambiguate fully
@@ -1298,60 +1194,56 @@ QString Room::roomMembername(const QString& userId) const
 
 void Room::updateData(SyncRoomData&& data, bool fromCache)
 {
-    if( d->prevBatch.isEmpty() )
+    if (d->prevBatch.isEmpty())
         d->prevBatch = data.timelinePrevBatch;
     setJoinState(data.joinState);
 
     Changes roomChanges = Change::NoChange;
-    QElapsedTimer et; et.start();
-    for (auto&& event: data.accountData)
+    QElapsedTimer et;
+    et.start();
+    for (auto&& event : data.accountData)
         roomChanges |= processAccountDataEvent(move(event));
 
     roomChanges |= d->updateStateFrom(data.state);
 
-    if (!data.timeline.empty())
-    {
+    if (!data.timeline.empty()) {
         et.restart();
         roomChanges |= d->addNewMessageEvents(move(data.timeline));
         if (data.timeline.size() > 9 || et.nsecsElapsed() >= profilerMinNsecs())
             qCDebug(PROFILER) << "*** Room::addNewMessageEvents():"
                               << data.timeline.size() << "event(s)," << et;
     }
-    if (roomChanges&TopicChange)
+    if (roomChanges & TopicChange)
         emit topicChanged();
 
-    if (roomChanges&NameChange)
+    if (roomChanges & NameChange)
         emit namesChanged(this);
 
-    if (roomChanges&MembersChange)
+    if (roomChanges & MembersChange)
         emit memberListChanged();
 
     roomChanges |= d->setSummary(move(data.summary));
     d->updateDisplayname();
 
-    for( auto&& ephemeralEvent: data.ephemeral )
+    for (auto&& ephemeralEvent : data.ephemeral)
         roomChanges |= processEphemeralEvent(move(ephemeralEvent));
 
     // See https://github.com/QMatrixClient/libqmatrixclient/wiki/unread_count
-    if (data.unreadCount != -2 && data.unreadCount != d->unreadMessages)
-    {
+    if (data.unreadCount != -2 && data.unreadCount != d->unreadMessages) {
         qCDebug(MAIN) << "Setting unread_count to" << data.unreadCount;
         d->unreadMessages = data.unreadCount;
         emit unreadMessagesChanged(this);
     }
 
-    if( data.highlightCount != d->highlightCount )
-    {
+    if (data.highlightCount != d->highlightCount) {
         d->highlightCount = data.highlightCount;
         emit highlightCountChanged(this);
     }
-    if( data.notificationCount != d->notificationCount )
-    {
+    if (data.notificationCount != d->notificationCount) {
         d->notificationCount = data.notificationCount;
         emit notificationCountChanged(this);
     }
-    if (roomChanges != Change::NoChange)
-    {
+    if (roomChanges != Change::NoChange) {
         emit changed(roomChanges);
         if (!fromCache)
             connection()->saveRoomState(this);
@@ -1382,37 +1274,34 @@ QString Room::Private::doSendEvent(const RoomEvent* pEvent)
 {
     const auto txnId = pEvent->transactionId();
     // TODO, #133: Enqueue the job rather than immediately trigger it.
-    if (auto call = connection->callApi<SendMessageJob>(BackgroundRequest,
-                        id, pEvent->matrixType(), txnId, pEvent->contentJson()))
-    {
-        Room::connect(call, &BaseJob::started, q,
-            [this,txnId] {
-                auto it = q->findPendingEvent(txnId);
-                if (it == unsyncedEvents.end())
-                {
-                    qWarning(EVENTS) << "Pending event for transaction" << txnId
-                                     << "not found - got synced so soon?";
-                    return;
-                }
-                it->setDeparted();
-                emit q->pendingEventChanged(it - unsyncedEvents.begin());
-            });
+    if (auto call = connection->callApi<SendMessageJob>(
+                BackgroundRequest, id, pEvent->matrixType(), txnId,
+                pEvent->contentJson())) {
+        Room::connect(call, &BaseJob::started, q, [this, txnId] {
+            auto it = q->findPendingEvent(txnId);
+            if (it == unsyncedEvents.end()) {
+                qWarning(EVENTS) << "Pending event for transaction" << txnId
+                                 << "not found - got synced so soon?";
+                return;
+            }
+            it->setDeparted();
+            emit q->pendingEventChanged(it - unsyncedEvents.begin());
+        });
         Room::connect(call, &BaseJob::failure, q,
-            std::bind(&Room::Private::onEventSendingFailure, this, txnId, call));
-        Room::connect(call, &BaseJob::success, q,
-            [this,call,txnId] {
-                emit q->messageSent(txnId, call->eventId());
-                auto it = q->findPendingEvent(txnId);
-                if (it == unsyncedEvents.end())
-                {
-                    qDebug(EVENTS) << "Pending event for transaction" << txnId
-                                   << "already merged";
-                    return;
-                }
+                      std::bind(&Room::Private::onEventSendingFailure, this,
+                                txnId, call));
+        Room::connect(call, &BaseJob::success, q, [this, call, txnId] {
+            emit q->messageSent(txnId, call->eventId());
+            auto it = q->findPendingEvent(txnId);
+            if (it == unsyncedEvents.end()) {
+                qDebug(EVENTS) << "Pending event for transaction" << txnId
+                               << "already merged";
+                return;
+            }
 
-                it->setReachedServer(call->eventId());
-                emit q->pendingEventChanged(it - unsyncedEvents.begin());
-            });
+            it->setReachedServer(call->eventId());
+            emit q->pendingEventChanged(it - unsyncedEvents.begin());
+        });
     } else
         onEventSendingFailure(txnId);
     return txnId;
@@ -1421,15 +1310,14 @@ QString Room::Private::doSendEvent(const RoomEvent* pEvent)
 void Room::Private::onEventSendingFailure(const QString& txnId, BaseJob* call)
 {
     auto it = q->findPendingEvent(txnId);
-    if (it == unsyncedEvents.end())
-    {
+    if (it == unsyncedEvents.end()) {
         qCritical(EVENTS) << "Pending event for transaction" << txnId
                           << "could not be sent";
         return;
     }
-    it->setSendingFailed(call
-        ? call->statusCaption() % ": " % call->errorString()
-        : tr("The call could not be started"));
+    it->setSendingFailed(call ? call->statusCaption() % ": "
+                                         % call->errorString()
+                              : tr("The call could not be started"));
     emit q->pendingEventChanged(it - unsyncedEvents.begin());
 }
 
@@ -1439,30 +1327,29 @@ QString Room::retryMessage(const QString& txnId)
     Q_ASSERT(it != d->unsyncedEvents.end());
     qDebug(EVENTS) << "Retrying transaction" << txnId;
     const auto& transferIt = d->fileTransfers.find(txnId);
-    if (transferIt != d->fileTransfers.end())
-    {
+    if (transferIt != d->fileTransfers.end()) {
         Q_ASSERT(transferIt->isUpload);
-        if (transferIt->status == FileTransferInfo::Completed)
-        {
+        if (transferIt->status == FileTransferInfo::Completed) {
             qCDebug(MAIN) << "File for transaction" << txnId
                           << "has already been uploaded, bypassing re-upload";
         } else {
-            if (isJobRunning(transferIt->job))
-            {
+            if (isJobRunning(transferIt->job)) {
                 qCDebug(MAIN) << "Abandoning the upload job for transaction"
                               << txnId << "and starting again";
                 transferIt->job->abandon();
-                emit fileTransferFailed(txnId, tr("File upload will be retried"));
+                emit fileTransferFailed(txnId,
+                                        tr("File upload will be retried"));
             }
             uploadFile(txnId,
-                QUrl::fromLocalFile(transferIt->localFileInfo.absoluteFilePath()));
+                       QUrl::fromLocalFile(
+                               transferIt->localFileInfo.absoluteFilePath()));
             // FIXME: Content type is no more passed here but it should
         }
     }
-    if (it->deliveryStatus() == EventStatus::ReachedServer)
-    {
-        qCWarning(MAIN) << "The previous attempt has reached the server; two"
-                           " events are likely to be in the timeline after retry";
+    if (it->deliveryStatus() == EventStatus::ReachedServer) {
+        qCWarning(MAIN)
+                << "The previous attempt has reached the server; two"
+                   " events are likely to be in the timeline after retry";
     }
     it->resetStatus();
     return d->doSendEvent(it->event());
@@ -1470,23 +1357,22 @@ QString Room::retryMessage(const QString& txnId)
 
 void Room::discardMessage(const QString& txnId)
 {
-    auto it = std::find_if(d->unsyncedEvents.begin(), d->unsyncedEvents.end(),
-            [txnId] (const auto& evt) { return evt->transactionId() == txnId; });
+    auto it = std::find_if(
+            d->unsyncedEvents.begin(), d->unsyncedEvents.end(),
+            [txnId](const auto& evt) { return evt->transactionId() == txnId; });
     Q_ASSERT(it != d->unsyncedEvents.end());
     qDebug(EVENTS) << "Discarding transaction" << txnId;
     const auto& transferIt = d->fileTransfers.find(txnId);
-    if (transferIt != d->fileTransfers.end())
-    {
+    if (transferIt != d->fileTransfers.end()) {
         Q_ASSERT(transferIt->isUpload);
-        if (isJobRunning(transferIt->job))
-        {
+        if (isJobRunning(transferIt->job)) {
             transferIt->status = FileTransferInfo::Cancelled;
             transferIt->job->abandon();
             emit fileTransferFailed(txnId, tr("File upload cancelled"));
-        } else if (transferIt->status == FileTransferInfo::Completed)
-        {
-            qCWarning(MAIN) << "File for transaction" << txnId
-                            << "has been uploaded but the message was discarded";
+        } else if (transferIt->status == FileTransferInfo::Completed) {
+            qCWarning(MAIN)
+                    << "File for transaction" << txnId
+                    << "has been uploaded but the message was discarded";
         }
     }
     emit pendingEventAboutToDiscard(int(it - d->unsyncedEvents.begin()));
@@ -1507,8 +1393,9 @@ QString Room::postPlainText(const QString& plainText)
 QString Room::postHtmlMessage(const QString& plainText, const QString& html,
                               MessageEventType type)
 {
-    return d->sendEvent<RoomMessageEvent>(plainText, type,
-          new EventContent::TextContent(html, QStringLiteral("text/html")));
+    return d->sendEvent<RoomMessageEvent>(
+            plainText, type,
+            new EventContent::TextContent(html, QStringLiteral("text/html")));
 }
 
 QString Room::postHtmlText(const QString& plainText, const QString& html)
@@ -1523,58 +1410,58 @@ QString Room::postFile(const QString& plainText, const QUrl& localPath,
     Q_ASSERT(localFile.isFile());
     // Remote URL will only be known after upload; fill in the local path
     // to enable the preview while the event is pending.
-    const auto txnId = d->addAsPending(makeEvent<RoomMessageEvent>(
-                                           plainText, localFile, asGenericFile)
-                                       )->transactionId();
+    const auto txnId =
+            d->addAsPending(makeEvent<RoomMessageEvent>(plainText, localFile,
+                                                        asGenericFile))
+                    ->transactionId();
     uploadFile(txnId, localPath);
     auto* context = new QObject(this);
     connect(this, &Room::fileTransferCompleted, context,
-        [context,this,txnId] (const QString& id, QUrl, const QUrl& mxcUri) {
-            if (id == txnId)
-            {
-                auto it = findPendingEvent(txnId);
-                if (it != d->unsyncedEvents.end())
-                {
-                    it->setFileUploaded(mxcUri);
-                    emit pendingEventChanged(
+            [context, this, txnId](const QString& id, QUrl,
+                                   const QUrl& mxcUri) {
+                if (id == txnId) {
+                    auto it = findPendingEvent(txnId);
+                    if (it != d->unsyncedEvents.end()) {
+                        it->setFileUploaded(mxcUri);
+                        emit pendingEventChanged(
                                 int(it - d->unsyncedEvents.begin()));
-                    d->doSendEvent(it->get());
-                } else {
-                    // Normally in this situation we should instruct
-                    // the media server to delete the file; alas, there's no
-                    // API specced for that.
-                    qCWarning(MAIN) << "File uploaded to" << mxcUri
-                        << "but the event referring to it was cancelled";
+                        d->doSendEvent(it->get());
+                    } else {
+                        // Normally in this situation we should instruct
+                        // the media server to delete the file; alas, there's no
+                        // API specced for that.
+                        qCWarning(MAIN) << "File uploaded to" << mxcUri
+                                        << "but the event referring to it was "
+                                           "cancelled";
+                    }
+                    context->deleteLater();
                 }
-                context->deleteLater();
-            }
-        });
+            });
     connect(this, &Room::fileTransferCancelled, this,
-        [context,this,txnId] (const QString& id) {
-            if (id == txnId)
-            {
-                auto it = findPendingEvent(txnId);
-                if (it != d->unsyncedEvents.end())
-                {
-                    const auto idx = int(it - d->unsyncedEvents.begin());
-                    emit pendingEventAboutToDiscard(idx);
-                    // See #286 on why iterator may not be valid here.
-                    d->unsyncedEvents.erase(d->unsyncedEvents.begin() + idx);
-                    emit pendingEventDiscarded();
+            [context, this, txnId](const QString& id) {
+                if (id == txnId) {
+                    auto it = findPendingEvent(txnId);
+                    if (it != d->unsyncedEvents.end()) {
+                        const auto idx = int(it - d->unsyncedEvents.begin());
+                        emit pendingEventAboutToDiscard(idx);
+                        // See #286 on why iterator may not be valid here.
+                        d->unsyncedEvents.erase(d->unsyncedEvents.begin()
+                                                + idx);
+                        emit pendingEventDiscarded();
+                    }
+                    context->deleteLater();
                 }
-                context->deleteLater();
-            }
-        });
+            });
 
     return txnId;
 }
 
 QString Room::postEvent(RoomEvent* event)
 {
-    if (usesEncryption())
-    {
+    if (usesEncryption()) {
         qCCritical(MAIN) << "Room" << displayName()
-            << "enforces encryption; sending encrypted messages is not supported yet";
+                         << "enforces encryption; sending encrypted messages "
+                            "is not supported yet";
     }
     return d->sendEvent(RoomEventPtr(event));
 }
@@ -1582,7 +1469,8 @@ QString Room::postEvent(RoomEvent* event)
 QString Room::postJson(const QString& matrixType,
                        const QJsonObject& eventContent)
 {
-    return d->sendEvent(loadEvent<RoomEvent>(basicEventJson(matrixType, eventContent)));
+    return d->sendEvent(
+            loadEvent<RoomEvent>(basicEventJson(matrixType, eventContent)));
 }
 
 void Room::setName(const QString& newName)
@@ -1625,10 +1513,7 @@ bool isEchoEvent(const RoomEventPtr& le, const PendingEventItem& re)
     return le->contentJson() == re->contentJson();
 }
 
-bool Room::supportsCalls() const
-{
-    return joinedCount() == 2;
-}
+bool Room::supportsCalls() const { return joinedCount() == 2; }
 
 void Room::checkVersion()
 {
@@ -1638,8 +1523,7 @@ void Room::checkVersion()
     // This method is only called after the base state has been loaded
     // or the server capabilities have been loaded.
     emit stabilityUpdated(defaultVersion, stableVersions);
-    if (!stableVersions.contains(version()))
-    {
+    if (!stableVersions.contains(version())) {
         qCDebug(MAIN) << this << "version is" << version()
                       << "which the server doesn't count as stable";
         if (canSwitchVersions())
@@ -1680,25 +1564,22 @@ void Room::hangupCall(const QString& callId)
     postEvent(new CallHangupEvent(callId));
 }
 
-void Room::getPreviousContent(int limit)
-{
-    d->getPreviousContent(limit);
-}
+void Room::getPreviousContent(int limit) { d->getPreviousContent(limit); }
 
 void Room::Private::getPreviousContent(int limit)
 {
     if (isJobRunning(eventsHistoryJob))
         return;
 
-    eventsHistoryJob =
-        connection->callApi<GetRoomEventsJob>(id, prevBatch, "b", "", limit);
+    eventsHistoryJob = connection->callApi<GetRoomEventsJob>(id, prevBatch, "b",
+                                                             "", limit);
     emit q->eventsHistoryJobChanged();
-    connect( eventsHistoryJob, &BaseJob::success, q, [=] {
+    connect(eventsHistoryJob, &BaseJob::success, q, [=] {
         prevBatch = eventsHistoryJob->end();
         addHistoricalMessageEvents(eventsHistoryJob->chunk());
     });
-    connect( eventsHistoryJob, &QObject::destroyed,
-             q, &Room::eventsHistoryJobChanged);
+    connect(eventsHistoryJob, &QObject::destroyed, q,
+            &Room::eventsHistoryJobChanged);
 }
 
 void Room::inviteToRoom(const QString& memberId)
@@ -1712,7 +1593,8 @@ LeaveRoomJob* Room::leaveRoom()
     return connection()->leaveRoom(this);
 }
 
-SetRoomStateWithKeyJob*Room::setMemberState(const QString& memberId, const RoomMemberEvent& event) const
+SetRoomStateWithKeyJob* Room::setMemberState(const QString& memberId,
+                                             const RoomMemberEvent& event) const
 {
     return d->requestSetState(memberId, event);
 }
@@ -1735,7 +1617,7 @@ void Room::unban(const QString& userId)
 void Room::redactEvent(const QString& eventId, const QString& reason)
 {
     connection()->callApi<RedactEventJob>(
-        id(), eventId, connection()->generateTxnId(), reason);
+            id(), eventId, connection()->generateTxnId(), reason);
 }
 
 void Room::uploadFile(const QString& id, const QUrl& localFilename,
@@ -1745,18 +1627,17 @@ void Room::uploadFile(const QString& id, const QUrl& localFilename,
                "localFilename should point at a local file");
     auto fileName = localFilename.toLocalFile();
     auto job = connection()->uploadFile(fileName, overrideContentType);
-    if (isJobRunning(job))
-    {
+    if (isJobRunning(job)) {
         d->fileTransfers.insert(id, { job, fileName, true });
         connect(job, &BaseJob::uploadProgress, this,
-                [this,id] (qint64 sent, qint64 total) {
+                [this, id](qint64 sent, qint64 total) {
                     d->fileTransfers[id].update(sent, total);
                     emit fileTransferProgress(id, sent, total);
                 });
-        connect(job, &BaseJob::success, this, [this,id,localFilename,job] {
-                d->fileTransfers[id].status = FileTransferInfo::Completed;
-                emit fileTransferCompleted(id, localFilename, job->contentUri());
-            });
+        connect(job, &BaseJob::success, this, [this, id, localFilename, job] {
+            d->fileTransfers[id].status = FileTransferInfo::Completed;
+            emit fileTransferCompleted(id, localFilename, job->contentUri());
+        });
         connect(job, &BaseJob::failure, this,
                 std::bind(&Private::failedTransfer, d, id, job->errorString()));
         emit newFileTransfer(id, localFilename);
@@ -1767,9 +1648,8 @@ void Room::uploadFile(const QString& id, const QUrl& localFilename,
 void Room::downloadFile(const QString& eventId, const QUrl& localFilename)
 {
     auto ongoingTransfer = d->fileTransfers.find(eventId);
-    if (ongoingTransfer != d->fileTransfers.end() &&
-            ongoingTransfer->status == FileTransferInfo::Started)
-    {
+    if (ongoingTransfer != d->fileTransfers.end()
+        && ongoingTransfer->status == FileTransferInfo::Started) {
         qCWarning(MAIN) << "Transfer for" << eventId
                         << "is ongoing; download won't start";
         return;
@@ -1778,42 +1658,41 @@ void Room::downloadFile(const QString& eventId, const QUrl& localFilename)
     Q_ASSERT_X(localFilename.isEmpty() || localFilename.isLocalFile(),
                __FUNCTION__, "localFilename should point at a local file");
     const auto* event = d->getEventWithFile(eventId);
-    if (!event)
-    {
+    if (!event) {
         qCCritical(MAIN)
-            << eventId << "is not in the local timeline or has no file content";
+                << eventId
+                << "is not in the local timeline or has no file content";
         Q_ASSERT(false);
         return;
     }
     const auto fileUrl = event->content()->fileInfo()->url;
     auto filePath = localFilename.toLocalFile();
-    if (filePath.isEmpty())
-    {
+    if (filePath.isEmpty()) {
         // Build our own file path, starting with temp directory and eventId.
         filePath = eventId;
-        filePath = QDir::tempPath() % '/' %
-            filePath.replace(QRegularExpression("[/\\<>|\"*?:]"), "_") %
-                '#' % d->fileNameToDownload(event);
+        filePath = QDir::tempPath() % '/'
+                % filePath.replace(QRegularExpression("[/\\<>|\"*?:]"), "_")
+                % '#' % d->fileNameToDownload(event);
     }
     auto job = connection()->downloadFile(fileUrl, filePath);
-    if (isJobRunning(job))
-    {
+    if (isJobRunning(job)) {
         // If there was a previous transfer (completed or failed), remove it.
         d->fileTransfers.remove(eventId);
         d->fileTransfers.insert(eventId, { job, job->targetFileName() });
         connect(job, &BaseJob::downloadProgress, this,
-            [this,eventId] (qint64 received, qint64 total) {
-                d->fileTransfers[eventId].update(received, total);
-                emit fileTransferProgress(eventId, received, total);
-            });
-        connect(job, &BaseJob::success, this, [this,eventId,fileUrl,job] {
-                d->fileTransfers[eventId].status = FileTransferInfo::Completed;
-                emit fileTransferCompleted(eventId, fileUrl,
-                        QUrl::fromLocalFile(job->targetFileName()));
-            });
+                [this, eventId](qint64 received, qint64 total) {
+                    d->fileTransfers[eventId].update(received, total);
+                    emit fileTransferProgress(eventId, received, total);
+                });
+        connect(job, &BaseJob::success, this, [this, eventId, fileUrl, job] {
+            d->fileTransfers[eventId].status = FileTransferInfo::Completed;
+            emit fileTransferCompleted(
+                    eventId, fileUrl,
+                    QUrl::fromLocalFile(job->targetFileName()));
+        });
         connect(job, &BaseJob::failure, this,
-                std::bind(&Private::failedTransfer, d,
-                          eventId, job->errorString()));
+                std::bind(&Private::failedTransfer, d, eventId,
+                          job->errorString()));
     } else
         d->failedTransfer(eventId);
 }
@@ -1821,10 +1700,9 @@ void Room::downloadFile(const QString& eventId, const QUrl& localFilename)
 void Room::cancelFileTransfer(const QString& id)
 {
     auto it = d->fileTransfers.find(id);
-    if (it == d->fileTransfers.end())
-    {
-        qCWarning(MAIN) << "No information on file transfer" << id
-                        << "in room" << d->id;
+    if (it == d->fileTransfers.end()) {
+        qCWarning(MAIN) << "No information on file transfer" << id << "in room"
+                        << d->id;
         return;
     }
     if (isJobRunning(it->job))
@@ -1840,15 +1718,16 @@ void Room::Private::dropDuplicateEvents(RoomEvents& events) const
 
     // Multiple-remove (by different criteria), single-erase
     // 1. Check for duplicates against the timeline.
-    auto dupsBegin = remove_if(events.begin(), events.end(),
-            [&] (const RoomEventPtr& e)
-                { return eventsIndex.contains(e->id()); });
+    auto dupsBegin =
+            remove_if(events.begin(), events.end(), [&](const RoomEventPtr& e) {
+                return eventsIndex.contains(e->id());
+            });
 
     // 2. Check for duplicates within the batch if there are still events.
     for (auto eIt = events.begin(); distance(eIt, dupsBegin) > 1; ++eIt)
-        dupsBegin = remove_if(eIt + 1, dupsBegin,
-                [&] (const RoomEventPtr& e)
-                    { return e->id() == (*eIt)->id(); });
+        dupsBegin = remove_if(eIt + 1, dupsBegin, [&](const RoomEventPtr& e) {
+            return e->id() == (*eIt)->id();
+        });
     if (dupsBegin == events.end())
         return;
 
@@ -1867,48 +1746,54 @@ RoomEventPtr makeRedacted(const RoomEvent& target,
                           const RedactionEvent& redaction)
 {
     auto originalJson = target.originalJsonObject();
-    static const QStringList keepKeys {
-        EventIdKey, TypeKey, QStringLiteral("room_id"),
-        QStringLiteral("sender"), QStringLiteral("state_key"),
-        QStringLiteral("prev_content"), ContentKey,
-        QStringLiteral("hashes"), QStringLiteral("signatures"),
-        QStringLiteral("depth"), QStringLiteral("prev_events"),
-        QStringLiteral("prev_state"), QStringLiteral("auth_events"),
-        QStringLiteral("origin"), QStringLiteral("origin_server_ts"),
-        QStringLiteral("membership")
+    static const QStringList keepKeys { EventIdKey,
+                                        TypeKey,
+                                        QStringLiteral("room_id"),
+                                        QStringLiteral("sender"),
+                                        QStringLiteral("state_key"),
+                                        QStringLiteral("prev_content"),
+                                        ContentKey,
+                                        QStringLiteral("hashes"),
+                                        QStringLiteral("signatures"),
+                                        QStringLiteral("depth"),
+                                        QStringLiteral("prev_events"),
+                                        QStringLiteral("prev_state"),
+                                        QStringLiteral("auth_events"),
+                                        QStringLiteral("origin"),
+                                        QStringLiteral("origin_server_ts"),
+                                        QStringLiteral("membership") };
+
+    std::vector<std::pair<Event::Type, QStringList>> keepContentKeysMap {
+        { RoomMemberEvent::typeId(), { QStringLiteral("membership") } },
+        { RoomCreateEvent::typeId(), { QStringLiteral("creator") } }
+        //        , { RoomJoinRules::typeId(), { QStringLiteral("join_rule") } }
+        //        , { RoomPowerLevels::typeId(),
+        //            { QStringLiteral("ban"), QStringLiteral("events"),
+        //              QStringLiteral("events_default"),
+        //              QStringLiteral("kick"), QStringLiteral("redact"),
+        //              QStringLiteral("state_default"),
+        //              QStringLiteral("users"), QStringLiteral("users_default")
+        //              } }
+        ,
+        { RoomAliasesEvent::typeId(), { QStringLiteral("aliases") } }
+        //        , { RoomHistoryVisibility::typeId(),
+        //                { QStringLiteral("history_visibility") } }
     };
-
-        std::vector<std::pair<Event::Type, QStringList>> keepContentKeysMap
-        { { RoomMemberEvent::typeId(), { QStringLiteral("membership") } }
-        , { RoomCreateEvent::typeId(), { QStringLiteral("creator") } }
-//        , { RoomJoinRules::typeId(), { QStringLiteral("join_rule") } }
-//        , { RoomPowerLevels::typeId(),
-//            { QStringLiteral("ban"), QStringLiteral("events"),
-//              QStringLiteral("events_default"), QStringLiteral("kick"),
-//              QStringLiteral("redact"), QStringLiteral("state_default"),
-//              QStringLiteral("users"), QStringLiteral("users_default") } }
-        , { RoomAliasesEvent::typeId(), { QStringLiteral("aliases") } }
-//        , { RoomHistoryVisibility::typeId(),
-//                { QStringLiteral("history_visibility") } }
-        };
-    for (auto it = originalJson.begin(); it != originalJson.end();)
-    {
+    for (auto it = originalJson.begin(); it != originalJson.end();) {
         if (!keepKeys.contains(it.key()))
             it = originalJson.erase(it); // TODO: shred the value
         else
             ++it;
     }
-    auto keepContentKeys =
-            find_if(keepContentKeysMap.begin(), keepContentKeysMap.end(),
-                    [&target](const auto& t) { return target.type() == t.first; } );
-    if (keepContentKeys == keepContentKeysMap.end())
-    {
+    auto keepContentKeys = find_if(
+            keepContentKeysMap.begin(), keepContentKeysMap.end(),
+            [&target](const auto& t) { return target.type() == t.first; });
+    if (keepContentKeys == keepContentKeysMap.end()) {
         originalJson.remove(ContentKeyL);
         originalJson.remove(PrevContentKeyL);
     } else {
         auto content = originalJson.take(ContentKeyL).toObject();
-        for (auto it = content.begin(); it != content.end(); )
-        {
+        for (auto it = content.begin(); it != content.end();) {
             if (!keepContentKeys->second.contains(it.key()))
                 it = content.erase(it);
             else
@@ -1934,10 +1819,9 @@ bool Room::Private::processRedaction(const RedactionEvent& redaction)
     Q_ASSERT(q->isValidIndex(*pIdx));
 
     auto& ti = timeline[Timeline::size_type(*pIdx - q->minTimelineIndex())];
-    if (ti->isRedacted() && ti->redactedBecause()->id() == redaction.id())
-    {
-        qCDebug(MAIN) << "Redaction" << redaction.id()
-                      << "of event" << ti->id() << "already done, skipping";
+    if (ti->isRedacted() && ti->redactedBecause()->id() == redaction.id()) {
+        qCDebug(MAIN) << "Redaction" << redaction.id() << "of event" << ti->id()
+                      << "already done, skipping";
         return true;
     }
 
@@ -1945,15 +1829,16 @@ bool Room::Private::processRedaction(const RedactionEvent& redaction)
     // instead of the redacted one. oldEvent will be deleted on return.
     auto oldEvent = ti.replaceEvent(makeRedacted(*ti, redaction));
     qCDebug(MAIN) << "Redacted" << oldEvent->id() << "with" << redaction.id();
-    if (oldEvent->isStateEvent())
-    {
-        const StateEventKey evtKey { oldEvent->matrixType(), oldEvent->stateKey() };
+    if (oldEvent->isStateEvent()) {
+        const StateEventKey evtKey { oldEvent->matrixType(),
+                                     oldEvent->stateKey() };
         Q_ASSERT(currentState.contains(evtKey));
-        if (currentState[evtKey] == oldEvent.get())
-        {
-            Q_ASSERT(ti.index() >= 0); // Historical states can't be in currentState
-            qCDebug(MAIN).nospace() << "Reverting state "
-                << oldEvent->matrixType() << "/" << oldEvent->stateKey();
+        if (currentState[evtKey] == oldEvent.get()) {
+            Q_ASSERT(ti.index()
+                     >= 0); // Historical states can't be in currentState
+            qCDebug(MAIN).nospace()
+                    << "Reverting state " << oldEvent->matrixType() << "/"
+                    << oldEvent->stateKey();
             // Retarget the current state to the newly made event.
             if (q->processStateEvent(*ti))
                 emit q->namesChanged(q);
@@ -1971,10 +1856,7 @@ Connection* Room::connection() const
     return d->connection;
 }
 
-User* Room::localUser() const
-{
-    return connection()->user();
-}
+User* Room::localUser() const { return connection()->user(); }
 
 inline bool isRedaction(const RoomEventPtr& ep)
 {
@@ -1992,22 +1874,22 @@ Room::Changes Room::Private::addNewMessageEvents(RoomEvents&& events)
     // batch landed in the timeline already redacted.
     // NB: We have to store redaction events to the timeline too - see #220.
     auto redactionIt = std::find_if(events.begin(), events.end(), isRedaction);
-    for(const auto& eptr: RoomEventsRange(redactionIt, events.end()))
-        if (auto* r = eventCast<RedactionEvent>(eptr))
-        {
+    for (const auto& eptr : RoomEventsRange(redactionIt, events.end()))
+        if (auto* r = eventCast<RedactionEvent>(eptr)) {
             // Try to find the target in the timeline, then in the batch.
             if (processRedaction(*r))
                 continue;
-            auto targetIt = std::find_if(events.begin(), redactionIt,
-                [id=r->redactedEvent()] (const RoomEventPtr& ep) {
-                    return ep->id() == id;
-                });
+            auto targetIt = std::find_if(
+                    events.begin(), redactionIt,
+                    [id = r->redactedEvent()](const RoomEventPtr& ep) {
+                        return ep->id() == id;
+                    });
             if (targetIt != redactionIt)
                 *targetIt = makeRedacted(**targetIt, *r);
             else
-                qCDebug(MAIN) << "Redaction" << r->id()
-                              << "ignored: target event" << r->redactedEvent()
-                              << "is not found";
+                qCDebug(MAIN)
+                        << "Redaction" << r->id() << "ignored: target event"
+                        << r->redactedEvent() << "is not found";
             // If the target event comes later, it comes already redacted.
         }
 
@@ -2017,26 +1899,26 @@ Room::Changes Room::Private::addNewMessageEvents(RoomEvents&& events)
     // postulate that the current state is only current between syncs but not
     // within a sync.
     Changes roomChanges = Change::NoChange;
-    for (const auto& eptr: events)
+    for (const auto& eptr : events)
         roomChanges |= q->processStateEvent(*eptr);
 
     auto timelineSize = timeline.size();
     auto totalInserted = 0;
-    for (auto it = events.begin(); it != events.end();)
-    {
-        auto nextPendingPair = findFirstOf(it, events.end(),
-                    unsyncedEvents.begin(), unsyncedEvents.end(), isEchoEvent);
+    for (auto it = events.begin(); it != events.end();) {
+        auto nextPendingPair =
+                findFirstOf(it, events.end(), unsyncedEvents.begin(),
+                            unsyncedEvents.end(), isEchoEvent);
         auto nextPending = nextPendingPair.first;
 
-        if (it != nextPending)
-        {
+        if (it != nextPending) {
             RoomEventsRange eventsSpan { it, nextPending };
             emit q->aboutToAddNewMessages(eventsSpan);
             auto insertedSize = moveEventsToTimeline(eventsSpan, Newer);
             totalInserted += insertedSize;
             auto firstInserted = timeline.cend() - insertedSize;
             q->onAddNewTimelineEvents(firstInserted);
-            emit q->addedMessages(firstInserted->index(), timeline.back().index());
+            emit q->addedMessages(firstInserted->index(),
+                                  timeline.back().index());
         }
         if (nextPending == events.end())
             break;
@@ -2058,8 +1940,8 @@ Room::Changes Room::Private::addNewMessageEvents(RoomEvents&& events)
         // unsyncedEvents (see #286). Fortunately, unsyncedEvents only grows at
         // its back so we can rely on the index staying valid at least.
         unsyncedEvents.erase(unsyncedEvents.begin() + pendingEvtIdx);
-        if (auto insertedSize = moveEventsToTimeline({nextPending, it}, Newer))
-        {
+        if (auto insertedSize =
+                    moveEventsToTimeline({ nextPending, it }, Newer)) {
             totalInserted += insertedSize;
             q->onAddNewTimelineEvents(timeline.cend() - insertedSize);
         }
@@ -2073,11 +1955,10 @@ Room::Changes Room::Private::addNewMessageEvents(RoomEvents&& events)
             if (auto* evt = it->viewAs<CallEventBase>())
                 emit q->callEvent(q, evt);
 
-    if (totalInserted > 0)
-    {
-        qCDebug(MAIN)
-                << "Room" << q->objectName() << "received" << totalInserted
-                << "new events; the last event is now" << timeline.back();
+    if (totalInserted > 0) {
+        qCDebug(MAIN) << "Room" << q->objectName() << "received"
+                      << totalInserted << "new events; the last event is now"
+                      << timeline.back();
 
         // The first event in the just-added batch (referred to by `from`)
         // defines whose read marker can possibly be promoted any further over
@@ -2086,11 +1967,11 @@ Room::Changes Room::Private::addNewMessageEvents(RoomEvents&& events)
         // markMessagesAsRead() invocation) to promote their read markers over
         // the new message events.
         auto firstWriter = q->user((*from)->senderId());
-        if (q->readMarker(firstWriter) != timeline.crend())
-        {
+        if (q->readMarker(firstWriter) != timeline.crend()) {
             roomChanges |= promoteReadMarker(firstWriter, rev_iter_t(from) - 1);
-            qCDebug(MAIN) << "Auto-promoted read marker for" << firstWriter->id()
-                          << "to" << *q->readMarker(firstWriter);
+            qCDebug(MAIN) << "Auto-promoted read marker for"
+                          << firstWriter->id() << "to"
+                          << *q->readMarker(firstWriter);
         }
 
         updateUnreadCount(timeline.crbegin(), rev_iter_t(from));
@@ -2103,7 +1984,8 @@ Room::Changes Room::Private::addNewMessageEvents(RoomEvents&& events)
 
 void Room::Private::addHistoricalMessageEvents(RoomEvents&& events)
 {
-    QElapsedTimer et; et.start();
+    QElapsedTimer et;
+    et.start();
     const auto timelineSize = timeline.size();
 
     dropDuplicateEvents(events);
@@ -2114,12 +1996,10 @@ void Room::Private::addHistoricalMessageEvents(RoomEvents&& events)
     // messages. Also, the cache doesn't store events with empty content;
     // so when such events show up in the timeline they should be properly
     // incorporated.
-    for (const auto& eptr: events)
-    {
+    for (const auto& eptr : events) {
         const auto& e = *eptr;
-        if (e.isStateEvent() &&
-                !currentState.contains({e.matrixType(), e.stateKey()}))
-        {
+        if (e.isStateEvent()
+            && !currentState.contains({ e.matrixType(), e.stateKey() })) {
             q->processStateEvent(e);
         }
     }
@@ -2147,167 +2027,157 @@ Room::Changes Room::processStateEvent(const RoomEvent& e)
     if (!e.isStateEvent())
         return Change::NoChange;
 
-    const auto* oldStateEvent = std::exchange(
-        d->currentState[{e.matrixType(),e.stateKey()}],
-        static_cast<const StateEventBase*>(&e));
-    Q_ASSERT(!oldStateEvent ||
-             (oldStateEvent->matrixType() == e.matrixType() &&
-              oldStateEvent->stateKey() == e.stateKey()));
+    const auto* oldStateEvent =
+            std::exchange(d->currentState[{ e.matrixType(), e.stateKey() }],
+                          static_cast<const StateEventBase*>(&e));
+    Q_ASSERT(!oldStateEvent
+             || (oldStateEvent->matrixType() == e.matrixType()
+                 && oldStateEvent->stateKey() == e.stateKey()));
     if (!is<RoomMemberEvent>(e))
         qCDebug(EVENTS) << "Room state event:" << e;
 
-    return visit(e
-        , [] (const RoomNameEvent&) {
-            return NameChange;
-        }
-        , [this,oldStateEvent] (const RoomAliasesEvent& ae) {
-            const auto previousAliases = oldStateEvent
-                ? static_cast<const RoomAliasesEvent*>(oldStateEvent)->aliases()
-                : QStringList();
-            connection()->updateRoomAliases(id(), previousAliases, ae.aliases());
-            return OtherChange;
-        }
-        , [this] (const RoomCanonicalAliasEvent& evt) {
-            setObjectName(evt.alias().isEmpty() ? d->id : evt.alias());
-            return CanonicalAliasChange;
-        }
-        , [] (const RoomTopicEvent&) {
-            return TopicChange;
-        }
-        , [this] (const RoomAvatarEvent& evt) {
-            if (d->avatar.updateUrl(evt.url()))
-                emit avatarChanged();
-            return AvatarChange;
-        }
-        , [this] (const RoomMemberEvent& evt) {
-            auto* u = user(evt.userId());
-            u->processEvent(evt, this);
-            if (u == localUser() && memberJoinState(u) == JoinState::Invite
+    return visit(
+            e, [](const RoomNameEvent&) { return NameChange; },
+            [this, oldStateEvent](const RoomAliasesEvent& ae) {
+                const auto previousAliases = oldStateEvent
+                        ? static_cast<const RoomAliasesEvent*>(oldStateEvent)
+                                  ->aliases()
+                        : QStringList();
+                connection()->updateRoomAliases(id(), previousAliases,
+                                                ae.aliases());
+                return OtherChange;
+            },
+            [this](const RoomCanonicalAliasEvent& evt) {
+                setObjectName(evt.alias().isEmpty() ? d->id : evt.alias());
+                return CanonicalAliasChange;
+            },
+            [](const RoomTopicEvent&) { return TopicChange; },
+            [this](const RoomAvatarEvent& evt) {
+                if (d->avatar.updateUrl(evt.url()))
+                    emit avatarChanged();
+                return AvatarChange;
+            },
+            [this](const RoomMemberEvent& evt) {
+                auto* u = user(evt.userId());
+                u->processEvent(evt, this);
+                if (u == localUser() && memberJoinState(u) == JoinState::Invite
                     && evt.isDirect())
-                connection()->addToDirectChats(this, user(evt.senderId()));
-
-            if( evt.membership() == MembershipType::Join )
-            {
-                if (memberJoinState(u) != JoinState::Join)
-                {
-                    d->insertMemberIntoMap(u);
-                    connect(u, &User::nameAboutToChange, this,
-                        [=] (QString newName, QString, const Room* context) {
-                            if (context == this)
-                                emit memberAboutToRename(u, newName);
-                        });
-                    connect(u, &User::nameChanged, this,
-                        [=] (QString, QString oldName, const Room* context) {
-                            if (context == this)
-                                d->renameMember(u, oldName);
-                        });
-                    emit userAdded(u);
-                }
-            }
-            else if( evt.membership() != MembershipType::Join )
-            {
-                if (memberJoinState(u) == JoinState::Join)
-                {
-                    if (evt.membership() == MembershipType::Invite)
-                        qCWarning(MAIN) << "Invalid membership change:" << evt;
-                    if (!d->membersLeft.contains(u))
-                        d->membersLeft.append(u);
-                    d->removeMemberFromMap(u->name(this), u);
-                    emit userRemoved(u);
+                    connection()->addToDirectChats(this, user(evt.senderId()));
+
+                if (evt.membership() == MembershipType::Join) {
+                    if (memberJoinState(u) != JoinState::Join) {
+                        d->insertMemberIntoMap(u);
+                        connect(u, &User::nameAboutToChange, this,
+                                [=](QString newName, QString,
+                                    const Room* context) {
+                                    if (context == this)
+                                        emit memberAboutToRename(u, newName);
+                                });
+                        connect(u, &User::nameChanged, this,
+                                [=](QString, QString oldName,
+                                    const Room* context) {
+                                    if (context == this)
+                                        d->renameMember(u, oldName);
+                                });
+                        emit userAdded(u);
+                    }
+                } else if (evt.membership() != MembershipType::Join) {
+                    if (memberJoinState(u) == JoinState::Join) {
+                        if (evt.membership() == MembershipType::Invite)
+                            qCWarning(MAIN)
+                                    << "Invalid membership change:" << evt;
+                        if (!d->membersLeft.contains(u))
+                            d->membersLeft.append(u);
+                        d->removeMemberFromMap(u->name(this), u);
+                        emit userRemoved(u);
+                    }
                 }
-            }
-            return MembersChange;
-        }
-        , [this] (const EncryptionEvent&) {
-            emit encryption(); // It can only be done once, so emit it here.
-            return OtherChange;
-        }
-        , [this] (const RoomTombstoneEvent& evt) {
-            const auto successorId = evt.successorRoomId();
-            if (auto* successor = connection()->room(successorId))
-                emit upgraded(evt.serverMessage(), successor);
-            else
-                connectUntil(connection(), &Connection::loadedRoomState, this,
-                    [this,successorId,serverMsg=evt.serverMessage()]
-                    (Room* newRoom) {
-                        if (newRoom->id() != successorId)
-                            return false;
-                        emit upgraded(serverMsg, newRoom);
-                        return true;
-                    });
-
-            return OtherChange;
-        }
-    );
+                return MembersChange;
+            },
+            [this](const EncryptionEvent&) {
+                emit encryption(); // It can only be done once, so emit it here.
+                return OtherChange;
+            },
+            [this](const RoomTombstoneEvent& evt) {
+                const auto successorId = evt.successorRoomId();
+                if (auto* successor = connection()->room(successorId))
+                    emit upgraded(evt.serverMessage(), successor);
+                else
+                    connectUntil(
+                            connection(), &Connection::loadedRoomState, this,
+                            [this, successorId,
+                             serverMsg = evt.serverMessage()](Room* newRoom) {
+                                if (newRoom->id() != successorId)
+                                    return false;
+                                emit upgraded(serverMsg, newRoom);
+                                return true;
+                            });
+
+                return OtherChange;
+            });
 }
 
 Room::Changes Room::processEphemeralEvent(EventPtr&& event)
 {
     Changes changes = NoChange;
-    QElapsedTimer et; et.start();
-    if (auto* evt = eventCast<TypingEvent>(event))
-    {
+    QElapsedTimer et;
+    et.start();
+    if (auto* evt = eventCast<TypingEvent>(event)) {
         d->usersTyping.clear();
-        for( const QString& userId: qAsConst(evt->users()) )
-        {
+        for (const QString& userId : qAsConst(evt->users())) {
             auto u = user(userId);
             if (memberJoinState(u) == JoinState::Join)
                 d->usersTyping.append(u);
         }
         if (evt->users().size() > 3 || et.nsecsElapsed() >= profilerMinNsecs())
             qCDebug(PROFILER) << "*** Room::processEphemeralEvent(typing):"
-                << evt->users().size() << "users," << et;
+                              << evt->users().size() << "users," << et;
         emit typingChanged();
     }
-    if (auto* evt = eventCast<ReceiptEvent>(event))
-    {
+    if (auto* evt = eventCast<ReceiptEvent>(event)) {
         int totalReceipts = 0;
-        for( const auto &p: qAsConst(evt->eventsWithReceipts()) )
-        {
+        for (const auto& p : qAsConst(evt->eventsWithReceipts())) {
             totalReceipts += p.receipts.size();
             {
                 if (p.receipts.size() == 1)
-                    qCDebug(EPHEMERAL) << "Marking" << p.evtId
-                        << "as read for" << p.receipts[0].userId;
+                    qCDebug(EPHEMERAL) << "Marking" << p.evtId << "as read for"
+                                       << p.receipts[0].userId;
                 else
-                    qCDebug(EPHEMERAL) << "Marking" << p.evtId
-                        << "as read for" << p.receipts.size() << "users";
+                    qCDebug(EPHEMERAL) << "Marking" << p.evtId << "as read for"
+                                       << p.receipts.size() << "users";
             }
             const auto newMarker = findInTimeline(p.evtId);
-            if (newMarker != timelineEdge())
-            {
-                for( const Receipt& r: p.receipts )
-                {
+            if (newMarker != timelineEdge()) {
+                for (const Receipt& r : p.receipts) {
                     if (r.userId == connection()->userId())
                         continue; // FIXME, #185
                     auto u = user(r.userId);
                     if (memberJoinState(u) == JoinState::Join)
                         changes |= d->promoteReadMarker(u, newMarker);
                 }
-            } else
-            {
+            } else {
                 qCDebug(EPHEMERAL) << "Event" << p.evtId
-                    << "not found; saving read receipts anyway";
+                                   << "not found; saving read receipts anyway";
                 // If the event is not found (most likely, because it's too old
                 // and hasn't been fetched from the server yet), but there is
                 // a previous marker for a user, keep the previous marker.
                 // Otherwise, blindly store the event id for this user.
-                for( const Receipt& r: p.receipts )
-                {
+                for (const Receipt& r : p.receipts) {
                     if (r.userId == connection()->userId())
                         continue; // FIXME, #185
                     auto u = user(r.userId);
-                    if (memberJoinState(u) == JoinState::Join &&
-                            readMarker(u) == timelineEdge())
+                    if (memberJoinState(u) == JoinState::Join
+                        && readMarker(u) == timelineEdge())
                         changes |= d->setLastReadEvent(u, p.evtId);
                 }
             }
         }
-        if (evt->eventsWithReceipts().size() > 3 || totalReceipts > 10 ||
-                et.nsecsElapsed() >= profilerMinNsecs())
-            qCDebug(PROFILER) << "*** Room::processEphemeralEvent(receipts):"
-                << evt->eventsWithReceipts().size()
-                << "event(s) with" << totalReceipts << "receipt(s)," << et;
+        if (evt->eventsWithReceipts().size() > 3 || totalReceipts > 10
+            || et.nsecsElapsed() >= profilerMinNsecs())
+            qCDebug(PROFILER)
+                    << "*** Room::processEphemeralEvent(receipts):"
+                    << evt->eventsWithReceipts().size() << "event(s) with"
+                    << totalReceipts << "receipt(s)," << et;
     }
     return changes;
 }
@@ -2315,28 +2185,25 @@ Room::Changes Room::processEphemeralEvent(EventPtr&& event)
 Room::Changes Room::processAccountDataEvent(EventPtr&& event)
 {
     Changes changes = NoChange;
-    if (auto* evt = eventCast<TagEvent>(event))
-    {
+    if (auto* evt = eventCast<TagEvent>(event)) {
         d->setTags(evt->tags());
         changes |= Change::TagsChange;
     }
 
-    if (auto* evt = eventCast<ReadMarkerEvent>(event))
-    {
+    if (auto* evt = eventCast<ReadMarkerEvent>(event)) {
         auto readEventId = evt->event_id();
         qCDebug(MAIN) << "Server-side read marker at" << readEventId;
         d->serverReadMarker = readEventId;
         const auto newMarker = findInTimeline(readEventId);
         changes |= newMarker != timelineEdge()
-            ? d->markMessagesAsRead(newMarker)
-            : d->setLastReadEvent(localUser(), readEventId);
+                ? d->markMessagesAsRead(newMarker)
+                : d->setLastReadEvent(localUser(), readEventId);
     }
     // For all account data events
     auto& currentData = d->accountData[event->matrixType()];
     // A polymorphic event-specific comparison might be a bit more
     // efficient; maaybe do it another day
-    if (!currentData || currentData->contentJson() != event->contentJson())
-    {
+    if (!currentData || currentData->contentJson() != event->contentJson()) {
         emit accountDataAboutToChange(event->matrixType());
         currentData = move(event);
         qCDebug(MAIN) << "Updated account data of type"
@@ -2356,15 +2223,14 @@ Room::Private::buildShortlist(const ContT& users) const
     // display names of two topmost users excluding the current one to render
     // the name of the room. The below code selects 3 topmost users,
     // slightly extending the spec.
-    users_shortlist_t shortlist { }; // Prefill with nullptrs
+    users_shortlist_t shortlist {}; // Prefill with nullptrs
     std::partial_sort_copy(
-        users.begin(), users.end(),
-        shortlist.begin(), shortlist.end(),
-        [this] (const User* u1, const User* u2) {
-            // localUser(), if it's in the list, is sorted below all others
-            return isLocalUser(u2) || (!isLocalUser(u1) && u1->id() < u2->id());
-        }
-    );
+            users.begin(), users.end(), shortlist.begin(), shortlist.end(),
+            [this](const User* u1, const User* u2) {
+                // localUser(), if it's in the list, is sorted below all others
+                return isLocalUser(u2)
+                        || (!isLocalUser(u1) && u1->id() < u2->id());
+            });
     return shortlist;
 }
 
@@ -2373,7 +2239,7 @@ Room::Private::buildShortlist(const QStringList& userIds) const
 {
     QList<User*> users;
     users.reserve(userIds.size());
-    for (const auto& h: userIds)
+    for (const auto& h : userIds)
         users.push_back(q->user(h));
     return buildShortlist(users);
 }
@@ -2395,23 +2261,22 @@ QString Room::Private::calculateDisplayname() const
         return dispName;
 
     // Using m.room.aliases in naming is explicitly discouraged by the spec
-    //if (!q->aliases().empty() && !q->aliases().at(0).isEmpty())
+    // if (!q->aliases().empty() && !q->aliases().at(0).isEmpty())
     //    return q->aliases().at(0);
 
     // Supplementary code for 3 and 4: build the shortlist of users whose names
     // will be used to construct the room name. Takes into account MSC688's
     // "heroes" if available.
 
-    const bool emptyRoom = membersMap.isEmpty() ||
-             (membersMap.size() == 1 && isLocalUser(*membersMap.begin()));
-    const auto shortlist =
-            !summary.heroes.omitted() ? buildShortlist(summary.heroes.value()) :
-            !emptyRoom ? buildShortlist(membersMap) :
-                         buildShortlist(membersLeft);
+    const bool emptyRoom = membersMap.isEmpty()
+            || (membersMap.size() == 1 && isLocalUser(*membersMap.begin()));
+    const auto shortlist = !summary.heroes.omitted()
+            ? buildShortlist(summary.heroes.value())
+            : !emptyRoom ? buildShortlist(membersMap)
+                         : buildShortlist(membersLeft);
 
     QStringList names;
-    for (auto u: shortlist)
-    {
+    for (auto u : shortlist) {
         if (u == nullptr || isLocalUser(u))
             break;
         names.push_back(q->roomMembername(u));
@@ -2421,10 +2286,10 @@ QString Room::Private::calculateDisplayname() const
             ? membersLeft.size() - int(joinState == JoinState::Leave)
             : q->joinedCount() - int(joinState == JoinState::Join);
     if (usersCountExceptLocal > int(shortlist.size()))
-        names <<
-            tr("%Ln other(s)",
-               "Used to make a room name from user names: A, B and _N others_",
-               usersCountExceptLocal);
+        names << tr(
+                "%Ln other(s)",
+                "Used to make a room name from user names: A, B and _N others_",
+                usersCountExceptLocal);
     auto namesList = QLocale().createSeparatedList(names);
 
     // 3. Room members
@@ -2442,8 +2307,7 @@ QString Room::Private::calculateDisplayname() const
 void Room::Private::updateDisplayname()
 {
     auto swappedName = calculateDisplayname();
-    if (swappedName != displayname)
-    {
+    if (swappedName != displayname) {
         emit q->displaynameAboutToChange(q);
         swap(displayname, swappedName);
         qDebug(MAIN) << q->objectName() << "has changed display name from"
@@ -2454,17 +2318,17 @@ void Room::Private::updateDisplayname()
 
 QJsonObject Room::Private::toJson() const
 {
-    QElapsedTimer et; et.start();
+    QElapsedTimer et;
+    et.start();
     QJsonObject result;
     addParam<IfNotEmpty>(result, QStringLiteral("summary"), summary);
     {
         QJsonArray stateEvents;
 
-        for (const auto* evt: currentState)
-        {
+        for (const auto* evt : currentState) {
             Q_ASSERT(evt->isStateEvent());
-            if ((evt->isRedacted() && !is<RoomMemberEvent>(*evt)) ||
-                    evt->contentJson().isEmpty())
+            if ((evt->isRedacted() && !is<RoomMemberEvent>(*evt))
+                || evt->contentJson().isEmpty())
                 continue;
 
             auto json = evt->fullJson();
@@ -2474,56 +2338,54 @@ QJsonObject Room::Private::toJson() const
             stateEvents.append(json);
         }
 
-        const auto stateObjName = joinState == JoinState::Invite ?
-                    QStringLiteral("invite_state") : QStringLiteral("state");
-        result.insert(stateObjName,
-            QJsonObject {{ QStringLiteral("events"), stateEvents }});
+        const auto stateObjName = joinState == JoinState::Invite
+                ? QStringLiteral("invite_state")
+                : QStringLiteral("state");
+        result.insert(
+                stateObjName,
+                QJsonObject { { QStringLiteral("events"), stateEvents } });
     }
 
-    if (!accountData.empty())
-    {
+    if (!accountData.empty()) {
         QJsonArray accountDataEvents;
-        for (const auto& e: accountData)
-        {
+        for (const auto& e : accountData) {
             if (!e.second->contentJson().isEmpty())
                 accountDataEvents.append(e.second->fullJson());
         }
         result.insert(QStringLiteral("account_data"),
-                      QJsonObject {{ QStringLiteral("events"), accountDataEvents }});
+                      QJsonObject { { QStringLiteral("events"),
+                                      accountDataEvents } });
     }
 
-    QJsonObject unreadNotifObj
-        { { SyncRoomData::UnreadCountKey, unreadMessages } };
+    QJsonObject unreadNotifObj { { SyncRoomData::UnreadCountKey,
+                                   unreadMessages } };
 
     if (highlightCount > 0)
-        unreadNotifObj.insert(QStringLiteral("highlight_count"), highlightCount);
+        unreadNotifObj.insert(QStringLiteral("highlight_count"),
+                              highlightCount);
     if (notificationCount > 0)
-        unreadNotifObj.insert(QStringLiteral("notification_count"), notificationCount);
+        unreadNotifObj.insert(QStringLiteral("notification_count"),
+                              notificationCount);
 
     result.insert(QStringLiteral("unread_notifications"), unreadNotifObj);
 
     if (et.elapsed() > 30)
-        qCDebug(PROFILER) << "Room::toJson() for" << displayname << "took" << et;
+        qCDebug(PROFILER) << "Room::toJson() for" << displayname << "took"
+                          << et;
 
     return result;
 }
 
-QJsonObject Room::toJson() const
-{
-    return d->toJson();
-}
+QJsonObject Room::toJson() const { return d->toJson(); }
 
-MemberSorter Room::memberSorter() const
-{
-    return MemberSorter(this);
-}
+MemberSorter Room::memberSorter() const { return MemberSorter(this); }
 
-bool MemberSorter::operator()(User *u1, User *u2) const
+bool MemberSorter::operator()(User* u1, User* u2) const
 {
     return operator()(u1, room->roomMembername(u2));
 }
 
-bool MemberSorter::operator ()(User* u1, const QString& u2name) const
+bool MemberSorter::operator()(User* u1, const QString& u2name) const
 {
     auto n1 = room->roomMembername(u1);
     if (n1.startsWith('@'))
diff --git a/lib/room.h b/lib/room.h
index f4ecef42..4645d02a 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -13,25 +13,24 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
 #include "csapi/message_pagination.h"
-#include "events/roommessageevent.h"
-#include "events/accountdataevents.h"
 #include "eventitem.h"
+#include "events/accountdataevents.h"
+#include "events/roommessageevent.h"
 #include "joinstate.h"
 
 #include <QtGui/QImage>
 
-#include <memory>
 #include <deque>
+#include <memory>
 #include <utility>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     class Event;
     class Avatar;
     class SyncRoomData;
@@ -50,553 +49,571 @@ namespace QMatrixClient
      */
     class FileTransferInfo
     {
-            Q_GADGET
-            Q_PROPERTY(bool isUpload MEMBER isUpload CONSTANT)
-            Q_PROPERTY(bool active READ active CONSTANT)
-            Q_PROPERTY(bool started READ started CONSTANT)
-            Q_PROPERTY(bool completed READ completed CONSTANT)
-            Q_PROPERTY(bool failed READ failed CONSTANT)
-            Q_PROPERTY(int progress MEMBER progress CONSTANT)
-            Q_PROPERTY(int total MEMBER total CONSTANT)
-            Q_PROPERTY(QUrl localDir MEMBER localDir CONSTANT)
-            Q_PROPERTY(QUrl localPath MEMBER localPath CONSTANT)
+        Q_GADGET
+        Q_PROPERTY(bool isUpload MEMBER isUpload CONSTANT)
+        Q_PROPERTY(bool active READ active CONSTANT)
+        Q_PROPERTY(bool started READ started CONSTANT)
+        Q_PROPERTY(bool completed READ completed CONSTANT)
+        Q_PROPERTY(bool failed READ failed CONSTANT)
+        Q_PROPERTY(int progress MEMBER progress CONSTANT)
+        Q_PROPERTY(int total MEMBER total CONSTANT)
+        Q_PROPERTY(QUrl localDir MEMBER localDir CONSTANT)
+        Q_PROPERTY(QUrl localPath MEMBER localPath CONSTANT)
         public:
-            enum Status { None, Started, Completed, Failed, Cancelled };
-            Status status = None;
-            bool isUpload = false;
-            int progress = 0;
-            int total = -1;
-            QUrl localDir { };
-            QUrl localPath { };
-
-            bool started() const { return status == Started; }
-            bool completed() const { return status == Completed; }
-            bool active() const { return started() || completed(); }
-            bool failed() const { return status == Failed; }
+        enum Status { None, Started, Completed, Failed, Cancelled };
+        Status status = None;
+        bool isUpload = false;
+        int progress = 0;
+        int total = -1;
+        QUrl localDir {};
+        QUrl localPath {};
+
+        bool started() const { return status == Started; }
+        bool completed() const { return status == Completed; }
+        bool active() const { return started() || completed(); }
+        bool failed() const { return status == Failed; }
     };
 
-    class Room: public QObject
+    class Room : public QObject
     {
-            Q_OBJECT
-            Q_PROPERTY(Connection* connection READ connection CONSTANT)
-            Q_PROPERTY(User* localUser READ localUser CONSTANT)
-            Q_PROPERTY(QString id READ id CONSTANT)
-            Q_PROPERTY(QString version READ version NOTIFY baseStateLoaded)
-            Q_PROPERTY(bool isUnstable READ isUnstable NOTIFY stabilityUpdated)
-            Q_PROPERTY(QString predecessorId READ predecessorId NOTIFY baseStateLoaded)
-            Q_PROPERTY(QString successorId READ successorId NOTIFY upgraded)
-            Q_PROPERTY(QString name READ name NOTIFY namesChanged)
-            Q_PROPERTY(QStringList aliases READ aliases NOTIFY namesChanged)
-            Q_PROPERTY(QString canonicalAlias READ canonicalAlias NOTIFY namesChanged)
-            Q_PROPERTY(QString displayName READ displayName NOTIFY namesChanged)
-            Q_PROPERTY(QString topic READ topic NOTIFY topicChanged)
-            Q_PROPERTY(QString avatarMediaId READ avatarMediaId NOTIFY avatarChanged STORED false)
-            Q_PROPERTY(QUrl avatarUrl READ avatarUrl NOTIFY avatarChanged)
-            Q_PROPERTY(bool usesEncryption READ usesEncryption NOTIFY encryption)
-
-            Q_PROPERTY(int timelineSize READ timelineSize NOTIFY addedMessages)
-            Q_PROPERTY(QStringList memberNames READ memberNames NOTIFY memberListChanged)
-            Q_PROPERTY(int memberCount READ memberCount NOTIFY memberListChanged)
-            Q_PROPERTY(int joinedCount READ joinedCount NOTIFY memberListChanged)
-            Q_PROPERTY(int invitedCount READ invitedCount NOTIFY memberListChanged)
-            Q_PROPERTY(int totalMemberCount READ totalMemberCount NOTIFY memberListChanged)
-
-            Q_PROPERTY(bool displayed READ displayed WRITE setDisplayed NOTIFY displayedChanged)
-            Q_PROPERTY(QString firstDisplayedEventId READ firstDisplayedEventId WRITE setFirstDisplayedEventId NOTIFY firstDisplayedEventChanged)
-            Q_PROPERTY(QString lastDisplayedEventId READ lastDisplayedEventId WRITE setLastDisplayedEventId NOTIFY lastDisplayedEventChanged)
-
-            Q_PROPERTY(QString readMarkerEventId READ readMarkerEventId WRITE markMessagesAsRead NOTIFY readMarkerMoved)
-            Q_PROPERTY(bool hasUnreadMessages READ hasUnreadMessages NOTIFY unreadMessagesChanged)
-            Q_PROPERTY(int unreadCount READ unreadCount NOTIFY unreadMessagesChanged)
-            Q_PROPERTY(QStringList tagNames READ tagNames NOTIFY tagsChanged)
-            Q_PROPERTY(bool isFavourite READ isFavourite NOTIFY tagsChanged)
-            Q_PROPERTY(bool isLowPriority READ isLowPriority NOTIFY tagsChanged)
-
-            Q_PROPERTY(GetRoomEventsJob* eventsHistoryJob READ eventsHistoryJob NOTIFY eventsHistoryJobChanged)
+        Q_OBJECT
+        Q_PROPERTY(Connection* connection READ connection CONSTANT)
+        Q_PROPERTY(User* localUser READ localUser CONSTANT)
+        Q_PROPERTY(QString id READ id CONSTANT)
+        Q_PROPERTY(QString version READ version NOTIFY baseStateLoaded)
+        Q_PROPERTY(bool isUnstable READ isUnstable NOTIFY stabilityUpdated)
+        Q_PROPERTY(
+                QString predecessorId READ predecessorId NOTIFY baseStateLoaded)
+        Q_PROPERTY(QString successorId READ successorId NOTIFY upgraded)
+        Q_PROPERTY(QString name READ name NOTIFY namesChanged)
+        Q_PROPERTY(QStringList aliases READ aliases NOTIFY namesChanged)
+        Q_PROPERTY(
+                QString canonicalAlias READ canonicalAlias NOTIFY namesChanged)
+        Q_PROPERTY(QString displayName READ displayName NOTIFY namesChanged)
+        Q_PROPERTY(QString topic READ topic NOTIFY topicChanged)
+        Q_PROPERTY(QString avatarMediaId READ avatarMediaId NOTIFY avatarChanged
+                           STORED false)
+        Q_PROPERTY(QUrl avatarUrl READ avatarUrl NOTIFY avatarChanged)
+        Q_PROPERTY(bool usesEncryption READ usesEncryption NOTIFY encryption)
+
+        Q_PROPERTY(int timelineSize READ timelineSize NOTIFY addedMessages)
+        Q_PROPERTY(QStringList memberNames READ memberNames NOTIFY
+                           memberListChanged)
+        Q_PROPERTY(int memberCount READ memberCount NOTIFY memberListChanged)
+        Q_PROPERTY(int joinedCount READ joinedCount NOTIFY memberListChanged)
+        Q_PROPERTY(int invitedCount READ invitedCount NOTIFY memberListChanged)
+        Q_PROPERTY(int totalMemberCount READ totalMemberCount NOTIFY
+                           memberListChanged)
+
+        Q_PROPERTY(bool displayed READ displayed WRITE setDisplayed NOTIFY
+                           displayedChanged)
+        Q_PROPERTY(QString firstDisplayedEventId READ firstDisplayedEventId
+                           WRITE setFirstDisplayedEventId NOTIFY
+                                   firstDisplayedEventChanged)
+        Q_PROPERTY(QString lastDisplayedEventId READ lastDisplayedEventId WRITE
+                           setLastDisplayedEventId NOTIFY
+                                   lastDisplayedEventChanged)
+
+        Q_PROPERTY(QString readMarkerEventId READ readMarkerEventId WRITE
+                           markMessagesAsRead NOTIFY readMarkerMoved)
+        Q_PROPERTY(bool hasUnreadMessages READ hasUnreadMessages NOTIFY
+                           unreadMessagesChanged)
+        Q_PROPERTY(
+                int unreadCount READ unreadCount NOTIFY unreadMessagesChanged)
+        Q_PROPERTY(QStringList tagNames READ tagNames NOTIFY tagsChanged)
+        Q_PROPERTY(bool isFavourite READ isFavourite NOTIFY tagsChanged)
+        Q_PROPERTY(bool isLowPriority READ isLowPriority NOTIFY tagsChanged)
+
+        Q_PROPERTY(GetRoomEventsJob* eventsHistoryJob READ eventsHistoryJob
+                           NOTIFY eventsHistoryJobChanged)
 
         public:
-            using Timeline = std::deque<TimelineItem>;
-            using PendingEvents = std::vector<PendingEventItem>;
-            using rev_iter_t = Timeline::const_reverse_iterator;
-            using timeline_iter_t = Timeline::const_iterator;
-
-            enum Change : uint {
-                NoChange = 0x0,
-                NameChange = 0x1,
-                CanonicalAliasChange = 0x2,
-                TopicChange = 0x4,
-                UnreadNotifsChange = 0x8,
-                AvatarChange = 0x10,
-                JoinStateChange = 0x20,
-                TagsChange = 0x40,
-                MembersChange = 0x80,
-                /* = 0x100, */
-                AccountDataChange = 0x200,
-                SummaryChange = 0x400,
-                ReadMarkerChange = 0x800,
-                OtherChange = 0x8000,
-                AnyChange = 0xFFFF
-            };
-            Q_DECLARE_FLAGS(Changes, Change)
-            Q_FLAG(Changes)
-
-            Room(Connection* connection, QString id, JoinState initialJoinState);
-            ~Room() override;
-
-            // Property accessors
-
-            Connection* connection() const;
-            User* localUser() const;
-            const QString& id() const;
-            QString version() const;
-            bool isUnstable() const;
-            QString predecessorId() const;
-            QString successorId() const;
-            QString name() const;
-            QStringList aliases() const;
-            QString canonicalAlias() const;
-            QString displayName() const;
-            QString topic() const;
-            QString avatarMediaId() const;
-            QUrl avatarUrl() const;
-            const Avatar& avatarObject() const;
-            Q_INVOKABLE JoinState joinState() const;
-            Q_INVOKABLE QList<User*> usersTyping() const;
-            QList<User*> membersLeft() const;
-
-            Q_INVOKABLE QList<User*> users() const;
-            QStringList memberNames() const;
-            [[deprecated("Use joinedCount(), invitedCount(), totalMemberCount()")]]
-            int memberCount() const;
-            int timelineSize() const;
-            bool usesEncryption() const;
-            int joinedCount() const;
-            int invitedCount() const;
-            int totalMemberCount() const;
-
-            GetRoomEventsJob* eventsHistoryJob() const;
-
-            /**
-             * Returns a square room avatar with the given size and requests it
-             * from the network if needed
-             * \return a pixmap with the avatar or a placeholder if there's none
-             * available yet
-             */
-            Q_INVOKABLE QImage avatar(int dimension);
-            /**
-             * Returns a room avatar with the given dimensions and requests it
-             * from the network if needed
-             * \return a pixmap with the avatar or a placeholder if there's none
-             * available yet
-             */
-            Q_INVOKABLE QImage avatar(int width, int height);
-
-            /**
-             * \brief Get a user object for a given user id
-             * This is the recommended way to get a user object in a room
-             * context. The actual object type may be changed in further
-             * versions to provide room-specific user information (display name,
-             * avatar etc.).
-             * \note The method will return a valid user regardless of
-             *       the membership.
-             */
-            Q_INVOKABLE User* user(const QString& userId) const;
-
-            /**
-             * \brief Check the join state of a given user in this room
-             *
-             * \note Banned and invited users are not tracked for now (Leave
-             *       will be returned for them).
-             *
-             * \return either of Join, Leave, depending on the given
-             *         user's state in the room
-             */
-            Q_INVOKABLE JoinState memberJoinState(User* user) const;
-
-            /**
-             * Get a disambiguated name for a given user in
-             * the context of the room
-             */
-            Q_INVOKABLE QString roomMembername(const User* u) const;
-            /**
-             * Get a disambiguated name for a user with this id in
-             * the context of the room
-             */
-            Q_INVOKABLE QString roomMembername(const QString& userId) const;
-
-            const Timeline& messageEvents() const;
-            const PendingEvents& pendingEvents() const;
-            /**
-             * A convenience method returning the read marker to the position
-             * before the "oldest" event; same as messageEvents().crend()
-             */
-            rev_iter_t historyEdge() const;
-            /**
-             * A convenience method returning the iterator beyond the latest
-             * arrived event; same as messageEvents().cend()
-             */
-            Timeline::const_iterator syncEdge() const;
-            /// \deprecated Use historyEdge instead
-            rev_iter_t timelineEdge() const;
-            Q_INVOKABLE TimelineItem::index_t minTimelineIndex() const;
-            Q_INVOKABLE TimelineItem::index_t maxTimelineIndex() const;
-            Q_INVOKABLE bool isValidIndex(TimelineItem::index_t timelineIndex) const;
-
-            rev_iter_t findInTimeline(TimelineItem::index_t index) const;
-            rev_iter_t findInTimeline(const QString& evtId) const;
-            PendingEvents::iterator findPendingEvent(const QString & txnId);
-            PendingEvents::const_iterator findPendingEvent(const QString & txnId) const;
-
-            bool displayed() const;
-            /// Mark the room as currently displayed to the user
-            /**
-             * Marking the room displayed causes the room to obtain the full
-             * list of members if it's been lazy-loaded before; in the future
-             * it may do more things bound to "screen time" of the room, e.g.
-             * measure that "screen time".
-             */
-            void setDisplayed(bool displayed = true);
-            QString firstDisplayedEventId() const;
-            rev_iter_t firstDisplayedMarker() const;
-            void setFirstDisplayedEventId(const QString& eventId);
-            void setFirstDisplayedEvent(TimelineItem::index_t index);
-            QString lastDisplayedEventId() const;
-            rev_iter_t lastDisplayedMarker() const;
-            void setLastDisplayedEventId(const QString& eventId);
-            void setLastDisplayedEvent(TimelineItem::index_t index);
-
-            rev_iter_t readMarker(const User* user) const;
-            rev_iter_t readMarker() const;
-            QString readMarkerEventId() const;
-            QList<User*> usersAtEventId(const QString& eventId);
-            /**
-             * \brief Mark the event with uptoEventId as read
-             *
-             * Finds in the timeline and marks as read the event with
-             * the specified id; also posts a read receipt to the server either
-             * for this message or, if it's from the local user, for
-             * the nearest non-local message before. uptoEventId must be non-empty.
-             */
-            void markMessagesAsRead(QString uptoEventId);
-
-            /// Check whether there are unread messages in the room
-            bool hasUnreadMessages() const;
-
-            /** Get the number of unread messages in the room
-             * Depending on the read marker state, this call may return either
-             * a precise or an estimate number of unread events. Only "notable"
-             * events (non-redacted message events from users other than local)
-             * are counted.
-             *
-             * In a case when readMarker() == timelineEdge() (the local read
-             * marker is beyond the local timeline) only the bottom limit of
-             * the unread messages number can be estimated (and even that may
-             * be slightly off due to, e.g., redactions of events not loaded
-             * to the local timeline).
-             *
-             * If all messages are read, this function will return -1 (_not_ 0,
-             * as zero may mean "zero or more unread messages" in a situation
-             * when the read marker is outside the local timeline.
-             */
-            int unreadCount() const;
-
-            Q_INVOKABLE int notificationCount() const;
-            Q_INVOKABLE void resetNotificationCount();
-            Q_INVOKABLE int highlightCount() const;
-            Q_INVOKABLE void resetHighlightCount();
-
-            /** Check whether the room has account data of the given type
-             * Tags and read markers are not supported by this method _yet_.
-             */
-            bool hasAccountData(const QString& type) const;
-
-            /** Get a generic account data event of the given type
-             * This returns a generic hashmap for any room account data event
-             * stored on the server. Tags and read markers cannot be retrieved
-             * using this method _yet_.
-             */
-            const EventPtr& accountData(const QString& type) const;
-
-            QStringList tagNames() const;
-            TagsMap tags() const;
-            TagRecord tag(const QString& name) const;
-
-            /** Add a new tag to this room
-             * If this room already has this tag, nothing happens. If it's a new
-             * tag for the room, the respective tag record is added to the set
-             * of tags and the new set is sent to the server to update other
-             * clients.
-             */
-            void addTag(const QString& name, const TagRecord& record = {});
-            Q_INVOKABLE void addTag(const QString& name, float order);
-
-            /// Remove a tag from the room
-            Q_INVOKABLE void removeTag(const QString& name);
-
-            /** Overwrite the room's tags
-             * This completely replaces the existing room's tags with a set
-             * of new ones and updates the new set on the server. Unlike
-             * most other methods in Room, this one sends a signal about changes
-             * immediately, not waiting for confirmation from the server
-             * (because tags are saved in account data rather than in shared
-             * room state).
-             */
-            void setTags(TagsMap newTags);
-
-            /// Check whether the list of tags has m.favourite
-            bool isFavourite() const;
-            /// Check whether the list of tags has m.lowpriority
-            bool isLowPriority() const;
-
-            /// Check whether this room is a direct chat
-            Q_INVOKABLE bool isDirectChat() const;
-
-            /// Get the list of users this room is a direct chat with
-            QList<User*> directChatUsers() const;
-
-            Q_INVOKABLE QUrl urlToThumbnail(const QString& eventId) const;
-            Q_INVOKABLE QUrl urlToDownload(const QString& eventId) const;
-            Q_INVOKABLE QString fileNameToDownload(const QString& eventId) const;
-            Q_INVOKABLE FileTransferInfo fileTransferInfo(const QString& id) const;
-            Q_INVOKABLE QUrl fileSource(const QString& id) const;
-
-            /** Pretty-prints plain text into HTML
-             * As of now, it's exactly the same as QMatrixClient::prettyPrint();
-             * in the future, it will also linkify room aliases, mxids etc.
-             * using the room context.
-             */
-            QString prettyPrint(const QString& plainText) const;
-
-            MemberSorter memberSorter() const;
-
-            Q_INVOKABLE void inviteCall(const QString& callId,
-                                        const int lifetime, const QString& sdp);
-            Q_INVOKABLE void sendCallCandidates(const QString& callId,
+        using Timeline = std::deque<TimelineItem>;
+        using PendingEvents = std::vector<PendingEventItem>;
+        using rev_iter_t = Timeline::const_reverse_iterator;
+        using timeline_iter_t = Timeline::const_iterator;
+
+        enum Change : uint {
+            NoChange = 0x0,
+            NameChange = 0x1,
+            CanonicalAliasChange = 0x2,
+            TopicChange = 0x4,
+            UnreadNotifsChange = 0x8,
+            AvatarChange = 0x10,
+            JoinStateChange = 0x20,
+            TagsChange = 0x40,
+            MembersChange = 0x80,
+            /* = 0x100, */
+            AccountDataChange = 0x200,
+            SummaryChange = 0x400,
+            ReadMarkerChange = 0x800,
+            OtherChange = 0x8000,
+            AnyChange = 0xFFFF
+        };
+        Q_DECLARE_FLAGS(Changes, Change)
+        Q_FLAG(Changes)
+
+        Room(Connection* connection, QString id, JoinState initialJoinState);
+        ~Room() override;
+
+        // Property accessors
+
+        Connection* connection() const;
+        User* localUser() const;
+        const QString& id() const;
+        QString version() const;
+        bool isUnstable() const;
+        QString predecessorId() const;
+        QString successorId() const;
+        QString name() const;
+        QStringList aliases() const;
+        QString canonicalAlias() const;
+        QString displayName() const;
+        QString topic() const;
+        QString avatarMediaId() const;
+        QUrl avatarUrl() const;
+        const Avatar& avatarObject() const;
+        Q_INVOKABLE JoinState joinState() const;
+        Q_INVOKABLE QList<User*> usersTyping() const;
+        QList<User*> membersLeft() const;
+
+        Q_INVOKABLE QList<User*> users() const;
+        QStringList memberNames() const;
+        [[deprecated(
+                "Use joinedCount(), invitedCount(), totalMemberCount()")]] int
+        memberCount() const;
+        int timelineSize() const;
+        bool usesEncryption() const;
+        int joinedCount() const;
+        int invitedCount() const;
+        int totalMemberCount() const;
+
+        GetRoomEventsJob* eventsHistoryJob() const;
+
+        /**
+         * Returns a square room avatar with the given size and requests it
+         * from the network if needed
+         * \return a pixmap with the avatar or a placeholder if there's none
+         * available yet
+         */
+        Q_INVOKABLE QImage avatar(int dimension);
+        /**
+         * Returns a room avatar with the given dimensions and requests it
+         * from the network if needed
+         * \return a pixmap with the avatar or a placeholder if there's none
+         * available yet
+         */
+        Q_INVOKABLE QImage avatar(int width, int height);
+
+        /**
+         * \brief Get a user object for a given user id
+         * This is the recommended way to get a user object in a room
+         * context. The actual object type may be changed in further
+         * versions to provide room-specific user information (display name,
+         * avatar etc.).
+         * \note The method will return a valid user regardless of
+         *       the membership.
+         */
+        Q_INVOKABLE User* user(const QString& userId) const;
+
+        /**
+         * \brief Check the join state of a given user in this room
+         *
+         * \note Banned and invited users are not tracked for now (Leave
+         *       will be returned for them).
+         *
+         * \return either of Join, Leave, depending on the given
+         *         user's state in the room
+         */
+        Q_INVOKABLE JoinState memberJoinState(User* user) const;
+
+        /**
+         * Get a disambiguated name for a given user in
+         * the context of the room
+         */
+        Q_INVOKABLE QString roomMembername(const User* u) const;
+        /**
+         * Get a disambiguated name for a user with this id in
+         * the context of the room
+         */
+        Q_INVOKABLE QString roomMembername(const QString& userId) const;
+
+        const Timeline& messageEvents() const;
+        const PendingEvents& pendingEvents() const;
+        /**
+         * A convenience method returning the read marker to the position
+         * before the "oldest" event; same as messageEvents().crend()
+         */
+        rev_iter_t historyEdge() const;
+        /**
+         * A convenience method returning the iterator beyond the latest
+         * arrived event; same as messageEvents().cend()
+         */
+        Timeline::const_iterator syncEdge() const;
+        /// \deprecated Use historyEdge instead
+        rev_iter_t timelineEdge() const;
+        Q_INVOKABLE TimelineItem::index_t minTimelineIndex() const;
+        Q_INVOKABLE TimelineItem::index_t maxTimelineIndex() const;
+        Q_INVOKABLE bool
+        isValidIndex(TimelineItem::index_t timelineIndex) const;
+
+        rev_iter_t findInTimeline(TimelineItem::index_t index) const;
+        rev_iter_t findInTimeline(const QString& evtId) const;
+        PendingEvents::iterator findPendingEvent(const QString& txnId);
+        PendingEvents::const_iterator
+        findPendingEvent(const QString& txnId) const;
+
+        bool displayed() const;
+        /// Mark the room as currently displayed to the user
+        /**
+         * Marking the room displayed causes the room to obtain the full
+         * list of members if it's been lazy-loaded before; in the future
+         * it may do more things bound to "screen time" of the room, e.g.
+         * measure that "screen time".
+         */
+        void setDisplayed(bool displayed = true);
+        QString firstDisplayedEventId() const;
+        rev_iter_t firstDisplayedMarker() const;
+        void setFirstDisplayedEventId(const QString& eventId);
+        void setFirstDisplayedEvent(TimelineItem::index_t index);
+        QString lastDisplayedEventId() const;
+        rev_iter_t lastDisplayedMarker() const;
+        void setLastDisplayedEventId(const QString& eventId);
+        void setLastDisplayedEvent(TimelineItem::index_t index);
+
+        rev_iter_t readMarker(const User* user) const;
+        rev_iter_t readMarker() const;
+        QString readMarkerEventId() const;
+        QList<User*> usersAtEventId(const QString& eventId);
+        /**
+         * \brief Mark the event with uptoEventId as read
+         *
+         * Finds in the timeline and marks as read the event with
+         * the specified id; also posts a read receipt to the server either
+         * for this message or, if it's from the local user, for
+         * the nearest non-local message before. uptoEventId must be non-empty.
+         */
+        void markMessagesAsRead(QString uptoEventId);
+
+        /// Check whether there are unread messages in the room
+        bool hasUnreadMessages() const;
+
+        /** Get the number of unread messages in the room
+         * Depending on the read marker state, this call may return either
+         * a precise or an estimate number of unread events. Only "notable"
+         * events (non-redacted message events from users other than local)
+         * are counted.
+         *
+         * In a case when readMarker() == timelineEdge() (the local read
+         * marker is beyond the local timeline) only the bottom limit of
+         * the unread messages number can be estimated (and even that may
+         * be slightly off due to, e.g., redactions of events not loaded
+         * to the local timeline).
+         *
+         * If all messages are read, this function will return -1 (_not_ 0,
+         * as zero may mean "zero or more unread messages" in a situation
+         * when the read marker is outside the local timeline.
+         */
+        int unreadCount() const;
+
+        Q_INVOKABLE int notificationCount() const;
+        Q_INVOKABLE void resetNotificationCount();
+        Q_INVOKABLE int highlightCount() const;
+        Q_INVOKABLE void resetHighlightCount();
+
+        /** Check whether the room has account data of the given type
+         * Tags and read markers are not supported by this method _yet_.
+         */
+        bool hasAccountData(const QString& type) const;
+
+        /** Get a generic account data event of the given type
+         * This returns a generic hashmap for any room account data event
+         * stored on the server. Tags and read markers cannot be retrieved
+         * using this method _yet_.
+         */
+        const EventPtr& accountData(const QString& type) const;
+
+        QStringList tagNames() const;
+        TagsMap tags() const;
+        TagRecord tag(const QString& name) const;
+
+        /** Add a new tag to this room
+         * If this room already has this tag, nothing happens. If it's a new
+         * tag for the room, the respective tag record is added to the set
+         * of tags and the new set is sent to the server to update other
+         * clients.
+         */
+        void addTag(const QString& name, const TagRecord& record = {});
+        Q_INVOKABLE void addTag(const QString& name, float order);
+
+        /// Remove a tag from the room
+        Q_INVOKABLE void removeTag(const QString& name);
+
+        /** Overwrite the room's tags
+         * This completely replaces the existing room's tags with a set
+         * of new ones and updates the new set on the server. Unlike
+         * most other methods in Room, this one sends a signal about changes
+         * immediately, not waiting for confirmation from the server
+         * (because tags are saved in account data rather than in shared
+         * room state).
+         */
+        void setTags(TagsMap newTags);
+
+        /// Check whether the list of tags has m.favourite
+        bool isFavourite() const;
+        /// Check whether the list of tags has m.lowpriority
+        bool isLowPriority() const;
+
+        /// Check whether this room is a direct chat
+        Q_INVOKABLE bool isDirectChat() const;
+
+        /// Get the list of users this room is a direct chat with
+        QList<User*> directChatUsers() const;
+
+        Q_INVOKABLE QUrl urlToThumbnail(const QString& eventId) const;
+        Q_INVOKABLE QUrl urlToDownload(const QString& eventId) const;
+        Q_INVOKABLE QString fileNameToDownload(const QString& eventId) const;
+        Q_INVOKABLE FileTransferInfo fileTransferInfo(const QString& id) const;
+        Q_INVOKABLE QUrl fileSource(const QString& id) const;
+
+        /** Pretty-prints plain text into HTML
+         * As of now, it's exactly the same as QMatrixClient::prettyPrint();
+         * in the future, it will also linkify room aliases, mxids etc.
+         * using the room context.
+         */
+        QString prettyPrint(const QString& plainText) const;
+
+        MemberSorter memberSorter() const;
+
+        Q_INVOKABLE void inviteCall(const QString& callId, const int lifetime,
+                                    const QString& sdp);
+        Q_INVOKABLE void sendCallCandidates(const QString& callId,
                                             const QJsonArray& candidates);
-            Q_INVOKABLE void answerCall(const QString& callId, const int lifetime,
-                                        const QString& sdp);
-            Q_INVOKABLE void answerCall(const QString& callId,
-                                        const QString& sdp);
-            Q_INVOKABLE void hangupCall(const QString& callId);
-            Q_INVOKABLE bool supportsCalls() const;
+        Q_INVOKABLE void answerCall(const QString& callId, const int lifetime,
+                                    const QString& sdp);
+        Q_INVOKABLE void answerCall(const QString& callId, const QString& sdp);
+        Q_INVOKABLE void hangupCall(const QString& callId);
+        Q_INVOKABLE bool supportsCalls() const;
 
         public slots:
-            /** Check whether the room should be upgraded */
-            void checkVersion();
-
-            QString postMessage(const QString& plainText, MessageEventType type);
-            QString postPlainText(const QString& plainText);
-            QString postHtmlMessage(const QString& plainText,
-                        const QString& html,
-                        MessageEventType type = MessageEventType::Text);
-            QString postHtmlText(const QString& plainText, const QString& html);
-            QString postFile(const QString& plainText, const QUrl& localPath,
-                             bool asGenericFile = false);
-            /** Post a pre-created room message event
-             *
-             * Takes ownership of the event, deleting it once the matching one
-             * arrives with the sync
-             * \return transaction id associated with the event.
-             */
-            QString postEvent(RoomEvent* event);
-            QString postJson(const QString& matrixType,
-                             const QJsonObject& eventContent);
-            QString retryMessage(const QString& txnId);
-            void discardMessage(const QString& txnId);
-            void setName(const QString& newName);
-            void setCanonicalAlias(const QString& newAlias);
-            void setAliases(const QStringList& aliases);
-            void setTopic(const QString& newTopic);
-
-            void getPreviousContent(int limit = 10);
-
-            void inviteToRoom(const QString& memberId);
-            LeaveRoomJob* leaveRoom();
-            SetRoomStateWithKeyJob* setMemberState(
-                    const QString& memberId, const RoomMemberEvent& event) const;
-            void kickMember(const QString& memberId, const QString& reason = {});
-            void ban(const QString& userId, const QString& reason = {});
-            void unban(const QString& userId);
-            void redactEvent(const QString& eventId,
-                             const QString& reason = {});
-
-            void uploadFile(const QString& id, const QUrl& localFilename,
-                            const QString& overrideContentType = {});
-            // If localFilename is empty a temporary file is created
-            void downloadFile(const QString& eventId,
-                              const QUrl& localFilename = {});
-            void cancelFileTransfer(const QString& id);
-
-            /// Mark all messages in the room as read
-            void markAllMessagesAsRead();
-
-            /// Whether the current user is allowed to upgrade the room
-            bool canSwitchVersions() const;
-
-            /// Switch the room's version (aka upgrade)
-            void switchVersion(QString newVersion);
+        /** Check whether the room should be upgraded */
+        void checkVersion();
+
+        QString postMessage(const QString& plainText, MessageEventType type);
+        QString postPlainText(const QString& plainText);
+        QString postHtmlMessage(const QString& plainText, const QString& html,
+                                MessageEventType type = MessageEventType::Text);
+        QString postHtmlText(const QString& plainText, const QString& html);
+        QString postFile(const QString& plainText, const QUrl& localPath,
+                         bool asGenericFile = false);
+        /** Post a pre-created room message event
+         *
+         * Takes ownership of the event, deleting it once the matching one
+         * arrives with the sync
+         * \return transaction id associated with the event.
+         */
+        QString postEvent(RoomEvent* event);
+        QString postJson(const QString& matrixType,
+                         const QJsonObject& eventContent);
+        QString retryMessage(const QString& txnId);
+        void discardMessage(const QString& txnId);
+        void setName(const QString& newName);
+        void setCanonicalAlias(const QString& newAlias);
+        void setAliases(const QStringList& aliases);
+        void setTopic(const QString& newTopic);
+
+        void getPreviousContent(int limit = 10);
+
+        void inviteToRoom(const QString& memberId);
+        LeaveRoomJob* leaveRoom();
+        SetRoomStateWithKeyJob*
+        setMemberState(const QString& memberId,
+                       const RoomMemberEvent& event) const;
+        void kickMember(const QString& memberId, const QString& reason = {});
+        void ban(const QString& userId, const QString& reason = {});
+        void unban(const QString& userId);
+        void redactEvent(const QString& eventId, const QString& reason = {});
+
+        void uploadFile(const QString& id, const QUrl& localFilename,
+                        const QString& overrideContentType = {});
+        // If localFilename is empty a temporary file is created
+        void downloadFile(const QString& eventId,
+                          const QUrl& localFilename = {});
+        void cancelFileTransfer(const QString& id);
+
+        /// Mark all messages in the room as read
+        void markAllMessagesAsRead();
+
+        /// Whether the current user is allowed to upgrade the room
+        bool canSwitchVersions() const;
+
+        /// Switch the room's version (aka upgrade)
+        void switchVersion(QString newVersion);
 
         signals:
-            /// Initial set of state events has been loaded
-            /**
-             * The initial set is what comes from the initial sync for the room.
-             * This includes all basic things like RoomCreateEvent,
-             * RoomNameEvent, a (lazy-loaded, not full) set of RoomMemberEvents
-             * etc. This is a per-room reflection of Connection::loadedRoomState
-             * \sa Connection::loadedRoomState
-             */
-            void baseStateLoaded();
-            void eventsHistoryJobChanged();
-            void aboutToAddHistoricalMessages(RoomEventsRange events);
-            void aboutToAddNewMessages(RoomEventsRange events);
-            void addedMessages(int fromIndex, int toIndex);
-            /// The event is about to be appended to the list of pending events
-            void pendingEventAboutToAdd(RoomEvent* event);
-            /// An event has been appended to the list of pending events
-            void pendingEventAdded();
-            /// The remote echo has arrived with the sync and will be merged
-            /// with its local counterpart
-            /** NB: Requires a sync loop to be emitted */
-            void pendingEventAboutToMerge(RoomEvent* serverEvent,
-                                          int pendingEventIndex);
-            /// The remote and local copies of the event have been merged
-            /** NB: Requires a sync loop to be emitted */
-            void pendingEventMerged();
-            /// An event will be removed from the list of pending events
-            void pendingEventAboutToDiscard(int pendingEventIndex);
-            /// An event has just been removed from the list of pending events
-            void pendingEventDiscarded();
-            /// The status of a pending event has changed
-            /** \sa PendingEventItem::deliveryStatus */
-            void pendingEventChanged(int pendingEventIndex);
-            /// The server accepted the message
-            /** This is emitted when an event sending request has successfully
-             * completed. This does not mean that the event is already in the
-             * local timeline, only that the server has accepted it.
-             * \param txnId transaction id assigned by the client during sending
-             * \param eventId event id assigned by the server upon acceptance
-             * \sa postEvent, postPlainText, postMessage, postHtmlMessage
-             * \sa pendingEventMerged, aboutToAddNewMessages
-             */
-            void messageSent(QString txnId, QString eventId);
-
-            /** A common signal for various kinds of changes in the room
-             * Aside from all changes in the room state
-             * @param changes a set of flags describing what changes occured
-             *                upon the last sync
-             * \sa StateChange
-             */
-            void changed(Changes changes);
-            /**
-             * \brief The room name, the canonical alias or other aliases changed
-             *
-             * Not triggered when displayname changes.
-             */
-            void namesChanged(Room* room);
-            void displaynameAboutToChange(Room* room);
-            void displaynameChanged(Room* room, QString oldName);
-            void topicChanged();
-            void avatarChanged();
-            void userAdded(User* user);
-            void userRemoved(User* user);
-            void memberAboutToRename(User* user, QString newName);
-            void memberRenamed(User* user);
-            /// The list of members has changed
-            /** Emitted no more than once per sync, this is a good signal to
-             * for cases when some action should be done upon any change in
-             * the member list. If you need per-item granularity you should use
-             * userAdded, userRemoved and memberAboutToRename / memberRenamed
-             * instead.
-             */
-            void memberListChanged();
-            /// The previously lazy-loaded members list is now loaded entirely
-            /// \sa setDisplayed
-            void allMembersLoaded();
-            void encryption();
-
-            void joinStateChanged(JoinState oldState, JoinState newState);
-            void typingChanged();
-
-            void highlightCountChanged(Room* room);
-            void notificationCountChanged(Room* room);
-
-            void displayedChanged(bool displayed);
-            void firstDisplayedEventChanged();
-            void lastDisplayedEventChanged();
-            void lastReadEventChanged(User* user);
-            void readMarkerMoved(QString fromEventId, QString toEventId);
-            void readMarkerForUserMoved(User* user, QString fromEventId, QString toEventId);
-            void unreadMessagesChanged(Room* room);
-
-            void accountDataAboutToChange(QString type);
-            void accountDataChanged(QString type);
-            void tagsAboutToChange();
-            void tagsChanged();
-
-            void replacedEvent(const RoomEvent* newEvent,
-                               const RoomEvent* oldEvent);
-
-            void newFileTransfer(QString id, QUrl localFile);
-            void fileTransferProgress(QString id, qint64 progress, qint64 total);
-            void fileTransferCompleted(QString id, QUrl localFile, QUrl mxcUrl);
-            void fileTransferFailed(QString id, QString errorMessage = {});
-            void fileTransferCancelled(QString id);
-
-            void callEvent(Room* room, const RoomEvent* event);
-
-            /// The room's version stability may have changed
-            void stabilityUpdated(QString recommendedDefault,
-                                  QStringList stableVersions);
-            /// This room has been upgraded and won't receive updates anymore
-            void upgraded(QString serverMessage, Room* successor);
-            /// An attempted room upgrade has failed
-            void upgradeFailed(QString errorMessage);
-
-            /// The room is about to be deleted
-            void beforeDestruction(Room*);
+        /// Initial set of state events has been loaded
+        /**
+         * The initial set is what comes from the initial sync for the room.
+         * This includes all basic things like RoomCreateEvent,
+         * RoomNameEvent, a (lazy-loaded, not full) set of RoomMemberEvents
+         * etc. This is a per-room reflection of Connection::loadedRoomState
+         * \sa Connection::loadedRoomState
+         */
+        void baseStateLoaded();
+        void eventsHistoryJobChanged();
+        void aboutToAddHistoricalMessages(RoomEventsRange events);
+        void aboutToAddNewMessages(RoomEventsRange events);
+        void addedMessages(int fromIndex, int toIndex);
+        /// The event is about to be appended to the list of pending events
+        void pendingEventAboutToAdd(RoomEvent* event);
+        /// An event has been appended to the list of pending events
+        void pendingEventAdded();
+        /// The remote echo has arrived with the sync and will be merged
+        /// with its local counterpart
+        /** NB: Requires a sync loop to be emitted */
+        void pendingEventAboutToMerge(RoomEvent* serverEvent,
+                                      int pendingEventIndex);
+        /// The remote and local copies of the event have been merged
+        /** NB: Requires a sync loop to be emitted */
+        void pendingEventMerged();
+        /// An event will be removed from the list of pending events
+        void pendingEventAboutToDiscard(int pendingEventIndex);
+        /// An event has just been removed from the list of pending events
+        void pendingEventDiscarded();
+        /// The status of a pending event has changed
+        /** \sa PendingEventItem::deliveryStatus */
+        void pendingEventChanged(int pendingEventIndex);
+        /// The server accepted the message
+        /** This is emitted when an event sending request has successfully
+         * completed. This does not mean that the event is already in the
+         * local timeline, only that the server has accepted it.
+         * \param txnId transaction id assigned by the client during sending
+         * \param eventId event id assigned by the server upon acceptance
+         * \sa postEvent, postPlainText, postMessage, postHtmlMessage
+         * \sa pendingEventMerged, aboutToAddNewMessages
+         */
+        void messageSent(QString txnId, QString eventId);
+
+        /** A common signal for various kinds of changes in the room
+         * Aside from all changes in the room state
+         * @param changes a set of flags describing what changes occured
+         *                upon the last sync
+         * \sa StateChange
+         */
+        void changed(Changes changes);
+        /**
+         * \brief The room name, the canonical alias or other aliases changed
+         *
+         * Not triggered when displayname changes.
+         */
+        void namesChanged(Room* room);
+        void displaynameAboutToChange(Room* room);
+        void displaynameChanged(Room* room, QString oldName);
+        void topicChanged();
+        void avatarChanged();
+        void userAdded(User* user);
+        void userRemoved(User* user);
+        void memberAboutToRename(User* user, QString newName);
+        void memberRenamed(User* user);
+        /// The list of members has changed
+        /** Emitted no more than once per sync, this is a good signal to
+         * for cases when some action should be done upon any change in
+         * the member list. If you need per-item granularity you should use
+         * userAdded, userRemoved and memberAboutToRename / memberRenamed
+         * instead.
+         */
+        void memberListChanged();
+        /// The previously lazy-loaded members list is now loaded entirely
+        /// \sa setDisplayed
+        void allMembersLoaded();
+        void encryption();
+
+        void joinStateChanged(JoinState oldState, JoinState newState);
+        void typingChanged();
+
+        void highlightCountChanged(Room* room);
+        void notificationCountChanged(Room* room);
+
+        void displayedChanged(bool displayed);
+        void firstDisplayedEventChanged();
+        void lastDisplayedEventChanged();
+        void lastReadEventChanged(User* user);
+        void readMarkerMoved(QString fromEventId, QString toEventId);
+        void readMarkerForUserMoved(User* user, QString fromEventId,
+                                    QString toEventId);
+        void unreadMessagesChanged(Room* room);
+
+        void accountDataAboutToChange(QString type);
+        void accountDataChanged(QString type);
+        void tagsAboutToChange();
+        void tagsChanged();
+
+        void replacedEvent(const RoomEvent* newEvent,
+                           const RoomEvent* oldEvent);
+
+        void newFileTransfer(QString id, QUrl localFile);
+        void fileTransferProgress(QString id, qint64 progress, qint64 total);
+        void fileTransferCompleted(QString id, QUrl localFile, QUrl mxcUrl);
+        void fileTransferFailed(QString id, QString errorMessage = {});
+        void fileTransferCancelled(QString id);
+
+        void callEvent(Room* room, const RoomEvent* event);
+
+        /// The room's version stability may have changed
+        void stabilityUpdated(QString recommendedDefault,
+                              QStringList stableVersions);
+        /// This room has been upgraded and won't receive updates anymore
+        void upgraded(QString serverMessage, Room* successor);
+        /// An attempted room upgrade has failed
+        void upgradeFailed(QString errorMessage);
+
+        /// The room is about to be deleted
+        void beforeDestruction(Room*);
 
         protected:
-            /// Returns true if any of room names/aliases has changed
-            virtual Changes processStateEvent(const RoomEvent& e);
-            virtual Changes processEphemeralEvent(EventPtr&& event);
-            virtual Changes processAccountDataEvent(EventPtr&& event);
-            virtual void onAddNewTimelineEvents(timeline_iter_t /*from*/) { }
-            virtual void onAddHistoricalTimelineEvents(rev_iter_t /*from*/) { }
-            virtual void onRedaction(const RoomEvent& /*prevEvent*/,
-                                     const RoomEvent& /*after*/) { }
-            virtual QJsonObject toJson() const;
-            virtual void updateData(SyncRoomData&& data, bool fromCache = false);
+        /// Returns true if any of room names/aliases has changed
+        virtual Changes processStateEvent(const RoomEvent& e);
+        virtual Changes processEphemeralEvent(EventPtr&& event);
+        virtual Changes processAccountDataEvent(EventPtr&& event);
+        virtual void onAddNewTimelineEvents(timeline_iter_t /*from*/) {}
+        virtual void onAddHistoricalTimelineEvents(rev_iter_t /*from*/) {}
+        virtual void onRedaction(const RoomEvent& /*prevEvent*/,
+                                 const RoomEvent& /*after*/)
+        {
+        }
+        virtual QJsonObject toJson() const;
+        virtual void updateData(SyncRoomData&& data, bool fromCache = false);
 
         private:
-            friend class Connection;
+        friend class Connection;
 
-            class Private;
-            Private* d;
+        class Private;
+        Private* d;
 
-            // This is called from Connection, reflecting a state change that
-            // arrived from the server. Clients should use
-            // Connection::joinRoom() and Room::leaveRoom() to change the state.
-            void setJoinState(JoinState state);
+        // This is called from Connection, reflecting a state change that
+        // arrived from the server. Clients should use
+        // Connection::joinRoom() and Room::leaveRoom() to change the state.
+        void setJoinState(JoinState state);
     };
 
     class MemberSorter
     {
         public:
-            explicit MemberSorter(const Room* r) : room(r) { }
+        explicit MemberSorter(const Room* r) : room(r) {}
 
-            bool operator()(User* u1, User* u2) const;
-            bool operator()(User* u1, const QString& u2name) const;
+        bool operator()(User* u1, User* u2) const;
+        bool operator()(User* u1, const QString& u2name) const;
 
-            template <typename ContT, typename ValT>
-            typename ContT::size_type lowerBoundIndex(const ContT& c,
-                                                      const ValT& v) const
-            {
-                return std::lower_bound(c.begin(), c.end(), v, *this) - c.begin();
-            }
+        template <typename ContT, typename ValT>
+        typename ContT::size_type lowerBoundIndex(const ContT& c,
+                                                  const ValT& v) const
+        {
+            return std::lower_bound(c.begin(), c.end(), v, *this) - c.begin();
+        }
 
         private:
-            const Room* room;
+        const Room* room;
     };
-}  // namespace QMatrixClient
+} // namespace QMatrixClient
 Q_DECLARE_METATYPE(QMatrixClient::FileTransferInfo)
 Q_DECLARE_OPERATORS_FOR_FLAGS(QMatrixClient::Room::Changes)
diff --git a/lib/settings.cpp b/lib/settings.cpp
index 852e19cb..e0a1783f 100644
--- a/lib/settings.cpp
+++ b/lib/settings.cpp
@@ -18,7 +18,7 @@ void Settings::setLegacyNames(const QString& organizationName,
 
 void Settings::setValue(const QString& key, const QVariant& value)
 {
-//    qCDebug() << "Setting" << key << "to" << value;
+    //    qCDebug() << "Setting" << key << "to" << value;
     QSettings::setValue(key, value);
     if (legacySettings.contains(key))
         legacySettings.remove(key);
@@ -32,7 +32,8 @@ QVariant Settings::value(const QString& key, const QVariant& defaultValue) const
     // (QVariant("false") == true in JavaScript). Since we have a mixed
     // environment where both QSettings and Qt.labs.Settings may potentially
     // work with same settings, better ensure compatibility.
-    return value.toString() == QStringLiteral("false") ? QVariant(false) : value;
+    return value.toString() == QStringLiteral("false") ? QVariant(false)
+                                                       : value;
 }
 
 bool Settings::contains(const QString& key) const
@@ -56,15 +57,13 @@ bool SettingsGroup::contains(const QString& key) const
     return Settings::contains(groupPath + '/' + key);
 }
 
-QVariant SettingsGroup::value(const QString& key, const QVariant& defaultValue) const
+QVariant SettingsGroup::value(const QString& key,
+                              const QVariant& defaultValue) const
 {
     return Settings::value(groupPath + '/' + key, defaultValue);
 }
 
-QString SettingsGroup::group() const
-{
-    return groupPath;
-}
+QString SettingsGroup::group() const { return groupPath; }
 
 QStringList SettingsGroup::childGroups() const
 {
@@ -84,9 +83,12 @@ void SettingsGroup::remove(const QString& key)
     Settings::remove(fullKey);
 }
 
-QMC_DEFINE_SETTING(AccountSettings, QString, deviceId, "device_id", "", setDeviceId)
-QMC_DEFINE_SETTING(AccountSettings, QString, deviceName, "device_name", "", setDeviceName)
-QMC_DEFINE_SETTING(AccountSettings, bool, keepLoggedIn, "keep_logged_in", false, setKeepLoggedIn)
+QMC_DEFINE_SETTING(AccountSettings, QString, deviceId, "device_id", "",
+                   setDeviceId)
+QMC_DEFINE_SETTING(AccountSettings, QString, deviceName, "device_name", "",
+                   setDeviceName)
+QMC_DEFINE_SETTING(AccountSettings, bool, keepLoggedIn, "keep_logged_in", false,
+                   setKeepLoggedIn)
 
 QUrl AccountSettings::homeserver() const
 {
@@ -98,10 +100,7 @@ void AccountSettings::setHomeserver(const QUrl& url)
     setValue("homeserver", url.toString());
 }
 
-QString AccountSettings::userId() const
-{
-    return group().section('/', -1);
-}
+QString AccountSettings::userId() const { return group().section('/', -1); }
 
 QString AccountSettings::accessToken() const
 {
diff --git a/lib/settings.h b/lib/settings.h
index 0b3ecaff..0cde47a3 100644
--- a/lib/settings.h
+++ b/lib/settings.h
@@ -13,140 +13,142 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
 #include <QtCore/QSettings>
-#include <QtCore/QVector>
 #include <QtCore/QUrl>
+#include <QtCore/QVector>
 
 class QVariant;
 
-namespace QMatrixClient
-{
-    class Settings: public QSettings
+namespace QMatrixClient {
+    class Settings : public QSettings
     {
-            Q_OBJECT
+        Q_OBJECT
         public:
-            /**
-             * Use this function before creating any Settings objects in order
-             * to setup a read-only location where configuration has previously
-             * been stored. This will provide an additional fallback in case of
-             * renaming the organisation/application.
-             */
-            static void setLegacyNames(const QString& organizationName,
-                                       const QString& applicationName = {});
+        /**
+         * Use this function before creating any Settings objects in order
+         * to setup a read-only location where configuration has previously
+         * been stored. This will provide an additional fallback in case of
+         * renaming the organisation/application.
+         */
+        static void setLegacyNames(const QString& organizationName,
+                                   const QString& applicationName = {});
 
 #if defined(_MSC_VER) && _MSC_VER < 1900
-            // VS 2013 (and probably older) aren't friends with 'using' statements
-            // that involve private constructors
-            explicit Settings(QObject* parent = 0) : QSettings(parent) { }
+        // VS 2013 (and probably older) aren't friends with 'using' statements
+        // that involve private constructors
+        explicit Settings(QObject* parent = 0) : QSettings(parent) {}
 #else
-            using QSettings::QSettings;
+        using QSettings::QSettings;
 #endif
 
-            Q_INVOKABLE void setValue(const QString &key,
-                                      const QVariant &value);
-            Q_INVOKABLE QVariant value(const QString &key,
-                                       const QVariant &defaultValue = {}) const;
+        Q_INVOKABLE void setValue(const QString& key, const QVariant& value);
+        Q_INVOKABLE QVariant value(const QString& key,
+                                   const QVariant& defaultValue = {}) const;
 
-            template <typename T>
-            T get(const QString& key, const T& defaultValue = {}) const
-            {
-                const auto qv = value(key, QVariant());
-                return qv.isValid() && qv.canConvert<T>() ? qv.value<T>()
-                                                          : defaultValue;
-            }
+        template <typename T>
+        T get(const QString& key, const T& defaultValue = {}) const
+        {
+            const auto qv = value(key, QVariant());
+            return qv.isValid() && qv.canConvert<T>() ? qv.value<T>()
+                                                      : defaultValue;
+        }
 
-            Q_INVOKABLE bool contains(const QString& key) const;
-            Q_INVOKABLE QStringList childGroups() const;
+        Q_INVOKABLE bool contains(const QString& key) const;
+        Q_INVOKABLE QStringList childGroups() const;
 
         private:
-            static QString legacyOrganizationName;
-            static QString legacyApplicationName;
+        static QString legacyOrganizationName;
+        static QString legacyApplicationName;
 
         protected:
-            QSettings legacySettings { legacyOrganizationName,
-                                       legacyApplicationName };
+        QSettings legacySettings { legacyOrganizationName,
+                                   legacyApplicationName };
     };
 
-    class SettingsGroup: public Settings
+    class SettingsGroup : public Settings
     {
         public:
-            template <typename... ArgTs>
-            explicit SettingsGroup(QString path, ArgTs&&... qsettingsArgs)
-                : Settings(std::forward<ArgTs>(qsettingsArgs)...)
-                , groupPath(std::move(path))
-            { }
-
-            Q_INVOKABLE bool contains(const QString& key) const;
-            Q_INVOKABLE QVariant value(const QString &key,
-                                       const QVariant &defaultValue = {}) const;
-
-            template <typename T>
-            T get(const QString& key, const T& defaultValue = {}) const
-            {
-                const auto qv = value(key, QVariant());
-                return qv.isValid() && qv.canConvert<T>() ? qv.value<T>()
-                                                          : defaultValue;
-            }
-
-            Q_INVOKABLE QString group() const;
-            Q_INVOKABLE QStringList childGroups() const;
-            Q_INVOKABLE void setValue(const QString &key,
-                                      const QVariant &value);
-
-            Q_INVOKABLE void remove(const QString& key);
+        template <typename... ArgTs>
+        explicit SettingsGroup(QString path, ArgTs&&... qsettingsArgs)
+            : Settings(std::forward<ArgTs>(qsettingsArgs)...),
+              groupPath(std::move(path))
+        {
+        }
+
+        Q_INVOKABLE bool contains(const QString& key) const;
+        Q_INVOKABLE QVariant value(const QString& key,
+                                   const QVariant& defaultValue = {}) const;
+
+        template <typename T>
+        T get(const QString& key, const T& defaultValue = {}) const
+        {
+            const auto qv = value(key, QVariant());
+            return qv.isValid() && qv.canConvert<T>() ? qv.value<T>()
+                                                      : defaultValue;
+        }
+
+        Q_INVOKABLE QString group() const;
+        Q_INVOKABLE QStringList childGroups() const;
+        Q_INVOKABLE void setValue(const QString& key, const QVariant& value);
+
+        Q_INVOKABLE void remove(const QString& key);
 
         private:
-            QString groupPath;
+        QString groupPath;
     };
 
-#define QMC_DECLARE_SETTING(type, propname, setter) \
-        Q_PROPERTY(type propname READ propname WRITE setter) \
-    public: \
-        type propname() const; \
-        void setter(type newValue); \
+#define QMC_DECLARE_SETTING(type, propname, setter)                            \
+    Q_PROPERTY(type propname READ propname WRITE setter)                       \
+    public:                                                                    \
+    type propname() const;                                                     \
+    void setter(type newValue);                                                \
+                                                                               \
     private:
 
-#define QMC_DEFINE_SETTING(classname, type, propname, qsettingname, defaultValue, setter) \
-type classname::propname() const \
-{ \
-    return get<type>(QStringLiteral(qsettingname), defaultValue); \
-} \
-\
-void classname::setter(type newValue) \
-{ \
-    setValue(QStringLiteral(qsettingname), newValue); \
-} \
-
-    class AccountSettings: public SettingsGroup
+#define QMC_DEFINE_SETTING(classname, type, propname, qsettingname,            \
+                           defaultValue, setter)                               \
+    type classname::propname() const                                           \
+    {                                                                          \
+        return get<type>(QStringLiteral(qsettingname), defaultValue);          \
+    }                                                                          \
+                                                                               \
+    void classname::setter(type newValue)                                      \
+    {                                                                          \
+        setValue(QStringLiteral(qsettingname), newValue);                      \
+    }
+
+    class AccountSettings : public SettingsGroup
     {
-            Q_OBJECT
-            Q_PROPERTY(QString userId READ userId CONSTANT)
-            QMC_DECLARE_SETTING(QString, deviceId, setDeviceId)
-            QMC_DECLARE_SETTING(QString, deviceName, setDeviceName)
-            QMC_DECLARE_SETTING(bool, keepLoggedIn, setKeepLoggedIn)
-            /** \deprecated \sa setAccessToken */
-            Q_PROPERTY(QString accessToken READ accessToken WRITE setAccessToken)
+        Q_OBJECT
+        Q_PROPERTY(QString userId READ userId CONSTANT)
+        QMC_DECLARE_SETTING(QString, deviceId, setDeviceId)
+        QMC_DECLARE_SETTING(QString, deviceName, setDeviceName)
+        QMC_DECLARE_SETTING(bool, keepLoggedIn, setKeepLoggedIn)
+        /** \deprecated \sa setAccessToken */
+        Q_PROPERTY(QString accessToken READ accessToken WRITE setAccessToken)
         public:
-            template <typename... ArgTs>
-            explicit AccountSettings(const QString& accountId, ArgTs... qsettingsArgs)
-                : SettingsGroup("Accounts/" + accountId, qsettingsArgs...)
-            { }
-
-            QString userId() const;
-
-            QUrl homeserver() const;
-            void setHomeserver(const QUrl& url);
-
-            /** \deprecated \sa setToken */
-            QString accessToken() const;
-            /** \deprecated Storing accessToken in QSettings is unsafe,
-             * see QMatrixClient/Quaternion#181 */
-            void setAccessToken(const QString& accessToken);
-            Q_INVOKABLE void clearAccessToken();
+        template <typename... ArgTs>
+        explicit AccountSettings(const QString& accountId,
+                                 ArgTs... qsettingsArgs)
+            : SettingsGroup("Accounts/" + accountId, qsettingsArgs...)
+        {
+        }
+
+        QString userId() const;
+
+        QUrl homeserver() const;
+        void setHomeserver(const QUrl& url);
+
+        /** \deprecated \sa setToken */
+        QString accessToken() const;
+        /** \deprecated Storing accessToken in QSettings is unsafe,
+         * see QMatrixClient/Quaternion#181 */
+        void setAccessToken(const QString& accessToken);
+        Q_INVOKABLE void clearAccessToken();
     };
-}  // namespace QMatrixClient
+} // namespace QMatrixClient
diff --git a/lib/syncdata.cpp b/lib/syncdata.cpp
index f55d4396..d8fb7bb6 100644
--- a/lib/syncdata.cpp
+++ b/lib/syncdata.cpp
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "syncdata.h"
@@ -30,17 +30,16 @@ const QString SyncRoomData::UnreadCountKey =
 
 bool RoomSummary::isEmpty() const
 {
-    return joinedMemberCount.omitted() && invitedMemberCount.omitted() &&
-            heroes.omitted();
+    return joinedMemberCount.omitted() && invitedMemberCount.omitted()
+            && heroes.omitted();
 }
 
 bool RoomSummary::merge(const RoomSummary& other)
 {
     // Using bitwise OR to prevent computation shortcut.
-    return
-        joinedMemberCount.merge(other.joinedMemberCount) |
-        invitedMemberCount.merge(other.invitedMemberCount) |
-        heroes.merge(other.heroes);
+    return joinedMemberCount.merge(other.joinedMemberCount)
+            | invitedMemberCount.merge(other.invitedMemberCount)
+            | heroes.merge(other.heroes);
 }
 
 QDebug QMatrixClient::operator<<(QDebug dbg, const RoomSummary& rs)
@@ -78,32 +77,33 @@ void JsonObjectConverter<RoomSummary>::fillFrom(const QJsonObject& jo,
 template <typename EventsArrayT, typename StrT>
 inline EventsArrayT load(const QJsonObject& batches, StrT keyName)
 {
-    return fromJson<EventsArrayT>(batches[keyName].toObject().value("events"_ls));
+    return fromJson<EventsArrayT>(
+            batches[keyName].toObject().value("events"_ls));
 }
 
 SyncRoomData::SyncRoomData(const QString& roomId_, JoinState joinState_,
                            const QJsonObject& room_)
-    : roomId(roomId_)
-    , joinState(joinState_)
-    , summary(fromJson<RoomSummary>(room_["summary"]))
-    , state(load<StateEvents>(room_, joinState == JoinState::Invite
-                                     ? "invite_state"_ls : "state"_ls))
+    : roomId(roomId_),
+      joinState(joinState_),
+      summary(fromJson<RoomSummary>(room_["summary"])),
+      state(load<StateEvents>(room_,
+                              joinState == JoinState::Invite ? "invite_state"_ls
+                                                             : "state"_ls))
 {
     switch (joinState) {
-        case JoinState::Join:
-            ephemeral = load<Events>(room_, "ephemeral"_ls);
-            FALLTHROUGH;
-        case JoinState::Leave:
-        {
-            accountData = load<Events>(room_, "account_data"_ls);
-            timeline = load<RoomEvents>(room_, "timeline"_ls);
-            const auto timelineJson = room_.value("timeline"_ls).toObject();
-            timelineLimited = timelineJson.value("limited"_ls).toBool();
-            timelinePrevBatch = timelineJson.value("prev_batch"_ls).toString();
-
-            break;
-        }
-        default: /* nothing on top of state */;
+    case JoinState::Join:
+        ephemeral = load<Events>(room_, "ephemeral"_ls);
+        FALLTHROUGH;
+    case JoinState::Leave: {
+        accountData = load<Events>(room_, "account_data"_ls);
+        timeline = load<RoomEvents>(room_, "timeline"_ls);
+        const auto timelineJson = room_.value("timeline"_ls).toObject();
+        timelineLimited = timelineJson.value("limited"_ls).toBool();
+        timelinePrevBatch = timelineJson.value("prev_batch"_ls).toString();
+
+        break;
+    }
+    default: /* nothing on top of state */;
     }
 
     const auto unreadJson = room_.value("unread_notifications"_ls).toObject();
@@ -121,20 +121,17 @@ SyncData::SyncData(const QString& cacheFileName)
     QFileInfo cacheFileInfo { cacheFileName };
     auto json = loadJson(cacheFileName);
     auto requiredVersion = std::get<0>(cacheVersion());
-    auto actualVersion = json.value("cache_version").toObject()
-                             .value("major").toInt();
+    auto actualVersion =
+            json.value("cache_version").toObject().value("major").toInt();
     if (actualVersion == requiredVersion)
         parseJson(json, cacheFileInfo.absolutePath() + '/');
     else
-        qCWarning(MAIN)
-            << "Major version of the cache file is" << actualVersion << "but"
-            << requiredVersion << "is required; discarding the cache";
+        qCWarning(MAIN) << "Major version of the cache file is" << actualVersion
+                        << "but" << requiredVersion
+                        << "is required; discarding the cache";
 }
 
-SyncDataList&& SyncData::takeRoomData()
-{
-    return move(roomData);
-}
+SyncDataList&& SyncData::takeRoomData() { return move(roomData); }
 
 QString SyncData::fileNameForRoom(QString roomId)
 {
@@ -142,31 +139,20 @@ QString SyncData::fileNameForRoom(QString roomId)
     return roomId + ".json";
 }
 
-Events&& SyncData::takePresenceData()
-{
-    return std::move(presenceData);
-}
+Events&& SyncData::takePresenceData() { return std::move(presenceData); }
 
-Events&& SyncData::takeAccountData()
-{
-    return std::move(accountData);
-}
+Events&& SyncData::takeAccountData() { return std::move(accountData); }
 
-Events&& SyncData::takeToDeviceEvents()
-{
-    return std::move(toDeviceEvents);
-}
+Events&& SyncData::takeToDeviceEvents() { return std::move(toDeviceEvents); }
 
 QJsonObject SyncData::loadJson(const QString& fileName)
 {
     QFile roomFile { fileName };
-    if (!roomFile.exists())
-    {
+    if (!roomFile.exists()) {
         qCWarning(MAIN) << "No state cache file" << fileName;
         return {};
     }
-    if(!roomFile.open(QIODevice::ReadOnly))
-    {
+    if (!roomFile.open(QIODevice::ReadOnly)) {
         qCWarning(MAIN) << "Failed to open state cache file"
                         << roomFile.fileName();
         return {};
@@ -174,10 +160,10 @@ QJsonObject SyncData::loadJson(const QString& fileName)
     auto data = roomFile.readAll();
 
     const auto json =
-        (data.startsWith('{') ? QJsonDocument::fromJson(data)
-                              : QJsonDocument::fromBinaryData(data)).object();
-    if (json.isEmpty())
-    {
+            (data.startsWith('{') ? QJsonDocument::fromJson(data)
+                                  : QJsonDocument::fromBinaryData(data))
+                    .object();
+    if (json.isEmpty()) {
         qCWarning(MAIN) << "State cache in" << fileName
                         << "is broken or empty, discarding";
     }
@@ -186,7 +172,8 @@ QJsonObject SyncData::loadJson(const QString& fileName)
 
 void SyncData::parseJson(const QJsonObject& json, const QString& baseDir)
 {
-    QElapsedTimer et; et.start();
+    QElapsedTimer et;
+    et.start();
 
     nextBatch_ = json.value("next_batch"_ls).toString();
     presenceData = load<Events>(json, "presence"_ls);
@@ -197,25 +184,22 @@ void SyncData::parseJson(const QJsonObject& json, const QString& baseDir)
     JoinStates::Int ii = 1; // ii is used to make a JoinState value
     auto totalRooms = 0;
     auto totalEvents = 0;
-    for (size_t i = 0; i < JoinStateStrings.size(); ++i, ii <<= 1)
-    {
+    for (size_t i = 0; i < JoinStateStrings.size(); ++i, ii <<= 1) {
         const auto rs = rooms.value(JoinStateStrings[i]).toObject();
         // We have a Qt container on the right and an STL one on the left
         roomData.reserve(static_cast<size_t>(rs.size()));
-        for(auto roomIt = rs.begin(); roomIt != rs.end(); ++roomIt)
-        {
+        for (auto roomIt = rs.begin(); roomIt != rs.end(); ++roomIt) {
             auto roomJson = roomIt->isObject()
-                            ? roomIt->toObject()
-                            : loadJson(baseDir + fileNameForRoom(roomIt.key()));
-            if (roomJson.isEmpty())
-            {
+                    ? roomIt->toObject()
+                    : loadJson(baseDir + fileNameForRoom(roomIt.key()));
+            if (roomJson.isEmpty()) {
                 unresolvedRoomIds.push_back(roomIt.key());
                 continue;
             }
             roomData.emplace_back(roomIt.key(), JoinState(ii), roomJson);
             const auto& r = roomData.back();
-            totalEvents += r.state.size() + r.ephemeral.size() +
-                           r.accountData.size() + r.timeline.size();
+            totalEvents += r.state.size() + r.ephemeral.size()
+                    + r.accountData.size() + r.timeline.size();
         }
         totalRooms += rs.size();
     }
@@ -223,6 +207,6 @@ void SyncData::parseJson(const QJsonObject& json, const QString& baseDir)
         qCWarning(MAIN) << "Unresolved rooms:" << unresolvedRoomIds.join(',');
     if (totalRooms > 9 || et.nsecsElapsed() >= profilerMinNsecs())
         qCDebug(PROFILER) << "*** SyncData::parseJson(): batch with"
-                          << totalRooms << "room(s),"
-                          << totalEvents << "event(s) in" << et;
+                          << totalRooms << "room(s)," << totalEvents
+                          << "event(s) in" << et;
 }
diff --git a/lib/syncdata.h b/lib/syncdata.h
index 8694626e..139af130 100644
--- a/lib/syncdata.h
+++ b/lib/syncdata.h
@@ -13,13 +13,13 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
-#include "joinstate.h"
 #include "events/stateevent.h"
+#include "joinstate.h"
 
 namespace QMatrixClient {
     /// Room summary, as defined in MSC688
@@ -30,11 +30,11 @@ namespace QMatrixClient {
      * means that nothing has come from the server; heroes.value().isEmpty()
      * means a peculiar case of a room with the only member - the current user.
      */
-    struct RoomSummary
-    {
+    struct RoomSummary {
         Omittable<int> joinedMemberCount;
         Omittable<int> invitedMemberCount;
-        Omittable<QStringList> heroes; //< mxids of users to take part in the room name
+        Omittable<QStringList>
+                heroes; //< mxids of users to take part in the room name
 
         bool isEmpty() const;
         /// Merge the contents of another RoomSummary object into this one
@@ -44,9 +44,7 @@ namespace QMatrixClient {
         friend QDebug operator<<(QDebug dbg, const RoomSummary& rs);
     };
 
-    template <>
-    struct JsonObjectConverter<RoomSummary>
-    {
+    template <> struct JsonObjectConverter<RoomSummary> {
         static void dumpTo(QJsonObject& jo, const RoomSummary& rs);
         static void fillFrom(const QJsonObject& jo, RoomSummary& rs);
     };
@@ -54,26 +52,26 @@ namespace QMatrixClient {
     class SyncRoomData
     {
         public:
-            QString roomId;
-            JoinState joinState;
-            RoomSummary summary;
-            StateEvents state;
-            RoomEvents timeline;
-            Events ephemeral;
-            Events accountData;
-
-            bool timelineLimited;
-            QString timelinePrevBatch;
-            int unreadCount;
-            int highlightCount;
-            int notificationCount;
-
-            SyncRoomData(const QString& roomId, JoinState joinState_,
-                         const QJsonObject& room_);
-            SyncRoomData(SyncRoomData&&) = default;
-            SyncRoomData& operator=(SyncRoomData&&) = default;
-
-            static const QString UnreadCountKey;
+        QString roomId;
+        JoinState joinState;
+        RoomSummary summary;
+        StateEvents state;
+        RoomEvents timeline;
+        Events ephemeral;
+        Events accountData;
+
+        bool timelineLimited;
+        QString timelinePrevBatch;
+        int unreadCount;
+        int highlightCount;
+        int notificationCount;
+
+        SyncRoomData(const QString& roomId, JoinState joinState_,
+                     const QJsonObject& room_);
+        SyncRoomData(SyncRoomData&&) = default;
+        SyncRoomData& operator=(SyncRoomData&&) = default;
+
+        static const QString UnreadCountKey;
     };
 
     // QVector cannot work with non-copiable objects, std::vector can.
@@ -82,35 +80,35 @@ namespace QMatrixClient {
     class SyncData
     {
         public:
-            SyncData() = default;
-            explicit SyncData(const QString& cacheFileName);
-            /** Parse sync response into room events
-             * \param json response from /sync or a room state cache
-             * \return the list of rooms with missing cache files; always
-             *         empty when parsing response from /sync
-             */
-            void parseJson(const QJsonObject& json, const QString& baseDir = {});
+        SyncData() = default;
+        explicit SyncData(const QString& cacheFileName);
+        /** Parse sync response into room events
+         * \param json response from /sync or a room state cache
+         * \return the list of rooms with missing cache files; always
+         *         empty when parsing response from /sync
+         */
+        void parseJson(const QJsonObject& json, const QString& baseDir = {});
 
-            Events&& takePresenceData();
-            Events&& takeAccountData();
-            Events&& takeToDeviceEvents();
-            SyncDataList&& takeRoomData();
+        Events&& takePresenceData();
+        Events&& takeAccountData();
+        Events&& takeToDeviceEvents();
+        SyncDataList&& takeRoomData();
 
-            QString nextBatch() const { return nextBatch_; }
+        QString nextBatch() const { return nextBatch_; }
 
-            QStringList unresolvedRooms() const { return unresolvedRoomIds; }
+        QStringList unresolvedRooms() const { return unresolvedRoomIds; }
 
-            static std::pair<int, int> cacheVersion() { return { 10, 0 }; }
-            static QString fileNameForRoom(QString roomId);
+        static std::pair<int, int> cacheVersion() { return { 10, 0 }; }
+        static QString fileNameForRoom(QString roomId);
 
         private:
-            QString nextBatch_;
-            Events presenceData;
-            Events accountData;
-            Events toDeviceEvents;
-            SyncDataList roomData;
-            QStringList unresolvedRoomIds;
-
-            static QJsonObject loadJson(const QString& fileName);
+        QString nextBatch_;
+        Events presenceData;
+        Events accountData;
+        Events toDeviceEvents;
+        SyncDataList roomData;
+        QStringList unresolvedRoomIds;
+
+        static QJsonObject loadJson(const QString& fileName);
     };
-}  // namespace QMatrixClient
+} // namespace QMatrixClient
diff --git a/lib/user.cpp b/lib/user.cpp
index eec41957..43792e74 100644
--- a/lib/user.cpp
+++ b/lib/user.cpp
@@ -13,25 +13,25 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "user.h"
 
-#include "connection.h"
-#include "room.h"
 #include "avatar.h"
+#include "connection.h"
+#include "csapi/content-repo.h"
+#include "csapi/profile.h"
+#include "csapi/room_state.h"
 #include "events/event.h"
 #include "events/roommemberevent.h"
-#include "csapi/room_state.h"
-#include "csapi/profile.h"
-#include "csapi/content-repo.h"
+#include "room.h"
 
-#include <QtCore/QTimer>
-#include <QtCore/QRegularExpression>
+#include <QtCore/QElapsedTimer>
 #include <QtCore/QPointer>
+#include <QtCore/QRegularExpression>
 #include <QtCore/QStringBuilder>
-#include <QtCore/QElapsedTimer>
+#include <QtCore/QTimer>
 
 #include <functional>
 
@@ -42,42 +42,38 @@ using std::move;
 class User::Private
 {
     public:
-        static Avatar makeAvatar(QUrl url)
-        {
-            return Avatar(move(url));
-        }
+    static Avatar makeAvatar(QUrl url) { return Avatar(move(url)); }
 
-        Private(QString userId, Connection* connection)
-            : userId(move(userId)), connection(connection)
-        { }
-
-        QString userId;
-        Connection* connection;
-
-        QString bridged;
-        QString mostUsedName;
-        QMultiHash<QString, const Room*> otherNames;
-        Avatar mostUsedAvatar { makeAvatar({}) };
-        std::vector<Avatar> otherAvatars;
-        auto otherAvatar(QUrl url)
-        {
-            return std::find_if(otherAvatars.begin(), otherAvatars.end(),
-                    [&url] (const auto& av) { return av.url() == url; });
-        }
-        QMultiHash<QUrl, const Room*> avatarsToRooms;
+    Private(QString userId, Connection* connection)
+        : userId(move(userId)), connection(connection)
+    {
+    }
 
-        mutable int totalRooms = 0;
+    QString userId;
+    Connection* connection;
 
-        QString nameForRoom(const Room* r, const QString& hint = {}) const;
-        void setNameForRoom(const Room* r, QString newName, QString oldName);
-        QUrl avatarUrlForRoom(const Room* r, const QUrl& hint = {}) const;
-        void setAvatarForRoom(const Room* r, const QUrl& newUrl,
-                              const QUrl& oldUrl);
+    QString bridged;
+    QString mostUsedName;
+    QMultiHash<QString, const Room*> otherNames;
+    Avatar mostUsedAvatar { makeAvatar({}) };
+    std::vector<Avatar> otherAvatars;
+    auto otherAvatar(QUrl url)
+    {
+        return std::find_if(otherAvatars.begin(), otherAvatars.end(),
+                            [&url](const auto& av) { return av.url() == url; });
+    }
+    QMultiHash<QUrl, const Room*> avatarsToRooms;
 
-        void setAvatarOnServer(QString contentUri, User* q);
+    mutable int totalRooms = 0;
 
-};
+    QString nameForRoom(const Room* r, const QString& hint = {}) const;
+    void setNameForRoom(const Room* r, QString newName, QString oldName);
+    QUrl avatarUrlForRoom(const Room* r, const QUrl& hint = {}) const;
+    void setAvatarForRoom(const Room* r, const QUrl& newUrl,
+                          const QUrl& oldUrl);
 
+    void setAvatarOnServer(QString contentUri, User* q);
+};
 
 QString User::Private::nameForRoom(const Room* r, const QString& hint) const
 {
@@ -94,30 +90,27 @@ void User::Private::setNameForRoom(const Room* r, QString newName,
 {
     Q_ASSERT(oldName != newName);
     Q_ASSERT(oldName == mostUsedName || otherNames.contains(oldName, r));
-    if (totalRooms < 2)
-    {
+    if (totalRooms < 2) {
         Q_ASSERT_X(totalRooms > 0 && otherNames.empty(), __FUNCTION__,
                    "Internal structures inconsistency");
         mostUsedName = move(newName);
         return;
     }
     otherNames.remove(oldName, r);
-    if (newName != mostUsedName)
-    {
+    if (newName != mostUsedName) {
         // Check if the newName is about to become most used.
-        if (otherNames.count(newName) >= totalRooms - otherNames.size())
-        {
+        if (otherNames.count(newName) >= totalRooms - otherNames.size()) {
             Q_ASSERT(totalRooms > 1);
             QElapsedTimer et;
-            if (totalRooms > MIN_JOINED_ROOMS_TO_LOG)
-            {
-                qCDebug(MAIN) << "Switching the most used name of user" << userId
-                              << "from" << mostUsedName << "to" << newName;
+            if (totalRooms > MIN_JOINED_ROOMS_TO_LOG) {
+                qCDebug(MAIN)
+                        << "Switching the most used name of user" << userId
+                        << "from" << mostUsedName << "to" << newName;
                 qCDebug(MAIN) << "The user is in" << totalRooms << "rooms";
                 et.start();
             }
 
-            for (auto* r1: connection->roomMap())
+            for (auto* r1 : connection->roomMap())
                 if (nameForRoom(r1) == mostUsedName)
                     otherNames.insert(mostUsedName, r1);
 
@@ -125,8 +118,7 @@ void User::Private::setNameForRoom(const Room* r, QString newName,
             otherNames.remove(newName);
             if (totalRooms > MIN_JOINED_ROOMS_TO_LOG)
                 qCDebug(PROFILER) << et << "to switch the most used name";
-        }
-        else
+        } else
             otherNames.insert(newName, r);
     }
 }
@@ -144,40 +136,37 @@ void User::Private::setAvatarForRoom(const Room* r, const QUrl& newUrl,
                                      const QUrl& oldUrl)
 {
     Q_ASSERT(oldUrl != newUrl);
-    Q_ASSERT(oldUrl == mostUsedAvatar.url() ||
-             avatarsToRooms.contains(oldUrl, r));
-    if (totalRooms < 2)
-    {
+    Q_ASSERT(oldUrl == mostUsedAvatar.url()
+             || avatarsToRooms.contains(oldUrl, r));
+    if (totalRooms < 2) {
         Q_ASSERT_X(totalRooms > 0 && otherAvatars.empty(), __FUNCTION__,
                    "Internal structures inconsistency");
         mostUsedAvatar.updateUrl(newUrl);
         return;
     }
     avatarsToRooms.remove(oldUrl, r);
-    if (!avatarsToRooms.contains(oldUrl))
-    {
+    if (!avatarsToRooms.contains(oldUrl)) {
         auto it = otherAvatar(oldUrl);
         if (it != otherAvatars.end())
             otherAvatars.erase(it);
     }
-    if (newUrl != mostUsedAvatar.url())
-    {
+    if (newUrl != mostUsedAvatar.url()) {
         // Check if the new avatar is about to become most used.
-        if (avatarsToRooms.count(newUrl) >= totalRooms - avatarsToRooms.size())
-        {
+        if (avatarsToRooms.count(newUrl)
+            >= totalRooms - avatarsToRooms.size()) {
             QElapsedTimer et;
-            if (totalRooms > MIN_JOINED_ROOMS_TO_LOG)
-            {
-                qCDebug(MAIN) << "Switching the most used avatar of user" << userId
-                              << "from" << mostUsedAvatar.url().toDisplayString()
-                              << "to" << newUrl.toDisplayString();
+            if (totalRooms > MIN_JOINED_ROOMS_TO_LOG) {
+                qCDebug(MAIN)
+                        << "Switching the most used avatar of user" << userId
+                        << "from" << mostUsedAvatar.url().toDisplayString()
+                        << "to" << newUrl.toDisplayString();
                 et.start();
             }
             avatarsToRooms.remove(newUrl);
             auto nextMostUsedIt = otherAvatar(newUrl);
             Q_ASSERT(nextMostUsedIt != otherAvatars.end());
             std::swap(mostUsedAvatar, *nextMostUsedIt);
-            for (const auto* r1: connection->roomMap())
+            for (const auto* r1 : connection->roomMap())
                 if (avatarUrlForRoom(r1) == nextMostUsedIt->url())
                     avatarsToRooms.insert(nextMostUsedIt->url(), r1);
 
@@ -205,29 +194,23 @@ Connection* User::connection() const
 
 User::~User() = default;
 
-QString User::id() const
-{
-    return d->userId;
-}
+QString User::id() const { return d->userId; }
 
 bool User::isGuest() const
 {
     Q_ASSERT(!d->userId.isEmpty() && d->userId.startsWith('@'));
     auto it = std::find_if_not(d->userId.begin() + 1, d->userId.end(),
-                               [] (QChar c) { return c.isDigit(); });
+                               [](QChar c) { return c.isDigit(); });
     Q_ASSERT(it != d->userId.end());
     return *it == ':';
 }
 
-QString User::name(const Room* room) const
-{
-    return d->nameForRoom(room);
-}
+QString User::name(const Room* room) const { return d->nameForRoom(room); }
 
 QString User::rawName(const Room* room) const
 {
-    return d->bridged.isEmpty() ? name(room) :
-                                  name(room) % " (" % d->bridged % ')';
+    return d->bridged.isEmpty() ? name(room)
+                                : name(room) % " (" % d->bridged % ')';
 }
 
 void User::updateName(const QString& newName, const Room* room)
@@ -238,9 +221,9 @@ void User::updateName(const QString& newName, const Room* room)
 void User::updateName(const QString& newName, const QString& oldName,
                       const Room* room)
 {
-    Q_ASSERT(oldName == d->mostUsedName || d->otherNames.contains(oldName, room));
-    if (newName != oldName)
-    {
+    Q_ASSERT(oldName == d->mostUsedName
+             || d->otherNames.contains(oldName, room));
+    if (newName != oldName) {
         emit nameAboutToChange(newName, oldName, room);
         d->setNameForRoom(room, newName, oldName);
         setObjectName(displayname());
@@ -251,15 +234,13 @@ void User::updateName(const QString& newName, const QString& oldName,
 void User::updateAvatarUrl(const QUrl& newUrl, const QUrl& oldUrl,
                            const Room* room)
 {
-    Q_ASSERT(oldUrl == d->mostUsedAvatar.url() ||
-             d->avatarsToRooms.contains(oldUrl, room));
-    if (newUrl != oldUrl)
-    {
+    Q_ASSERT(oldUrl == d->mostUsedAvatar.url()
+             || d->avatarsToRooms.contains(oldUrl, room));
+    if (newUrl != oldUrl) {
         d->setAvatarForRoom(room, newUrl, oldUrl);
         setObjectName(displayname());
         emit avatarChanged(this, room);
     }
-
 }
 
 void User::rename(const QString& newName)
@@ -270,8 +251,7 @@ void User::rename(const QString& newName)
 
 void User::rename(const QString& newName, const Room* r)
 {
-    if (!r)
-    {
+    if (!r) {
         qCWarning(MAIN) << "Passing a null room to two-argument User::rename()"
                            "is incorrect; client developer, please fix it";
         rename(newName);
@@ -287,35 +267,25 @@ void User::rename(const QString& newName, const Room* r)
 
 bool User::setAvatar(const QString& fileName)
 {
-    return avatarObject().upload(connection(), fileName,
-                std::bind(&Private::setAvatarOnServer, d.data(), _1, this));
+    return avatarObject().upload(
+            connection(), fileName,
+            std::bind(&Private::setAvatarOnServer, d.data(), _1, this));
 }
 
 bool User::setAvatar(QIODevice* source)
 {
-    return avatarObject().upload(connection(), source,
-                std::bind(&Private::setAvatarOnServer, d.data(), _1, this));
+    return avatarObject().upload(
+            connection(), source,
+            std::bind(&Private::setAvatarOnServer, d.data(), _1, this));
 }
 
-void User::requestDirectChat()
-{
-    connection()->requestDirectChat(this);
-}
+void User::requestDirectChat() { connection()->requestDirectChat(this); }
 
-void User::ignore()
-{
-    connection()->addToIgnoredUsers(this);
-}
+void User::ignore() { connection()->addToIgnoredUsers(this); }
 
-void User::unmarkIgnore()
-{
-    connection()->removeFromIgnoredUsers(this);
-}
+void User::unmarkIgnore() { connection()->removeFromIgnoredUsers(this); }
 
-bool User::isIgnored() const
-{
-    return connection()->isIgnored(this);
-}
+bool User::isIgnored() const { return connection()->isIgnored(this); }
 
 void User::Private::setAvatarOnServer(QString contentUri, User* q)
 {
@@ -339,10 +309,7 @@ QString User::fullName(const Room* room) const
     return name.isEmpty() ? d->userId : name % " (" % d->userId % ')';
 }
 
-QString User::bridged() const
-{
-    return d->bridged;
-}
+QString User::bridged() const { return d->bridged; }
 
 const Avatar& User::avatarObject(const Room* room) const
 {
@@ -357,14 +324,16 @@ QImage User::avatar(int dimension, const Room* room)
 
 QImage User::avatar(int width, int height, const Room* room)
 {
-    return avatar(width, height, room, []{});
+    return avatar(width, height, room, [] {});
 }
 
 QImage User::avatar(int width, int height, const Room* room,
                     const Avatar::get_callback_t& callback)
 {
-    return avatarObject(room).get(d->connection, width, height,
-                [=] { emit avatarChanged(this, room); callback(); });
+    return avatarObject(room).get(d->connection, width, height, [=] {
+        emit avatarChanged(this, room);
+        callback();
+    });
 }
 
 QString User::avatarMediaId(const Room* room) const
@@ -380,13 +349,13 @@ QUrl User::avatarUrl(const Room* room) const
 void User::processEvent(const RoomMemberEvent& event, const Room* room)
 {
     Q_ASSERT(room);
-    if (event.membership() != MembershipType::Invite &&
-            event.membership() != MembershipType::Join)
+    if (event.membership() != MembershipType::Invite
+        && event.membership() != MembershipType::Join)
         return;
 
-    auto aboutToEnter = room->memberJoinState(this) == JoinState::Leave &&
-            (event.membership() == MembershipType::Join ||
-             event.membership() == MembershipType::Invite);
+    auto aboutToEnter = room->memberJoinState(this) == JoinState::Leave
+            && (event.membership() == MembershipType::Join
+                || event.membership() == MembershipType::Invite);
     if (aboutToEnter)
         ++d->totalRooms;
 
@@ -399,26 +368,25 @@ void User::processEvent(const RoomMemberEvent& event, const Room* room)
     // bridge tags are not supported at all.
     QRegularExpression reSuffix(" \\((IRC|Gitter|Telegram)\\)$");
     auto match = reSuffix.match(newName);
-    if (match.hasMatch())
-    {
-        if (d->bridged != match.captured(1))
-        {
+    if (match.hasMatch()) {
+        if (d->bridged != match.captured(1)) {
             if (!d->bridged.isEmpty())
-                qCWarning(MAIN) << "Bridge for user" << id() << "changed:"
-                                << d->bridged << "->" << match.captured(1);
+                qCWarning(MAIN)
+                        << "Bridge for user" << id() << "changed:" << d->bridged
+                        << "->" << match.captured(1);
             d->bridged = match.captured(1);
         }
         newName.truncate(match.capturedStart(0));
     }
-    if (event.prevContent())
-    {
+    if (event.prevContent()) {
         // FIXME: the hint doesn't work for bridged users
         auto oldNameHint =
                 d->nameForRoom(room, event.prevContent()->displayName);
         updateName(newName, oldNameHint, room);
-        updateAvatarUrl(event.avatarUrl(),
-                        d->avatarUrlForRoom(room, event.prevContent()->avatarUrl),
-                        room);
+        updateAvatarUrl(
+                event.avatarUrl(),
+                d->avatarUrlForRoom(room, event.prevContent()->avatarUrl),
+                room);
     } else {
         updateName(newName, room);
         updateAvatarUrl(event.avatarUrl(), d->avatarUrlForRoom(room), room);
diff --git a/lib/user.h b/lib/user.h
index 0023b44a..c174314e 100644
--- a/lib/user.h
+++ b/lib/user.h
@@ -13,138 +13,141 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
-#include <QtCore/QString>
-#include <QtCore/QObject>
 #include "avatar.h"
+#include <QtCore/QObject>
+#include <QtCore/QString>
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     class Connection;
     class Room;
     class RoomMemberEvent;
 
-    class User: public QObject
+    class User : public QObject
     {
-            Q_OBJECT
-            Q_PROPERTY(QString id READ id CONSTANT)
-            Q_PROPERTY(bool isGuest READ isGuest CONSTANT)
-            Q_PROPERTY(QString name READ name NOTIFY nameChanged)
-            Q_PROPERTY(QString displayName READ displayname NOTIFY nameChanged STORED false)
-            Q_PROPERTY(QString fullName READ fullName NOTIFY nameChanged STORED false)
-            Q_PROPERTY(QString bridgeName READ bridged NOTIFY nameChanged STORED false)
-            Q_PROPERTY(QString avatarMediaId READ avatarMediaId NOTIFY avatarChanged STORED false)
-            Q_PROPERTY(QUrl avatarUrl READ avatarUrl NOTIFY avatarChanged)
+        Q_OBJECT
+        Q_PROPERTY(QString id READ id CONSTANT)
+        Q_PROPERTY(bool isGuest READ isGuest CONSTANT)
+        Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+        Q_PROPERTY(QString displayName READ displayname NOTIFY nameChanged
+                           STORED false)
+        Q_PROPERTY(
+                QString fullName READ fullName NOTIFY nameChanged STORED false)
+        Q_PROPERTY(
+                QString bridgeName READ bridged NOTIFY nameChanged STORED false)
+        Q_PROPERTY(QString avatarMediaId READ avatarMediaId NOTIFY avatarChanged
+                           STORED false)
+        Q_PROPERTY(QUrl avatarUrl READ avatarUrl NOTIFY avatarChanged)
         public:
-            User(QString userId, Connection* connection);
-            ~User() override;
-
-            Connection* connection() const;
-
-            /** Get unique stable user id
-             * User id is generated by the server and is not changed ever.
-             */
-            QString id() const;
-
-            /** Get the name chosen by the user
-             * This may be empty if the user didn't choose the name or cleared
-             * it. If the user is bridged, the bridge postfix (such as '(IRC)')
-             * is stripped out. No disambiguation for the room is done.
-             * \sa displayName, rawName
-             */
-            QString name(const Room* room = nullptr) const;
-
-            /** Get the user name along with the bridge postfix
-             * This function is similar to name() but appends the bridge postfix
-             * (such as '(IRC)') to the user name. No disambiguation is done.
-             * \sa name, displayName
-             */
-            QString rawName(const Room* room = nullptr) const;
-
-            /** Get the displayed user name
-             * When \p room is null, this method returns result of name() if
-             * the name is non-empty; otherwise it returns user id.
-             * When \p room is non-null, this call is equivalent to
-             * Room::roomMembername invocation for the user (i.e. the user's
-             * disambiguated room-specific name is returned).
-             * \sa name, id, fullName, Room::roomMembername
-             */
-            QString displayname(const Room* room = nullptr) const;
-
-            /** Get user name and id in one string
-             * The constructed string follows the format 'name (id)'
-             * which the spec recommends for users disambiguation in
-             * a room context and in other places.
-             * \sa displayName, Room::roomMembername
-             */
-            QString fullName(const Room* room = nullptr) const;
-
-            /**
-             * Returns the name of bridge the user is connected from or empty.
-            */
-            QString bridged() const;
-
-            /** Whether the user is a guest
-             * As of now, the function relies on the convention used in Synapse
-             * that guests and only guests have all-numeric IDs. This may or
-             * may not work with non-Synapse servers.
-             */
-            bool isGuest() const;
-
-            const Avatar& avatarObject(const Room* room = nullptr) const;
-            Q_INVOKABLE QImage avatar(int dimension, const Room* room = nullptr);
-            Q_INVOKABLE QImage avatar(int requestedWidth, int requestedHeight,
-                                      const Room* room = nullptr);
-            QImage avatar(int width, int height, const Room* room,
-                          const Avatar::get_callback_t& callback);
-
-            QString avatarMediaId(const Room* room = nullptr) const;
-            QUrl avatarUrl(const Room* room = nullptr) const;
-
-            void processEvent(const RoomMemberEvent& event, const Room* r);
+        User(QString userId, Connection* connection);
+        ~User() override;
+
+        Connection* connection() const;
+
+        /** Get unique stable user id
+         * User id is generated by the server and is not changed ever.
+         */
+        QString id() const;
+
+        /** Get the name chosen by the user
+         * This may be empty if the user didn't choose the name or cleared
+         * it. If the user is bridged, the bridge postfix (such as '(IRC)')
+         * is stripped out. No disambiguation for the room is done.
+         * \sa displayName, rawName
+         */
+        QString name(const Room* room = nullptr) const;
+
+        /** Get the user name along with the bridge postfix
+         * This function is similar to name() but appends the bridge postfix
+         * (such as '(IRC)') to the user name. No disambiguation is done.
+         * \sa name, displayName
+         */
+        QString rawName(const Room* room = nullptr) const;
+
+        /** Get the displayed user name
+         * When \p room is null, this method returns result of name() if
+         * the name is non-empty; otherwise it returns user id.
+         * When \p room is non-null, this call is equivalent to
+         * Room::roomMembername invocation for the user (i.e. the user's
+         * disambiguated room-specific name is returned).
+         * \sa name, id, fullName, Room::roomMembername
+         */
+        QString displayname(const Room* room = nullptr) const;
+
+        /** Get user name and id in one string
+         * The constructed string follows the format 'name (id)'
+         * which the spec recommends for users disambiguation in
+         * a room context and in other places.
+         * \sa displayName, Room::roomMembername
+         */
+        QString fullName(const Room* room = nullptr) const;
+
+        /**
+         * Returns the name of bridge the user is connected from or empty.
+         */
+        QString bridged() const;
+
+        /** Whether the user is a guest
+         * As of now, the function relies on the convention used in Synapse
+         * that guests and only guests have all-numeric IDs. This may or
+         * may not work with non-Synapse servers.
+         */
+        bool isGuest() const;
+
+        const Avatar& avatarObject(const Room* room = nullptr) const;
+        Q_INVOKABLE QImage avatar(int dimension, const Room* room = nullptr);
+        Q_INVOKABLE QImage avatar(int requestedWidth, int requestedHeight,
+                                  const Room* room = nullptr);
+        QImage avatar(int width, int height, const Room* room,
+                      const Avatar::get_callback_t& callback);
+
+        QString avatarMediaId(const Room* room = nullptr) const;
+        QUrl avatarUrl(const Room* room = nullptr) const;
+
+        void processEvent(const RoomMemberEvent& event, const Room* r);
 
         public slots:
-            /** Set a new name in the global user profile */
-            void rename(const QString& newName);
-            /** Set a new name for the user in one room */
-            void rename(const QString& newName, const Room* r);
-            /** Upload the file and use it as an avatar */
-            bool setAvatar(const QString& fileName);
-            /** Upload contents of the QIODevice and set that as an avatar */
-            bool setAvatar(QIODevice* source);
-            /** Create or find a direct chat with this user
-             * The resulting chat is returned asynchronously via
-             * Connection::directChatAvailable()
-             */
-            void requestDirectChat();
-            /** Add the user to the ignore list */
-            void ignore();
-            /** Remove the user from the ignore list */
-            void unmarkIgnore();
-            /** Check whether the user is in ignore list */
-            bool isIgnored() const;
+        /** Set a new name in the global user profile */
+        void rename(const QString& newName);
+        /** Set a new name for the user in one room */
+        void rename(const QString& newName, const Room* r);
+        /** Upload the file and use it as an avatar */
+        bool setAvatar(const QString& fileName);
+        /** Upload contents of the QIODevice and set that as an avatar */
+        bool setAvatar(QIODevice* source);
+        /** Create or find a direct chat with this user
+         * The resulting chat is returned asynchronously via
+         * Connection::directChatAvailable()
+         */
+        void requestDirectChat();
+        /** Add the user to the ignore list */
+        void ignore();
+        /** Remove the user from the ignore list */
+        void unmarkIgnore();
+        /** Check whether the user is in ignore list */
+        bool isIgnored() const;
 
         signals:
-            void nameAboutToChange(QString newName, QString oldName,
-                                   const Room* roomContext);
-            void nameChanged(QString newName, QString oldName,
-                             const Room* roomContext);
-            void avatarChanged(User* user, const Room* roomContext);
+        void nameAboutToChange(QString newName, QString oldName,
+                               const Room* roomContext);
+        void nameChanged(QString newName, QString oldName,
+                         const Room* roomContext);
+        void avatarChanged(User* user, const Room* roomContext);
 
         private slots:
-            void updateName(const QString& newName, const Room* room = nullptr);
-            void updateName(const QString& newName, const QString& oldName,
-                            const Room* room = nullptr);
-            void updateAvatarUrl(const QUrl& newUrl, const QUrl& oldUrl,
-                                 const Room* room = nullptr);
+        void updateName(const QString& newName, const Room* room = nullptr);
+        void updateName(const QString& newName, const QString& oldName,
+                        const Room* room = nullptr);
+        void updateAvatarUrl(const QUrl& newUrl, const QUrl& oldUrl,
+                             const Room* room = nullptr);
 
         private:
-            class Private;
-            QScopedPointer<Private> d;
+        class Private;
+        QScopedPointer<Private> d;
     };
 }
 Q_DECLARE_METATYPE(QMatrixClient::User*)
diff --git a/lib/util.cpp b/lib/util.cpp
index d042aa34..a7c745d4 100644
--- a/lib/util.cpp
+++ b/lib/util.cpp
@@ -13,20 +13,19 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "util.h"
 
+#include <QtCore/QDir>
 #include <QtCore/QRegularExpression>
 #include <QtCore/QStandardPaths>
-#include <QtCore/QDir>
 #include <QtCore/QStringBuilder>
 
-static const auto RegExpOptions =
-    QRegularExpression::CaseInsensitiveOption
-    | QRegularExpression::OptimizeOnFirstUsageOption
-    | QRegularExpression::UseUnicodePropertiesOption;
+static const auto RegExpOptions = QRegularExpression::CaseInsensitiveOption
+        | QRegularExpression::OptimizeOnFirstUsageOption
+        | QRegularExpression::UseUnicodePropertiesOption;
 
 // Converts all that looks like a URL into HTML links
 static void linkifyUrls(QString& htmlEscapedText)
@@ -39,34 +38,37 @@ static void linkifyUrls(QString& htmlEscapedText)
     // Note: outer parentheses are a part of C++ raw string delimiters, not of
     // the regex (see http://en.cppreference.com/w/cpp/language/string_literal).
     // Note2: yet another pair of outer parentheses are \1 in the replacement.
-    static const QRegularExpression FullUrlRegExp(QStringLiteral(
-            R"(((www\.(?!\.)|(https?|ftp|magnet)://)(&(?![lg]t;)|[^&\s<>'"])+(&(?![lg]t;)|[^&!,.\s<>'"\]):])))"
-        ), RegExpOptions);
+    static const QRegularExpression FullUrlRegExp(
+            QStringLiteral(
+                    R"(((www\.(?!\.)|(https?|ftp|magnet)://)(&(?![lg]t;)|[^&\s<>'"])+(&(?![lg]t;)|[^&!,.\s<>'"\]):])))"),
+            RegExpOptions);
     // email address:
     // [word chars, dots or dashes]@[word chars, dots or dashes].[word chars]
-    static const QRegularExpression EmailAddressRegExp(QStringLiteral(
-            R"((mailto:)?(\b(\w|\.|-)+@(\w|\.|-)+\.\w+\b))"
-        ), RegExpOptions);
+    static const QRegularExpression EmailAddressRegExp(
+            QStringLiteral(R"((mailto:)?(\b(\w|\.|-)+@(\w|\.|-)+\.\w+\b))"),
+            RegExpOptions);
     // An interim liberal implementation of
     // https://matrix.org/docs/spec/appendices.html#identifier-grammar
-    static const QRegularExpression MxIdRegExp(QStringLiteral(
-            R"((^|[^<>/])([!#@][-a-z0-9_=/.]{1,252}:[-.a-z0-9]+))"
-        ), RegExpOptions);
+    static const QRegularExpression MxIdRegExp(
+            QStringLiteral(
+                    R"((^|[^<>/])([!#@][-a-z0-9_=/.]{1,252}:[-.a-z0-9]+))"),
+            RegExpOptions);
 
     // NOTE: htmlEscapedText is already HTML-escaped! No literal <,>,&
 
     htmlEscapedText.replace(EmailAddressRegExp,
-                 QStringLiteral(R"(<a href="mailto:\2">\1\2</a>)"));
+                            QStringLiteral(R"(<a href="mailto:\2">\1\2</a>)"));
     htmlEscapedText.replace(FullUrlRegExp,
-                 QStringLiteral(R"(<a href="\1">\1</a>)"));
-    htmlEscapedText.replace(MxIdRegExp,
-                 QStringLiteral(R"(\1<a href="https://matrix.to/#/\2">\2</a>)"));
+                            QStringLiteral(R"(<a href="\1">\1</a>)"));
+    htmlEscapedText.replace(
+            MxIdRegExp,
+            QStringLiteral(R"(\1<a href="https://matrix.to/#/\2">\2</a>)"));
 }
 
 QString QMatrixClient::prettyPrint(const QString& plainText)
 {
-    auto pt = QStringLiteral("<span style='white-space:pre-wrap'>") +
-            plainText.toHtmlEscaped() + QStringLiteral("</span>");
+    auto pt = QStringLiteral("<span style='white-space:pre-wrap'>")
+            + plainText.toHtmlEscaped() + QStringLiteral("</span>");
     pt.replace('\n', QStringLiteral("<br/>"));
 
     linkifyUrls(pt);
@@ -76,7 +78,7 @@ QString QMatrixClient::prettyPrint(const QString& plainText)
 QString QMatrixClient::cacheLocation(const QString& dirName)
 {
     const QString cachePath =
-        QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
+            QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
             % '/' % dirName % '/';
     QDir dir;
     if (!dir.exists(cachePath))
@@ -104,17 +106,24 @@ void f2(int, QString);
 static_assert(std::is_same<fn_arg_t<decltype(f2), 1>, QString>::value,
               "Test fn_arg_t<>");
 
-struct S { int mf(); };
+struct S {
+    int mf();
+};
 static_assert(is_callable_v<decltype(&S::mf)>, "Test member function");
-static_assert(returns<int, decltype(&S::mf)>(), "Test returns<> with member function");
+static_assert(returns<int, decltype(&S::mf)>(),
+              "Test returns<> with member function");
 
-struct Fo { int operator()(); };
+struct Fo {
+    int operator()();
+};
 static_assert(is_callable_v<Fo>, "Test is_callable<> with function object");
 static_assert(function_traits<Fo>::arg_number == 0, "Test function object");
 static_assert(std::is_same<fn_return_t<Fo>, int>::value,
               "Test return type of function object");
 
-struct Fo1 { void operator()(int); };
+struct Fo1 {
+    void operator()(int);
+};
 static_assert(function_traits<Fo1>::arg_number == 1, "Test function object 1");
 static_assert(is_callable_v<Fo1>, "Test is_callable<> with function object 1");
 static_assert(std::is_same<fn_arg_t<Fo1>, int>(),
@@ -127,14 +136,10 @@ static_assert(std::is_same<fn_return_t<decltype(l)>, int>::value,
               "Test fn_return_t<> with lambda");
 #endif
 
-template <typename T>
-struct fn_object
-{
+template <typename T> struct fn_object {
     static int smf(double) { return 0; }
 };
-template <>
-struct fn_object<QString>
-{
+template <> struct fn_object<QString> {
     void operator()(QString);
 };
 static_assert(is_callable_v<fn_object<QString>>, "Test function object");
@@ -142,13 +147,12 @@ static_assert(returns<void, fn_object<QString>>(),
               "Test returns<> with function object");
 static_assert(!is_callable_v<fn_object<int>>, "Test non-function object");
 // FIXME: These two don't work
-//static_assert(is_callable_v<decltype(&fn_object<int>::smf)>,
+// static_assert(is_callable_v<decltype(&fn_object<int>::smf)>,
 //              "Test static member function");
-//static_assert(returns<int, decltype(&fn_object<int>::smf)>(),
+// static_assert(returns<int, decltype(&fn_object<int>::smf)>(),
 //              "Test returns<> with static member function");
 
-template <typename T>
-QString ft(T&&);
+template <typename T> QString ft(T&&);
 static_assert(std::is_same<fn_arg_t<decltype(ft<QString>)>, QString&&>(),
               "Test function templates");
 
diff --git a/lib/util.h b/lib/util.h
index f7f646da..fbcafc0d 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
@@ -21,8 +21,8 @@
 #include <QtCore/QLatin1String>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-#include <QtCore/QMetaEnum>
 #include <QtCore/QDebug>
+#include <QtCore/QMetaEnum>
 #endif
 
 #include <functional>
@@ -39,41 +39,43 @@
 #endif
 
 // Along the lines of Q_DISABLE_COPY
-#define DISABLE_MOVE(_ClassName) \
-    _ClassName(_ClassName&&) Q_DECL_EQ_DELETE; \
+#define DISABLE_MOVE(_ClassName)                                               \
+    _ClassName(_ClassName&&) Q_DECL_EQ_DELETE;                                 \
     _ClassName& operator=(_ClassName&&) Q_DECL_EQ_DELETE;
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
 // Copy-pasted from Qt 5.10
 template <typename T>
-Q_DECL_CONSTEXPR typename std::add_const<T>::type &qAsConst(T &t) Q_DECL_NOTHROW { return t; }
+Q_DECL_CONSTEXPR typename std::add_const<T>::type& qAsConst(T& t) Q_DECL_NOTHROW
+{
+    return t;
+}
 // prevent rvalue arguments:
-template <typename T>
-static void qAsConst(const T &&) Q_DECL_EQ_DELETE;
+template <typename T> static void qAsConst(const T&&) Q_DECL_EQ_DELETE;
 #endif
 
 // MSVC 2015 and older GCC's don't handle initialisation from initializer lists
 // right in the absense of a constructor; MSVC 2015, notably, fails with
 // "error C2440: 'return': cannot convert from 'initializer list' to '<type>'"
-#if (defined(_MSC_VER) && _MSC_VER < 1910) || \
-    (defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 4)
-#  define BROKEN_INITIALIZER_LISTS
+#if (defined(_MSC_VER) && _MSC_VER < 1910)                                     \
+        || (defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 4)
+#define BROKEN_INITIALIZER_LISTS
 #endif
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // The below enables pretty-printing of enums in logs
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
 #define REGISTER_ENUM(EnumName) Q_ENUM(EnumName)
 #else
     // Thanks to Olivier for spelling it and for making Q_ENUM to replace it:
     // https://woboq.com/blog/q_enum.html
-#define REGISTER_ENUM(EnumName) \
-    Q_ENUMS(EnumName) \
-    friend QDebug operator<<(QDebug dbg, EnumName val) \
-    { \
-        static int enumIdx = staticMetaObject.indexOfEnumerator(#EnumName); \
-        return dbg << Event::staticMetaObject.enumerator(enumIdx).valueToKey(int(val)); \
+#define REGISTER_ENUM(EnumName)                                                \
+    Q_ENUMS(EnumName)                                                          \
+    friend QDebug operator<<(QDebug dbg, EnumName val)                         \
+    {                                                                          \
+        static int enumIdx = staticMetaObject.indexOfEnumerator(#EnumName);    \
+        return dbg << Event::staticMetaObject.enumerator(enumIdx).valueToKey(  \
+                       int(val));                                              \
     }
 #endif
 
@@ -84,97 +86,101 @@ namespace QMatrixClient
         return std::unique_ptr<T1>(static_cast<T1*>(p.release()));
     }
 
-    struct NoneTag {};
+    struct NoneTag {
+    };
     constexpr NoneTag none {};
 
     /** A crude substitute for `optional` while we're not C++17
      *
      * Only works with default-constructible types.
      */
-    template <typename T>
-    class Omittable
+    template <typename T> class Omittable
     {
-            static_assert(!std::is_reference<T>::value,
-                "You cannot make an Omittable<> with a reference type");
+        static_assert(!std::is_reference<T>::value,
+                      "You cannot make an Omittable<> with a reference type");
+
         public:
-            using value_type = std::decay_t<T>;
-
-            explicit Omittable() : Omittable(none) { }
-            Omittable(NoneTag) : _value(value_type()), _omitted(true) { }
-            Omittable(const value_type& val) : _value(val) { }
-            Omittable(value_type&& val) : _value(std::move(val)) { }
-            Omittable<T>& operator=(const value_type& val)
-            {
-                _value = val;
-                _omitted = false;
-                return *this;
-            }
-            Omittable<T>& operator=(value_type&& val)
-            {
-                // For some reason GCC complains about -Wmaybe-uninitialized
-                // in the context of using Omittable<bool> with converters.h;
-                // though the logic looks very much benign (GCC bug???)
-                _value = std::move(val);
-                _omitted = false;
-                return *this;
-            }
-
-            bool operator==(const value_type& rhs) const
-            {
-                return !omitted() && value() == rhs;
-            }
-            friend bool operator==(const value_type& lhs,
-                                   const Omittable<value_type>& rhs)
-            {
-                return rhs == lhs;
-            }
-            bool operator!=(const value_type& rhs) const
-            {
-                return !operator==(rhs);
-            }
-            friend bool operator!=(const value_type& lhs,
-                                   const Omittable<value_type>& rhs)
-            {
-                return !(rhs == lhs);
-            }
-
-            bool omitted() const { return _omitted; }
-            const value_type& value() const
-            {
-                Q_ASSERT(!_omitted);
-                return _value;
-            }
-            value_type& editValue()
-            {
-                _omitted = false;
-                return _value;
-            }
-            /// Merge the value from another Omittable
-            /// \return true if \p other is not omitted and the value of
-            ///         the current Omittable was different (or omitted);
-            ///         in other words, if the current Omittable has changed;
-            ///         false otherwise
-            template <typename T1>
-            auto merge(const Omittable<T1>& other)
+        using value_type = std::decay_t<T>;
+
+        explicit Omittable() : Omittable(none) {}
+        Omittable(NoneTag) : _value(value_type()), _omitted(true) {}
+        Omittable(const value_type& val) : _value(val) {}
+        Omittable(value_type&& val) : _value(std::move(val)) {}
+        Omittable<T>& operator=(const value_type& val)
+        {
+            _value = val;
+            _omitted = false;
+            return *this;
+        }
+        Omittable<T>& operator=(value_type&& val)
+        {
+            // For some reason GCC complains about -Wmaybe-uninitialized
+            // in the context of using Omittable<bool> with converters.h;
+            // though the logic looks very much benign (GCC bug???)
+            _value = std::move(val);
+            _omitted = false;
+            return *this;
+        }
+
+        bool operator==(const value_type& rhs) const
+        {
+            return !omitted() && value() == rhs;
+        }
+        friend bool operator==(const value_type& lhs,
+                               const Omittable<value_type>& rhs)
+        {
+            return rhs == lhs;
+        }
+        bool operator!=(const value_type& rhs) const
+        {
+            return !operator==(rhs);
+        }
+        friend bool operator!=(const value_type& lhs,
+                               const Omittable<value_type>& rhs)
+        {
+            return !(rhs == lhs);
+        }
+
+        bool omitted() const { return _omitted; }
+        const value_type& value() const
+        {
+            Q_ASSERT(!_omitted);
+            return _value;
+        }
+        value_type& editValue()
+        {
+            _omitted = false;
+            return _value;
+        }
+        /// Merge the value from another Omittable
+        /// \return true if \p other is not omitted and the value of
+        ///         the current Omittable was different (or omitted);
+        ///         in other words, if the current Omittable has changed;
+        ///         false otherwise
+        template <typename T1>
+        auto merge(const Omittable<T1>& other)
                 -> std::enable_if_t<std::is_convertible<T1, T>::value, bool>
-            {
-                if (other.omitted() ||
-                        (!_omitted && _value == other.value()))
-                    return false;
-                _omitted = false;
-                _value = other.value();
-                return true;
-            }
-            value_type&& release() { _omitted = true; return std::move(_value); }
-
-            const value_type* operator->() const & { return &value(); }
-            value_type* operator->() & { return &editValue(); }
-            const value_type& operator*() const & { return value(); }
-            value_type& operator*() & { return editValue(); }
+        {
+            if (other.omitted() || (!_omitted && _value == other.value()))
+                return false;
+            _omitted = false;
+            _value = other.value();
+            return true;
+        }
+        value_type&& release()
+        {
+            _omitted = true;
+            return std::move(_value);
+        }
+
+        const value_type* operator->() const& { return &value(); }
+        value_type* operator->() & { return &editValue(); }
+        const value_type& operator*() const& { return value(); }
+        value_type& operator*() & { return editValue(); }
 
         private:
-            T _value;
-            bool _omitted = false;
+        T _value;
+        bool _omitted = false;
     };
 
     namespace _impl {
@@ -184,15 +190,16 @@ namespace QMatrixClient
     /** Determine traits of an arbitrary function/lambda/functor
      * Doesn't work with generic lambdas and function objects that have
      * operator() overloaded.
-     * \sa https://stackoverflow.com/questions/7943525/is-it-possible-to-figure-out-the-parameter-type-and-return-type-of-a-lambda#7943765
+     * \sa
+     * https://stackoverflow.com/questions/7943525/is-it-possible-to-figure-out-the-parameter-type-and-return-type-of-a-lambda#7943765
      */
     template <typename T>
-    struct function_traits : public _impl::fn_traits<void, T> {};
+    struct function_traits : public _impl::fn_traits<void, T> {
+    };
 
     // Specialisation for a function
     template <typename ReturnT, typename... ArgTs>
-    struct function_traits<ReturnT(ArgTs...)>
-    {
+    struct function_traits<ReturnT(ArgTs...)> {
         static constexpr auto is_callable = true;
         using return_type = ReturnT;
         using arg_types = std::tuple<ArgTs...>;
@@ -201,39 +208,37 @@ namespace QMatrixClient
     };
 
     namespace _impl {
-        template <typename AlwaysVoid, typename T>
-        struct fn_traits
-        {
+        template <typename AlwaysVoid, typename T> struct fn_traits {
             static constexpr auto is_callable = false;
         };
 
         template <typename T>
         struct fn_traits<decltype(void(&T::operator())), T>
-            : public fn_traits<void, decltype(&T::operator())>
-        { }; // A generic function object that has (non-overloaded) operator()
+            : public fn_traits<void, decltype(&T::operator())> {
+        }; // A generic function object that has (non-overloaded) operator()
 
         // Specialisation for a member function
         template <typename ReturnT, typename ClassT, typename... ArgTs>
-        struct fn_traits<void, ReturnT(ClassT::*)(ArgTs...)>
-            : function_traits<ReturnT(ArgTs...)>
-        { };
+        struct fn_traits<void, ReturnT (ClassT::*)(ArgTs...)>
+            : function_traits<ReturnT(ArgTs...)> {
+        };
 
         // Specialisation for a const member function
         template <typename ReturnT, typename ClassT, typename... ArgTs>
-        struct fn_traits<void, ReturnT(ClassT::*)(ArgTs...) const>
-            : function_traits<ReturnT(ArgTs...)>
-        { };
-    }  // namespace _impl
+        struct fn_traits<void, ReturnT (ClassT::*)(ArgTs...) const>
+            : function_traits<ReturnT(ArgTs...)> {
+        };
+    } // namespace _impl
 
     template <typename FnT>
     using fn_return_t = typename function_traits<FnT>::return_type;
 
     template <typename FnT, int ArgN = 0>
     using fn_arg_t =
-        std::tuple_element_t<ArgN, typename function_traits<FnT>::arg_types>;
+            std::tuple_element_t<ArgN,
+                                 typename function_traits<FnT>::arg_types>;
 
-    template <typename R, typename FnT>
-    constexpr bool returns()
+    template <typename R, typename FnT> constexpr bool returns()
     {
         return std::is_same<fn_return_t<FnT>, R>::value;
     }
@@ -251,31 +256,31 @@ namespace QMatrixClient
      * This is a very basic range type over a container with iterators that
      * are at least ForwardIterators. Inspired by Ranges TS.
      */
-    template <typename ArrayT>
-    class Range
+    template <typename ArrayT> class Range
     {
-            // Looking forward for Ranges TS to produce something (in C++23?..)
-            using iterator = typename ArrayT::iterator;
-            using const_iterator = typename ArrayT::const_iterator;
-            using size_type = typename ArrayT::size_type;
+        // Looking forward for Ranges TS to produce something (in C++23?..)
+        using iterator = typename ArrayT::iterator;
+        using const_iterator = typename ArrayT::const_iterator;
+        using size_type = typename ArrayT::size_type;
+
         public:
-            Range(ArrayT& arr) : from(std::begin(arr)), to(std::end(arr)) { }
-            Range(iterator from, iterator to) : from(from), to(to) { }
-
-            size_type size() const
-            {
-                Q_ASSERT(std::distance(from, to) >= 0);
-                return size_type(std::distance(from, to));
-            }
-            bool empty() const { return from == to; }
-            const_iterator begin() const { return from; }
-            const_iterator end() const { return to; }
-            iterator begin() { return from; }
-            iterator end() { return to; }
+        Range(ArrayT& arr) : from(std::begin(arr)), to(std::end(arr)) {}
+        Range(iterator from, iterator to) : from(from), to(to) {}
+
+        size_type size() const
+        {
+            Q_ASSERT(std::distance(from, to) >= 0);
+            return size_type(std::distance(from, to));
+        }
+        bool empty() const { return from == to; }
+        const_iterator begin() const { return from; }
+        const_iterator end() const { return to; }
+        iterator begin() { return from; }
+        iterator end() { return to; }
 
         private:
-            iterator from;
-            iterator to;
+        iterator from;
+        iterator to;
     };
 
     /** A replica of std::find_first_of that returns a pair of iterators
@@ -283,10 +288,10 @@ namespace QMatrixClient
      * Convenient for cases when you need to know which particular "first of"
      * [sFirst, sLast) has been found in [first, last).
      */
-    template<typename InputIt, typename ForwardIt, typename Pred>
-    inline std::pair<InputIt, ForwardIt> findFirstOf(
-            InputIt first, InputIt last, ForwardIt sFirst, ForwardIt sLast,
-            Pred pred)
+    template <typename InputIt, typename ForwardIt, typename Pred>
+    inline std::pair<InputIt, ForwardIt>
+    findFirstOf(InputIt first, InputIt last, ForwardIt sFirst, ForwardIt sLast,
+                Pred pred)
     {
         for (; first != last; ++first)
             for (auto it = sFirst; it != sLast; ++it)
@@ -306,5 +311,4 @@ namespace QMatrixClient
      * \param dir path to cache directory relative to the standard cache path
      */
     QString cacheLocation(const QString& dirName);
-}  // namespace QMatrixClient
-
+} // namespace QMatrixClient