Don't store RoomMembers in unique ptrs

Causes crashes due to double-free

.contextProperties.ini

@@ -0,0 +1,2 @@
+[General]
+disableUnqualifiedAccess = "i18nc,xi18nc,i18ncp,i18n"

.craft.ini

@@ -2,7 +2,5 @@
 ; SPDX-License-Identifier: CC0-1.0
 
 [BlueprintSettings]
-kde/frameworks/extra-cmake-modules.version=master
-kde/unreleased/kirigami-addons.version=master
 kde/applications/neochat.packageAppx=True
 libs/qt.qtMajorVersion=6

.flatpak-manifest.json

@@ -2,7 +2,7 @@
     "id": "org.kde.neochat",
     "branch": "master",
     "runtime": "org.kde.Platform",
-    "runtime-version": "6.8",
+    "runtime-version": "6.9",
     "sdk": "org.kde.Sdk",
     "command": "neochat",
     "tags": [
@@ -20,8 +20,16 @@
         "--talk-name=org.kde.kwalletd5",
         "--talk-name=org.kde.StatusNotifierWatcher",
         "--talk-name=org.freedesktop.secrets",
+        "--talk-name=org.kde.kuiserver",
         "--own-name=org.kde.StatusNotifierItem-2-2"
     ],
+    "cleanup": [
+        "/include",
+        "/lib/*.a",
+        "/lib/cmake",
+        "/lib/pkgconfig",
+        "/share/ndk-modules"
+    ],
     "modules": [
         {
             "name": "kirigamiaddons",
@@ -36,6 +44,22 @@
                 }
             ]
         },
+        {
+            "name": "opencv",
+            "config-opts": [
+                "-DBUILD_TESTS=OFF",
+                "-DWITH_GTK=OFF",
+                "-DBUILD_LIST=core,imgproc"
+            ],
+            "buildsystem": "cmake-ninja",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/opencv/opencv"
+                }
+            ],
+            "builddir": true
+        },
         {
             "name": "kquickimageeditor",
             "config-opts": [
@@ -82,8 +106,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.gnome.org/sources/libsecret/0.21/libsecret-0.21.6.tar.xz",
-                    "sha256": "747b8c175be108c880d3adfb9c3537ea66e520e4ad2dccf5dce58003aeeca090",
+                    "url": "https://download.gnome.org/sources/libsecret/0.21/libsecret-0.21.7.tar.xz",
+                    "sha256": "6b452e4750590a2b5617adc40026f28d2f4903de15f1250e1d1c40bfd68ed55e",
                     "x-checker-data": {
                         "type": "gnome",
                         "name": "libsecret",
@@ -150,40 +174,23 @@
             "builddir": true
         },
         {
-            "name": "qcoro",
+            "name": "kunifiedpush",
             "buildsystem": "cmake-ninja",
+            "builddir": true,
             "config-opts": [
-                "-DQCORO_BUILD_EXAMPLES=OFF",
-                "-DBUILD_TESTING=OFF"
+                "-DENABLE_TESTING=OFF",
+                "-DKUNIFIEDPUSH_CLIENT_ONLY=ON"
             ],
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/danvratil/qcoro/archive/refs/tags/v0.11.0.tar.gz",
-                    "sha256": "9942c5b4c533192f6c5954dc6d10178b3829075e6a621b67df73f0a4b74d8297",
+                    "url": "https://download.kde.org/stable/release-service/25.08.0/src/kunifiedpush-25.08.0.tar.xz",
+                    "sha256": "846db6ffc7d93f6afea7ce0d5a9f10b52792157ceb593856542279f4197f3518",
                     "x-checker-data": {
                         "type": "anitya",
-                        "project-id": 236236,
+                        "project-id": 8763,
                         "stable-only": true,
-                        "url-template": "https://github.com/danvratil/qcoro/archive/refs/tags/v$version.tar.gz"
-                    }
-                }
-            ]
-        },
-        {
-            "name": "kunifiedpush",
-            "buildsystem": "cmake-ninja",
-            "builddir": true,
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://download.kde.org/stable/kunifiedpush/kunifiedpush-1.0.0.tar.xz",
-                    "sha256": "2ddeba21306d0307114ec50a2c38159ec62359f9fc6cdd58da30a369fbd550cf",
-                    "x-checker-data": {
-                        "type": "anitya",
-                        "project-id": 375055,
-                        "stable-only": true,
-                        "url-template": "https://download.kde.org/stable/kunifiedpush/kunifiedpush-$version.tar.xz"
+                        "url-template": "https://download.kde.org/stable/release-service/$version/src/kunifiedpush-$version.tar.xz"
                     }
                 }
             ]
@@ -199,6 +206,14 @@
                 {
                     "type": "dir",
                     "path": "."
+                },
+                {
+                    "type": "patch",
+                    "path": "patches/0001-Revert-Bump-KF6-dependency-version.patch"
+                },
+                {
+                    "type": "patch",
+                    "path": "patches/0001-Revert-Use-new-Kirigami-builtin-column-resize-handle.patch"
                 }
             ]
         }

.kde-ci.yml

@@ -43,3 +43,4 @@ Dependencies:
 Options:
   per-test-timeout: 90
   require-passing-tests-on: ['Linux', 'Android', 'FreeBSD', 'Windows']
+  run-qmllint: True

CMakeLists.txt

@@ -8,14 +8,14 @@ cmake_minimum_required(VERSION 3.16)
 
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "25")
-set(RELEASE_SERVICE_VERSION_MINOR "07")
+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.12")
-set(QT_MIN_VERSION "6.5")
+set(KF_MIN_VERSION "6.17")
+set(QT_MIN_VERSION "6.8")
 
 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
 

REUSE.toml

@@ -88,3 +88,9 @@ 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"

autotests/CMakeLists.txt

@@ -92,3 +92,15 @@ 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
+)

autotests/chatbarcachetest.cpp

@@ -6,6 +6,7 @@
 #include <QObject>
 #include <QTest>
 
+#include <QSignalSpy>
 #include <Quotient/roommember.h>
 #include <Quotient/syncdata.h>
 #include <qtestcase.h>
@@ -32,6 +33,7 @@ private Q_SLOTS:
     void noRoom();
     void badParent();
     void reply();
+    void replyMissingUser();
     void edit();
     void attachment();
 };
@@ -102,6 +104,33 @@ 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()

autotests/data/test-min-sync-extra-sync.json

@@ -0,0 +1,20 @@
+{
+  "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"
+        }
+      }
+    ]
+  }
+}

autotests/eventhandlertest.cpp

@@ -130,7 +130,8 @@ 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::UTC)).toString(u"hh:mm"_s));
+    QCOMPARE(EventHandler::timeString(room, event, u"hh:mm"_s),
+             QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::LocalTime)).toString(u"hh:mm"_s));
 
     const auto txID = room->postJson("m.room.message"_L1, event->fullJson());
     QCOMPARE(room->pendingEvents().size(), 1);

autotests/messagecontentmodeltest.cpp

@@ -10,7 +10,7 @@
 #include <Quotient/roommember.h>
 #include <Quotient/syncdata.h>
 
-#include "models/messagecontentmodel.h"
+#include "models/eventmessagecontentmodel.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 = MessageContentModel(room, u"$153456789:example.org"_s);
+    auto model1 = EventMessageContentModel(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 = MessageContentModel(room, u"$153456789:example.org"_s, true);
+    auto model2 = EventMessageContentModel(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);

autotests/reactionmodeltest.cpp

@@ -9,7 +9,7 @@
 
 #include <Quotient/events/roommessageevent.h>
 
-#include "models/messagecontentmodel.h"
+#include "models/eventmessagecontentmodel.h"
 #include "testutils.h"
 
 using namespace Quotient;
@@ -21,7 +21,7 @@ class ReactionModelTest : public QObject
 private:
     Connection *connection = nullptr;
     TestUtils::TestRoom *room = nullptr;
-    MessageContentModel *parentModel;
+    EventMessageContentModel *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 MessageContentModel(room, "123456"_L1);
+    parentModel = new EventMessageContentModel(room, "123456"_L1);
 }
 
 void ReactionModelTest::basicReaction()

autotests/roommanagertest.cpp

@@ -0,0 +1,141 @@
+// 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"

autotests/server.cpp

