skip windows as one test is failing

Testing for VM based CI
2025-07-06 09:34:01 +10:00 · 2025-07-06 09:15:21 +10:00
317 changed files with 67273 additions and 107324 deletions
--- a/.contextProperties.ini
+++ b/.contextProperties.ini
@@ -1,2 +0,0 @@
-[General]
-disableUnqualifiedAccess = "i18nc,xi18nc,i18ncp,i18n"
--- 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.10",
+    "runtime-version": "6.9",
    "sdk": "org.kde.Sdk",
    "command": "neochat",
    "tags": [
@@ -20,32 +20,21 @@
        "--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": "opencv",
+            "name": "kirigamiaddons",
            "config-opts": [
-                "-DBUILD_TESTS=OFF",
-                "-DWITH_GTK=OFF",
-                "-DBUILD_LIST=core,imgproc"
+                "-DBUILD_TESTING=OFF"
            ],
            "buildsystem": "cmake-ninja",
            "sources": [
                {
                    "type": "git",
-                    "url": "https://github.com/opencv/opencv"
+                    "url": "https://invent.kde.org/libraries/kirigami-addons.git"
                }
-            ],
-            "builddir": true
+            ]
        },
        {
            "name": "kquickimageeditor",
@@ -65,7 +54,6 @@
            "name": "olm",
            "buildsystem": "cmake-ninja",
            "config-opts": [
-                "-DCMAKE_POLICY_VERSION_MINIMUM=3.5",
                "-DOLM_TESTS=OFF"
            ],
            "sources": [
@@ -94,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",
@@ -165,20 +153,16 @@
            "name": "kunifiedpush",
            "buildsystem": "cmake-ninja",
            "builddir": true,
-            "config-opts": [
-                "-DENABLE_TESTING=OFF",
-                "-DKUNIFIEDPUSH_CLIENT_ONLY=ON"
-            ],
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://download.kde.org/stable/release-service/25.08.3/src/kunifiedpush-25.08.3.tar.xz",
-                    "sha256": "e8c924438d5359f0fa0930ab35111012076e3a0ff4e959d6929595571383320a",
+                    "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/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,19 +3,20 @@

 include:
  - project: sysadmin/ci-utilities
+    ref: work/switch-vm-ci
    file:
-      - /gitlab-templates/reuse-lint.yml
-      - /gitlab-templates/json-validation.yml
-      - /gitlab-templates/xml-lint.yml
-      - /gitlab-templates/yaml-lint.yml
-      - /gitlab-templates/android-qt6.yml
+      #- /gitlab-templates/reuse-lint.yml
+      #- /gitlab-templates/json-validation.yml
+      #- /gitlab-templates/xml-lint.yml
+      #- /gitlab-templates/yaml-lint.yml
+      #- /gitlab-templates/android-qt6.yml
      - /gitlab-templates/linux-qt6.yml
      - /gitlab-templates/linux-qt6-next.yml
-      - /gitlab-templates/windows-qt6.yml
-      - /gitlab-templates/freebsd-qt6.yml
+      #- /gitlab-templates/windows-qt6.yml
+      #- /gitlab-templates/freebsd-qt6.yml
      - /gitlab-templates/flatpak.yml
      - /gitlab-templates/snap-snapcraft-lxd.yml
-      - /gitlab-templates/craft-android-qt6-apks.yml
-      - /gitlab-templates/craft-appimage-qt6.yml
+      #- /gitlab-templates/craft-android-qt6-apks.yml
+      #- /gitlab-templates/craft-appimage-qt6.yml
      - /gitlab-templates/craft-windows-x86-64-qt6.yml
      - /gitlab-templates/craft-windows-appx-qt6.yml
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -14,6 +14,7 @@ Dependencies:
      'frameworks/kquickcharts': '@latest-kf6'
      'frameworks/knotifications': '@latest-kf6'
      'frameworks/kcolorscheme': '@latest-kf6'
+      'frameworks/kiconthemes': '@latest-kf6'
      'libraries/kquickimageeditor': '@latest-kf6'
      'frameworks/sonnet': '@latest-kf6'
      'frameworks/prison': '@latest-kf6'
@@ -28,15 +29,12 @@ Dependencies:
      'frameworks/kio': '@latest-kf6'
      'frameworks/kwindowsystem': '@latest-kf6'
      'frameworks/kstatusnotifieritem': '@latest-kf6'
-
-  - 'on': ['Linux', 'FreeBSD', 'Android']
-    'require':
-      'libraries/kunifiedpush': '@latest-kf6'
-
+      'frameworks/kcrash': '@latest-kf6'
  - 'on': ['Linux', 'FreeBSD']
    'require':
      'frameworks/kdbusaddons': '@latest-kf6'
      'frameworks/purpose': '@latest-kf6'
+      'libraries/kunifiedpush': '@latest-kf6'

  - 'on': ['Linux']
    'require':
@@ -45,4 +43,3 @@ Dependencies:
 Options:
  per-test-timeout: 90
  require-passing-tests-on: ['Linux', 'Android', 'FreeBSD', 'Windows']
-  run-qmllint: True
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,15 +7,15 @@
 cmake_minimum_required(VERSION 3.16)

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

 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})

-set(KF_MIN_VERSION "6.17")
-set(QT_MIN_VERSION "6.9")
+set(KF_MIN_VERSION "6.12")
+set(QT_MIN_VERSION "6.5")

 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)

@@ -24,7 +24,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

-set(KDE_COMPILERSETTINGS_LEVEL 6.17)
+set(KDE_COMPILERSETTINGS_LEVEL 6.0)

 include(FeatureSummary)
 include(ECMSetupVersion)
@@ -39,16 +39,17 @@ include(ECMCheckOutboundLicense)
 include(ECMQtDeclareLoggingCategory)
 include(ECMAddAndroidApk)
 include(ECMQmlModule)
-include(ECMDeprecationSettings)
 include(GenerateExportHeader)
 include(ECMGenerateHeaders)
 if (NOT ANDROID)
    include(KDEClangFormat)
 endif()

-set(QUOTIENT_FORCE_NAMESPACED_INCLUDES TRUE)
+if(NEOCHAT_FLATPAK)
+    include(cmake/Flatpak.cmake)
+endif()

-ecm_set_disabled_deprecation_versions(Qt 6.9.0 KF 6.17.0)
+set(QUOTIENT_FORCE_NAMESPACED_INCLUDES TRUE)

 ecm_setup_version(${PROJECT_VERSION}
    VARIABLE_PREFIX NEOCHAT
@@ -65,7 +66,7 @@ if (QT_KNOWN_POLICY_QTP0004)
 qt_policy(SET QTP0004 NEW)
 endif ()

-find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels ColorScheme)
+find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels IconThemes ColorScheme)
 set_package_properties(KF6 PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
@@ -74,7 +75,7 @@ set_package_properties(KF6Kirigami PROPERTIES
    TYPE REQUIRED
    PURPOSE "Kirigami application UI framework"
 )
-find_package(KF6KirigamiAddons 1.10.0 REQUIRED)
+find_package(KF6KirigamiAddons 1.6.0 REQUIRED)

 if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT NEOCHAT_FLATPAK AND NOT NEOCHAT_APPIMAGE)
    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Purpose)
@@ -88,7 +89,7 @@ if(ANDROID)
    )
 else()
    find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem)
+    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem Crash)
    find_package(KF6SyntaxHighlighting ${KF_MIN_VERSION} REQUIRED)
    set_package_properties(KF6QQC2DesktopStyle PROPERTIES
        TYPE RUNTIME
@@ -106,7 +107,7 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU)
    find_package(KF6DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()

-find_package(QuotientQt6 0.9.3)
+find_package(QuotientQt6 0.9.1)
 set_package_properties(QuotientQt6 PROPERTIES
    TYPE REQUIRED
    DESCRIPTION "Qt wrapper around Matrix API"
@@ -148,7 +149,7 @@ set_package_properties(KF6DocTools PROPERTIES DESCRIPTION

 option(WITH_UNIFIEDPUSH "Build with KUnifiedPush support" ON)

-if (APPLE OR WIN32 OR HAIKU)
+if (ANDROID OR APPLE OR WIN32 OR HAIKU)
    set(WITH_UNIFIEDPUSH OFF)
 endif()

--- a/REUSE.toml
+++ b/REUSE.toml
@@ -88,9 +88,3 @@ path = "memorytests/memtest-sync.json"
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2024 James Graham <james.h.graham@protonmail.com>"
 SPDX-License-Identifier = "BSD-2-Clause"
-
-[[annotations]]
-path = ".contextProperties.ini"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2025 Tobias Fella <tobias.fella@kde.org>"
-SPDX-License-Identifier = "BSD-2-Clause"
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -92,15 +92,3 @@ ecm_add_test(
    LINK_LIBRARIES neochat Qt::Test neochat_server
    TEST_NAME actionstest
 )
-
-ecm_add_test(
-    servernoticestest.cpp
-    LINK_LIBRARIES neochat Qt::Test neochat_server
-    TEST_NAME servernoticestest
-)
-
-ecm_add_test(
-    roommanagertest.cpp
-    LINK_LIBRARIES neochat Qt::Test neochat_server
-    TEST_NAME roommanagertest
-)
--- 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/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,17 +39,17 @@ 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);
+    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);
-    QCOMPARE(model2.data(model2.index(0), MessageContentModel::DisplayRole), u"Loading reply…"_s);
+    QCOMPARE(model2.data(model2.index(0), MessageContentModel::DisplayRole), u"Loading reply"_s);

    room->syncNewEvents(u"test-min-sync.json"_s);
    QCOMPARE(model1.rowCount(), 2);
--- 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/roommanagertest.cpp
+++ b/autotests/roommanagertest.cpp
@@ -1,141 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include <QObject>
-#include <QSignalSpy>
-#include <QTest>
-#include <QVariantList>
-
-#include "accountmanager.h"
-#include "models/actionsmodel.h"
-#include "roommanager.h"
-
-#include "server.h"
-#include "testutils.h"
-
-using namespace Quotient;
-
-class RoomManagerTest : public QObject
-{
-    Q_OBJECT
-
-private:
-    NeoChatConnection *connection = nullptr;
-    NeoChatRoom *room = nullptr;
-
-    Server server;
-
-private Q_SLOTS:
-    void initTestCase();
-    void testMaximizeMedia();
-    void testResolveMatrixLinks();
-};
-
-void RoomManagerTest::initTestCase()
-{
-    Connection::setRoomType<NeoChatRoom>();
-    server.start();
-    KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));
-    auto accountManager = new AccountManager(true);
-    QSignalSpy spy(accountManager, &AccountManager::connectionAdded);
-    connection = dynamic_cast<NeoChatConnection *>(accountManager->accounts()->front());
-    QVERIFY(connection);
-    auto roomId = server.createRoom(u"@user:localhost:1234"_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);
-    RoomManager::instance().setConnection(connection);
-    QSignalSpy roomSpy(&RoomManager::instance(), &RoomManager::currentRoomChanged);
-    RoomManager::instance().resolveResource(room->id());
-    QVERIFY(roomSpy.size() > 0);
-}
-
-void RoomManagerTest::testMaximizeMedia()
-{
-    QSignalSpy spy(&RoomManager::instance(), &RoomManager::showMaximizedMedia);
-    QSignalSpy syncSpy(connection, &Connection::syncDone);
-
-    QTest::ignoreMessage(QtMsgType::QtWarningMsg, "Tried to open media for empty event id");
-    RoomManager::instance().maximizeMedia(QString());
-    QVERIFY(!spy.wait(10));
-
-    QTest::ignoreMessage(QtMsgType::QtWarningMsg, "Tried to open media for unknown event id \"Doesn't exist\"");
-    RoomManager::instance().maximizeMedia(u"Doesn't exist"_s);
-    QVERIFY(!spy.wait(10));
-
-    const auto eventWithoutMedia = server.sendEvent(room->id(),
-                                                    u"m.room.message"_s,
-                                                    QJsonObject({
-                                                        {u"body"_s, u"Foo"_s},
-                                                        {u"format"_s, u"org.matrix.custom.html"_s},
-                                                        {u"formatted_body"_s, u"Foo"_s},
-                                                        {u"msgtype"_s, u"m.text"_s},
-                                                    }));
-    QVERIFY(syncSpy.wait());
-    QVERIFY(syncSpy.wait());
-    QTest::ignoreMessage(QtMsgType::QtWarningMsg, u"Tried to open media for unknown event id \"%1\""_s.arg(eventWithoutMedia).toLatin1().data());
-    RoomManager::instance().maximizeMedia(eventWithoutMedia);
-    QVERIFY(!spy.wait(10));
-
-    // NOTE: This is supposed to test that maximizing pending media works correctly. This probably doesn't work in the UI yet, but at least the backend supports
-    // it. If the server ever learns how to process events, this becomes pointless and we need to find a way of preventing *these* events from arriving
-    auto pendingEventWithoutMedia = room->postText(u"Hello"_s);
-    QTest::ignoreMessage(QtMsgType::QtWarningMsg, u"Tried to open media for unknown event id \"%1\""_s.arg(pendingEventWithoutMedia).toLatin1().data());
-    RoomManager::instance().maximizeMedia(pendingEventWithoutMedia);
-    QVERIFY(!spy.wait(10));
-
-    const auto eventWithMedia = server.sendEvent(room->id(),
-                                                 u"m.room.message"_s,
-                                                 QJsonObject({
-                                                     {u"body"_s, u"Foo"_s},
-                                                     {u"filename"_s, u"foo.jpg"_s},
-                                                     {u"info"_s,
-                                                      QJsonObject{
-                                                          {u"h"_s, 1000},
-                                                          {u"w"_s, 2000},
-                                                          {u"size"_s, 10000},
-                                                          {u"mimetype"_s, u"image/png"_s},
-                                                      }},
-                                                     {u"msgtype"_s, u"m.image"_s},
-                                                     {u"url"_s, u"mxc://foo.bar/asdf"_s},
-                                                 }));
-    QVERIFY(syncSpy.wait());
-    QVERIFY(syncSpy.wait());
-    QVERIFY(syncSpy.wait());
-    RoomManager::instance().maximizeMedia(eventWithMedia);
-    QVERIFY(spy.size() == 1);
-    QVERIFY(spy[0][0] == 0);
-
-    auto pendingEventWithMedia = room->postJson(u"m.room.message"_s,
-                                                QJsonObject({
-                                                    {u"body"_s, u"Foo"_s},
-                                                    {u"filename"_s, u"foo.jpg"_s},
-                                                    {u"info"_s,
-                                                     QJsonObject{
-                                                         {u"h"_s, 1000},
-                                                         {u"w"_s, 2000},
-                                                         {u"size"_s, 10000},
-                                                         {u"mimetype"_s, u"image/png"_s},
-                                                     }},
-                                                    {u"msgtype"_s, u"m.image"_s},
-                                                    {u"url"_s, u"mxc://foo.bar/asdf"_s},
-                                                }));
-    RoomManager::instance().maximizeMedia(pendingEventWithMedia);
-    QVERIFY(spy.size() == 2);
-    QVERIFY(spy[1][0] == 0);
-}
-
-void RoomManagerTest::testResolveMatrixLinks()
-{
-    // Test if resolving a non-joined room will bring up the confirmation dialog.
-    const QSignalSpy askToJoinSpy(&RoomManager::instance(), &RoomManager::askJoinRoom);
-    RoomManager::instance().resolveResource(QStringLiteral("matrix:r/testbuild:matrix.org"), QStringLiteral("join"));
-    QTRY_COMPARE(askToJoinSpy.size(), 1);
-}
-
-QTEST_MAIN(RoomManagerTest)
-#include "roommanagertest.moc"
--- a/autotests/server.cpp
+++ b/autotests/server.cpp
@@ -4,12 +4,15 @@
 #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>
