Use QQC2 Dialog with updated style instead of Kirigami.Dialog

2025-05-17 14:14:48 +01:00
337 changed files with 66081 additions and 86910 deletions
--- a/.craft.ini
+++ b/.craft.ini
@@ -2,5 +2,7 @@
 ; SPDX-License-Identifier: CC0-1.0

 [BlueprintSettings]
+kde/frameworks/extra-cmake-modules.version=master
+kde/unreleased/kirigami-addons.version=master
 kde/applications/neochat.packageAppx=True
 libs/qt.qtMajorVersion=6
--- a/.flatpak-manifest.json
+++ b/.flatpak-manifest.json
@@ -2,7 +2,7 @@
    "id": "org.kde.neochat",
    "branch": "master",
    "runtime": "org.kde.Platform",
-    "runtime-version": "6.9",
+    "runtime-version": "6.8",
    "sdk": "org.kde.Sdk",
    "command": "neochat",
    "tags": [
@@ -20,16 +20,8 @@
        "--talk-name=org.kde.kwalletd5",
        "--talk-name=org.kde.StatusNotifierWatcher",
        "--talk-name=org.freedesktop.secrets",
-        "--talk-name=org.kde.kuiserver",
        "--own-name=org.kde.StatusNotifierItem-2-2"
    ],
-    "cleanup": [
-        "/include",
-        "/lib/*.a",
-        "/lib/cmake",
-        "/lib/pkgconfig",
-        "/share/ndk-modules"
-    ],
    "modules": [
        {
            "name": "kirigamiaddons",
@@ -90,8 +82,8 @@
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/libsecret/0.21/libsecret-0.21.7.tar.xz",
-                    "sha256": "6b452e4750590a2b5617adc40026f28d2f4903de15f1250e1d1c40bfd68ed55e",
+                    "url": "https://download.gnome.org/sources/libsecret/0.21/libsecret-0.21.6.tar.xz",
+                    "sha256": "747b8c175be108c880d3adfb9c3537ea66e520e4ad2dccf5dce58003aeeca090",
                    "x-checker-data": {
                        "type": "gnome",
                        "name": "libsecret",
@@ -157,6 +149,27 @@
            ],
            "builddir": true
        },
+        {
+            "name": "qcoro",
+            "buildsystem": "cmake-ninja",
+            "config-opts": [
+                "-DQCORO_BUILD_EXAMPLES=OFF",
+                "-DBUILD_TESTING=OFF"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://github.com/danvratil/qcoro/archive/refs/tags/v0.11.0.tar.gz",
+                    "sha256": "9942c5b4c533192f6c5954dc6d10178b3829075e6a621b67df73f0a4b74d8297",
+                    "x-checker-data": {
+                        "type": "anitya",
+                        "project-id": 236236,
+                        "stable-only": true,
+                        "url-template": "https://github.com/danvratil/qcoro/archive/refs/tags/v$version.tar.gz"
+                    }
+                }
+            ]
+        },
        {
            "name": "kunifiedpush",
            "buildsystem": "cmake-ninja",
@@ -164,13 +177,13 @@
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://download.kde.org/stable/release-service/25.04.3/src/kunifiedpush-25.04.3.tar.xz",
-                    "sha256": "a16ffe4117b14baa02f3b8ae7de9e509a17359c1b67dcd851aef4f3c3661a1df",
+                    "url": "https://download.kde.org/stable/kunifiedpush/kunifiedpush-1.0.0.tar.xz",
+                    "sha256": "2ddeba21306d0307114ec50a2c38159ec62359f9fc6cdd58da30a369fbd550cf",
                    "x-checker-data": {
                        "type": "anitya",
-                        "project-id": 8763,
+                        "project-id": 375055,
                        "stable-only": true,
-                        "url-template": "https://download.kde.org/stable/release-service/$version/src/kunifiedpush-$version.tar.xz"
+                        "url-template": "https://download.kde.org/stable/kunifiedpush/kunifiedpush-$version.tar.xz"
                    }
                }
            ]
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.16)

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

@@ -164,7 +164,6 @@ endif()

 if(ANDROID)
    find_package(Sqlite3)
-    set(BUILD_TESTING FALSE)
 endif()

 ki18n_install(po)
@@ -179,7 +178,7 @@ add_definitions(-DQT_NO_FOREACH)
 add_subdirectory(src)

 if (BUILD_TESTING)
-    find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test HttpServer)
+    find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
    add_subdirectory(autotests)
    # add_subdirectory(appiumtests)
    if (NOT ANDROID)
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -3,10 +3,6 @@

 enable_testing()

-add_library(neochat_server STATIC server.cpp)
-
-target_link_libraries(neochat_server PUBLIC Qt::HttpServer QuotientQt6)
-
 add_definitions(-DDATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" )

 ecm_add_test(
@@ -89,6 +85,6 @@ ecm_add_test(

 ecm_add_test(
    actionstest.cpp
-    LINK_LIBRARIES neochat Qt::Test neochat_server
+    LINK_LIBRARIES neochat Qt::Test
    TEST_NAME actionstest
 )
--- a/autotests/actionstest.cpp
+++ b/autotests/actionstest.cpp
@@ -6,11 +6,9 @@
 #include <QSignalSpy>
 #include <QVariantList>

-#include "accountmanager.h"
 #include "chatbarcache.h"
 #include "models/actionsmodel.h"

-#include "server.h"
 #include "testutils.h"

 using namespace Quotient;
@@ -23,12 +21,10 @@ class ActionsTest : public QObject

 private:
    Connection *connection = nullptr;
-    NeoChatRoom *room = nullptr;
+    TestUtils::TestRoom *room = nullptr;

    void expectMessage(const QString &actionName, const QString &args, MessageType::Type type, const QString &message);

-    Server server;
-
 private Q_SLOTS:
    void initTestCase();
    void testActions();
@@ -38,23 +34,8 @@ private Q_SLOTS:

 void ActionsTest::initTestCase()
 {
-    Connection::setRoomType<NeoChatRoom>();
-    server.start();
-    KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));
-    auto accountManager = new AccountManager(true);
-    QSignalSpy spy(accountManager, &AccountManager::connectionAdded);
-    connection = accountManager->accounts()->front();
-    auto roomId = server.createRoom(u"@user:localhost:1234"_s);
-    server.inviteUser(roomId, u"@invited:example.com"_s);
-    server.banUser(roomId, u"@banned:example.com"_s);
-    server.joinUser(roomId, u"@example:example.com"_s);
-
-    QSignalSpy syncSpy(connection, &Connection::syncDone);
-    // We need to wait for two syncs, as the next one won't have the changes yet
-    QVERIFY(syncSpy.wait());
-    QVERIFY(syncSpy.wait());
-    room = dynamic_cast<NeoChatRoom *>(connection->room(roomId));
-    QVERIFY(room);
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-min-sync.json"));
 }

 void ActionsTest::testActions_data()
@@ -109,7 +90,7 @@ static ActionsModel::Action findAction(const QString &name)
 void ActionsTest::expectMessage(const QString &actionName, const QString &args, MessageType::Type type, const QString &message)
 {
    auto action = findAction(actionName);
-    QSignalSpy spy(room, &NeoChatRoom::showMessage);
+    QSignalSpy spy(room, &TestUtils::TestRoom::showMessage);
    auto result = action.handle(args, room, nullptr);
    auto expected = QVariantList {type, message};
    auto signal = spy.takeFirst();
@@ -125,26 +106,14 @@ void ActionsTest::testInvite()
    QCOMPARE(room->memberState(u"@banned:example.com"_s), Membership::Ban);
    expectMessage(u"invite"_s, connection->userId(), MessageType::Positive, u"You are already in this room."_s);
    QCOMPARE(room->memberState(connection->userId()), Membership::Join);
-    expectMessage(u"invite"_s, u"@example:example.com"_s, MessageType::Information, u"@example:example.com is already in this room."_s);
-    QCOMPARE(room->memberState(u"@example:example.com"_s), Membership::Join);
+    expectMessage(u"invite"_s, u"@example:example.org"_s, MessageType::Information, u"@example:example.org is already in this room."_s);
+    QCOMPARE(room->memberState(u"@example:example.org"_s), Membership::Join);

    QCOMPARE(room->memberState(u"@user:example.com"_s), Membership::Leave);
    expectMessage(u"invite"_s, u"@user:example.com"_s, MessageType::Positive, u"@user:example.com was invited into this room."_s);

-    QSignalSpy spy(room, &NeoChatRoom::changed);
-    QVERIFY(spy.wait());
-
-    auto tries = 0;
-
-    while (room->memberState(u"@user:example.com"_s) != Membership::Invite) {
-        QVERIFY(spy.wait());
-        tries += 1;
-        if (tries > 3) {
-            QVERIFY(false);
-        }
-    }
-
-    QCOMPARE(room->memberState(u"@user:example.com"_s), Membership::Invite);
+    //TODO mock server, wait for invite state to change
+    //TODO QCOMPARE(room->memberState(u"@user:example.com"_s), Membership::Invite);
 }

 QTEST_MAIN(ActionsTest)
--- a/autotests/chatbarcachetest.cpp
+++ b/autotests/chatbarcachetest.cpp
@@ -6,7 +6,6 @@
 #include <QObject>
 #include <QTest>

-#include <QSignalSpy>
 #include <Quotient/roommember.h>
 #include <Quotient/syncdata.h>
 #include <qtestcase.h>
@@ -33,7 +32,6 @@ private Q_SLOTS:
    void noRoom();
    void badParent();
    void reply();
-    void replyMissingUser();
    void edit();
    void attachment();
 };
@@ -104,33 +102,6 @@ void ChatBarCacheTest::reply()
    QCOMPARE(chatBarCache->relationAuthor(), room->member(u"@example:example.org"_s));
    QCOMPARE(chatBarCache->relationMessage(), u"This is an example\ntext message"_s);
    QCOMPARE(chatBarCache->attachmentPath(), QString());
-    QCOMPARE(chatBarCache->relationAuthorIsPresent(), true);
-}
-
-void ChatBarCacheTest::replyMissingUser()
-{
-    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-    chatBarCache->setText(u"some text"_s);
-    chatBarCache->setAttachmentPath(u"some/path"_s);
-    chatBarCache->setReplyId(u"$153456789:example.org"_s);
-
-    QCOMPARE(chatBarCache->text(), u"some text"_s);
-    QCOMPARE(chatBarCache->isReplying(), true);
-    QCOMPARE(chatBarCache->replyId(), u"$153456789:example.org"_s);
-    QCOMPARE(chatBarCache->isEditing(), false);
-    QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationAuthor(), room->member(u"@example:example.org"_s));
-    QCOMPARE(chatBarCache->relationMessage(), u"This is an example\ntext message"_s);
-    QCOMPARE(chatBarCache->attachmentPath(), QString());
-    QCOMPARE(chatBarCache->relationAuthorIsPresent(), true);
-
-    QSignalSpy relationAuthorIsPresentSpy(chatBarCache.get(), &ChatBarCache::relationAuthorIsPresentChanged);
-
-    // sync again, which will simulate the reply user leaving the room
-    room->syncNewEvents(u"test-min-sync-extra-sync.json"_s);
-
-    QTRY_COMPARE(relationAuthorIsPresentSpy.count(), 1);
-    QCOMPARE(chatBarCache->relationAuthorIsPresent(), false);
 }

 void ChatBarCacheTest::edit()
