Visually show reactions while the server is processing them

Unlike messages, reactions do not have a "pending" state. This problem
is more obvious while the server is under heavy load, or your connection
is disconnecting often, etc. This creates a pretty terrible UX as you
try to add an emoji, and nothing obvious happens.

libQuotient gives us the tools to do this, we can take advantage of
this. The main missing component is that we depend on a changed
RoomMessage event for reaction updates, but in the pending queue the
library gives us a ReactionEvent directly. We can process this, and tell
ReactionModel to use this while waiting for the message to be updated.

I did some code cleanup in ReactionModel while I'm touching it as well.

.contextProperties.ini

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

.flatpak-manifest.json

@@ -44,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": [
@@ -161,11 +177,15 @@
             "name": "kunifiedpush",
             "buildsystem": "cmake-ninja",
             "builddir": true,
+            "config-opts": [
+                "-DENABLE_TESTING=OFF",
+                "-DKUNIFIEDPUSH_CLIENT_ONLY=ON"
+            ],
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.kde.org/stable/release-service/25.04.3/src/kunifiedpush-25.04.3.tar.xz",
-                    "sha256": "a16ffe4117b14baa02f3b8ae7de9e509a17359c1b67dcd851aef4f3c3661a1df",
+                    "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": 8763,
@@ -186,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

@@ -14,8 +14,8 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
 
-set(KF_MIN_VERSION "6.16")
-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)
 

autotests/CMakeLists.txt

@@ -93,6 +93,12 @@ ecm_add_test(
     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

autotests/messagecontentmodeltest.cpp

@@ -43,13 +43,13 @@ void MessageContentModelTest::missingEvent()
 
     QCOMPARE(model1.rowCount(), 1);
     QCOMPARE(model1.data(model1.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);
-    QCOMPARE(model1.data(model1.index(0), MessageContentModel::DisplayRole), u"Loading"_s);
+    QCOMPARE(model1.data(model1.index(0), MessageContentModel::DisplayRole), u"Loading…"_s);
 
     auto model2 = EventMessageContentModel(room, u"$153456789:example.org"_s, true);
 
     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/server.cpp

@@ -109,113 +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;
-        QMap<QString, QJsonArray> roomAccountData;
-
-        for (const auto &roomData : m_roomsToCreate) {
-            stateEvents[roomData.id] += 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, roomData.id},
-                {u"sender"_s, roomData.members[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 : roomData.members) {
-                stateEvents[roomData.id] += 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, roomData.id},
-                    {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}}},
-                };
-            }
-            QJsonObject tags;
-            for (const auto &tag : roomData.tags) {
-                tags[tag] = QJsonObject();
-            }
-            roomAccountData[roomData.id] += QJsonObject{{u"type"_s, u"m.tag"_s}, {u"content"_s, QJsonObject{{u"tags"_s, tags}}}};
-        }
-        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;
-        auto keys = stateEvents.keys() + m_events.keys();
-        for (const auto &roomId : QSet(keys.begin(), keys.end())) {
-            rooms[roomId] = QJsonObject{
-                {u"state"_s, QJsonObject{{u"events"_s, stateEvents[roomId]}}},
-                {u"account_data"_s, QJsonObject{{u"events"_s, roomAccountData[roomId]}}},
-                {u"timeline"_s, QJsonObject{{u"events"_s, m_events[roomId]}}},
-            };
-        }
-        m_events.clear();
-
-        auto json = QJsonObject{{u"rooms"_s, QJsonObject{{u"join"_s, rooms}}}};
-        responder.write(QJsonDocument(json), 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);
@@ -229,46 +136,239 @@ void Server::start()
 
 QString Server::createRoom(const QString &matrixId)
 {
-    auto roomId = generateRoomId();
-    m_roomsToCreate += RoomData{
-        .members = {matrixId},
-        .id = roomId,
+    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)
 {
-    auto roomId = createRoom(matrixId);
-    m_roomsToCreate.last().tags = {u"m.server_notice"_s};
+    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();
-    m_events[roomId] += 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()},
+    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,16 +2,51 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include <QHttpServer>
+#include <QJsonObject>
 #include <QSslServer>
 
+struct Changes {
+    struct NewRoom {
+        QStringList initialMembers;
+        QString roomId;
+        QStringList tags;
+    };
+    QList<NewRoom> newRooms;
+
+    struct InviteUser {
+        QString userId;
+        QString roomId;
+    };
+    QList<InviteUser> invitations;
+
+    struct BanUser {
+        QString userId;
+        QString roomId;
+    };
+    QList<BanUser> bans;
+
+    struct JoinUser {
+        QString userId;
+        QString roomId;
+    };
+    QList<JoinUser> joins;
+
+    struct Event {
+        QJsonObject fullJson;
+    };
+    QList<Event> events;
+};
+
 struct RoomData {
     QStringList members;
     QString id;
     QStringList tags;
 };
 
-class Server
+class Server : public QObject
 {
+    Q_OBJECT
+
 public:
     Server();
 
@@ -37,10 +72,7 @@ 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<RoomData> m_roomsToCreate;
-    QMap<QString, QJsonArray> m_events;
+    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();
@@ -71,6 +75,9 @@ private Q_SLOTS:
 
     void componentOutput_data();
     void componentOutput();
+
+    void updateSpoiler_data();
+    void updateSpoiler();
 };
 
 void TextHandlerTest::initTestCase()
@@ -89,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()
@@ -146,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;
@@ -338,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.
@@ -408,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);
@@ -460,21 +523,23 @@ void TextHandlerTest::receiveRichPlainUrl_data()
     // so we can confirm consistent behaviour for complex urls.
     QTest::addRow("link 1")
         << u"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s