@@ -106,20 +109,98 @@ void Server::start()
    m_server.route(u"/_matrix/client/v3/rooms/<arg>/invite"_s,
                   QHttpServerRequest::Method::Post,
                   [this](const QString &roomId, QHttpServerResponder &responder, const QHttpServerRequest &request) {
-                       Changes changes;
-                       changes.invitations += Changes::InviteUser{
-                           .userId = QJsonDocument::fromJson(request.body()).object()[u"user_id"_s].toString(),
-                           .roomId = roomId,
-                       };
-                       m_state += changes;
+                       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, &Server::sync);
+    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);
-    void(key.open(QFile::ReadOnly));
+    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);
@@ -133,239 +214,22 @@ void Server::start()

 QString Server::createRoom(const QString &matrixId)
 {
-    const auto roomId = generateRoomId();
-    Changes changes;
-    changes.newRooms += Changes::NewRoom{
-        .initialMembers = {matrixId},
-        .roomId = {roomId},
-        .tags = {},
-    };
-    m_state += changes;
+    auto roomId = generateRoomId();
+    m_roomsToCreate += {roomId, matrixId};
    return roomId;
 }

 void Server::inviteUser(const QString &roomId, const QString &matrixId)
 {
-    Changes changes;
-    changes.invitations += Changes::InviteUser{
-        .userId = matrixId,
-        .roomId = roomId,
-    };
-    m_state += changes;
+    m_invitedUsers[roomId] += matrixId;
 }

 void Server::banUser(const QString &roomId, const QString &matrixId)
 {
-    Changes changes;
-    changes.bans += Changes::BanUser{
-        .userId = matrixId,
-        .roomId = roomId,
-    };
-    m_state += changes;
+    m_bannedUsers[roomId] += matrixId;
 }

 void Server::joinUser(const QString &roomId, const QString &matrixId)
 {
-    Changes changes;
-    changes.joins += Changes::JoinUser{
-        .userId = matrixId,
-        .roomId = roomId,
-    };
-    m_state += changes;
-}
-
-QString Server::createServerNoticesRoom(const QString &matrixId)
-{
-    const auto roomId = generateRoomId();
-    Changes changes;
-    changes.newRooms += Changes::NewRoom{
-        .initialMembers = {matrixId},
-        .roomId = {roomId},
-        .tags = {u"m.server_notice"_s},
-    };
-    m_state += changes;
-    return roomId;
-}
-
-QString Server::sendEvent(const QString &roomId, const QString &eventType, const QJsonObject &content)
-{
-    Changes changes;
-    const auto eventId = generateEventId();
-    changes.events += Changes::Event{
-        .fullJson = QJsonObject{{u"type"_s, eventType},
-                                {u"content"_s, content},
-                                {u"sender"_s, u"@foo:server.com"_s},
-                                {u"event_id"_s, eventId},
-                                {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                                {u"room_id"_s, roomId}},
-    };
-    m_state += changes;
-    return eventId;
-}
-
-void Server::sync(const QHttpServerRequest &request, QHttpServerResponder &responder)
-{
-    QJsonObject joinRooms;
-    auto token = request.query().queryItemValue(u"since"_s).toInt();
-
-    for (const auto &change : m_state.mid(token)) {
-        for (const auto &newRoom : change.newRooms) {
-            QJsonArray stateEvents;
-            stateEvents += 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, newRoom.roomId},
-                {u"sender"_s, newRoom.initialMembers[0]},
-                {u"state_key"_s, QString()},
-                {u"type"_s, u"m.room.create"_s},
-                {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-            };
-            for (const auto &member : newRoom.initialMembers) {
-                stateEvents += 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, newRoom.roomId},
-                    {u"sender"_s, member},
-                    {u"state_key"_s, member},
-                    {u"type"_s, u"m.room.member"_s},
-                    {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-                };
-            }
-
-            auto room = QJsonObject{{u"state"_s, QJsonObject{{u"events"_s, stateEvents}}}};
-
-            QJsonArray roomAccountData;
-            QJsonObject tags;
-            for (const auto &tag : newRoom.tags) {
-                tags[tag] = QJsonObject();
-            }
-            if (!tags.empty()) {
-                roomAccountData += QJsonObject{{u"type"_s, u"m.tag"_s}, {u"content"_s, QJsonObject{{u"tags"_s, tags}}}};
-            }
-
-            if (roomAccountData.size() > 0) {
-                room[u"account_data"] = QJsonObject{{u"events"_s, roomAccountData}};
-            }
-
-            joinRooms[newRoom.roomId] = room;
-        }
-    }
-
-    for (const auto &change : m_state.mid(token)) {
-        for (const auto &invitation : change.invitations) {
-            // TODO: The invitation could be for a room we haven't joined yet. Shouldn't be necessary for now, though.
-            auto stateEvents = joinRooms[invitation.roomId][u"state"_s][u"events"_s].toArray();
-            stateEvents += 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, invitation.roomId},
-                {u"sender"_s, u"@user:localhost:1234"_s},
-                {u"state_key"_s, invitation.userId},
-                {u"type"_s, u"m.room.member"_s},
-                {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-            };
-            if (joinRooms.contains(invitation.roomId)) {
-                auto room = joinRooms[invitation.roomId].toObject();
-                room[u"state"_s] = QJsonObject{{u"events"_s, stateEvents}};
-                joinRooms[invitation.roomId] = room;
-            } else {
-                joinRooms[invitation.roomId] = QJsonObject{{u"state"_s,
-                                                            QJsonObject{
-                                                                {u"events"_s, stateEvents},
-                                                            }}};
-            }
-        }
-    }
-
-    for (const auto &change : m_state.mid(token)) {
-        for (const auto &ban : change.bans) {
-            // TODO: The ban could be for a room we haven't joined yet. Shouldn't be necessary for now, though.
-            auto stateEvents = joinRooms[ban.roomId][u"state"_s][u"events"_s].toArray();
-            stateEvents += 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, ban.roomId},
-                {u"sender"_s, u"@user:localhost:1234"_s},
-                {u"state_key"_s, ban.userId},
-                {u"type"_s, u"m.room.member"_s},
-                {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-            };
-            if (joinRooms.contains(ban.roomId)) {
-                auto room = joinRooms[ban.roomId].toObject();
-                room[u"state"_s] = QJsonObject{{u"events"_s, stateEvents}};
-                joinRooms[ban.roomId] = room;
-            } else {
-                joinRooms[ban.roomId] = QJsonObject{{u"state"_s,
-                                                     QJsonObject{
-                                                         {u"events"_s, stateEvents},
-                                                     }}};
-            }
-        }
-    }
-
-    for (const auto &change : m_state.mid(token)) {
-        for (const auto &join : change.joins) {
-            // TODO: The join could be for a room we haven't joined yet. Shouldn't be necessary for now, though.
-            auto stateEvents = joinRooms[join.roomId][u"state"_s][u"events"_s].toArray();
-            stateEvents += 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, join.roomId},
-                {u"sender"_s, u"@user:localhost:1234"_s},
-                {u"state_key"_s, join.userId},
-                {u"type"_s, u"m.room.member"_s},
-                {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-            };
-            if (joinRooms.contains(join.roomId)) {
-                auto room = joinRooms[join.roomId].toObject();
-                room[u"state"_s] = QJsonObject{{u"events"_s, stateEvents}};
-                joinRooms[join.roomId] = room;
-            } else {
-                joinRooms[join.roomId] = QJsonObject{{u"state"_s,
-                                                      QJsonObject{
-                                                          {u"events"_s, stateEvents},
-                                                      }}};
-            }
-        }
-    }
-
-    for (const auto &change : m_state.mid(token)) {
-        for (const auto &event : change.events) {
-            // TODO the room might be in a different join state.
-            auto timeline = joinRooms[event.fullJson[u"room_id"_s].toString()][u"timeline"_s][u"events"_s].toArray();
-            timeline += event.fullJson;
-            if (joinRooms.contains(event.fullJson[u"room_id"_s].toString())) {
-                auto room = joinRooms[event.fullJson[u"room_id"_s].toString()].toObject();
-                room[u"timeline"_s] = QJsonObject{{u"events"_s, timeline}};
-                joinRooms[event.fullJson[u"room_id"_s].toString()] = room;
-            } else {
-                joinRooms[event.fullJson[u"room_id"_s].toString()] = QJsonObject{
-                    {u"timeline"_s, QJsonObject{{u"events"_s, timeline}}},
-                };
-            }
-        }
-    }
-
-    QJsonObject syncData = {
-        // {u"account_data"_s, QJsonObject {}},
-        // {u"presence"_s, QJsonObject {}},
-        {u"next_batch"_s, QString::number(m_state.size())},
-    };
-
-    QJsonObject rooms;
-    if (!joinRooms.isEmpty()) {
-        rooms[u"join"_s] = joinRooms;
-    }
-
-    if (!rooms.empty()) {
-        syncData[u"rooms"_s] = rooms;
-    }
-
-    qWarning() << syncData;
-    responder.write(QJsonDocument(syncData), QHttpServerResponder::StatusCode::Ok);
+    m_joinedUsers[roomId] += matrixId;
 }
--- a/autotests/server.h
+++ b/autotests/server.h
@@ -2,51 +2,10 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #include <QHttpServer>
-#include <QJsonObject>
 #include <QSslServer>

-struct Changes {
-    struct NewRoom {
-        QStringList initialMembers;
-        QString roomId;
-        QStringList tags;
-    };
-    QList<NewRoom> newRooms;
-
-    struct InviteUser {
-        QString userId;
-        QString roomId;
-    };
-    QList<InviteUser> invitations;
-
-    struct BanUser {
-        QString userId;
-        QString roomId;
-    };
-    QList<BanUser> bans;
-
-    struct JoinUser {
-        QString userId;
-        QString roomId;
-    };
-    QList<JoinUser> joins;
-
-    struct Event {
-        QJsonObject fullJson;
-    };
-    QList<Event> events;
-};
-
-struct RoomData {
-    QStringList members;
-    QString id;
-    QStringList tags;
-};
-
-class Server : public QObject
+class Server
 {
-    Q_OBJECT
-
 public:
    Server();

@@ -62,17 +21,13 @@ public:
    void banUser(const QString &roomId, const QString &matrixId);
    void joinUser(const QString &roomId, const QString &matrixId);

-    /**
-     * Create a server notices room.
-     */
-    QString createServerNoticesRoom(const QString &matrixId);
-    QString sendEvent(const QString &roomId, const QString &eventType, const QJsonObject &content);
-
 private:
    QHttpServer m_server;
    QSslServer m_sslServer;

-    void sync(const QHttpServerRequest &request, QHttpServerResponder &responder);
+    QHash<QString, QList<QString>> m_invitedUsers;
+    QHash<QString, QList<QString>> m_bannedUsers;
+    QHash<QString, QList<QString>> m_joinedUsers;

-    QList<Changes> m_state;
+    QList<std::pair<QString, QString>> m_roomsToCreate;
 };