@@ -109,98 +109,20 @@ 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) {
-                       m_invitedUsers[roomId] += QJsonDocument::fromJson(request.body()).object()[u"user_id"_s].toString();
+                       Changes changes;
+                       changes.invitations += Changes::InviteUser{
+                           .userId = QJsonDocument::fromJson(request.body()).object()[u"user_id"_s].toString(),
+                           .roomId = roomId,
+                       };
+                       m_state += changes;
                        responder.write(QJsonDocument(QJsonObject{}), QHttpServerResponder::StatusCode::Ok);
                    });
 
-    m_server.route(u"/_matrix/client/r0/sync"_s, QHttpServerRequest::Method::Get, [this](QHttpServerResponder &responder) {
-        QMap<QString, QJsonArray> stateEvents;
-
-        for (const auto &[roomId, matrixId] : m_roomsToCreate) {
-            stateEvents[roomId] += QJsonObject{
-                {u"content"_s, QJsonObject{{u"room_version"_s, u"11"_s}}},
-                {u"event_id"_s, generateEventId()},
-                {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                {u"room_id"_s, roomId},
-                {u"sender"_s, matrixId},
-                {u"state_key"_s, QString()},
-                {u"type"_s, u"m.room.create"_s},
-                {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-            };
-            stateEvents[roomId] += QJsonObject{
-                {u"content"_s, QJsonObject{{u"displayname"_s, u"User"_s}, {u"membership"_s, u"join"_s}}},
-                {u"event_id"_s, generateEventId()},
-                {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                {u"room_id"_s, roomId},
-                {u"sender"_s, matrixId},
-                {u"state_key"_s, matrixId},
-                {u"type"_s, u"m.room.member"_s},
-                {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-            };
-        }
-        m_roomsToCreate.clear();
-        for (const auto &roomId : m_invitedUsers.keys()) {
-            const auto &values = m_invitedUsers[roomId];
-            for (const auto &value : values) {
-                stateEvents[roomId] += QJsonObject{
-                    {u"content"_s, QJsonObject{{u"displayname"_s, u"User"_s}, {u"membership"_s, u"invite"_s}}},
-                    {u"event_id"_s, generateEventId()},
-                    {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                    {u"room_id"_s, roomId},
-                    {u"sender"_s, u"@user:localhost:1234"_s},
-                    {u"state_key"_s, value},
-                    {u"type"_s, u"m.room.member"_s},
-                    {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-                };
-            }
-        }
-        m_invitedUsers.clear();
-
-        for (const auto &roomId : m_bannedUsers.keys()) {
-            const auto &values = m_bannedUsers[roomId];
-            for (const auto &value : values) {
-                stateEvents[roomId] += QJsonObject{
-                    {u"content"_s, QJsonObject{{u"displayname"_s, u"User"_s}, {u"membership"_s, u"ban"_s}}},
-                    {u"event_id"_s, generateEventId()},
-                    {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                    {u"room_id"_s, roomId},
-                    {u"sender"_s, u"@user:localhost:1234"_s},
-                    {u"state_key"_s, value},
-                    {u"type"_s, u"m.room.member"_s},
-                    {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-                };
-            }
-        }
-        m_bannedUsers.clear();
-
-        for (const auto &roomId : m_joinedUsers.keys()) {
-            const auto &values = m_joinedUsers[roomId];
-            for (const auto &value : values) {
-                stateEvents[roomId] += QJsonObject{
-                    {u"content"_s, QJsonObject{{u"displayname"_s, u"User"_s}, {u"membership"_s, u"join"_s}}},
-                    {u"event_id"_s, generateEventId()},
-                    {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                    {u"room_id"_s, roomId},
-                    {u"sender"_s, u"@user:localhost:1234"_s},
-                    {u"state_key"_s, value},
-                    {u"type"_s, u"m.room.member"_s},
-                    {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-                };
-            }
-        }
-        m_joinedUsers.clear();
-
-        QJsonObject rooms;
-        for (const auto &roomId : stateEvents.keys()) {
-            rooms[roomId] = QJsonObject{{u"state"_s, QJsonObject{{u"events"_s, stateEvents[roomId]}}}};
-        }
-
-        responder.write(QJsonDocument(QJsonObject{{u"rooms"_s, QJsonObject{{u"join"_s, rooms}}}}), QHttpServerResponder::StatusCode::Ok);
-    });
+    m_server.route(u"/_matrix/client/r0/sync"_s, QHttpServerRequest::Method::Get, this, &Server::sync);
 
     QSslConfiguration config;
     QFile key(QStringLiteral(DATA_DIR) + u"/localhost.key"_s);
-    key.open(QFile::ReadOnly);
+    void(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);
@@ -214,22 +136,239 @@ void Server::start()
 
 QString Server::createRoom(const QString &matrixId)
 {
-    auto roomId = generateRoomId();
-    m_roomsToCreate += {roomId, matrixId};
+    const auto roomId = generateRoomId();
+    Changes changes;
+    changes.newRooms += Changes::NewRoom{
+        .initialMembers = {matrixId},
+        .roomId = {roomId},
+        .tags = {},
+    };
+    m_state += changes;
     return roomId;
 }
 
 void Server::inviteUser(const QString &roomId, const QString &matrixId)
 {
-    m_invitedUsers[roomId] += matrixId;
+    Changes changes;
+    changes.invitations += Changes::InviteUser{
+        .userId = matrixId,
+        .roomId = roomId,
+    };
+    m_state += changes;
 }
 
 void Server::banUser(const QString &roomId, const QString &matrixId)
 {
-    m_bannedUsers[roomId] += matrixId;
+    Changes changes;
+    changes.bans += Changes::BanUser{
+        .userId = matrixId,
+        .roomId = roomId,
+    };
+    m_state += changes;
 }
 
 void Server::joinUser(const QString &roomId, const QString &matrixId)
 {
-    m_joinedUsers[roomId] += 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);
 }

autotests/server.h

@@ -2,10 +2,51 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include <QHttpServer>
+#include <QJsonObject>
 #include <QSslServer>
 
-class Server
+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
 {
+    Q_OBJECT
+
 public:
     Server();
 
@@ -21,13 +62,17 @@ 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;
 
-    QHash<QString, QList<QString>> m_invitedUsers;
-    QHash<QString, QList<QString>> m_bannedUsers;
-    QHash<QString, QList<QString>> m_joinedUsers;
+    void sync(const QHttpServerRequest &request, QHttpServerResponder &responder);
 
-    QList<std::pair<QString, QString>> m_roomsToCreate;
+    QList<Changes> m_state;
 };

autotests/servernoticestest.cpp

@@ -0,0 +1,87 @@
+// 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"

autotests/testutils.h

@@ -1,6 +1,7 @@
 // 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>
 
@@ -32,7 +33,7 @@ public:
         if (!syncFileName.isEmpty()) {
             QFile testSyncFile;
             testSyncFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + syncFileName);
-            testSyncFile.open(QIODevice::ReadOnly);
+            Q_UNUSED(testSyncFile.open(QIODevice::ReadOnly));
             const auto testSyncJson = QJsonDocument::fromJson(testSyncFile.readAll());
             Quotient::SyncRoomData roomData(id(), Quotient::JoinState::Join, testSyncJson.object());
             update(std::move(roomData));
@@ -46,7 +47,7 @@ inline Quotient::event_ptr_tt<EventT> loadEventFromFile(const QString &eventFile
     if (!eventFileName.isEmpty()) {
         QFile testEventFile;
         testEventFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + eventFileName);
-        testEventFile.open(QIODevice::ReadOnly);
+        Q_UNUSED(testEventFile.open(QIODevice::ReadOnly));
         auto testSyncJson = QJsonDocument::fromJson(testEventFile.readAll()).object();
         return Quotient::loadEvent<EventT>(testSyncJson);
     }

autotests/texthandlertest.cpp

@@ -34,6 +34,10 @@ private Q_SLOTS:
     void stripDisallowedTags();
     void stripDisallowedAttributes();
     void emptyCodeTags();
+    void addStyle_data();
+    void addStyle();
+    void dontAddStyle_data();
+    void dontAddStyle();
 
     void sendSimpleStringCase();
     void sendSingleParaMarkup();
@@ -61,6 +65,7 @@ private Q_SLOTS:
     void receiveRichStrikethrough();
     void receiveRichtextIn();
     void receiveRichMxcUrl();
+    void receiveRichPlainUrl_data();
     void receiveRichPlainUrl();
     void receiveRichEdited_data();
     void receiveRichEdited();
@@ -70,6 +75,9 @@ private Q_SLOTS:
 
     void componentOutput_data();
     void componentOutput();
+
+    void updateSpoiler_data();
+    void updateSpoiler();
 };
 
 void TextHandlerTest::initTestCase()
@@ -88,21 +96,26 @@ 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 testOutputString1 = 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());
     // 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 testOutputString2 = 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;
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString1);
 
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString1);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString1);
+    QCOMPARE(testTextHandler.handleSendText(), testOutputString1S);
+    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString1R);
 
     testTextHandler.setData(testInputString2);
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString2);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString2);
+    QCOMPARE(testTextHandler.handleSendText(), testOutputString2S);
+    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString2R);
 }
 
 void TextHandlerTest::stripDisallowedTags()