-        << u"<a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">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;
+        << 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/\">https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/</a>"_s;
+        << u"<a href=\"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/\" 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">email@example.com</a> <a href="mailto:email@example.com">Link already rich</a>)"_s;
+    QTest::addRow("email")
+        << uR"(email@example.com <a href="mailto:email@example.com">Link already rich</a>)"_s
+        << uR"(<a href="mailto:email@example.com" 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\">@user:kde.org</a></b> <b><a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a></b>"_s;
-    QTest::addRow("mxid with prefix") << u"a @user:kde.org b"_s << u"a <b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> b"_s;
+        << 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;
 }
 
 /**
@@ -596,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

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

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

@@ -120,7 +120,7 @@
     <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>
@@ -154,7 +154,7 @@
     <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>
@@ -488,6 +488,7 @@
     <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"/>

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
+

src/app/CMakeLists.txt

@@ -104,7 +104,7 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
     DEPENDENCIES
         QtCore
         QtQuick
-        com.github.quotient_im.libquotient
+        io.github.quotient_im.libquotient
     IMPORTS
         org.kde.neochat.libneochat
         org.kde.neochat.rooms
@@ -342,9 +342,6 @@ if(TARGET KF6::DBusAddons AND NOT WIN32)
 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})

src/app/controller.cpp

@@ -19,6 +19,7 @@
 
 #include "accountmanager.h"
 #include "enums/roomsortparameter.h"
+#include "general_logging.h"
 #include "mediasizehelper.h"
 #include "models/actionsmodel.h"
 #include "models/messagemodel.h"
@@ -37,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
@@ -133,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();
     });
 
@@ -200,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)
@@ -262,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
 }
 
@@ -273,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
 }
@@ -334,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
@@ -378,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());
 }
 

src/app/controller.h

@@ -110,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/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/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()));
         });

src/app/qml/AccountMenu.qml

@@ -88,7 +88,7 @@ KirigamiComponents.ConvergentContextMenu {
     Kirigami.Action {
         text: i18nc("@action:inmenu", "Verify This Device")
         icon.name: "security-low"
-        visible: !root.connection.isVerifiedSession()
+        visible: !root.connection.isVerifiedSession
         onTriggered: {
             root.connection.startSelfVerification();
             const dialog = Qt.createComponent("org.kde.kirigami", "PromptDialog").createObject(QQC2.Overlay.overlay, {

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/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/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

src/app/qml/KeyVerificationDialog.qml

@@ -4,6 +4,7 @@
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
+import QtQuick.Window
 import QtQml
 
 import org.kde.kirigami as Kirigami
@@ -50,6 +51,22 @@ Kirigami.Page {
                 sourceComponent: message
             }
         },
+        State {
+            name: "waitingForKey"
+            when: root.session.state === KeyVerificationSession.WAITINGFORKEY
+            PropertyChanges {
+                target: stateLoader
+                sourceComponent: message
+            }
+        },
+        State {
+            name: "waitingForAccept"
+            when: root.session.state === KeyVerificationSession.WAITINGFORACCEPT
+            PropertyChanges {
+                target: stateLoader
+                sourceComponent: message
+            }
+        },
         State {
             name: "waitingForMac"
             when: root.session.state === KeyVerificationSession.WAITINGFORMAC
@@ -127,7 +144,9 @@ Kirigami.Page {
                 case KeyVerificationSession.WAITINGFORREADY:
                 case KeyVerificationSession.INCOMING:
                 case KeyVerificationSession.WAITINGFORMAC:
-                    return "security-medium-symbolic";
+                case KeyVerificationSession.WAITINGFORKEY:
+                case KeyVerificationSession.WAITINGFORACCEPT:
+                        return "security-medium-symbolic";
                 case KeyVerificationSession.DONE:
                     return "security-high";
                 default:
@@ -141,13 +160,18 @@ Kirigami.Page {
                 case KeyVerificationSession.INCOMING:
                     return i18n("Incoming key verification request from device **%1**", root.session.remoteDeviceId);
                 case KeyVerificationSession.WAITINGFORMAC:
+                    return i18n("Waiting for other party to send us keys.");
+                case KeyVerificationSession.WAITINGFORKEY:
+                    return i18n("Waiting for other party to confirm our keys.");
+                case KeyVerificationSession.WAITINGFORACCEPT:
                     return i18n("Waiting for other party to verify.");
                 case KeyVerificationSession.DONE:
-                    return i18n("Successfully verified device **%1**", root.session.remoteDeviceId)
+                    return i18n("Successfully verified device **%1**", root.session.remoteDeviceId);
                 default:
                     return "";
                 }
             }
+            onDone: root.QQC2.Window.window.close()
         }
     }
 

src/app/qml/Main.qml

@@ -233,7 +233,7 @@ Kirigami.ApplicationWindow {
         RoomListPage {
             id: roomList
 
-            onSearch: quickSwitcher.open()
+            onSearch: root.quickSwitcher.open()
 
             connection: root.connection
 
@@ -267,6 +267,17 @@ Kirigami.ApplicationWindow {
         }
     }
 
+    Connections {
+        target: root.connection
+        function onLoggedOut(): void {
+            root.pageStack.clear();
+            let page = root.pageStack.push(Qt.createComponent('org.kde.neochat.login', 'WelcomePage'), {
+                showExisting: true,
+            }) as WelcomePage;
+            page.connectionChosen.connect(() => root.load())
+        }
+    }
+
     Connections {
         target: AccountRegistry
         function onRowsRemoved() {

src/app/qml/ManualUserDialog.qml

@@ -21,7 +21,7 @@ Kirigami.Dialog {
     /**
      * @brief Thrown when a user is selected.
      */
-    signal userSelected
+    signal userSelected(string userId)
 
     title: i18nc("@title", "User ID")
 
@@ -38,7 +38,7 @@ Kirigami.Dialog {
             text: i18n("OK")
             icon.name: "dialog-ok"
             onTriggered: {
-                root.connection.requestDirectChat(userIdText.text);
+                root.userSelected(userIdText.text)
                 root.accept();
             }
         }

src/app/qml/MessageSourceSheet.qml

@@ -34,8 +34,8 @@ Kirigami.Page {
         enabled: root.model
         target: root.room
         function onChanged(): void {
-            root.contentJson = model.stateEventContentJson(root.type, root.stateKey);
-            root.sourceText = model.stateEventJson(root.type, root.stateKey);
+            root.contentJson = root.model.stateEventContentJson(root.type, root.stateKey);
+            root.sourceText = root.model.stateEventJson(root.type, root.stateKey);
         }
     }
 
