Remove roomChanged from ActionsHandler

Move ActionsHandler to being instantiated by RoomManager this will allow it to be accessed by RoomDrawer items as well
2023-10-21 19:10:26 +01:00 · 2023-10-21 18:29:52 +01:00
147 changed files with 17077 additions and 25210 deletions
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -13,10 +13,8 @@ Dependencies:
    'frameworks/kitemmodels': '@latest-kf6'
    'frameworks/kquickcharts': '@latest-kf6'
    'frameworks/knotifications': '@latest-kf6'
-    'frameworks/kcolorscheme': '@latest-kf6'
    'libraries/kquickimageeditor': '@latest-kf6'
    'frameworks/sonnet': '@latest-kf6'
-    'frameworks/prison': '@latest-kf6'
    'libraries/kirigami-addons': '@latest-kf6'
    'third-party/libquotient': '@latest'
    'third-party/qtkeychain': '@latest'
@@ -27,6 +25,7 @@ Dependencies:
    'frameworks/qqc2-desktop-style': '@latest-kf6'
    'frameworks/kio': '@latest-kf6'
    'frameworks/kwindowsystem': '@latest-kf6'
+    'frameworks/kconfigwidgets': '@latest-kf6'
 - 'on': ['Linux', 'FreeBSD']
  'require':
    'frameworks/kdbusaddons': '@latest-kf6'
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,9 +7,9 @@
 cmake_minimum_required(VERSION 3.16)

 # KDE Applications version, managed by release script.
-set(RELEASE_SERVICE_VERSION_MAJOR "24")
-set(RELEASE_SERVICE_VERSION_MINOR "01")
-set(RELEASE_SERVICE_VERSION_MICRO "75")
+set(RELEASE_SERVICE_VERSION_MAJOR "23")
+set(RELEASE_SERVICE_VERSION_MINOR "11")
+set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")

 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
@@ -37,7 +37,6 @@ include(ECMAddAppIcon)
 include(KDEGitCommitHooks)
 include(ECMCheckOutboundLicense)
 include(ECMQtDeclareLoggingCategory)
-include(ECMAddAndroidApk)
 if (NOT ANDROID)
    include(KDEClangFormat)
 endif()
@@ -58,7 +57,7 @@ set_package_properties(Qt6 PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
 )
-find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels ColorScheme)
+find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels)
 set_package_properties(KF6 PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
@@ -77,7 +76,7 @@ if(ANDROID)
    )
 else()
    find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem)
+    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem StatusNotifierItem)
    set_package_properties(KF6QQC2DesktopStyle PROPERTIES
        TYPE RUNTIME
    )
@@ -120,7 +119,6 @@ ecm_find_qmlmodule(org.kde.kquickimageeditor 1.0)
 ecm_find_qmlmodule(org.kde.kitemmodels 1.0)
 ecm_find_qmlmodule(org.kde.quickcharts 1.0)
 ecm_find_qmlmodule(QtLocation)
-ecm_find_qmlmodule(org.kde.prison)

 find_package(KQuickImageEditor COMPONENTS)
 set_package_properties(KQuickImageEditor PROPERTIES
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -9,9 +9,9 @@
          android:versionName="${versionName}"
          android:versionCode="${versionCode}"
          android:installLocation="auto">
-    <application android:name="org.qtproject.qt.android.bindings.QtApplication" android:label="NeoChat" android:icon="@drawable/neochat" android:usesCleartextTraffic="true">
+    <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="NeoChat" android:icon="@drawable/neochat" android:usesCleartextTraffic="true">
        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"
-                  android:name="org.qtproject.qt.android.bindings.QtActivity"
+                  android:name="org.qtproject.qt5.android.bindings.QtActivity"
                  android:label="NeoChat"
                  android:windowSoftInputMode="adjustResize"
                  android:launchMode="singleTop"
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -12,7 +12,7 @@ buildscript {
    }

    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.1'
+        classpath 'com.android.tools.build:gradle:7.0.2'
    }
 }

@@ -35,7 +35,7 @@ android {
     * The following variables:
     * - androidBuildToolsVersion,
     * - androidCompileSdkVersion
-     * - qtAndroidDir - holds the path to qt android files
+     * - qt5AndroidDir - holds the path to qt android files
     *                   needed to build any Qt application
     *                   on Android.
     *
@@ -44,20 +44,17 @@ android {
     * Changing them manually might break the compilation!
     *******************************************************/

-    compileSdkVersion androidCompileSdkVersion
+    compileSdkVersion androidCompileSdkVersion.toInteger()
+
    buildToolsVersion androidBuildToolsVersion
    ndkVersion androidNdkVersion

-    // Extract native libraries from the APK
-    packagingOptions.jniLibs.useLegacyPackaging true
-
-
    sourceSets {
        main {
            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = [qtAndroidDir + '/src', 'src', 'java']
-            aidl.srcDirs = [qtAndroidDir + '/src', 'src', 'aidl']
-            res.srcDirs = [qtAndroidDir + '/res', 'res']
+            java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java']
+            aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
+            res.srcDirs = [qt5AndroidDir + '/res', 'res']
            resources.srcDirs = ['src']
            renderscript.srcDirs = ['src']
            assets.srcDirs = ['assets']
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -40,9 +40,3 @@ ecm_add_test(
    LINK_LIBRARIES neochat Qt::Test
    TEST_NAME chatbarcachetest
 )
-
-ecm_add_test(
-    chatdocumenthandlertest.cpp
-    LINK_LIBRARIES neochat Qt::Test
-    TEST_NAME chatdocumenthandlertest
-)
--- a/autotests/chatdocumenthandlertest.cpp
+++ b/autotests/chatdocumenthandlertest.cpp
@@ -1,36 +0,0 @@
-// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include <QObject>
-#include <QTest>
-
-#include "chatdocumenthandler.h"
-#include "neochatconfig.h"
-
-class ChatDocumentHandlerTest : public QObject
-{
-    Q_OBJECT
-
-private:
-    ChatDocumentHandler emptyHandler;
-
-private Q_SLOTS:
-    void initTestCase();
-
-    void nullComplete();
-};
-
-void ChatDocumentHandlerTest::initTestCase()
-{
-    // HACK: this is to stop KStatusNotifierItem SEGFAULTING on cleanup.
-    NeoChatConfig::self()->setSystemTray(false);
-}
-
-void ChatDocumentHandlerTest::nullComplete()
-{
-    QTest::ignoreMessage(QtWarningMsg, "complete called with m_document set to nullptr.");
-    emptyHandler.complete(0);
-}
-
-QTEST_MAIN(ChatDocumentHandlerTest)
-#include "chatdocumenthandlertest.moc"
--- a/autotests/data/test-texthandler-sync.json
+++ b/autotests/data/test-texthandler-sync.json
@@ -1,124 +0,0 @@
-{
-  "account_data": {
-    "events": [
-      {
-        "content": {
-          "tags": {
-            "u.work": {
-              "order": 0.9
-            }
-          }
-        },
-        "type": "m.tag"
-      },
-      {
-        "content": {
-          "custom_config_key": "custom_config_value"
-        },
-        "type": "org.example.custom.room.config"
-      }
-    ]
-  },
-  "ephemeral": {
-    "events": [
-      {
-        "content": {
-          "user_ids": [
-            "@alice:matrix.org",
-            "@bob:example.com"
-          ]
-        },
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "type": "m.typing"
-      }
-    ]
-  },
-  "state": {
-    "events": [
-      {
-        "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Alice Margatroid",
-          "membership": "join",
-          "reason": "Looking for support"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1432735824653,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "state_key": "@alice:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      }
-    ]
-  },
-  "summary": {
-    "m.heroes": [
-      "@alice:example.com",
-      "@bob:example.com"
-    ],
-    "m.invited_member_count": 0,
-    "m.joined_member_count": 2
-  },
-  "timeline": {
-    "events": [
-      {
-        "content": {
-          "body": "This is an **example** text message",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "<b>This is an example text message</b>",
-          "msgtype": "m.text"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1432735824654,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "body": "/me This is an emote.",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "This is an emote.",
-          "msgtype": "m.emote"
-        },
-        "event_id": "$153273582443PhrSn:example.org",
-        "origin_server_ts": 1532735824654,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1231
-        }
-      },
-      {
-        "content": {
-            "body": "tested",
-            "msgtype": "m.text"
-        },
-        "event_id": "$zrCiBxBnqqTn0Z5FY78qSZAszno_w8nJJXzfBULG-3E",
-        "origin_server_ts": 1680948575928,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 1747776,
-            "m.relations": {
-                "m.replace": {
-                    "event_id": "$UX0PlpyI7vYO32iHMuuYEP7ECMh4sX3XLGiB2SwM4mQ",
-                    "origin_server_ts": 1680948580992,
-                    "sender": "@example:example.org"
-                }
-            }
-        }
-      }
-    ],
-    "limited": true,
-    "prev_batch": "t34-23535_0_0"
-  }
-}
--- a/autotests/eventhandlertest.cpp
+++ b/autotests/eventhandlertest.cpp
@@ -39,61 +39,34 @@ private:
    Connection *connection = nullptr;
    TestRoom *room = nullptr;
    EventHandler eventHandler;
-    EventHandler emptyHandler;
-    EventHandler noEventHandler;

 private Q_SLOTS:
    void initTestCase();

-    void nullSetEvent();
    void eventId();
-    void nullEventId();
    void delegateType_data();
    void delegateType();
-    void nullDelegateType();
    void author();
-    void nullAuthor();
    void authorDisplayName();
-    void nullAuthorDisplayName();
    void time();
-    void nullTime();
    void timeString();
-    void nullTimeString();
    void highlighted();
-    void nullHighlighted();
    void hidden();
-    void nullHidden();
    void body();
-    void nullBody();
    void genericBody_data();
    void genericBody();
-    void nullGenericBody();
    void mediaInfo();
-    void nullMediaInfo();
    void linkPreviewer();
-    void nullLinkPreviewer();
    void reactions();
-    void nullReactions();
    void hasReply();
-    void nullHasReply();
    void replyId();
-    void nullReplyId();
    void replyDelegateType();
-    void nullReplyDelegateType();
    void replyAuthor();
-    void nullReplyAuthor();
    void replyBody();
-    void nullReplyBody();
    void replyMediaInfo();
-    void nullReplyMediaInfo();
    void thread();
-    void nullThread();
    void location();
-    void nullLocation();
    void readMarkers();
-    void nullReadMarkers();
-
-    void cleanup();
 };

 void EventHandlerTest::initTestCase()
@@ -109,13 +82,6 @@ void EventHandlerTest::initTestCase()
    room->update(std::move(roomData));

    eventHandler.setRoom(room);
-    noEventHandler.setRoom(room);
-}
-
-void EventHandlerTest::nullSetEvent()
-{
-    QTest::ignoreMessage(QtWarningMsg, "cannot setEvent when m_room is set to nullptr.");
-    emptyHandler.setEvent(room->messageEvents().at(0).get());
 }

 void EventHandlerTest::eventId()
@@ -125,12 +91,6 @@ void EventHandlerTest::eventId()
    QCOMPARE(eventHandler.getId(), QStringLiteral("$153456789:example.org"));
 }

-void EventHandlerTest::nullEventId()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getId called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getId(), QString());
-}
-
 void EventHandlerTest::delegateType_data()
 {
    QTest::addColumn<int>("eventNum");
@@ -154,12 +114,6 @@ void EventHandlerTest::delegateType()
    QCOMPARE(eventHandler.getDelegateType(), delegateType);
 }

-void EventHandlerTest::nullDelegateType()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getDelegateType called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getDelegateType(), DelegateType::Other);
-}
-
 void EventHandlerTest::author()
 {
    auto event = room->messageEvents().at(0).get();
@@ -177,15 +131,6 @@ void EventHandlerTest::author()
    QCOMPARE(eventHandlerAuthor["object"_ls], QVariant::fromValue(author));
 }

-void EventHandlerTest::nullAuthor()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getAuthor called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getAuthor(), QVariantMap());
-
-    QTest::ignoreMessage(QtWarningMsg, "getAuthor called with m_event set to nullptr. Returning empty user.");
-    QCOMPARE(noEventHandler.getAuthor(), room->getUser(nullptr));
-}
-
 void EventHandlerTest::authorDisplayName()
 {
    auto event = room->messageEvents().at(1).get();
@@ -194,15 +139,6 @@ void EventHandlerTest::authorDisplayName()
    QCOMPARE(eventHandler.getAuthorDisplayName(), QStringLiteral("before"));
 }

-void EventHandlerTest::nullAuthorDisplayName()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getAuthorDisplayName(), QString());
-
-    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getAuthorDisplayName(), QString());
-}
-
 void EventHandlerTest::time()
 {
    auto event = room->messageEvents().at(0).get();
@@ -212,16 +148,6 @@ void EventHandlerTest::time()
    QCOMPARE(eventHandler.getTime(true, QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC)), QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC));
 }

-void EventHandlerTest::nullTime()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getTime called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getTime(), QDateTime());
-
-    eventHandler.setEvent(room->messageEvents().at(0).get());
-    QTest::ignoreMessage(QtWarningMsg, "a value must be provided for lastUpdated for a pending event.");
-    QCOMPARE(eventHandler.getTime(true), QDateTime());
-}
-
 void EventHandlerTest::timeString()
 {
    auto event = room->messageEvents().at(0).get();
@@ -243,16 +169,6 @@ void EventHandlerTest::timeString()
             format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().date(), QLocale::LongFormat));
 }

-void EventHandlerTest::nullTimeString()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getTimeString called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getTimeString(false), QString());
-
-    eventHandler.setEvent(room->messageEvents().at(0).get());
-    QTest::ignoreMessage(QtWarningMsg, "a value must be provided for lastUpdated for a pending event.");
-    QCOMPARE(eventHandler.getTimeString(false, QLocale::ShortFormat, true), QString());
-}
-
 void EventHandlerTest::highlighted()
 {
    auto event = room->messageEvents().at(2).get();
@@ -266,15 +182,6 @@ void EventHandlerTest::highlighted()
    QCOMPARE(eventHandler.isHighlighted(), false);
 }

-void EventHandlerTest::nullHighlighted()
-{
-    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.isHighlighted(), false);
-
-    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.isHighlighted(), false);
-}
-
 void EventHandlerTest::hidden()
 {
    auto event = room->messageEvents().at(3).get();
@@ -288,15 +195,6 @@ void EventHandlerTest::hidden()
    QCOMPARE(eventHandler.isHidden(), false);
 }

-void EventHandlerTest::nullHidden()
-{
-    QTest::ignoreMessage(QtWarningMsg, "isHidden called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.isHidden(), false);
-
-    QTest::ignoreMessage(QtWarningMsg, "isHidden called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.isHidden(), false);
-}
-
 void EventHandlerTest::body()
 {
    auto event = room->messageEvents().at(0).get();
@@ -308,15 +206,6 @@ void EventHandlerTest::body()
    QCOMPARE(eventHandler.getPlainBody(true), QStringLiteral("This is an example text message"));
 }

-void EventHandlerTest::nullBody()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getRichBody called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getRichBody(), QString());
-
-    QTest::ignoreMessage(QtWarningMsg, "getPlainBody called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getPlainBody(), QString());
-}
-
 void EventHandlerTest::genericBody_data()
 {
    QTest::addColumn<int>("eventNum");
@@ -339,12 +228,6 @@ void EventHandlerTest::genericBody()
    QCOMPARE(eventHandler.getGenericBody(), output);
 }

-void EventHandlerTest::nullGenericBody()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getGenericBody called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getGenericBody(), QString());
-}
-
 void EventHandlerTest::mediaInfo()
 {
    auto event = room->messageEvents().at(4).get();
@@ -368,15 +251,6 @@ void EventHandlerTest::mediaInfo()
    QCOMPARE(thumbnailInfo["height"_ls], 450);
 }

-void EventHandlerTest::nullMediaInfo()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getMediaInfo called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getMediaInfo(), QVariantMap());
-
-    QTest::ignoreMessage(QtWarningMsg, "getMediaInfo called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getMediaInfo(), QVariantMap());
-}
-
 void EventHandlerTest::linkPreviewer()
 {
    auto event = room->messageEvents().at(2).get();
@@ -390,15 +264,6 @@ void EventHandlerTest::linkPreviewer()
    QCOMPARE(eventHandler.getLinkPreviewer(), nullptr);
 }

-void EventHandlerTest::nullLinkPreviewer()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getLinkPreviewer called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getLinkPreviewer(), nullptr);
-
-    QTest::ignoreMessage(QtWarningMsg, "getLinkPreviewer called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getLinkPreviewer(), nullptr);
-}
-
 void EventHandlerTest::reactions()
 {
    auto event = room->messageEvents().at(0).get();
@@ -407,15 +272,6 @@ void EventHandlerTest::reactions()
    QCOMPARE(eventHandler.getReactions()->rowCount(), 1);
 }

-void EventHandlerTest::nullReactions()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getReactions called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReactions(), nullptr);
-
-    QTest::ignoreMessage(QtWarningMsg, "getReactions called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReactions(), nullptr);
-}
-
 void EventHandlerTest::hasReply()
 {
    auto event = room->messageEvents().at(5).get();
@@ -429,12 +285,6 @@ void EventHandlerTest::hasReply()
    QCOMPARE(eventHandler.hasReply(), false);
 }

-void EventHandlerTest::nullHasReply()
-{
-    QTest::ignoreMessage(QtWarningMsg, "hasReply called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.hasReply(), false);
-}
-
 void EventHandlerTest::replyId()
 {
    auto event = room->messageEvents().at(5).get();
@@ -448,12 +298,6 @@ void EventHandlerTest::replyId()
    QCOMPARE(eventHandler.getReplyId(), QStringLiteral(""));
 }

-void EventHandlerTest::nullReplyId()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getReplyId called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReplyId(), QString());
-}
-
 void EventHandlerTest::replyDelegateType()
 {
    auto event = room->messageEvents().at(5).get();
@@ -467,15 +311,6 @@ void EventHandlerTest::replyDelegateType()
    QCOMPARE(eventHandler.getReplyDelegateType(), DelegateType::Other);
 }