@@ -145,6 +158,56 @@ 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;
@@ -337,7 +400,8 @@ 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\">https://kde.org</a>."_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;
     QString testOutputStringPlain = u"<plain text in tag bracket>\nTest link https://kde.org."_s;
 
     // Make sure quotes are maintained in a plain string.
@@ -407,7 +471,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\">@alice:example.org</a></b>"_s;
+    const QString testOutputString = u"<b><a href=\"https://matrix.to/#/@alice:example.org\" style=\"text-decoration: none;\">@alice:example.org</a></b>"_s;
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -450,6 +514,34 @@ void TextHandlerTest::receiveRichMxcUrl()
     QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, room->messageEvents().at(0).get()), testOutputString);
 }
 
+void TextHandlerTest::receiveRichPlainUrl_data()
+{
+    QTest::addColumn<QString>("input");
+    QTest::addColumn<QString>("output");
+
+    // This is an actual link that caused trouble which is why it's so long. Keeping
+    // so we can confirm consistent behaviour for complex urls.
+    QTest::addRow("link 1")
+        << u"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s
+        << u"<a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\" 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;
+
+    // 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;
+
+    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("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;
+}
+
 /**
  * For when your rich input string has a plain text url left in.
  *
@@ -458,46 +550,13 @@ void TextHandlerTest::receiveRichMxcUrl()
  */
 void TextHandlerTest::receiveRichPlainUrl()
 {
-    // This is an actual link that caused trouble which is why it's so long. Keeping
-    // so we can confirm consistent behaviour for complex urls.
-    const QString testInputStringLink1 =
-        u"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s;
-    const QString testOutputStringLink1 =
-        u"<a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im</a> <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s;
-
-    // Another real case. The linkification wasn't handling it when a single link
-    // contains what looks like and email. It was been broken into 3 but needs to
-    // be just single link.
-    const QString testInputStringLink2 = u"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/"_s;
-    const QString testOutputStringLink2 =
-        u"<a href=\"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/\">https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/</a>"_s;
-
-    QString testInputStringEmail = uR"(email@example.com <a href="mailto:email@example.com">Link already rich</a>)"_s;
-    QString testOutputStringEmail = uR"(<a href="mailto:email@example.com">email@example.com</a> <a href="mailto:email@example.com">Link already rich</a>)"_s;
-
-    QString testInputStringMxId = u"@user:kde.org <a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a>"_s;
-    QString testOutputStringMxId =
-        u"<b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> <b><a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a></b>"_s;
-
-    QString testInputStringMxIdWithPrefix = u"a @user:kde.org b"_s;
-    QString testOutputStringMxIdWithPrefix = u"a <b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> b"_s;
+    QFETCH(QString, input);
+    QFETCH(QString, output);
 
     TextHandler testTextHandler;
-    testTextHandler.setData(testInputStringLink1);
+    testTextHandler.setData(input);
 
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringLink1);
-
-    testTextHandler.setData(testInputStringLink2);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringLink2);
-
-    testTextHandler.setData(testInputStringEmail);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringEmail);
-
-    testTextHandler.setData(testInputStringMxId);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxId);
-
-    testTextHandler.setData(testInputStringMxIdWithPrefix);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxIdWithPrefix);
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), output);
 }
 
 void TextHandlerTest::receiveRichEdited_data()
@@ -602,5 +661,35 @@ 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"

autotests/timelinemessagemodeltest.cpp

@@ -57,7 +57,7 @@ void TimelineMessageModelTest::switchEmptyRoom()
     auto firstRoom = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s);
     auto secondRoom = new TestUtils::TestRoom(connection, u"#secondRoom:kde.org"_s);
 
-    QSignalSpy spy(model, SIGNAL(roomChanged()));
+    QSignalSpy spy(model, SIGNAL(roomChanged(NeoChatRoom *, NeoChatRoom *)));
 
     QCOMPARE(model->room(), nullptr);
     model->setRoom(firstRoom);
@@ -77,7 +77,7 @@ void TimelineMessageModelTest::switchSyncedRoom()
     auto firstRoom = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s, u"test-messageventmodel-sync.json"_s);
     auto secondRoom = new TestUtils::TestRoom(connection, u"#secondRoom:kde.org"_s, u"test-messageventmodel-sync.json"_s);
 
-    QSignalSpy spy(model, SIGNAL(roomChanged()));
+    QSignalSpy spy(model, SIGNAL(roomChanged(NeoChatRoom *, NeoChatRoom *)));
 
     QCOMPARE(model->room(), nullptr);
     model->setRoom(firstRoom);
@@ -161,7 +161,7 @@ void TimelineMessageModelTest::pendingEvent()
     // different every time.
     QFile testSyncFile;
     testSyncFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + u"test-pending-sync.json"_s);
-    testSyncFile.open(QIODevice::ReadOnly);
+    QVERIFY(testSyncFile.open(QIODevice::ReadOnly));
     auto testSyncJson = QJsonDocument::fromJson(testSyncFile.readAll());
     auto root = testSyncJson.object();
     auto timeline = root["timeline"_L1].toObject();
@@ -208,7 +208,7 @@ void TimelineMessageModelTest::idToRow()
     auto room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-min-sync.json"_s);
     model->setRoom(room);
 
-    QCOMPARE(model->eventIdToRow(u"$153456789:example.org"_s), 0);
+    QCOMPARE(model->indexforEventId(u"$153456789:example.org"_s).row(), 0);
 }
 
 void TimelineMessageModelTest::cleanup()

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,14 +16,13 @@ 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

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();
 }

memorytests/memtesttimelinemodel.h

@@ -37,7 +37,11 @@ public:
         if (!syncFileName.isEmpty()) {
             QFile testSyncFile;
             testSyncFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + syncFileName);
-            testSyncFile.open(QIODevice::ReadOnly);
+            auto ok = testSyncFile.open(QIODevice::ReadOnly);
+            if (!ok) {
+                qWarning() << "Failed to open" << testSyncFile.fileName() << testSyncFile.errorString();
+            }
+
             auto testSyncJson = QJsonDocument::fromJson(testSyncFile.readAll()).object();
             auto timelineJson = testSyncJson["timeline"_L1].toObject();
             timelineJson["events"_L1] = multiplyEvents(timelineJson["events"_L1].toArray(), 100);

org.kde.neochat.appdata.xml

@@ -49,7 +49,6 @@
   <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,6 +74,7 @@
   <summary xml:lang="nl">Chat op Matrix</summary>
   <summary xml:lang="nn">Prat med via Matrix</summary>
   <summary xml:lang="pl">Rozmawiaj na Matriksie</summary>
+  <summary xml:lang="pt-BR">Bate-papo na Matrix</summary>
   <summary xml:lang="ru">Общение в Matrix</summary>
   <summary xml:lang="sa">Matrix इत्यत्र गपशपं कुर्वन्तु</summary>
   <summary xml:lang="sl">Klepet na Matrixu</summary>
@@ -82,7 +82,6 @@
   <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>
@@ -109,16 +108,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="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>
@@ -142,16 +141,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="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>
@@ -175,6 +174,7 @@
     <p xml:lang="nn">På grunn av måten Matrix-spesifikasjonen vert utvikla på, støttar NeoChat òg nokre uferdige funksjonar:</p>
     <p xml:lang="pl">Ze względu na sposób rozwoju Matriksa, NeoChat obsługuje także kilka niestabilnych możliwości. Obecnie są to:</p>
     <p xml:lang="pt">Devido à natureza do desenvolvimento da especificação do Matrix, o NeoChat também suporta diversas funcionalidades instáveis. De momento são:</p>