--- a/autotests/data/localhost.crt
+++ b/autotests/data/localhost.crt
@@ -1,20 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIDNTCCAh2gAwIBAgIUXbyWfTfcvVLrVB1qx36pW/7IkwMwDQYJKoZIhvcNAQEL
-BQAwQjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UE
-CgwTRGVmYXVsdCBDb21wYW55IEx0ZDAgFw0yNDEyMjQxNTAxMDNaGA8yNTcyMDcy
-NDE1MDEwM1owQjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEc
-MBoGA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKlxZ540TQ1uUDAR7ZJ9ue0PzcD2dPmblIIddyekvZS59V7X
-drhamclXpHE2EelR87Sexst0BaHH/jmrHwxCtwbeXHZ8ueJHkGHJ5DLZCCiwfG+Q
-gml7wlSXxXz37vie2tdlZh2yJSM8yvLAYceHb2zOskaGvul7ZITIS0JrPc3o6VZk
-+MYGkYtA2JfUsv3jH4oQbxOf7RXqhWNAXbB+3hlwRBwMIdyoBNK6YS9QSrTeS9jj
-UqgO5QmaQZOVvpaPf1Y/rHHLd2Qa6+a/cCJ1sr2biagb75AihpQFsK/oy6D1PP70
-zTe7hPWn/efEpmtCV7CQ8ti4cRu0Kjy0T8grtCsCAwEAAaMhMB8wHQYDVR0OBBYE
-FIFlylzwADNLfgTDNkhFeFelaEDxMA0GCSqGSIb3DQEBCwUAA4IBAQBQ2rw4GLIU
-v+GY7Qru9LttkrQPd2bZXKxDMd/jT+wjmMVtqS4MAsCuDYwaYLjU1aWyqy0mN+lY
-A17kD0VjBNBy45sYqkZveY0ks8mCScBemtrIDmjz2tiueecBIEASwEPBOZgv5/MV
-cz864FiChF+2r8Zl8bhycGy9DEpRjzYKvIQWSDHQ3zpuh3iBnjfoieLHWX2kKCpk
-ouS3V6485rHNCWsZT5IcCwfBFQkOuWRJpIazpz4AfwZh1TK9+bgiKA5EyZjSNrKw
-xGQSpMSTRQMB0/FOCL/AixhN9unVFUViqUcdtSfoHE1VyBHv9kDT/cYms/Xl4B0t
-/ZSQJ/D/Km1+
-----END CERTIFICATE-----
--- a/autotests/data/localhost.key
+++ b/autotests/data/localhost.key
@@ -1,28 +0,0 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCpcWeeNE0NblAw
-Ee2SfbntD83A9nT5m5SCHXcnpL2UufVe13a4WpnJV6RxNhHpUfO0nsbLdAWhx/45
-qx8MQrcG3lx2fLniR5BhyeQy2QgosHxvkIJpe8JUl8V89+74ntrXZWYdsiUjPMry
-wGHHh29szrJGhr7pe2SEyEtCaz3N6OlWZPjGBpGLQNiX1LL94x+KEG8Tn+0V6oVj
-QF2wft4ZcEQcDCHcqATSumEvUEq03kvY41KoDuUJmkGTlb6Wj39WP6xxy3dkGuvm
-v3AidbK9m4moG++QIoaUBbCv6Mug9Tz+9M03u4T1p/3nxKZrQlewkPLYuHEbtCo8
-tE/IK7QrAgMBAAECggEAH9qmeKrra2F4KLlOGNKS//qPGz4Z+ozhi95/NpA1Zb7Z
-3pUSCBFcROo5i2D3WA4kiymoRLpQjrv60puVcCggoWVvK4VCKsR6Y6/hOx/q9T9M
-fWrE4ZC3FVEc+uPfZJT0nja9TkrdyXSV0LITD8Ap1eI7yJ9vR5R/bqj64QcpLMrU
-QeoQIy1oTMR+qdjj33duyRwBZU3Yf8FRB2iW6OILZ8hzFo1jngec7dph9a1RK4e0
-mEPdc9ywsKlDM7P0Y7zdmjar5XtQn87GiwNhz23f1fzCC2axLtOW0Xm4e4Qumehb
-WrIi6Vfq8IWMglU7QrBJ7iR0Ls+XoKA5GxomV2IJZQKBgQDoIkOl5YGPQ3iGR+WK
-e5/2Ml4G/uURzYiOlzSsyfoPXyO4EI2BJd5HkH+EvfgRx4xKkxUZRJdzR7llYPl8
-BFYcFitvhO8SbD0mNAB5YW7f+3v1pgEN2umzoKd389Zx5WqTZ7YB1VG5RN/Q1JJL
-2JM0Xgamq2vNtx3roRPxDBeW7QKBgQC63R/bmACJbgIzfaVBX4Zie3NQG0/Hf+gF
-LnBwUmQDZOR7MY+kSiIUVMn3NuZRiCSCFBVwApruyK8r535JCibTVm5PWjvhFddY
-LgaPOCKGlm9TLScjoH1pErYgG3uJ4nXeRfXhg4mco6EkrC7RzQywrd0VDoqpuc1Y
-EKfEsYk8dwKBgE+mSh3nNOBKX1V73+f3aTiZqaeu2DyWkG+UtE9BclrJ40Cp9VPG
-AZH+o7KRWEgJdzqzYv7riSfWCWgesRv7hOxYMwktzLY+i3DLUQpVAy05ZhwwnJX7
-ckrfKfc/pGoqNLplUI8qecMfPciy14vMwR2r0Y5orTHFzi9mcqg35PQ1AoGAW2LX
-OLq+0HdHhk0Va8I+450CSRQCUUvhed87SANTPEG0Z/dWC3/h6NWKrGdh/k+5oxAV
-Z+EuSkdFPBCLt0bKtCKZ8h7sF+lplotz08kdQXsC2MfFU2wiySdIgK1QHp/tCxZl
-6LM+sqdnoJrAjwRcB3AQJkMlV1ox7ba/hbdZqYMCgYBS6+JUXSSASpm5ZHd32a8m
-xwryEZ7H6Hek6lvMHdxmwoKat5dCavxw64nrtyeeGZpg1W3zLLyamF9x/8kMyr6y
-KKvtBfJ5sCvAbt80o9Pbs6R3yDB3AKiD3s3PQK7lol1nhE/8IbsF2r8JEQVcYd/k
-oBzkl7MrMyLhhaCqSxwqQQ==
-----END PRIVATE KEY-----
--- a/autotests/data/test-min-sync-extra-sync.json
+++ b/autotests/data/test-min-sync-extra-sync.json
@@ -1,20 +0,0 @@
-{
-  "state": {
-    "events": [
-      {
-        "content": {
-          "membership": "leave"
-        },
-        "event_id": "$1432735824666PhrSA:example.org",
-        "origin_server_ts": 1432735824666,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "state_key": "@example:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "replaces_state": "$143273582443PhrSn:example.org"
-        }
-      }
-    ]
-  }
-}
--- a/autotests/eventhandlertest.cpp
+++ b/autotests/eventhandlertest.cpp
@@ -130,8 +130,7 @@ void EventHandlerTest::timeString()
             QLocale().toString(QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toLocalTime().time(), QLocale::ShortFormat));
    QCOMPARE(EventHandler::timeString(room, event, true),
             format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(room, event, u"hh:mm"_s),
-             QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::LocalTime)).toString(u"hh:mm"_s));
+    QCOMPARE(EventHandler::timeString(room, event, u"hh:mm"_s), QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toString(u"hh:mm"_s));

    const auto txID = room->postJson("m.room.message"_L1, event->fullJson());
    QCOMPARE(room->pendingEvents().size(), 1);
--- a/autotests/messagecontentmodeltest.cpp
+++ b/autotests/messagecontentmodeltest.cpp
@@ -10,7 +10,7 @@
 #include <Quotient/roommember.h>
 #include <Quotient/syncdata.h>

-#include "models/eventmessagecontentmodel.h"
+#include "models/messagecontentmodel.h"

 #include "neochatconnection.h"
 #include "testutils.h"
@@ -39,13 +39,13 @@ void MessageContentModelTest::initTestCase()
 void MessageContentModelTest::missingEvent()
 {
    auto room = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s);
-    auto model1 = EventMessageContentModel(room, u"$153456789:example.org"_s);
+    auto model1 = MessageContentModel(room, u"$153456789:example.org"_s);

    QCOMPARE(model1.rowCount(), 1);
    QCOMPARE(model1.data(model1.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);
    QCOMPARE(model1.data(model1.index(0), MessageContentModel::DisplayRole), u"Loading"_s);

-    auto model2 = EventMessageContentModel(room, u"$153456789:example.org"_s, true);
+    auto model2 = MessageContentModel(room, u"$153456789:example.org"_s, true);

    QCOMPARE(model2.rowCount(), 1);
    QCOMPARE(model2.data(model2.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);
--- a/autotests/reactionmodeltest.cpp
+++ b/autotests/reactionmodeltest.cpp
@@ -9,7 +9,7 @@

 #include <Quotient/events/roommessageevent.h>

-#include "models/eventmessagecontentmodel.h"
+#include "models/messagecontentmodel.h"
 #include "testutils.h"

 using namespace Quotient;
@@ -21,7 +21,7 @@ class ReactionModelTest : public QObject
 private:
    Connection *connection = nullptr;
    TestUtils::TestRoom *room = nullptr;
-    EventMessageContentModel *parentModel;
+    MessageContentModel *parentModel;

 private Q_SLOTS:
    void initTestCase();
@@ -34,7 +34,7 @@ void ReactionModelTest::initTestCase()
 {
    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
    room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-reactionmodel-sync.json"_s);
-    parentModel = new EventMessageContentModel(room, "123456"_L1);
+    parentModel = new MessageContentModel(room, "123456"_L1);
 }

 void ReactionModelTest::basicReaction()
--- a/autotests/server.cpp
+++ b/autotests/server.cpp
@@ -1,235 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#include "server.h"
-
-#include <QFile>
-#include <QHttpServer>
-#include <QHttpServerResponder>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QNetworkReply>
-#include <QSslCertificate>
-#include <QSslKey>
-#include <QSslServer>
-#include <QUuid>
-
-#include <Quotient/networkaccessmanager.h>
-
-using namespace Qt::Literals::StringLiterals;
-
-QString generateEventId()
-{
-    return u"$"_s + QString::fromLatin1(QCryptographicHash::hash(QUuid::createUuid().toString().toLatin1(), QCryptographicHash::Sha1).toBase64());
-}
-
-QString generateRoomId()
-{
-    return u"!%1:localhost:1234"_s
-        .arg(QString::fromLatin1(QCryptographicHash::hash(QUuid::createUuid().toString().toLatin1(), QCryptographicHash::Sha1).toBase64()))
-        .replace(u'/', QChar());
-}
-
-Server::Server()
-{
-}
-
-void Server::start()
-{
-    QObject::connect(Quotient::NetworkAccessManager::instance(),
-                     &QNetworkAccessManager::sslErrors,
-                     Quotient::NetworkAccessManager::instance(),
-                     [](QNetworkReply *reply) {
-                         reply->ignoreSslErrors();
-                     });
-    m_server.route(u"/.well-known/matrix/client"_s, QHttpServerRequest::Method::Get, [](QHttpServerResponder &responder) {
-        responder.write(QJsonDocument(QJsonObject{
-                            {u"m.homeserver"_s, QJsonObject{{u"base_url"_s, u"https://localhost:1234"_s}}},
-                        }),
-                        QHttpServerResponder::StatusCode::Ok);
-    });
-    m_server.route(u"/_matrix/client/versions"_s, QHttpServerRequest::Method::Get, [](QHttpServerResponder &responder) {
-        responder.write(QJsonDocument(QJsonObject{
-                            {u"versions"_s,
-                             QJsonArray{
-                                 u"v1.0"_s,
-                                 u"v1.1"_s,
-                                 u"v1.2"_s,
-                                 u"v1.3"_s,
-                                 u"v1.4"_s,
-                                 u"v1.5"_s,
-                                 u"v1.6"_s,
-                                 u"v1.7"_s,
-                                 u"v1.8"_s,
-                                 u"v1.9"_s,
-                                 u"v1.10"_s,
-                                 u"v1.11"_s,
-                                 u"v1.12"_s,
-                                 u"v1.13"_s,
-                             }},
-                        }),
-                        QHttpServerResponder::StatusCode::Ok);
-    });
-    m_server.route(u"/_matrix/client/v3/capabilities"_s, QHttpServerRequest::Method::Get, [](QHttpServerResponder &responder) {
-        responder.write(
-            QJsonDocument(QJsonObject{{u"capabilities"_s,
-                                       QJsonObject{
-                                           {u"m.room_versions"_s, QJsonObject{{u"m.available"_s, QJsonObject{{u"1"_s, u"stable"_s}}}, {u"default"_s, u"1"_s}}},
-                                       }}}),
-            QHttpServerResponder::StatusCode::Ok);
-    });
-    m_server.route(u"/_matrix/client/v3/account/whoami"_s, QHttpServerRequest::Method::Get, [](QHttpServerResponder &responder) {
-        responder.write(QJsonDocument(QJsonObject{
-                            {u"device_id"_s, u"device_id_1234"_s},
-                            {u"user_id"_s, u"@user:localhost:1234"_s},
-                        }),
-                        QHttpServerResponder::StatusCode::Ok);
-    });
-
-    m_server.route(u"/_matrix/client/v3/login"_s, QHttpServerRequest::Method::Post, [](QHttpServerResponder &responder) {
-        // TODO
-        // if data["identifier"]["user"] != "user" or data["password"] != "1234":
-        //     abort(403)
-        responder.write(QJsonDocument(QJsonObject{
-                            {u"access_token"_s, u"token_login"_s},
-                            {u"device_id"_s, u"device_1234"_s},
-                            {u"user_id"_s, u"@user:localhost:1234"_s},
-                        }),
-                        QHttpServerResponder::StatusCode::Ok);
-    });
-
-    m_server.route(u"/_matrix/client/v3/login"_s, QHttpServerRequest::Method::Get, [](QHttpServerResponder &responder) {
-        responder.write(QJsonDocument(QJsonObject{
-                            {u"flows"_s, QJsonArray{QJsonObject{{u"type"_s, u"m.login.password"_s}}}},
-                        }),
-                        QHttpServerResponder::StatusCode::Ok);
-    });
-
-    m_server.route(u"/_matrix/client/v3/rooms/<arg>/invite"_s,
-                   QHttpServerRequest::Method::Post,
-                   [this](const QString &roomId, QHttpServerResponder &responder, const QHttpServerRequest &request) {
-                       m_invitedUsers[roomId] += QJsonDocument::fromJson(request.body()).object()[u"user_id"_s].toString();
-                       responder.write(QJsonDocument(QJsonObject{}), QHttpServerResponder::StatusCode::Ok);
-                   });
-
-    m_server.route(u"/_matrix/client/r0/sync"_s, QHttpServerRequest::Method::Get, [this](QHttpServerResponder &responder) {
-        QMap<QString, QJsonArray> stateEvents;
-
-        for (const auto &[roomId, matrixId] : m_roomsToCreate) {
-            stateEvents[roomId] += QJsonObject{
-                {u"content"_s, QJsonObject{{u"room_version"_s, u"11"_s}}},
-                {u"event_id"_s, generateEventId()},
-                {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                {u"room_id"_s, roomId},
-                {u"sender"_s, matrixId},
-                {u"state_key"_s, QString()},
-                {u"type"_s, u"m.room.create"_s},
-                {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-            };
-            stateEvents[roomId] += QJsonObject{
-                {u"content"_s, QJsonObject{{u"displayname"_s, u"User"_s}, {u"membership"_s, u"join"_s}}},
-                {u"event_id"_s, generateEventId()},
-                {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                {u"room_id"_s, roomId},
-                {u"sender"_s, matrixId},
-                {u"state_key"_s, matrixId},
-                {u"type"_s, u"m.room.member"_s},
-                {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-            };
-        }
-        m_roomsToCreate.clear();
-        for (const auto &roomId : m_invitedUsers.keys()) {
-            const auto &values = m_invitedUsers[roomId];
-            for (const auto &value : values) {
-                stateEvents[roomId] += QJsonObject{
-                    {u"content"_s, QJsonObject{{u"displayname"_s, u"User"_s}, {u"membership"_s, u"invite"_s}}},
-                    {u"event_id"_s, generateEventId()},
-                    {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                    {u"room_id"_s, roomId},
-                    {u"sender"_s, u"@user:localhost:1234"_s},
-                    {u"state_key"_s, value},
-                    {u"type"_s, u"m.room.member"_s},
-                    {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-                };
-            }
-        }
-        m_invitedUsers.clear();
-
-        for (const auto &roomId : m_bannedUsers.keys()) {
-            const auto &values = m_bannedUsers[roomId];
-            for (const auto &value : values) {
-                stateEvents[roomId] += QJsonObject{
-                    {u"content"_s, QJsonObject{{u"displayname"_s, u"User"_s}, {u"membership"_s, u"ban"_s}}},
-                    {u"event_id"_s, generateEventId()},
-                    {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                    {u"room_id"_s, roomId},
-                    {u"sender"_s, u"@user:localhost:1234"_s},
-                    {u"state_key"_s, value},
-                    {u"type"_s, u"m.room.member"_s},
-                    {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-                };
-            }
-        }
-        m_bannedUsers.clear();
-
-        for (const auto &roomId : m_joinedUsers.keys()) {
-            const auto &values = m_joinedUsers[roomId];
-            for (const auto &value : values) {
-                stateEvents[roomId] += QJsonObject{
-                    {u"content"_s, QJsonObject{{u"displayname"_s, u"User"_s}, {u"membership"_s, u"join"_s}}},
-                    {u"event_id"_s, generateEventId()},
-                    {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                    {u"room_id"_s, roomId},
-                    {u"sender"_s, u"@user:localhost:1234"_s},
-                    {u"state_key"_s, value},
-                    {u"type"_s, u"m.room.member"_s},
-                    {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-                };
-            }
-        }
-        m_joinedUsers.clear();
-
-        QJsonObject rooms;
-        for (const auto &roomId : stateEvents.keys()) {
-            rooms[roomId] = QJsonObject{{u"state"_s, QJsonObject{{u"events"_s, stateEvents[roomId]}}}};
-        }
-
-        responder.write(QJsonDocument(QJsonObject{{u"rooms"_s, QJsonObject{{u"join"_s, rooms}}}}), QHttpServerResponder::StatusCode::Ok);
-    });
-
-    QSslConfiguration config;
-    QFile key(QStringLiteral(DATA_DIR) + u"/localhost.key"_s);
-    key.open(QFile::ReadOnly);
-    config.setPrivateKey(QSslKey(&key, QSsl::Rsa));
-    config.setLocalCertificate(QSslCertificate::fromPath(QStringLiteral(DATA_DIR) + u"/localhost.crt"_s).front());
-    m_sslServer.setSslConfiguration(config);
-    if (!m_sslServer.listen(QHostAddress::LocalHost, 1234) || !m_server.bind(&m_sslServer)) {
-        qFatal() << "Server failed to listen on a port.";
-        return;
-    } else {
-        qWarning() << "Server listening";
-    }
-}
-
-QString Server::createRoom(const QString &matrixId)
-{
-    auto roomId = generateRoomId();
-    m_roomsToCreate += {roomId, matrixId};
-    return roomId;
-}
-
-void Server::inviteUser(const QString &roomId, const QString &matrixId)
-{
-    m_invitedUsers[roomId] += matrixId;
-}
-
-void Server::banUser(const QString &roomId, const QString &matrixId)
-{
-    m_bannedUsers[roomId] += matrixId;
-}
-
-void Server::joinUser(const QString &roomId, const QString &matrixId)
-{
-    m_joinedUsers[roomId] += matrixId;
-}
--- a/autotests/server.h
+++ b/autotests/server.h
@@ -1,33 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#include <QHttpServer>
-#include <QSslServer>
-
-class Server
-{
-public:
-    Server();
-
-    void start();
-
-    /**
-     * Create a room and place the user with id matrixId in it.
-     * Returns the room's id
-     */
-    QString createRoom(const QString &matrixId);
-
-    void inviteUser(const QString &roomId, const QString &matrixId);
-    void banUser(const QString &roomId, const QString &matrixId);
-    void joinUser(const QString &roomId, const QString &matrixId);
-
-private:
-    QHttpServer m_server;
-    QSslServer m_sslServer;
-
-    QHash<QString, QList<QString>> m_invitedUsers;
-    QHash<QString, QList<QString>> m_bannedUsers;
-    QHash<QString, QList<QString>> m_joinedUsers;
-
-    QList<std::pair<QString, QString>> m_roomsToCreate;
-};
--- a/autotests/texthandlertest.cpp
+++ b/autotests/texthandlertest.cpp
@@ -61,7 +61,6 @@ private Q_SLOTS:
    void receiveRichStrikethrough();
    void receiveRichtextIn();
    void receiveRichMxcUrl();
-    void receiveRichPlainUrl_data();
    void receiveRichPlainUrl();
    void receiveRichEdited_data();
    void receiveRichEdited();
@@ -265,8 +264,6 @@ void TextHandlerTest::sendCustomTags_data()
    QTest::newRow("inside code block spoiler") << u"```||apple||```"_s << u"<code>||apple||</code>"_s;
    QTest::newRow("outside code block spoiler") << u"||apple|| ```||banana||``` ||pear||"_s
                                                << u"<span data-mx-spoiler>apple</span> <code>||banana||</code> <span data-mx-spoiler>pear</span>"_s;
-    QTest::newRow("complex spoiler") << u"Between `formFactor == Horizontal||Vertical` and `location == top||left||bottom||right`"_s
-                                     << u"Between <code>formFactor == Horizontal||Vertical</code> and <code>location == top||left||bottom||right</code>"_s;

    // strikethrough
    QTest::newRow("incomplete strikethrough") << u"~~test"_s << u"~~test"_s;
@@ -451,32 +448,6 @@ void TextHandlerTest::receiveRichMxcUrl()
    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, room->messageEvents().at(0).get()), testOutputString);
 }

-void TextHandlerTest::receiveRichPlainUrl_data()
-{
-    QTest::addColumn<QString>("input");
-    QTest::addColumn<QString>("output");
-
-    // This is an actual link that caused trouble which is why it's so long. Keeping
-    // so we can confirm consistent behaviour for complex urls.
-    QTest::addRow("link 1")
-        << u"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s
-        << u"<a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im</a> <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s;
-
-    // Another real case. The linkification wasn't handling it when a single link
-    // contains what looks like and email. It was broken into 3 but needs to
-    // be just single link.
-    QTest::addRow("link 2")
-        << u"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/"_s
-        << u"<a href=\"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/\">https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/</a>"_s;
-
-    QTest::addRow("email") << uR"(email@example.com <a href="mailto:email@example.com">Link already rich</a>)"_s
-                           << uR"(<a href="mailto:email@example.com">email@example.com</a> <a href="mailto:email@example.com">Link already rich</a>)"_s;
-    QTest::addRow("mxid")
-        << u"@user:kde.org <a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a>"_s
-        << u"<b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> <b><a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a></b>"_s;
-    QTest::addRow("mxid with prefix") << u"a @user:kde.org b"_s << u"a <b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> b"_s;
-}
-
 /**
 * For when your rich input string has a plain text url left in.
 *
@@ -485,13 +456,46 @@ void TextHandlerTest::receiveRichPlainUrl_data()
 */
 void TextHandlerTest::receiveRichPlainUrl()
 {
-    QFETCH(QString, input);
-    QFETCH(QString, output);
+    // This is an actual link that caused trouble which is why it's so long. Keeping
+    // so we can confirm consistent behaviour for complex urls.
+    const QString testInputStringLink1 =
+        u"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s;
+    const QString testOutputStringLink1 =
+        u"<a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im</a> <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s;
+
+    // Another real case. The linkification wasn't handling it when a single link
+    // contains what looks like and email. It was been broken into 3 but needs to
+    // be just single link.
+    const QString testInputStringLink2 = u"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/"_s;
+    const QString testOutputStringLink2 =
+        u"<a href=\"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/\">https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/</a>"_s;
+
+    QString testInputStringEmail = uR"(email@example.com <a href="mailto:email@example.com">Link already rich</a>)"_s;
+    QString testOutputStringEmail = uR"(<a href="mailto:email@example.com">email@example.com</a> <a href="mailto:email@example.com">Link already rich</a>)"_s;
+
+    QString testInputStringMxId = u"@user:kde.org <a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a>"_s;
+    QString testOutputStringMxId =
+        u"<b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> <b><a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a></b>"_s;
+
+    QString testInputStringMxIdWithPrefix = u"a @user:kde.org b"_s;
+    QString testOutputStringMxIdWithPrefix = u"a <b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> b"_s;

    TextHandler testTextHandler;
-    testTextHandler.setData(input);
+    testTextHandler.setData(testInputStringLink1);

-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), output);
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringLink1);
+
+    testTextHandler.setData(testInputStringLink2);
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringLink2);
+
+    testTextHandler.setData(testInputStringEmail);
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringEmail);
+
+    testTextHandler.setData(testInputStringMxId);
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxId);
+
+    testTextHandler.setData(testInputStringMxIdWithPrefix);
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxIdWithPrefix);
 }

 void TextHandlerTest::receiveRichEdited_data()
--- a/autotests/timelinemessagemodeltest.cpp
+++ b/autotests/timelinemessagemodeltest.cpp
@@ -57,7 +57,7 @@ void TimelineMessageModelTest::switchEmptyRoom()
    auto firstRoom = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s);
    auto secondRoom = new TestUtils::TestRoom(connection, u"#secondRoom:kde.org"_s);

-    QSignalSpy spy(model, SIGNAL(roomChanged(NeoChatRoom *, NeoChatRoom *)));
+    QSignalSpy spy(model, SIGNAL(roomChanged()));

    QCOMPARE(model->room(), nullptr);
    model->setRoom(firstRoom);
@@ -77,7 +77,7 @@ void TimelineMessageModelTest::switchSyncedRoom()
    auto firstRoom = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s, u"test-messageventmodel-sync.json"_s);
    auto secondRoom = new TestUtils::TestRoom(connection, u"#secondRoom:kde.org"_s, u"test-messageventmodel-sync.json"_s);