-void EventHandlerTest::nullReplyDelegateType()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getReplyDelegateType called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReplyDelegateType(), DelegateType::Other);
-
-    QTest::ignoreMessage(QtWarningMsg, "getReplyDelegateType called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReplyDelegateType(), DelegateType::Other);
-}
-
 void EventHandlerTest::replyAuthor()
 {
    auto event = room->messageEvents().at(5).get();
@@ -499,15 +334,6 @@ void EventHandlerTest::replyAuthor()
    QCOMPARE(eventHandler.getReplyAuthor(), room->getUser(nullptr));
 }

-void EventHandlerTest::nullReplyAuthor()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getReplyAuthor called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReplyAuthor(), QVariantMap());
-
-    QTest::ignoreMessage(QtWarningMsg, "getReplyAuthor called with m_event set to nullptr. Returning empty user.");
-    QCOMPARE(noEventHandler.getReplyAuthor(), room->getUser(nullptr));
-}
-
 void EventHandlerTest::replyBody()
 {
    auto event = room->messageEvents().at(5).get();
@@ -519,15 +345,6 @@ void EventHandlerTest::replyBody()
    QCOMPARE(eventHandler.getReplyPlainBody(true), QStringLiteral("This is an example text message"));
 }

-void EventHandlerTest::nullReplyBody()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getReplyRichBody called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReplyRichBody(), QString());
-
-    QTest::ignoreMessage(QtWarningMsg, "getReplyPlainBody called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReplyPlainBody(), QString());
-}
-
 void EventHandlerTest::replyMediaInfo()
 {
    auto event = room->messageEvents().at(6).get();
@@ -552,15 +369,6 @@ void EventHandlerTest::replyMediaInfo()
    QCOMPARE(thumbnailInfo["height"_ls], 450);
 }

-void EventHandlerTest::nullReplyMediaInfo()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getReplyMediaInfo called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReplyMediaInfo(), QVariantMap());
-
-    QTest::ignoreMessage(QtWarningMsg, "getReplyMediaInfo called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReplyMediaInfo(), QVariantMap());
-}
-
 void EventHandlerTest::thread()
 {
    auto event = room->messageEvents().at(0).get();
@@ -584,15 +392,6 @@ void EventHandlerTest::thread()
    QCOMPARE(eventHandler.getReplyId(), QStringLiteral("$threadmessage1:example.org"));
 }

-void EventHandlerTest::nullThread()
-{
-    QTest::ignoreMessage(QtWarningMsg, "isThreaded called with m_event set to nullptr.");
-    QCOMPARE(emptyHandler.isThreaded(), false);
-
-    QTest::ignoreMessage(QtWarningMsg, "threadRoot called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.threadRoot(), QString());
-}
-
 void EventHandlerTest::location()
 {
    auto event = room->messageEvents().at(7).get();
@@ -603,18 +402,6 @@ void EventHandlerTest::location()
    QCOMPARE(eventHandler.getLocationAssetType(), QStringLiteral("m.pin"));
 }

-void EventHandlerTest::nullLocation()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getLatitude called with m_event set to nullptr.");
-    QCOMPARE(emptyHandler.getLatitude(), -100.0);
-
-    QTest::ignoreMessage(QtWarningMsg, "getLongitude called with m_event set to nullptr.");
-    QCOMPARE(emptyHandler.getLongitude(), -200.0);
-
-    QTest::ignoreMessage(QtWarningMsg, "getLocationAssetType called with m_event set to nullptr.");
-    QCOMPARE(emptyHandler.getLocationAssetType(), QString());
-}
-
 void EventHandlerTest::readMarkers()
 {
    auto event = room->messageEvents().at(0).get();
@@ -644,37 +431,5 @@ void EventHandlerTest::readMarkers()
    QCOMPARE(eventHandler.getReadMarkersString().startsWith(QStringLiteral("6 users:")), true);
 }

-void EventHandlerTest::nullReadMarkers()
-{
-    QTest::ignoreMessage(QtWarningMsg, "hasReadMarkers called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.hasReadMarkers(), false);
-
-    QTest::ignoreMessage(QtWarningMsg, "getReadMarkers called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReadMarkers(), QVariantList());
-
-    QTest::ignoreMessage(QtWarningMsg, "getNumberExcessReadMarkers called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getNumberExcessReadMarkers(), QString());
-
-    QTest::ignoreMessage(QtWarningMsg, "getReadMarkersString called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReadMarkersString(), QString());
-
-    QTest::ignoreMessage(QtWarningMsg, "hasReadMarkers called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.hasReadMarkers(), false);
-
-    QTest::ignoreMessage(QtWarningMsg, "getReadMarkers called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReadMarkers(), QVariantList());
-
-    QTest::ignoreMessage(QtWarningMsg, "getNumberExcessReadMarkers called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getNumberExcessReadMarkers(), QString());
-
-    QTest::ignoreMessage(QtWarningMsg, "getReadMarkersString called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReadMarkersString(), QString());
-}
-
-void EventHandlerTest::cleanup()
-{
-    eventHandler.setEvent(nullptr);
-}
-
 QTEST_MAIN(EventHandlerTest)
 #include "eventhandlertest.moc"
--- a/autotests/neochatroomtest.cpp
+++ b/autotests/neochatroomtest.cpp
@@ -42,18 +42,101 @@ void NeoChatRoomTest::initTestCase()
    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
    room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);

-    QFile testMinSyncFile;
-    testMinSyncFile.setFileName(QLatin1String(DATA_DIR) + u'/' + QLatin1String("test-min-sync.json"));
-    testMinSyncFile.open(QIODevice::ReadOnly);
-    const auto testMinSyncJson = QJsonDocument::fromJson(testMinSyncFile.readAll());
-    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, testMinSyncJson.object());
+    auto json = QJsonDocument::fromJson(R"EVENT({
+  "account_data": {
+    "events": [
+      {
+        "content": {
+          "tags": {
+            "u.work": {
+              "order": 0.9
+            }
+          }
+        },
+        "type": "m.tag"
+      },
+      {
+        "content": {
+          "custom_config_key": "custom_config_value"
+        },
+        "type": "org.example.custom.room.config"
+      }
+    ]
+  },
+  "ephemeral": {
+    "events": [
+      {
+        "content": {
+          "user_ids": [
+            "@alice:matrix.org",
+            "@bob:example.com"
+          ]
+        },
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "type": "m.typing"
+      }
+    ]
+  },
+  "state": {
+    "events": [
+      {
+        "content": {
+          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
+          "displayname": "Alice Margatroid",
+          "membership": "join",
+          "reason": "Looking for support"
+        },
+        "event_id": "$143273582443PhrSn:example.org",
+        "origin_server_ts": 1432735824653,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "state_key": "@alice:example.org",
+        "type": "m.room.member",
+        "unsigned": {
+          "age": 1234
+        }
+      }
+    ]
+  },
+  "summary": {
+    "m.heroes": [
+      "@alice:example.com",
+      "@bob:example.com"
+    ],
+    "m.invited_member_count": 0,
+    "m.joined_member_count": 2
+  },
+  "timeline": {
+    "events": [
+      {
+        "content": {
+          "body": "This is an **example** text message",
+          "format": "org.matrix.custom.html",
+          "formatted_body": "<b>This is an example text message</b>",
+          "msgtype": "m.text"
+        },
+        "event_id": "$143273582443PhrSn:example.org",
+        "origin_server_ts": 1432735824654,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "type": "m.room.message",
+        "unsigned": {
+          "age": 1235
+        }
+      }
+    ],
+    "limited": true,
+    "prev_batch": "t34-23535_0_0"
+  }
+})EVENT");
+    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, json.object());
    room->update(std::move(roomData));
 }

 void NeoChatRoomTest::subtitleTextTest()
 {
    QCOMPARE(room->timelineSize(), 1);
-    QCOMPARE(room->lastEventToString(), QStringLiteral("@example:example.org: This is an example\ntext message"));
+    QCOMPARE(room->lastEventToString(), QStringLiteral("@example:example.org: This is an example text message"));
 }

 void NeoChatRoomTest::eventTest()
--- a/autotests/texthandlertest.cpp
+++ b/autotests/texthandlertest.cpp
@@ -40,7 +40,6 @@ private Q_SLOTS:
    void stripDisallowedTags();
    void stripDisallowedAttributes();
    void emptyCodeTags();
-    void formatBlockQuote();

    void sendSimpleStringCase();
    void sendSingleParaMarkup();
@@ -67,7 +66,6 @@ private Q_SLOTS:
    void receiveRichEdited_data();
    void receiveRichEdited();
    void receiveLineSeparator();
-    void receiveRichCodeUrl();

    void linkPreviewsMatch_data();
    void linkPreviewsMatch();
@@ -80,11 +78,131 @@ void TextHandlerTest::initTestCase()
    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
    room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);

-    QFile testTextHandlerSyncFile;
-    testTextHandlerSyncFile.setFileName(QLatin1String(DATA_DIR) + u'/' + QLatin1String("test-texthandler-sync.json"));
-    testTextHandlerSyncFile.open(QIODevice::ReadOnly);
-    const auto testTextHandlerSyncJson = QJsonDocument::fromJson(testTextHandlerSyncFile.readAll());
-    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, testTextHandlerSyncJson.object());
+    const auto json = QJsonDocument::fromJson(R"EVENT({
+  "account_data": {
+    "events": [
+      {
+        "content": {
+          "tags": {
+            "u.work": {
+              "order": 0.9
+            }
+          }
+        },
+        "type": "m.tag"
+      },
+      {
+        "content": {
+          "custom_config_key": "custom_config_value"
+        },
+        "type": "org.example.custom.room.config"
+      }
+    ]
+  },
+  "ephemeral": {
+    "events": [
+      {
+        "content": {
+          "user_ids": [
+            "@alice:matrix.org",
+            "@bob:example.com"
+          ]
+        },
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "type": "m.typing"
+      }
+    ]
+  },
+  "state": {
+    "events": [
+      {
+        "content": {
+          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
+          "displayname": "Alice Margatroid",
+          "membership": "join",
+          "reason": "Looking for support"
+        },
+        "event_id": "$143273582443PhrSn:example.org",
+        "origin_server_ts": 1432735824653,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "state_key": "@alice:example.org",
+        "type": "m.room.member",
+        "unsigned": {
+          "age": 1234
+        }
+      }
+    ]
+  },
+  "summary": {
+    "m.heroes": [
+      "@alice:example.com",
+      "@bob:example.com"
+    ],
+    "m.invited_member_count": 0,
+    "m.joined_member_count": 2
+  },
+  "timeline": {
+    "events": [
+      {
+        "content": {
+          "body": "This is an **example** text message",
+          "format": "org.matrix.custom.html",
+          "formatted_body": "<b>This is an example text message</b>",
+          "msgtype": "m.text"
+        },
+        "event_id": "$143273582443PhrSn:example.org",
+        "origin_server_ts": 1432735824654,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "type": "m.room.message",
+        "unsigned": {
+          "age": 1232
+        }
+      },
+      {
+        "content": {
+          "body": "/me This is an emote.",
+          "format": "org.matrix.custom.html",
+          "formatted_body": "This is an emote.",
+          "msgtype": "m.emote"
+        },
+        "event_id": "$153273582443PhrSn:example.org",
+        "origin_server_ts": 1532735824654,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "type": "m.room.message",
+        "unsigned": {
+          "age": 1231
+        }
+      },
+      {
+        "content": {
+            "body": "tested",
+            "msgtype": "m.text"
+        },
+        "event_id": "$zrCiBxBnqqTn0Z5FY78qSZAszno_w8nJJXzfBULG-3E",
+        "origin_server_ts": 1680948575928,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "type": "m.room.message",
+        "unsigned": {
+            "age": 1747776,
+            "m.relations": {
+                "m.replace": {
+                    "event_id": "$UX0PlpyI7vYO32iHMuuYEP7ECMh4sX3XLGiB2SwM4mQ",
+                    "origin_server_ts": 1680948580992,
+                    "sender": "@example:example.org"
+                }
+            }
+        }
+      }
+    ],
+    "limited": true,
+    "prev_batch": "t34-23535_0_0"
+  }
+})EVENT");
+    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, json.object());
    room->update(std::move(roomData));
 }

@@ -147,16 +265,6 @@ void TextHandlerTest::emptyCodeTags()
    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
 }

-void TextHandlerTest::formatBlockQuote()
-{
-    auto input = QStringLiteral("<blockquote>\n<p>Lorem Ispum</p>\n</blockquote>");
-    auto expectedOutput = QStringLiteral("<blockquote><table><tr><td>\u201CLorem Ispum\u201D</td></tr></table></blockquote>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(input);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), expectedOutput);
-}
-
 void TextHandlerTest::sendSimpleStringCase()
 {
    const QString testInputString = QStringLiteral("This data should just be put in a paragraph.");
@@ -469,9 +577,8 @@ void TextHandlerTest::receiveRichEdited_data()
    QTest::newRow("basic") << QStringLiteral("Edited") << QStringLiteral("Edited <span style=\"color:#000000\">(edited)</span>");
    QTest::newRow("multiple paragraphs") << QStringLiteral("<p>Edited</p>\n<p>Edited</p>")
                                         << QStringLiteral("<p>Edited</p>\n<p>Edited <span style=\"color:#000000\">(edited)</span></p>");
-    QTest::newRow("blockquote")
-        << QStringLiteral("<blockquote>Edited</blockquote>")
-        << QStringLiteral("<blockquote><table><tr><td>\u201CEdited\u201D</td></tr></table></blockquote><p> <span style=\"color:#000000\">(edited)</span></p>");
+    QTest::newRow("blockquote") << QStringLiteral("<blockquote>Edited</blockquote>")
+                                << QStringLiteral("<blockquote>Edited</blockquote><p> <span style=\"color:#000000\">(edited)</span></p>");
 }

 void TextHandlerTest::receiveRichEdited()
@@ -540,13 +647,5 @@ void TextHandlerTest::linkPreviewsReject()
    QCOMPARE(testTextHandler.getLinkPreviews(), testOutputLinks);
 }

-void TextHandlerTest::receiveRichCodeUrl()
-{
-    auto input = QStringLiteral("<code>https://kde.org</code>");
-    TextHandler testTextHandler;
-    testTextHandler.setData(input);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), input);
-}
-
 QTEST_MAIN(TextHandlerTest)
 #include "texthandlertest.moc"
--- a/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
@@ -11,7 +11,6 @@
  </provides>
  <name>NeoChat</name>
  <name xml:lang="ar">نيوتشات</name>
-  <name xml:lang="ast">NeoChat</name>
  <name xml:lang="az">NeoChat</name>
  <name xml:lang="ca">NeoChat</name>
  <name xml:lang="ca-valencia">NeoChat</name>
@@ -99,7 +98,7 @@ to provide a convergent experience across multiple platforms.</p>
    <p>NeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.</p>
    <p xml:lang="ar">يهدف نيوتشات إلى أن يكون تطبيقًا كامل الميزات لمواصفات ماتركس. على هذا النحو يتم دعم كل شيء في المواصفات المستقرة الحالية مع الاستثناءات الملحوظة لـ VoIP والخيوط وبعض جوانب التشفير من طرف إلى طرف. هناك عدد قليل من الإغفالات الصغيرة الأخرى بسبب حقيقة أن مواصفات ماتركس تتطور باستمرار ، ولكن يبقى الهدف توفير الدعم النهائي للمواصفات بأكملها.</p>
    <p xml:lang="ca">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de la VoIP, fils i alguns aspectes de l'encriptatge d'extrem a extrem. Hi ha algunes altres omissions més petites a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu segueix sent proporcionar suport eventual per a tota l'especificació.</p>
-    <p xml:lang="ca-valencia">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de la VoIP, fils i alguns aspectes de l'encriptació d'extrem a extrem. Hi ha algunes altres omissions més xicotetes a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu seguix sent proporcionar suport eventual per a tota l'especificació.</p>
+    <p xml:lang="ca-valencia">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de VoIP, fils i alguns aspectes de l'encriptació d'extrem a extrem. Hi ha algunes altres omissions més xicotetes a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu seguix sent proporcionar suport eventual per a tota l'especificació.</p>
    <p xml:lang="en-GB">NeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.</p>
    <p xml:lang="eo">NeoChat celas esti plene kapabla aplikaĵo por la Matrix-specifo. Kiel tia, ĉio en la nuna stabila specifo kun la rimarkindaj esceptoj de VoIP, fadenoj kaj kelkaj aspektoj de Fin-al-Fina Ĉifrado estas subtenataj. Estas kelkaj aliaj pli malgrandaj preterlasoj pro la fakto, ke la Matrix-speco konstante evoluas, sed la celo restas provizi finfine subtenon por la tuta specifaĵo.</p>
    <p xml:lang="es">NeoChat pretende ser una aplicación con todas las funciones para la especificación de Matrix. Como tal, admite todo en la especificación estable actual, con las notables excepciones de VoIP, subprocesos y algunas funciones de cifrado de extremo a extremo. Existen algunas omisiones menos importantes debido al hecho de que la especificación de Matrix está en constante evolución, pero el objetivo sigue siendo brindar compatibilidad final con toda la especificación.</p>
@@ -343,7 +342,6 @@ to provide a convergent experience across multiple platforms.</p>
    <content_attribute id="social-chat">intense</content_attribute>
  </content_rating>
  <releases>