@@ -46,8 +46,8 @@ Kirigami.Page {
             text: i18nc("@action As in 'edit the state of this room'", "Edit state")
             icon.name: "document-edit"
             visible: root.allowEdit
-            enabled: room.canSendState(root.type) && (!root.stateKey.startsWith("@") || root.stateKey === root.room.connection.localUserId) && root.type !== "m.room.create"
-            onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat", "EditStateDialog"), {
+            enabled: root.room.canSendState(root.type) && (!root.stateKey.startsWith("@") || root.stateKey === root.room.connection.localUserId) && root.type !== "m.room.create"
+            onTriggered: (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent("org.kde.neochat", "EditStateDialog"), {
                 room: root.room,
                 type: root.type,
                 stateKey: root.stateKey,

src/app/qml/NeochatMaximizeComponent.qml

@@ -120,7 +120,7 @@ Components.AlbumMaximizeComponent {
 
     onOpened: forceActiveFocus()
 
-    onItemRightClicked: RoomManager.viewEventMenu(root.currentEventId, root.currentRoom, root.currentAuthor)
+    onItemRightClicked: RoomManager.viewEventMenu(root.currentEventId, root.currentRoom)
 
     onSaveItem: {
         var dialog = saveAsDialog.createObject(QQC2.Overlay.overlay);

src/app/qml/NewPollDialog.qml

@@ -116,7 +116,7 @@ Kirigami.Dialog {
                                 optionModel.set(optionDelegate.index, {optionText: text})
                                 optionModel.allValuesSetChanged()
                             }
-                            placeholderText: i18n("Enter option")
+                            placeholderText: i18nc("@placeholder", "Enter option")
                         }
                         QQC2.ToolButton {
                             display: QQC2.AbstractButton.IconOnly

src/app/qml/NotificationsView.qml

@@ -1,12 +1,13 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // 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
-import org.kde.kirigami.delegates as KD
 import org.kde.kirigamiaddons.components as Components
 
 import org.kde.neochat
@@ -41,15 +42,23 @@ Kirigami.ScrollablePage {
         }
 
         delegate: QQC2.ItemDelegate {
+            id: notificationDelegate
+
+            required property string uri
+            required property string authorAvatar
+            required property string authorName
+            required property string roomDisplayName
+            required property string notificationText
+
             width: parent?.width ?? 0
 
-            onClicked: RoomManager.resolveResource(model.uri)
+            onClicked: RoomManager.resolveResource(uri)
             contentItem: RowLayout {
                 spacing: Kirigami.Units.largeSpacing
 
                 Components.Avatar {
-                    source: model.authorAvatar
-                    name: model.authorName
+                    source: notificationDelegate.authorAvatar
+                    name: notificationDelegate.authorName
                     implicitHeight: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
                     implicitWidth: implicitHeight
 
@@ -66,7 +75,7 @@ Kirigami.ScrollablePage {
                     QQC2.Label {
                         id: label
 
-                        text: model.roomDisplayName
+                        text: notificationDelegate.roomDisplayName
                         elide: Text.ElideRight
                         font.weight: Font.Normal
                         textFormat: Text.PlainText
@@ -78,10 +87,9 @@ Kirigami.ScrollablePage {
                     QQC2.Label {
                         id: subtitle
 
-                        text: model.text
+                        text: notificationDelegate.notificationText
                         elide: Text.ElideRight
                         font: Kirigami.Theme.smallFont
-                        opacity: root.hasNotifications ? 0.9 : 0.7
 
                         Layout.fillWidth: true
                         Layout.alignment: Qt.AlignLeft | Qt.AlignTop

src/app/qml/RoomPage.qml

@@ -2,6 +2,8 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-3.0-only
 
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Window
@@ -71,10 +73,16 @@ Kirigami.Page {
     KeyNavigation.left: (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).get(0)
 
     onCurrentRoomChanged: {
-        banner.visible = false;
         if (!Kirigami.Settings.isMobile && chatBarLoader.item) {
             (chatBarLoader.item as ChatBar).forceActiveFocus();
         }
+
+        if (root.currentRoom.tagNames.includes("m.server_notice")) {
+            banner.text = i18nc("@info", "This room contains official messages from your homeserver.")
+            banner.show("message");
+        } else {
+            banner.hideIf("message");
+        }
     }
 
     Connections {
@@ -82,10 +90,10 @@ Kirigami.Page {
         function onIsOnlineChanged() {
             if (!root.currentRoom.connection.isOnline) {
                 banner.text = i18nc("@info:status", "NeoChat is offline. Please check your network connection.");
-                banner.visible = true;
                 banner.type = Kirigami.MessageType.Error;
+                banner.show("offline");
             } else {
-                banner.visible = false;
+                banner.hideIf("offline");
             }
         }
     }
@@ -93,17 +101,30 @@ Kirigami.Page {
     header: Kirigami.InlineMessage {
         id: banner
 
+        // Used to keep track of messages so we can hide the right one at the right time
+        property string messageId
+
         showCloseButton: true
         visible: false
         position: Kirigami.InlineMessage.Position.Header
+
+        function show(msgid: string): void {
+            messageId = msgid;
+            visible = true;
+        }
+
+        function hideIf(msgid: string): void {
+            if (messageId == msgid) {
+                visible = false;
+            }
+        }
     }
 
     Loader {
         id: timelineViewLoader
         anchors.fill: parent
-        active: root.currentRoom && !root.currentRoom.isInvite && !root.currentRoom.isSpace
         // We need the loader to be active but invisible while the room is loading messages so signals in TimelineView work.
-        visible: !root.loading
+        active: root.currentRoom && !root.currentRoom.isInvite && !root.currentRoom.isSpace
         sourceComponent: TimelineView {
             id: timelineView
             messageFilterModel: root.messageFilterModel
@@ -149,13 +170,13 @@ Kirigami.Page {
 
     footer: Loader {
         id: chatBarLoader
-        height: active ? item.implicitHeight : 0
+        height: active ? (item as ChatBar).implicitHeight : 0
         active: timelineViewLoader.active && !root.currentRoom.readOnly
         sourceComponent: ChatBar {
             id: chatBar
             width: parent.width
             currentRoom: root.currentRoom
-            connection: root.currentRoom.connection
+            connection: root.currentRoom.connection as NeoChatConnection
         }
     }
 
@@ -197,7 +218,7 @@ Kirigami.Page {
         function onShowMessage(messageType, message) {
             banner.text = message;
             banner.type = messageType;
-            banner.visible = true;
+            banner.show("generic");
         }
 
         function onShowEventSource(eventId) {
@@ -209,29 +230,15 @@ Kirigami.Page {
             });
         }
 
-        function onShowMessageMenu(eventId, author, messageComponentType, plainText, htmlText, selectedText, hoveredLink, isThread) {
-            const contextMenu = messageDelegateContextMenu.createObject(root, {
-                selectedText: selectedText,
-                hoveredLink: hoveredLink,
-                author: author,
-                eventId: eventId,
-                messageComponentType: messageComponentType,
-                plainText: plainText,
-                htmlText: htmlText,
-            });
-            contextMenu.popup();
-        }
-
-        function onShowFileMenu(eventId, author, messageComponentType, plainText, mimeType, progressInfo, isThread) {
-            const contextMenu = fileDelegateContextMenu.createObject(root, {
+        function onShowDelegateMenu(eventId: string, author, messageComponentType, plainText: string, richText: string, mimeType: string, progressInfo, isThread: bool, selectedText: string, hoveredLink: string) {
+            (delegateContextMenu.createObject(root, {
                 author: author,
                 eventId: eventId,
                 plainText: plainText,
                 mimeType: mimeType,
                 progressInfo: progressInfo,
                 messageComponentType: messageComponentType,
-            });
-            contextMenu.popup();
+            }) as DelegateContextMenu).popup();
         }
 
         function onShowMaximizedMedia(index) {
@@ -246,28 +253,20 @@ Kirigami.Page {
         }
 
         function onShowMaximizedCode(author, time, codeText, language) {
-            let popup = Qt.createComponent('org.kde.neochat', 'CodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
+            (Qt.createComponent('org.kde.neochat', 'CodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
                 author: author,
                 time: time,
                 codeText: codeText,
                 language: language
-            }).open();
+            }) as CodeMaximizeComponent).open();
         }
     }
 
     Component {
-        id: messageDelegateContextMenu
-        MessageDelegateContextMenu {
+        id: delegateContextMenu
+        DelegateContextMenu {
             room: root.currentRoom
-            connection: root.currentRoom.connection
-        }
-    }
-
-    Component {
-        id: fileDelegateContextMenu
-        FileDelegateContextMenu {
-            room: root.currentRoom
-            connection: root.currentRoom.connection
+            connection: root.currentRoom.connection as NeoChatConnection
         }
     }
 

src/app/qml/ServerComboBox.qml

@@ -1,14 +1,14 @@
-
 // SPDX-FileCopyrightText: 2024 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.delegates as Delegates
-import org.kde.kirigamiaddons.formcard as FormCard
 
 import org.kde.neochat
 
@@ -44,7 +44,7 @@ QQC2.ComboBox {
         required property bool isHomeServer
         required property bool isDeletable
 
-        text: isAddServerDelegate ? i18n("Add New Server") : url
+        text: isAddServerDelegate ? i18nc("@action:button", "Add New Server") : url
         highlighted: index === root.highlightedIndex
 
         topInset: index === 0 ? Kirigami.Units.smallSpacing : Math.round(Kirigami.Units.smallSpacing / 2)
@@ -60,7 +60,7 @@ QQC2.ComboBox {
 
             Delegates.SubtitleContentItem {
                 itemDelegate: serverItem
-                subtitle: serverItem.isHomeServer ? i18n("Home Server") : ""
+                subtitle: serverItem.isHomeServer ? i18nc("@info", "Home Server") : ""
                 Layout.fillWidth: true
             }
 
@@ -138,11 +138,11 @@ QQC2.ComboBox {
                 text: {
                     if (serverUrlField.length > 0) {
                         if (!serverUrlField.acceptableInput) {
-                            return i18n("The entered text is not a valid url");
+                            return i18nc("@info", "The entered text is not a valid url");
                         }
 
                         if (!serverUrlField.isValidServer) {
-                            return i18n("This server cannot be resolved or has already been added");
+                            return i18nc("@info", "This server cannot be resolved or has already been added");
                         }
                     }
 
@@ -153,7 +153,7 @@ QQC2.ComboBox {
             QQC2.Label {
                 Layout.fillWidth: true
 
-                text: i18n("Server URL:")
+                text: i18nc("@label", "Server URL:")
             }
 
             QQC2.TextField {
@@ -187,7 +187,7 @@ QQC2.ComboBox {
         }
 
         customFooterActions: Kirigami.Action {
-            text: i18nc("@action:button", "Ok")
+            text: i18nc("@action:button", "OK")
             enabled: serverUrlField.acceptableInput && serverUrlField.isValidServer
             onTriggered: {
                 serverListModel.addServer(serverUrlField.text);

src/app/qml/ShareAction.qml

@@ -45,6 +45,8 @@ Kirigami.Action {
         model: Purpose.PurposeAlternativesModel {
             pluginType: "Export"
             inputData: root.inputData
+            // We already have many better ways to copy events to the clipboard
+            disabledPlugins: ["clipboardplugin"]
         }
 
         delegate: Kirigami.Action {

src/app/qml/UnlockSSSSDialog.qml

@@ -130,6 +130,6 @@ FormCard.FormCardPage {
 
     property OpenFileDialog openFileDialog: OpenFileDialog {
         id: openFileDialog
-        onChosen: securityKeyField.text = Controller.loadFileContent(path)
+        onChosen: path => securityKeyField.text = Controller.loadFileContent(path)
     }
 }

src/app/qml/UserDetailDialog.qml

@@ -63,6 +63,7 @@ Kirigami.Dialog {
                     level: 1
                     Layout.fillWidth: true
                     font.bold: true
+                    clip: true // Intentional to limit insane Unicode in display names
 
                     elide: Text.ElideRight
                     wrapMode: Text.NoWrap
@@ -109,15 +110,15 @@ Kirigami.Dialog {
                 }
 
                 onClicked: {
-                    let map = Qt.createComponent('org.kde.neochat', 'QrCodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
+                    let qrCode = Qt.createComponent('org.kde.neochat', 'QrCodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
                         text: barcode.content,
                         title: root.room ? root.room.member(root.user.id).displayName : root.user.displayName,
                         subtitle: root.user.id,
                         avatarColor: root.room?.member(root.user.id).color,
                         avatarSource: root.room? root.room.member(root.user.id).avatarUrl : root.user.avatarUrl
-                    });
+                    }) as QrCodeMaximizeComponent;
                     root.close();
-                    map.open();
+                    qrCode.open();
                 }
 
                 QQC2.ToolTip.visible: hovered
@@ -151,7 +152,7 @@ Kirigami.Dialog {
         }
 
         FormCard.FormButtonDelegate {
-            visible: root.room && root.user.id !== root.connection.localUserId && room.canSendState("kick") && room.containsUser(root.user.id) && room.memberEffectivePowerLevel(root.user.id) < room.memberEffectivePowerLevel(root.connection.localUserId)
+            visible: root.room && root.user.id !== root.connection.localUserId && root.room.canSendState("kick") && root.room.containsUser(root.user.id) && root.room.memberEffectivePowerLevel(root.user.id) < root.room.memberEffectivePowerLevel(root.connection.localUserId)
 
             text: i18nc("@action:button", "Kick this user")
             icon.name: "im-kick-user"
@@ -173,7 +174,7 @@ Kirigami.Dialog {
         }
 
         FormCard.FormButtonDelegate {
-            visible: root.room && root.user.id !== root.connection.localUserId && room.canSendState("invite") && !room.containsUser(root.user.id)
+            visible: root.room && root.user.id !== root.connection.localUserId && root.room.canSendState("invite") && !root.room.containsUser(root.user.id)
 
             enabled: root.room && !root.room.isUserBanned(root.user.id)
             text: i18nc("@action:button", "Invite this user")
@@ -185,7 +186,7 @@ Kirigami.Dialog {
         }
 
         FormCard.FormButtonDelegate {
-            visible: root.room && root.user.id !== root.connection.localUserId && room.canSendState("ban") && !room.isUserBanned(root.user.id) && room.memberEffectivePowerLevel(root.user.id) < room.memberEffectivePowerLevel(root.connection.localUserId)
+            visible: root.room && root.user.id !== root.connection.localUserId && root.room.canSendState("ban") && !root.room.isUserBanned(root.user.id) && root.room.memberEffectivePowerLevel(root.user.id) < root.room.memberEffectivePowerLevel(root.connection.localUserId)
 
             text: i18nc("@action:button", "Ban this user")
             icon.name: "im-ban-user"
@@ -208,7 +209,7 @@ Kirigami.Dialog {
         }
 
         FormCard.FormButtonDelegate {
-            visible: root.room && root.user.id !== root.connection.localUserId && room.canSendState("ban") && room.isUserBanned(root.user.id)
+            visible: root.room && root.user.id !== root.connection.localUserId && root.room.canSendState("ban") && root.room.isUserBanned(root.user.id)
 
             text: i18nc("@action:button", "Unban this user")
             icon.name: "im-irc"
@@ -224,12 +225,11 @@ Kirigami.Dialog {
             text: i18nc("@action:button", "Set user power level")
             icon.name: "visibility"
             onClicked: {
-                let dialog = powerLevelDialog.createObject(this, {
+                (powerLevelDialog.createObject(this, {
                     room: root.room,
                     userId: root.user.id,
                     powerLevel: root.room.memberEffectivePowerLevel(root.user.id)
-                });
-                dialog.open();
+                }) as PowerLevelDialog).open();
                 root.close();
             }
 
@@ -242,13 +242,13 @@ Kirigami.Dialog {
         }
 
         FormCard.FormButtonDelegate {
-            visible: root.room && (root.user.id === root.connection.localUserId || room.canSendState("redact"))
+            visible: root.room && (root.user.id === root.connection.localUserId || root.room.canSendState("redact"))
 
             text: i18nc("@action:button", "Remove recent messages by this user")
             icon.name: "delete"
             icon.color: Kirigami.Theme.negativeTextColor
             onClicked: {
-                let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReasonDialog'), {
+                let dialog = ((QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReasonDialog'), {
                     title: i18nc("@title:dialog", "Remove Messages"),
                     placeholder: i18nc("@info:placeholder", "Reason for removing this user's recent messages"),
                     actionText: i18nc("@action:button 'Remove' as in 'Remove these messages'", "Remove"),
@@ -274,6 +274,20 @@ Kirigami.Dialog {
             }
         }
 
+        FormCard.FormButtonDelegate {
+            text: i18nc("@action:button %1 is the name of the user.", "Search room for %1's messages", root.room ? root.room.member(root.user.id).htmlSafeDisplayName : QmlUtils.escapeString(root.user.displayName))
+            icon.name: "search-symbolic"
+            onClicked: {
+                ((QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RoomSearchPage'), {
+                    room: root.room,
+                    senderId: root.user.id
+                }, {
+                    title: i18nc("@action:title", "Search")
+                });
+                root.close();
+            }
+        }
+
         FormCard.FormButtonDelegate {
             text: i18n("Copy link")
             icon.name: "username-copy"

src/app/qml/UserSearchPage.qml

@@ -39,16 +39,6 @@ SearchPage {
         connection: root.connection
     }
 
-    listHeaderDelegate: Delegates.RoundedItemDelegate {
-        onClicked: _private.openManualUserDialog()
-
-        activeFocusOnTab: false // We handle moving to this item via up/down arrows, otherwise the tab order is wacky
-        text: i18n("Enter a user ID")
-        icon.name: "list-add-user"
-        icon.width: Kirigami.Units.gridUnit * 2
-        icon.height: Kirigami.Units.gridUnit * 2
-    }
-
     modelDelegate: Delegates.RoundedItemDelegate {
         id: userDelegate
         required property string userId
@@ -81,17 +71,26 @@ SearchPage {
             }
             QQC2.Label {
                 visible: userDelegate.directChatExists
-                text: i18n("Friends")
+                text: i18nc("@info", "Friends")
                 textFormat: Text.PlainText
                 color: Kirigami.Theme.positiveTextColor
             }
         }
     }
 
-    searchFieldPlaceholder: i18n("Find your friends…")
-    noSearchPlaceholderMessage: i18n("Enter text to start searching for your friends")
+    searchFieldPlaceholder: i18nc("@info:placeholder", "Find your friends…")
+    noSearchPlaceholderMessage: i18nc("@info:placeholder", "Enter text to start searching for your friends")
     noResultPlaceholderMessage: i18nc("@info:label", "No matches found")
 
+    noSearchHelpfulAction: noResultHelpfulAction
+
+    noResultHelpfulAction: Kirigami.Action {
+        icon.name: "list-add-user"
+        text: i18nc("@action:button", "Enter a User ID")
+        onTriggered: _private.openManualUserDialog()
+        tooltip: text
+    }
+
     Component {
         id: manualUserDialog
         ManualUserDialog {}
@@ -102,11 +101,14 @@ SearchPage {
         function openManualUserDialog() {
             let dialog = manualUserDialog.createObject(this, {
                 connection: root.connection
-            });
-            dialog.parent = root.Window.window.overlay;
+            }) as ManualUserDialog;
+            dialog.parent = root.QQC2.Overlay.overlay;
             dialog.accepted.connect(() => {
                 root.closeDialog();
             });
+            dialog.userSelected.connect(userId => {
+                root.connection.requestDirectChat(userId);
+            });
             dialog.open();
         }
     }

src/app/roommanager.cpp

@@ -54,10 +54,6 @@ RoomManager::RoomManager(QObject *parent)
     }
 #endif
 
-    m_lastRoomConfig = m_config->group(u"LastOpenRoom"_s);
-    m_lastSpaceConfig = m_config->group(u"LastOpenSpace"_s);
-    m_directChatsConfig = m_config->group(u"DirectChatsActive"_s);
-
     connect(this, &RoomManager::currentRoomChanged, this, [this]() {
         m_userListModel->setRoom(m_currentRoom);
         m_timelineModel->setRoom(m_currentRoom);
@@ -270,7 +266,7 @@ void RoomManager::viewEventSource(const QString &eventId)
     Q_EMIT showEventSource(eventId);
 }
 
-void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, NeochatRoomMember *sender, const QString &selectedText, const QString &hoveredLink)
+void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, const QString &selectedText, const QString &hoveredLink)
 {
     if (eventId.isEmpty()) {
         qWarning() << "Tried to open event menu with empty event id";
@@ -283,23 +279,15 @@ void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, Neoch
         return;
     }
     const auto &event = **it;
-    if (EventHandler::mediaInfo(room, &event).contains("mimeType"_L1)) {
-        Q_EMIT showFileMenu(eventId,
-                            sender,
+    Q_EMIT showDelegateMenu(eventId,
+                            room->qmlSafeMember(event.senderId()),
                             MessageComponentType::typeForEvent(event),
                             EventHandler::plainBody(room, &event),
+                            EventHandler::richBody(room, &event),
                             EventHandler::mediaInfo(room, &event)["mimeType"_L1].toString(),
-                            room->fileTransferInfo(eventId));
-        return;
-    }
-
-    Q_EMIT showMessageMenu(eventId,
-                           sender,
-                           MessageComponentType::typeForEvent(event),
-                           EventHandler::plainBody(room, &event),
-                           EventHandler::richBody(room, &event),
-                           selectedText,
-                           hoveredLink);
+                            room->fileTransferInfo(eventId),
+                            selectedText,
+                            hoveredLink);
 }
 
 bool RoomManager::hasOpenRoom() const
@@ -321,7 +309,7 @@ void RoomManager::loadInitialRoom()
     }
 
     if (m_isMobile) {
-        QString lastSpace = m_lastSpaceConfig.readEntry(m_connection->userId(), QString());
+        QString lastSpace = m_lastRoomConfig.readEntry(u"lastSpace"_s, QString());
         // We can't have empty keys in KConfig, so we stored it as "Home"
         if (lastSpace == u"Home"_s) {
             lastSpace.clear();
@@ -348,7 +336,11 @@ void RoomManager::openRoomForActiveConnection()
         setCurrentSpace({}, false);
         return;
     }
-    setCurrentSpace(m_lastSpaceConfig.readEntry(m_connection->userId(), QString()), true);
+    auto lastSpace = m_lastRoomConfig.readEntry(u"lastSpace"_s, QString());
+    if (lastSpace == u"Home"_s) {
+        lastSpace.clear();
+    }
+    setCurrentSpace(lastSpace, true);
 }
 
 UriResolveResult RoomManager::visitUser(User *user, const QString &action)
@@ -408,7 +400,7 @@ void RoomManager::joinRoom(Quotient::Connection *account, const QString &roomAli
         job.get(),
         &Quotient::BaseJob::finished,
         this,
-        [this, account](Quotient::BaseJob *finish) {
+        [this, account, roomAliasOrId](Quotient::BaseJob *finish) {
             if (finish->status() == Quotient::BaseJob::Success) {
                 connect(
                     account,
@@ -419,7 +411,7 @@ void RoomManager::joinRoom(Quotient::Connection *account, const QString &roomAli
                     },
                     Qt::SingleShotConnection);
             } else {
-                Q_EMIT showMessage(MessageType::Warning, i18n("Failed to join room<br />%1", finish->errorString()));
+                Q_EMIT showMessage(MessageType::Warning, i18n("Failed to join %1:<br />%2", roomAliasOrId, finish->errorString()));
             }
         },
         Qt::SingleShotConnection);
@@ -487,6 +479,7 @@ void RoomManager::setConnection(NeoChatConnection *connection)
     m_connection = connection;
 
     if (m_connection != nullptr) {
+        m_lastRoomConfig = m_config->group(m_connection->userId()).group(u"LastOpenRoom"_s);
         connect(m_connection, &NeoChatConnection::showMessage, this, &RoomManager::showMessage);
         connect(m_connection, &NeoChatConnection::createdRoom, this, [this](Quotient::Room *room) {
             resolveResource(room->id());
@@ -514,11 +507,7 @@ void RoomManager::setCurrentSpace(const QString &spaceId, bool setRoom)
 
     Q_EMIT currentSpaceChanged();
     if (m_connection) {
-        if (spaceId.isEmpty()) {
-            m_lastSpaceConfig.writeEntry(m_connection->userId(), u"Home"_s);
-        } else {
-            m_lastSpaceConfig.writeEntry(m_connection->userId(), spaceId);
-        }
+        m_lastRoomConfig.writeEntry(u"lastSpace"_s, spaceId.isEmpty() ? u"Home"_s : spaceId);
     }
 
     if (!setRoom) {
@@ -526,22 +515,20 @@ void RoomManager::setCurrentSpace(const QString &spaceId, bool setRoom)
     }
 
     // We intentionally don't want to open the last room on mobile
-    if (!m_isMobile) {
-        QString configSpaceId = spaceId;
-        // We can't have empty keys in KConfig, so it's stored as "Home"
-        if (spaceId.isEmpty()) {
-            configSpaceId = u"Home"_s;
-        }
-
-        const auto &lastRoom = m_lastRoomConfig.readEntry(configSpaceId, QString());
-        if (lastRoom.isEmpty()) {
-            if (spaceId != u"DM"_s && spaceId != u"Home"_s) {
-                resolveResource(spaceId, "no_join"_L1);
-            }
-        } else {
-            resolveResource(lastRoom, "no_join"_L1);
-        }
+    if (m_isMobile) {
+        return;
     }
+
+    // We can't have empty keys in KConfig, so it's stored as "Home"
+    if (const auto &lastRoom = m_lastRoomConfig.readEntry(spaceId.isEmpty() ? u"Home"_s : spaceId, QString()); !lastRoom.isEmpty()) {
+        resolveResource(lastRoom, "no_join"_L1);
+        return;
+    }
+    if (!spaceId.isEmpty() && spaceId != u"DM"_s) {
+        resolveResource(spaceId, "no_join"_L1);
+        return;
+    }
+    setCurrentRoom({});
 }
 
 void RoomManager::setCurrentRoom(const QString &roomId)

src/app/roommanager.h

@@ -222,8 +222,7 @@ public:
     /**
      * @brief Show a context menu for the given event.
      */
-    Q_INVOKABLE void
-    viewEventMenu(const QString &eventId, NeoChatRoom *room, NeochatRoomMember *sender, const QString &selectedText = {}, const QString &hoveredLink = {});
+    Q_INVOKABLE void viewEventMenu(const QString &eventId, NeoChatRoom *room, const QString &selectedText = {}, const QString &hoveredLink = {});
 
     /**
      * @brief Set a URL to be loaded as the initial room.
@@ -296,23 +295,15 @@ Q_SIGNALS:
     /**
      * @brief Request to show a menu for the given event.
      */
-    void showMessageMenu(const QString &eventId,
-                         const NeochatRoomMember *author,
-                         MessageComponentType::Type messageComponentType,
-                         const QString &plainText,
-                         const QString &htmlText,
-                         const QString &selectedText,
-                         const QString &hoveredLink);
-
-    /**
-     * @brief Request to show a menu for the given media event.
-     */
-    void showFileMenu(const QString &eventId,
-                      const NeochatRoomMember *author,
-                      MessageComponentType::Type messageComponentType,
-                      const QString &plainText,
-                      const QString &mimeType,
-                      const FileTransferInfo &progressInfo);
+    void showDelegateMenu(const QString &eventId,
+                          const NeochatRoomMember *author,
+                          MessageComponentType::Type messageComponentType,
+                          const QString &plainText,
+                          const QString &richtText,
+                          const QString &mimeType,
+                          const FileTransferInfo &progressInfo,
+                          const QString &selectedText,
+                          const QString &hoveredLink);
 
     /**
      * @brief Show the direct chat confirmation dialog.
@@ -353,8 +344,6 @@ private:
     QString m_arg;
     KSharedConfig::Ptr m_config;
     KConfigGroup m_lastRoomConfig;
-    KConfigGroup m_lastSpaceConfig;
-    KConfigGroup m_directChatsConfig;
 
     RoomListModel *m_roomListModel;
     SortFilterRoomListModel *m_sortFilterRoomListModel;

src/chatbar/ChatBar.qml

@@ -253,7 +253,8 @@ QQC2.Control {
                     placeholderText: root.currentRoom.usesEncryption ? i18nc("@placeholder", "Send an encrypted message…") : root.currentRoom.mainCache.attachmentPath.length > 0 ? i18nc("@placeholder", "Set an attachment caption…") : i18nc("@placeholder", "Send a message…")
                     verticalAlignment: TextEdit.AlignVCenter
                     wrapMode: TextEdit.Wrap
-                    textFormat: TextEdit.MarkdownText
+                    // This has to stay PlainText or else formatting starts breaking in strange ways
+                    textFormat: TextEdit.PlainText
 
                     Accessible.description: placeholderText
 

src/chatbar/CompletionMenu.qml

@@ -92,6 +92,7 @@ QQC2.Popup {
                         Delegates.SubtitleContentItem {
                             itemDelegate: completionDelegate
                             labelItem.textFormat: Text.PlainText
+                            labelItem.clip: true // Intentional to limit insane Unicode in display names
                             subtitle: completionDelegate.subtitle ?? ""
                             subtitleItem.textFormat: Text.PlainText
                         }

src/chatbar/EmojiGrid.qml

@@ -15,7 +15,7 @@ QQC2.ScrollView {
     readonly property int emojisPerRow: emojis.width / targetIconSize
     required property bool withCustom
     readonly property var searchCategory: withCustom ? EmojiModel.Search : EmojiModel.SearchNoCustom
-    required property QtObject header
+    required property Item header
     property bool stickers: false
 
     signal chosen(string unicode)
@@ -75,7 +75,7 @@ QQC2.ScrollView {
                     shortName: modelData.shortName,
                     unicode: modelData.unicode,
                     categoryIconSize: root.targetIconSize
-                });
+                }) as EmojiTonesPicker;
                 tones.open();
                 tones.forceActiveFocus();
             }
@@ -85,14 +85,14 @@ QQC2.ScrollView {
         Kirigami.PlaceholderMessage {
             anchors.centerIn: parent
             icon.name: root.stickers ? "stickers" : "preferences-desktop-emoticons"
-            text: root.stickers ? i18n("No stickers") : i18n("No emojis")
+            text: root.stickers ? i18nc("@info", "No stickers") : i18nc("@info", "No emojis")
             visible: emojis.count === 0
         }
     }
     Component {
         id: tonesPopupComponent
         EmojiTonesPicker {
-            onChosen: root.chosen(emoji)
+            onChosen: emoji => root.chosen(emoji)
         }
     }
 }

src/chatbar/EmojiPicker.qml

@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
@@ -51,14 +53,14 @@ ColumnLayout {
             Kirigami.Action {
                 id: emojis
                 icon.name: "smiley"
-                text: i18n("Emojis")
+                text: i18nc("@action:button", "Emojis")
                 checked: true
                 onTriggered: root.selectedType = 0
             },
             Kirigami.Action {
                 id: stickers
                 icon.name: "stickers"
-                text: i18n("Stickers")
+                text: i18nc("@action:button", "Stickers")
                 onTriggered: root.selectedType = 1
             }
         ]
@@ -107,7 +109,7 @@ ColumnLayout {
         id: searchField
         Layout.margins: Kirigami.Units.smallSpacing
         Layout.fillWidth: true
-        visible: selectedType === 0
+        visible: root.selectedType === 0
 
         /**
          * The focus is manged by the parent and we don't want to use the standard
@@ -127,17 +129,17 @@ ColumnLayout {
         header: categories
         Keys.forwardTo: searchField
         stickers: root.selectedType === 1
-        onStickerChosen: stickerModel.postSticker(emoticonFilterModel.mapToSource(emoticonFilterModel.index(index, 0)).row)
+        onStickerChosen: index => stickerModel.postSticker(emoticonFilterModel.mapToSource(emoticonFilterModel.index(index, 0)).row)
     }
 
     Kirigami.Separator {
-        visible: showQuickReaction
+        visible: root.showQuickReaction
         Layout.fillWidth: true
         Layout.preferredHeight: 1
     }
 
     QQC2.ScrollView {
-        visible: showQuickReaction
+        visible: root.showQuickReaction
         Layout.fillWidth: true
         Layout.preferredHeight: root.categoryIconSize + QQC2.ScrollBar.horizontal.height
         QQC2.ScrollBar.horizontal.height: QQC2.ScrollBar.horizontal.visible ? QQC2.ScrollBar.horizontal.implicitHeight : 0
@@ -149,6 +151,7 @@ ColumnLayout {
             model: ["👍", "👎", "😄", "🎉", "😕", "❤", "🚀", "👀"]
 
             delegate: EmojiDelegate {
+                required property string modelData
                 emoji: modelData
 
                 height: root.categoryIconSize
@@ -184,11 +187,14 @@ ColumnLayout {
     Component {
         id: emojiDelegate
         Kirigami.NavigationTabButton {
+            required property string emoji
+            required property int index
+            required property string name
             width: root.categoryIconSize
             height: width
-            checked: categories.currentIndex === model.index
-            text: modelData ? modelData.emoji : ""
-            QQC2.ToolTip.text: modelData ? modelData.name : ""
+            checked: categories.currentIndex === index
+            text: emoji
+            QQC2.ToolTip.text: name
             QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
             QQC2.ToolTip.visible: hovered
             onClicked: {
@@ -201,21 +207,25 @@ ColumnLayout {
     Component {
         id: stickerDelegate
         Kirigami.NavigationTabButton {
+            id: sticker
+            required property string name
+            required property int index
+            required property string emoji
             width: root.categoryIconSize
             height: width
-            checked: stickerModel.packIndex === model.index
+            checked: stickerModel.packIndex === index
             padding: Kirigami.Units.largeSpacing
 
             contentItem: Image {
-                source: model.url
+                source: sticker.emoji
                 fillMode: Image.PreserveAspectFit
                 sourceSize.width: width
                 sourceSize.height: height
             }
-            QQC2.ToolTip.text: model.name
+            QQC2.ToolTip.text: name
             QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
-            QQC2.ToolTip.visible: hovered && !!model.name
-            onClicked: stickerModel.packIndex = model.index
+            QQC2.ToolTip.visible: hovered && !!name
+            onClicked: stickerModel.packIndex = index
         }
     }
 

src/devtools/models/statemodel.cpp

@@ -46,6 +46,7 @@ void StateModel::loadState()
     beginResetModel();
     m_stateEvents.clear();
     if (!m_room) {
+        endResetModel();
         return;
     }
     const auto keys = m_room->currentState().events().keys();

src/libneochat/CMakeLists.txt

@@ -63,7 +63,14 @@ ecm_add_qml_module(LibNeoChat GENERATE_PLUGIN_SOURCE
         qml/CreateRoomDialog.qml
         qml/CreateSpaceDialog.qml
     DEPENDENCIES
-        com.github.quotient_im.libquotient
+        io.github.quotient_im.libquotient
+)
+
+ecm_qt_declare_logging_category(LibNeoChat
+    HEADER "general_logging.h"
+    IDENTIFIER "GENERAL"
+    CATEGORY_NAME "org.kde.neochat"
+    DEFAULT_SEVERITY Info
 )
 
 ecm_qt_declare_logging_category(LibNeoChat
@@ -105,3 +112,8 @@ if(NOT ANDROID)
     )
     target_compile_definitions(LibNeoChat PUBLIC -DHAVE_ICU)
 endif()
+
+if (TARGET KUnifiedPush)
+    target_compile_definitions(LibNeoChat PUBLIC -DHAVE_KUNIFIEDPUSH)
+    target_link_libraries(LibNeoChat PUBLIC KUnifiedPush)
+endif()

src/libneochat/accountmanager.cpp

@@ -12,6 +12,8 @@
 
 #include "neochatroom.h"
 
+#include "general_logging.h"
+
 using namespace Qt::StringLiterals;
 
 AccountManager::AccountManager(bool testMode, QObject *parent)
@@ -23,10 +25,10 @@ AccountManager::AccountManager(bool testMode, QObject *parent)
             loadAccountsFromCache();
         });
     } else {
-        auto c = new NeoChatConnection(QUrl(u"https://localhost:1234"_s), this);
-        c->assumeIdentity(u"@user:localhost:1234"_s, u"device_1234"_s, u"token_1234"_s);
-        m_accountRegistry->add(c);
-        c->syncLoop();
+        auto connection = new NeoChatConnection(QUrl(u"https://localhost:1234"_s), this);
+        connection->assumeIdentity(u"@user:localhost:1234"_s, u"device_1234"_s, u"token_1234"_s);
+        m_accountRegistry->add(connection);
+        connection->syncLoop();
     }
 }
 
@@ -37,48 +39,45 @@ Quotient::AccountRegistry *AccountManager::accounts()
 
 void AccountManager::loadAccountsFromCache()
 {
-    const auto accounts = Quotient::SettingsGroup("Accounts"_L1).childGroups();
-    for (const auto &accountId : accounts) {
+    for (const auto &accountId : Quotient::SettingsGroup("Accounts"_L1).childGroups()) {
         Quotient::AccountSettings account{accountId};
         m_accountsLoading += accountId;
         Q_EMIT accountsLoadingChanged();
-        if (!account.homeserver().isEmpty()) {
-            auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account.userId());
-            connect(accessTokenLoadingJob, &QKeychain::Job::finished, this, [accountId, this, accessTokenLoadingJob](QKeychain::Job *) {
-                Quotient::AccountSettings account{accountId};
-                QString accessToken;
-                if (accessTokenLoadingJob->error() == QKeychain::Error::NoError) {
-                    accessToken = QString::fromLatin1(accessTokenLoadingJob->binaryData());
-                } else {
-                    return;
-                }
-
-                auto connection = new NeoChatConnection(account.homeserver());
-                m_connectionsLoading[accountId] = connection;
-                connect(connection, &NeoChatConnection::connected, this, [this, connection, accountId] {
-                    connection->loadState();
-                    if (connection->allRooms().size() == 0 || connection->allRooms()[0]->currentState().get<Quotient::RoomCreateEvent>()) {
-                        addConnection(connection);
-                        m_accountsLoading.removeAll(connection->userId());
-                        m_connectionsLoading.remove(accountId);
-                        Q_EMIT accountsLoadingChanged();
-                    } else {
-                        connect(
-                            connection->allRooms()[0],
-                            &NeoChatRoom::baseStateLoaded,
-                            this,
-                            [this, connection, accountId]() {
-                                addConnection(connection);
-                                m_accountsLoading.removeAll(connection->userId());
-                                m_connectionsLoading.remove(accountId);
-                                Q_EMIT accountsLoadingChanged();
-                            },
-                            Qt::SingleShotConnection);
-                    }
-                });
-                connection->assumeIdentity(account.userId(), account.deviceId(), accessToken);
-            });
+        if (account.homeserver().isEmpty()) {
+            continue;
         }
+        auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account.userId());
+        connect(accessTokenLoadingJob, &QKeychain::Job::finished, this, [accountId, this, accessTokenLoadingJob](QKeychain::Job *) {
+            if (accessTokenLoadingJob->error() != QKeychain::Error::NoError) {
+                return;
+            }
+
+            Quotient::AccountSettings account{accountId};
+            auto connection = new NeoChatConnection(account.homeserver());
+            m_connectionsLoading[accountId] = connection;
+            connect(connection, &NeoChatConnection::connected, this, [this, connection, accountId] {
+                connection->loadState();
+                if (connection->allRooms().size() == 0 || connection->allRooms()[0]->currentState().get<Quotient::RoomCreateEvent>()) {
+                    addConnection(connection);
+                    m_accountsLoading.removeAll(connection->userId());
+                    m_connectionsLoading.remove(accountId);
+                    Q_EMIT accountsLoadingChanged();
+                } else {
+                    connect(
+                        connection->allRooms()[0],
+                        &NeoChatRoom::baseStateLoaded,
+                        this,
+                        [this, connection, accountId]() {
+                            addConnection(connection);
+                            m_accountsLoading.removeAll(connection->userId());
+                            m_connectionsLoading.remove(accountId);
+                            Q_EMIT accountsLoadingChanged();
+                        },
+                        Qt::SingleShotConnection);
+                }
+            });
+            connection->assumeIdentity(account.userId(), account.deviceId(), QString::fromLatin1(accessTokenLoadingJob->binaryData()));
+        });
     }
 }
 
@@ -94,7 +93,7 @@ void AccountManager::saveAccessTokenToKeyChain(NeoChatConnection *connection)
     }
     const auto userId = connection->userId();
 
-    qDebug() << "Save the access token to the keychain for " << userId;
+    qCDebug(GENERAL) << "Save the access token to the keychain for " << userId;
     auto job = new QKeychain::WritePasswordJob(qAppName());
     job->setAutoDelete(true);
     job->setKey(userId);
@@ -109,7 +108,7 @@ void AccountManager::saveAccessTokenToKeyChain(NeoChatConnection *connection)
 
 QKeychain::ReadPasswordJob *AccountManager::loadAccessTokenFromKeyChain(const QString &userId)
 {
-    qDebug() << "Reading access token from the keychain for" << userId;
+    qCDebug(GENERAL) << "Reading access token from the keychain for" << userId;
     auto job = new QKeychain::ReadPasswordJob(qAppName(), this);
     job->setKey(userId);
 
@@ -205,8 +204,7 @@ void AccountManager::dropConnection(const QString &userId)
     if (dropConnectionLoading(m_connectionsLoading.value(userId, nullptr))) {
         return;
     }
-    const auto connection = dynamic_cast<NeoChatConnection *>(m_accountRegistry->get(userId));
-    if (connection) {
+    if (const auto connection = dynamic_cast<NeoChatConnection *>(m_accountRegistry->get(userId))) {
         dropRegistry(connection);
     }
 }

src/libneochat/chatdocumenthandler.cpp

@@ -330,7 +330,7 @@ QString ChatDocumentHandler::getText() const
         qCWarning(ChatDocumentHandling) << "getText called with no QQuickTextDocument available.";
         return {};
     }
-    return document()->toRawText();
+    return document()->toPlainText();
 }
 
 void ChatDocumentHandler::pushMention(const Mention mention) const

src/libneochat/chatdocumenthandler.h

@@ -116,12 +116,14 @@ Q_SIGNALS:
     void textItemChanged();
     void roomChanged();
 
+public Q_SLOTS:
+    void updateCompletion() const;
+
 private:
     ChatBarType::Type m_type = ChatBarType::None;
     QPointer<QQuickItem> m_textItem;
     QTextDocument *document() const;
 
-    void updateCompletion() const;
     int completionStartIndex() const;
 
     QPointer<NeoChatRoom> m_room;

src/libneochat/delegatesizehelper.cpp

@@ -186,6 +186,10 @@ int DelegateSizeHelper::availablePercentageWidth() const
 qreal DelegateSizeHelper::availableWidth() const
 {
     qreal absoluteWidth = maxAvailableWidth() * availablePercentageWidth() * 0.01;
+    // We want to use all available space for a horizontal line.
+    if (m_startPercentWidth == m_endPercentWidth) {
+        return std::round(absoluteWidth);
+    }
     return std::round(std::min(absoluteWidth, maxWidth()));
 }
 

src/libneochat/enums/neochatroomtype.h

@@ -27,6 +27,7 @@ public:
         Favorite, /**< The room is set as a favourite. */
         Direct, /**< The room is a direct chat. */
         Normal, /**< The default category for a joined room. */
+        ServerNotice, /**< Official messages from the server. */
         Deprioritized, /**< The room is set as low priority. */
         Space, /**< The room is a space. */
         AddDirect, /**< So we can show the add friend delegate. */
@@ -36,6 +37,9 @@ public:
 
     static NeoChatRoomType::Types typeForRoom(const NeoChatRoom *room)
     {
+        if (room->isServerNoticeRoom()) {
+            return NeoChatRoomType::ServerNotice;
+        }
         if (room->isSpace()) {
             return NeoChatRoomType::Space;
         }
@@ -69,6 +73,8 @@ public:
             return i18n("Low priority");
         case NeoChatRoomType::Space:
             return i18n("Spaces");
+        case NeoChatRoomType::ServerNotice:
+            return i18nc("@info Meaning: official information messages from your server", "Server Notices");
         default:
             return {};
         }