--- a/autotests/servernoticestest.cpp
+++ b/autotests/servernoticestest.cpp
@@ -1,87 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include <QObject>
-#include <QSignalSpy>
-#include <QTest>
-
-#include <KLocalizedString>
-
-#include <Quotient/connection.h>
-#include <Quotient/eventstats.h>
-#include <Quotient/quotient_common.h>
-#include <Quotient/syncdata.h>
-
-#include "accountmanager.h"
-#include "neochatroom.h"
-#include "roommanager.h"
-#include "server.h"
-
-#include "testutils.h"
-
-using namespace Quotient;
-
-class ServerNoticesTest : public QObject
-{
-    Q_OBJECT
-
-private:
-    NeoChatConnection *connection = nullptr;
-    Server server;
-
-private Q_SLOTS:
-    void initTestCase();
-    void test();
-};
-
-void ServerNoticesTest::initTestCase()
-{
-    Connection::setRoomType<NeoChatRoom>();
-    server.start();
-    KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));
-    auto accountManager = new AccountManager(true);
-    QSignalSpy spy(accountManager, &AccountManager::connectionAdded);
-    connection = dynamic_cast<NeoChatConnection *>(accountManager->accounts()->front());
-    QVERIFY(connection);
-    auto roomId = server.createRoom(u"@user:localhost:1234"_s);
-    RoomManager::instance().setConnection(connection);
-
-    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());
-    auto room = dynamic_cast<NeoChatRoom *>(connection->room(roomId));
-    QVERIFY(room);
-}
-
-void ServerNoticesTest::test()
-{
-    auto roomTreeModel = RoomManager::instance().roomTreeModel();
-    QCOMPARE(roomTreeModel->rowCount(roomTreeModel->index(NeoChatRoomType::ServerNotice, 0)), 0);
-    auto sortFilterRoomTreeModel = RoomManager::instance().sortFilterRoomTreeModel();
-    const auto roomId = server.createServerNoticesRoom(u"@user:localhost:1234"_s);
-    QSignalSpy syncSpy(connection, &Connection::syncDone);
-    QVERIFY(syncSpy.wait());
-    QVERIFY(syncSpy.wait());
-    const auto room = dynamic_cast<NeoChatRoom *>(connection->room(roomId));
-    QVERIFY(connection->room(roomId)->isServerNoticeRoom());
-    QCOMPARE(roomTreeModel->rowCount(roomTreeModel->index(NeoChatRoomType::ServerNotice, 0)), 1);
-    QCOMPARE(sortFilterRoomTreeModel->mapFromSource(roomTreeModel->indexForRoom(room)).parent().row(), 1 /* Below the normal room */);
-    server.sendEvent(roomId,
-                     u"m.room.message"_s,
-                     QJsonObject{
-                         {u"body"_s, u"Foo"_s},
-                         {u"format"_s, u"org.matrix.custom.html"_s},
-                         {u"formatted_body"_s, u"Foo"_s},
-                         {u"msgtype"_s, u"m.text"_s},
-                     });
-    QVERIFY(syncSpy.wait());
-    QVERIFY(syncSpy.wait());
-    sortFilterRoomTreeModel->invalidate();
-    QCOMPARE(sortFilterRoomTreeModel->mapFromSource(roomTreeModel->indexForRoom(room)).parent().row(), 0);
-    room->markAllMessagesAsRead();
-    QCOMPARE(sortFilterRoomTreeModel->mapFromSource(roomTreeModel->indexForRoom(room)).parent().row(), 1 /* Below the normal room */);
-}
-
-QTEST_GUILESS_MAIN(ServerNoticesTest)
-#include "servernoticestest.moc"
--- a/autotests/testutils.h
+++ b/autotests/testutils.h
@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL

-#include <QTest>
 #include <Quotient/events/event.h>
 #include <Quotient/syncdata.h>

@@ -33,7 +32,7 @@ public:
        if (!syncFileName.isEmpty()) {
            QFile testSyncFile;
            testSyncFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + syncFileName);
-            Q_UNUSED(testSyncFile.open(QIODevice::ReadOnly));
+            testSyncFile.open(QIODevice::ReadOnly);
            const auto testSyncJson = QJsonDocument::fromJson(testSyncFile.readAll());
            Quotient::SyncRoomData roomData(id(), Quotient::JoinState::Join, testSyncJson.object());
            update(std::move(roomData));
@@ -47,7 +46,7 @@ inline Quotient::event_ptr_tt<EventT> loadEventFromFile(const QString &eventFile
    if (!eventFileName.isEmpty()) {
        QFile testEventFile;
        testEventFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + eventFileName);
-        Q_UNUSED(testEventFile.open(QIODevice::ReadOnly));
+        testEventFile.open(QIODevice::ReadOnly);
        auto testSyncJson = QJsonDocument::fromJson(testEventFile.readAll()).object();
        return Quotient::loadEvent<EventT>(testSyncJson);
    }
--- a/autotests/texthandlertest.cpp
+++ b/autotests/texthandlertest.cpp
@@ -34,10 +34,6 @@ private Q_SLOTS:
    void stripDisallowedTags();
    void stripDisallowedAttributes();
    void emptyCodeTags();
-    void addStyle_data();
-    void addStyle();
-    void dontAddStyle_data();
-    void dontAddStyle();

    void sendSimpleStringCase();
    void sendSingleParaMarkup();
@@ -75,9 +71,6 @@ private Q_SLOTS:

    void componentOutput_data();
    void componentOutput();
-
-    void updateSpoiler_data();
-    void updateSpoiler();
 };

 void TextHandlerTest::initTestCase()
@@ -96,26 +89,21 @@ void TextHandlerTest::initTestCase()

 void TextHandlerTest::allowedAttributes()
 {
-    auto theme = static_cast<Kirigami::Platform::PlatformTheme *>(qmlAttachedPropertiesObject<Kirigami::Platform::PlatformTheme>(this, true));
    const QString testInputString1 = u"<span data-mx-spoiler><font color=#FFFFFF>Test</font><span>"_s;
-    const QString testOutputString1S = u"<span data-mx-spoiler><font color=#FFFFFF>Test</font><span>"_s;
-    const QString testOutputString1R = u"<span data-mx-spoiler style=\"color: transparent; background: %1;\"><font color=#FFFFFF>Test</font><span>"_s.arg(
-        theme->alternateBackgroundColor().name());
+    const QString testOutputString1 = u"<span data-mx-spoiler><font color=#FFFFFF>Test</font><span>"_s;
    // Handle urls where the href has either single (') or double (") quotes.
    const QString testInputString2 = u"<a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a>"_s;
-    const QString testOutputString2S = u"<a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a>"_s;
-    const QString testOutputString2R =
-        u"<a href=\"https://kde.org\" style=\"text-decoration: none;\">link</a><a href='https://kde.org' style=\"text-decoration: none;\">link</a>"_s;
+    const QString testOutputString2 = u"<a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a>"_s;

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString1);

-    QCOMPARE(testTextHandler.handleSendText(), testOutputString1S);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString1R);
+    QCOMPARE(testTextHandler.handleSendText(), testOutputString1);
+    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString1);

    testTextHandler.setData(testInputString2);
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString2S);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString2R);
+    QCOMPARE(testTextHandler.handleSendText(), testOutputString2);
+    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString2);
 }

 void TextHandlerTest::stripDisallowedTags()
@@ -158,56 +146,6 @@ void TextHandlerTest::emptyCodeTags()
    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
 }