+    <p xml:lang="pt-BR">Devido à natureza do desenvolvimento da especificação Matrix, o NeoChat também suporta diversos recursos instáveis. Atualmente, são eles:</p>
     <p xml:lang="ru">В силу природы разработки спецификации Matrix в NeoChat тоже предусмотрена поддержка многочисленных нестабильных возможностей. В текущей версии это следующие возможности:</p>
     <p xml:lang="sa">Matrix विनिर्देशविकासस्य प्रकृतेः कारणात् NeoChat अपि अनेकानाम् अस्थिरविशेषतानां समर्थनं करोति । सम्प्रति एते सन्ति :</p>
     <p xml:lang="sl">Zaradi narave razvoja specifikacije Matrixa NeoChat podpira tudi številne nestabilne zmožnosti. Trenutno so to:</p>
@@ -182,13 +182,12 @@
     <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">Enquestes - MSC3381</li>
-      <li xml:lang="ca-valencia">Enquestes - MSC3381</li>
+      <li xml:lang="ca">Votacions - MSC3381</li>
+      <li xml:lang="ca-valencia">Votacions - MSC3381</li>
       <li xml:lang="el">Δημοσκοπήσεις - MSC3381</li>
       <li xml:lang="en-GB">Polls - MSC3381</li>
       <li xml:lang="eo">Enketoj - MSC3381</li>
@@ -209,6 +208,7 @@
       <li xml:lang="nn">Avstemmingar – MSC3381</li>
       <li xml:lang="pl">Ankiety - MSC3381</li>
       <li xml:lang="pt">Inquéritos - MSC3381</li>
+      <li xml:lang="pt-BR">Enquetes - MSC3381</li>
       <li xml:lang="ru">Голосования — MSC3381</li>
       <li xml:lang="sa">मतदान - MSC3381</li>
       <li xml:lang="sl">Polls - MSC3381</li>
@@ -216,7 +216,6 @@
       <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>
@@ -242,6 +241,7 @@
       <li xml:lang="nn">Klistremerke-pakkar – MSC2545</li>
       <li xml:lang="pl">Paczki naklejek - MSC2545</li>
       <li xml:lang="pt">Pacotes de Autocolantes - MSC2545</li>
+      <li xml:lang="pt-BR">Pacotes de Stickers - MSC2545</li>
       <li xml:lang="ru">Наборы стикеров — MSC2545</li>
       <li xml:lang="sa">स्टिकर पैक - MSC2545</li>
       <li xml:lang="sl">Sticker Packs - MSC2545</li>
@@ -249,7 +249,6 @@
       <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>
@@ -275,6 +274,7 @@
       <li xml:lang="nn">Posisjonshendingar – MSC3488</li>
       <li xml:lang="pl">Wydarzenia w miejscach - MSC3488</li>
       <li xml:lang="pt">Eventos com Localizações - MSC3488</li>
+      <li xml:lang="pt-BR">Localização de eventos - MSC3488</li>
       <li xml:lang="ru">События местоположения — MSC3488</li>
       <li xml:lang="sa">स्थान घटनाएँ - MSC3488</li>
       <li xml:lang="sl">Location Events - MSC3488</li>
@@ -282,7 +282,6 @@
       <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>
@@ -299,8 +298,8 @@
     <keyword>Matrix</keyword>
     <keyword>Kirigami</keyword>
   </keywords>
-  <developer id="kde.org">
-    <name>The KDE Community</name>
+  <developer id="org.kde">
+    <name translate="no">KDE</name>
     <url>https://kde.org</url>
   </developer>
   <metadata_license>CC0-1.0</metadata_license>
@@ -344,6 +343,7 @@
       <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
       <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
       <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="pt-BR">Visão principal com lista de salas, bate-papo e informações sobre as salas</caption>
       <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
       <caption xml:lang="sa">कक्षसूची, गपशपः, कक्षसूचना च सह मुख्यदृश्यम्</caption>
       <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
@@ -351,7 +351,6 @@
       <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">
@@ -380,6 +379,7 @@
       <caption xml:lang="nl">Ontdek nieuwe gemeenschappen met Matrix-ruimten</caption>
       <caption xml:lang="nn">Oppdag nye fellesskap med Matrix Spaces</caption>
       <caption xml:lang="pl">Odkrywaj nowe społeczności w Przestrzeniach Matriksa</caption>
+      <caption xml:lang="pt-BR">Descubra novas comunidades com os Espaços Matrix</caption>
       <caption xml:lang="ru">Поиск новых сообществ с помощью Matrix Spaces</caption>
       <caption xml:lang="sa">Matrix Spaces इत्यनेन सह नूतनानां समुदायानाम् अन्वेषणं कुर्वन्तु</caption>
       <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
@@ -387,7 +387,6 @@
       <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>
     <!--
@@ -424,6 +423,7 @@
       <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
       <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
       <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="pt-BR">Visão principal com lista de salas, bate-papo e informações sobre as salas</caption>
       <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
       <caption xml:lang="sa">कक्षसूची, गपशपः, कक्षसूचना च सह मुख्यदृश्यम्</caption>
       <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
@@ -431,7 +431,6 @@
       <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">
@@ -462,6 +461,7 @@
       <caption xml:lang="nn">Innloggingsbilete</caption>
       <caption xml:lang="pl">Ekran logowania</caption>
       <caption xml:lang="pt">Ecrã de autenticação</caption>
+      <caption xml:lang="pt-BR">Tela de login</caption>
       <caption xml:lang="ru">Окно входа</caption>
       <caption xml:lang="sa">लॉगिन् स्क्रीन</caption>
       <caption xml:lang="sl">Prijavni zaslon</caption>
@@ -469,7 +469,6 @@
       <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>
@@ -477,6 +476,10 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <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"/>
     <release version="25.04.0" date="2025-04-17"/>
     <release version="24.12.3" date="2025-03-06"/>

org.kde.neochat.desktop

@@ -44,7 +44,6 @@ 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
@@ -88,7 +87,6 @@ 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
@@ -121,7 +119,6 @@ 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;

patches/0001-Revert-Bump-KF6-dependency-version.patch

@@ -0,0 +1,28 @@
+SPDX-FileCopyrightText: 2025 Tobias Fella <tobias.fella@kde.org>
+SPDX-License-Identifier: BSD-2-Clause
+From dbd1cefd0f07a6942aef450f8f3e082aa3b1cc25 Mon Sep 17 00:00:00 2001
+From: Tobias Fella <tobias.fella@kde.org>
+Date: Sun, 17 Aug 2025 20:04:04 +0200
+Subject: [PATCH] Revert "Bump KF6 dependency version"
+
+This reverts commit 18a6ea98232b3a734905fb18eebba9cf39bf5325.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 10fe66daa..cd063113d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,7 +14,7 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
+ 
+ project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
+ 
+-set(KF_MIN_VERSION "6.17")
++set(KF_MIN_VERSION "6.12")
+ set(QT_MIN_VERSION "6.8")
+ 
+ find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
+-- 
+2.50.1
+

patches/0001-Revert-Use-new-Kirigami-builtin-column-resize-handle.patch