-    QSignalSpy spy(model, SIGNAL(roomChanged(NeoChatRoom *, NeoChatRoom *)));
+    QSignalSpy spy(model, SIGNAL(roomChanged()));

    QCOMPARE(model->room(), nullptr);
    model->setRoom(firstRoom);
@@ -208,7 +208,7 @@ void TimelineMessageModelTest::idToRow()
    auto room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-min-sync.json"_s);
    model->setRoom(room);

-    QCOMPARE(model->indexforEventId(u"$153456789:example.org"_s).row(), 0);
+    QCOMPARE(model->eventIdToRow(u"$153456789:example.org"_s), 0);
 }

 void TimelineMessageModelTest::cleanup()
--- a/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
@@ -75,7 +75,6 @@
  <summary xml:lang="nl">Chat op Matrix</summary>
  <summary xml:lang="nn">Prat med via Matrix</summary>
  <summary xml:lang="pl">Rozmawiaj na Matriksie</summary>
-  <summary xml:lang="pt-BR">Bate-papo na Matrix</summary>
  <summary xml:lang="ru">Общение в Matrix</summary>
  <summary xml:lang="sa">Matrix इत्यत्र गपशपं कुर्वन्तु</summary>
  <summary xml:lang="sl">Klepet na Matrixu</summary>
@@ -110,7 +109,6 @@
    <p xml:lang="nl">NeoChat is een chat-toepassing die u het volledige voordeel van het Matrix-netwerk laat genieten. Het levert u op een veilige manier tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden te verzenden.</p>
    <p xml:lang="nn">NeoChat er ein prateapp som lèt deg bruka all funksjonalitet i Matrix-nettverket. Du kan utveksla tekst, lyd og videoar med vennar, familie og kollegaar på ein trygg måte.</p>
    <p xml:lang="pl">NoeChat to aplikacja do rozmów, która umożliwia wykorzystanie wszystkich możliwości Matriksa. Umożliwia wysyłanie wiadomości tekstowych, filmów i dźwięków w bezpieczny sposób do twojej rodziny, kolegów i przyjaciół.</p>
-    <p xml:lang="pt-BR">O NeoChat é um aplicativo de bate-papo que permite que você aproveite ao máximo a rede Matrix. Ele oferece uma maneira segura de enviar mensagens de texto, vídeos e arquivos de áudio para sua família, colegas e amigos.</p>
    <p xml:lang="ru">NeoChat — приложение для общения, предоставляющее все преимущества сети Matrix. С его помощью можно безопасно отправлять текстовые сообщения, видеозаписи и звуковые файлы родственникам, коллегам и друзьям.</p>
    <p xml:lang="sa">NeoChat इति एकं गपशप-अनुप्रयोगं यत् भवान् Matrix-जालस्य पूर्णं लाभं ग्रहीतुं शक्नोति । एतत् भवन्तं भवतः परिवाराय, सहकारिभ्यः, मित्रेभ्यः च पाठसन्देशान्, भिडियो, श्रव्यसञ्चिकाः च प्रेषयितुं सुरक्षितं मार्गं प्रदाति ।</p>
    <p xml:lang="sl">NeoChat je aplikacija za klepet, ki vam omogoča, da v celoti izkoristite omrežje Matrix. Zagotavlja vam varen način za pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, sodelavcem in prijateljem.</p>
@@ -144,7 +142,6 @@
    <p xml:lang="nn">NeoChat har som mål å støtta all funksjonalitet i Matrix-spesifikasjonen. Førebels er alt i den gjeldande stabile spesifikasjonen støtta, med unntak av VoIP, trådar og nokre delar av ende-til-kryptering. Det finst òg andre småting som ikkje er støtta, sidan Matrix-spesifikasjon er i stadig endring, men målet er altså støtte for alt.</p>
    <p xml:lang="pl">NeoChat w zamyśle ma być pełnowartościową aplikacją wg wytycznych Matriksa. Z tego powodu, wszystko, co jest obecnie w stabilnych wytycznych z pominięciem VoIP, wątków i niektórych części szyfrowania Użytkownik-do-Użytkownika są obecnie obsługiwane. Pominięto też kilka mniejszych rzeczy ze względu na ciągły rozwój wytycznych Matriksa, lecz celem nadal jest zapewnienie obsługi wszystkich wytycznych.</p>
    <p xml:lang="pt">O NeoChat pretende ser uma aplicação completa para a especificação do Matrix. Como tal, tudo o que existe na especificação estável actual, com as notáveis excepções do VoIP, tópicos e alguns aspectos da Encriptação Ponto-a-Ponto, são suportados. Existem mais algumas omissões, devido ao facto que a norma do Matrix está em constante evolução, mas o objectivo continua a ser oferecer o suporte eventual para a norma por inteiro.</p>
-    <p xml:lang="pt-BR">O NeoChat pretende ser um aplicativo completo para a especificação Matrix. Dessa forma, tudo na especificação estável atual, com as notáveis exceções de VoIP, tópicos e alguns aspectos da criptografia de ponta a ponta, é suportado. Há algumas outras pequenas omissões devido ao fato de a especificação Matrix estar em constante evolução, mas o objetivo continua sendo fornecer suporte eventual para toda a especificação.</p>
    <p xml:lang="ru">Целью создания NeoChat является полноценная реализация программы для спецификации Matrix. Как следствие, реализовано всё в текущей стабильной спецификации (за исключением голосовой интернет-связи, потоков и некоторых аспектов сквозного шифрования). Есть также несколько других незначительных пробелов, обусловленных постоянными изменениями спецификации Matrix. Тем не менее, стоит задача в итоге предоставить полную поддержку спецификации.</p>
    <p xml:lang="sa">NeoChat इत्यस्य उद्देश्यं Matrix विनिर्देशस्य कृते पूर्णतया विशेषतायुक्तः अनुप्रयोगः भवितुम् अस्ति । यथा तथा वर्तमानस्थिरविनिर्देशे सर्वं VoIP इत्यस्य उल्लेखनीयअपवादैः सह, थ्रेड्स तथा च End-to-End Encryption इत्यस्य केचन पक्षाः समर्थिताः सन्ति । अन्ये कतिचन लघु लोपाः सन्ति यतोहि Matrix spec निरन्तरं विकसितः अस्ति परन्तु उद्देश्यं सम्पूर्ण spec कृते अन्ततः समर्थनं प्रदातुं अवशिष्टम् अस्ति</p>
    <p xml:lang="sl">Neochat cilja, da bi bila popolna aplikacija po specifikaciji Matrixa. Kot takšna vsebuje vse v trenutni stabilni specifikaciji z pomembnimi izjemami pri VoIP, nitih in nekaterih vidikov šifriranja od konca do konca. Obstaja nekaj drugih manjših opustitev zaradi dejstva, da se specifikacija Matrix nenehno razvija, vendar cilj ostaja zagotoviti morebitno podporo celotni specifikaciji.</p>