-    <release version="23.08.3" date="2023-11-09"/>
    <release version="23.08.2" date="2023-10-12"/>
    <release version="23.08.0" date="2023-08-24">
      <url>https://kde.org/announcements/gear/23.08.0/#neochathttpsappskdeorgneochat</url>
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -4,7 +4,6 @@
 Version=1.5
 Name=NeoChat
 Name[ar]=نيوتشات
-Name[ast]=NeoChat
 Name[az]=NeoChat
 Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
--- a/po/ar/neochat.po
+++ b/po/ar/neochat.po
--- a/po/ast/neochat.po
+++ b/po/ast/neochat.po
--- a/po/az/neochat.po
+++ b/po/az/neochat.po
--- a/po/ca/neochat.po
+++ b/po/ca/neochat.po
--- a/po/ca@valencia/neochat.po
+++ b/po/ca@valencia/neochat.po
--- a/po/cs/neochat.po
+++ b/po/cs/neochat.po
--- a/po/da/neochat.po
+++ b/po/da/neochat.po
--- a/po/de/neochat.po
+++ b/po/de/neochat.po
--- a/po/el/neochat.po
+++ b/po/el/neochat.po
--- a/po/en_GB/neochat.po
+++ b/po/en_GB/neochat.po
--- a/po/eo/neochat.po
+++ b/po/eo/neochat.po
--- a/po/es/neochat.po
+++ b/po/es/neochat.po
--- a/po/eu/neochat.po
+++ b/po/eu/neochat.po
--- a/po/fi/neochat.po
+++ b/po/fi/neochat.po
--- a/po/fr/neochat.po
+++ b/po/fr/neochat.po
--- a/po/hu/neochat.po
+++ b/po/hu/neochat.po
--- a/po/ia/neochat.po
+++ b/po/ia/neochat.po
--- a/po/id/neochat.po
+++ b/po/id/neochat.po
--- a/po/ie/neochat.po
+++ b/po/ie/neochat.po
--- a/po/it/neochat.po
+++ b/po/it/neochat.po
--- a/po/ja/neochat.po
+++ b/po/ja/neochat.po
--- a/po/ka/neochat.po
+++ b/po/ka/neochat.po
--- a/po/ko/neochat.po
+++ b/po/ko/neochat.po
--- a/po/lt/neochat.po
+++ b/po/lt/neochat.po
--- a/po/nl/neochat.po
+++ b/po/nl/neochat.po
--- a/po/nn/neochat.po
+++ b/po/nn/neochat.po
--- a/po/pa/neochat.po
+++ b/po/pa/neochat.po
--- a/po/pl/neochat.po
+++ b/po/pl/neochat.po
--- a/po/pt/neochat.po
+++ b/po/pt/neochat.po
--- a/po/pt_BR/neochat.po
+++ b/po/pt_BR/neochat.po
--- a/po/ru/neochat.po
+++ b/po/ru/neochat.po
--- a/po/sk/neochat.po
+++ b/po/sk/neochat.po
--- a/po/sl/neochat.po
+++ b/po/sl/neochat.po
--- a/po/sv/neochat.po
+++ b/po/sv/neochat.po
--- a/po/ta/neochat.po
+++ b/po/ta/neochat.po
--- a/po/tok/neochat.po
+++ b/po/tok/neochat.po
--- a/po/tr/neochat.po
+++ b/po/tr/neochat.po
--- a/po/uk/neochat.po
+++ b/po/uk/neochat.po
--- a/po/zh_CN/neochat.po
+++ b/po/zh_CN/neochat.po
--- a/po/zh_TW/neochat.po
+++ b/po/zh_TW/neochat.po
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -137,8 +137,6 @@ add_library(neochat STATIC
    roomlastmessageprovider.h
    chatbarcache.cpp
    chatbarcache.h
-    colorschemer.cpp
-    colorschemer.h
 )

 qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
@@ -146,14 +144,13 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
        qml/main.qml
        qml/AccountMenu.qml
        qml/ExploreComponent.qml
-        qml/ExploreComponentMobile.qml
        qml/ContextMenu.qml
        qml/CollapsedRoomDelegate.qml
        qml/RoomDelegate.qml
        qml/RoomListPage.qml
        qml/SpaceListContextMenu.qml
        qml/UserInfo.qml
-        qml/UserInfoDesktop.qml
+        qml/LoadingPage.qml
        qml/RoomPage.qml
        qml/RoomWindow.qml
        qml/JoinRoomPage.qml
@@ -164,13 +161,14 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
        qml/ImageEditorPage.qml
        qml/WelcomePage.qml
        qml/General.qml
-        qml/RoomSecurity.qml
+        qml/Security.qml
        qml/PushNotification.qml
        qml/Categories.qml
        qml/Permissions.qml
        qml/NeochatMaximizeComponent.qml
        qml/FancyEffectsContainer.qml
        qml/TypingPane.qml
+        qml/ShimmerGradient.qml
        qml/QuickSwitcher.qml
        qml/HoverActions.qml
        qml/ChatBox.qml
@@ -287,9 +285,6 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
        qml/SpaceHierarchyDelegate.qml
        qml/RemoveChildDialog.qml
        qml/SelectParentDialog.qml
-        qml/Security.qml
-        qml/QrCodeMaximizeComponent.qml
-        qml/SelectSpacesDialog.qml
    RESOURCES
        qml/confetti.png
        qml/glowdot.png
@@ -311,13 +306,6 @@ ecm_qt_declare_logging_category(neochat
    DEFAULT_SEVERITY Info
 )

-ecm_qt_declare_logging_category(neochat
-    HEADER "chatdocumenthandler_logging.h"
-    IDENTIFIER "ChatDocumentHandling"
-    CATEGORY_NAME "org.kde.neochat.chatdocumenthandler"
-    DEFAULT_SEVERITY Info
-)
-
 add_executable(neochat-app
    main.cpp
 )
@@ -338,13 +326,15 @@ ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)
 target_sources(neochat-app PRIVATE ${NEOCHAT_ICON})

 if(NOT ANDROID)
+    target_sources(neochat PRIVATE colorschemer.cpp colorschemer.h)
    if (NOT WIN32 AND NOT APPLE)
        target_sources(neochat PRIVATE trayicon_sni.cpp trayicon_sni.h)
        target_link_libraries(neochat PRIVATE KF6::StatusNotifierItem)
    else()
        target_sources(neochat PRIVATE trayicon.cpp trayicon.h)
    endif()
-    target_link_libraries(neochat PUBLIC KF6::WindowSystem ICU::uc)
+    target_link_libraries(neochat PUBLIC KF6::ConfigWidgets KF6::WindowSystem ICU::uc)
+    target_compile_definitions(neochat PUBLIC -DHAVE_COLORSCHEME)
    target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM)
    target_compile_definitions(neochat PUBLIC -DHAVE_ICU)
 endif()
@@ -356,27 +346,7 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
 endif()

 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums)
-target_link_libraries(neochat PUBLIC
-    Qt::Core
-    Qt::Quick
-    Qt::Qml
-    Qt::Gui
-    Qt::Multimedia
-    Qt::Network
-    Qt::QuickControls2
-    KF6::I18n
-    KF6::Kirigami2
-    KF6::Notifications
-    KF6::ConfigCore
-    KF6::ConfigGui
-    KF6::CoreAddons
-    KF6::SonnetCore
-    KF6::ColorScheme
-    KF6::ItemModels
-    QuotientQt6
-    cmark::cmark
-    QCoro::Core
-)
+target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF6::I18n KF6::Kirigami2 KF6::Notifications KF6::ConfigCore KF6::ConfigGui KF6::CoreAddons KF6::SonnetCore  KF6::ItemModels QuotientQt6 cmark::cmark QCoro::Core)

 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)

@@ -464,7 +434,6 @@ if(ANDROID)
        "gps"
        "system-users-symbolic"
    )
-    ecm_add_android_apk(neochat-app ANDROID_DIR ${CMAKE_SOURCE_DIR/android})
 else()
    target_link_libraries(neochat PUBLIC Qt::Widgets KF6::KIOWidgets)
    install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
--- a/src/actionshandler.cpp
+++ b/src/actionshandler.cpp
@@ -35,7 +35,6 @@ void ActionsHandler::setRoom(NeoChatRoom *room)
    }

    m_room = room;
-    Q_EMIT roomChanged();
 }

 void ActionsHandler::handleMessageEvent(ChatBarCache *chatBarCache)
@@ -75,7 +74,7 @@ QString ActionsHandler::handleMentions(QString handledText, QList<Mention> *ment
        }
        handledText = handledText.replace(mention.cursor.anchor(),
                                          mention.cursor.position() - mention.cursor.anchor(),
-                                          QStringLiteral("[%1](https://matrix.to/#/%2)").arg(mention.text.toHtmlEscaped(), mention.id));
+                                          QStringLiteral("[%1](https://matrix.to/#/%2)").arg(mention.text, mention.id));
    }
    mentions->clear();