@@ -0,0 +1,123 @@
+SPDX-FileCopyrightText: 2025 Tobias Fella <tobias.fella@kde.org>
+SPDX-License-Identifier: BSD-2-Clause
+From ca72345b8ee550be2172d8ac5e5dc9e4c2b508c9 Mon Sep 17 00:00:00 2001
+From: Tobias Fella <tobias.fella@kde.org>
+Date: Sun, 17 Aug 2025 20:00:08 +0200
+Subject: [PATCH] Revert "Use new Kirigami builtin column resize handle"
+
+This reverts commit de97275a387abcbca6fcb185bcbd1b69c30f5c66.
+---
+ src/app/qml/Main.qml       |  1 -
+ src/rooms/RoomListPage.qml | 70 +++++++++++++++++++++++++++++---------
+ 2 files changed, 54 insertions(+), 17 deletions(-)
+
+diff --git a/src/app/qml/Main.qml b/src/app/qml/Main.qml
+index ea8955674..6eed271c1 100644
+--- a/src/app/qml/Main.qml
++++ b/src/app/qml/Main.qml
+@@ -45,7 +45,6 @@ Kirigami.ApplicationWindow {
+             showExisting: true
+             onConnectionChosen: root.load()
+         }
+-        columnView.columnResizeMode: pageStack.wideMode ? Kirigami.ColumnView.DynamicColumns : Kirigami.ColumnView.SingleColumn
+         globalToolBar.canContainHandles: true
+         globalToolBar {
+             style: Kirigami.ApplicationHeaderStyle.ToolBar
+diff --git a/src/rooms/RoomListPage.qml b/src/rooms/RoomListPage.qml
+index 2ac211fd5..f5586d789 100644
+--- a/src/rooms/RoomListPage.qml
++++ b/src/rooms/RoomListPage.qml
+@@ -17,22 +17,13 @@ import org.kde.neochat
+ Kirigami.Page {
+     id: root
+ 
+-    Kirigami.ColumnView.interactiveResizeEnabled: true
+-    Kirigami.ColumnView.minimumWidth: _private.collapsedSize + spaceDrawer.width + 1
+-    Kirigami.ColumnView.maximumWidth: _private.defaultWidth + spaceDrawer.width + 1
+-    Kirigami.ColumnView.onInteractiveResizingChanged: {
+-        if (!Kirigami.ColumnView.interactiveResizing && collapsed) {
+-            Kirigami.ColumnView.preferredWidth = root.Kirigami.ColumnView.minimumWidth;
+-        }
+-    }
+-    Kirigami.ColumnView.preferredWidth: _private.currentWidth + spaceDrawer.width + 1
+-    Kirigami.ColumnView.onPreferredWidthChanged: {
+-        if (width > _private.collapseWidth) {
+-            NeoChatConfig.collapsed = false;
+-        } else if (Kirigami.ColumnView.interactiveResizing) {
+-            NeoChatConfig.collapsed = true;
+-        }
+-    }
++    /**
++     * @brief The current width of the room list.
++     *
++     * @note Other objects can access the value but the private function makes sure
++     *       that only the internal members can modify it.
++     */
++    readonly property int currentWidth: _private.currentWidth + spaceDrawer.width + 1
+ 
+     required property NeoChatConnection connection
+ 
+@@ -40,6 +31,10 @@ Kirigami.Page {
+ 
+     signal search
+ 
++    onCurrentWidthChanged: pageStack.defaultColumnWidth = root.currentWidth
++    Component.onCompleted: pageStack.defaultColumnWidth = root.currentWidth
++
++
+     onCollapsedChanged: {
+         if (collapsed) {
+             RoomManager.sortFilterRoomTreeModel.filterText = "";
+@@ -252,6 +247,49 @@ Kirigami.Page {
+         sourceComponent: Kirigami.Settings.isMobile ? exploreComponentMobile : userInfoDesktop
+     }
+ 
++    MouseArea {
++        anchors.top: parent.top
++        anchors.bottom: parent.bottom
++        parent: applicationWindow().overlay.parent
++
++        x: root.currentWidth - width / 2
++        width: Kirigami.Units.smallSpacing * 2
++        z: root.z + 1
++        enabled: RoomManager.hasOpenRoom && applicationWindow().width >= Kirigami.Units.gridUnit * 35
++        visible: enabled
++        cursorShape: Qt.SplitHCursor
++
++        property int _lastX
++
++        onPressed: mouse => {
++            _lastX = mouse.x;
++        }
++        onPositionChanged: mouse => {
++            if (_lastX == -1) {
++                return;
++            }
++            if (mouse.x > _lastX) {
++                // we moved to the right
++                if (_private.currentWidth < _private.collapseWidth && _private.currentWidth + (mouse.x - _lastX) >= _private.collapseWidth) {
++                    // Here we get back directly to a more wide mode.
++                    _private.currentWidth = _private.defaultWidth;
++                    NeoChatConfig.collapsed = false;
++                } else if (_private.currentWidth >= _private.collapseWidth) {
++                    // Increase page width
++                    _private.currentWidth = Math.min(_private.defaultWidth, _private.currentWidth + (mouse.x - _lastX));
++                }
++            } else if (mouse.x < _lastX) {
++                const tmpWidth = _private.currentWidth - (_lastX - mouse.x);
++                if (tmpWidth < _private.collapseWidth) {
++                    _private.currentWidth = Qt.binding(() => _private.collapsedSize);
++                    NeoChatConfig.collapsed = true;
++                } else {
++                    _private.currentWidth = tmpWidth;
++                }
++            }
++        }
++    }
++
+     Component {
+         id: userInfo
+         UserInfo {
+-- 
+2.50.1
+

po/ru/docs/neochat/man-neochat.1.docbook

@@ -0,0 +1,122 @@
+<?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>

src/CMakeLists.txt

@@ -9,6 +9,7 @@ add_subdirectory(libneochat)
 add_subdirectory(login)
 add_subdirectory(rooms)
 add_subdirectory(roominfo)
+add_subdirectory(messagecontent)
 add_subdirectory(timeline)
 add_subdirectory(spaces)
 add_subdirectory(chatbar)

src/app/CMakeLists.txt

@@ -20,8 +20,6 @@ add_library(neochat STATIC
     windowcontroller.h
     models/serverlistmodel.cpp
     models/serverlistmodel.h
-    logger.cpp
-    logger.h
     models/notificationsmodel.cpp
     models/notificationsmodel.h
     proxycontroller.cpp
@@ -50,6 +48,8 @@ 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
@@ -61,9 +61,7 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/RoomPage.qml
         qml/ManualRoomDialog.qml
         qml/ExplorerDelegate.qml
-        qml/ImageEditorPage.qml
         qml/NeochatMaximizeComponent.qml
-        qml/TypingPane.qml
         qml/QuickSwitcher.qml
         qml/AttachmentPane.qml
         qml/QuickFormatBar.qml
@@ -108,23 +106,27 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
     DEPENDENCIES
         QtCore
         QtQuick
+        io.github.quotient_im.libquotient
     IMPORTS
         org.kde.neochat.libneochat
         org.kde.neochat.rooms
         org.kde.neochat.roominfo
+        org.kde.neochat.messagecontent
         org.kde.neochat.timeline
         org.kde.neochat.spaces
         org.kde.neochat.settings
         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
@@ -180,7 +182,7 @@ else()
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models)
-target_link_libraries(neochat PRIVATE Loginplugin Roomsplugin RoomInfoplugin Timelineplugin Spacesplugin Chatbarplugin Settingsplugin Devtoolsplugin)
+target_link_libraries(neochat PRIVATE Loginplugin Roomsplugin RoomInfoplugin MessageContentplugin Timelineplugin Spacesplugin Chatbarplugin Settingsplugin Devtoolsplugin)
 target_link_libraries(neochat PUBLIC
     LibNeoChat
     Timeline
@@ -205,6 +207,7 @@ target_link_libraries(neochat PUBLIC
     QuotientQt6
     Login
     Rooms
+    MessageContent
     Spaces
 )
 
@@ -340,14 +343,7 @@ 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})
@@ -359,3 +355,10 @@ install(TARGETS neochat-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins)
 endif()
+
+if (APPLE)
+    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.neochat")
+    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "NeoChat")
+    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING ${RELEASE_SERVICE_VERSION})
+    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION ${RELEASE_SERVICE_VERSION})
+endif ()

src/app/controller.cpp

@@ -5,7 +5,6 @@
 #include "controller.h"
 
 #include <Quotient/connection.h>
-#include <qt6keychain/keychain.h>
 
 #include <KLocalizedString>
 
@@ -14,17 +13,16 @@
 
 #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"
@@ -40,14 +38,6 @@
 #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
@@ -136,8 +126,10 @@ Controller::Controller(QObject *parent)
     connect(NeoChatConfig::self(), &NeoChatConfig::SystemTrayChanged, this, &Controller::setQuitOnLastWindowClosed);
 #endif
 
-    QObject::connect(QGuiApplication::instance(), &QCoreApplication::aboutToQuit, QGuiApplication::instance(), [this] {
+    connect(QGuiApplication::instance(), &QCoreApplication::aboutToQuit, QGuiApplication::instance(), [this] {
+#ifndef Q_OS_ANDROID
         delete m_trayIcon;
+#endif
         NeoChatConfig::self()->save();
     });
 
@@ -203,13 +195,15 @@ void Controller::setAccountManager(AccountManager *manager)
 
     m_accountManager = manager;
 
-    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);
+    if (!m_accountManager) {
+        return;
     }
+
+    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)
@@ -265,8 +259,8 @@ bool Controller::supportSystemTray() const
 #ifdef Q_OS_ANDROID
     return false;
 #else
-    auto de = QString::fromLatin1(qgetenv("XDG_CURRENT_DESKTOP"));
-    return de != u"GNOME"_s && de != u"Pantheon"_s;
+    QStringList unsupportedPlatforms{u"GNOME"_s, u"Pantheon"_s};
+    return !unsupportedPlatforms.contains(QString::fromLatin1(qgetenv("XDG_CURRENT_DESKTOP")));
 #endif
 }
 
@@ -276,11 +270,8 @@ void Controller::setQuitOnLastWindowClosed()
     if (supportSystemTray() && NeoChatConfig::self()->systemTray()) {
         m_trayIcon = new TrayIcon(this);
         m_trayIcon->show();
-    } else {
-        if (m_trayIcon) {
-            delete m_trayIcon;
-            m_trayIcon = nullptr;
-        }
+    } else if (m_trayIcon) {
+        delete m_trayIcon;
     }
 #endif
 }
@@ -337,30 +328,7 @@ 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
@@ -381,7 +349,10 @@ QString Controller::loadFileContent(const QString &path) const
 {
     QUrl url(path);
     QFile file(url.isLocalFile() ? url.toLocalFile() : url.toString());
-    file.open(QFile::ReadOnly);
+    if (!file.open(QFile::ReadOnly)) {
+        qCWarning(GENERAL) << "Failed to open file" << path;
+        return {};
+    }
     return QString::fromLatin1(file.readAll());
 }
 
@@ -407,4 +378,9 @@ void Controller::markImageShown(const QString &eventId)
     m_shownImages.append(eventId);
 }
 