@@ -178,7 +175,6 @@
    <p xml:lang="nn">På grunn av måten Matrix-spesifikasjonen vert utvikla på, støttar NeoChat òg nokre uferdige funksjonar:</p>
    <p xml:lang="pl">Ze względu na sposób rozwoju Matriksa, NeoChat obsługuje także kilka niestabilnych możliwości. Obecnie są to:</p>
    <p xml:lang="pt">Devido à natureza do desenvolvimento da especificação do Matrix, o NeoChat também suporta diversas funcionalidades instáveis. De momento são:</p>
-    <p xml:lang="pt-BR">Devido à natureza do desenvolvimento da especificação Matrix, o NeoChat também suporta diversos recursos instáveis. Atualmente, são eles:</p>
    <p xml:lang="ru">В силу природы разработки спецификации Matrix в NeoChat тоже предусмотрена поддержка многочисленных нестабильных возможностей. В текущей версии это следующие возможности:</p>
    <p xml:lang="sa">Matrix विनिर्देशविकासस्य प्रकृतेः कारणात् NeoChat अपि अनेकानाम् अस्थिरविशेषतानां समर्थनं करोति । सम्प्रति एते सन्ति :</p>
    <p xml:lang="sl">Zaradi narave razvoja specifikacije Matrixa NeoChat podpira tudi številne nestabilne zmožnosti. Trenutno so to:</p>
@@ -191,8 +187,8 @@
    <ul>
      <li>Polls - MSC3381</li>
      <li xml:lang="ar">التصويت - MSC3381</li>
-      <li xml:lang="ca">Votacions - MSC3381</li>
-      <li xml:lang="ca-valencia">Votacions - MSC3381</li>
+      <li xml:lang="ca">Enquestes - MSC3381</li>
+      <li xml:lang="ca-valencia">Enquestes - MSC3381</li>
      <li xml:lang="el">Δημοσκοπήσεις - MSC3381</li>
      <li xml:lang="en-GB">Polls - MSC3381</li>
      <li xml:lang="eo">Enketoj - MSC3381</li>
@@ -213,7 +209,6 @@
      <li xml:lang="nn">Avstemmingar – MSC3381</li>
      <li xml:lang="pl">Ankiety - MSC3381</li>
      <li xml:lang="pt">Inquéritos - MSC3381</li>
-      <li xml:lang="pt-BR">Enquetes - MSC3381</li>
      <li xml:lang="ru">Голосования — MSC3381</li>
      <li xml:lang="sa">मतदान - MSC3381</li>
      <li xml:lang="sl">Polls - MSC3381</li>
@@ -247,7 +242,6 @@
      <li xml:lang="nn">Klistremerke-pakkar – MSC2545</li>
      <li xml:lang="pl">Paczki naklejek - MSC2545</li>
      <li xml:lang="pt">Pacotes de Autocolantes - MSC2545</li>
-      <li xml:lang="pt-BR">Pacotes de Stickers - MSC2545</li>
      <li xml:lang="ru">Наборы стикеров — MSC2545</li>
      <li xml:lang="sa">स्टिकर पैक - MSC2545</li>
      <li xml:lang="sl">Sticker Packs - MSC2545</li>
@@ -281,7 +275,6 @@
      <li xml:lang="nn">Posisjonshendingar – MSC3488</li>
      <li xml:lang="pl">Wydarzenia w miejscach - MSC3488</li>
      <li xml:lang="pt">Eventos com Localizações - MSC3488</li>
-      <li xml:lang="pt-BR">Localização de eventos - MSC3488</li>
      <li xml:lang="ru">События местоположения — MSC3488</li>
      <li xml:lang="sa">स्थान घटनाएँ - MSC3488</li>
      <li xml:lang="sl">Location Events - MSC3488</li>
@@ -351,7 +344,6 @@
      <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
      <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
      <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
-      <caption xml:lang="pt-BR">Visão principal com lista de salas, bate-papo e informações sobre as salas</caption>
      <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
      <caption xml:lang="sa">कक्षसूची, गपशपः, कक्षसूचना च सह मुख्यदृश्यम्</caption>
      <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
@@ -388,7 +380,6 @@
      <caption xml:lang="nl">Ontdek nieuwe gemeenschappen met Matrix-ruimten</caption>
      <caption xml:lang="nn">Oppdag nye fellesskap med Matrix Spaces</caption>
      <caption xml:lang="pl">Odkrywaj nowe społeczności w Przestrzeniach Matriksa</caption>
-      <caption xml:lang="pt-BR">Descubra novas comunidades com os Espaços Matrix</caption>
      <caption xml:lang="ru">Поиск новых сообществ с помощью Matrix Spaces</caption>
      <caption xml:lang="sa">Matrix Spaces इत्यनेन सह नूतनानां समुदायानाम् अन्वेषणं कुर्वन्तु</caption>
      <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
@@ -433,7 +424,6 @@
      <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
      <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
      <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
-      <caption xml:lang="pt-BR">Visão principal com lista de salas, bate-papo e informações sobre as salas</caption>
      <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
      <caption xml:lang="sa">कक्षसूची, गपशपः, कक्षसूचना च सह मुख्यदृश्यम्</caption>
      <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
@@ -472,7 +462,6 @@
      <caption xml:lang="nn">Innloggingsbilete</caption>
      <caption xml:lang="pl">Ekran logowania</caption>
      <caption xml:lang="pt">Ecrã de autenticação</caption>
-      <caption xml:lang="pt-BR">Tela de login</caption>
      <caption xml:lang="ru">Окно входа</caption>
      <caption xml:lang="sa">लॉगिन् स्क्रीन</caption>
      <caption xml:lang="sl">Prijavni zaslon</caption>
@@ -488,9 +477,6 @@
    <content_attribute id="social-chat">intense</content_attribute>
  </content_rating>
  <releases>
-    <release version="25.08.0" date="2025-08-14"/>
-    <release version="25.04.3" date="2025-07-03"/>
-    <release version="25.04.2" date="2025-06-05"/>
    <release version="25.04.1" date="2025-05-08"/>
    <release version="25.04.0" date="2025-04-17"/>
    <release version="24.12.3" date="2025-03-06"/>
--- 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/gl/neochat.po
+++ b/po/gl/neochat.po
--- a/po/he/neochat.po
+++ b/po/he/neochat.po
--- a/po/hi/neochat.po
+++ b/po/hi/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/lv/neochat.po
+++ b/po/lv/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/docs/neochat/man-neochat.1.docbook
+++ b/po/ru/docs/neochat/man-neochat.1.docbook
@@ -1,122 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
-<!ENTITY % Russian "INCLUDE">
-]>
-<!--
-SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
-<refentry lang="&language;">
-<refentryinfo>
-<title
->Руководство пользователя NeoChat</title>
-<author
-><firstname
->Carl</firstname
-><surname
->Schwan</surname
-> <contrib
->man-страница NeoChat.</contrib
-> <email
->carl@carlschwan.eu</email
-></author>
-<date
->2022-11-01</date>
-<releaseinfo
->22.09</releaseinfo>
-<productname
->NeoChat</productname>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>
-    <command
->neochat</command>
-  </refentrytitle>
-  <manvolnum
->1</manvolnum>
-</refmeta>
-
-<refnamediv>
-  <refname
->neochat</refname>
-  <refpurpose
->Клиент для взаимодействия с протоколом обмена сообщениями Matrix</refpurpose>
-  </refnamediv>
-  <!-- body begins here -->
-  <refsynopsisdiv id='synopsis'>
-  <cmdsynopsis
-><command
->neochat</command
-> <arg choice="opt"
-><replaceable
->URI</replaceable
-></arg
-> </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsect1 id="description">
-  <title
->Описание</title>
-  <para
-><command
->neochat</command
-> — приложение для настольных и мобильных устройств, позволяющее общаться в чатах с помощью протокола Matrix. </para>
-</refsect1>
-
-<refsect1 id="options"
-><title
->Параметры</title>
-<variablelist>
-  <varlistentry>
-  <term
-><option
->URI</option
-></term>
-  <listitem>
-    <para
->URI-адрес пользователя или комнаты в Matrix, например: matrix:u/user:example.org и matrix:r/root:example.org. NeoChat попытается открыть указанную комнату или беседу. </para>
-  </listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1 id="bug">
-  <title
->Отчёты об ошибках</title>
-  <para
->Сообщать об ошибках и отправлять предложения по улучшению можно по адресу <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General"
->https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General</ulink
-></para>
-</refsect1>
-
-<refsect1>
-  <title
->Смотрите также</title>
-  <simplelist>
-    <member
->Список наиболее часто задаваемых вопросов о Matrix <ulink url="https://matrix.org/faq/"
->https://matrix.org/faq/</ulink
-> </member>
-    <member
->kf5options(7)</member>
-    <member
->qt5options(7)</member>
-  </simplelist>
-</refsect1>
-
-<refsect1 id="copyright"
-><title
->Авторские права</title>
-<para
->Авторские права &copy; Tobias Fella, 2020–2022 </para>
-<para
->Авторские права &copy; Carl Schwan, 2020–2022 </para>
-<para
->Лицензия: стандартная общественная лицензия GNU версии 3 или любой более поздней версии &lt;<ulink url="https://www.gnu.org/licenses/gpl-3.0.html"
->https://www.gnu.org/licenses/gpl-3.0.html</ulink
->&gt;</para>
-</refsect1>
-</refentry>
--- a/po/ru/neochat.po
+++ b/po/ru/neochat.po
--- a/po/sa/neochat.po
+++ b/po/sa/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
@@ -8,8 +8,6 @@ endif()
 add_subdirectory(libneochat)
 add_subdirectory(login)
 add_subdirectory(rooms)
-add_subdirectory(roominfo)
-add_subdirectory(messagecontent)
 add_subdirectory(timeline)
 add_subdirectory(spaces)
 add_subdirectory(chatbar)
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -8,6 +8,8 @@ add_library(neochat STATIC
    controller.h
    roommanager.cpp
    roommanager.h
+    models/userfiltermodel.cpp
+    models/userfiltermodel.h
    models/userdirectorylistmodel.cpp
    models/userdirectorylistmodel.h
    notificationsmanager.cpp
@@ -20,6 +22,8 @@ add_library(neochat STATIC
    windowcontroller.h
    models/serverlistmodel.cpp
    models/serverlistmodel.h
+    logger.cpp
+    logger.h
    models/notificationsmodel.cpp
    models/notificationsmodel.h
    proxycontroller.cpp
@@ -45,9 +49,6 @@ if(ANDROID OR WIN32)
    set_source_files_properties(qml/ShareActionStub.qml PROPERTIES
        QT_QML_SOURCE_TYPENAME ShareAction
    )
-    set_source_files_properties(qml/GlobalMenuStub.qml PROPERTIES
-            QT_QML_SOURCE_TYPENAME GlobalMenu
-    )
 endif()

 ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
@@ -57,13 +58,18 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
        qml/AccountMenu.qml
        qml/CollapsedRoomDelegate.qml
        qml/RoomPage.qml
+        qml/ExploreRoomsPage.qml
        qml/ManualRoomDialog.qml
        qml/ExplorerDelegate.qml
+        qml/InviteUserPage.qml
+        qml/ImageEditorPage.qml
        qml/NeochatMaximizeComponent.qml
+        qml/TypingPane.qml
        qml/QuickSwitcher.qml
        qml/AttachmentPane.qml
        qml/QuickFormatBar.qml
        qml/UserDetailDialog.qml
+        qml/CreateRoomDialog.qml
        qml/OpenFileDialog.qml
        qml/KeyVerificationDialog.qml
        qml/ConfirmLogoutDialog.qml
@@ -73,14 +79,26 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
        qml/EmojiSas.qml
        qml/VerificationCanceled.qml
        qml/MessageSourceSheet.qml
+        qml/RoomSearchPage.qml
+        qml/RoomPinnedMessagesPage.qml
        qml/LocationChooser.qml
        qml/InvitationView.qml
        qml/AvatarTabButton.qml
        qml/OsmLocationPlugin.qml
        qml/FullScreenMap.qml
+        qml/LocationsPage.qml
+        qml/LocationMapItem.qml
+        qml/RoomDrawer.qml
+        qml/RoomDrawerPage.qml
+        qml/DirectChatDrawerHeader.qml
+        qml/GroupChatDrawerHeader.qml
+        qml/RoomInformation.qml
+        qml/RoomMedia.qml
        qml/ChooseRoomDialog.qml
+        qml/RemoveChildDialog.qml
        qml/QrCodeMaximizeComponent.qml
        qml/NotificationsView.qml
+        qml/SearchPage.qml
        qml/ServerComboBox.qml
        qml/UserSearchPage.qml
        qml/ManualUserDialog.qml
@@ -100,15 +118,12 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
        qml/AvatarNotification.qml
        qml/ReasonDialog.qml
        qml/NewPollDialog.qml
-        qml/UserMenu.qml
    DEPENDENCIES
        QtCore
        QtQuick
    IMPORTS
        org.kde.neochat.libneochat
        org.kde.neochat.rooms
-        org.kde.neochat.roominfo
-        org.kde.neochat.messagecontent
        org.kde.neochat.timeline
        org.kde.neochat.spaces
        org.kde.neochat.settings
@@ -124,10 +139,7 @@ if(NOT ANDROID AND NOT WIN32)
        qml/EditMenu.qml
    )
 else()
-    qt_target_qml_sources(neochat QML_FILES
-            qml/ShareActionStub.qml
-            qml/GlobalMenuStub.qml
-    )
+    qt_target_qml_sources(neochat QML_FILES qml/ShareActionStub.qml)
 endif()

 if(WIN32)
@@ -177,7 +189,7 @@ else()
 endif()

 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models)