--- a/src/actionshandler.h
+++ b/src/actionshandler.h
@@ -35,20 +35,18 @@ class ActionsHandler : public QObject
 {
    Q_OBJECT
    QML_ELEMENT
-
-    /**
-     * @brief The room that messages will be sent to.
-     */
-    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
+    QML_UNCREATABLE("")

 public:
    explicit ActionsHandler(QObject *parent = nullptr);

+    /**
+     * @brief The room that messages will be sent to.
+     */
    [[nodiscard]] NeoChatRoom *room() const;
    void setRoom(NeoChatRoom *room);

 Q_SIGNALS:
-    void roomChanged();
    void showEffect(const QString &effect);

 public Q_SLOTS:
--- a/src/chatbarcache.cpp
+++ b/src/chatbarcache.cpp
@@ -173,5 +173,3 @@ void ChatBarCache::setSavedText(const QString &savedText)
 {
    m_savedText = savedText;
 }
-
-#include "moc_chatbarcache.cpp"
--- a/src/chatdocumenthandler.cpp
+++ b/src/chatdocumenthandler.cpp
@@ -14,8 +14,6 @@
 #include <Sonnet/BackgroundChecker>
 #include <Sonnet/Settings>

-#include "chatdocumenthandler_logging.h"
-
 class SyntaxHighlighter : public QSyntaxHighlighter
 {
 public:
@@ -100,7 +98,7 @@ ChatDocumentHandler::ChatDocumentHandler(QObject *parent)
    , m_document(nullptr)
    , m_cursorPosition(-1)
    , m_highlighter(new SyntaxHighlighter(this))
-    , m_completionModel(new CompletionModel(this))
+    , m_completionModel(new CompletionModel())
 {
    connect(this, &ChatDocumentHandler::roomChanged, this, [this]() {
        m_completionModel->setRoom(m_room);
@@ -150,6 +148,20 @@ int ChatDocumentHandler::completionStartIndex() const
    return start;
 }

+bool ChatDocumentHandler::isEdit() const
+{
+    return m_isEdit;
+}
+
+void ChatDocumentHandler::setIsEdit(bool edit)
+{
+    if (edit == m_isEdit) {
+        return;
+    }
+    m_isEdit = edit;
+    Q_EMIT isEditChanged();
+}
+
 QQuickTextDocument *ChatDocumentHandler::document() const
 {
    return m_document;
@@ -215,15 +227,6 @@ void ChatDocumentHandler::setChatBarCache(ChatBarCache *chatBarCache)

 void ChatDocumentHandler::complete(int index)
 {
-    if (m_document == nullptr) {
-        qCWarning(ChatDocumentHandling) << "complete called with m_document set to nullptr.";
-        return;
-    }
-    if (m_completionModel->autoCompletionType() == CompletionModel::None) {
-        qCWarning(ChatDocumentHandling) << "complete called with m_completionModel->autoCompletionType() == CompletionModel::None.";
-        return;
-    }
-
    if (m_completionModel->autoCompletionType() == CompletionModel::User) {
        auto name = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::DisplayNameRole).toString();
        auto id = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::SubtitleRole).toString();
@@ -307,17 +310,15 @@ void ChatDocumentHandler::setSelectionEnd(int position)

 QString ChatDocumentHandler::getText() const
 {
-    if (!m_chatBarCache) {
-        qCWarning(ChatDocumentHandling) << "getText called with m_chatBarCache set to nullptr.";
-        return {};
+    if (!m_room) {
+        return QString();
    }
    return m_chatBarCache->text();
 }

 void ChatDocumentHandler::pushMention(const Mention mention) const
 {
-    if (!m_chatBarCache) {
-        qCWarning(ChatDocumentHandling) << "pushMention called with m_chatBarCache set to nullptr.";
+    if (!m_room) {
        return;
    }
    m_chatBarCache->mentions()->push_back(mention);
--- a/src/chatdocumenthandler.h
+++ b/src/chatdocumenthandler.h
@@ -62,6 +62,14 @@ class ChatDocumentHandler : public QObject
    Q_OBJECT
    QML_ELEMENT

+    /**
+     * @brief Is the instance being used to handle an edit message.
+     *
+     * This is needed to ensure that the text and mentions are saved and retrieved
+     * from the correct parameters in the assigned room.
+     */
+    Q_PROPERTY(bool isEdit READ isEdit WRITE setIsEdit NOTIFY isEditChanged)
+
    /**
     * @brief The QQuickTextDocument that is being handled.
     */
@@ -88,7 +96,7 @@ class ChatDocumentHandler : public QObject
     * This is typically provided to a qml component to visualise the current
     * completion results.
     */
-    Q_PROPERTY(CompletionModel *completionModel READ completionModel CONSTANT)
+    Q_PROPERTY(CompletionModel *completionModel READ completionModel NOTIFY completionModelChanged)

    /**
     * @brief The current room that the the text document is being handled for.
@@ -113,6 +121,9 @@ class ChatDocumentHandler : public QObject
 public:
    explicit ChatDocumentHandler(QObject *parent = nullptr);

+    [[nodiscard]] bool isEdit() const;
+    void setIsEdit(bool edit);
+
    [[nodiscard]] QQuickTextDocument *document() const;
    void setDocument(QQuickTextDocument *document);

@@ -133,6 +144,7 @@ public:

    Q_INVOKABLE void complete(int index);

+    void updateCompletions();
    CompletionModel *completionModel() const;

    [[nodiscard]] QColor mentionColor() const;
@@ -142,10 +154,12 @@ public:
    void setErrorColor(const QColor &color);

 Q_SIGNALS:
+    void isEditChanged();
    void documentChanged();
    void cursorPositionChanged();
    void roomChanged();
    void chatBarCacheChanged();
+    void completionModelChanged();
    void selectionStartChanged();
    void selectionEndChanged();
    void errorColorChanged();
@@ -154,6 +168,8 @@ Q_SIGNALS:
 private:
    int completionStartIndex() const;

+    bool m_isEdit = false;
+
    QPointer<QQuickTextDocument> m_document;

    QPointer<NeoChatRoom> m_room;
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -6,8 +6,13 @@

 #include <qt6keychain/keychain.h>

+#include <KConfig>
+#include <KConfigGroup>
 #include <KLocalizedString>
 #include <KWindowConfig>
+#ifdef HAVE_WINDOWSYSTEM
+#include <KWindowEffects>
+#endif

 #include <QFile>
 #include <QFileInfo>
@@ -60,8 +65,7 @@ Controller::Controller(QObject *parent)
        invokeLogin();
    });

-    QObject::connect(QGuiApplication::instance(), &QCoreApplication::aboutToQuit, QGuiApplication::instance(), [this] {
-        delete m_trayIcon;
+    QObject::connect(QGuiApplication::instance(), &QCoreApplication::aboutToQuit, QGuiApplication::instance(), [] {
        NeoChatConfig::self()->save();
    });

@@ -99,6 +103,10 @@ Controller::Controller(QObject *parent)
        }
        oldAccountCount = m_accountRegistry.size();
    });
+
+    QTimer::singleShot(0, this, [this] {
+        m_pushRuleModel = new PushRuleModel;
+    });
 }

 Controller &Controller::instance()
@@ -167,8 +175,6 @@ void Controller::invokeLogin()
    QString id = NeoChatConfig::self()->activeConnection();
    for (const auto &accountId : accounts) {
        AccountSettings account{accountId};
-        m_accountsLoading += accountId;
-        Q_EMIT accountsLoadingChanged();
        if (id.isEmpty()) {
            // handle case where the account config is empty
            id = accountId;
@@ -188,8 +194,6 @@ void Controller::invokeLogin()
                connect(connection, &NeoChatConnection::connected, this, [this, connection, id] {
                    connection->loadState();
                    addConnection(connection);
-                    m_accountsLoading.removeAll(connection->userId());
-                    Q_EMIT accountsLoadingChanged();
                    if (connection->userId() == id) {
                        setActiveConnection(connection);
                        connectSingleShot(connection, &NeoChatConnection::syncDone, this, &Controller::initiated);
@@ -350,6 +354,12 @@ void Controller::setActiveConnection(NeoChatConnection *connection)
    }
    NeoChatConfig::self()->save();
    Q_EMIT activeConnectionChanged();
+    Q_EMIT activeConnectionIndexChanged();
+}
+
+PushRuleModel *Controller::pushRuleModel() const
+{
+    return m_pushRuleModel;
 }

 void Controller::saveWindowGeometry()
@@ -374,6 +384,56 @@ void Controller::joinRoom(const QString &alias)
    RoomManager::instance().joinRoom(m_connection, alias, QStringList{knownServer});
 }

+void Controller::openOrCreateDirectChat(User *user)
+{
+    const auto existing = activeConnection()->directChats();
+
+    if (existing.contains(user)) {
+        const auto &room = static_cast<NeoChatRoom *>(activeConnection()->room(existing.value(user)));
+        if (room) {
+            RoomManager::instance().enterRoom(room);
+            return;
+        }
+    }
+    activeConnection()->requestDirectChat(user);
+}
+
+QString Controller::formatByteSize(double size, int precision) const
+{
+    return QLocale().formattedDataSize(size, precision);
+}
+
+QString Controller::formatDuration(quint64 msecs, KFormat::DurationFormatOptions options) const
+{
+    return KFormat().formatDuration(msecs, options);
+}
+
+void Controller::setBlur(QQuickItem *item, bool blur)
+{
+#ifdef HAVE_WINDOWSYSTEM
+    auto setWindows = [item, blur]() {
+        auto reg = QRect(QPoint(0, 0), item->window()->size());
+        KWindowEffects::enableBackgroundContrast(item->window(), blur, 1, 1, 1, reg);
+        KWindowEffects::enableBlurBehind(item->window(), blur, reg);
+    };
+
+    disconnect(item->window(), &QQuickWindow::heightChanged, this, nullptr);
+    disconnect(item->window(), &QQuickWindow::widthChanged, this, nullptr);
+    connect(item->window(), &QQuickWindow::heightChanged, this, setWindows);
+    connect(item->window(), &QQuickWindow::widthChanged, this, setWindows);
+    setWindows();
+#endif
+}
+
+bool Controller::hasWindowSystem() const
+{
+#ifdef HAVE_WINDOWSYSTEM
+    return true;
+#else
+    return false;
+#endif
+}
+
 void Controller::forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item)
 {
    // HACK: Workaround bug QTBUG 93281
@@ -410,6 +470,14 @@ void Controller::setApplicationProxy()
    QNetworkProxy::setApplicationProxy(proxy);
 }

+int Controller::activeConnectionIndex() const
+{
+    auto result = std::find_if(m_accountRegistry.accounts().begin(), m_accountRegistry.accounts().end(), [this](const auto &it) {
+        return it == m_connection;
+    });
+    return result - m_accountRegistry.accounts().begin();
+}
+
 bool Controller::isFlatpak() const
 {
 #ifdef NEOCHAT_FLATPAK
--- a/src/controller.h
+++ b/src/controller.h
@@ -3,10 +3,13 @@

 #pragma once

+#include "models/pushrulemodel.h"
 #include <QObject>
 #include <QQmlEngine>
 #include <QQuickItem>

+#include <KFormat>
+
 #include "neochatconnection.h"
 #include <Quotient/accountregistry.h>
 #include <Quotient/jobs/basejob.h>
@@ -46,11 +49,26 @@ class Controller : public QObject
     */
    Q_PROPERTY(NeoChatConnection *activeConnection READ activeConnection WRITE setActiveConnection NOTIFY activeConnectionChanged)

+    /**
+     * @brief The PushRuleModel that has the active connection's push rules.
+     */
+    Q_PROPERTY(PushRuleModel *pushRuleModel READ pushRuleModel CONSTANT)
+
+    /**
+     * @brief The row number in the accounts directory of the active connection.
+     */
+    Q_PROPERTY(int activeConnectionIndex READ activeConnectionIndex NOTIFY activeConnectionIndexChanged)
+
    /**
     * @brief Whether the OS NeoChat is running on supports sytem tray icons.
     */
    Q_PROPERTY(bool supportSystemTray READ supportSystemTray CONSTANT)

+    /**
+     * @brief Whether KWindowSystem specific features are available.
+     */
+    Q_PROPERTY(bool hasWindowSystem READ hasWindowSystem CONSTANT)
+
    /**
     * @brief Whether NeoChat is currently able to connect to the server.
     */
@@ -63,8 +81,6 @@ class Controller : public QObject
     */
    Q_PROPERTY(bool isFlatpak READ isFlatpak CONSTANT)

-    Q_PROPERTY(QStringList accountsLoading MEMBER m_accountsLoading NOTIFY accountsLoadingChanged)
-
 public:
    /**
     * @brief Defines the status after an attempt to change the password on an account.
@@ -86,6 +102,8 @@ public:
    void setActiveConnection(NeoChatConnection *connection);
    [[nodiscard]] NeoChatConnection *activeConnection() const;

+    [[nodiscard]] PushRuleModel *pushRuleModel() const;
+
    /**
     * @brief Add a new connection to the account registry.
     */
@@ -96,6 +114,8 @@ public:
     */
    void dropConnection(NeoChatConnection *c);

+    int activeConnectionIndex() const;
+
    /**
     * @brief Save an access token to the keychain for the given account.
     */
@@ -106,8 +126,20 @@ public:
     */
    Q_INVOKABLE void joinRoom(const QString &alias);

+    /**
+     * @brief Join a direct chat with the given user.
+     *
+     * If a direct chat with the user doesn't exist one is created and then joined.
+     */
+    Q_INVOKABLE void openOrCreateDirectChat(Quotient::User *user);
+
    [[nodiscard]] bool supportSystemTray() const;

+    /**
+     * @brief Set the background blur status of the given item.
+     */
+    Q_INVOKABLE void setBlur(QQuickItem *item, bool blur);
+
    bool isOnline() const;

    /**
@@ -119,6 +151,20 @@ public:

    bool isFlatpak() const;

+    /**
+     * @brief Return a string for the input timestamp.
+     *
+     * The output format depends on the KFormat::DurationFormatOptions chosen.
+     *
+     * @sa KFormat::DurationFormatOptions
+     */
+    Q_INVOKABLE QString formatDuration(quint64 msecs, KFormat::DurationFormatOptions options = KFormat::DefaultDuration) const;
+
+    /**
+     * @brief Return a human readable string for a given input number of bytes.
+     */
+    Q_INVOKABLE QString formatByteSize(double size, int precision = 1) const;
+
    /**
     * @brief Force a QQuickTextDocument to refresh when images are loaded.
     *
@@ -141,8 +187,10 @@ private:
    bool m_isOnline = true;
    QMap<Quotient::Room *, int> m_notificationCounts;

+    bool hasWindowSystem() const;
+
+    QPointer<PushRuleModel> m_pushRuleModel;
    Quotient::AccountRegistry m_accountRegistry;
-    QStringList m_accountsLoading;

 private Q_SLOTS:
    void invokeLogin();
@@ -165,7 +213,7 @@ Q_SIGNALS:
    void passwordStatus(Controller::PasswordStatus status);
    void userConsentRequired(QUrl url);
    void isOnlineChanged(bool isOnline);
-    void accountsLoadingChanged();
+    void activeConnectionIndexChanged();

 public Q_SLOTS:
    void saveWindowGeometry();
--- a/src/eventhandler.cpp
+++ b/src/eventhandler.cpp
@@ -19,7 +19,6 @@
 #include <Quotient/events/stickerevent.h>
 #include <Quotient/quotient_common.h>

-#include "delegatetype.h"
 #include "eventhandler_logging.h"
 #include "events/pollevent.h"
 #include "linkpreviewer.h"
@@ -51,10 +50,6 @@ const Quotient::Event *EventHandler::getEvent() const

 void EventHandler::setEvent(const Quotient::RoomEvent *event)
 {
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "cannot setEvent when m_room is set to nullptr.";
-        return;
-    }
    if (event == m_event) {
        return;
    }
@@ -186,7 +181,7 @@ QDateTime EventHandler::getTime(bool isPending, QDateTime lastUpdated) const
 QString EventHandler::getTimeString(bool relative, QLocale::FormatType format, bool isPending, QDateTime lastUpdated) const
 {
    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getTimeString called with m_event set to nullptr.";
+        qCWarning(EventHandling) << "getTime called with m_event set to nullptr.";
        return {};
    }
    if (isPending && lastUpdated == QDateTime()) {
@@ -221,15 +216,6 @@ bool EventHandler::isHighlighted()

 bool EventHandler::isHidden()
 {
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "isHidden called with m_room set to nullptr.";
-        return false;
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "isHidden called with m_event set to nullptr.";
-        return false;
-    }
-
    if (m_event->isStateEvent() && !NeoChatConfig::self()->showStateEvent()) {
        return true;
    }
@@ -625,14 +611,6 @@ QString EventHandler::getGenericBody() const

 QVariantMap EventHandler::getMediaInfo() const
 {
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getMediaInfo called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getMediaInfo called with m_event set to nullptr.";
-        return {};
-    }
    return getMediaInfoForEvent(m_event);
 }

@@ -745,14 +723,6 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo

 QSharedPointer<LinkPreviewer> EventHandler::getLinkPreviewer() const
 {
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getLinkPreviewer called with m_room set to nullptr.";
-        return nullptr;
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getLinkPreviewer called with m_event set to nullptr.";
-        return nullptr;
-    }
    if (!m_event->is<RoomMessageEvent>()) {
        return nullptr;
    }
@@ -784,7 +754,7 @@ QSharedPointer<ReactionModel> EventHandler::getReactions() const
 {
    if (m_room == nullptr) {
        qCWarning(EventHandling) << "getReactions called with m_room set to nullptr.";
-        return nullptr;
+        return {};
    }
    if (m_event == nullptr) {
        qCWarning(EventHandling) << "getReactions called with m_event set to nullptr.";
@@ -836,33 +806,16 @@ QSharedPointer<ReactionModel> EventHandler::getReactions() const

 bool EventHandler::hasReply() const
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "hasReply called with m_event set to nullptr.";
-        return false;
-    }
    return !m_event->contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString().isEmpty();
 }

 QString EventHandler::getReplyId() const
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReplyId called with m_event set to nullptr.";
-        return {};
-    }
    return m_event->contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString();
 }

 DelegateType::Type EventHandler::getReplyDelegateType() const
 {
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReplyDelegateType called with m_room set to nullptr.";
-        return DelegateType::Other;
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReplyDelegateType called with m_event set to nullptr.";
-        return DelegateType::Other;
-    }
-
    auto replyEvent = m_room->getReplyForEvent(*m_event);
    if (replyEvent == nullptr) {
        return DelegateType::Other;
@@ -950,11 +903,6 @@ QVariantMap EventHandler::getReplyMediaInfo() const

 bool EventHandler::isThreaded() const
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "isThreaded called with m_event set to nullptr.";
-        return false;
-    }
-
    return (m_event->contentPart<QJsonObject>("m.relates_to"_ls).contains("rel_type"_ls)
            && m_event->contentPart<QJsonObject>("m.relates_to"_ls)["rel_type"_ls].toString() == "m.thread"_ls)
        || (!m_event->unsignedPart<QJsonObject>("m.relations"_ls).isEmpty() && m_event->unsignedPart<QJsonObject>("m.relations"_ls).contains("m.thread"_ls));
@@ -962,11 +910,6 @@ bool EventHandler::isThreaded() const

 QString EventHandler::threadRoot() const
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "threadRoot called with m_event set to nullptr.";
-        return {};
-    }
-
    // Get the thread root ID from m.relates_to if it exists.
    if (m_event->contentPart<QJsonObject>("m.relates_to"_ls).contains("rel_type"_ls)
        && m_event->contentPart<QJsonObject>("m.relates_to"_ls)["rel_type"_ls].toString() == "m.thread"_ls) {
@@ -982,11 +925,6 @@ QString EventHandler::threadRoot() const

 float EventHandler::getLatitude() const
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getLatitude called with m_event set to nullptr.";
-        return -100.0;
-    }
-
    const auto geoUri = m_event->contentJson()["geo_uri"_ls].toString();
    if (geoUri.isEmpty()) {
        return -100.0; // latitude runs from -90deg to +90deg so -100 is out of range.
@@ -997,11 +935,6 @@ float EventHandler::getLatitude() const

 float EventHandler::getLongitude() const
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getLongitude called with m_event set to nullptr.";
-        return -200.0;
-    }
-
    const auto geoUri = m_event->contentJson()["geo_uri"_ls].toString();
    if (geoUri.isEmpty()) {
        return -200.0; // longitude runs from -180deg to +180deg so -200 is out of range.
@@ -1012,11 +945,6 @@ float EventHandler::getLongitude() const

 QString EventHandler::getLocationAssetType() const
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getLocationAssetType called with m_event set to nullptr.";
-        return {};
-    }
-
    const auto assetType = m_event->contentJson()["org.matrix.msc3488.asset"_ls].toObject()["type"_ls].toString();
    if (assetType.isEmpty()) {
        return {};
@@ -1026,15 +954,6 @@ QString EventHandler::getLocationAssetType() const

 bool EventHandler::hasReadMarkers() const
 {
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "hasReadMarkers called with m_room set to nullptr.";
-        return false;
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "hasReadMarkers called with m_event set to nullptr.";
-        return false;
-    }
-
    auto userIds = m_room->userIdsAtEvent(m_event->id());
    userIds.remove(m_room->localUser()->id());
    return userIds.size() > 0;
@@ -1042,15 +961,6 @@ bool EventHandler::hasReadMarkers() const

 QVariantList EventHandler::getReadMarkers(int maxMarkers) const
 {
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReadMarkers called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReadMarkers called with m_event set to nullptr.";
-        return {};
-    }
-
    auto userIds_temp = m_room->userIdsAtEvent(m_event->id());
    userIds_temp.remove(m_room->localUser()->id());

@@ -1071,15 +981,6 @@ QVariantList EventHandler::getReadMarkers(int maxMarkers) const

 QString EventHandler::getNumberExcessReadMarkers(int maxMarkers) const
 {
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getNumberExcessReadMarkers called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getNumberExcessReadMarkers called with m_event set to nullptr.";
-        return {};
-    }
-
    auto userIds = m_room->userIdsAtEvent(m_event->id());
    userIds.remove(m_room->localUser()->id());

@@ -1092,15 +993,6 @@ QString EventHandler::getNumberExcessReadMarkers(int maxMarkers) const

 QString EventHandler::getReadMarkersString() const
 {
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReadMarkersString called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReadMarkersString called with m_event set to nullptr.";
-        return {};
-    }
-
    auto userIds = m_room->userIdsAtEvent(m_event->id());
    userIds.remove(m_room->localUser()->id());

--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -117,7 +117,7 @@ public:
        file.write(buf.constData(), buf.size());
        file.flush();

-        if (oldHandler && (!context.category || (strcmp(context.category, "quotient.e2ee") != 0 || e2eeDebugEnabled))) {
+        if (oldHandler && (strcmp(context.category, "quotient.e2ee") != 0 || e2eeDebugEnabled)) {
            oldHandler(type, context, message);
        }
    }
@@ -197,6 +197,7 @@ void messageHandler(QtMsgType type, const QMessageLogContext &context, const QSt
        break;
    case QtFatalMsg:
        sInstance()->log(QtInfoMsg, context, message);
+        abort();
    }
 }

--- a/src/login.cpp
+++ b/src/login.cpp
@@ -100,8 +100,7 @@ void LoginHelper::init()
        Q_EMIT Controller::instance().globalErrorOccured(i18n("Network Error"), std::move(error));
    });

-    connectSingleShot(m_connection, &Connection::syncDone, this, [this]() {
-        Q_EMIT loaded();
+    connectSingleShot(m_connection, &Connection::syncDone, this, []() {
        Q_EMIT Controller::instance().initiated();
    });
 }
--- a/src/login.h
+++ b/src/login.h
@@ -79,17 +79,7 @@ class LoginHelper : public QObject
    Q_PROPERTY(bool isInvalidPassword READ isInvalidPassword NOTIFY isInvalidPasswordChanged)

 public:
-    static LoginHelper &instance()
-    {
-        static LoginHelper _instance;
-        return _instance;
-    }
-
-    static LoginHelper *create(QQmlEngine *engine, QJSEngine *)
-    {
-        engine->setObjectOwnership(&instance(), QQmlEngine::CppOwnership);
-        return &instance();
-    }
+    explicit LoginHelper(QObject *parent = nullptr);

    Q_INVOKABLE void init();

@@ -135,7 +125,6 @@ Q_SIGNALS:
    void isLoggingInChanged();
    void isLoggedInChanged();
    void isInvalidPasswordChanged();
-    void loaded();

 private:
    void setHomeserverReachable(bool reachable);
@@ -152,5 +141,4 @@ private:
    bool m_isLoggingIn = false;
    bool m_isLoggedIn = false;
    bool m_invalidPassword = false;
-    explicit LoginHelper(QObject *parent = nullptr);
 };
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -35,9 +35,9 @@
 #include "neochat-version.h"

 #include <Quotient/networkaccessmanager.h>
+#include <Quotient/util.h>

 #include "blurhashimageprovider.h"
-#include "colorschemer.h"
 #include "controller.h"
 #include "logger.h"
 #include "matriximageprovider.h"
@@ -45,6 +45,10 @@
 #include "roommanager.h"
 #include "windowcontroller.h"

+#ifdef HAVE_COLORSCHEME
+#include "colorschemer.h"
+#endif
+
 #ifdef HAVE_RUNNER
 #include "runner.h"
 #include <QDBusConnection>
@@ -121,7 +125,7 @@ int main(int argc, char *argv[])
    font.setHintingPreference(QFont::PreferNoHinting);
    app.setFont(font);
 #endif
-    KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));
+    KLocalizedString::setApplicationDomain("neochat");

    QGuiApplication::setOrganizationName("KDE"_ls);

@@ -131,11 +135,7 @@ int main(int argc, char *argv[])
                     i18n("Matrix client"),
                     KAboutLicense::GPL_V3,
                     i18n("© 2018-2020 Black Hat, 2020-2023 KDE Community"));
-    about.addAuthor(i18n("Carl Schwan"),
-                    i18n("Maintainer"),
-                    QStringLiteral("carl@carlschwan.eu"),
-                    QStringLiteral("https://carlschwan.eu"),
-                    QStringLiteral("https://carlschwan.eu/avatar.png"));
+    about.addAuthor(i18n("Carl Schwan"), i18n("Maintainer"), QStringLiteral("carl@carlschwan.eu"), QStringLiteral("https://carlschwan.eu"));
    about.addAuthor(i18n("Tobias Fella"), i18n("Maintainer"), QStringLiteral("tobias.fella@kde.org"), QStringLiteral("https://tobiasfella.de"));
    about.addAuthor(i18n("James Graham"), i18n("Maintainer"), QStringLiteral("james.h.graham@protonmail.com"));
    about.addCredit(i18n("Black Hat"), i18n("Original author of Spectral"), QStringLiteral("bhat@encom.eu.org"));
@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
    about.setOrganizationDomain("kde.org");

    about.addComponent(QStringLiteral("libQuotient"),
-                       i18n("A Qt library to write cross-platform clients for Matrix"),
+                       i18n("A Qt5 library to write cross-platform clients for Matrix"),
                       i18nc("<version number> (built against <possibly different version number>)",
                             "%1 (built against %2)",
                             Quotient::versionString(),
@@ -157,7 +157,9 @@ int main(int argc, char *argv[])

    initLogging();

+#if Quotient_VERSION_MINOR == 8
    Connection::setEncryptionDefault(true);
+#endif

 #ifdef NEOCHAT_FLATPAK
    // Copy over the included FontConfig configuration to the
@@ -166,10 +168,12 @@ int main(int argc, char *argv[])
                QStringLiteral("/var/config/fontconfig/conf.d/99-noto-mono-color-emoji.conf"));
 #endif

+#ifdef HAVE_COLORSCHEME
    ColorSchemer colorScheme;
    if (!NeoChatConfig::self()->colorScheme().isEmpty()) {
        colorScheme.apply(NeoChatConfig::self()->colorScheme());
    }
+#endif

    qml_register_types_org_kde_neochat();
    qmlRegisterSingletonInstance("org.kde.neochat.config", 1, 0, "Config", NeoChatConfig::self());
@@ -223,7 +227,7 @@ int main(int argc, char *argv[])
        });
    }

-    engine.addImageProvider(QLatin1String("mxc"), MatrixImageProvider::create(&engine, &engine));
+    engine.addImageProvider(QLatin1String("mxc"), new MatrixImageProvider);
    engine.addImageProvider(QLatin1String("blurhash"), new BlurhashImageProvider);

    engine.load(QUrl(QStringLiteral("qrc:/org/kde/neochat/qml/main.qml")));
@@ -236,8 +240,8 @@ int main(int argc, char *argv[])
    }

 #ifdef HAVE_RUNNER
-    auto runner = Runner::create(&engine, &engine);
-    QDBusConnection::sessionBus().registerObject("/RoomRunner"_ls, runner, QDBusConnection::ExportScriptableContents);
+    Runner runner;
+    QDBusConnection::sessionBus().registerObject("/RoomRunner"_ls, &runner, QDBusConnection::ExportScriptableContents);
 #endif

    QWindow *window = windowFromEngine(&engine);
--- a/src/matriximageprovider.cpp
+++ b/src/matriximageprovider.cpp
@@ -13,13 +13,11 @@
 #include <KLocalizedString>

 #include "controller.h"
-#include "neochatconnection.h"
-
 #include <Quotient/connection.h>

 using namespace Quotient;

-ThumbnailResponse::ThumbnailResponse(QString id, QSize size, NeoChatConnection *connection)
+ThumbnailResponse::ThumbnailResponse(QString id, QSize size)
    : mediaId(std::move(id))
    , requestedSize(size)
    , localFile(QStringLiteral("%1/image_provider/%2-%3x%4.png")
@@ -27,7 +25,6 @@ ThumbnailResponse::ThumbnailResponse(QString id, QSize size, NeoChatConnection *
                         mediaId,
                         QString::number(requestedSize.width()),
                         QString::number(requestedSize.height())))
-    , m_connection(connection)
    , errorStr("Image request hasn't started"_ls)
 {
    if (requestedSize.isEmpty()) {
@@ -54,24 +51,24 @@ ThumbnailResponse::ThumbnailResponse(QString id, QSize size, NeoChatConnection *
        return;
    }

-    if (!m_connection) {
+    if (!Controller::instance().activeConnection()) {
        qWarning() << "Current connection is null";
        return;
    }

    // Execute a request on the main thread asynchronously
-    moveToThread(m_connection->thread());
+    moveToThread(Controller::instance().activeConnection()->thread());
    QMetaObject::invokeMethod(this, &ThumbnailResponse::startRequest, Qt::QueuedConnection);
 }

 void ThumbnailResponse::startRequest()
 {
-    if (!m_connection) {
+    if (!Controller::instance().activeConnection()) {
        return;
    }
    // Runs in the main thread, not QML thread
-    Q_ASSERT(QThread::currentThread() == m_connection->thread());
-    job = m_connection->getThumbnail(mediaId, requestedSize);
+    Q_ASSERT(QThread::currentThread() == Controller::instance().activeConnection()->thread());
+    job = Controller::instance().activeConnection()->getThumbnail(mediaId, requestedSize);
    // Connect to any possible outcome including abandonment
    // to make sure the QML thread is not left stuck forever.
    connect(job, &BaseJob::finished, this, &ThumbnailResponse::prepareResult);
@@ -121,7 +118,7 @@ QString ThumbnailResponse::errorString() const

 QQuickImageResponse *MatrixImageProvider::requestImageResponse(const QString &id, const QSize &requestedSize)
 {
-    return new ThumbnailResponse(id, requestedSize, m_connection);
+    return new ThumbnailResponse(id, requestedSize);
 }

 #include "moc_matriximageprovider.cpp"
--- a/src/matriximageprovider.h
+++ b/src/matriximageprovider.h
@@ -10,8 +10,6 @@

 #include <QReadWriteLock>

-class NeoChatConnection;
-
 /**
 * @class ThumbnailResponse
 *
@@ -23,7 +21,7 @@ class ThumbnailResponse : public QQuickImageResponse
 {
    Q_OBJECT
 public:
-    explicit ThumbnailResponse(QString mediaId, QSize requestedSize, NeoChatConnection *m_connection);
+    explicit ThumbnailResponse(QString mediaId, QSize requestedSize);
    ~ThumbnailResponse() override = default;

 private Q_SLOTS:
@@ -35,7 +33,6 @@ private:
    QSize requestedSize;
    const QString localFile;
    Quotient::MediaThumbnailJob *job = nullptr;
-    NeoChatConnection *m_connection;

    QImage image;
    QString errorStr;
@@ -54,27 +51,11 @@ private:
 */
 class MatrixImageProvider : public QQuickAsyncImageProvider
 {
-    Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
-
-    Q_PROPERTY(NeoChatConnection *connection MEMBER m_connection)
 public:
-    static MatrixImageProvider *create(QQmlEngine *engine, QJSEngine *)
-    {
-        static MatrixImageProvider instance;
-        engine->setObjectOwnership(&instance, QQmlEngine::CppOwnership);
-        return &instance;
-    }
-
    /**
     * @brief Return a job to provide the image with the given ID.
     *
     * @sa QQuickAsyncImageProvider::requestImageResponse
     */
    QQuickImageResponse *requestImageResponse(const QString &id, const QSize &requestedSize) override;
-
-private:
-    NeoChatConnection *m_connection = nullptr;
-    MatrixImageProvider() = default;
 };
--- a/src/models/actionsmodel.cpp
+++ b/src/models/actionsmodel.cpp
@@ -261,7 +261,7 @@ QList<ActionsModel::Action> actions{
                return QString();
            }
            Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Knocking room <roomname>.", "Knocking room %1.", text));
-            auto connection = room->connection();
+            auto connection = Controller::instance().activeConnection();
            const auto knownServer = roomName.mid(roomName.indexOf(":"_ls) + 1);
            if (parts.length() >= 2) {
                RoomManager::instance().knockRoom(connection, roomName, parts[1], QStringList{knownServer});
@@ -285,7 +285,7 @@ QList<ActionsModel::Action> actions{
                                         i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
                return QString();
            }
-            if (room->connection()->room(text) || room->connection()->roomByAlias(text)) {
+            if (Controller::instance().activeConnection()->room(text) || Controller::instance().activeConnection()->roomByAlias(text)) {
                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("You are already in room <roomname>.", "You are already in room %1.", text));
                return QString();
            }
--- a/src/models/customemojimodel.cpp
+++ b/src/models/customemojimodel.cpp
@@ -15,28 +15,13 @@

 using namespace Quotient;

-void CustomEmojiModel::setConnection(NeoChatConnection *connection)
-{
-    if (connection == m_connection) {
-        return;
-    }
-    m_connection = connection;
-    Q_EMIT connectionChanged();
-    fetchEmojis();
-}
-
-NeoChatConnection *CustomEmojiModel::connection() const
-{
-    return m_connection;
-}
-
 void CustomEmojiModel::fetchEmojis()
 {
-    if (!m_connection) {
+    if (!Controller::instance().activeConnection()) {
        return;
    }

-    const auto &data = m_connection->accountData("im.ponies.user_emotes"_ls);
+    const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes"_ls);
    if (data == nullptr) {
        return;
    }
@@ -68,10 +53,10 @@ void CustomEmojiModel::addEmoji(const QString &name, const QUrl &location)
 {
    using namespace Quotient;

-    auto job = m_connection->uploadFile(location.toLocalFile());
+    auto job = Controller::instance().activeConnection()->uploadFile(location.toLocalFile());

-    connect(job, &BaseJob::success, this, [name, location, job, this] {
-        const auto &data = m_connection->accountData("im.ponies.user_emotes"_ls);
+    connect(job, &BaseJob::success, this, [name, location, job] {
+        const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes"_ls);
        auto json = data != nullptr ? data->contentJson() : QJsonObject();
        auto emojiData = json["images"_ls].toObject();

@@ -93,7 +78,7 @@ void CustomEmojiModel::addEmoji(const QString &name, const QUrl &location)
        });

        json["images"_ls] = emojiData;
-        m_connection->setAccountData("im.ponies.user_emotes"_ls, json);
+        Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes"_ls, json);
    });
 }

@@ -101,7 +86,7 @@ void CustomEmojiModel::removeEmoji(const QString &name)
 {
    using namespace Quotient;

-    const auto &data = m_connection->accountData("im.ponies.user_emotes"_ls);
+    const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes"_ls);
    Q_ASSERT(data);
    auto json = data->contentJson();
    const QString _name = name.mid(1).chopped(1);
@@ -124,18 +109,18 @@ void CustomEmojiModel::removeEmoji(const QString &name)
        emojiData.remove(_name);
        json["emoticons"_ls] = emojiData;
    }
-    m_connection->setAccountData("im.ponies.user_emotes"_ls, json);
+    Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes"_ls, json);
 }

 CustomEmojiModel::CustomEmojiModel(QObject *parent)
    : QAbstractListModel(parent)
 {
-    connect(this, &CustomEmojiModel::connectionChanged, this, [this]() {
-        if (!m_connection) {
+    connect(&Controller::instance(), &Controller::activeConnectionChanged, this, [this]() {
+        if (!Controller::instance().activeConnection()) {
            return;
        }
        CustomEmojiModel::fetchEmojis();
-        connect(m_connection, &Connection::accountDataChanged, this, [this](const QString &id) {
+        connect(Controller::instance().activeConnection(), &Connection::accountDataChanged, this, [this](const QString &id) {
            if (id != QStringLiteral("im.ponies.user_emotes")) {
                return;
            }
--- a/src/models/customemojimodel.h
+++ b/src/models/customemojimodel.h
@@ -8,8 +8,6 @@
 #include <QRegularExpression>
 #include <memory>

-class NeoChatConnection;
-
 struct CustomEmoji {
    QString name; // with :semicolons:
    QString url; // mxc://
@@ -33,8 +31,6 @@ class CustomEmojiModel : public QAbstractListModel
    QML_ELEMENT
    QML_SINGLETON

-    Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
-
 public:
    /**
     * @brief Defines the model roles.
@@ -102,16 +98,9 @@ public:
     */
    Q_INVOKABLE void removeEmoji(const QString &name);

-    void setConnection(NeoChatConnection *connection);
-    NeoChatConnection *connection() const;
-
-Q_SIGNALS:
-    void connectionChanged();
-
 private:
    explicit CustomEmojiModel(QObject *parent = nullptr);
    QList<CustomEmoji> m_emojis;
-    NeoChatConnection *m_connection = nullptr;

    void fetchEmojis();
 };
--- a/src/models/devicesmodel.cpp
+++ b/src/models/devicesmodel.cpp
@@ -24,8 +24,8 @@ DevicesModel::DevicesModel(QObject *parent)

 void DevicesModel::fetchDevices()
 {
-    if (m_connection) {
-        auto job = m_connection->callApi<GetDevicesJob>();
+    if (Controller::instance().activeConnection()) {
+        auto job = Controller::instance().activeConnection()->callApi<GetDevicesJob>();
        connect(job, &BaseJob::success, this, [this, job]() {
            beginResetModel();
            m_devices = job->devices();
@@ -102,7 +102,7 @@ void DevicesModel::logout(const QString &deviceId, const QString &password)
    for (index = 0; m_devices[index].deviceId != deviceId; index++)
        ;

-    auto job = m_connection->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId);
+    auto job = Controller::instance().activeConnection()->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId);

    connect(job, &BaseJob::result, this, [this, job, password, index] {
        auto onSuccess = [this, index]() {
@@ -117,9 +117,9 @@ void DevicesModel::logout(const QString &deviceId, const QString &password)
            authData["session"_ls] = replyData["session"_ls];
            authData["password"_ls] = password;
            authData["type"_ls] = "m.login.password"_ls;
-            QJsonObject identifier = {{"type"_ls, "m.id.user"_ls}, {"user"_ls, m_connection->user()->id()}};
+            QJsonObject identifier = {{"type"_ls, "m.id.user"_ls}, {"user"_ls, Controller::instance().activeConnection()->user()->id()}};
            authData["identifier"_ls] = identifier;
-            auto *innerJob = m_connection->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId, authData);
+            auto *innerJob = Controller::instance().activeConnection()->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId, authData);
            connect(innerJob, &BaseJob::success, this, onSuccess);
        } else {
            onSuccess();
@@ -132,7 +132,7 @@ void DevicesModel::setName(const QString &deviceId, const QString &name)
    int index;
    for (index = 0; m_devices[index].deviceId != deviceId; index++);

-    auto job = m_connection->callApi<UpdateDeviceJob>(m_devices[index].deviceId, name);
+    auto job = Controller::instance().activeConnection()->callApi<UpdateDeviceJob>(m_devices[index].deviceId, name);
    QString oldName = m_devices[index].displayName;
    beginResetModel();
    m_devices[index].displayName = name;
@@ -160,7 +160,7 @@ void DevicesModel::setConnection(Connection *connection)

    connect(m_connection, &Connection::sessionVerified, this, [this](const QString &userId, const QString &deviceId) {
        Q_UNUSED(deviceId);
-        if (userId == m_connection->userId()) {
+        if (userId == Controller::instance().activeConnection()->userId()) {
            fetchDevices();
        }
    });
--- a/src/models/keywordnotificationrulemodel.cpp
+++ b/src/models/keywordnotificationrulemodel.cpp
@@ -0,0 +1,112 @@
+// SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include "keywordnotificationrulemodel.h"
+#include "controller.h"
+#include "notificationsmanager.h"
+
+#include <QDebug>
+#include <Quotient/connection.h>
+#include <Quotient/converters.h>
+#include <Quotient/csapi/definitions/push_ruleset.h>
+#include <Quotient/csapi/pushrules.h>
+#include <Quotient/jobs/basejob.h>
+
+KeywordNotificationRuleModel::KeywordNotificationRuleModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+    if (Controller::instance().activeConnection()) {
+        controllerConnectionChanged();
+    }
+    connect(&Controller::instance(), &Controller::activeConnectionChanged, this, &KeywordNotificationRuleModel::controllerConnectionChanged);
+}
+
+void KeywordNotificationRuleModel::controllerConnectionChanged()
+{
+    connect(Controller::instance().activeConnection(), &Quotient::Connection::accountDataChanged, this, &KeywordNotificationRuleModel::updateNotificationRules);
+    updateNotificationRules("m.push_rules");
+}
+
+void KeywordNotificationRuleModel::updateNotificationRules(const QString &type)
+{
+    if (type != "m.push_rules") {
+        return;
+    }
+
+    const QJsonObject ruleDataJson = Controller::instance().activeConnection()->accountDataJson("m.push_rules");
+    const Quotient::PushRuleset ruleData = Quotient::fromJson<Quotient::PushRuleset>(ruleDataJson["global"].toObject());
+    const QList<Quotient::PushRule> contentRules = ruleData.content;
+
+    beginResetModel();
+    m_notificationRules.clear();
+    for (const auto &i : contentRules) {
+        if (!m_notificationRules.contains(i.ruleId) && i.ruleId[0] != '.') {
+            m_notificationRules.append(i.ruleId);
+        }
+    }
+    endResetModel();
+}
+
+QVariant KeywordNotificationRuleModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid()) {
+        return {};
+    }
+
+    if (index.row() >= m_notificationRules.count()) {
+        qDebug() << "KeywordNotificationRuleModel, something's wrong: index.row() >= m_notificationRules.count()";
+        return {};
+    }
+
+    if (role == NameRole) {
+        return m_notificationRules.at(index.row());
+    }
+
+    return {};
+}
+
+int KeywordNotificationRuleModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent)
+
+    return m_notificationRules.count();
+}
+
+void KeywordNotificationRuleModel::addKeyword(const QString &keyword)
+{
+    if (m_notificationRules.count() == 0) {
+        NotificationsManager::instance().initializeKeywordNotificationAction();
+    }
+
+    const QList<QVariant> actions = NotificationsManager::instance().getKeywordNotificationActions();
+
+    auto job = Controller::instance()
+                   .activeConnection()
+                   ->callApi<Quotient::SetPushRuleJob>("global", "content", keyword, actions, "", "", QList<Quotient::PushCondition>(), keyword);
+    connect(job, &Quotient::BaseJob::success, this, [this, keyword]() {
+        beginInsertRows(QModelIndex(), m_notificationRules.count(), m_notificationRules.count());
+        m_notificationRules.append(keyword);
+        endInsertRows();
+    });
+}
+
+void KeywordNotificationRuleModel::removeKeywordAtIndex(int index)
+{
+    auto job = Controller::instance().activeConnection()->callApi<Quotient::DeletePushRuleJob>("global", "content", m_notificationRules[index]);
+    connect(job, &Quotient::BaseJob::success, this, [this, index]() {
+        beginRemoveRows(QModelIndex(), index, index);
+        m_notificationRules.removeAt(index);
+        endRemoveRows();
+
+        if (m_notificationRules.count() == 0) {
+            NotificationsManager::instance().deactivateKeywordNotificationAction();
+        }
+    });
+}
+
+QHash<int, QByteArray> KeywordNotificationRuleModel::roleNames() const
+{
+    return {{NameRole, QByteArrayLiteral("name")}};
+}
+
+#include "moc_keywordnotificationrulemodel.cpp"
--- a/src/models/keywordnotificationrulemodel.h
+++ b/src/models/keywordnotificationrulemodel.h
@@ -0,0 +1,66 @@
+// SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#pragma once
+
+#include <Quotient/csapi/definitions/push_rule.h>
+
+#include <QAbstractListModel>
+
+/**
+ * @class KeywordNotificationRuleModel
+ *
+ * This class defines the model for managing notification push rule keywords.
+ */
+class KeywordNotificationRuleModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    /**
+     * @brief Defines the model roles.
+     */
+    enum EventRoles {
+        NameRole = Qt::DisplayRole, /**< The push rule keyword. */
+    };
+
+    KeywordNotificationRuleModel(QObject *parent = nullptr);
+
+    /**
+     * @brief Get the given role value at the given index.
+     *
+     * @sa QAbstractItemModel::data
+     */
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+    /**
+     * @brief Number of rows in the model.
+     *
+     * @sa QAbstractItemModel::rowCount
+     */
+    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    /**
+     * @brief Returns a mapping from Role enum values to role names.
+     *
+     * @sa EventRoles, QAbstractItemModel::roleNames()
+     */
+    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
+
+    /**
+     * @brief Add a new keyword to the model.
+     */
+    Q_INVOKABLE void addKeyword(const QString &keyword);
+
+    /**
+     * @brief Remove a keyword from the model.
+     */
+    Q_INVOKABLE void removeKeywordAtIndex(int index);
+
+private Q_SLOTS:
+    void controllerConnectionChanged();
+    void updateNotificationRules(const QString &type);
+
+private:
+    QList<QString> m_notificationRules;
+};
--- a/src/models/messageeventmodel.cpp
+++ b/src/models/messageeventmodel.cpp
@@ -100,9 +100,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
        room->setDisplayed();

        for (auto event = m_currentRoom->messageEvents().begin(); event != m_currentRoom->messageEvents().end(); ++event) {
-            if (const auto &roomMessageEvent = &*event->viewAs<RoomMessageEvent>()) {
-                createEventObjects(roomMessageEvent);
-            }
+            createEventObjects(&*event->viewAs<RoomMessageEvent>());
        }

        if (m_currentRoom->timelineSize() < 10 && !room->allHistoryLoaded()) {
@@ -122,8 +120,9 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
            for (auto &&event : events) {
                const RoomMessageEvent *message = dynamic_cast<RoomMessageEvent *>(event.get());

+                createEventObjects(message);
+
                if (message != nullptr) {
-                    createEventObjects(message);
                    if (NeoChatConfig::self()->showFancyEffects()) {
                        QString planBody = message->plainBody();
                        // snowflake
@@ -159,9 +158,8 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
        });
        connect(m_currentRoom, &Room::aboutToAddHistoricalMessages, this, [this](RoomEventsRange events) {
            for (auto &event : events) {
-                if (const auto &roomMessageEvent = dynamic_cast<RoomMessageEvent *>(event.get())) {
-                    createEventObjects(roomMessageEvent);
-                }
+                RoomMessageEvent *message = dynamic_cast<RoomMessageEvent *>(event.get());
+                createEventObjects(message);
            }
            if (rowCount() > 0) {
                rowBelowInserted = rowCount() - 1; // See #312
@@ -230,9 +228,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
            }
            const auto eventIt = m_currentRoom->findInTimeline(eventId);
            if (eventIt != m_currentRoom->historyEdge()) {
-                if (const auto &event = dynamic_cast<const RoomMessageEvent *>(&**eventIt)) {
-                    createEventObjects(event);
-                }
+                createEventObjects(static_cast<const RoomMessageEvent *>(&**eventIt));
            }
            refreshEventRoles(eventId, {ReactionRole, ShowReactionsRole, Qt::DisplayRole});
        });
@@ -708,6 +704,10 @@ int MessageEventModel::eventIdToRow(const QString &eventID) const

 void MessageEventModel::createEventObjects(const Quotient::RoomMessageEvent *event)
 {
+    if (event == nullptr) {
+        return;
+    }
+
    auto eventId = event->id();

    EventHandler eventHandler;
--- a/src/models/pushrulemodel.cpp
+++ b/src/models/pushrulemodel.cpp
@@ -66,6 +66,19 @@ PushRuleModel::PushRuleModel(QObject *parent)
    : QAbstractListModel(parent)
 {
    m_defaultKeywordAction = static_cast<PushNotificationAction::Action>(NeoChatConfig::self()->keywordPushRuleDefault());
+
+    if (Controller::instance().activeConnection()) {
+        controllerConnectionChanged();
+    }
+    connect(&Controller::instance(), &Controller::activeConnectionChanged, this, &PushRuleModel::controllerConnectionChanged);
+}
+
+void PushRuleModel::controllerConnectionChanged()
+{
+    if (Controller::instance().activeConnection()) {
+        connect(Controller::instance().activeConnection(), &Quotient::Connection::accountDataChanged, this, &PushRuleModel::updateNotificationRules);
+        updateNotificationRules(QStringLiteral("m.push_rules"));
+    }
 }

 void PushRuleModel::updateNotificationRules(const QString &type)
@@ -74,7 +87,7 @@ void PushRuleModel::updateNotificationRules(const QString &type)
        return;
    }

-    const QJsonObject ruleDataJson = m_connection->accountDataJson(QStringLiteral("m.push_rules"));
+    const QJsonObject ruleDataJson = Controller::instance().activeConnection()->accountDataJson(QStringLiteral("m.push_rules"));
    const Quotient::PushRuleset ruleData = Quotient::fromJson<Quotient::PushRuleset>(ruleDataJson[QStringLiteral("global")].toObject());

    beginResetModel();
@@ -143,7 +156,8 @@ PushNotificationSection::Section PushRuleModel::getSection(Quotient::PushRule ru
         *
         * Rooms that the user hasn't joined shouldn't have a rule.
         */
-        if (m_connection->room(ruleId) != nullptr) {
+        auto connection = Controller::instance().activeConnection();
+        if (connection->room(ruleId) != nullptr) {
            return PushNotificationSection::Undefined;
        }
        /**
@@ -157,7 +171,7 @@ PushNotificationSection::Section PushRuleModel::getSection(Quotient::PushRule ru
        if (!testUserId.startsWith(u'@')) {
            testUserId.prepend(u'@');
        }
-        if (testUserId.startsWith(u'@') && !Quotient::serverPart(testUserId).isEmpty() && m_connection->user(testUserId) != nullptr) {
+        if (testUserId.startsWith(u'@') && !Quotient::serverPart(testUserId).isEmpty() && connection->user(testUserId) != nullptr) {
            return PushNotificationSection::Undefined;
        }
        // If the rule has push conditions and one is a room ID it is a room only keyword.
@@ -311,14 +325,14 @@ void PushRuleModel::addKeyword(const QString &keyword, const QString &roomId)
        pushConditions.append(keywordCondition);
    }

-    auto job = m_connection->callApi<Quotient::SetPushRuleJob>(QLatin1String("global"),
-                                                               PushNotificationKind::kindString(kind),
-                                                               keyword,
-                                                               actions,
-                                                               QString(),
-                                                               QString(),
-                                                               pushConditions,
-                                                               roomId.isEmpty() ? keyword : QString());
+    auto job = Controller::instance().activeConnection()->callApi<Quotient::SetPushRuleJob>(QLatin1String("global"),
+                                                                                            PushNotificationKind::kindString(kind),
+                                                                                            keyword,
+                                                                                            actions,
+                                                                                            QString(),
+                                                                                            QString(),
+                                                                                            pushConditions,
+                                                                                            roomId.isEmpty() ? keyword : QString());
    connect(job, &Quotient::BaseJob::failure, this, [job, keyword]() {
        qWarning() << QLatin1String("Unable to set push rule for keyword %1: ").arg(keyword) << job->errorString();
    });
@@ -337,7 +351,7 @@ void PushRuleModel::removeKeyword(const QString &keyword)
    }

    auto kind = PushNotificationKind::kindString(m_rules[index].kind);
-    auto job = m_connection->callApi<Quotient::DeletePushRuleJob>(QStringLiteral("global"), kind, m_rules[index].id);
+    auto job = Controller::instance().activeConnection()->callApi<Quotient::DeletePushRuleJob>(QStringLiteral("global"), kind, m_rules[index].id);
    connect(job, &Quotient::BaseJob::failure, this, [this, job, index]() {
        qWarning() << QLatin1String("Unable to remove push rule for keyword %1: ").arg(m_rules[index].id) << job->errorString();
    });
@@ -345,10 +359,10 @@ void PushRuleModel::removeKeyword(const QString &keyword)

 void PushRuleModel::setNotificationRuleEnabled(const QString &kind, const QString &ruleId, bool enabled)
 {
-    auto job = m_connection->callApi<Quotient::IsPushRuleEnabledJob>(QStringLiteral("global"), kind, ruleId);
-    connect(job, &Quotient::BaseJob::success, this, [job, kind, ruleId, enabled, this]() {
+    auto job = Controller::instance().activeConnection()->callApi<Quotient::IsPushRuleEnabledJob>(QStringLiteral("global"), kind, ruleId);
+    connect(job, &Quotient::BaseJob::success, this, [job, kind, ruleId, enabled]() {
        if (job->enabled() != enabled) {
-            m_connection->callApi<Quotient::SetPushRuleEnabledJob>(QStringLiteral("global"), kind, ruleId, enabled);
+            Controller::instance().activeConnection()->callApi<Quotient::SetPushRuleEnabledJob>(QStringLiteral("global"), kind, ruleId, enabled);
        }
    });
 }
@@ -362,7 +376,7 @@ void PushRuleModel::setNotificationRuleActions(const QString &kind, const QStrin
        actions = actionToVariant(action);
    }

-    m_connection->callApi<Quotient::SetPushRuleActionsJob>(QStringLiteral("global"), kind, ruleId, actions);
+    Controller::instance().activeConnection()->callApi<Quotient::SetPushRuleActionsJob>(QStringLiteral("global"), kind, ruleId, actions);
 }

 PushNotificationAction::Action PushRuleModel::variantToAction(const QList<QVariant> &actions, bool enabled)
@@ -439,23 +453,4 @@ QList<QVariant> PushRuleModel::actionToVariant(PushNotificationAction::Action ac
    return actions;
 }

-NeoChatConnection *PushRuleModel::connection() const
-{
-    return m_connection;
-}
-
-void PushRuleModel::setConnection(NeoChatConnection *connection)
-{
-    if (connection == m_connection) {
-        return;
-    }
-    m_connection = connection;
-    Q_EMIT connectionChanged();
-
-    if (m_connection) {
-        connect(m_connection, &Quotient::Connection::accountDataChanged, this, &PushRuleModel::updateNotificationRules);
-        updateNotificationRules(QStringLiteral("m.push_rules"));
-    }
-}
-
 #include "moc_pushrulemodel.cpp"
--- a/src/models/pushrulemodel.h
+++ b/src/models/pushrulemodel.h
@@ -157,8 +157,6 @@ class PushRuleModel : public QAbstractListModel
     */
    Q_PROPERTY(bool globalNotificationsSet READ globalNotificationsSet NOTIFY globalNotificationsSetChanged)

-    Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
-
 public:
    struct Rule {
        QString id;
@@ -227,22 +225,18 @@ public:
     */
    Q_INVOKABLE void removeKeyword(const QString &keyword);

-    void setConnection(NeoChatConnection *connection);
-    NeoChatConnection *connection() const;
-
 Q_SIGNALS:
    void defaultStateChanged();
    void globalNotificationsEnabledChanged();
    void globalNotificationsSetChanged();
-    void connectionChanged();

 private Q_SLOTS:
+    void controllerConnectionChanged();
    void updateNotificationRules(const QString &type);

 private:
    PushNotificationAction::Action m_defaultKeywordAction;
    QList<Rule> m_rules;
-    NeoChatConnection *m_connection;

    void setRules(QList<Quotient::PushRule> rules, PushNotificationKind::Kind kind);

--- a/src/models/roomlistmodel.cpp
+++ b/src/models/roomlistmodel.cpp
@@ -368,9 +368,6 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
    if (role == IsChildSpaceRole) {
        return SpaceHierarchyCache::instance().isChildSpace(room->id());
    }
-    if (role == ReplacementIdRole) {
-        return room->successorId();
-    }

    return QVariant();
 }
--- a/src/models/roomlistmodel.h
+++ b/src/models/roomlistmodel.h
@@ -79,7 +79,6 @@ public:
        RoomIdRole, /**< The room matrix ID. */
        IsSpaceRole, /**< Whether the room is a space. */
        IsChildSpaceRole, /**< Whether this space is a child of a different space. */
-        ReplacementIdRole, /**< The room id of the room replacing this one, if any. */
    };
    Q_ENUM(EventRoles)

--- a/src/models/serverlistmodel.cpp
+++ b/src/models/serverlistmodel.cpp
@@ -19,7 +19,7 @@ ServerListModel::ServerListModel(QObject *parent)
    const auto stateConfig = KSharedConfig::openStateConfig();
    const KConfigGroup serverGroup = stateConfig->group(QStringLiteral("Servers"));

-    QString domain = m_connection->domain();
+    QString domain = Controller::instance().activeConnection()->domain();

    // Add the user's homeserver
    m_servers.append(Server{
@@ -100,7 +100,7 @@ void ServerListModel::checkServer(const QString &url)
            m_checkServerJob->abandon();
        }

-        m_checkServerJob = m_connection->callApi<Quotient::QueryPublicRoomsJob>(url, 1);
+        m_checkServerJob = Controller::instance().activeConnection()->callApi<Quotient::QueryPublicRoomsJob>(url, 1);
        connect(m_checkServerJob, &Quotient::BaseJob::success, this, [this, url] {
            Q_EMIT serverCheckComplete(url, true);
        });
@@ -153,18 +153,4 @@ QHash<int, QByteArray> ServerListModel::roleNames() const
    };
 }

-NeoChatConnection *ServerListModel::connection() const
-{
-    return m_connection;
-}
-
-void ServerListModel::setConnection(NeoChatConnection *connection)
-{
-    if (m_connection == connection) {
-        return;
-    }
-    m_connection = connection;
-    Q_EMIT connectionChanged();
-}
-
 #include "moc_serverlistmodel.cpp"
--- a/src/models/serverlistmodel.h
+++ b/src/models/serverlistmodel.h
@@ -10,8 +10,6 @@
 #include <QQmlEngine>
 #include <QUrl>

-class NeoChatConnection;
-
 /**
 * @class ServerListModel
 *
@@ -29,8 +27,6 @@ class ServerListModel : public QAbstractListModel
    Q_OBJECT
    QML_ELEMENT

-    Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
-
 public:
    /**
     * @brief Define the data required to represent a server.
@@ -100,15 +96,10 @@ public:
     */
    Q_INVOKABLE void removeServerAtIndex(int index);

-    NeoChatConnection *connection() const;
-    void setConnection(NeoChatConnection *connection);
-
 Q_SIGNALS:
    void serverCheckComplete(QString url, bool valid);
-    void connectionChanged();

 private:
    QList<Server> m_servers;
    QPointer<Quotient::QueryPublicRoomsJob> m_checkServerJob = nullptr;
-    NeoChatConnection *m_connection = nullptr;
 };
--- a/src/models/sortfilterroomlistmodel.cpp
+++ b/src/models/sortfilterroomlistmodel.cpp
@@ -3,7 +3,6 @@

 #include "sortfilterroomlistmodel.h"

-#include "neochatconnection.h"
 #include "roomlistmodel.h"
 #include "spacehierarchycache.h"

@@ -15,10 +14,6 @@ SortFilterRoomListModel::SortFilterRoomListModel(QObject *parent)
    connect(this, &SortFilterRoomListModel::filterTextChanged, this, [this]() {
        invalidateFilter();
    });
-    connect(this, &SortFilterRoomListModel::sourceModelChanged, this, [this]() {
-        connect(sourceModel(), &QAbstractListModel::rowsInserted, this, &SortFilterRoomListModel::invalidateRowsFilter);
-        connect(sourceModel(), &QAbstractListModel::rowsRemoved, this, &SortFilterRoomListModel::invalidateRowsFilter);
-    });
 }

 void SortFilterRoomListModel::setRoomSortOrder(SortFilterRoomListModel::RoomSortOrder sortOrder)
@@ -83,15 +78,9 @@ bool SortFilterRoomListModel::filterAcceptsRow(int source_row, const QModelIndex
 {
    Q_UNUSED(source_parent);

-    if (sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::JoinStateRole).toString() == QStringLiteral("upgraded")
-        && dynamic_cast<RoomListModel *>(sourceModel())
-               ->connection()
-               ->room(sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::ReplacementIdRole).toString())) {
-        return false;
-    }
-
    bool acceptRoom =
        sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::DisplayNameRole).toString().contains(m_filterText, Qt::CaseInsensitive)
+        && sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::JoinStateRole).toString() != QStringLiteral("upgraded")
        && sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::IsSpaceRole).toBool() == false;

    if (m_activeSpaceId.isEmpty()) {
--- a/src/models/spacechildrenmodel.cpp
+++ b/src/models/spacechildrenmodel.cpp
@@ -12,7 +12,7 @@
 SpaceChildrenModel::SpaceChildrenModel(QObject *parent)
    : QAbstractItemModel(parent)
 {
-    m_rootItem = new SpaceTreeItem(nullptr);
+    m_rootItem = new SpaceTreeItem();
 }

 SpaceChildrenModel::~SpaceChildrenModel()
@@ -71,8 +71,7 @@ void SpaceChildrenModel::refreshModel()
    delete m_rootItem;
    m_loading = true;
    Q_EMIT loadingChanged();
-    m_rootItem =
-        new SpaceTreeItem(dynamic_cast<NeoChatConnection *>(m_space->connection()), nullptr, m_space->id(), m_space->displayName(), m_space->canonicalAlias());
+    m_rootItem = new SpaceTreeItem(nullptr, m_space->id(), m_space->displayName(), m_space->canonicalAlias());
    endResetModel();
    auto job = m_space->connection()->callApi<Quotient::GetSpaceHierarchyJob>(m_space->id(), Quotient::none, Quotient::none, 1);
    m_currentJobs.append(job);
@@ -113,8 +112,7 @@ void SpaceChildrenModel::insertChildren(std::vector<Quotient::GetSpaceHierarchyJ
                }
            }
            parentItem->insertChild(insertRow,
-                                    new SpaceTreeItem(dynamic_cast<NeoChatConnection *>(m_space->connection()),
-                                                      parentItem,
+                                    new SpaceTreeItem(parentItem,
                                                      children[i].roomId,
                                                      children[i].name,
                                                      children[i].canonicalAlias,
--- a/src/models/spacetreeitem.cpp
+++ b/src/models/spacetreeitem.cpp
@@ -5,8 +5,7 @@

 #include "controller.h"

-SpaceTreeItem::SpaceTreeItem(NeoChatConnection *connection,
-                             SpaceTreeItem *parent,
+SpaceTreeItem::SpaceTreeItem(SpaceTreeItem *parent,
                             const QString &id,
                             const QString &name,
                             const QString &canonicalAlias,
@@ -16,8 +15,7 @@ SpaceTreeItem::SpaceTreeItem(NeoChatConnection *connection,
                             bool allowGuests,
                             bool worldReadable,
                             bool isSpace)
-    : m_connection(connection)
-    , m_parentItem(parent)
+    : m_parentItem(parent)
    , m_id(id)
    , m_name(name)
    , m_canonicalAlias(canonicalAlias)
@@ -109,7 +107,8 @@ QUrl SpaceTreeItem::avatarUrl() const
    if (m_avatarUrl.isEmpty() || m_avatarUrl.scheme() != QLatin1String("mxc")) {
        return {};
    }
-    auto url = m_connection->makeMediaUrl(m_avatarUrl);
+    auto connection = Controller::instance().activeConnection();
+    auto url = connection->makeMediaUrl(m_avatarUrl);
    if (url.scheme() == QLatin1String("mxc")) {
        return url;
    }
@@ -128,10 +127,11 @@ bool SpaceTreeItem::worldReadable() const

 bool SpaceTreeItem::isJoined() const
 {
-    if (!m_connection) {
+    auto connection = Controller::instance().activeConnection();
+    if (!connection) {
        return false;
    }
-    return m_connection->room(id(), Quotient::JoinState::Join) != nullptr;
+    return connection->room(id(), Quotient::JoinState::Join) != nullptr;
 }

 bool SpaceTreeItem::isSpace() const
--- a/src/models/spacetreeitem.h
+++ b/src/models/spacetreeitem.h
@@ -3,8 +3,6 @@

 #include <Quotient/csapi/space_hierarchy.h>

-class NeoChatConnection;
-
 /**
 * @class SpaceTreeItem
 *
@@ -20,8 +18,7 @@ class NeoChatConnection;
 class SpaceTreeItem
 {
 public:
-    explicit SpaceTreeItem(NeoChatConnection *connection,
-                           SpaceTreeItem *parent = nullptr,
+    explicit SpaceTreeItem(SpaceTreeItem *parent = nullptr,
                           const QString &id = {},
                           const QString &name = {},
                           const QString &canonicalAlias = {},
@@ -124,7 +121,6 @@ public:
    bool isSpace() const;

 private:
-    NeoChatConnection *m_connection;
    QList<SpaceTreeItem *> m_children;
    SpaceTreeItem *m_parentItem;

--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -2,7 +2,6 @@
 IconName=org.kde.neochat
 Name=NeoChat
 Name[ar]=نيوتشات
-Name[ast]=NeoChat
 Name[az]=NeoChat
 Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
--- a/src/neochatconnection.cpp
+++ b/src/neochatconnection.cpp
@@ -16,7 +16,6 @@

 #include <Quotient/csapi/content-repo.h>
 #include <Quotient/csapi/profile.h>
-#include <Quotient/database.h>
 #include <Quotient/qt_connection_util.h>
 #include <Quotient/settings.h>
 #include <Quotient/user.h>
@@ -221,35 +220,4 @@ void NeoChatConnection::createSpace(const QString &name, const QString &topic, c
    });
 }

-void NeoChatConnection::openOrCreateDirectChat(User *user)
-{
-    const auto existing = directChats();
-
-    if (existing.contains(user)) {
-        const auto room = static_cast<NeoChatRoom *>(this->room(existing.value(user)));
-        if (room) {
-            RoomManager::instance().enterRoom(room);
-            return;
-        }
-    }
-    requestDirectChat(user);
-}
-
-QString NeoChatConnection::deviceKey() const
-{
-    return edKeyForUserDevice(userId(), deviceId());
-}
-
-QString NeoChatConnection::encryptionKey() const
-{
-    auto query = database()->prepareQuery(QStringLiteral("SELECT curveKey FROM tracked_devices WHERE matrixId=:matrixId AND deviceid=:deviceId LIMIT 1;"));
-    query.bindValue(QStringLiteral(":matrixId"), userId());
-    query.bindValue(QStringLiteral(":deviceId"), deviceId());
-    database()->execute(query);
-    if (!query.next()) {
-        return {};
-    }
-    return query.value(0).toString();
-}
-
 #include "moc_neochatconnection.cpp"
--- a/src/neochatconnection.h
+++ b/src/neochatconnection.h
@@ -23,8 +23,6 @@ class NeoChatConnection : public Quotient::Connection
     * Set to an empty string to remove the label.
     */
    Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
-    Q_PROPERTY(QString deviceKey READ deviceKey CONSTANT)
-    Q_PROPERTY(QString encryptionKey READ encryptionKey CONSTANT)

 public:
    NeoChatConnection(QObject *parent = nullptr);
@@ -63,16 +61,6 @@ public:
     */
    Q_INVOKABLE void createSpace(const QString &name, const QString &topic, const QString &parent = {}, bool setChildParent = false);

-    /**
-     * @brief Join a direct chat with the given user.
-     *
-     * If a direct chat with the user doesn't exist one is created and then joined.
-     */
-    Q_INVOKABLE void openOrCreateDirectChat(Quotient::User *user);
-
-    QString deviceKey() const;
-    QString encryptionKey() const;
-
 Q_SIGNALS:
    void labelChanged();
 };
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -123,7 +123,6 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
        Q_EMIT canEncryptRoomChanged();
        Q_EMIT parentIdsChanged();
        Q_EMIT canonicalParentChanged();
-        Q_EMIT joinRuleChanged();
    });
    connect(connection, &Connection::capabilitiesLoaded, this, &NeoChatRoom::maxRoomVersionChanged);
    connect(this, &Room::changed, this, [this]() {
@@ -419,6 +418,30 @@ QDateTime NeoChatRoom::lastActiveTime()
    return messageEvents().rbegin()->get()->originTimestamp();
 }

+QVariantList NeoChatRoom::getUsers(const QString &keyword, int limit) const
+{
+    const auto userList = users();
+    QVariantList matchedList;
+    int count = 0;
+    for (const auto u : userList) {
+        if (u->displayname(this).contains(keyword, Qt::CaseInsensitive)) {
+            Quotient::User user(u->id(), u->connection());
+            QVariantMap userVariant{{QStringLiteral("id"), user.id()},
+                                    {QStringLiteral("displayName"), user.displayname(this)},
+                                    {QStringLiteral("avatarMediaId"), user.avatarMediaId(this)},
+                                    {QStringLiteral("color"), Utils::getUserColor(user.hueF())}};
+
+            matchedList.append(QVariant::fromValue(userVariant));
+            count++;
+            if (count == limit) { // -1 is infinite
+                break;
+            }
+        }
+    }
+
+    return matchedList;
+}
+
 // An empty user is useful for returning as a model value to avoid properties being undefined.
 static const QVariantMap emptyUser = {
    {"isLocalUser"_ls, false},
@@ -713,51 +736,16 @@ QString NeoChatRoom::joinRule() const
    return joinRulesEvent->joinRule();
 }

-void NeoChatRoom::setJoinRule(const QString &joinRule, const QList<QString> &allowedSpaces)
+void NeoChatRoom::setJoinRule(const QString &joinRule)
 {
    if (!canSendState("m.room.join_rules"_ls)) {
        qWarning() << "Power level too low to set join rules";
        return;
    }
-    auto actualRule = joinRule;
-    if (joinRule == "restricted"_ls && allowedSpaces.isEmpty()) {
-        actualRule = "private"_ls;
-    }
-
-    QJsonArray allowConditions;
-    if (actualRule == "restricted"_ls) {
-        for (auto allowedSpace : allowedSpaces) {
-            allowConditions += QJsonObject{{"type"_ls, "m.room_membership"_ls}, {"room_id"_ls, allowedSpace}};
-        }
-    }
-
-    QJsonObject content;
-    content.insert("join_rule"_ls, joinRule);
-    if (!allowConditions.isEmpty()) {
-        content.insert("allow"_ls, allowConditions);
-    }
-    qWarning() << content;
-    setState("m.room.join_rules"_ls, {}, content);
+    setState("m.room.join_rules"_ls, {}, QJsonObject{{"join_rule"_ls, joinRule}});
    // Not emitting joinRuleChanged() here, since that would override the change in the UI with the *current* value, which is not the *new* value.
 }

-QList<QString> NeoChatRoom::restrictedIds() const
-{
-    auto joinRulesEvent = currentState().get<JoinRulesEvent>();
-    if (!joinRulesEvent) {
-        return {};
-    }
-    if (joinRulesEvent->joinRule() != "restricted"_ls) {
-        return {};
-    }
-
-    QList<QString> roomIds;
-    for (auto allow : joinRulesEvent->allow()) {
-        roomIds += allow.toObject().value("room_id"_ls).toString();
-    }
-    return roomIds;
-}
-
 QString NeoChatRoom::historyVisibility() const
 {
    return currentState().get("m.room.history_visibility"_ls)->contentJson()["history_visibility"_ls].toString();
@@ -1177,21 +1165,6 @@ QList<QString> NeoChatRoom::parentIds() const
    return parentIds;
 }

-QList<NeoChatRoom *> NeoChatRoom::parentObjects(bool multiLevel) const
-{
-    QList<NeoChatRoom *> parentObjects;
-    QList<QString> parentIds = this->parentIds();
-    for (const auto &parentId : parentIds) {
-        if (auto parentObject = static_cast<NeoChatRoom *>(connection()->room(parentId))) {
-            parentObjects += parentObject;
-            if (multiLevel) {
-                parentObjects += parentObject->parentObjects(true);
-            }
-        }
-    }
-    return parentObjects;
-}
-
 QString NeoChatRoom::canonicalParent() const
 {
    auto parentEvents = currentState().eventsOfType("m.space.parent"_ls);
@@ -1389,7 +1362,7 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
        for (const auto &i : roomRuleArray) {
            QJsonObject roomRule = i.toObject();
            if (roomRule["rule_id"_ls] == id()) {
-                connection()->callApi<DeletePushRuleJob>("global"_ls, "room"_ls, id());
+                Controller::instance().activeConnection()->callApi<DeletePushRuleJob>("global"_ls, "room"_ls, id());
            }
        }
    }
@@ -1400,7 +1373,7 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
        for (const auto &i : overrideRuleArray) {
            QJsonObject overrideRule = i.toObject();
            if (overrideRule["rule_id"_ls] == id()) {
-                connection()->callApi<DeletePushRuleJob>("global"_ls, "override"_ls, id());
+                Controller::instance().activeConnection()->callApi<DeletePushRuleJob>("global"_ls, "override"_ls, id());
            }
        }
    }
@@ -1436,9 +1409,11 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
        const QList<PushCondition> conditions = {pushCondition};

        // Add new override rule and make sure it's enabled
-        auto job = connection()->callApi<SetPushRuleJob>("global"_ls, "override"_ls, id(), actions, QString(), QString(), conditions, QString());
+        auto job = Controller::instance()
+                       .activeConnection()
+                       ->callApi<SetPushRuleJob>("global"_ls, "override"_ls, id(), actions, QString(), QString(), conditions, QString());
        connect(job, &BaseJob::success, this, [this]() {
-            auto enableJob = connection()->callApi<SetPushRuleEnabledJob>("global"_ls, "override"_ls, id(), true);
+            auto enableJob = Controller::instance().activeConnection()->callApi<SetPushRuleEnabledJob>("global"_ls, "override"_ls, id(), true);
            connect(enableJob, &BaseJob::success, this, [this]() {
                m_pushNotificationStateUpdating = false;
            });
@@ -1462,9 +1437,11 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
        // No conditions for a room rule
        const QList<PushCondition> conditions;

-        auto setJob = connection()->callApi<SetPushRuleJob>("global"_ls, "room"_ls, id(), actions, QString(), QString(), conditions, QString());
+        auto setJob = Controller::instance()
+                          .activeConnection()
+                          ->callApi<SetPushRuleJob>("global"_ls, "room"_ls, id(), actions, QString(), QString(), conditions, QString());
        connect(setJob, &BaseJob::success, this, [this]() {
-            auto enableJob = connection()->callApi<SetPushRuleEnabledJob>("global"_ls, "room"_ls, id(), true);
+            auto enableJob = Controller::instance().activeConnection()->callApi<SetPushRuleEnabledJob>("global"_ls, "room"_ls, id(), true);
            connect(enableJob, &BaseJob::success, this, [this]() {
                m_pushNotificationStateUpdating = false;
            });
@@ -1493,9 +1470,11 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
        const QList<PushCondition> conditions;

        // Add new room rule and make sure enabled
-        auto setJob = connection()->callApi<SetPushRuleJob>("global"_ls, "room"_ls, id(), actions, QString(), QString(), conditions, QString());
+        auto setJob = Controller::instance()
+                          .activeConnection()
+                          ->callApi<SetPushRuleJob>("global"_ls, "room"_ls, id(), actions, QString(), QString(), conditions, QString());
        connect(setJob, &BaseJob::success, this, [this]() {
-            auto enableJob = connection()->callApi<SetPushRuleEnabledJob>("global"_ls, "room"_ls, id(), true);
+            auto enableJob = Controller::instance().activeConnection()->callApi<SetPushRuleEnabledJob>("global"_ls, "room"_ls, id(), true);
            connect(enableJob, &BaseJob::success, this, [this]() {
                m_pushNotificationStateUpdating = false;
            });
--- a/src/neochatroom.h
+++ b/src/neochatroom.h
@@ -160,13 +160,6 @@ class NeoChatRoom : public Quotient::Room
     */
    Q_PROPERTY(QString joinRule READ joinRule WRITE setJoinRule NOTIFY joinRuleChanged)

-    /**
-     * @brief The space IDs that members of can join this room.
-     *
-     * Empty if the join rule is not restricted.
-     */
-    Q_PROPERTY(QList<QString> restrictedIds READ restrictedIds NOTIFY joinRuleChanged)
-
    /**
     * @brief Get the maximum room version that the server supports.
     *
@@ -331,6 +324,28 @@ public:

    explicit NeoChatRoom(Quotient::Connection *connection, QString roomId, Quotient::JoinState joinState = {});

+    /**
+     * @brief Get a list of users in the context of this room.
+     *
+     * This is different to getting a list of Quotient::User objects
+     * as neither of those can provide details like the displayName or avatarMediaId
+     * without the room context as these can vary from room to room. This function
+     * provides the room context and returns the result as a list of QVariantMap objects.
+     *
+     * @param keyword filters the users based on the displayname containing keyword.
+     * @param limit max number of user returned, -1 is infinite.
+     *
+     * @return a QVariantList containing a QVariantMap for each user with the following
+     * properties:
+     *  - id - User ID.
+     *  - displayName - Display name in the context of this room.
+     *  - avatarMediaId - Avatar id in the context of this room.
+     *  - color - Color for the user.
+     *
+     * @sa Quotient::User
+     */
+    Q_INVOKABLE [[nodiscard]] QVariantList getUsers(const QString &keyword, int limit = -1) const;
+
    /**
     * @brief Get a user in the context of this room.
     *
@@ -512,17 +527,6 @@ public:

    QList<QString> parentIds() const;

-    /**
-     * @brief Get a list of parent space objects for this room.
-     *
-     * Will only return retrun spaces that are know, i.e. the user has joined and
-     * a valid NeoChatRoom is available.
-     *
-     * @param multiLevel whether the function should recursively gather all levels
-     *        of parents
-     */
-    Q_INVOKABLE QList<NeoChatRoom *> parentObjects(bool multiLevel = false) const;
-
    QString canonicalParent() const;
    void setCanonicalParent(const QString &parentId);

@@ -577,23 +581,7 @@ public:
    Q_INVOKABLE void clearInvitationNotification();

    [[nodiscard]] QString joinRule() const;
-
-    /**
-     * @brief Set the join rule for the room.
-     *
-     * Will fail if the user doesn't have the required privileges.
-     *
-     * @param joinRule the join rule [public, knock, invite, private, restricted].
-     * @param allowedSpaces only used when the join rule is restricted. This is a
-     *        list of space Matrix IDs that members of can join without an invite.
-     *        If the rule is restricted and this list is empty it is treated as a join
-     *        rule of private instead.
-     *
-     * @sa https://spec.matrix.org/latest/client-server-api/#mroomjoin_rules
-     */
-    Q_INVOKABLE void setJoinRule(const QString &joinRule, const QList<QString> &allowedSpaces = {});
-
-    QList<QString> restrictedIds() const;
+    void setJoinRule(const QString &joinRule);

    int maxRoomVersion() const;

--- a/src/notificationsmanager.cpp
+++ b/src/notificationsmanager.cpp
@@ -204,15 +204,15 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
    notification->setText(notification->text() + QLatin1Char('\n') + entry);
    notification->setPixmap(createNotificationImage(icon, room));

-    auto defaultAction = notification->addDefaultAction(i18n("Open NeoChat in this room"));
-    connect(defaultAction, &KNotificationAction::activated, this, [notification, room]() {
+    notification->setDefaultAction(i18n("Open NeoChat in this room"));
+    connect(notification, &KNotification::defaultActivated, this, [notification, room]() {
        WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
        if (!room) {
            return;
        }
-        auto connection = dynamic_cast<NeoChatConnection *>(Controller::instance().accounts().get(room->localUser()->id()));
-        Controller::instance().setActiveConnection(connection);
-        RoomManager::instance().setConnection(connection);
+        if (room->localUser()->id() != Controller::instance().activeConnection()->userId()) {
+            Controller::instance().setActiveConnection(dynamic_cast<NeoChatConnection *>(Controller::instance().accounts().get(room->localUser()->id())));
+        }
        RoomManager::instance().enterRoom(room);
    });

@@ -240,31 +240,28 @@ void NotificationsManager::postInviteNotification(NeoChatRoom *room, const QStri
    notification->setTitle(title);
    notification->setPixmap(createNotificationImage(icon, nullptr));
    notification->setFlags(KNotification::Persistent);
-    auto defaultAction = notification->addDefaultAction(i18n("Open this invitation in NeoChat"));
-    connect(defaultAction, &KNotificationAction::activated, this, [notification, room]() {
+    notification->setDefaultAction(i18n("Open this invitation in NeoChat"));
+    connect(notification, &KNotification::defaultActivated, this, [notification, room]() {
        WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
        notification->close();
        RoomManager::instance().enterRoom(room);
    });
-
-    const auto acceptAction = notification->addAction(i18nc("@action:button The thing being accepted is an invitation to chat", "Accept"));
-    const auto rejectAction = notification->addAction(i18nc("@action:button The thing being rejected is an invitation to chat", "Reject"));
-    const auto rejectAndIgnoreAction = notification->addAction(i18nc("@action:button The thing being rejected is an invitation to chat", "Reject and Ignore User"));
-    connect(acceptAction, &KNotificationAction::activated, this, [room, notification]() {
+    notification->setActions({i18nc("@action:button The thing being accepted is an invitation to chat", "Accept"), i18nc("@action:button The thing being rejected is an invitation to chat", "Reject"), i18nc("@action:button The thing being rejected is an invitation to chat", "Reject and Ignore User")});
+    connect(notification, &KNotification::action1Activated, this, [room, notification]() {
        if (!room) {
            return;
        }
        room->acceptInvitation();
        notification->close();
    });
-    connect(rejectAction, &KNotificationAction::activated, this, [room, notification]() {
+    connect(notification, &KNotification::action2Activated, this, [room, notification]() {
        if (!room) {
            return;
        }
        RoomManager::instance().leaveRoom(room);
        notification->close();
    });
-    connect(rejectAndIgnoreAction, &KNotificationAction::activated, this, [room, notification]() {
+    connect(notification, &KNotification::action3Activated, this, [room, notification]() {
        if (!room) {
            return;
        }
--- a/src/plasma-runner-neochat.desktop
+++ b/src/plasma-runner-neochat.desktop
@@ -3,7 +3,6 @@
 [Desktop Entry]
 Name=NeoChat
 Name[ar]=نيوتشات
-Name[ast]=NeoChat
 Name[az]=NeoChat
 Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
--- a/src/qml/AppearanceSettingsPage.qml
+++ b/src/qml/AppearanceSettingsPage.qml
@@ -212,7 +212,7 @@ FormCard.FormCardPage {

        Loader {
            id: colorSchemeDelegate
-            visible: item !== null
+            visible: item !== null && Qt.platform.os !== "android"
            source: "qrc:/org/kde/neochat/qml/ColorScheme.qml"
            Layout.fillWidth: true
        }
@@ -235,7 +235,7 @@ FormCard.FormCardPage {

        FormCard.FormCheckDelegate {
            id: hasWindowSystemDelegate
-            visible: WindowController.hasWindowSystem
+            visible: Controller.hasWindowSystem
            text: i18n("Use transparent chat page")
            enabled: !Config.compactLayout && !Config.isBlurImmutable
            checked: Config.blur
@@ -249,7 +249,7 @@ FormCard.FormCardPage {

        FormCard.AbstractFormDelegate {
            id: transparencyDelegate
-            visible: WindowController.hasWindowSystem && Config.blur
+            visible: Controller.hasWindowSystem && Config.blur
            enabled: !Config.isTransparancyImmutable
            background: Item {}
            contentItem: ColumnLayout {
--- a/src/qml/AudioDelegate.qml
+++ b/src/qml/AudioDelegate.qml
@@ -6,7 +6,6 @@ import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 import QtMultimedia

-import org.kde.coreaddons
 import org.kde.kirigami as Kirigami

 import org.kde.neochat
@@ -128,7 +127,7 @@ MessageDelegate {
            QQC2.Label {
                visible: root.contentMaxWidth > Kirigami.Units.gridUnit * 12

-                text: Format.formatDuration(audio.position) + "/" + Format.formatDuration(audio.duration)
+                text: Controller.formatDuration(audio.position) + "/" + Controller.formatDuration(audio.duration)
            }
        }
        QQC2.Label {
@@ -136,7 +135,7 @@ MessageDelegate {
            Layout.rightMargin: Kirigami.Units.smallSpacing
            visible: audio.hasAudio && root.contentMaxWidth < Kirigami.Units.gridUnit * 12

-            text: Format.formatDuration(audio.position) + "/" + Format.formatDuration(audio.duration)
+            text: Controller.formatDuration(audio.position) + "/" + Controller.formatDuration(audio.duration)
        }
    }
 }
--- a/src/qml/Categories.qml
+++ b/src/qml/Categories.qml
@@ -32,7 +32,7 @@ KirigamiSettings.CategorizedSettings {
            actionName: "security"
            text: i18n("Security")
            icon.name: "security-low"
-            page: Qt.resolvedUrl("RoomSecurity.qml")
+            page: Qt.resolvedUrl("Security.qml")
            initialProperties: {
                return {
                    room: root.room
--- a/src/qml/ChatBar.qml
+++ b/src/qml/ChatBar.qml
@@ -50,14 +50,6 @@ QQC2.Control {

    property NeoChatConnection connection

-    /**
-     * @brief The ActionsHandler object to use.
-     *
-     * This is expected to have the correct room set otherwise messages will be sent
-     * to the wrong room.
-     */
-    required property ActionsHandler actionsHandler
-
    /**
     * @brief The list of actions in the ChatBar.
     *
@@ -486,7 +478,7 @@ QQC2.Control {
    }

    function postMessage() {
-        root.actionsHandler.handleMessageEvent(_private.chatBarCache);
+        RoomManager.actionsHandler.handleMessageEvent(_private.chatBarCache);
        repeatTimer.stop()
        root.currentRoom.markAllMessagesAsRead();
        textField.clear();
--- a/src/qml/ChatBox.qml
+++ b/src/qml/ChatBox.qml
@@ -38,14 +38,6 @@ ColumnLayout {

    required property NeoChatConnection connection

-    /**
-     * @brief The ActionsHandler object to use.
-     *
-     * This is expected to have the correct room set otherwise messages will be sent
-     * to the wrong room.
-     */
-    required property ActionsHandler actionsHandler
-
    /**
     * @brief A message has been sent from the chat bar.
     */
@@ -83,7 +75,6 @@ ColumnLayout {
        Layout.preferredHeight: Math.round(implicitHeight)

        currentRoom: root.currentRoom
-        actionsHandler: root.actionsHandler

        FontMetrics {
            id: chatBarFontMetrics
--- a/src/qml/ChooseRoomDialog.qml
+++ b/src/qml/ChooseRoomDialog.qml
@@ -31,7 +31,7 @@ Kirigami.ScrollablePage {
        delegate: RoomDelegate {
            id: roomDelegate
            filterText: ""
-            onSelected: {
+            onClicked: {
                root.chosen(roomDelegate.currentRoom.id)
            }
            connection: root.connection
--- a/src/qml/DevicesPage.qml
+++ b/src/qml/DevicesPage.qml
@@ -16,11 +16,6 @@ FormCard.FormCardPage {

    title: i18n("Devices")

-    background: Kirigami.PlaceholderMessage {
-        text: i18n("Loading…")
-        visible: !thisDeviceCard.visible
-    }
-
    required property NeoChatConnection connection

    property DevicesModel devicesModel: DevicesModel {
@@ -29,7 +24,6 @@ FormCard.FormCardPage {
    }

    DevicesCard {
-        id: thisDeviceCard
        title: i18n("This Device")
        type: DevicesModel.This
        showVerifyButton: false
@@ -65,33 +59,26 @@ FormCard.FormCardPage {
        visible: !root.connection
    }

-    property Kirigami.Dialog passwordSheet: Kirigami.Dialog {
+    property Kirigami.OverlaySheet passwordSheet: Kirigami.OverlaySheet {
        id: passwordSheet

        property string deviceId

-        preferredWidth: Kirigami.Units.gridUnit * 24
-
        title: i18n("Remove device")
-
-        standardButtons: QQC2.Dialog.Cancel
-        FormCard.FormCard {
-            FormCard.FormTextFieldDelegate {
+        Kirigami.FormLayout {
+            QQC2.TextField {
                id: passwordField
-                label: i18n("Password:")
+                Kirigami.FormData.label: i18n("Password:")
                echoMode: TextInput.Password
            }
-        }
-        customFooterActions: [
-            Kirigami.Action {
-                text: i18nc("As in 'Remove this device'", "Remove")
-                icon.name: "delete"
-                onTriggered: {
+            QQC2.Button {
+                text: i18n("Confirm")
+                onClicked: {
                    devicesModel.logout(passwordSheet.deviceId, passwordField.text)
                    passwordField.text = ""
                    passwordSheet.close()
                }
            }
-        ]
+        }
    }
 }
--- a/src/qml/DirectChatDrawerHeader.qml
+++ b/src/qml/DirectChatDrawerHeader.qml
@@ -11,13 +11,6 @@ import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 import org.kde.neochat

 ColumnLayout {
-    id: root
-
-    /**
-     * @brief The current room that user is viewing.
-     */
-    required property NeoChatRoom room
-
    Layout.fillWidth: true
    Layout.alignment: Qt.AlignVCenter
    spacing: 0
@@ -33,15 +26,15 @@ ColumnLayout {
        Layout.alignment: Qt.AlignHCenter

        onClicked: {
-            RoomManager.visitUser(root.room.getUser(root.room.directChatRemoteUser.id).object, "mention")
+            RoomManager.visitUser(room.getUser(room.directChatRemoteUser.id).object, "mention")
        }

        contentItem: KirigamiComponents.Avatar {
-            name: root.room ? root.room.displayName : ""
-            source: root.room ? ("image://mxc/" +  root.room.avatarMediaId) : ""
+            name: room ? room.displayName : ""
+            source: room ? ("image://mxc/" +  room.avatarMediaId) : ""

            Rectangle {
-                visible: root.room.usesEncryption
+                visible: room.usesEncryption
                color: Kirigami.Theme.backgroundColor

                width: Kirigami.Units.gridUnit
@@ -63,7 +56,7 @@ ColumnLayout {
        Layout.fillWidth: true
        type: Kirigami.Heading.Type.Primary
        wrapMode: QQC2.Label.Wrap
-        text: root.room.displayName
+        text: room.displayName
        textFormat: Text.PlainText
        horizontalAlignment: Text.AlignHCenter
    }
--- a/src/qml/ExploreComponentMobile.qml
+++ b/src/qml/ExploreComponentMobile.qml
@@ -1,159 +0,0 @@
-// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-import QtQuick
-import QtQuick.Controls as QQC2
-import QtQuick.Layouts
-
-import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.delegates as Delegates
-
-import org.kde.neochat
-
-ColumnLayout {
-    id: root
-    spacing: 0
-
-    /**
-     * @brief The connection for the current user.
-     */
-    required property NeoChatConnection connection
-
-    /**
-     * @brief Emitted when the text is changed in the search field.
-     */
-    signal textChanged(string newText)
-
-    Kirigami.Separator {
-        Layout.fillWidth: true
-    }
-    Kirigami.NavigationTabBar {
-        id: exploreTabBar
-        Layout.fillWidth: true
-        actions: [
-            Kirigami.Action {
-                id: infoAction
-                text: i18n("Search")
-                icon.name: "search"
-                onTriggered: {
-                    if (explorePopup.visible && explorePopupLoader.sourceComponent == search) {
-                        explorePopup.close();
-                        exploreTabBar.currentIndex = -1;
-                    } else if (explorePopup.visible && explorePopupLoader.sourceComponent != search) {
-                        explorePopup.close();
-                        explorePopup.open();
-                    } else {
-                        explorePopup.open();
-                    }
-                    explorePopupLoader.sourceComponent = search;
-                }
-            },
-            Kirigami.Action {
-                text: i18n("Explore rooms")
-                icon.name: "compass"
-                onTriggered: {
-                    let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/JoinRoomPage.qml", {connection: root.connection}, {title: i18nc("@title", "Explore Rooms")})
-                    dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
-                        if (isJoined) {
-                            RoomManager.enterRoom(root.connection.room(roomId));
-                        } else {
-                            Controller.joinRoom(roomId.length > 0 ? roomId : alias);
-                        }
-                    })
-                    exploreTabBar.currentIndex = -1;
-                }
-            },
-            Kirigami.Action {
-                text: i18n("Start a Chat")
-                icon.name: "list-add-user"
-                onTriggered: {
-                    pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/StartChatPage.qml", {connection: root.connection}, {title: i18nc("@title", "Start a Chat")})
-                    exploreTabBar.currentIndex = -1;
-                }
-            },
-            Kirigami.Action {
-                text: i18n("Create New")
-                icon.name: "list-add"
-                onTriggered: {
-                    if (explorePopup.visible && explorePopupLoader.sourceComponent == create) {
-                        explorePopup.close();
-                        exploreTabBar.currentIndex = -1;
-                    } else if (explorePopup.visible && explorePopupLoader.sourceComponent != create) {
-                        explorePopup.close();
-                        explorePopup.open();
-                    } else {
-                        explorePopup.open();
-                    }
-                    explorePopupLoader.sourceComponent = create;
-                }
-            }
-        ]
-    }
-
-    QQC2.Popup {
-        id: explorePopup
-        parent: root
-
-        y: -height + 1
-        width: root.width
-        leftPadding: Kirigami.Units.largeSpacing
-        rightPadding: Kirigami.Units.largeSpacing
-        bottomPadding: Kirigami.Units.largeSpacing
-        topPadding: Kirigami.Units.largeSpacing
-
-        closePolicy: QQC2.Popup.CloseOnEscape
-
-        contentItem: Loader {
-            id: explorePopupLoader
-            sourceComponent: search
-        }
-
-        background: ColumnLayout {
-            spacing: 0
-            Kirigami.Separator {
-                Layout.fillWidth: true
-            }
-            Rectangle {
-                Layout.fillWidth: true
-                Layout.fillHeight: true
-                color: Kirigami.Theme.backgroundColor
-            }
-        }
-
-        Component {
-            id: search
-            Kirigami.SearchField {
-                onTextChanged: root.textChanged(text)
-            }
-        }
-        Component {
-            id: create
-            ColumnLayout {
-                spacing: 0
-                Delegates.RoundedItemDelegate {
-                    Layout.fillWidth: true
-                    action: Kirigami.Action {
-                        text: i18n("Create a Room")
-                        icon.name: "system-users-symbolic"
-                        onTriggered: {
-                            pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/CreateRoomDialog.qml", {connection: root.connection}, {title: i18nc("@title", "Create a Room")})
-                            explorePopup.close()
-                        }
-                        shortcut: StandardKey.New
-                    }
-                }
-                Delegates.RoundedItemDelegate {
-                    Layout.fillWidth: true
-                    action: Kirigami.Action {
-                        text: i18n("Create a Space")
-                        icon.name: "list-add"
-                        onTriggered: {
-                            pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/CreateRoomDialog.qml", {connection: root.connection, isSpace: true, title: i18nc("@title", "Create a Space")}, {title: i18nc("@title", "Create a Space")})
-                            explorePopup.close()
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
James Graham	210585129e	Remove roomChanged from ActionsHandler	2023-10-21 19:10:26 +01:00
James Graham	3473b75863	Move ActionsHandler to being instantiated by RoomManager this will allow it to be accessed by RoomDrawer items as well	2023-10-21 18:29:52 +01:00