+void Controller::markImageHidden(const QString &eventId)
+{
+    m_shownImages.removeAll(eventId);
+}
+
 #include "moc_controller.cpp"

src/app/controller.h

@@ -99,6 +99,7 @@ public:
 
     Q_INVOKABLE bool isImageShown(const QString &eventId);
     Q_INVOKABLE void markImageShown(const QString &eventId);
+    Q_INVOKABLE void markImageHidden(const QString &eventId);
 
 private:
     explicit Controller(QObject *parent = nullptr);
@@ -109,8 +110,9 @@ private:
     void initActiveConnection(NeoChatConnection *oldConnection, NeoChatConnection *newConnection);
 
     QPointer<NeoChatConnection> m_connection;
-    TrayIcon *m_trayIcon = nullptr;
-
+#ifndef Q_OS_ANDROID
+    QPointer<TrayIcon> m_trayIcon;
+#endif
     QString m_endpoint;
     QStringList m_shownImages;
 

src/app/logger.cpp

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

src/app/logger.h

@@ -1,9 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/**
- * Initlalize logging to file and enables some additional categories, which will only be logged to the file
- */
-void initLogging();

src/app/main.cpp

@@ -49,7 +49,6 @@
 #include "blurhashimageprovider.h"
 #include "colorschemer.h"
 #include "controller.h"
-#include "logger.h"
 #include "login.h"
 #include "registration.h"
 #include "roommanager.h"
@@ -138,6 +137,11 @@ int main(int argc, char *argv[])
     font.setHintingPreference(QFont::PreferNoHinting);
     app.setFont(font);
 #endif
+
+#ifdef Q_OS_MACOS
+    QApplication::setStyle(u"breeze"_s);
+#endif
+
     KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));
 
     QGuiApplication::setOrganizationName("KDE"_L1);
@@ -177,8 +181,6 @@ int main(int argc, char *argv[])
     KCrash::initialize();
 #endif
 
-    initLogging();
-
     Connection::setEncryptionDefault(true);
     Connection::setDirectChatEncryptionDefault(true);
 
@@ -195,6 +197,9 @@ int main(int argc, char *argv[])
     parser.addPositionalArgument(u"urls"_s, i18n("Supports matrix: url scheme"));
     parser.addOption(QCommandLineOption("ignore-ssl-errors"_L1, i18n("Ignore all SSL Errors, e.g., unsigned certificates.")));
 
+    QCommandLineOption replaceOption({QStringLiteral("replace")}, i18nc("command line description", "Replace an existing instance"));
+    parser.addOption(replaceOption);
+
     QCommandLineOption testOption("test"_L1, i18n("Only used for autotests"));
     testOption.setFlags(QCommandLineOption::HiddenFromHelp);
     parser.addOption(testOption);
@@ -231,7 +236,7 @@ int main(int argc, char *argv[])
 #endif
 
 #ifdef HAVE_KDBUSADDONS
-    KDBusService service(KDBusService::Unique);
+    KDBusService service(KDBusService::Unique | (parser.isSet(replaceOption) ? KDBusService::Replace : KDBusService::StartupOption(0)));
 #endif
 
     const auto accountManager = std::make_unique<AccountManager>(parser.isSet("test"_L1));
@@ -239,13 +244,6 @@ int main(int argc, char *argv[])
     LoginHelper::instance().setAccountManager(accountManager.get());
     Registration::instance().setAccountManager(accountManager.get());
 
-    Q_IMPORT_QML_PLUGIN(org_kde_neochat_settingsPlugin)
-    Q_IMPORT_QML_PLUGIN(org_kde_neochat_roomsPlugin)
-    Q_IMPORT_QML_PLUGIN(org_kde_neochat_timelinePlugin)
-    Q_IMPORT_QML_PLUGIN(org_kde_neochat_devtoolsPlugin)
-    Q_IMPORT_QML_PLUGIN(org_kde_neochat_loginPlugin)
-    Q_IMPORT_QML_PLUGIN(org_kde_neochat_chatbarPlugin)
-
     qml_register_types_org_kde_neochat();
     qmlRegisterUncreatableMetaObject(Quotient::staticMetaObject, "Quotient", 1, 0, "JoinRule", u"Access to JoinRule enum only"_s);
 

src/app/models/commonroomsmodel.h

@@ -7,7 +7,6 @@
 #include <QQmlEngine>
 
 #include "neochatconnection.h"
-#include "neochatroom.h"
 
 #include <Quotient/events/roommessageevent.h>
 #include <Quotient/roommember.h>
@@ -25,11 +24,7 @@ class CommonRoomsModel : public QAbstractListModel
 
 public:
     enum Roles {
-        TextRole = Qt::DisplayRole,
-        LongitudeRole,
-        LatitudeRole,
-        AssetRole,
-        AuthorRole,
+        RoomIdRole = Qt::DisplayRole,
     };
     Q_ENUM(Roles)
 

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, "text"},
+        {TextRole, "notificationText"},
         {RoomIdRole, "roomId"},
         {AuthorName, "authorName"},
         {AuthorAvatar, "authorAvatar"},

src/app/models/serverlistmodel.cpp

@@ -176,7 +176,7 @@ void ServerListModel::initialize()
         true,
         false,
     });
-    beginResetModel();
+    endResetModel();
 }
 
 #include "moc_serverlistmodel.cpp"

src/app/neochat.notifyrc

@@ -42,7 +42,6 @@ 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
@@ -87,7 +86,6 @@ 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 的用戶端
 
@@ -134,7 +132,6 @@ 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
@@ -177,7 +174,6 @@ 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
@@ -222,7 +218,6 @@ 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
@@ -264,7 +259,6 @@ Comment[sv]=Det finns en ny inbjudan till ett rum
 Comment[ta]=ஓர் அரங்கிற்கான புதிய அழைப்பிதழ் உள்ளது
 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
@@ -303,7 +297,6 @@ 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
@@ -338,7 +331,6 @@ 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

src/app/neochatconfig.kcfg

@@ -78,6 +78,12 @@
       <label>Use a compact room list layout</label>
       <default>false</default>
     </entry>
+    <entry name="MarkReadCondition" type="Enum">
+      <label>The sort order for the rooms in the list.</label>
+      <choices name="::TimelineMarkReadCondition::Condition">
+      </choices>
+      <default>2</default>
+    </entry>
     <entry name="ShowStateEvent" type="bool">
       <label>Show state events in the timeline</label>
       <default>true</default>
@@ -183,6 +189,10 @@
       <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>
@@ -205,6 +215,10 @@
       <label>Enable add phone numbers as 3PIDs</label>
       <default>false</default>
     </entry>
+    <entry name="Calls" type="bool">
+      <label>Enable audio and video calling</label>
+      <default>false</default>
+    </entry>
   </group>
   <group name="Security">
     <entry name="RejectUnknownInvites" type="bool">

src/app/notificationsmanager.cpp