-target_link_libraries(neochat PRIVATE Loginplugin Roomsplugin RoomInfoplugin MessageContentplugin Timelineplugin Spacesplugin Chatbarplugin Settingsplugin Devtoolsplugin)
+target_link_libraries(neochat PRIVATE Loginplugin Roomsplugin Timelineplugin Spacesplugin Chatbarplugin Settingsplugin Devtoolsplugin)
 target_link_libraries(neochat PUBLIC
    LibNeoChat
    Timeline
@@ -202,7 +214,6 @@ target_link_libraries(neochat PUBLIC
    QuotientQt6
    Login
    Rooms
-    MessageContent
    Spaces
 )

@@ -357,10 +368,3 @@ install(TARGETS neochat-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
    install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins)
 endif()
-
-if (APPLE)
-    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.neochat")
-    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "NeoChat")
-    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING ${RELEASE_SERVICE_VERSION})
-    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION ${RELEASE_SERVICE_VERSION})
-endif ()
--- a/src/app/controller.cpp
+++ b/src/app/controller.cpp
@@ -5,6 +5,7 @@
 #include "controller.h"

 #include <Quotient/connection.h>
+#include <qt6keychain/keychain.h>

 #include <KLocalizedString>

@@ -13,6 +14,7 @@

 #include <signal.h>

+#include <Quotient/csapi/notifications.h>
 #include <Quotient/events/roommemberevent.h>
 #include <Quotient/qt_connection_util.h>
 #include <Quotient/settings.h>
@@ -22,6 +24,7 @@
 #include "mediasizehelper.h"
 #include "models/actionsmodel.h"
 #include "models/messagemodel.h"
+#include "models/pushrulemodel.h"
 #include "models/roomlistmodel.h"
 #include "models/roomtreemodel.h"
 #include "neochatconfig.h"
@@ -29,7 +32,6 @@
 #include "neochatroom.h"
 #include "notificationsmanager.h"
 #include "proxycontroller.h"
-#include "roommanager.h"

 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
 #include "trayicon.h"
@@ -96,7 +98,6 @@ Controller::Controller(QObject *parent)
    MessageModel::setHiddenFilter(hiddenEventFilter);
    RoomListModel::setHiddenFilter(hiddenEventFilter);
    RoomTreeModel::setHiddenFilter(hiddenEventFilter);
-    NeoChatRoom::setHiddenFilter(hiddenEventFilter);

    MediaSizeHelper::setMaxSize(NeoChatConfig::mediaMaxWidth(), NeoChatConfig::mediaMaxHeight());
    connect(NeoChatConfig::self(), &NeoChatConfig::MediaMaxWidthChanged, this, []() {
@@ -229,7 +230,6 @@ void Controller::initConnection(NeoChatConnection *connection)
        m_notificationsManager.handleNotifications(connection);
    });
    connect(this, &Controller::globalUrlPreviewDefaultChanged, connection, &NeoChatConnection::globalUrlPreviewEnabledChanged);
-    connect(connection, &NeoChatConnection::roomAboutToBeLeft, &RoomManager::instance(), &RoomManager::roomLeft);
    Q_EMIT connectionAdded(connection);
 }

@@ -404,9 +404,4 @@ void Controller::markImageShown(const QString &eventId)
    m_shownImages.append(eventId);
 }

-void Controller::markImageHidden(const QString &eventId)
-{
-    m_shownImages.removeAll(eventId);
-}
-
 #include "moc_controller.cpp"
--- a/src/app/controller.h
+++ b/src/app/controller.h
@@ -99,7 +99,6 @@ public:

    Q_INVOKABLE bool isImageShown(const QString &eventId);
    Q_INVOKABLE void markImageShown(const QString &eventId);
-    Q_INVOKABLE void markImageHidden(const QString &eventId);

 private:
    explicit Controller(QObject *parent = nullptr);
--- a/src/app/logger.cpp
+++ b/src/app/logger.cpp
@@ -0,0 +1,223 @@
+// SPDX-FileCopyrightText: 1997 Matthias Kalle Dalheimer <kalle@kde.org>
+// SPDX-FileCopyrightText: 2002 Holger Freyther <freyther@kde.org>
+// SPDX-FileCopyrightText: 2008 Volker Krause <vkrause@kde.org>
+// SPDX-FileCopyrightText: 2023 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "logger.h"
+
+#include <QDateTime>
+#include <QDir>
+#include <QFileInfo>
+#include <QLoggingCategory>
+#include <QMutex>
+#include <QStandardPaths>
+
+using namespace Qt::StringLiterals;
+
+static QLoggingCategory::CategoryFilter oldCategoryFilter = nullptr;
+static QtMessageHandler oldHandler = nullptr;
+static bool e2eeDebugEnabled = false;
+
+class FileDebugStream : public QIODevice
+{
+    Q_OBJECT
+public:
+    FileDebugStream()
+        : mType(QtCriticalMsg)
+    {
+        open(WriteOnly);
+    }
+
+    bool isSequential() const override
+    {
+        return true;
+    }
+    qint64 readData(char *, qint64) override
+    {
+        return 0;
+    }
+    qint64 readLineData(char *, qint64) override
+    {
+        return 0;
+    }
+
+    qint64 writeData(const char *data, qint64 len) override
+    {
+        if (!mFileName.isEmpty()) {
+            QFile outputFile(mFileName);
+            outputFile.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Unbuffered);
+            outputFile.write(data, len);
+            outputFile.putChar('\n');
+            outputFile.close();
+        }
+
+        return len;
+    }
+
+    void setFileName(const QString &fileName)
+    {
+        mFileName = fileName;
+    }
+
+    void setType(QtMsgType type)
+    {
+        mType = type;
+    }
+
+private:
+    QString mFileName;
+    QtMsgType mType;
+};
+
+class DebugPrivate
+{
+public:
+    DebugPrivate()
+        : origHandler(nullptr)
+    {
+    }
+
+    ~DebugPrivate()
+    {
+        qInstallMessageHandler(origHandler);
+        file.close();
+    }
+
+    void log(QtMsgType type, const QMessageLogContext &context, const QString &message)
+    {
+        QMutexLocker locker(&mutex);
+        QByteArray buf;
+        QTextStream str(&buf);
+        str << QDateTime::currentDateTime().toString(Qt::ISODate) << u" ["_s;
+        switch (type) {
+        case QtDebugMsg:
+            str << u"DEBUG"_s;
+            break;
+        case QtInfoMsg:
+            str << u"INFO "_s;
+            break;
+        case QtWarningMsg:
+            str << u"WARN "_s;
+            break;
+        case QtFatalMsg:
+            str << u"FATAL"_s;
+            break;
+        case QtCriticalMsg:
+            str << u"CRITICAL"_s;
+            break;
+        }
+        str << u"] "_s << context.category << u": "_s;
+        if (context.file && *context.file && context.line) {
+            str << context.file << u":"_s << context.line << u": "_s;
+        }
+        if (context.function && *context.function) {
+            str << context.function << u": "_s;
+        }
+        str << message << u"\n"_s;
+        str.flush();
+        file.write(buf.constData(), buf.size());
+        file.flush();
+
+        if (oldHandler && (!context.category || (strcmp(context.category, "quotient.e2ee") != 0 || e2eeDebugEnabled))) {
+            oldHandler(type, context, message);
+        }
+    }
+
+    void setName(const QString &appName)
+    {
+        name = appName;
+
+        if (file.isOpen()) {
+            file.close();
+        }
+        const auto &filePath = u"%1%2%3"_s.arg(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation), QDir::separator(), appName);
+
+        QDir dir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QDir::separator());
+        auto entryList = dir.entryList({appName + u".*"_s});
+        std::sort(entryList.begin(), entryList.end(), [](const auto &left, const auto &right) {
+            auto leftIndex = left.split(u"."_s).last().toInt();
+            auto rightIndex = right.split(u"."_s).last().toInt();
+            return leftIndex > rightIndex;
+        });
+        for (const auto &entry : entryList) {
+            bool ok = false;
+            const auto index = entry.split(u"."_s).last().toInt(&ok);
+            if (!ok) {
+                continue;
+            }
+            QFileInfo info(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QDir::separator() + entry);
+            if (info.exists()) {
+                QFile file(info.absoluteFilePath());
+                if (index > 50) {
+                    file.remove();
+                    continue;
+                }
+                const auto &newName = u"%1.%2"_s.arg(filePath, QString::number(index + 1));
+                const auto success = file.copy(newName);
+                if (success) {
+                    file.remove();
+                } else {
+                    qFatal("Cannot rename log file '%s' to '%s': %s",
+                           qUtf8Printable(file.fileName()),
+                           qUtf8Printable(newName),
+                           qUtf8Printable(file.errorString()));
+                }
+            }
+        }
+
+        QFileInfo finfo(filePath);
+        if (!finfo.absoluteDir().exists()) {
+            QDir().mkpath(finfo.absolutePath());
+        }
+        file.setFileName(filePath + u".0"_s);
+        file.open(QIODevice::WriteOnly | QIODevice::Unbuffered);
+    }
+
+    void setOrigHandler(QtMessageHandler origHandler_)
+    {
+        origHandler = origHandler_;
+    }
+
+    QMutex mutex;
+    QFile file;
+    QString name;
+    QtMessageHandler origHandler;
+    QByteArray loggingCategory;
+};
+
+Q_GLOBAL_STATIC(DebugPrivate, sInstance)
+
+void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message)
+{
+    switch (type) {
+    case QtDebugMsg:
+    case QtInfoMsg:
+    case QtWarningMsg:
+    case QtCriticalMsg:
+        sInstance()->log(type, context, message);
+        break;
+    case QtFatalMsg:
+        sInstance()->log(QtInfoMsg, context, message);
+    }
+}
+
+void filter(QLoggingCategory *category)
+{
+    if (qstrcmp(category->categoryName(), "quotient.e2ee") == 0) {
+        category->setEnabled(QtDebugMsg, true);
+    } else if (oldCategoryFilter) {
+        oldCategoryFilter(category);
+    }
+}
+
+void initLogging()
+{
+    e2eeDebugEnabled = QLoggingCategory("quotient.e2ee", QtInfoMsg).isEnabled(QtDebugMsg);
+    oldCategoryFilter = QLoggingCategory::installFilter(filter);
+    oldHandler = qInstallMessageHandler(messageHandler);
+    sInstance->setOrigHandler(oldHandler);
+    sInstance->setName(u"neochat.log"_s);
+}
+
+#include "logger.moc"
--- a/src/app/logger.h
+++ b/src/app/logger.h
@@ -0,0 +1,9 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/**
+ * Initlalize logging to file and enables some additional categories, which will only be logged to the file
+ */
+void initLogging();
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -49,6 +49,7 @@
 #include "blurhashimageprovider.h"
 #include "colorschemer.h"
 #include "controller.h"
+#include "logger.h"
 #include "login.h"
 #include "registration.h"
 #include "roommanager.h"
@@ -137,11 +138,6 @@ int main(int argc, char *argv[])
    font.setHintingPreference(QFont::PreferNoHinting);
    app.setFont(font);
 #endif
-
-#ifdef Q_OS_MACOS
-    QApplication::setStyle(u"breeze"_s);
-#endif
-
    KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));

    QGuiApplication::setOrganizationName("KDE"_L1);
@@ -181,6 +177,8 @@ int main(int argc, char *argv[])
    KCrash::initialize();
 #endif

+    initLogging();
+
    Connection::setEncryptionDefault(true);
    Connection::setDirectChatEncryptionDefault(true);

@@ -197,9 +195,6 @@ int main(int argc, char *argv[])
    parser.addPositionalArgument(u"urls"_s, i18n("Supports matrix: url scheme"));
    parser.addOption(QCommandLineOption("ignore-ssl-errors"_L1, i18n("Ignore all SSL Errors, e.g., unsigned certificates.")));

-    QCommandLineOption replaceOption({QStringLiteral("replace")}, i18nc("command line description", "Replace an existing instance"));
-    parser.addOption(replaceOption);
-
    QCommandLineOption testOption("test"_L1, i18n("Only used for autotests"));
    testOption.setFlags(QCommandLineOption::HiddenFromHelp);
    parser.addOption(testOption);
@@ -236,7 +231,7 @@ int main(int argc, char *argv[])
 #endif

 #ifdef HAVE_KDBUSADDONS
-    KDBusService service(KDBusService::Unique | (parser.isSet(replaceOption) ? KDBusService::Replace : KDBusService::StartupOption(0)));
+    KDBusService service(KDBusService::Unique);
 #endif

    const auto accountManager = std::make_unique<AccountManager>(parser.isSet("test"_L1));
@@ -244,6 +239,13 @@ int main(int argc, char *argv[])
    LoginHelper::instance().setAccountManager(accountManager.get());
    Registration::instance().setAccountManager(accountManager.get());

+    Q_IMPORT_QML_PLUGIN(org_kde_neochat_settingsPlugin)
+    Q_IMPORT_QML_PLUGIN(org_kde_neochat_roomsPlugin)
+    Q_IMPORT_QML_PLUGIN(org_kde_neochat_timelinePlugin)
+    Q_IMPORT_QML_PLUGIN(org_kde_neochat_devtoolsPlugin)
+    Q_IMPORT_QML_PLUGIN(org_kde_neochat_loginPlugin)
+    Q_IMPORT_QML_PLUGIN(org_kde_neochat_chatbarPlugin)
+
    qml_register_types_org_kde_neochat();
    qmlRegisterUncreatableMetaObject(Quotient::staticMetaObject, "Quotient", 1, 0, "JoinRule", u"Access to JoinRule enum only"_s);

--- a/src/app/models/commonroomsmodel.h
+++ b/src/app/models/commonroomsmodel.h
@@ -7,6 +7,7 @@
 #include <QQmlEngine>

 #include "neochatconnection.h"
+#include "neochatroom.h"

 #include <Quotient/events/roommessageevent.h>
 #include <Quotient/roommember.h>
@@ -24,7 +25,11 @@ class CommonRoomsModel : public QAbstractListModel

 public:
    enum Roles {
-        RoomIdRole = Qt::DisplayRole,
+        TextRole = Qt::DisplayRole,
+        LongitudeRole,
+        LatitudeRole,
+        AssetRole,
+        AuthorRole,
    };
    Q_ENUM(Roles)

--- a/src/app/models/serverlistmodel.cpp
+++ b/src/app/models/serverlistmodel.cpp
@@ -176,7 +176,7 @@ void ServerListModel::initialize()
        true,
        false,
    });
-    endResetModel();
+    beginResetModel();
 }

 #include "moc_serverlistmodel.cpp"