-void TextHandlerTest::addStyle_data()
-{
-    QTest::addColumn<QString>("testInputString");
-    QTest::addColumn<QString>("testOutputString");
-
-    QTest::newRow("link") << u"<a href=\"https://kde.org\">link</a>"_s << u"<a href=\"https://kde.org\" style=\"text-decoration: none;\">link</a>"_s;
-    QTest::newRow("table")
-        << u"<table><tr><th>Company</th><th>Contact</th><th>Country</th></tr><tr><td>Alfreds Futterkiste</td><td>Maria Anders</td><td>Germany</td></tr><tr><td>Centro comercial Moctezuma</td><td>Francisco Chang</td><td>Mexico</td></tr></table>"_s
-        << u"<table style=\"width: 100%; border-collapse: collapse; border: 1px; border-style: solid;\"><tr><th style=\"border: 1px solid black; padding: 3px;\">Company</th><th style=\"border: 1px solid black; padding: 3px;\">Contact</th><th style=\"border: 1px solid black; padding: 3px;\">Country</th></tr><tr><td style=\"border: 1px solid black; padding: 3px;\">Alfreds Futterkiste</td><td style=\"border: 1px solid black; padding: 3px;\">Maria Anders</td><td style=\"border: 1px solid black; padding: 3px;\">Germany</td></tr><tr><td style=\"border: 1px solid black; padding: 3px;\">Centro comercial Moctezuma</td><td style=\"border: 1px solid black; padding: 3px;\">Francisco Chang</td><td style=\"border: 1px solid black; padding: 3px;\">Mexico</td></tr></table>"_s;
-    auto theme = static_cast<Kirigami::Platform::PlatformTheme *>(qmlAttachedPropertiesObject<Kirigami::Platform::PlatformTheme>(this, true));
-    QTest::newRow("spoiler") << u"<span data-mx-spoiler><font color=#FFFFFF>Test</font><span>"_s
-                             << u"<span data-mx-spoiler style=\"color: transparent; background: %1;\"><font color=#FFFFFF>Test</font><span>"_s.arg(
-                                    theme->alternateBackgroundColor().name());
-}
-
-void TextHandlerTest::addStyle()
-{
-    QFETCH(QString, testInputString);
-    QFETCH(QString, testOutputString);
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-}
-
-void TextHandlerTest::dontAddStyle_data()
-{
-    QTest::addColumn<QString>("testInputString");
-    QTest::addColumn<QString>("testOutputString");
-
-    QTest::newRow("link") << u"<a href=\"https://kde.org\">link</a>"_s << u"<a href=\"https://kde.org\">link</a>"_s;
-    QTest::newRow("table")
-        << u"<table><tr><th>Company</th><th>Contact</th><th>Country</th></tr><tr><td>Alfreds Futterkiste</td><td>Maria Anders</td><td>Germany</td></tr><tr><td>Centro comercial Moctezuma</td><td>Francisco Chang</td><td>Mexico</td></tr></table>"_s
-        << u"<table><tr><th>Company</th><th>Contact</th><th>Country</th></tr><tr><td>Alfreds Futterkiste</td><td>Maria Anders</td><td>Germany</td></tr><tr><td>Centro comercial Moctezuma</td><td>Francisco Chang</td><td>Mexico</td></tr></table>"_s;
-    QTest::newRow("spoiler") << u"<span data-mx-spoiler><font color=#FFFFFF>Test</font><span>"_s
-                             << u"<span data-mx-spoiler><font color=#FFFFFF>Test</font><span>"_s;
-}
-
-void TextHandlerTest::dontAddStyle()
-{
-    QFETCH(QString, testInputString);
-    QFETCH(QString, testOutputString);
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-}
-
 void TextHandlerTest::sendSimpleStringCase()
 {
    const QString testInputString = u"This data should just be left alone."_s;
@@ -400,8 +338,7 @@ void TextHandlerTest::receiveRichInPlainOut()
 void TextHandlerTest::receivePlainTextIn()
 {
    const QString testInputString = u"<plain text in tag bracket>\nTest link https://kde.org."_s;
-    const QString testOutputStringRich =
-        u"&lt;plain text in tag bracket&gt;<br>Test link <a href=\"https://kde.org\" style=\"text-decoration: none;\">https://kde.org</a>."_s;
+    const QString testOutputStringRich = u"&lt;plain text in tag bracket&gt;<br>Test link <a href=\"https://kde.org\">https://kde.org</a>."_s;
    QString testOutputStringPlain = u"<plain text in tag bracket>\nTest link https://kde.org."_s;

    // Make sure quotes are maintained in a plain string.
@@ -471,7 +408,7 @@ void TextHandlerTest::receivePlainStripMarkup()
 void TextHandlerTest::receiveRichUserPill()
 {
    const QString testInputString = u"<p><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></p>"_s;
-    const QString testOutputString = u"<b><a href=\"https://matrix.to/#/@alice:example.org\" style=\"text-decoration: none;\">@alice:example.org</a></b>"_s;
+    const QString testOutputString = u"<b><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></b>"_s;

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -523,23 +460,21 @@ void TextHandlerTest::receiveRichPlainUrl_data()
    // 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\" style=\"text-decoration: none;\">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\" style=\"text-decoration: none;\">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/\" style=\"text-decoration: none;\">https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/</a>"_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" style="text-decoration: none;">email@example.com</a> <a href="mailto:email@example.com" style="text-decoration: none;">Link already rich</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\" style=\"text-decoration: none;\">@user:kde.org</a></b> <b><a href=\"https://matrix.to/#/@user:kde.org\" style=\"text-decoration: none;\">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\" style=\"text-decoration: none;\">@user:kde.org</a></b> b"_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;
 }

 /**
@@ -661,35 +596,5 @@ void TextHandlerTest::componentOutput()
    QCOMPARE(testTextHandler.textComponents(testInputString), testOutputComponents);
 }

-void TextHandlerTest::updateSpoiler_data()
-{
-    QTest::addColumn<QString>("testInputString");
-    QTest::addColumn<QString>("testOutputString");
-    QTest::addColumn<bool>("spoilerRevealed");
-
-    auto theme = static_cast<Kirigami::Platform::PlatformTheme *>(qmlAttachedPropertiesObject<Kirigami::Platform::PlatformTheme>(this, true));
-    QTest::newRow("same length") << u"<span data-mx-spoiler style=\"color: #123456; background: #123456;\">Test<span>"_s
-                                 << u"<span data-mx-spoiler style=\"color: transparent; background: %1;\">Test<span>"_s.arg(
-                                        theme->alternateBackgroundColor().name())
-                                 << false;
-    QTest::newRow("different length") << u"<span data-mx-spoiler style=\"color: short; background: looooooooooong;\">Test<span>"_s
-                                      << u"<span data-mx-spoiler style=\"color: transparent; background: %1;\">Test<span>"_s.arg(
-                                             theme->alternateBackgroundColor().name())
-                                      << false;
-    QTest::newRow("spoiler revealed")
-        << u"<span data-mx-spoiler style=\"color: transparent; background: %1;\">Test<span>"_s.arg(theme->alternateBackgroundColor().name())
-        << u"<span data-mx-spoiler style=\"color: %1; background: %2;\">Test<span>"_s.arg(theme->textColor().name(), theme->alternateBackgroundColor().name())
-        << true;
-}
-
-void TextHandlerTest::updateSpoiler()
-{
-    QFETCH(QString, testInputString);
-    QFETCH(QString, testOutputString);
-    QFETCH(bool, spoilerRevealed);
-
-    QCOMPARE(TextHandler::updateSpoilerText(this, testInputString, spoilerRevealed), testOutputString);
-}
-
 QTEST_MAIN(TextHandlerTest)
 #include "texthandlertest.moc"
--- a/autotests/timelinemessagemodeltest.cpp
+++ b/autotests/timelinemessagemodeltest.cpp
@@ -161,7 +161,7 @@ void TimelineMessageModelTest::pendingEvent()
    // different every time.
    QFile testSyncFile;
    testSyncFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + u"test-pending-sync.json"_s);
-    QVERIFY(testSyncFile.open(QIODevice::ReadOnly));
+    testSyncFile.open(QIODevice::ReadOnly);
    auto testSyncJson = QJsonDocument::fromJson(testSyncFile.readAll());
    auto root = testSyncJson.object();
    auto timeline = root["timeline"_L1].toObject();
--- a/cmake/Flatpak.cmake
+++ b/cmake/Flatpak.cmake
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+# SPDX-License-Identifier: BSD-2-Clause
+
+include(GNUInstallDirs)
+
+# Include FontConfig config which uses the Emoji One font from the
+# KDE Flatpak SDK.
+install(
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Flatpak/99-noto-mono-color-emoji.conf
+    DESTINATION
+        ${CMAKE_INSTALL_SYSCONFDIR}/fonts/local.conf
+)
+
--- a/cmake/Flatpak/99-noto-mono-color-emoji.conf
+++ b/cmake/Flatpak/99-noto-mono-color-emoji.conf
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>Noto Color Emoji</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Noto Color Emoji</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>Noto Color Emoji</family>
+    </prefer>
+  </alias>
+</fontconfig>
+
--- a/memorytests/CMakeLists.txt
+++ b/memorytests/CMakeLists.txt
@@ -3,12 +3,12 @@

 add_definitions(-DDATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}" )

-qt_add_executable(timeline_memtest
+qt_add_executable(timeline-memtest
    main.cpp
 )

-target_link_libraries(timeline_memtest PRIVATE neochatplugin Timelineplugin)
-target_link_libraries(timeline_memtest PUBLIC
+target_link_libraries(timeline-memtest PRIVATE neochatplugin Timelineplugin)
+target_link_libraries(timeline-memtest PUBLIC
    Qt::Core
    Qt::Quick
    Qt::Qml
@@ -16,13 +16,14 @@ target_link_libraries(timeline_memtest PUBLIC
    Qt::QuickControls2
    Qt::Widgets
    KF6::I18nQml
+    KF6::Kirigami
    QuotientQt6
    LibNeoChat
    Timeline
 )

-ecm_add_qml_module(timeline_memtest URI org.kde.neochat.timeline_memtest GENERATE_PLUGIN_SOURCE
-    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/timeline_memtest
+ecm_add_qml_module(timeline-memtest URI org.kde.neochat.timeline-memtest GENERATE_PLUGIN_SOURCE
+    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/timeline-memtest
    QML_FILES
        Main.qml
    SOURCES
--- a/memorytests/main.cpp
+++ b/memorytests/main.cpp
@@ -28,7 +28,7 @@ int main(int argc, char **argv)
    engine.rootContext()->setContextProperty(u"memTestTimelineModel"_s, memTestTimelineModel);
    engine.rootContext()->setContextProperty(u"messageFilterModel"_s, messageFilterModel);

-    engine.loadFromModule("org.kde.neochat.timeline_memtest", "Main");
+    engine.loadFromModule("org.kde.neochat.timeline-memtest", "Main");

    return app.exec();
 }
--- a/memorytests/memtesttimelinemodel.h
+++ b/memorytests/memtesttimelinemodel.h
@@ -37,11 +37,7 @@ public:
        if (!syncFileName.isEmpty()) {
            QFile testSyncFile;
            testSyncFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + syncFileName);
-            auto ok = testSyncFile.open(QIODevice::ReadOnly);
-            if (!ok) {
-                qWarning() << "Failed to open" << testSyncFile.fileName() << testSyncFile.errorString();
-            }
-
+            testSyncFile.open(QIODevice::ReadOnly);
            auto testSyncJson = QJsonDocument::fromJson(testSyncFile.readAll()).object();
            auto timelineJson = testSyncJson["timeline"_L1].toObject();
            timelineJson["events"_L1] = multiplyEvents(timelineJson["events"_L1].toArray(), 100);
--- a/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
@@ -41,7 +41,6 @@
  <name xml:lang="pl">NeoChat</name>
  <name xml:lang="pt">NeoChat</name>
  <name xml:lang="pt-BR">NeoChat</name>
-  <name xml:lang="ro">NeoChat</name>
  <name xml:lang="ru">NeoChat</name>
  <name xml:lang="sa">नवचैट्</name>
  <name xml:lang="sk">NeoChat</name>
@@ -50,6 +49,7 @@
  <name xml:lang="ta">நியோச்சாட்</name>
  <name xml:lang="tr">NeoChat</name>
  <name xml:lang="uk">NeoChat</name>
+  <name xml:lang="x-test">xxNeoChatxx</name>
  <name xml:lang="zh-CN">NeoChat</name>
  <name xml:lang="zh-TW">NeoChat</name>
  <summary>Chat on Matrix</summary>
@@ -75,8 +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="ro">Discutați pe Matrix</summary>
  <summary xml:lang="ru">Общение в Matrix</summary>
  <summary xml:lang="sa">Matrix इत्यत्र गपशपं कुर्वन्तु</summary>
  <summary xml:lang="sl">Klepet na Matrixu</summary>
@@ -84,6 +82,7 @@
  <summary xml:lang="ta">மேட்ரிக்ஸுக்கான உரையாடல் செயலி</summary>
  <summary xml:lang="tr">Matrix Üzerinde Sohbet</summary>
  <summary xml:lang="uk">Спілкування у Matrix</summary>
+  <summary xml:lang="x-test">xxChat on Matrixxx</summary>
  <summary xml:lang="zh-TW">在 Matrix 上聊天</summary>
  <description>
    <p>NeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.</p>
@@ -110,17 +109,16 @@
    <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="ro">NeoChat e o aplicație de discuții ce vă ajută să profitați din plin de rețeaua Matrix. Aceasta oferă o modalitate sigură de a trimite mesaje textuale, videoclipuri și fișiere audio familiei, colegilor și prietenilor.</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>
    <p xml:lang="sv">NeoChat är ett chattprogram som låter dig dra full nytta av Matrix-nätverket. Det ger dig ett säkert sätt att skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner.</p>
    <p xml:lang="tr">NeoChat, Matrix ağının tüm özelliklerini kullanan bir sohbet uygulamasıdır. Ailenize, arkadaşlarınıza ve iş arkadaşlarınıza metin iletileri, ses ve video dosyaları göndermenin kolay bir yolunu sunar.</p>
    <p xml:lang="uk">NeoChat є програмою для спілкування, за допомогою якої ви можете скористатися усіма перевагами мережі Matrix. За її допомогою ви можете безпечно надсилати текстові повідомлення, відео та звукові файли вашим родичам, колегам та друзям.</p>
+    <p xml:lang="x-test">xxNeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.xx</p>
    <p xml:lang="zh-TW">NeoChat 是一個讓您能夠完全利用 Matrix 網路的聊天應用程式。它讓您安全地傳送文字訊息、影片或音訊檔給家人、同事或朋友等等。</p>
    <p>NeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.</p>
-    <p xml:lang="ar">يهدف نيوتشات إلى أن يكون تطبيقًا كامل الميزات لمواصفات ماتركس. يوفر نيوتشات كل شيء في المواصفات المستقرة الحالية مع الاستثناءات الملحوظة لـ VoIP و تعدد الخيوط وبعض جوانب التعمية من طرف إلى طرف. هناك عدد قليل من الإغفالات الصغيرة الأخرى بسبب حقيقة أن مواصفات ماتركس تتطور باستمرار، ولكن يبقى الهدف توفير تطبيق للمواصفات بأكملها.</p>
+    <p xml:lang="ar">يهدف نيوتشات إلى أن يكون تطبيقًا كامل الميزات لمواصفات ماتركس. على هذا النحو يتم دعم كل شيء في المواصفات المستقرة الحالية مع الاستثناءات الملحوظة لـ VoIP والخيوط وبعض جوانب التشفير من طرف إلى طرف. هناك عدد قليل من الإغفالات الصغيرة الأخرى بسبب حقيقة أن مواصفات ماتركس تتطور باستمرار ، ولكن يبقى الهدف توفير الدعم النهائي للمواصفات بأكملها.</p>
    <p xml:lang="ca">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de la VoIP, fils i alguns aspectes de l'encriptatge d'extrem a extrem. Hi ha algunes altres omissions més petites a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu segueix sent proporcionar suport eventual per a tota l'especificació.</p>
    <p xml:lang="ca-valencia">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de la VoIP, fils i alguns aspectes de l'encriptació d'extrem a extrem. Hi ha algunes altres omissions més xicotetes a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu seguix sent proporcionar suport eventual per a tota l'especificació.</p>
    <p xml:lang="de">NeoChat versucht eine vollumfängliche Anwendung für die Spezifikation von Matrix zu sein. Damit wird alles der aktuellen stabilen Spezifikation mit den erwähnenswerten Ausnahmen von VoIP, Diskussionsfäden und ein paar Teilen der Ende-zu-Ende-Verschlüsselung unterstützt. Zudem sind andere kleinere Auslassungen vorhanden, da sich die Matrixspezifikation ständig weiterentwickelt. Nichtsdestotrotz soll letztendlich die gesamte Spezifikation unterstützt werden.</p>
@@ -144,17 +142,16 @@
    <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="ro">NeoChat vrea să fie o aplicație completă pentru specificațiile Matrix. Astfel, susține tot ce se găsește acum în specificațiile stabile cu excepția VoIP, a firelor de discuții, și a unor părți din criptarea punct-la-punct. Sunt și câteva omisiuni minore din cauza faptului că specificația Matrix evoluează continuu, dar scopul rămâne acela de a implementa întreaga specificație.</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>
    <p xml:lang="sv">NeoChat har som mål att vara ett fullständigt program enligt Matrix-specifikationen. Som sådant stöds allt i den nuvarande stabila specifikationen, med de nämnvärda undantagen VoIP, trådar och några aspekter av kryptering hela vägen. Det finns några ytterligare utelämnanden på grund av att Matrix-specifikationen hela tiden utvecklas, men målet förblir att till slut erbjuda stöd för hela specifikationen.</p>
    <p xml:lang="tr">NeoChat, Matrix belirtimi için tam özellikli bir uygulama olmayı hedefler. Bu nedenle; VoIP, ileti zincirleri ve Uçtan Uca Şifreleme’nin bazı yönleri gibi dikkate değer istisnalar dışında var olan kararlı belirtimdeki her şey desteklenir. Matrix belirtiminin sürekli gelişmesi nedeniyle birkaç küçük eksiklik daha var; ancak amaç tüm belirtim için nihai destek sağlamak olmayı sürdürüyor.</p>
    <p xml:lang="uk">Метою створення NeoChat є повноцінна реалізація програми для специфікації Matrix. Як наслідок, реалізовано усе у поточній стабільній специфікації, окрім голосового інтернет-зв'язку, потоків та деяких аспектів міжвузлового шифрування. Є також декілька інших незначних прогалин через те, що специфікація Matrix постійно змінюється, але метою лишається повна підтримка специфікації.</p>
+    <p xml:lang="x-test">xxNeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.xx</p>
    <p xml:lang="zh-TW">NeoChat 以完整支援 Matrix 標準為目標，因此目前穩定版標準除了 VoIP、對話串與端對端加密的某些部分以外的所有部分都有支援。其他部分還有一些較小的不支援的部分，這是因為 Matrix 標準隨時都在改進，但目標仍然時最終提供整個標準的完整支援。</p>
    <p>Due to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:</p>
-    <p xml:lang="ar">نظرًا لطبيعة تطوير مواصفات ماتركس، يوفر نيوتشات أيضًا العديد من الميزات غير المستقرة وهي:</p>
+    <p xml:lang="ar">نظرًا لطبيعة تطوير مواصفات ماتركس، يدعم نيوتشات أيضًا العديد من الميزات غير المستقرة وهي:</p>
    <p xml:lang="ca">A causa de la naturalesa del desenvolupament de l'especificació de Matrix, el NeoChat també implementa nombroses característiques inestables. Actualment són:</p>
    <p xml:lang="ca-valencia">A causa de la naturalea del desenvolupament de l'especificació de Matrix, NeoChat també implementa nombroses característiques inestables. Actualment són:</p>
    <p xml:lang="de">Durch die Weiterentwicklung der Matrix-Spezifikation unterstützt auch NeoChat einige als noch instabil gekennzeichnete Funktionen. Derzeit sind das:</p>
@@ -178,8 +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="ro">Datorită modului de dezvoltare a specificațiilor Matrix, NeoChat susține și numeroase caracteristici nestabile. Acum, acestea sunt:</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>
@@ -187,12 +182,13 @@
    <p xml:lang="ta">மேட்ரிக்ஸு நெறிமுறை வரையறுக்கப்படும் வித‍த்தின் காரணமாக, பல நிலையற்ற அம்சங்களையும் நியோச்சாட் ஆதரிக்கிறது. தற்போது ஆதரிக்கப்படுபவை:</p>
    <p xml:lang="tr">NeoChat, Matrix belirtimi geliştirmesinin doğası gereği çok sayıda kararsız özelliği de destekler. Şu anda bunlar:</p>
    <p xml:lang="uk">Через природу розробки специфікації Matrix, у NeoChat також передбачено підтримку численних нестабільних можливостей. У поточній версії цими можливостями є:</p>
+    <p xml:lang="x-test">xxDue to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:xx</p>
    <p xml:lang="zh-TW">由於 Matrix 標準的開發流程的緣故，NeoChat 也支援數個非穩定版的功能。目前這些功能是：</p>
    <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,8 +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="ro">Sondaje - MSC3381</li>
      <li xml:lang="ru">Голосования — MSC3381</li>
      <li xml:lang="sa">मतदान - MSC3381</li>
      <li xml:lang="sl">Polls - MSC3381</li>
@@ -222,6 +216,7 @@
      <li xml:lang="ta">வாக்கெடுப்புகள் - MSC3381</li>
      <li xml:lang="tr">Anketler — MSC3381</li>
      <li xml:lang="uk">Опитування - MSC3381</li>
+      <li xml:lang="x-test">xxPolls - MSC3381xx</li>
      <li xml:lang="zh-TW">投票 - MSC3381</li>
      <li>Sticker Packs - MSC2545</li>
      <li xml:lang="ar">حزم الملصقات - MSC2545</li>
@@ -247,8 +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="ro">Colecții de abțibilduri - MSC2545</li>
      <li xml:lang="ru">Наборы стикеров — MSC2545</li>
      <li xml:lang="sa">स्टिकर पैक - MSC2545</li>
      <li xml:lang="sl">Sticker Packs - MSC2545</li>
@@ -256,6 +249,7 @@
      <li xml:lang="ta">ஒட்டி தொகுப்புகள் - MSC2545</li>
      <li xml:lang="tr">Çıkartma Paketleri — MSC2545</li>
      <li xml:lang="uk">Пакунки наліпок - MSC2545</li>
+      <li xml:lang="x-test">xxSticker Packs - MSC2545xx</li>
      <li xml:lang="zh-TW">貼圖包 - MSC2545</li>
      <li>Location Events - MSC3488</li>
      <li xml:lang="ar">موقع الأحداث - MSC3488</li>
@@ -281,8 +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="ro">Evenimente de amplasare - MSC3488</li>
      <li xml:lang="ru">События местоположения — MSC3488</li>
      <li xml:lang="sa">स्थान घटनाएँ - MSC3488</li>
      <li xml:lang="sl">Location Events - MSC3488</li>
@@ -290,6 +282,7 @@
      <li xml:lang="ta">இட நிகழ்வுகள் - MSC3488</li>
      <li xml:lang="tr">Konum Etkinlikleri — MSC3488</li>
      <li xml:lang="uk">Місцеві зустрічі - MSC3488</li>
+      <li xml:lang="x-test">xxLocation Events - MSC3488xx</li>
      <li xml:lang="zh-TW">位置事件 - MSC3488</li>
    </ul>
  </description>
@@ -306,8 +299,8 @@
    <keyword>Matrix</keyword>
    <keyword>Kirigami</keyword>
  </keywords>
-  <developer id="org.kde">
-    <name translate="no">KDE</name>
+  <developer id="kde.org">
+    <name>The KDE Community</name>
    <url>https://kde.org</url>
  </developer>
  <metadata_license>CC0-1.0</metadata_license>
@@ -320,6 +313,7 @@
    <value key="KDE::windows_store::StoreLogoSquare">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/storelogo-1080x1080.png</value>
    <value key="KDE::windows_store::Icon">https://invent.kde.org/network/neochat/-/raw/master/icons/300-apps-neochat.png</value>
    <value key="KDE::windows_store::PromotionalArt16x9">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/promoimage-1920x1080.png</value>
+    <value key="KDE::supporters">Tanguy Fardet;[dabe](https://freeradical.zone/@dabe);[lengau](https://mastodon.world/@lengau);Joshua Strobl;Stuart Turton</value>
  </custom>
  <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
  <screenshots>
@@ -350,8 +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="ro">Vederea principală cu lista de camere, discuție, și informații despre cameră</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>
@@ -359,6 +351,7 @@
      <caption xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</caption>
      <caption xml:lang="tr">Oda listesini, sohbet penceresini ve oda bilgisini gösteren ana görünüm</caption>
      <caption xml:lang="uk">Головна панель із списком кімнат, спілкуванням та даними щодо кімнати</caption>
+      <caption xml:lang="x-test">xxMain view with room list, chat, and room informationxx</caption>
      <caption xml:lang="zh-TW">主頁面，包含聊天室列表、聊天內容，與聊天室資訊</caption>
    </screenshot>
    <screenshot type="default">
@@ -387,8 +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="ro">Descoperiți comunități noi cu Spații 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>
@@ -396,6 +387,7 @@
      <caption xml:lang="ta">மேட்ரிக்ஸு இடங்களின் மூலம் புதிய சமூகங்களைக் கண்டுபிடிக்கலாம்</caption>
      <caption xml:lang="tr">Matrix Alanlar ile yeni topluluklar keşfedin</caption>
      <caption xml:lang="uk">Пошук нових спільнот за допомогою Matrix Spaces</caption>
+      <caption xml:lang="x-test">xxDiscover new communities with Matrix Spacesxx</caption>
      <caption xml:lang="zh-TW">利用 Matrix 聊天空間發現新的社群</caption>
    </screenshot>
    <!--
@@ -432,8 +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="ro">Vederea principală cu lista de camere, discuție, și informații despre cameră</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>
@@ -441,6 +431,7 @@
      <caption xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</caption>
      <caption xml:lang="tr">Oda listesini, sohbet penceresini ve oda bilgisini gösteren ana görünüm</caption>
      <caption xml:lang="uk">Головна панель із списком кімнат, спілкуванням та даними щодо кімнати</caption>
+      <caption xml:lang="x-test">xxMain view with room list, chat, and room informationxx</caption>
      <caption xml:lang="zh-TW">主頁面，包含聊天室列表、聊天內容，與聊天室資訊</caption>
    </screenshot>
    <screenshot environment="windows">
@@ -471,8 +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="ro">Ecran de autentificare</caption>
      <caption xml:lang="ru">Окно входа</caption>
      <caption xml:lang="sa">लॉगिन् स्क्रीन</caption>
      <caption xml:lang="sl">Prijavni zaslon</caption>
@@ -480,6 +469,7 @@
      <caption xml:lang="ta">நுழைவுத் திரை</caption>
      <caption xml:lang="tr">Oturum açma ekranı</caption>
      <caption xml:lang="uk">Вікно входу</caption>
+      <caption xml:lang="x-test">xxLogin screenxx</caption>
      <caption xml:lang="zh-TW">登入畫面</caption>
    </screenshot>
  </screenshots>
@@ -487,11 +477,6 @@
    <content_attribute id="social-chat">intense</content_attribute>
  </content_rating>
  <releases>
-    <release version="25.12.0" date="2025-12-11"/>
-    <release version="25.08.3" date="2025-11-06"/>
-    <release version="25.08.2" date="2025-10-09"/>
-    <release version="25.08.1" date="2025-09-11"/>
-    <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"/>
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -44,6 +44,7 @@ Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[tr]=NeoChat
 Name[uk]=NeoChat
+Name[x-test]=xxNeoChatxx
 Name[zh_CN]=NeoChat
 Name[zh_TW]=NeoChat
 GenericName=Matrix Client
@@ -87,6 +88,7 @@ GenericName[sv]=Matrix-klient
 GenericName[ta]=Matrix வாங்கி
 GenericName[tr]=Matrix İstemcisi
 GenericName[uk]=Клієнт Matrix
+GenericName[x-test]=xxMatrix Clientxx
 GenericName[zh_CN]=Matrix 客户端
 GenericName[zh_TW]=Matrix 用戶端
 Comment=Chat on Matrix
@@ -112,7 +114,6 @@ Comment[lv]=Tērzējiet „Matrix“ tīklā
 Comment[nl]=Chat op Matrix
 Comment[pl]=Rozmawiaj na Matriksie
 Comment[pt_BR]=Bate papo na Matrix
-Comment[ro]=Discutați pe Matrix
 Comment[ru]=Общение в Matrix
 Comment[sa]=Matrix इत्यत्र गपशपं कुर्वन्तु
 Comment[sl]=Klepet na Matrixu
@@ -120,6 +121,7 @@ Comment[sv]=Chatta på Matrix
 Comment[ta]=மேட்ரிக்ஸில் உரையாட உதவும்
 Comment[tr]=Matrix üzerinde sohbet edin
 Comment[uk]=Спілкування у Matrix
+Comment[x-test]=xxChat on Matrixxx
 Comment[zh_CN]=在 Matrix 上聊天
 Comment[zh_TW]=在 Matrix 上聊天
 MimeType=x-scheme-handler/matrix;
--- 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/docs/neochat/man-neochat.1.docbook
+++ b/po/pt_BR/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 % Brazilian-Portuguese "INCLUDE">
-]>
-<!--
-SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
-<refentry lang="&language;">
-<refentryinfo>
-<title
->Manual do Usuário do NeoChat</title>
-<author
-><firstname
->Carl</firstname
-><surname
->Schwan</surname
-> <contrib
->NeoChat man page.</contrib
-> <email
->carl@carlschwan.eu</email
-></author>
-<date
->01/11/2022</date>
-<releaseinfo
->22.09</releaseinfo>
-<productname
->NeoChat</productname>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>
-    <command
->neochat</command>
-  </refentrytitle>
-  <manvolnum
->1</manvolnum>
-</refmeta>
-
-<refnamediv>
-  <refname
->neochat</refname>
-  <refpurpose
->Cliente para interação com o protocolo de mensagens 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
->Descrição</title>
-  <para
->O <command
->neochat</command
-> é um aplicativo de bate-papo para o protocolo Matrix. Ele funciona tanto em computadores quanto em dispositivos móveis. </para>
-</refsect1>
-
-<refsect1 id="options"
-><title
->Opções</title>
-<variablelist>
-  <varlistentry>
-  <term
-><option
->URI</option
-></term>
-  <listitem>
-    <para
->O URI da matriz para um usuário ou uma sala. Por exemplo, matrix:u/usuário:exemplo.org e matrix:r/root:exemplo.org. Isso fará com que o NeoChat tente abrir a sala ou conversa especificada. </para>
-  </listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1 id="bug">
-  <title
->Relatar bugs</title>
-  <para
->Você pode reportar erros e solicitar novas funcionalidades em <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
->Veja também</title>
-  <simplelist>
-    <member
->Lista de perguntas frequentes sobre o 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
->Direitos autorais</title>
-<para
->Direitos autorais &copy; 2020-2022 Tobias Fella </para>
-<para
->Direitos autorais &copy; 2020-2022 Carl Schwan </para>
-<para
->Licença: GNU General Public Versão 3 ou posterior <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/pt_BR/neochat.po
+++ b/po/pt_BR/neochat.po
--- a/po/ro/neochat.po
+++ b/po/ro/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/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -48,8 +48,6 @@ if(ANDROID OR WIN32)
    set_source_files_properties(qml/GlobalMenuStub.qml PROPERTIES
            QT_QML_SOURCE_TYPENAME GlobalMenu
    )
-else()
-    set(EXTRA_IMPORTS org.kde.purpose)
 endif()

 ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
@@ -103,11 +101,9 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
        qml/ReasonDialog.qml
        qml/NewPollDialog.qml
        qml/UserMenu.qml
-        qml/MeetingDialog.qml
    DEPENDENCIES
        QtCore
        QtQuick
-        io.github.quotient_im.libquotient
    IMPORTS
        org.kde.neochat.libneochat
        org.kde.neochat.rooms
@@ -119,15 +115,13 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
        org.kde.neochat.devtools
        org.kde.neochat.login
        org.kde.neochat.chatbar
-        org.kde.config
-        org.kde.syntaxhighlighting
-        ${EXTRA_IMPORTS}
 )

 if(NOT ANDROID AND NOT WIN32)
    qt_target_qml_sources(neochat QML_FILES
        qml/ShareAction.qml
        qml/GlobalMenu.qml
+        qml/EditMenu.qml
    )
 else()
    qt_target_qml_sources(neochat QML_FILES
@@ -203,9 +197,8 @@ target_link_libraries(neochat PUBLIC
    KF6::ConfigGui
    KF6::CoreAddons
    KF6::SonnetCore
+    KF6::IconThemes
    KF6::ItemModels
-    KF6::I18nQml
-    KirigamiApp
    QuotientQt6
    Login
    Rooms
@@ -213,6 +206,10 @@ target_link_libraries(neochat PUBLIC
    Spaces
 )

+if (TARGET KF6::Crash)
+    target_link_libraries(neochat PUBLIC KF6::Crash)
+endif()
+
 kconfig_target_kcfg_file(neochat FILE neochatconfig.kcfg CLASS_NAME NeoChatConfig MUTATORS GENERATE_PROPERTIES DEFAULT_VALUE_GETTERS PARENT_IN_CONSTRUCTOR SINGLETON GENERATE_MOC QML_REGISTRATION)

 if(NEOCHAT_FLATPAK)
@@ -323,7 +320,6 @@ if(ANDROID)
        "kt-restore-defaults-symbolic"
        "user-symbolic"
        "mark-location-symbolic"
-        "amarok_playcount"

        ${KIRIGAMI_ADDONS_ICONS}
    )
@@ -342,7 +338,14 @@ if(TARGET KF6::DBusAddons AND NOT WIN32)
    target_compile_definitions(neochat PUBLIC -DHAVE_KDBUSADDONS)
 endif()

+if (TARGET KF6::KIOWidgets)
+    target_compile_definitions(neochat PUBLIC -DHAVE_KIO)
+endif()
+
 if (TARGET KUnifiedPush)
+    target_compile_definitions(neochat PUBLIC -DHAVE_KUNIFIEDPUSH)
+    target_link_libraries(neochat PUBLIC KUnifiedPush)
+
    if (NOT ANDROID)
        configure_file(org.kde.neochat.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.kde.neochat.service)
        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.neochat.service DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
@@ -352,8 +355,7 @@ endif()
 install(TARGETS neochat-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
-    # krunner plugin must be the same as the app id for flatpak to export it
-    install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins RENAME org.kde.neochat.desktop)
+    install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins)
 endif()

 if (APPLE)
--- 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,19 +14,23 @@

 #include <signal.h>

+#include <Quotient/csapi/notifications.h>
 #include <Quotient/events/roommemberevent.h>
 #include <Quotient/qt_connection_util.h>
 #include <Quotient/settings.h>

+#include "accountmanager.h"
 #include "enums/roomsortparameter.h"
-#include "general_logging.h"
 #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"
+#include "neochatconnection.h"
 #include "neochatroom.h"
+#include "notificationsmanager.h"
 #include "proxycontroller.h"
 #include "roommanager.h"

@@ -35,6 +40,14 @@
 #include "trayicon_sni.h"
 #endif

+#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
+#ifndef Q_OS_ANDROID
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusMessage>
+#endif
+#endif
+
 #ifdef HAVE_KUNIFIEDPUSH
 #include <kunifiedpush/connector.h>
 #endif
@@ -123,10 +136,8 @@ Controller::Controller(QObject *parent)
    connect(NeoChatConfig::self(), &NeoChatConfig::SystemTrayChanged, this, &Controller::setQuitOnLastWindowClosed);
 #endif

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

@@ -192,15 +203,13 @@ void Controller::setAccountManager(AccountManager *manager)

    m_accountManager = manager;

-    if (!m_accountManager) {
-        return;
+    if (m_accountManager) {
+        connect(m_accountManager, &AccountManager::errorOccured, this, &Controller::errorOccured);
+        connect(m_accountManager, &AccountManager::accountsLoadingChanged, this, &Controller::accountsLoadingChanged);
+        connect(m_accountManager, &AccountManager::connectionAdded, this, &Controller::initConnection);
+        connect(m_accountManager, &AccountManager::connectionDropped, this, &Controller::teardownConnection);
+        connect(m_accountManager, &AccountManager::activeConnectionChanged, this, &Controller::initActiveConnection);
    }
-
-    connect(m_accountManager, &AccountManager::errorOccured, this, &Controller::errorOccured);
-    connect(m_accountManager, &AccountManager::accountsLoadingChanged, this, &Controller::accountsLoadingChanged);
-    connect(m_accountManager, &AccountManager::connectionAdded, this, &Controller::initConnection);
-    connect(m_accountManager, &AccountManager::connectionDropped, this, &Controller::teardownConnection);
-    connect(m_accountManager, &AccountManager::activeConnectionChanged, this, &Controller::initActiveConnection);
 }

 void Controller::initConnection(NeoChatConnection *connection)
@@ -246,10 +255,7 @@ void Controller::initActiveConnection(NeoChatConnection *oldConnection, NeoChatC
    if (newConnection) {
        connect(newConnection, &NeoChatConnection::errorOccured, this, &Controller::errorOccured);
        connect(newConnection, &NeoChatConnection::badgeNotificationCountChanged, this, &Controller::updateBadgeNotificationCount);
-
-        // Refresh and update manually, in case we init too late for the badge count to actually change.
        newConnection->refreshBadgeNotificationCount();
-        updateBadgeNotificationCount(newConnection->badgeNotificationCount());
    }
    Q_EMIT activeConnectionChanged(newConnection);
 }
@@ -259,8 +265,8 @@ bool Controller::supportSystemTray() const
 #ifdef Q_OS_ANDROID
    return false;
 #else
-    QStringList unsupportedPlatforms{u"GNOME"_s, u"Pantheon"_s};
-    return !unsupportedPlatforms.contains(QString::fromLatin1(qgetenv("XDG_CURRENT_DESKTOP")));
+    auto de = QString::fromLatin1(qgetenv("XDG_CURRENT_DESKTOP"));
+    return de != u"GNOME"_s && de != u"Pantheon"_s;
 #endif
 }

@@ -270,8 +276,11 @@ void Controller::setQuitOnLastWindowClosed()
    if (supportSystemTray() && NeoChatConfig::self()->systemTray()) {
        m_trayIcon = new TrayIcon(this);
        m_trayIcon->show();
-    } else if (m_trayIcon) {
-        delete m_trayIcon;
+    } else {
+        if (m_trayIcon) {
+            delete m_trayIcon;
+            m_trayIcon = nullptr;
+        }
    }
 #endif
 }
@@ -309,7 +318,8 @@ void Controller::listenForNotifications()
    connect(timer, &QTimer::timeout, qGuiApp, &QGuiApplication::quit);

    connect(connector, &KUnifiedPush::Connector::messageReceived, [timer](const QByteArray &data) {
-        NotificationsManager::postPushNotification(data);
+        instance().m_notificationsManager.postPushNotification(data);
+        timer->stop();
    });

    // Wait five seconds to see if we received any messages or this happened to be an erroneous activation.
@@ -327,7 +337,30 @@ void Controller::clearInvitationNotification(const QString &roomId)

 void Controller::updateBadgeNotificationCount(int count)
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
+#ifndef Q_OS_ANDROID
+    // copied from Telegram desktop
+    const auto launcherUrl = "application://org.kde.neochat.desktop"_L1;
+    // Gnome requires that count is a 64bit integer
+    const qint64 counterSlice = std::min(count, 9999);
+    QVariantMap dbusUnityProperties;
+
+    if (counterSlice > 0) {
+        dbusUnityProperties["count"_L1] = counterSlice;
+        dbusUnityProperties["count-visible"_L1] = true;
+    } else {
+        dbusUnityProperties["count-visible"_L1] = false;
+    }
+
+    auto signal = QDBusMessage::createSignal("/com/canonical/unity/launcherentry/neochat"_L1, "com.canonical.Unity.LauncherEntry"_L1, "Update"_L1);
+
+    signal.setArguments({launcherUrl, dbusUnityProperties});
+
+    QDBusConnection::sessionBus().send(signal);
+#endif // Q_OS_ANDROID
+#else
    qGuiApp->setBadgeNumber(count);
+#endif // QT_VERSION_CHECK(6, 6, 0)
 }

 bool Controller::isFlatpak() const
@@ -348,10 +381,7 @@ QString Controller::loadFileContent(const QString &path) const
 {
    QUrl url(path);
    QFile file(url.isLocalFile() ? url.toLocalFile() : url.toString());
-    if (!file.open(QFile::ReadOnly)) {
-        qCWarning(GENERAL) << "Failed to open file" << path;
-        return {};
-    }
+    file.open(QFile::ReadOnly);
    return QString::fromLatin1(file.readAll());
 }

--- a/src/app/controller.h
+++ b/src/app/controller.h
@@ -110,9 +110,8 @@ private:
    void initActiveConnection(NeoChatConnection *oldConnection, NeoChatConnection *newConnection);

    QPointer<NeoChatConnection> m_connection;
-#ifndef Q_OS_ANDROID
-    QPointer<TrayIcon> m_trayIcon;
-#endif
+    TrayIcon *m_trayIcon = nullptr;
+
    QString m_endpoint;
    QStringList m_shownImages;

--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -33,9 +33,13 @@
 #include <KWindowSystem>
 #endif

-#include <KLocalizedQmlContext>
+#if __has_include("KCrash")
+#include <KCrash>
+#endif
+
+#include <KIconTheme>
+#include <KLocalizedContext>
 #include <KLocalizedString>
-#include <KirigamiApp>

 #include "neochat-version.h"

@@ -100,6 +104,7 @@ Q_DECL_EXPORT
 #endif
 int main(int argc, char *argv[])
 {
+    KIconTheme::initTheme();
    QNetworkProxyFactory::setUseSystemConfiguration(true);

 #ifdef HAVE_WEBVIEW
@@ -108,10 +113,24 @@ int main(int argc, char *argv[])
    QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi);
 #endif

-    KirigamiApp::App app(argc, argv);
-    KirigamiApp kirigamiApp;
+#ifdef Q_OS_ANDROID
+    QGuiApplication app(argc, argv);
+    QQuickStyle::setStyle(u"org.kde.breeze"_s);
+#else
+    QIcon::setFallbackThemeName("breeze"_L1);
+    QApplication app(argc, argv);
+    // Default to org.kde.desktop style unless the user forces another style
+    if (qEnvironmentVariableIsEmpty("QT_QUICK_CONTROLS_STYLE")) {
+        QQuickStyle::setStyle(u"org.kde.desktop"_s);
+    }
+#endif

 #ifdef Q_OS_WINDOWS
+    if (AttachConsole(ATTACH_PARENT_PROCESS)) {
+        freopen("CONOUT$", "w", stdout);
+        freopen("CONOUT$", "w", stderr);
+    }
+
    QApplication::setStyle(u"breeze"_s);
    QFont font(u"Segoe UI Emoji"_s);
    font.setPointSize(10);
@@ -158,9 +177,19 @@ int main(int argc, char *argv[])
    KAboutData::setApplicationData(about);
    QGuiApplication::setWindowIcon(QIcon::fromTheme(u"org.kde.neochat"_s));

+#if __has_include("KCrash")
+    KCrash::initialize();
+#endif
+
    Connection::setEncryptionDefault(true);
    Connection::setDirectChatEncryptionDefault(true);

+#ifdef NEOCHAT_FLATPAK
+    // Copy over the included FontConfig configuration to the
+    // app's config dir:
+    QFile::copy(u"/app/etc/fonts/conf.d/99-noto-mono-color-emoji.conf"_s, u"/var/config/fontconfig/conf.d/99-noto-mono-color-emoji.conf"_s);
+#endif
+
    ColorSchemer colorScheme;

    QCommandLineParser parser;
@@ -176,7 +205,7 @@ int main(int argc, char *argv[])
    parser.addOption(testOption);

 #ifdef HAVE_KUNIFIEDPUSH
-    QCommandLineOption dbusActivatedOption(u"dbus-activated"_s);
+    QCommandLineOption dbusActivatedOption(u"dbus-activated"_s, i18n("Internal usage only."));
    dbusActivatedOption.setFlags(QCommandLineOption::Flag::HiddenFromHelp);
    parser.addOption(dbusActivatedOption);
 #endif
@@ -190,14 +219,8 @@ int main(int argc, char *argv[])

 #ifdef HAVE_KUNIFIEDPUSH
    if (parser.isSet(dbusActivatedOption)) {
-#ifdef HAVE_KDBUSADDONS
-        // We *don't* want to use KDBusService here. I don't know why, but it makes activation super unreliable. We don't really need it anyway.
-        if (!QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.neochat"))) {
-            // Gracefully fail if NeoChat is already running
-            qWarning() << "NeoChat already running, not sending push notifications.";
-            return 0;
-        }
-#endif
+        // We want to be replaceable by the main client
+        KDBusService service(KDBusService::Replace);

 #ifdef HAVE_RUNNER
        // If we are built with KRunner and KUnifiedPush support, we need to do something special.
@@ -256,7 +279,7 @@ int main(int argc, char *argv[])
                    });
 #endif

-    KLocalization::setupLocalizedContext(&engine);
+    engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
    engine.setNetworkAccessManagerFactory(new NetworkAccessManagerFactory());

    if (parser.isSet("ignore-ssl-errors"_L1)) {
@@ -271,9 +294,7 @@ int main(int argc, char *argv[])

    engine.addImageProvider(u"blurhash"_s, new BlurhashImageProvider);

-    if (!kirigamiApp.start("org.kde.neochat", "Main", &engine)) {
-        return -1;
-    }
+    engine.loadFromModule("org.kde.neochat", "Main");

    if (!parser.positionalArguments().isEmpty() && !parser.isSet("share"_L1)) {
        RoomManager::instance().setUrlArgument(parser.positionalArguments()[0]);
--- 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/notificationsmodel.cpp
+++ b/src/app/models/notificationsmodel.cpp
@@ -58,7 +58,7 @@ QVariant NotificationsModel::data(const QModelIndex &index, int role) const
 QHash<int, QByteArray> NotificationsModel::roleNames() const
 {
    return {
-        {TextRole, "notificationText"},
+        {TextRole, "text"},
        {RoomIdRole, "roomId"},
        {AuthorName, "authorName"},
        {AuthorAvatar, "authorAvatar"},
--- 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/app/neochat.notifyrc
+++ b/src/app/neochat.notifyrc
@@ -42,6 +42,7 @@ Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[tr]=NeoChat
 Name[uk]=NeoChat
+Name[x-test]=xxNeoChatxx
 Name[zh_CN]=NeoChat
 Name[zh_TW]=NeoChat
 DesktopEntry=org.kde.neochat
@@ -86,6 +87,7 @@ Comment[sv]=En klient för matrix, det decentraliserade kommunikationsprotokolle
 Comment[ta]=மையமில்லா தகவல் பரிமாற்ற நெறிமுறையான மேட்ரிக்ஸுக்கான செயலி
 Comment[tr]=Merkezi olmayan iletişim protokolü Matrix için bir istemci
 Comment[uk]=Клієнт matrix, децентралізованого протоколу обміну даними
+Comment[x-test]=xxA client for matrix, the decentralized communication protocolxx
 Comment[zh_CN]=分布式通讯协议 Matrix 的客户端
 Comment[zh_TW]=去中心化通訊協定 Matrix 的用戶端

@@ -132,6 +134,7 @@ Name[sv]=Nytt meddelande
 Name[ta]=புதிய செய்தி
 Name[tr]=Yeni İleti
 Name[uk]=Нове повідомлення
+Name[x-test]=xxNew messagexx
 Name[zh_CN]=新消息
 Name[zh_TW]=新訊息
 Comment=There is a new message
@@ -174,6 +177,7 @@ Comment[sv]=Det finns ett nytt meddelande
 Comment[ta]=ஒரு புதிய செய்தி உள்ளது
 Comment[tr]=Yeni bir ileti var
 Comment[uk]=Надійшло нове повідомлення
+Comment[x-test]=xxThere is a new messagexx
 Comment[zh_CN]=有新消息
 Comment[zh_TW]=有新的訊息
 Action=Popup
@@ -211,7 +215,6 @@ Name[pa]=ਨਵਾਂ ਸੱਦਾ
 Name[pl]=Nowe zaproszenie
 Name[pt]=Novo Convite
 Name[pt_BR]=Novo convite
-Name[ro]=Invitație nouă
 Name[ru]=Новое приглашение
 Name[sa]=नवीन आमन्त्रणम्
 Name[sl]=Novo povabilo
@@ -219,6 +222,7 @@ Name[sv]=Ny inbjudan
 Name[ta]=புதிய அழைப்பிதழ்
 Name[tr]=Yeni Davet
 Name[uk]=Нове запрошення
+Name[x-test]=xxNew Invitationxx
 Name[zh_CN]=新邀请
 Name[zh_TW]=新邀請
 Comment=There is a new invitation to a room
@@ -253,14 +257,14 @@ Comment[pa]=ਰੂਮ ਲਈ ਨਵਾਂ ਸੱਦਾ ਹੈ
 Comment[pl]=Dostępna jest nowe zaproszenie do pokoju
 Comment[pt]=Existe um novo convite para uma sala
 Comment[pt_BR]=Existe um novo convite para uma sala
-Comment[ro]=E o nouă invitație la o cameră
 Comment[ru]=Доступно новое приглашение в комнату
 Comment[sa]=कक्षस्य नूतनं निमन्त्रणम् अस्ति
 Comment[sl]=Tam je novo povabilo v sobo
 Comment[sv]=Det finns en ny inbjudan till ett rum
 Comment[ta]=ஓர் அரங்கிற்கான புதிய அழைப்பிதழ் உள்ளது
-Comment[tr]=Bir odaya yeni bir davet var
+Comment[tr]=Bir odaya yeni bir davetiye var
 Comment[uk]=У кімнаті нове запрошення
+Comment[x-test]=xxThere is a new invitation to a roomxx
 Comment[zh_CN]=有新的聊天室邀请
 Comment[zh_TW]=有新的加入聊天室邀請
 Action=Popup
@@ -292,7 +296,6 @@ Name[nl]=Gedeelde
 Name[nn]=Del
 Name[pl]=Udostępnij
 Name[pt_BR]=Compartilhar
-Name[ro]=Partajare
 Name[ru]=Публикация
 Name[sa]=संविभागः
 Name[sl]=Deli
@@ -300,6 +303,7 @@ Name[sv]=Dela
 Name[ta]=பகிர்
 Name[tr]=Paylaş
 Name[uk]=Оприлюднення
+Name[x-test]=xxSharexx
 Name[zh_CN]=分享
 Name[zh_TW]=分享
 Comment=The result of sharing a piece of content
@@ -327,7 +331,6 @@ Comment[nl]=Het resultaat van het delen van een stukje inhoud
 Comment[nn]=Resultatet av deling av innhald
 Comment[pl]=Wynik udostępniania kawałka treści
 Comment[pt_BR]=O resultado de compartilhar um conteúdo
-Comment[ro]=Rezultatul partajării unei bucăți de conținut
 Comment[ru]=Результат публикации данных
 Comment[sa]=सामग्रीखण्डस्य साझाकरणस्य परिणामः
 Comment[sl]=Rezultat deljenega kosa vsebine
@@ -335,6 +338,7 @@ Comment[sv]=Resultatet av att dela innehåll
 Comment[ta]=எதையோ பகிர்ந்த‍தன் விளைவு
 Comment[tr]=Bir parça içerik paylaşımının sonucu
 Comment[uk]=Результат оприлюднення даних
+Comment[x-test]=xxThe result of sharing a piece of contentxx
 Comment[zh_CN]=分享一个内容得到的结果
 Comment[zh_TW]=分享一份內容之後的結果
 Action=Popup
--- a/src/app/neochatconfig.kcfg
+++ b/src/app/neochatconfig.kcfg
@@ -66,10 +66,6 @@
    </entry>
  </group>
  <group name="Timeline">
-    <entry name="FontScale" type="double">
-      <label>Scaling factor for font sizes</label>
-      <default>1.0</default>
-    </entry>
    <entry name="ShowAvatarInTimeline" type="bool">
      <label>Show avatar in the timeline</label>
      <default>true</default>
@@ -193,10 +189,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>
@@ -211,6 +203,10 @@
      <label>Enable threads</label>
      <default>false</default>
    </entry>
+    <entry name="SecretBackup" type="bool">
+      <label>Enable secret backup</label>
+      <default>false</default>
+    </entry>
    <entry name="Phone3PId" type="bool">
      <label>Enable add phone numbers as 3PIDs</label>
      <default>false</default>
--- a/src/app/notificationsmanager.cpp
+++ b/src/app/notificationsmanager.cpp
@@ -60,8 +60,9 @@ void NotificationsManager::startNotificationJob(QPointer<NeoChatConnection> conn
    }

    if (!m_connActiveJob.contains(connection->user()->id())) {
+        auto job = connection->callApi<GetNotificationsJob>();
        m_connActiveJob.append(connection->user()->id());
-        connection->callApi<GetNotificationsJob>().onResult([this, connection](const auto &job) {
+        connect(job, &BaseJob::success, this, [this, job, connection]() {
            m_connActiveJob.removeAll(connection->user()->id());
            processNotificationJob(connection, job, !m_oldNotifications.contains(connection->user()->id()));
        });
@@ -388,7 +389,7 @@ void NotificationsManager::postPushNotification(const QByteArray &message)

 #ifdef HAVE_KIO
        auto openAction = notification->addAction(i18n("Open NeoChat"));
-        connect(openAction, &KNotificationAction::activated, notification, [=]() {
+        connect(openAction, &KNotificationAction::activated, this, [=]() {
            QString properId = roomId;
            properId = properId.replace(u"#"_s, QString());
            properId = properId.replace(u"!"_s, QString());
@@ -402,6 +403,8 @@ void NotificationsManager::postPushNotification(const QByteArray &message)
        connect(notification, &KNotification::closed, qGuiApp, &QGuiApplication::quit);

        notification->sendEvent();
+
+        m_notifications.insert(roomId, {json["ts"_L1].toVariant().toLongLong(), notification});
    } else {
        qWarning() << "Skipping unsupported push notification" << type;
    }
@@ -430,7 +433,7 @@ QPixmap NotificationsManager::createNotificationImage(const QImage &icon, NeoCha

    if (room != nullptr) {
        const QImage roomAvatar = room->avatar(imageRect.width(), imageRect.height());
-        if (!roomAvatar.isNull() && icon != roomAvatar) {
+        if (icon != roomAvatar) {
            const QRect lowerQuarter{imageRect.center(), imageRect.size() / 2};

            painter.setBrush(Qt::white);
--- a/src/app/notificationsmanager.h
+++ b/src/app/notificationsmanager.h
@@ -53,7 +53,7 @@ public:
    /**
     * @brief Display a native notification for the given push notification.
     */
-    static void postPushNotification(const QByteArray &message);
+    void postPushNotification(const QByteArray &message);

    /**
     * @brief Handle the notifications for the given connection.
--- a/src/app/plasma-runner-neochat.desktop
+++ b/src/app/plasma-runner-neochat.desktop
@@ -43,6 +43,7 @@ Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[tr]=NeoChat
 Name[uk]=NeoChat
+Name[x-test]=xxNeoChatxx
 Name[zh_CN]=NeoChat
 Name[zh_TW]=NeoChat
 Comment=Find rooms in NeoChat
@@ -75,7 +76,6 @@ Comment[nn]=Finn rom i NeoChat
 Comment[pl]=Znajdź pokoje w NeoChat
 Comment[pt]=Procurar salas no NeoChat
 Comment[pt_BR]=Encontrar salas no NeoChat
-Comment[ro]=Găsește camere în NeoChat
 Comment[ru]=Поиск комнат NeoChat
 Comment[sa]=NeoChat इत्यत्र कक्ष्याः अन्वेषणं कुर्वन्तु
 Comment[sl]=Najdi sobe v NeoChatu
@@ -83,6 +83,7 @@ Comment[sv]=Sök efter rum i NeoChat
 Comment[ta]=நியோச்சாட்டில் அரங்குகளை கண்டுபிடிக்கும்
 Comment[tr]=NeoChat’te odalar bulun
 Comment[uk]=Пошук кімнат у NeoChat
+Comment[x-test]=xxFind rooms in NeoChatxx
 Comment[zh_CN]=在 NeoChat 查找聊天室
 Comment[zh_TW]=在 NeoChat 尋找聊天室
 X-KDE-ServiceTypes=Plasma/Runner
@@ -92,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,16 +1,16 @@
 // 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

 import org.kde.neochat
 import org.kde.neochat.settings
+import org.kde.neochat.devtools

 KirigamiComponents.ConvergentContextMenu {
    id: root
@@ -18,17 +18,21 @@ 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();
        }
    }

@@ -36,27 +40,26 @@ KirigamiComponents.ConvergentContextMenu {
        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, {
+        onTriggered: accountSwitchDialog.createObject(QQC2.Overlay.overlay, {
            connection: root.connection
-        }) as Kirigami.Dialog).open();
+        }).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});
    }

-    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');
@@ -64,10 +67,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"),
@@ -79,15 +82,15 @@ KirigamiComponents.ConvergentContextMenu {
    Kirigami.Action {
        text: i18nc("@action:inmenu", "Open Secret Backup")
        icon.name: "unlock"
+        visible: NeoChatConfig.secretBackup
        onTriggered: root.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UnlockSSSSDialog'), {}, {
            title: i18nc("@title:window", "Open Key Backup")
        })
    }

-    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, {
@@ -96,17 +99,19 @@ KirigamiComponents.ConvergentContextMenu {
                standardButtons: Kirigami.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
@@ -1,10 +1,7 @@
 // SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-or-later

-pragma ComponentBehavior: Bound
-
 import QtQuick
-import QtQuick.Controls as QQC2
 import QtQuick.Layouts

 import org.kde.kirigami as Kirigami
@@ -19,6 +16,8 @@ Kirigami.Dialog {

    required property NeoChatConnection connection

+    parent: applicationWindow().overlay
+
    leftPadding: 0
    rightPadding: 0
    topPadding: 0
@@ -26,7 +25,7 @@ Kirigami.Dialog {

    standardButtons: Kirigami.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) {
@@ -54,14 +53,14 @@ Kirigami.Dialog {
            }
            text: i18nc("@button: login to or register a new account.", "Add Account")
            contentItem: Delegates.SubtitleContentItem {
-                itemDelegate: addDelegate
-                subtitle: i18nc("@info", "Log in or create a new account")
+                itemDelegate: parent
+                subtitle: i18n("Log in or create a new account")
                labelItem.textFormat: Text.PlainText
                subtitleItem.textFormat: Text.PlainText
            }

            onClicked: {
-                ((root.QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat.login', 'WelcomePage'), {}, {
+                pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.login', 'WelcomePage'), {}, {
                    title: i18nc("@title:window", "Login")
                });
                root.close();
@@ -95,8 +94,8 @@ Kirigami.Dialog {
                accountView.decrementCurrentIndex();
            }
        }
-        Keys.onEnterPressed: ((accountView.currentItem ?? accountView.footerItem) as Delegates.RoundedItemDelegate).clicked()
-        Keys.onReturnPressed: ((accountView.currentItem ?? accountView.footerItem) as Delegates.RoundedItemDelegate).clicked()
+        Keys.onEnterPressed: accountView.currentItem.clicked()
+        Keys.onReturnPressed: accountView.currentItem.clicked()

        onVisibleChanged: {
            for (let i = 0; i < accountView.count; i++) {
--- a/src/app/qml/AskDirectChatConfirmation.qml
+++ b/src/app/qml/AskDirectChatConfirmation.qml
@@ -6,6 +6,8 @@ import QtQuick.Controls as QQC2

 import org.kde.kirigami as Kirigami

+import org.kde.neochat
+
 Kirigami.Dialog {
    id: root

@@ -18,7 +20,7 @@ Kirigami.Dialog {
    title: i18nc("@title:dialog", "Start a chat")

    contentItem: QQC2.Label {
-        text: i18nc("@info", "Do you want to start a chat with %1?", root.user.displayName)
+        text: i18n("Do you want to start a chat with %1?", root.user.displayName)
        textFormat: Text.PlainText
        wrapMode: Text.Wrap
        horizontalAlignment: Qt.AlignHCenter
--- 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;
                });
            }
@@ -58,18 +58,14 @@ ColumnLayout {
        QQC2.ToolButton {
            id: cancelAttachmentButton
            display: QQC2.AbstractButton.IconOnly
-            text: i18nc("@action:button", "Cancel sending attachment")
-            icon.name: "dialog-close"
-            onClicked: root.attachmentCancelled()
-
+            action: Kirigami.Action {
+                text: i18n("Cancel sending attachment")
+                icon.name: "dialog-close"
+                onTriggered: attachmentCancelled()
+                shortcut: "Escape"
+            }
            QQC2.ToolTip.text: text
            QQC2.ToolTip.visible: hovered
-            QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
-
-            Kirigami.Action {
-                shortcut: "Escape"
-                onTriggered: cancelAttachmentButton.clicked()
-            }
        }
    }

@@ -79,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: {
@@ -118,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
--- a/src/app/qml/CodeMaximizeComponent.qml
+++ b/src/app/qml/CodeMaximizeComponent.qml
@@ -48,7 +48,7 @@ Components.AbstractMaximizeComponent {
            implicitWidth: Kirigami.Units.iconSizes.medium
            implicitHeight: Kirigami.Units.iconSizes.medium

-            name: root.author.displayName
+            name: root.author.name ?? root.author.displayName
            source: root.author.avatarUrl
            color: root.author.color
        }
@@ -57,7 +57,7 @@ Components.AbstractMaximizeComponent {
            QQC2.Label {
                id: userLabel

-                text: root.author.displayName
+                text: root.author.name ?? root.author.displayName
                color: root.author.color
                font.weight: Font.Bold
                elide: Text.ElideRight
@@ -91,7 +91,6 @@ Components.AbstractMaximizeComponent {
            color: Kirigami.Theme.textColor

            font.family: "monospace"
-            font.pointSize: Kirigami.Theme.defaultFont.pointSize * NeoChatConfig.fontScale

            Kirigami.SpellCheck.enabled: false

--- 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/EditMenu.qml
+++ b/src/app/qml/EditMenu.qml
@@ -0,0 +1,86 @@
+// SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+import Qt.labs.platform as Labs
+import QtQuick
+import QtQuick.Layouts
+
+Labs.Menu {
+    id: root
+
+    required property Item field
+
+    Labs.MenuItem {
+        enabled: root.field !== null && root.field.canUndo
+        text: i18nc("text editing menu action", "Undo")
+        shortcut: StandardKey.Undo
+        onTriggered: {
+            root.field.undo();
+            root.close();
+        }
+    }
+
+    Labs.MenuItem {
+        enabled: root.field !== null && root.field.canRedo
+        text: i18nc("text editing menu action", "Redo")
+        shortcut: StandardKey.Redo
+        onTriggered: {
+            root.field.undo();
+            root.close();
+        }
+    }
+
+    Labs.MenuSeparator {}
+
+    Labs.MenuItem {
+        enabled: root.field !== null && root.field.selectedText
+        text: i18nc("text editing menu action", "Cut")
+        shortcut: StandardKey.Cut
+        onTriggered: {
+            root.field.cut();
+            root.close();
+        }
+    }
+
+    Labs.MenuItem {
+        enabled: root.field !== null && root.field.selectedText
+        text: i18nc("text editing menu action", "Copy")
+        shortcut: StandardKey.Copy
+        onTriggered: {
+            root.field.copy();
+            root.close();
+        }
+    }
+
+    Labs.MenuItem {
+        enabled: root.field !== null && root.field.canPaste
+        text: i18nc("text editing menu action", "Paste")
+        shortcut: StandardKey.Paste
+        onTriggered: {
+            root.field.paste();
+            root.close();
+        }
+    }
+
+    Labs.MenuItem {
+        enabled: root.field !== null && root.field.selectedText !== ""
+        text: i18nc("text editing menu action", "Delete")
+        shortcut: ""
+        onTriggered: {
+            root.field.remove(root.field.selectionStart, root.field.selectionEnd);
+            root.close();
+        }
+    }
+
+    Labs.MenuSeparator {}
+
+    Labs.MenuItem {
+        enabled: root.field !== null
+        text: i18nc("text editing menu action", "Select All")
+        shortcut: StandardKey.SelectAll
+        onTriggered: {
+            root.field.selectAll();
+            root.close();
+        }
+    }
+}
--- a/src/app/qml/EmojiItem.qml
+++ b/src/app/qml/EmojiItem.qml
@@ -6,15 +6,16 @@ import QtQuick.Controls as QQC2
 import QtQuick.Layouts

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

 ColumnLayout {
    id: root

-    required property string emoji
-    required property string description
+    property alias emoji: emojiLabel.text
+    property alias description: descriptionLabel.text

    QQC2.Label {
-        text: root.emoji
+        id: emojiLabel
        Layout.fillWidth: true
        Layout.preferredWidth: Kirigami.Units.iconSizes.huge
        Layout.preferredHeight: Kirigami.Units.iconSizes.huge
@@ -24,7 +25,7 @@ ColumnLayout {
        font.pointSize: Kirigami.Theme.defaultFont.pointSize * 4
    }
    QQC2.Label {
-        text: root.description
+        id: descriptionLabel
        Layout.fillWidth: true
        verticalAlignment: Text.AlignVCenter
        horizontalAlignment: Text.AlignHCenter
--- a/src/app/qml/EmojiRow.qml
+++ b/src/app/qml/EmojiRow.qml
@@ -17,6 +17,9 @@ RowLayout {

    Repeater {
        id: repeater
-        delegate: EmojiItem {}
+        delegate: EmojiItem {
+            emoji: modelData.emoji
+            description: modelData.description
+        }
    }
 }
--- a/src/app/qml/FullScreenMap.qml
+++ b/src/app/qml/FullScreenMap.qml
@@ -17,7 +17,7 @@ ApplicationWindow {
    property real longitude: NaN
    property string asset
    property var author
-    property LiveLocationsModel liveLocationModel: null
+    property QtObject liveLocationModel: null

    flags: Qt.FramelessWindowHint | Qt.WA_TranslucentBackground
    visibility: Qt.WindowFullScreen
@@ -59,7 +59,7 @@ ApplicationWindow {

        Connections {
            target: mapView.map
-            function onCopyrightLinkActivated(link: string) {
+            function onCopyrightLinkActivated() {
                Qt.openUrlExternally(link);
            }
        }
--- a/src/app/qml/GlobalMenu.qml
+++ b/src/app/qml/GlobalMenu.qml
@@ -5,6 +5,7 @@ import Qt.labs.platform as Labs

 import QtQuick
 import QtQuick.Window
+import QtQuick.Layouts

 import org.kde.kirigami as Kirigami

@@ -15,50 +16,12 @@ Labs.MenuBar {
    id: root

    required property NeoChatConnection connection
-    required property Kirigami.ApplicationWindow appWindow

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

        Labs.MenuItem {
-            icon.name: "list-add-user"
-            text: i18nc("@action:inmenu", "Find User")
-            enabled: root.connection
-            onTriggered: root.appWindow.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage'), {
-                connection: root.connection
-            }, {
-                title: i18nc("@title", "Find User")
-            })
-        }
-        Labs.MenuItem {
-            icon.name: "system-users-symbolic"
-            text: i18nc("@action:inmenu", "Create a Room…")
-            enabled: root.connection
-            shortcut: StandardKey.New
-            onTriggered: {
-                Qt.createComponent('org.kde.neochat', 'CreateRoomDialog').createObject(root.appWindow, {
-                    connection: root.connection
-                }, {
-                    title: i18nc("@title", "Create a Room")
-                }).open();
-            }
-        }
-        Labs.MenuItem {
-            icon.name: "compass-symbolic"
-            text: i18nc("@action:inmenu", "Explore Rooms")
-            enabled: root.connection
-            onTriggered: {
-                let dialog = root.appWindow.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…")

            shortcut: StandardKey.Preferences
@@ -71,15 +34,58 @@ Labs.MenuBar {
            onTriggered: Qt.quit()
        }
    }
+    Labs.Menu {
+        title: i18nc("menu", "File")

+        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");
+                });
+            }
+        }
+    }
+    EditMenu {
+        title: i18nc("menu", "Edit")
+        field: (root.activeFocusItem instanceof TextEdit || root.activeFocusItem instanceof TextInput) ? root.activeFocusItem : null
+    }
    Labs.Menu {
        title: i18nc("menu", "View")

        Labs.MenuItem {
            icon.name: "search-symbolic"
-            enabled: root.connection
            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")
-            onTriggered: (root.appWindow as Main).quickSwitcher.open()
+            onTriggered: quickSwitcher.open()
        }
    }
    Labs.Menu {
@@ -87,8 +93,8 @@ Labs.MenuBar {

        Labs.MenuItem {
            icon.name: "view-fullscreen-symbolic"
-            text: root.appWindow.visibility === Window.FullScreen ? i18nc("menu", "Exit Full Screen") : i18nc("menu", "Enter Full Screen")
-            onTriggered: root.appWindow.visibility === Window.FullScreen ? root.appWindow.showNormal() : root.appWindow.showFullScreen()
+            text: root.visibility === Window.FullScreen ? i18nc("menu", "Exit Full Screen") : i18nc("menu", "Enter Full Screen")
+            onTriggered: root.visibility === Window.FullScreen ? root.showNormal() : root.showFullScreen()
        }
    }
    Labs.Menu {
@@ -97,12 +103,12 @@ Labs.MenuBar {
        Labs.MenuItem {
            icon.name: "help-about-symbolic"
            text: i18nc("menu", "About NeoChat")
-            onTriggered: root.appWindow.pageStack.pushDialogLayer(Qt.createComponent("org.kde.kirigamiaddons.formcard", "AboutPage"))
+            onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.kirigamiaddons.formcard", "AboutPage"))
        }
        Labs.MenuItem {
            icon.name: "kde-symbolic"
            text: i18nc("menu", "About KDE")
-            onTriggered: root.appWindow.pageStack.pushDialogLayer(Qt.createComponent("org.kde.kirigamiaddons.formcard", "AboutKDEPage"))
+            onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.kirigamiaddons.formcard", "AboutKDEPage"))
        }
    }
 }
--- a/src/app/qml/GlobalMenuStub.qml
+++ b/src/app/qml/GlobalMenuStub.qml
@@ -3,10 +3,8 @@

 import QtQuick

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

 Item {
    required property NeoChatConnection connection
-    required property Kirigami.ApplicationWindow appWindow
 }
--- a/src/app/qml/HoverLinkIndicator.qml
+++ b/src/app/qml/HoverLinkIndicator.qml
@@ -3,54 +3,29 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later

 import QtQuick
-import QtQuick.Layouts
 import QtQuick.Controls as QQC2

 import org.kde.kirigami as Kirigami

-RowLayout {
+QQC2.Control {
    id: root

    property string text

-    onTextChanged: {
-        // This is done so the text doesn't disappear for a split second while in the opacity transition
-        if (root.text.length > 0) {
-            urlLabel.text = root.text
-        }
+    visible: !root.text.startsWith("https://matrix.to/") && root.text.length > 0
+    Kirigami.Theme.colorSet: Kirigami.Theme.View
+
+    z: 20
+
+    Accessible.ignored: true
+
+    contentItem: QQC2.Label {
+        text: root.text.startsWith("https://matrix.to/") ? "" : root.text
+        elide: Text.ElideRight
+        Accessible.description: i18nc("@info screenreader", "The currently selected link")
    }

-    z: 99
-    spacing: 0
-
-    opacity: (!root.text.startsWith("https://matrix.to/") && root.text.length > 0) ? 1 : 0
-    visible: opacity > 0
-
-    Behavior on opacity {
-        OpacityAnimator {
-            duration: Kirigami.Units.shortDuration
-            easing.type: Easing.InOutQuad
-        }
-    }
-
-    QQC2.Control {
-        Kirigami.Theme.colorSet: Kirigami.Theme.View
-
-        Accessible.ignored: true
-
-        contentItem: QQC2.Label {
-            id: urlLabel
-
-            elide: Text.ElideRight
-        }
-
-        background: Kirigami.ShadowedRectangle {
-            corners.topRightRadius: Kirigami.Units.cornerRadius
-            color: Kirigami.Theme.backgroundColor
-            border {
-                color: Kirigami.ColorUtils.linearInterpolation(Kirigami.Theme.backgroundColor, Kirigami.Theme.textColor, Kirigami.Theme.frameContrast)
-                width: 1
-            }
-        }
+    background: Rectangle {
+        color: Kirigami.Theme.backgroundColor
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Carlos De Maine	bf754711e3	skip windows as one test is failing	2025-07-06 09:34:01 +10:00
Carlos De Maine	32d0f846ee	Testing for VM based CI	2025-07-06 09:15:21 +10:00