@@ -60,9 +60,8 @@ void NotificationsManager::startNotificationJob(QPointer<NeoChatConnection> conn
     }
 
     if (!m_connActiveJob.contains(connection->user()->id())) {
-        auto job = connection->callApi<GetNotificationsJob>();
         m_connActiveJob.append(connection->user()->id());
-        connect(job, &BaseJob::success, this, [this, job, connection]() {
+        connection->callApi<GetNotificationsJob>().onResult([this, connection](const auto &job) {
             m_connActiveJob.removeAll(connection->user()->id());
             processNotificationJob(connection, job, !m_oldNotifications.contains(connection->user()->id()));
         });
@@ -433,7 +432,7 @@ QPixmap NotificationsManager::createNotificationImage(const QImage &icon, NeoCha
 
     if (room != nullptr) {
         const QImage roomAvatar = room->avatar(imageRect.width(), imageRect.height());
-        if (icon != roomAvatar) {
+        if (!roomAvatar.isNull() && icon != roomAvatar) {
             const QRect lowerQuarter{imageRect.center(), imageRect.size() / 2};
 
             painter.setBrush(Qt::white);

src/app/plasma-runner-neochat.desktop

@@ -43,7 +43,6 @@ 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
@@ -83,7 +82,6 @@ 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
@@ -93,4 +91,3 @@ 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

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,44 +18,45 @@ KirigamiComponents.ConvergentContextMenu {
     required property NeoChatConnection connection
     required property Kirigami.ApplicationWindow window
 
-    QQC2.Action {
+    Kirigami.Action {
         text: i18nc("@action:button", "Show QR Code")
         icon.name: "view-barcode-qr-symbolic"
         onTriggered: {
-            let qrMax = Qt.createComponent('org.kde.neochat', 'QrCodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
+            (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) : ""
-            });
-            if (typeof root.closeDialog === "function") {
-                root.closeDialog();
-            }
-            qrMax.open();
+            }) as QrCodeMaximizeComponent).open();
         }
     }
 
-    QQC2.Action {
-        text: i18n("Edit This Account")
-        icon.name: "document-edit"
-        onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'AccountEditorPage'), {
+    Kirigami.Action {
+        text: i18nc("@action:inmenu", "Switch Account")
+        icon.name: "system-switch-user"
+        shortcut: "Ctrl+U"
+        onTriggered: (Qt.createComponent("org.kde.neochat", "AccountSwitchDialog").createObject(QQC2.Overlay.overlay, {
             connection: root.connection
-        }, {
-            title: i18n("Account editor")
-        })
+        }) as Kirigami.Dialog).open();
     }
 
-    QQC2.Action {
-        text: i18n("Notification Settings")
+    Kirigami.Action {
+        text: i18nc("@action:inmenu", "Edit This Account")
+        icon.name: "document-edit"
+        onTriggered: NeoChatSettingsView.openWithInitialProperties("accounts", {initialAccount: root.connection});
+    }
+
+    Kirigami.Action {
+        text: i18nc("@action:inmenu", "Notification Settings")
         icon.name: "notifications"
         onTriggered: {
             NeoChatSettingsView.open('notifications');
         }
     }
 
-    QQC2.Action {
-        text: i18n("Devices")
+    Kirigami.Action {
+        text: i18nc("@action:inmenu", "Devices")
         icon.name: "computer-symbolic"
         onTriggered: {
             NeoChatSettingsView.open('devices');
@@ -63,10 +64,10 @@ KirigamiComponents.ConvergentContextMenu {
     }
 
     Kirigami.Action {
-        text: i18n("Open Developer Tools")
+        text: i18nc("@action:inmenu", "Open Developer Tools")
         icon.name: "tools"
         visible: NeoChatConfig.developerTools
-        onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), {
+        onTriggered: root.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), {
             connection: root.connection
         }, {
             title: i18nc("@title:window", "Developer Tools"),
@@ -84,9 +85,10 @@ KirigamiComponents.ConvergentContextMenu {
         })
     }
 
-    QQC2.Action {
+    Kirigami.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, {
@@ -95,19 +97,17 @@ KirigamiComponents.ConvergentContextMenu {
                 standardButtons: Kirigami.Dialog.Ok
             })
             dialog.open();
-            root.connection.onNewKeyVerificationSession.connect(() => {
+            root.connection.newKeyVerificationSession.connect(() => {
                 dialog.close();
             });
         }
     }
 
-    QQC2.Action {
-        text: i18n("Logout")
+    Kirigami.Action {
+        text: i18nc("@action:inmenu", "Logout…")
         icon.name: "im-kick-user"
-        onTriggered: confirmLogoutDialogComponent.createObject(root).open()
-    }
-
-    readonly property Component confirmLogoutDialogComponent: ConfirmLogoutDialog {
-        connection: root.connection
+        onTriggered: (Qt.createComponent("org.kde.neochat", "ConfirmLogoutDialog").createObject(QQC2.Overlay.overlay, {
+            connection: root.connection
+        }) as Kirigami.Dialog).open()
     }
 }

src/app/qml/AccountSwitchDialog.qml

@@ -1,7 +1,10 @@
 // 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
@@ -16,8 +19,6 @@ Kirigami.Dialog {
 
     required property NeoChatConnection connection
 
-    parent: applicationWindow().overlay
-
     leftPadding: 0
     rightPadding: 0
     topPadding: 0
@@ -25,7 +26,7 @@ Kirigami.Dialog {
 
     standardButtons: Kirigami.Dialog.NoButton
 
-    width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
+    width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
     title: i18nc("@title: dialog to switch between logged in accounts", "Switch Account")
 
     onVisibleChanged: if (visible) {
@@ -53,8 +54,8 @@ Kirigami.Dialog {
             }
             text: i18nc("@button: login to or register a new account.", "Add Account")
             contentItem: Delegates.SubtitleContentItem {
-                itemDelegate: parent
-                subtitle: i18n("Log in or create a new account")
+                itemDelegate: addDelegate
+                subtitle: i18nc("@info", "Log in or create a new account")
                 labelItem.textFormat: Text.PlainText
                 subtitleItem.textFormat: Text.PlainText
             }
@@ -94,8 +95,8 @@ Kirigami.Dialog {
                 accountView.decrementCurrentIndex();
             }
         }
-        Keys.onEnterPressed: accountView.currentItem.clicked()
-        Keys.onReturnPressed: accountView.currentItem.clicked()
+        Keys.onEnterPressed: (accountView.currentItem as Delegates.RoundedItemDelegate).clicked()
+        Keys.onReturnPressed: (accountView.currentItem as Delegates.RoundedItemDelegate).clicked()
 
         onVisibleChanged: {
             for (let i = 0; i < accountView.count; i++) {

src/app/qml/AskDirectChatConfirmation.qml

@@ -6,8 +6,6 @@ import QtQuick.Controls as QQC2
 
 import org.kde.kirigami as Kirigami
 
-import org.kde.neochat
-
 Kirigami.Dialog {
     id: root
 
@@ -20,7 +18,7 @@ Kirigami.Dialog {
     title: i18nc("@title:dialog", "Start a chat")
 
     contentItem: QQC2.Label {
-        text: i18n("Do you want to start a chat with %1?", root.user.displayName)
+        text: i18nc("@info", "Do you want to start a chat with %1?", root.user.displayName)
         textFormat: Text.PlainText
         wrapMode: Text.Wrap
         horizontalAlignment: Qt.AlignHCenter

src/app/qml/AttachmentPane.qml

@@ -33,7 +33,7 @@ ColumnLayout {
         }
         QQC2.ToolButton {
             id: editImageButton
-            visible: hasImage
+            visible: root.hasImage
             icon.name: "document-edit"
             text: i18n("Edit")
             display: QQC2.AbstractButton.IconOnly
@@ -46,9 +46,9 @@ ColumnLayout {
             }
 
             onClicked: {
-                let imageEditor = applicationWindow().pageStack.pushDialogLayer(imageEditorPage);
+                let imageEditor = (Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(imageEditorPage);
                 imageEditor.newPathChanged.connect(function (newPath) {
-                    applicationWindow().pageStack.layers.pop();
+                    imageEditor.closeDialog();
                     root.attachmentPath = newPath;
                 });
             }
@@ -58,14 +58,18 @@ ColumnLayout {
         QQC2.ToolButton {
             id: cancelAttachmentButton
             display: QQC2.AbstractButton.IconOnly
-            action: Kirigami.Action {
-                text: i18n("Cancel sending attachment")
-                icon.name: "dialog-close"
-                onTriggered: attachmentCancelled()
-                shortcut: "Escape"
-            }
+            text: i18nc("@action:button", "Cancel sending attachment")
+            icon.name: "dialog-close"
+            onClicked: root.attachmentCancelled()
+
             QQC2.ToolTip.text: text
             QQC2.ToolTip.visible: hovered
+            QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+
+            Kirigami.Action {
+                shortcut: "Escape"
+                onTriggered: cancelAttachmentButton.clicked()
+            }
         }
     }
 
@@ -75,8 +79,8 @@ ColumnLayout {
 
         asynchronous: true
         cache: false // Cache is not needed. Images will rarely be shown repeatedly.
-        source: hasImage ? root.attachmentPath : ""
-        visible: hasImage
+        source: root.hasImage ? root.attachmentPath : ""
+        visible: root.hasImage
         fillMode: Image.PreserveAspectFit
 
         onSourceChanged: {
@@ -114,11 +118,11 @@ ColumnLayout {
             id: mimetypeIcon
             implicitWidth: Kirigami.Units.iconSizes.smallMedium
             implicitHeight: Kirigami.Units.iconSizes.smallMedium
-            source: attachmentMimetype.iconName
+            source: root.attachmentMimetype.iconName
         }
         QQC2.Label {
             id: fileLabel
-            text: baseFileName
+            text: root.baseFileName
         }
     }
 }

src/app/qml/AvatarTabButton.qml

@@ -3,12 +3,9 @@
 // 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

src/app/qml/CodeMaximizeComponent.qml

@@ -48,7 +48,7 @@ Components.AbstractMaximizeComponent {
             implicitWidth: Kirigami.Units.iconSizes.medium
             implicitHeight: Kirigami.Units.iconSizes.medium
 
-            name: root.author.name ?? root.author.displayName
+            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.name ?? root.author.displayName
+                text: root.author.displayName
                 color: root.author.color
                 font.weight: Font.Bold
                 elide: Text.ElideRight

src/app/qml/CollapsedRoomDelegate.qml

@@ -8,7 +8,6 @@ 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
 

src/app/qml/EditMenu.qml

@@ -1,86 +0,0 @@
-// 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();
-        }
-    }
-}

src/app/qml/EmojiItem.qml

@@ -6,16 +6,15 @@ import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
-import org.kde.neochat
 
 ColumnLayout {
     id: root
 
-    property alias emoji: emojiLabel.text
-    property alias description: descriptionLabel.text
+    required property string emoji
+    required property string description
 
     QQC2.Label {
-        id: emojiLabel
+        text: root.emoji
         Layout.fillWidth: true
         Layout.preferredWidth: Kirigami.Units.iconSizes.huge
         Layout.preferredHeight: Kirigami.Units.iconSizes.huge
@@ -25,7 +24,7 @@ ColumnLayout {
         font.pointSize: Kirigami.Theme.defaultFont.pointSize * 4
     }
     QQC2.Label {
-        id: descriptionLabel
+        text: root.description
         Layout.fillWidth: true
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignHCenter

src/app/qml/EmojiRow.qml

@@ -17,9 +17,6 @@ RowLayout {
 
     Repeater {
         id: repeater
-        delegate: EmojiItem {
-            emoji: modelData.emoji
-            description: modelData.description
-        }
+        delegate: EmojiItem {}
     }
 }

src/app/qml/GlobalMenu.qml

@@ -5,7 +5,6 @@ import Qt.labs.platform as Labs
 
 import QtQuick
 import QtQuick.Window
-import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 
@@ -16,12 +15,50 @@ Labs.MenuBar {
     id: root
 
     required property NeoChatConnection connection
+    required property Kirigami.ApplicationWindow appWindow
 
     Labs.Menu {
-        title: i18nc("menu", "NeoChat")
+        title: i18nc("menu", "File")
 
         Labs.MenuItem {
-            enabled: pageStack.layers.currentItem.title !== i18n("Configure NeoChat…")
+            icon.name: "list-add-user"
+            text: i18nc("@action:inmenu", "Find your Friends")
+            enabled: root.connection
+            onTriggered: root.appWindow.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: 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 {
             text: i18nc("menu", "Configure NeoChat…")
 
             shortcut: StandardKey.Preferences
@@ -34,58 +71,15 @@ 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: quickSwitcher.open()
+            onTriggered: (root.appWindow as Main).quickSwitcher.open()
         }
     }
     Labs.Menu {
@@ -93,8 +87,8 @@ Labs.MenuBar {
 
         Labs.MenuItem {
             icon.name: "view-fullscreen-symbolic"
-            text: root.visibility === Window.FullScreen ? i18nc("menu", "Exit Full Screen") : i18nc("menu", "Enter Full Screen")
-            onTriggered: root.visibility === Window.FullScreen ? root.showNormal() : root.showFullScreen()
+            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()
         }
     }
     Labs.Menu {
@@ -103,12 +97,12 @@ Labs.MenuBar {
         Labs.MenuItem {
             icon.name: "help-about-symbolic"
             text: i18nc("menu", "About NeoChat")
-            onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.kirigamiaddons.formcard", "AboutPage"))
+            onTriggered: root.appWindow.pageStack.pushDialogLayer(Qt.createComponent("org.kde.kirigamiaddons.formcard", "AboutPage"))
         }
         Labs.MenuItem {
             icon.name: "kde-symbolic"
             text: i18nc("menu", "About KDE")
-            onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.kirigamiaddons.formcard", "AboutKDEPage"))
+            onTriggered: root.appWindow.pageStack.pushDialogLayer(Qt.createComponent("org.kde.kirigamiaddons.formcard", "AboutKDEPage"))
         }
     }
 }

src/app/qml/GlobalMenuStub.qml

@@ -3,8 +3,10 @@
 
 import QtQuick
 
+import org.kde.kirigami as Kirigami
 import org.kde.neochat
 
 Item {
     required property NeoChatConnection connection
+    required property Kirigami.ApplicationWindow appWindow
 }

src/app/qml/HoverLinkIndicator.qml

@@ -3,29 +3,54 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 import QtQuick
+import QtQuick.Layouts
 import QtQuick.Controls as QQC2
 
 import org.kde.kirigami as Kirigami
 
-QQC2.Control {
+RowLayout {
     id: root
 
     property string 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")
+    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
+        }
     }
 
-    background: Rectangle {
-        color: Kirigami.Theme.backgroundColor
+    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
+            }
+        }
     }
 }

src/app/qml/InvitationView.qml

@@ -2,6 +2,8 @@
 // SPDX-FileCopyrightText: 2025 Joshua Goins <josh@redstrate.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
@@ -16,7 +18,7 @@ ColumnLayout {
     id: root
 
     required property NeoChatRoom currentRoom
-    readonly property var invitingMember: currentRoom.member(currentRoom.invitingUserId)
+    readonly property var invitingMember: currentRoom.qmlSafeMember(currentRoom.invitingUserId)
     readonly property string inviteTimestamp: root.currentRoom.inviteTimestamp.toLocaleString(Qt.locale(), Locale.ShortFormat)
 
     spacing: Kirigami.Units.smallSpacing
@@ -33,7 +35,7 @@ ColumnLayout {
         Layout.fillWidth: true
 
         name: root.invitingMember.displayName
-        source: root.invitingMember.avatarUrl
+        source: NeoChatConfig.hideImages ? undefined : root.invitingMember.avatarUrl
         color: root.invitingMember.color
     }
 
@@ -52,6 +54,15 @@ ColumnLayout {
                 Layout.alignment: Qt.AlignHCenter
             }
 
+            Kirigami.SelectableLabel {
+                Layout.fillWidth: true
+                font: Kirigami.Theme.smallFont
+                textFormat: TextEdit.PlainText
+                visible: root.currentRoom && root.currentRoom.canonicalAlias
+                text: root.currentRoom && root.currentRoom.canonicalAlias ? root.currentRoom.canonicalAlias : ""
+                color: Kirigami.Theme.disabledTextColor
+            }
+
             Kirigami.Heading {
                 text: root.currentRoom.displayName
 
@@ -70,7 +81,14 @@ ColumnLayout {
             spacing: Kirigami.Units.smallSpacing
 
             Kirigami.Heading {
-                text: root.currentRoom.displayName
+                text: root.invitingMember.displayName
+
+                Layout.alignment: Qt.AlignHCenter
+            }
+
+            QQC2.Label {
+                text: root.invitingMember.id
+                color: Kirigami.Theme.disabledTextColor
 
                 Layout.alignment: Qt.AlignHCenter
             }
@@ -159,7 +177,7 @@ ColumnLayout {
 
             QQC2.Label {
                 color: Kirigami.Theme.disabledTextColor
-                text: i18nc("@info:label", "You can reject invitations from unknown users under Security settings.")
+                text: xi18nc("@info:label Ensure you are referring to the same translation used for that settings page", "You can reject invitations from unknown users under the <interface>Security & Safety</interface> settings.")
                 wrapMode: Text.WordWrap
 
                 // + 5 to prevent it from wrapping unnecessarily