--- a/src/libneochat/models/userfiltermodel.cpp
+++ b/src/libneochat/models/userfiltermodel.cpp
--- a/src/libneochat/models/userfiltermodel.h
+++ b/src/libneochat/models/userfiltermodel.h
--- a/src/app/neochatconfig.kcfg
+++ b/src/app/neochatconfig.kcfg
@@ -78,12 +78,6 @@
      <label>Use a compact room list layout</label>
      <default>false</default>
    </entry>
-    <entry name="MarkReadCondition" type="Enum">
-      <label>The sort order for the rooms in the list.</label>
-      <choices name="::TimelineMarkReadCondition::Condition">
-      </choices>
-      <default>2</default>
-    </entry>
    <entry name="ShowStateEvent" type="bool">
      <label>Show state events in the timeline</label>
      <default>true</default>
@@ -189,10 +183,6 @@
      <label>Don't hide any events in the timeline</label>
      <default>false</default>
    </entry>
-    <entry name="RelateAnyEvent" type="bool">
-      <label>Send relations to any event, including state events and events normally hidden.</label>
-      <default>false</default>
-    </entry>
    <entry name="AlwaysVerifyDevice" type="bool">
      <label>Always allow device verification</label>
      <default>false</default>
@@ -215,10 +205,6 @@
      <label>Enable add phone numbers as 3PIDs</label>
      <default>false</default>
    </entry>
-    <entry name="Calls" type="bool">
-      <label>Enable audio and video calling</label>
-      <default>false</default>
-    </entry>
  </group>
  <group name="Security">
    <entry name="RejectUnknownInvites" type="bool">
--- a/src/app/notificationsmanager.cpp
+++ b/src/app/notificationsmanager.cpp
@@ -276,7 +276,7 @@ void NotificationsManager::postInviteNotification(NeoChatRoom *rawRoom)
                if (inAnyOfOurRooms) {
                    doPostInviteNotification(room);
                } else {
-                    room->forget();
+                    room->leaveRoom();
                }
            }
        });
@@ -330,14 +330,14 @@ void NotificationsManager::doPostInviteNotification(QPointer<NeoChatRoom> room)
        if (!room) {
            return;
        }
-        room->forget();
+        RoomManager::instance().leaveRoom(room);
        notification->close();
    });
    connect(rejectAndIgnoreAction, &KNotificationAction::activated, this, [room, notification]() {
        if (!room) {
            return;
        }
-        room->forget();
+        RoomManager::instance().leaveRoom(room);
        room->connection()->addToIgnoredUsers(room->invitingUserId());
        notification->close();
    });
--- a/src/app/plasma-runner-neochat.desktop
+++ b/src/app/plasma-runner-neochat.desktop
@@ -93,3 +93,4 @@ X-Plasma-API=DBus
 X-Plasma-DBusRunner-Service=org.kde.neochat
 X-Plasma-DBusRunner-Path=/RoomRunner
 X-Plasma-Request-Actions-Once=true
+X-Plasma-Runner-Min-Letter-Count=3
--- a/src/app/qml/AccountMenu.qml
+++ b/src/app/qml/AccountMenu.qml
@@ -1,10 +1,9 @@
 // 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 ComponentBehavior: Bound
-
 import QtQuick
 import QtQuick.Controls as QQC2
+import QtQuick.Layouts

 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.components as KirigamiComponents
@@ -19,45 +18,44 @@ KirigamiComponents.ConvergentContextMenu {
    required property NeoChatConnection connection
    required property Kirigami.ApplicationWindow window

-    Kirigami.Action {
+    QQC2.Action {
        text: i18nc("@action:button", "Show QR Code")
        icon.name: "view-barcode-qr-symbolic"
        onTriggered: {
-            (Qt.createComponent('org.kde.neochat', 'QrCodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
+            let qrMax = Qt.createComponent('org.kde.neochat', 'QrCodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
                text: "https://matrix.to/#/" + root.connection.localUser.id,
                title: root.connection.localUser.displayName,
                subtitle: root.connection.localUser.id,
                // Note: User::avatarUrl does not set user_id, and thus cannot be used directly here. Hence the makeMediaUrl.
                avatarSource: root.connection.localUser.avatarUrl.toString().length > 0 ? root.connection.makeMediaUrl(root.connection.localUser.avatarUrl) : ""
-            }) as QrCodeMaximizeComponent).open();
+            });
+            if (typeof root.closeDialog === "function") {
+                root.closeDialog();
+            }
+            qrMax.open();
        }
    }

-    Kirigami.Action {
-        text: i18nc("@action:inmenu", "Switch Account")
-        icon.name: "system-switch-user"
-        shortcut: "Ctrl+U"
-        onTriggered: (Qt.createComponent("org.kde.neochat", "AccountSwitchDialog").createObject(QQC2.Overlay.overlay, {
-            connection: root.connection
-        }) as Kirigami.Dialog).open();
-    }
-
-    Kirigami.Action {
-        text: i18nc("@action:inmenu", "Edit This Account")
+    QQC2.Action {
+        text: i18n("Edit This Account")
        icon.name: "document-edit"
-        onTriggered: NeoChatSettingsView.openWithInitialProperties("accounts", {initialAccount: root.connection});
+        onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'AccountEditorPage'), {
+            connection: root.connection
+        }, {
+            title: i18n("Account editor")
+        })
    }

-    Kirigami.Action {
-        text: i18nc("@action:inmenu", "Notification Settings")
+    QQC2.Action {
+        text: i18n("Notification Settings")
        icon.name: "notifications"
        onTriggered: {
            NeoChatSettingsView.open('notifications');
        }
    }

-    Kirigami.Action {
-        text: i18nc("@action:inmenu", "Devices")
+    QQC2.Action {
+        text: i18n("Devices")
        icon.name: "computer-symbolic"
        onTriggered: {
            NeoChatSettingsView.open('devices');
@@ -65,10 +63,10 @@ KirigamiComponents.ConvergentContextMenu {
    }

    Kirigami.Action {
-        text: i18nc("@action:inmenu", "Open Developer Tools")
+        text: i18n("Open Developer Tools")
        icon.name: "tools"
        visible: NeoChatConfig.developerTools
-        onTriggered: root.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), {
+        onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), {
            connection: root.connection
        }, {
            title: i18nc("@title:window", "Developer Tools"),
@@ -86,29 +84,30 @@ KirigamiComponents.ConvergentContextMenu {
        })
    }

-    Kirigami.Action {
+    QQC2.Action {
        text: i18nc("@action:inmenu", "Verify This Device")
        icon.name: "security-low"
-        visible: !root.connection.isVerifiedSession()
        onTriggered: {
            root.connection.startSelfVerification();
            const dialog = Qt.createComponent("org.kde.kirigami", "PromptDialog").createObject(QQC2.Overlay.overlay, {
                title: i18nc("@title", "Verification Request Sent"),
                subtitle: i18nc("@info:label", "To proceed, accept the verification request on another device."),
-                standardButtons: Kirigami.Dialog.Ok
+                standardButtons: QQC2.Dialog.Ok
            })
            dialog.open();
-            root.connection.newKeyVerificationSession.connect(() => {
+            root.connection.onNewKeyVerificationSession.connect(() => {
                dialog.close();
            });
        }
    }

-    Kirigami.Action {
-        text: i18nc("@action:inmenu", "Logout…")
+    QQC2.Action {
+        text: i18n("Logout")
        icon.name: "im-kick-user"
-        onTriggered: (Qt.createComponent("org.kde.neochat", "ConfirmLogoutDialog").createObject(QQC2.Overlay.overlay, {
-            connection: root.connection
-        }) as Kirigami.Dialog).open()
+        onTriggered: confirmLogoutDialogComponent.createObject(root).open()
+    }
+
+    readonly property Component confirmLogoutDialogComponent: ConfirmLogoutDialog {
+        connection: root.connection
    }
 }
--- a/src/app/qml/AccountSwitchDialog.qml
+++ b/src/app/qml/AccountSwitchDialog.qml
@@ -12,19 +12,21 @@ import org.kde.kirigamiaddons.delegates as Delegates

 import org.kde.neochat

-Kirigami.Dialog {
+QQC2.Dialog {
    id: root

    required property NeoChatConnection connection

+    parent: applicationWindow().overlay
+
    leftPadding: 0
    rightPadding: 0
    topPadding: 0
    bottomPadding: 0

-    standardButtons: Kirigami.Dialog.NoButton
+    standardButtons: QQC2.Dialog.NoButton

-    width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
+    width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
    title: i18nc("@title: dialog to switch between logged in accounts", "Switch Account")

    onVisibleChanged: if (visible) {
@@ -52,7 +54,7 @@ Kirigami.Dialog {
            }
            text: i18nc("@button: login to or register a new account.", "Add Account")
            contentItem: Delegates.SubtitleContentItem {
-                itemDelegate: addDelegate
+                itemDelegate: parent
                subtitle: i18n("Log in or create a new account")
                labelItem.textFormat: Text.PlainText
                subtitleItem.textFormat: Text.PlainText
--- a/src/app/qml/AskDirectChatConfirmation.qml
+++ b/src/app/qml/AskDirectChatConfirmation.qml
@@ -8,33 +8,30 @@ import org.kde.kirigami as Kirigami

 import org.kde.neochat

-Kirigami.Dialog {
+Kirigami.PromptDialog {
    id: root

    required property var user

-    width: Math.min(Kirigami.Units.gridUnit * 24, QQC2.ApplicationWindow.window.width)
-    height: Kirigami.Units.gridUnit * 8
-
-    standardButtons: QQC2.Dialog.Close
    title: i18nc("@title:dialog", "Start a chat")
+    subtitle: i18n("Do you want to start a chat with %1?", root.user.displayName)
+    dialogType: Kirigami.PromptDialog.Warning

-    contentItem: QQC2.Label {
-        text: i18n("Do you want to start a chat with %1?", root.user.displayName)
-        textFormat: Text.PlainText
-        wrapMode: Text.Wrap
-        horizontalAlignment: Qt.AlignHCenter
-        verticalAlignment: Qt.AlignVCenter
+    onRejected: {
+        root.close();
    }

-    customFooterActions: [
-        Kirigami.Action {
+    footer: QQC2.DialogButtonBox {
+        standardButtons: QQC2.Dialog.Cancel
+
+        QQC2.Button {
            text: i18nc("@action:button", "Start Chat")
+            QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
            icon.name: "im-user"
-            onTriggered: {
+            onClicked: {
                root.user.requestDirectChat();
                root.close();
            }
        }
-    ]
+    }
 }
--- a/src/app/qml/AttachmentPane.qml
+++ b/src/app/qml/AttachmentPane.qml
@@ -33,7 +33,7 @@ ColumnLayout {
        }
        QQC2.ToolButton {
            id: editImageButton
-            visible: root.hasImage
+            visible: hasImage
            icon.name: "document-edit"
            text: i18n("Edit")
            display: QQC2.AbstractButton.IconOnly
@@ -46,9 +46,9 @@ ColumnLayout {
            }

            onClicked: {
-                let imageEditor = (Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(imageEditorPage);
+                let imageEditor = applicationWindow().pageStack.pushDialogLayer(imageEditorPage);
                imageEditor.newPathChanged.connect(function (newPath) {
-                    imageEditor.closeDialog();
+                    applicationWindow().pageStack.layers.pop();
                    root.attachmentPath = newPath;
                });
            }
@@ -61,7 +61,7 @@ ColumnLayout {
            action: Kirigami.Action {
                text: i18n("Cancel sending attachment")
                icon.name: "dialog-close"
-                onTriggered: root.attachmentCancelled()
+                onTriggered: attachmentCancelled()
                shortcut: "Escape"
            }
            QQC2.ToolTip.text: text
@@ -75,8 +75,8 @@ ColumnLayout {

        asynchronous: true
        cache: false // Cache is not needed. Images will rarely be shown repeatedly.
-        source: root.hasImage ? root.attachmentPath : ""
-        visible: root.hasImage
+        source: hasImage ? root.attachmentPath : ""
+        visible: hasImage
        fillMode: Image.PreserveAspectFit

        onSourceChanged: {
@@ -114,11 +114,11 @@ ColumnLayout {
            id: mimetypeIcon
            implicitWidth: Kirigami.Units.iconSizes.smallMedium
            implicitHeight: Kirigami.Units.iconSizes.smallMedium
-            source: root.attachmentMimetype.iconName
+            source: attachmentMimetype.iconName
        }
        QQC2.Label {
            id: fileLabel
-            text: root.baseFileName
+            text: baseFileName
        }
    }
 }
--- a/src/app/qml/AvatarTabButton.qml
+++ b/src/app/qml/AvatarTabButton.qml
@@ -3,9 +3,12 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later

 import QtQuick
+import QtQuick.Layouts
 import QtQuick.Controls as QQC2
+import QtQuick.Templates as T
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.delegates as Delegates
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents

 Delegates.RoundedItemDelegate {
    id: root
@@ -45,7 +48,6 @@ Delegates.RoundedItemDelegate {

    TapHandler {
        acceptedDevices: PointerDevice.TouchScreen
-        onTapped: root.selected()
        onLongPressed: root.contextMenuRequested()
    }

--- a/src/app/qml/CollapsedRoomDelegate.qml
+++ b/src/app/qml/CollapsedRoomDelegate.qml
@@ -8,6 +8,7 @@ import QtQml.Models

 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.labs.components as KirigamiComponents
+import org.kde.kitemmodels

 import org.kde.neochat

--- a/src/app/qml/ConfirmLeaveDialog.qml
+++ b/src/app/qml/ConfirmLeaveDialog.qml
@@ -28,7 +28,7 @@ Kirigami.PromptDialog {
            text: i18nc("@action:button", "Leave Room")
            QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
            icon.name: "arrow-left-symbolic"
-            onClicked: root.room.forget();
+            onClicked: RoomManager.leaveRoom(root.room)
        }
    }
 }
--- a/src/app/qml/ConsentDialog.qml
+++ b/src/app/qml/ConsentDialog.qml
@@ -8,32 +8,30 @@ import org.kde.kirigami as Kirigami

 import org.kde.neochat

-Kirigami.Dialog {
+Kirigami.PromptDialog {
    id: root

    required property string url

-    width: Math.min(Kirigami.Units.gridUnit * 24, QQC2.ApplicationWindow.window.width)
-    height: Kirigami.Units.gridUnit * 8
-    leftPadding: Kirigami.Units.largeSpacing
-    rightPadding: Kirigami.Units.largeSpacing
-
    title: i18nc("@title:dialog", "User Consent")
+    subtitle: i18nc("@info", "Your homeserver requires you to agree to its terms and conditions before being able to use it. Please click the button below to read them.")
+    dialogType: Kirigami.PromptDialog.Warning

-    contentItem: QQC2.Label {
-        text: i18nc("@info", "Your homeserver requires you to agree to its terms and conditions before being able to use it. Please click the button below to read them.")
-        wrapMode: Text.WordWrap
-        horizontalAlignment: Qt.AlignHCenter
-        verticalAlignment: Qt.AlignVCenter
+    onRejected: {
+        root.close();
    }
-    customFooterActions: [
-        Kirigami.Action {
+
+    footer: QQC2.DialogButtonBox {
+        standardButtons: QQC2.Dialog.Cancel
+
+        QQC2.Button {
            text: i18nc("@action:button", "Open")
+            QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
            icon.name: "internet-services"
-            onTriggered: {
+            onClicked: {
                UrlHelper.openUrl(root.url);
                root.close();
            }
        }
-    ]
+    }
 }
--- a/src/spaces/SelectExistingRoomDialog.qml
+++ b/src/spaces/SelectExistingRoomDialog.qml
@@ -9,36 +9,124 @@ import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
 import org.kde.kirigamiaddons.labs.components as Components

-import org.kde.neochat.libneochat
+import org.kde.neochat

-Kirigami.Dialog {
+FormCard.FormCardPage {
    id: root

-    property string parentId
+    property string parentId: ""
+
+    property bool isSpace: false
+
+    property bool showChildType: false
+
+    property bool showCreateChoice: false

    required property NeoChatConnection connection

    signal addChild(string childId, bool setChildParent, bool canonical)
    signal newChild(string childName)

-    title: i18nc("@title", "Select Existing Room")
-    implicitWidth: Kirigami.Units.gridUnit * 20
-    standardButtons: Kirigami.Dialog.Ok | Kirigami.Dialog.Cancel
+    title: isSpace ? i18nc("@title", "Create a Space") : i18nc("@title", "Create a Room")

-    onAccepted: root.addChild(chosenRoomDelegate.roomId, existingOfficialCheck.checked, makeCanonicalCheck.checked);
+    Component.onCompleted: roomNameField.forceActiveFocus()

-    Component.onCompleted: pickRoomDelegate.forceActiveFocus()
+    FormCard.FormHeader {
+        title: root.isSpace ? i18n("New Space Information") : i18n("New Room Information")
+    }
+    FormCard.FormCard {
+        FormCard.FormComboBoxDelegate {
+            id: roomTypeCombo
+            property bool isInitialising: true

-    ColumnLayout {
-        spacing: Kirigami.Units.largeSpacing
+            visible: root.showChildType
+
+            text: i18n("Select type")
+            model: ListModel {
+                id: roomTypeModel
+            }
+            textRole: "text"
+            valueRole: "isSpace"
+
+            Component.onCompleted: {
+                currentIndex = indexOfValue(root.isSpace);
+                roomTypeModel.append({
+                    "text": i18n("Room"),
+                    "isSpace": false
+                });
+                roomTypeModel.append({
+                    "text": i18n("Space"),
+                    "isSpace": true
+                });
+                roomTypeCombo.currentIndex = 0;
+                roomTypeCombo.isInitialising = false;
+            }
+            onCurrentValueChanged: {
+                if (!isInitialising) {
+                    root.isSpace = currentValue;
+                }
+            }
+        }
+
+        FormCard.FormDelegateSeparator {
+            visible: root.showChildType
+        }
+
+        FormCard.FormTextFieldDelegate {
+            id: roomNameField
+            label: i18n("Name:")
+            onAccepted: if (roomNameField.text.length > 0) {
+                roomTopicField.forceActiveFocus();
+            }
+        }
+
+        FormCard.FormDelegateSeparator {}
+
+        FormCard.FormTextFieldDelegate {
+            id: roomTopicField
+            label: i18n("Topic:")
+            onAccepted: ok.clicked()
+        }
+
+        FormCard.FormDelegateSeparator {}
+
+        FormCard.FormCheckDelegate {
+            id: newOfficialCheck
+            visible: root.parentId.length > 0
+            text: i18nc("@option:check As in make the space from which this dialog was created an official parent.", "Make this parent official")
+            checked: true
+        }
+
+        FormCard.FormDelegateSeparator {
+            visible: root.parentId.length > 0
+        }

        FormCard.FormButtonDelegate {
-            id: pickRoomDelegate
-
-            visible: !chosenRoomDelegate.visible
-            text: i18nc("@action:button", "Pick Room")
+            id: ok
+            text: root.isSpace ? i18nc("@action:button", "Create Space") : i18nc("@action:button", "Create Room")
+            enabled: roomNameField.text.length > 0
            onClicked: {
-                let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.libneochat', 'ExploreRoomsPage'), {
+                if (root.isSpace) {
+                    root.connection.createSpace(roomNameField.text, roomTopicField.text, root.parentId, newOfficialCheck.checked);
+                } else {
+                    root.connection.createRoom(roomNameField.text, roomTopicField.text, root.parentId, newOfficialCheck.checked);
+                }
+                root.newChild(roomNameField.text);
+                root.closeDialog();
+            }
+        }
+    }
+    FormCard.FormHeader {
+        visible: root.showChildType
+        title: i18n("Select Existing Room")
+    }
+    FormCard.FormCard {
+        visible: root.showChildType
+        FormCard.FormButtonDelegate {
+            visible: !chosenRoomDelegate.visible
+            text: i18nc("@action:button", "Pick room")
+            onClicked: {
+                let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
                    connection: root.connection
                }, {
                    title: i18nc("@title", "Explore Rooms")
@@ -139,15 +227,13 @@ Kirigami.Dialog {
            }
        }

-        FormCard.FormDelegateSeparator {
-            below: existingOfficialCheck
-        }
+        FormCard.FormDelegateSeparator {}

        FormCard.FormCheckDelegate {
            id: existingOfficialCheck
            visible: root.parentId.length > 0
            text: i18nc("@option:check As in make the space from which this dialog was created an official parent.", "Make this parent official")
-            description: enabled ? i18nc("@info:description", "You have the required privilege level in the child to set this state") : i18n("You do not have a high enough privilege level in the child to set this state")
+            description: enabled ? i18n("You have the required privilege level in the child to set this state") : i18n("You do not have a high enough privilege level in the child to set this state")
            checked: enabled

            enabled: {
@@ -164,17 +250,26 @@ Kirigami.Dialog {
        }

        FormCard.FormDelegateSeparator {
-            above: existingOfficialCheck
-            below: makeCanonicalCheck
+            visible: root.parentId.length > 0
        }

        FormCard.FormCheckDelegate {
            id: makeCanonicalCheck
            text: i18nc("@option:check The canonical parent is the default one if a room has multiple parent spaces.", "Make this space the canonical parent")
-            description: i18nc("@info:description", "The canonical parent is the default one if a room has multiple parent spaces.")
            checked: enabled

            enabled: existingOfficialCheck.enabled
        }
+
+        FormCard.FormDelegateSeparator {}
+
+        FormCard.FormButtonDelegate {
+            text: i18nc("@action:button", "Ok")
+            enabled: chosenRoomDelegate.visible
+            onClicked: {
+                root.addChild(chosenRoomDelegate.roomId, existingOfficialCheck.checked, makeCanonicalCheck.checked);
+                root.closeDialog();
+            }
+        }
    }
 }
--- a/src/roominfo/DirectChatDrawerHeader.qml
+++ b/src/roominfo/DirectChatDrawerHeader.qml
@@ -8,7 +8,7 @@ import QtQuick.Layouts
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.labs.components as KirigamiComponents

-import org.kde.neochat.libneochat
+import org.kde.neochat

 ColumnLayout {
    id: root
@@ -18,8 +18,6 @@ ColumnLayout {
     */
    required property NeoChatRoom room

-    signal resolveResource(string idOrUri, string action)
-
    Layout.fillWidth: true
    Layout.alignment: Qt.AlignVCenter
    spacing: 0
@@ -35,7 +33,7 @@ ColumnLayout {
        Layout.alignment: Qt.AlignHCenter

        onClicked: {
-            root.resolveResource(root.room.directChatRemoteMember.uri, "")
+            RoomManager.resolveResource(root.room.directChatRemoteMember.uri)
        }

        contentItem: KirigamiComponents.Avatar {
--- a/src/libneochat/qml/ExploreRoomsPage.qml
+++ b/src/libneochat/qml/ExploreRoomsPage.qml
--- a/src/app/qml/FullScreenMap.qml
+++ b/src/app/qml/FullScreenMap.qml
@@ -8,8 +8,6 @@ import QtPositioning

 import org.kde.kirigami as Kirigami

-import org.kde.neochat.libneochat
-
 ApplicationWindow {
    id: root

@@ -59,7 +57,7 @@ ApplicationWindow {

        Connections {
            target: mapView.map
-            function onCopyrightLinkActivated(link: string): void {
+            function onCopyrightLinkActivated() {
                Qt.openUrlExternally(link);
            }
        }
--- a/src/app/qml/GlobalMenu.qml
+++ b/src/app/qml/GlobalMenu.qml
@@ -15,48 +15,11 @@ import org.kde.neochat.settings
 Labs.MenuBar {
    id: root

-    required property NeoChatConnection connection
+    property NeoChatConnection connection

    Labs.Menu {
-        title: i18nc("menu", "File")
+        title: i18nc("menu", "NeoChat")

-        Labs.MenuItem {
-            icon.name: "list-add-user"
-            text: i18nc("@action:inmenu", "Find your Friends")
-            enabled: pageStack.layers.currentItem.title !== i18n("Find your friends") && AccountRegistry.accountCount > 0
-            onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage'), {
-                connection: root.connection
-            }, {
-                title: i18nc("@title", "Find your friends")
-            })
-        }
-        Labs.MenuItem {
-            icon.name: "system-users-symbolic"
-            text: i18nc("@action:inmenu", "Create a Room…")
-            enabled: pageStack.layers.currentItem.title !== i18n("Find your friends") && AccountRegistry.accountCount > 0
-            shortcut: StandardKey.New
-            onTriggered: {
-                pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog'), {
-                    connection: root.connection
-                }, {
-                    title: i18nc("@title", "Create a Room")
-                });
-            }
-        }
-        Labs.MenuItem {
-            icon.name: "compass-symbolic"
-            text: i18nc("@action:inmenu", "Explore Rooms")
-            onTriggered: {
-                let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
-                    connection: root.connection
-                }, {
-                    title: i18nc("@title", "Explore Rooms")
-                });
-                dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
-                    RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join");
-                });
-            }
-        }
        Labs.MenuItem {
            enabled: pageStack.layers.currentItem.title !== i18n("Configure NeoChat…")
            text: i18nc("menu", "Configure NeoChat…")
@@ -71,6 +34,41 @@ Labs.MenuBar {
            onTriggered: Qt.quit()
        }
    }
+    Labs.Menu {
+        title: i18nc("menu", "File")
+
+        Labs.MenuItem {
+            text: i18nc("menu", "Find your friends")
+            enabled: pageStack.layers.currentItem.title !== i18n("Find your friends") && AccountRegistry.accountCount > 0
+            onTriggered: pushReplaceLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage'), {
+                connection: root.connection
+            }, {
+                title: i18nc("@title", "Find your friends")
+            })
+        }
+        Labs.MenuItem {
+            text: i18nc("menu", "New Group…")
+            enabled: pageStack.layers.currentItem.title !== i18n("Find your friends") && AccountRegistry.accountCount > 0
+            shortcut: StandardKey.New
+            onTriggered: {
+                const dialog = createRoomDialog.createObject(root.overlay);
+                dialog.open();
+            }
+        }
+        Labs.MenuItem {
+            text: i18nc("menu", "Browse Chats…")
+            onTriggered: {
+                let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
+                    connection: root.connection
+                }, {
+                    title: i18nc("@title", "Explore Rooms")
+                });
+                dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
+                    RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join");
+                });
+            }
+        }
+    }
    EditMenu {
        title: i18nc("menu", "Edit")
        field: (root.activeFocusItem instanceof TextEdit || root.activeFocusItem instanceof TextInput) ? root.activeFocusItem : null
@@ -79,8 +77,7 @@ Labs.MenuBar {
        title: i18nc("menu", "View")

        Labs.MenuItem {
-            icon.name: "search-symbolic"
-            text: i18nc("@action:inmenu opens a UI element called the 'Quick Switcher', which offers a fast keyboard-based interface for switching in between chats.", "Search Rooms")
+            text: i18nc("menu item that opens a UI element called the 'Quick Switcher', which offers a fast keyboard-based interface for switching in between chats.", "Open Quick Switcher")
            onTriggered: quickSwitcher.open()
        }
    }
@@ -88,7 +85,6 @@ Labs.MenuBar {
        title: i18nc("menu", "Window")

        Labs.MenuItem {
-            icon.name: "view-fullscreen-symbolic"
            text: root.visibility === Window.FullScreen ? i18nc("menu", "Exit Full Screen") : i18nc("menu", "Enter Full Screen")
            onTriggered: root.visibility === Window.FullScreen ? root.showNormal() : root.showFullScreen()
        }
@@ -97,12 +93,14 @@ Labs.MenuBar {
        title: i18nc("menu", "Help")

        Labs.MenuItem {
-            icon.name: "help-about-symbolic"
+            text: i18nc("menu", "About Matrix")
+            onTriggered: UrlHelper.openUrl("https://matrix.org/docs/chat_basics/matrix-for-im/")
+        }
+        Labs.MenuItem {
            text: i18nc("menu", "About NeoChat")
            onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.kirigamiaddons.formcard", "AboutPage"))
        }
        Labs.MenuItem {
-            icon.name: "kde-symbolic"
            text: i18nc("menu", "About KDE")
            onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.kirigamiaddons.formcard", "AboutKDEPage"))
        }
--- a/src/app/qml/GlobalMenuStub.qml
+++ b/src/app/qml/GlobalMenuStub.qml
@@ -1,10 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Joshua Goins <josh@redstrate.com
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-import QtQuick
-
-import org.kde.neochat
-
-Item {
-    required property NeoChatConnection connection
-}
--- a/src/libneochat/qml/GroupChatDrawerHeader.qml
+++ b/src/libneochat/qml/GroupChatDrawerHeader.qml
@@ -19,11 +19,6 @@ ColumnLayout {
     */
    required property NeoChatRoom room

-    /**
-     * @brief The canonical alias of the room, if it exists. Otherwise falls back to the first available alias.
-     */
-    readonly property var roomAlias: room.aliases[0]
-
    Layout.fillWidth: true

    RowLayout {
@@ -78,8 +73,8 @@ ColumnLayout {
                Layout.fillWidth: true
                font: Kirigami.Theme.smallFont
                textFormat: TextEdit.PlainText
-                visible: root.room && root.roomAlias
-                text: root.room && root.roomAlias ? root.roomAlias : ""
+                visible: root.room && root.room.canonicalAlias
+                text: root.room && root.room.canonicalAlias ? root.room.canonicalAlias : ""
                color: Kirigami.Theme.disabledTextColor
            }
        }
@@ -121,9 +116,9 @@ ColumnLayout {
        wrapMode: Text.Wrap
        onLinkActivated: link => UrlHelper.openUrl(link)
        onHoveredLinkChanged: if (hoveredLink.length > 0 && hoveredLink !== "1") {
-            (QQC2.ApplicationWindow.window as Main).hoverLinkIndicator.text = hoveredLink;
+            applicationWindow().hoverLinkIndicator.text = hoveredLink;
        } else {
-            (QQC2.ApplicationWindow.window as Main).hoverLinkIndicator.text = "";
+            applicationWindow().hoverLinkIndicator.text = "";
        }
    }
 }
--- a/src/app/qml/ImageEditorPage.qml
+++ b/src/app/qml/ImageEditorPage.qml
@@ -100,7 +100,7 @@ Kirigami.Page {
            }
            Connections {
                target: selectionTool.selectionArea
-                function onDoubleClicked(): void {
+                function onDoubleClicked() {
                    rootEditorView.crop();
                }
            }
--- a/src/app/qml/InvitationView.qml
+++ b/src/app/qml/InvitationView.qml
@@ -16,7 +16,7 @@ ColumnLayout {
    id: root

    required property NeoChatRoom currentRoom
-    readonly property var invitingMember: currentRoom.qmlSafeMember(currentRoom.invitingUserId)
+    readonly property var invitingMember: currentRoom.member(currentRoom.invitingUserId)
    readonly property string inviteTimestamp: root.currentRoom.inviteTimestamp.toLocaleString(Qt.locale(), Locale.ShortFormat)

    spacing: Kirigami.Units.smallSpacing
@@ -33,7 +33,7 @@ ColumnLayout {
        Layout.fillWidth: true

        name: root.invitingMember.displayName
-        source: NeoChatConfig.hideImages ? undefined : root.invitingMember.avatarUrl
+        source: root.invitingMember.avatarUrl
        color: root.invitingMember.color
    }

@@ -52,15 +52,6 @@ ColumnLayout {
                Layout.alignment: Qt.AlignHCenter
            }

-            Kirigami.SelectableLabel {
-                Layout.fillWidth: true
-                font: Kirigami.Theme.smallFont
-                textFormat: TextEdit.PlainText
-                visible: root.currentRoom && root.currentRoom.canonicalAlias
-                text: root.currentRoom && root.currentRoom.canonicalAlias ? root.currentRoom.canonicalAlias : ""
-                color: Kirigami.Theme.disabledTextColor
-            }
-
            Kirigami.Heading {
                text: root.currentRoom.displayName

@@ -79,14 +70,7 @@ ColumnLayout {
            spacing: Kirigami.Units.smallSpacing

            Kirigami.Heading {
-                text: root.invitingMember.displayName
-
-                Layout.alignment: Qt.AlignHCenter
-            }
-
-            QQC2.Label {
-                text: root.invitingMember.id
-                color: Kirigami.Theme.disabledTextColor
+                text: root.currentRoom.displayName

                Layout.alignment: Qt.AlignHCenter
            }
@@ -124,7 +108,7 @@ ColumnLayout {
            icon.name: "dialog-cancel-symbolic"
            text: i18nc("@action:button Reject this invite", "Reject Invite")

-            onClicked: root.currentRoom.forget()
+            onClicked: RoomManager.leaveRoom(root.currentRoom)
        }
    }

@@ -139,7 +123,7 @@ ColumnLayout {
            text: i18nc("@action:button Block the user", "Block %1", root.invitingMember.displayName)

            onClicked: {
-                root.currentRoom.forget()
+                RoomManager.leaveRoom(root.currentRoom);
                root.currentRoom.connection.addToIgnoredUsers(root.currentRoom.invitingUserId);
            }
        }
@@ -175,7 +159,7 @@ ColumnLayout {

            QQC2.Label {
                color: Kirigami.Theme.disabledTextColor
-                text: xi18nc("@info:label Ensure you are referring to the same translation used for that settings page", "You can reject invitations from unknown users under the <interface>Security & Safety</interface> settings.")
+                text: i18nc("@info:label", "You can reject invitations from unknown users under Security settings.")
                wrapMode: Text.WordWrap

                // + 5 to prevent it from wrapping unnecessarily
--- a/src/libneochat/qml/InviteUserPage.qml
+++ b/src/libneochat/qml/InviteUserPage.qml
--- a/src/app/qml/JoinRoomDialog.qml
+++ b/src/app/qml/JoinRoomDialog.qml
@@ -8,10 +8,11 @@ import QtQuick.Layouts
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.components as KirigamiComponents
 import org.kde.kirigamiaddons.formcard as FormCard
+import org.kde.prison

 import org.kde.neochat

-Kirigami.Dialog {
+QQC2.Dialog {
    id: root

    required property string room
@@ -22,9 +23,9 @@ Kirigami.Dialog {
    topPadding: 0
    bottomPadding: 0

-    standardButtons: Kirigami.Dialog.NoButton
+    standardButtons: QQC2.Dialog.NoButton

-    width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
+    width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
    title: i18nc("@title:dialog", "Join Room")

    contentItem: ColumnLayout {
--- a/src/libneochat/qml/LocationMapItem.qml
+++ b/src/libneochat/qml/LocationMapItem.qml
--- a/src/roominfo/LocationsPage.qml
+++ b/src/roominfo/LocationsPage.qml
@@ -6,13 +6,12 @@ import QtLocation
 import QtPositioning

 import org.kde.kirigami as Kirigami
-
-import org.kde.neochat.libneochat
+import org.kde.neochat

 Kirigami.Page {
    id: root

-    required property NeoChatRoom room
+    required property var room

    title: i18nc("Locations on a map", "Locations")

@@ -59,7 +58,7 @@ Kirigami.Page {

        Connections {
            target: mapView.map
-            function onCopyrightLinkActivated(link: string): void {
+            function onCopyrightLinkActivated(link: string) {
                Qt.openUrlExternally(link);
            }
        }
--- a/src/app/qml/Main.qml
+++ b/src/app/qml/Main.qml
@@ -41,7 +41,6 @@ Kirigami.ApplicationWindow {
            showExisting: true
            onConnectionChosen: root.load()
        }
-        columnView.columnResizeMode: pageStack.wideMode ? Kirigami.ColumnView.DynamicColumns : Kirigami.ColumnView.SingleColumn
        globalToolBar.canContainHandles: true
        globalToolBar {
            style: Kirigami.ApplicationHeaderStyle.ToolBar
@@ -60,29 +59,30 @@ Kirigami.ApplicationWindow {

    Connections {
        target: LoginHelper
-        function onLoaded(): void {
+        function onLoaded() {
            root.load();
        }
    }

    Connections {
        target: Registration
-        function onLoaded(): void {
+        function onLoaded() {
            root.load();
        }
    }

    Connections {
        target: root.quitAction
-        function onTriggered(): void {
+        function onTriggered() {
            Qt.quit();
        }
    }

    Loader {
        active: Kirigami.Settings.hasPlatformMenuBar && !Kirigami.Settings.isMobile
-        sourceComponent: GlobalMenu {
-            connection: root.connection
+        sourceComponent: Qt.createComponent("org.kde.neochat", "GlobalMenu")
+        onActiveChanged: if (active) {
+            item.connection = root.connection;
        }
    }

@@ -98,40 +98,42 @@ Kirigami.ApplicationWindow {
    Connections {
        target: RoomManager

-        function onCurrentRoomChanged(): void {
+        function onCurrentRoomChanged() {
            if (RoomManager.currentRoom && pageStack.depth <= 1 && root.initialized && Kirigami.Settings.isMobile) {
-                let roomPage = pageStack.layers.push(Qt.createComponent('org.kde.neochat', 'RoomPage'));
+                let roomPage = pageStack.layers.push(Qt.createComponent('org.kde.neochat', 'RoomPage'), {
+                    connection: root.connection
+                });
                roomPage.backRequested.connect(event => {
                    RoomManager.clearCurrentRoom();
                });
            }
        }

-        function onAskJoinRoom(room: NeoChatRoom): void {
+        function onAskJoinRoom(room) {
            Qt.createComponent("org.kde.neochat", "JoinRoomDialog").createObject(root, {
                room: room,
                connection: root.connection
            }).open();
        }

-        function onShowUserDetail(user, room: NeoChatRoom): void {
+        function onShowUserDetail(user, room) {
            root.showUserDetail(user, room);
        }

-        function goToEvent(event: string): void {
+        function goToEvent(event) {
            if (event.length > 0) {
                roomItem.goToEvent(event);
            }
            roomItem.forceActiveFocus();
        }

-        function onAskDirectChatConfirmation(user): void {
+        function onAskDirectChatConfirmation(user) {
            Qt.createComponent("org.kde.neochat", "AskDirectChatConfirmation").createObject(this, {
                user: user
            }).open();
        }

-        function onExternalUrl(url): void {
+        function onExternalUrl(url) {
            let dialog = Qt.createComponent("org.kde.neochat", "ConfirmUrlDialog").createObject(this);
            dialog.link = url;
            dialog.open();
@@ -147,13 +149,9 @@ Kirigami.ApplicationWindow {
    }

    function openRoomDrawer() {
-        const page = pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomDrawerPage'), {
-            connection: root.connection,
-            room: RoomManager.currentRoom,
-            userListModel: RoomManager.userListModel,
-            mediaMessageFilterModel: RoomManager.mediaMessageFilterModel
+        pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomDrawerPage'), {
+            connection: root.connection
        });
-        page.resolveResource.connect((idOrUri, action) => RoomManager.resolveResource(idOrUri, action))
    }

    contextDrawer: RoomDrawer {
@@ -163,18 +161,7 @@ Kirigami.ApplicationWindow {
        // It is used to ensure that user choice is remembered when changing pages and expanding and contracting the window width
        property bool drawerUserState: NeoChatConfig.autoRoomInfoDrawer

-        room: RoomManager.currentRoom
        connection: root.connection
-        userListModel: RoomManager.userListModel
-        mediaMessageFilterModel: RoomManager.mediaMessageFilterModel
-
-        onResolveResource: (idOrUri, action) => RoomManager.resolveResource(idOrUri, action)
-
-        roomDrawerWidth: NeoChatConfig.roomDrawerWidth
-        onRoomDrawerWidthChanged: {
-            NeoChatConfig.roomDrawerWidth = actualWidth;
-            NeoChatConfig.save();
-        }

        handleClosedIcon.source: "documentinfo-symbolic"
        handleClosedToolTip: i18nc("@action:button", "Show Room Information")
@@ -336,7 +323,7 @@ Kirigami.ApplicationWindow {
        }
    }
    function handleShare(): void {
-        const dialog = root.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ChooseRoomDialog'), {
+        const dialog = applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ChooseRoomDialog'), {
            connection: root.connection
        }, {
            title: i18nc("@title", "Share"),
@@ -363,7 +350,9 @@ Kirigami.ApplicationWindow {
        RoomManager.loadInitialRoom();

        if (!Kirigami.Settings.isMobile) {
-            let roomPage = pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomPage'));
+            let roomPage = pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomPage'), {
+                connection: root.connection
+            });
            roomPage.forceActiveFocus();
        }

--- a/src/app/qml/ManualRoomDialog.qml
+++ b/src/app/qml/ManualRoomDialog.qml
@@ -2,6 +2,7 @@
 // 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.Window
 import QtQuick.Layouts

@@ -10,7 +11,7 @@ import org.kde.kirigamiaddons.formcard as FormCard

 import org.kde.neochat

-Kirigami.Dialog {
+QQC2.Dialog {
    id: root

    /**
@@ -31,35 +32,41 @@ Kirigami.Dialog {
    topPadding: 0
    bottomPadding: 0

-    standardButtons: Kirigami.Dialog.Cancel
-    customFooterActions: [
-        Kirigami.Action {
+    footer: QQC2.DialogButtonBox {
+        QQC2.Button {
+            QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
            enabled: roomIdAliasText.isValidText
            text: i18n("OK")
            icon.name: "dialog-ok"
-            onTriggered: {
-                // We don't necessarily have all the info so fill out the best we can.
-                let roomId = roomIdAliasText.isAlias() ? "" : roomIdAliasText.text;
-                let displayName = "";
-                let avatarUrl = "";
-                let alias = roomIdAliasText.isAlias() ? roomIdAliasText.text : "";
-                let topic = "";
-                let memberCount = -1;
-                let isJoined = false;
-                if (roomIdAliasText.room) {
-                    roomId = roomIdAliasText.room.id;
-                    displayName = roomIdAliasText.room.displayName;
-                    avatarUrl = roomIdAliasText.room.avatarUrl.toString().length > 0 ? connection.makeMediaUrl(roomIdAliasText.room.avatarUrl) : "";
-                    alias = roomIdAliasText.room.canonicalAlias;
-                    topic = roomIdAliasText.room.topic;
-                    memberCount = roomIdAliasText.room.joinedCount;
-                    isJoined = true;
-                }
-                root.roomSelected(roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined);
-                root.close();
-            }
        }
-    ]
+        QQC2.Button {
+            QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.RejectRole
+            text: i18n("Cancel")
+            icon.name: "dialog-cancel"
+        }
+    }
+
+    onAccepted: {
+        // We don't necessarily have all the info so fill out the best we can.
+        let roomId = roomIdAliasText.isAlias() ? "" : roomIdAliasText.text;
+        let displayName = "";
+        let avatarUrl = "";
+        let alias = roomIdAliasText.isAlias() ? roomIdAliasText.text : "";
+        let topic = "";
+        let memberCount = -1;
+        let isJoined = false;
+        if (roomIdAliasText.room) {
+            roomId = roomIdAliasText.room.id;
+            displayName = roomIdAliasText.room.displayName;
+            avatarUrl = roomIdAliasText.room.avatarUrl.toString().length > 0 ? connection.makeMediaUrl(roomIdAliasText.room.avatarUrl) : "";
+            alias = roomIdAliasText.room.canonicalAlias;
+            topic = roomIdAliasText.room.topic;
+            memberCount = roomIdAliasText.room.joinedCount;
+            isJoined = true;
+        }
+        root.roomSelected(roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined);
+        root.close();
+    }

    contentItem: ColumnLayout {
        spacing: 0
--- a/Show More
+++ b/Show More