Increase frameworks dependency version to 6.16

de97275a38 here in NeoChat depends on
de05764b4764d5641c647bb75bdf184522f63989 in Kirigami. However, that
Kirigami commit only landed in Frameworks 6.16, while the minimum
Frameworks version specified here in NeoChat's CMake remained at 6.12.

Because the CMake dependency version wasn't set to 6.16, a potential
build-time error was converted into a potential runtime error. And
that's exactly what happened for NeoChat's 25.08 Flatpak packaging,
because the KDE Runtime doesn't yet have Frameworks 6.16 in it.

CCBUG: 508298

.contextProperties.ini

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

.craft.ini

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

.flatpak-manifest.json

@@ -2,7 +2,7 @@
     "id": "org.kde.neochat",
     "branch": "master",
     "runtime": "org.kde.Platform",
-    "runtime-version": "6.8",
+    "runtime-version": "6.9",
     "sdk": "org.kde.Sdk",
     "command": "neochat",
     "tags": [
@@ -20,8 +20,16 @@
         "--talk-name=org.kde.kwalletd5",
         "--talk-name=org.kde.StatusNotifierWatcher",
         "--talk-name=org.freedesktop.secrets",
+        "--talk-name=org.kde.kuiserver",
         "--own-name=org.kde.StatusNotifierItem-2-2"
     ],
+    "cleanup": [
+        "/include",
+        "/lib/*.a",
+        "/lib/cmake",
+        "/lib/pkgconfig",
+        "/share/ndk-modules"
+    ],
     "modules": [
         {
             "name": "kirigamiaddons",
@@ -82,8 +90,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.gnome.org/sources/libsecret/0.21/libsecret-0.21.6.tar.xz",
-                    "sha256": "747b8c175be108c880d3adfb9c3537ea66e520e4ad2dccf5dce58003aeeca090",
+                    "url": "https://download.gnome.org/sources/libsecret/0.21/libsecret-0.21.7.tar.xz",
+                    "sha256": "6b452e4750590a2b5617adc40026f28d2f4903de15f1250e1d1c40bfd68ed55e",
                     "x-checker-data": {
                         "type": "gnome",
                         "name": "libsecret",
@@ -150,22 +158,19 @@
             "builddir": true
         },
         {
-            "name": "qcoro",
+            "name": "kunifiedpush",
             "buildsystem": "cmake-ninja",
-            "config-opts": [
-                "-DQCORO_BUILD_EXAMPLES=OFF",
-                "-DBUILD_TESTING=OFF"
-            ],
+            "builddir": true,
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/danvratil/qcoro/archive/refs/tags/v0.11.0.tar.gz",
-                    "sha256": "9942c5b4c533192f6c5954dc6d10178b3829075e6a621b67df73f0a4b74d8297",
+                    "url": "https://download.kde.org/stable/release-service/25.04.3/src/kunifiedpush-25.04.3.tar.xz",
+                    "sha256": "a16ffe4117b14baa02f3b8ae7de9e509a17359c1b67dcd851aef4f3c3661a1df",
                     "x-checker-data": {
                         "type": "anitya",
-                        "project-id": 236236,
+                        "project-id": 8763,
                         "stable-only": true,
-                        "url-template": "https://github.com/danvratil/qcoro/archive/refs/tags/v$version.tar.gz"
+                        "url-template": "https://download.kde.org/stable/release-service/$version/src/kunifiedpush-$version.tar.xz"
                     }
                 }
             ]

.gitlab-ci.yml

@@ -12,7 +12,7 @@ include:
       - /gitlab-templates/linux-qt6.yml
       - /gitlab-templates/linux-qt6-next.yml
       - /gitlab-templates/windows-qt6.yml
-      # - /gitlab-templates/freebsd-qt6.yml
+      - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/flatpak.yml
       - /gitlab-templates/snap-snapcraft-lxd.yml
       - /gitlab-templates/craft-android-qt6-apks.yml

.kde-ci.yml

@@ -34,6 +34,7 @@ Dependencies:
     'require':
       'frameworks/kdbusaddons': '@latest-kf6'
       'frameworks/purpose': '@latest-kf6'
+      'libraries/kunifiedpush': '@latest-kf6'
 
   - 'on': ['Linux']
     'require':

CMakeLists.txt

@@ -8,13 +8,13 @@ cmake_minimum_required(VERSION 3.16)
 
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "25")
-set(RELEASE_SERVICE_VERSION_MINOR "03")
+set(RELEASE_SERVICE_VERSION_MINOR "11")
 set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
 
-set(KF_MIN_VERSION "6.6")
+set(KF_MIN_VERSION "6.16")
 set(QT_MIN_VERSION "6.5")
 
 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
@@ -56,7 +56,7 @@ ecm_setup_version(${PROJECT_VERSION}
     VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
 )
 
-find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg WebView)
+find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg TextToSpeech WebView)
 set_package_properties(Qt6 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
@@ -75,7 +75,7 @@ set_package_properties(KF6Kirigami PROPERTIES
     TYPE REQUIRED
     PURPOSE "Kirigami application UI framework"
 )
-find_package(KF6KirigamiAddons 0.7.2 REQUIRED)
+find_package(KF6KirigamiAddons 1.6.0 REQUIRED)
 
 if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT NEOCHAT_FLATPAK AND NOT NEOCHAT_APPIMAGE)
     find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Purpose)
@@ -107,7 +107,7 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU)
     find_package(KF6DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()
 
-find_package(QuotientQt6 0.9)
+find_package(QuotientQt6 0.9.1)
 set_package_properties(QuotientQt6 PROPERTIES
     TYPE REQUIRED
     DESCRIPTION "Qt wrapper around Matrix API"
@@ -147,16 +147,24 @@ set_package_properties(KF6DocTools PROPERTIES DESCRIPTION
     TYPE OPTIONAL
 )
 
-find_package(KUnifiedPush QUIET)
-set_package_properties(KUnifiedPush PROPERTIES
-    TYPE OPTIONAL
-    PURPOSE "Push notification support"
-    URL "https://invent.kde.org/libraries/kunifiedpush"
-)
+option(WITH_UNIFIEDPUSH "Build with KUnifiedPush support" ON)
+
+if (ANDROID OR APPLE OR WIN32 OR HAIKU)
+    set(WITH_UNIFIEDPUSH OFF)
+endif()
+
+if (WITH_UNIFIEDPUSH)
+    find_package(KUnifiedPush)
+    set_package_properties(KUnifiedPush PROPERTIES
+        TYPE REQUIRED
+        PURPOSE "Push notification support"
+        URL "https://invent.kde.org/libraries/kunifiedpush"
+    )
+endif()
 
 if(ANDROID)
     find_package(Sqlite3)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/android/version.gradle.in ${CMAKE_BINARY_DIR}/version.gradle)
+    set(BUILD_TESTING FALSE)
 endif()
 
 ki18n_install(po)
@@ -171,9 +179,9 @@ add_definitions(-DQT_NO_FOREACH)
 add_subdirectory(src)
 
 if (BUILD_TESTING)
-    find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
+    find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test HttpServer)
     add_subdirectory(autotests)
-    add_subdirectory(appiumtests)
+    # add_subdirectory(appiumtests)
     if (NOT ANDROID)
         add_subdirectory(memorytests)
     endif()
@@ -184,7 +192,7 @@ if(KF6DocTools_FOUND)
     add_subdirectory(doc)
 endif()
 
-feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
 if (NOT ANDROID)
     file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES src/*.cpp src/*.h)

REUSE.toml

@@ -42,13 +42,13 @@ SPDX-FileCopyrightText = "2021 Carl Schwan <carlschwan@kde.org>"
 SPDX-License-Identifier = "BSD-2-Clause"
 
 [[annotations]]
-path = "src/neochatconfig.kcfg"
+path = "src/app/neochatconfig.kcfg"
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2020-2021 Carl Schwan <carlschwan@kde.org>, Tobias Fella <tobias.fella@kde.org>"
 SPDX-License-Identifier = "BSD-2-Clause"
 
 [[annotations]]
-path = "src/neochat.notifyrc"
+path = "src/app/neochat.notifyrc"
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2020 Tobias Fella <tobias.fella@kde.org>"
 SPDX-License-Identifier = "BSD-2-Clause"
@@ -88,3 +88,9 @@ path = "memorytests/memtest-sync.json"
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2024 James Graham <james.h.graham@protonmail.com>"
 SPDX-License-Identifier = "BSD-2-Clause"
+
+[[annotations]]
+path = ".contextProperties.ini"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2025 Tobias Fella <tobias.fella@kde.org>"
+SPDX-License-Identifier = "BSD-2-Clause"

android/build.gradle

@@ -23,8 +23,7 @@ repositories {
 
 
 apply plugin: 'com.android.application'
-apply from: '../version.gradle'
-def timestamp = (int)(new Date().getTime()/1000)
+apply from: '../ecm-version.gradle'
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
@@ -79,9 +78,9 @@ android {
         targetSdkVersion qtTargetSdkVersion
         applicationId "org.kde.neochat"
         namespace "org.kde.neochat"
-        versionCode timestamp
-        versionName projectVersionFull
-        manifestPlaceholders = [versionName: projectVersionFull, versionCode: timestamp]
+        versionCode ecmVersionCode
+        versionName ecmVersionName
+        manifestPlaceholders = [versionName: ecmVersionName, versionCode: ecmVersionCode]
     }
 
     packagingOptions {

android/version.gradle.in

@@ -1,6 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Volker Krause <vkrause@kde.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-ext {
-    projectVersionFull = "@NEOCHAT_VERSION@"
-}

autotests/CMakeLists.txt

@@ -3,6 +3,10 @@
 
 enable_testing()
 
+add_library(neochat_server STATIC server.cpp)
+
+target_link_libraries(neochat_server PUBLIC Qt::HttpServer QuotientQt6)
+
 add_definitions(-DDATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" )
 
 ecm_add_test(
@@ -11,13 +15,11 @@ ecm_add_test(
     TEST_NAME neochatroomtest
 )
 
-if (NOT $ENV{KDE_CI})
-    ecm_add_test(
-        texthandlertest.cpp
-        LINK_LIBRARIES neochat Qt::Test
-        TEST_NAME texthandlertest
-    )
-endif()
+ecm_add_test(
+    texthandlertest.cpp
+    LINK_LIBRARIES neochat Qt::Test
+    TEST_NAME texthandlertest
+)
 
 ecm_add_test(
     delegatesizehelpertest.cpp
@@ -87,6 +89,12 @@ ecm_add_test(
 
 ecm_add_test(
     actionstest.cpp
-    LINK_LIBRARIES neochat Qt::Test
+    LINK_LIBRARIES neochat Qt::Test neochat_server
     TEST_NAME actionstest
 )
+
+ecm_add_test(
+    roommanagertest.cpp
+    LINK_LIBRARIES neochat Qt::Test neochat_server
+    TEST_NAME roommanagertest
+)

autotests/actionstest.cpp

@@ -6,9 +6,11 @@
 #include <QSignalSpy>
 #include <QVariantList>
 
+#include "accountmanager.h"
 #include "chatbarcache.h"
 #include "models/actionsmodel.h"
 
+#include "server.h"
 #include "testutils.h"
 
 using namespace Quotient;
@@ -21,10 +23,12 @@ class ActionsTest : public QObject
 
 private:
     Connection *connection = nullptr;
-    TestUtils::TestRoom *room = nullptr;
+    NeoChatRoom *room = nullptr;
 
     void expectMessage(const QString &actionName, const QString &args, MessageType::Type type, const QString &message);
 
+    Server server;
+
 private Q_SLOTS:
     void initTestCase();
     void testActions();
@@ -34,8 +38,23 @@ private Q_SLOTS:
 
 void ActionsTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-min-sync.json"));
+    Connection::setRoomType<NeoChatRoom>();
+    server.start();
+    KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));
+    auto accountManager = new AccountManager(true);
+    QSignalSpy spy(accountManager, &AccountManager::connectionAdded);
+    connection = accountManager->accounts()->front();
+    auto roomId = server.createRoom(u"@user:localhost:1234"_s);
+    server.inviteUser(roomId, u"@invited:example.com"_s);
+    server.banUser(roomId, u"@banned:example.com"_s);
+    server.joinUser(roomId, u"@example:example.com"_s);
+
+    QSignalSpy syncSpy(connection, &Connection::syncDone);
+    // We need to wait for two syncs, as the next one won't have the changes yet
+    QVERIFY(syncSpy.wait());
+    QVERIFY(syncSpy.wait());
+    room = dynamic_cast<NeoChatRoom *>(connection->room(roomId));
+    QVERIFY(room);
 }
 
 void ActionsTest::testActions_data()
@@ -90,7 +109,7 @@ static ActionsModel::Action findAction(const QString &name)
 void ActionsTest::expectMessage(const QString &actionName, const QString &args, MessageType::Type type, const QString &message)
 {
     auto action = findAction(actionName);
-    QSignalSpy spy(room, &TestUtils::TestRoom::showMessage);
+    QSignalSpy spy(room, &NeoChatRoom::showMessage);
     auto result = action.handle(args, room, nullptr);
     auto expected = QVariantList {type, message};
     auto signal = spy.takeFirst();
@@ -106,14 +125,26 @@ void ActionsTest::testInvite()
     QCOMPARE(room->memberState(u"@banned:example.com"_s), Membership::Ban);
     expectMessage(u"invite"_s, connection->userId(), MessageType::Positive, u"You are already in this room."_s);
     QCOMPARE(room->memberState(connection->userId()), Membership::Join);
-    expectMessage(u"invite"_s, u"@example:example.org"_s, MessageType::Information, u"@example:example.org is already in this room."_s);
-    QCOMPARE(room->memberState(u"@example:example.org"_s), Membership::Join);
+    expectMessage(u"invite"_s, u"@example:example.com"_s, MessageType::Information, u"@example:example.com is already in this room."_s);
+    QCOMPARE(room->memberState(u"@example:example.com"_s), Membership::Join);
 
     QCOMPARE(room->memberState(u"@user:example.com"_s), Membership::Leave);
     expectMessage(u"invite"_s, u"@user:example.com"_s, MessageType::Positive, u"@user:example.com was invited into this room."_s);
 
-    //TODO mock server, wait for invite state to change
-    //TODO QCOMPARE(room->memberState(u"@user:example.com"_s), Membership::Invite);
+    QSignalSpy spy(room, &NeoChatRoom::changed);
+    QVERIFY(spy.wait());
+
+    auto tries = 0;
+
+    while (room->memberState(u"@user:example.com"_s) != Membership::Invite) {
+        QVERIFY(spy.wait());
+        tries += 1;
+        if (tries > 3) {
+            QVERIFY(false);
+        }
+    }
+
+    QCOMPARE(room->memberState(u"@user:example.com"_s), Membership::Invite);
 }
 
 QTEST_MAIN(ActionsTest)

autotests/chatbarcachetest.cpp

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

autotests/data/localhost.crt

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDNTCCAh2gAwIBAgIUXbyWfTfcvVLrVB1qx36pW/7IkwMwDQYJKoZIhvcNAQEL
+BQAwQjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UE
+CgwTRGVmYXVsdCBDb21wYW55IEx0ZDAgFw0yNDEyMjQxNTAxMDNaGA8yNTcyMDcy
+NDE1MDEwM1owQjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEc
+MBoGA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKlxZ540TQ1uUDAR7ZJ9ue0PzcD2dPmblIIddyekvZS59V7X
+drhamclXpHE2EelR87Sexst0BaHH/jmrHwxCtwbeXHZ8ueJHkGHJ5DLZCCiwfG+Q
+gml7wlSXxXz37vie2tdlZh2yJSM8yvLAYceHb2zOskaGvul7ZITIS0JrPc3o6VZk
++MYGkYtA2JfUsv3jH4oQbxOf7RXqhWNAXbB+3hlwRBwMIdyoBNK6YS9QSrTeS9jj
+UqgO5QmaQZOVvpaPf1Y/rHHLd2Qa6+a/cCJ1sr2biagb75AihpQFsK/oy6D1PP70
+zTe7hPWn/efEpmtCV7CQ8ti4cRu0Kjy0T8grtCsCAwEAAaMhMB8wHQYDVR0OBBYE
+FIFlylzwADNLfgTDNkhFeFelaEDxMA0GCSqGSIb3DQEBCwUAA4IBAQBQ2rw4GLIU
+v+GY7Qru9LttkrQPd2bZXKxDMd/jT+wjmMVtqS4MAsCuDYwaYLjU1aWyqy0mN+lY
+A17kD0VjBNBy45sYqkZveY0ks8mCScBemtrIDmjz2tiueecBIEASwEPBOZgv5/MV
+cz864FiChF+2r8Zl8bhycGy9DEpRjzYKvIQWSDHQ3zpuh3iBnjfoieLHWX2kKCpk
+ouS3V6485rHNCWsZT5IcCwfBFQkOuWRJpIazpz4AfwZh1TK9+bgiKA5EyZjSNrKw
+xGQSpMSTRQMB0/FOCL/AixhN9unVFUViqUcdtSfoHE1VyBHv9kDT/cYms/Xl4B0t
+/ZSQJ/D/Km1+
+-----END CERTIFICATE-----

autotests/data/localhost.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCpcWeeNE0NblAw
+Ee2SfbntD83A9nT5m5SCHXcnpL2UufVe13a4WpnJV6RxNhHpUfO0nsbLdAWhx/45
+qx8MQrcG3lx2fLniR5BhyeQy2QgosHxvkIJpe8JUl8V89+74ntrXZWYdsiUjPMry
+wGHHh29szrJGhr7pe2SEyEtCaz3N6OlWZPjGBpGLQNiX1LL94x+KEG8Tn+0V6oVj
+QF2wft4ZcEQcDCHcqATSumEvUEq03kvY41KoDuUJmkGTlb6Wj39WP6xxy3dkGuvm
+v3AidbK9m4moG++QIoaUBbCv6Mug9Tz+9M03u4T1p/3nxKZrQlewkPLYuHEbtCo8
+tE/IK7QrAgMBAAECggEAH9qmeKrra2F4KLlOGNKS//qPGz4Z+ozhi95/NpA1Zb7Z
+3pUSCBFcROo5i2D3WA4kiymoRLpQjrv60puVcCggoWVvK4VCKsR6Y6/hOx/q9T9M
+fWrE4ZC3FVEc+uPfZJT0nja9TkrdyXSV0LITD8Ap1eI7yJ9vR5R/bqj64QcpLMrU
+QeoQIy1oTMR+qdjj33duyRwBZU3Yf8FRB2iW6OILZ8hzFo1jngec7dph9a1RK4e0
+mEPdc9ywsKlDM7P0Y7zdmjar5XtQn87GiwNhz23f1fzCC2axLtOW0Xm4e4Qumehb
+WrIi6Vfq8IWMglU7QrBJ7iR0Ls+XoKA5GxomV2IJZQKBgQDoIkOl5YGPQ3iGR+WK
+e5/2Ml4G/uURzYiOlzSsyfoPXyO4EI2BJd5HkH+EvfgRx4xKkxUZRJdzR7llYPl8
+BFYcFitvhO8SbD0mNAB5YW7f+3v1pgEN2umzoKd389Zx5WqTZ7YB1VG5RN/Q1JJL
+2JM0Xgamq2vNtx3roRPxDBeW7QKBgQC63R/bmACJbgIzfaVBX4Zie3NQG0/Hf+gF
+LnBwUmQDZOR7MY+kSiIUVMn3NuZRiCSCFBVwApruyK8r535JCibTVm5PWjvhFddY
+LgaPOCKGlm9TLScjoH1pErYgG3uJ4nXeRfXhg4mco6EkrC7RzQywrd0VDoqpuc1Y
+EKfEsYk8dwKBgE+mSh3nNOBKX1V73+f3aTiZqaeu2DyWkG+UtE9BclrJ40Cp9VPG
+AZH+o7KRWEgJdzqzYv7riSfWCWgesRv7hOxYMwktzLY+i3DLUQpVAy05ZhwwnJX7
+ckrfKfc/pGoqNLplUI8qecMfPciy14vMwR2r0Y5orTHFzi9mcqg35PQ1AoGAW2LX
+OLq+0HdHhk0Va8I+450CSRQCUUvhed87SANTPEG0Z/dWC3/h6NWKrGdh/k+5oxAV
+Z+EuSkdFPBCLt0bKtCKZ8h7sF+lplotz08kdQXsC2MfFU2wiySdIgK1QHp/tCxZl
+6LM+sqdnoJrAjwRcB3AQJkMlV1ox7ba/hbdZqYMCgYBS6+JUXSSASpm5ZHd32a8m
+xwryEZ7H6Hek6lvMHdxmwoKat5dCavxw64nrtyeeGZpg1W3zLLyamF9x/8kMyr6y
+KKvtBfJ5sCvAbt80o9Pbs6R3yDB3AKiD3s3PQK7lol1nhE/8IbsF2r8JEQVcYd/k
+oBzkl7MrMyLhhaCqSxwqQQ==
+-----END PRIVATE KEY-----

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

@@ -0,0 +1,20 @@
+{
+  "state": {
+    "events": [
+      {
+        "content": {
+          "membership": "leave"
+        },
+        "event_id": "$1432735824666PhrSA:example.org",
+        "origin_server_ts": 1432735824666,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "state_key": "@example:example.org",
+        "type": "m.room.member",
+        "unsigned": {
+          "replaces_state": "$143273582443PhrSn:example.org"
+        }
+      }
+    ]
+  }
+}

autotests/data/test-pollhandlerstart-sync.json

@@ -8,14 +8,14 @@
                 "answers": [
                     {
                         "id": "option1",
-                        "org.matrix.msc1767.text": "option1"
+                        "org.matrix.msc1767.text": "option1text"
                     },
                     {
                         "id": "option2",
-                        "org.matrix.msc1767.text": "option2"
+                        "org.matrix.msc1767.text": "option2text"
                     }
                 ],
-                "kind": "org.matrix.msc3381.poll.disclosed",
+                "kind": "org.matrix.msc3381.poll.undisclosed",
                 "max_selections": 1,
                 "question": {
                     "body": "test",

autotests/delegatesizehelpertest.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
 #include <QObject>
+#include <QQuickItem>
 #include <QTest>
 
 #include "delegatesizehelper.h"
@@ -30,7 +31,7 @@ void DelegateSizeHelperTest::risingPercentage_data()
     QTest::addColumn<int>("currentPercentageWidth");
     QTest::addColumn<qreal>("currentWidth");
 
-    QTest::newRow("zero") << qreal(0) << int(0) << qreal(0);
+    QTest::newRow("zero") << qreal(0) << int(100) << qreal(0);
     QTest::newRow("one hundred") << qreal(100) << int(0) << qreal(0);
     QTest::newRow("one fifty") << qreal(150) << int(50) << qreal(75);
     QTest::newRow("two hundred") << qreal(200) << int(100) << qreal(200);
@@ -43,16 +44,18 @@ void DelegateSizeHelperTest::risingPercentage()
     QFETCH(int, currentPercentageWidth);
     QFETCH(qreal, currentWidth);
 
+    auto item = QQuickItem();
+    item.setWidth(parentWidth);
+
     DelegateSizeHelper delegateSizeHelper;
+    delegateSizeHelper.setParentItem(&item);
     delegateSizeHelper.setStartBreakpoint(100);
     delegateSizeHelper.setEndBreakpoint(200);
     delegateSizeHelper.setStartPercentWidth(0);
     delegateSizeHelper.setEndPercentWidth(100);
 
-    delegateSizeHelper.setParentWidth(parentWidth);
-
-    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
-    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
+    QCOMPARE(delegateSizeHelper.availablePercentageWidth(), currentPercentageWidth);
+    QCOMPARE(delegateSizeHelper.availableWidth(), currentWidth);
 }
 
 void DelegateSizeHelperTest::fallingPercentage_data()
@@ -74,16 +77,18 @@ void DelegateSizeHelperTest::fallingPercentage()
     QFETCH(int, currentPercentageWidth);
     QFETCH(qreal, currentWidth);
 
+    auto item = QQuickItem();
+    item.setWidth(parentWidth);
+
     DelegateSizeHelper delegateSizeHelper;
+    delegateSizeHelper.setParentItem(&item);
     delegateSizeHelper.setStartBreakpoint(100);
     delegateSizeHelper.setEndBreakpoint(200);
     delegateSizeHelper.setStartPercentWidth(100);
     delegateSizeHelper.setEndPercentWidth(0);
 
-    delegateSizeHelper.setParentWidth(parentWidth);
-
-    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
-    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
+    QCOMPARE(delegateSizeHelper.availablePercentageWidth(), currentPercentageWidth);
+    QCOMPARE(delegateSizeHelper.availableWidth(), currentWidth);
 }
 
 void DelegateSizeHelperTest::equalPercentage_data()
@@ -105,16 +110,18 @@ void DelegateSizeHelperTest::equalPercentage()
     QFETCH(int, currentPercentageWidth);
     QFETCH(qreal, currentWidth);
 
+    auto item = QQuickItem();
+    item.setWidth(parentWidth);
+
     DelegateSizeHelper delegateSizeHelper;
+    delegateSizeHelper.setParentItem(&item);
     delegateSizeHelper.setStartBreakpoint(100);
     delegateSizeHelper.setEndBreakpoint(200);
     delegateSizeHelper.setStartPercentWidth(50);
     delegateSizeHelper.setEndPercentWidth(50);
 
-    delegateSizeHelper.setParentWidth(parentWidth);
-
-    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
-    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
+    QCOMPARE(delegateSizeHelper.availablePercentageWidth(), currentPercentageWidth);
+    QCOMPARE(delegateSizeHelper.availableWidth(), currentWidth);
 }
 
 void DelegateSizeHelperTest::equalBreakpoint_data()
@@ -124,9 +131,9 @@ void DelegateSizeHelperTest::equalBreakpoint_data()
     QTest::addColumn<int>("currentPercentageWidth");
     QTest::addColumn<qreal>("currentWidth");
 
-    QTest::newRow("start higher") << int(100) << int(0) << int(-1) << qreal(0);
+    QTest::newRow("start higher") << int(100) << int(0) << int(100) << qreal(1000);
     QTest::newRow("equal") << int(50) << int(50) << int(50) << qreal(500);
-    QTest::newRow("end higher") << int(0) << int(100) << int(-1) << qreal(0);
+    QTest::newRow("end higher") << int(0) << int(100) << int(100) << qreal(1000);
 }
 
 /**
@@ -140,16 +147,18 @@ void DelegateSizeHelperTest::equalBreakpoint()
     QFETCH(int, currentPercentageWidth);
     QFETCH(qreal, currentWidth);
 
+    auto item = QQuickItem();
+    item.setWidth(1000);
+
     DelegateSizeHelper delegateSizeHelper;
+    delegateSizeHelper.setParentItem(&item);
     delegateSizeHelper.setStartBreakpoint(100);
     delegateSizeHelper.setEndBreakpoint(100);
     delegateSizeHelper.setStartPercentWidth(startPercentageWidth);
     delegateSizeHelper.setEndPercentWidth(endPercentageWidth);
 
-    delegateSizeHelper.setParentWidth(1000);
-
-    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
-    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
+    QCOMPARE(delegateSizeHelper.availablePercentageWidth(), currentPercentageWidth);
+    QCOMPARE(delegateSizeHelper.availableWidth(), currentWidth);
 }
 
 QTEST_GUILESS_MAIN(DelegateSizeHelperTest)

autotests/eventhandlertest.cpp

@@ -130,7 +130,8 @@ void EventHandlerTest::timeString()
              QLocale().toString(QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toLocalTime().time(), QLocale::ShortFormat));
     QCOMPARE(EventHandler::timeString(room, event, true),
              format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(room, event, u"hh:mm"_s), QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toString(u"hh:mm"_s));
+    QCOMPARE(EventHandler::timeString(room, event, u"hh:mm"_s),
+             QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::LocalTime)).toString(u"hh:mm"_s));
 
     const auto txID = room->postJson("m.room.message"_L1, event->fullJson());
     QCOMPARE(room->pendingEvents().size(), 1);

autotests/mediasizehelpertest.cpp

@@ -25,6 +25,7 @@ private Q_SLOTS:
 void MediaSizeHelperTest::uninitialized()
 {
     MediaSizeHelper mediasizehelper;
+    mediasizehelper.setMaxSize(540, 540);
     QCOMPARE(mediasizehelper.currentSize(), QSize(540, qRound(qreal(NeoChatConfig::self()->mediaMaxWidth()) / qreal(16.0) * qreal(9.0))));
 }
 
@@ -60,6 +61,7 @@ void MediaSizeHelperTest::limits()
     QFETCH(QSize, currentSize);
 
     MediaSizeHelper mediasizehelper;
+    mediasizehelper.setMaxSize(540, 540);
     mediasizehelper.setMediaWidth(mediaWidth);
     mediasizehelper.setMediaHeight(mediaHeight);
     mediasizehelper.setContentMaxWidth(contentMaxWidth);

autotests/messagecontentmodeltest.cpp

@@ -10,8 +10,9 @@
 #include <Quotient/roommember.h>
 #include <Quotient/syncdata.h>
 
-#include "models/messagecontentmodel.h"
+#include "models/eventmessagecontentmodel.h"
 
+#include "neochatconnection.h"
 #include "testutils.h"
 
 using namespace Quotient;
@@ -32,19 +33,19 @@ private Q_SLOTS:
 
 void MessageContentModelTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
+    connection = new NeoChatConnection;
 }
 
 void MessageContentModelTest::missingEvent()
 {
     auto room = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s);
-    auto model1 = MessageContentModel(room, u"$153456789:example.org"_s);
+    auto model1 = EventMessageContentModel(room, u"$153456789:example.org"_s);
 
     QCOMPARE(model1.rowCount(), 1);
     QCOMPARE(model1.data(model1.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);
     QCOMPARE(model1.data(model1.index(0), MessageContentModel::DisplayRole), u"Loading"_s);
 
-    auto model2 = MessageContentModel(room, u"$153456789:example.org"_s, true);
+    auto model2 = EventMessageContentModel(room, u"$153456789:example.org"_s, true);
 
     QCOMPARE(model2.rowCount(), 1);
     QCOMPARE(model2.data(model2.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);

autotests/pollhandlertest.cpp

@@ -41,29 +41,32 @@ void PollHandlerTest::nullObject()
     auto pollHandler = PollHandler();
 
     QCOMPARE(pollHandler.hasEnded(), false);
-    QCOMPARE(pollHandler.answerCount(), 0);
+    QCOMPARE(pollHandler.numAnswers(), 0);
     QCOMPARE(pollHandler.question(), QString());
-    QCOMPARE(pollHandler.options(), QJsonArray());
-    QCOMPARE(pollHandler.answers(), QJsonObject());
-    QCOMPARE(pollHandler.counts(), QJsonObject());
-    QCOMPARE(pollHandler.kind(), QString());
+    QCOMPARE(pollHandler.kind(), PollKind::Disclosed);
 }
 
 void PollHandlerTest::poll()
 {
     auto startEvent = eventCast<const PollStartEvent>(room->messageEvents().at(0).get());
-    auto pollHandler = PollHandler(room, startEvent);
+    auto pollHandler = PollHandler(room, startEvent->id());
 
-    auto options = QJsonArray{QJsonObject{{"id"_L1, "option1"_L1}, {"org.matrix.msc1767.text"_L1, "option1"_L1}},
-                              QJsonObject{{"id"_L1, "option2"_L1}, {"org.matrix.msc1767.text"_L1, "option2"_L1}}};
+    QList<Quotient::EventContent::Answer> options = {EventContent::Answer{"option1"_L1, "option1"_L1}, EventContent::Answer{"option2"_L1, "option2"_L1}};
 
+    const auto answer0 = pollHandler.answerAtRow(0);
+    const auto answer1 = pollHandler.answerAtRow(1);
     QCOMPARE(pollHandler.hasEnded(), false);
-    QCOMPARE(pollHandler.answerCount(), 0);
+    QCOMPARE(pollHandler.numAnswers(), 2);
     QCOMPARE(pollHandler.question(), u"test"_s);
-    QCOMPARE(pollHandler.options(), options);
-    QCOMPARE(pollHandler.answers(), QJsonObject());
-    QCOMPARE(pollHandler.counts(), QJsonObject());
-    QCOMPARE(pollHandler.kind(), u"org.matrix.msc3381.poll.disclosed"_s);
+    QCOMPARE(answer0.id, "option1"_L1);
+    QCOMPARE(answer1.id, "option2"_L1);
+    QCOMPARE(answer0.text, "option1text"_L1);
+    QCOMPARE(answer1.text, "option2text"_L1);
+    QCOMPARE(pollHandler.answerCountAtId(answer0.id), 0);
+    QCOMPARE(pollHandler.answerCountAtId(answer1.id), 0);
+    QCOMPARE(pollHandler.checkMemberSelectedId(connection->userId(), answer0.id), false);
+    QCOMPARE(pollHandler.checkMemberSelectedId(connection->userId(), answer1.id), false);
+    QCOMPARE(pollHandler.kind(), PollKind::Undisclosed);
 }
 
 QTEST_GUILESS_MAIN(PollHandlerTest)

autotests/reactionmodeltest.cpp

@@ -9,6 +9,7 @@
 
 #include <Quotient/events/roommessageevent.h>
 
+#include "models/eventmessagecontentmodel.h"
 #include "testutils.h"
 
 using namespace Quotient;
@@ -20,7 +21,7 @@ class ReactionModelTest : public QObject
 private:
     Connection *connection = nullptr;
     TestUtils::TestRoom *room = nullptr;
-    MessageContentModel *parentModel;
+    EventMessageContentModel *parentModel;
 
 private Q_SLOTS:
     void initTestCase();
@@ -33,7 +34,7 @@ void ReactionModelTest::initTestCase()
 {
     connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
     room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-reactionmodel-sync.json"_s);
-    parentModel = new MessageContentModel(room, "123456"_L1);
+    parentModel = new EventMessageContentModel(room, "123456"_L1);
 }
 
 void ReactionModelTest::basicReaction()

autotests/roommanagertest.cpp

@@ -0,0 +1,132 @@
+// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include <QObject>
+#include <QSignalSpy>
+#include <QTest>
+#include <QVariantList>
+
+#include "accountmanager.h"
+#include "models/actionsmodel.h"
+#include "roommanager.h"
+
+#include "server.h"
+#include "testutils.h"
+
+using namespace Quotient;
+
+class RoomManagerTest : public QObject
+{
+    Q_OBJECT
+
+private:
+    NeoChatConnection *connection = nullptr;
+    NeoChatRoom *room = nullptr;
+
+    Server server;
+
+private Q_SLOTS:
+    void initTestCase();
+    void testMaximizeMedia();
+};
+
+void RoomManagerTest::initTestCase()
+{
+    Connection::setRoomType<NeoChatRoom>();
+    server.start();
+    KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));
+    auto accountManager = new AccountManager(true);
+    QSignalSpy spy(accountManager, &AccountManager::connectionAdded);
+    connection = dynamic_cast<NeoChatConnection *>(accountManager->accounts()->front());
+    QVERIFY(connection);
+    auto roomId = server.createRoom(u"@user:localhost:1234"_s);
+
+    QSignalSpy syncSpy(connection, &Connection::syncDone);
+    // We need to wait for two syncs, as the next one won't have the changes yet
+    QVERIFY(syncSpy.wait());
+    QVERIFY(syncSpy.wait());
+    room = dynamic_cast<NeoChatRoom *>(connection->room(roomId));
+    QVERIFY(room);
+    RoomManager::instance().setConnection(connection);
+    QSignalSpy roomSpy(&RoomManager::instance(), &RoomManager::currentRoomChanged);
+    RoomManager::instance().resolveResource(room->id());
+    QVERIFY(roomSpy.size() > 0);
+}
+
+void RoomManagerTest::testMaximizeMedia()
+{
+    QSignalSpy spy(&RoomManager::instance(), &RoomManager::showMaximizedMedia);
+    QSignalSpy syncSpy(connection, &Connection::syncDone);
+
+    QTest::ignoreMessage(QtMsgType::QtWarningMsg, "Tried to open media for empty event id");
+    RoomManager::instance().maximizeMedia(QString());
+    QVERIFY(!spy.wait(10));
+
+    QTest::ignoreMessage(QtMsgType::QtWarningMsg, "Tried to open media for unknown event id \"Doesn't exist\"");
+    RoomManager::instance().maximizeMedia(u"Doesn't exist"_s);
+    QVERIFY(!spy.wait(10));
+
+    const auto eventWithoutMedia = server.sendEvent(room->id(),
+                                                    u"m.room.message"_s,
+                                                    QJsonObject({
+                                                        {u"body"_s, u"Foo"_s},
+                                                        {u"format"_s, u"org.matrix.custom.html"_s},
+                                                        {u"formatted_body"_s, u"Foo"_s},
+                                                        {u"msgtype"_s, u"m.text"_s},
+                                                    }));
+    QVERIFY(syncSpy.wait());
+    QVERIFY(syncSpy.wait());
+    QTest::ignoreMessage(QtMsgType::QtWarningMsg, u"Tried to open media for unknown event id \"%1\""_s.arg(eventWithoutMedia).toLatin1().data());
+    RoomManager::instance().maximizeMedia(eventWithoutMedia);
+    QVERIFY(!spy.wait(10));
+
+    // NOTE: This is supposed to test that maximizing pending media works correctly. This probably doesn't work in the UI yet, but at least the backend supports
+    // it. If the server ever learns how to process events, this becomes pointless and we need to find a way of preventing *these* events from arriving
+    auto pendingEventWithoutMedia = room->postText(u"Hello"_s);
+    QTest::ignoreMessage(QtMsgType::QtWarningMsg, u"Tried to open media for unknown event id \"%1\""_s.arg(pendingEventWithoutMedia).toLatin1().data());
+    RoomManager::instance().maximizeMedia(pendingEventWithoutMedia);
+    QVERIFY(!spy.wait(10));
+
+    const auto eventWithMedia = server.sendEvent(room->id(),
+                                                 u"m.room.message"_s,
+                                                 QJsonObject({
+                                                     {u"body"_s, u"Foo"_s},
+                                                     {u"filename"_s, u"foo.jpg"_s},
+                                                     {u"info"_s,
+                                                      QJsonObject{
+                                                          {u"h"_s, 1000},
+                                                          {u"w"_s, 2000},
+                                                          {u"size"_s, 10000},
+                                                          {u"mimetype"_s, u"image/png"_s},
+                                                      }},
+                                                     {u"msgtype"_s, u"m.image"_s},
+                                                     {u"url"_s, u"mxc://foo.bar/asdf"_s},
+                                                 }));
+    QVERIFY(syncSpy.wait());
+    QVERIFY(syncSpy.wait());
+    QVERIFY(syncSpy.wait());
+    RoomManager::instance().maximizeMedia(eventWithMedia);
+    QVERIFY(spy.size() == 1);
+    QVERIFY(spy[0][0] == 0);
+
+    auto pendingEventWithMedia = room->postJson(u"m.room.message"_s,
+                                                QJsonObject({
+                                                    {u"body"_s, u"Foo"_s},
+                                                    {u"filename"_s, u"foo.jpg"_s},
+                                                    {u"info"_s,
+                                                     QJsonObject{
+                                                         {u"h"_s, 1000},
+                                                         {u"w"_s, 2000},
+                                                         {u"size"_s, 10000},
+                                                         {u"mimetype"_s, u"image/png"_s},
+                                                     }},
+                                                    {u"msgtype"_s, u"m.image"_s},
+                                                    {u"url"_s, u"mxc://foo.bar/asdf"_s},
+                                                }));
+    RoomManager::instance().maximizeMedia(pendingEventWithMedia);
+    QVERIFY(spy.size() == 2);
+    QVERIFY(spy[1][0] == 0);
+}
+
+QTEST_MAIN(RoomManagerTest)
+#include "roommanagertest.moc"

autotests/server.cpp

@@ -0,0 +1,274 @@
+// SPDX-FileCopyrightText: 2025 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "server.h"
+
+#include <QFile>
+#include <QHttpServer>
+#include <QHttpServerResponder>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QNetworkReply>
+#include <QSslCertificate>
+#include <QSslKey>
+#include <QSslServer>
+#include <QUuid>
+
+#include <Quotient/networkaccessmanager.h>
+
+using namespace Qt::Literals::StringLiterals;
+
+QString generateEventId()
+{
+    return u"$"_s + QString::fromLatin1(QCryptographicHash::hash(QUuid::createUuid().toString().toLatin1(), QCryptographicHash::Sha1).toBase64());
+}
+
+QString generateRoomId()
+{
+    return u"!%1:localhost:1234"_s
+        .arg(QString::fromLatin1(QCryptographicHash::hash(QUuid::createUuid().toString().toLatin1(), QCryptographicHash::Sha1).toBase64()))
+        .replace(u'/', QChar());
+}
+
+Server::Server()
+{
+}
+
+void Server::start()
+{
+    QObject::connect(Quotient::NetworkAccessManager::instance(),
+                     &QNetworkAccessManager::sslErrors,
+                     Quotient::NetworkAccessManager::instance(),
+                     [](QNetworkReply *reply) {
+                         reply->ignoreSslErrors();
+                     });
+    m_server.route(u"/.well-known/matrix/client"_s, QHttpServerRequest::Method::Get, [](QHttpServerResponder &responder) {
+        responder.write(QJsonDocument(QJsonObject{
+                            {u"m.homeserver"_s, QJsonObject{{u"base_url"_s, u"https://localhost:1234"_s}}},
+                        }),
+                        QHttpServerResponder::StatusCode::Ok);
+    });
+    m_server.route(u"/_matrix/client/versions"_s, QHttpServerRequest::Method::Get, [](QHttpServerResponder &responder) {
+        responder.write(QJsonDocument(QJsonObject{
+                            {u"versions"_s,
+                             QJsonArray{
+                                 u"v1.0"_s,
+                                 u"v1.1"_s,
+                                 u"v1.2"_s,
+                                 u"v1.3"_s,
+                                 u"v1.4"_s,
+                                 u"v1.5"_s,
+                                 u"v1.6"_s,
+                                 u"v1.7"_s,
+                                 u"v1.8"_s,
+                                 u"v1.9"_s,
+                                 u"v1.10"_s,
+                                 u"v1.11"_s,
+                                 u"v1.12"_s,
+                                 u"v1.13"_s,
+                             }},
+                        }),
+                        QHttpServerResponder::StatusCode::Ok);
+    });
+    m_server.route(u"/_matrix/client/v3/capabilities"_s, QHttpServerRequest::Method::Get, [](QHttpServerResponder &responder) {
+        responder.write(
+            QJsonDocument(QJsonObject{{u"capabilities"_s,
+                                       QJsonObject{
+                                           {u"m.room_versions"_s, QJsonObject{{u"m.available"_s, QJsonObject{{u"1"_s, u"stable"_s}}}, {u"default"_s, u"1"_s}}},
+                                       }}}),
+            QHttpServerResponder::StatusCode::Ok);
+    });
+    m_server.route(u"/_matrix/client/v3/account/whoami"_s, QHttpServerRequest::Method::Get, [](QHttpServerResponder &responder) {
+        responder.write(QJsonDocument(QJsonObject{
+                            {u"device_id"_s, u"device_id_1234"_s},
+                            {u"user_id"_s, u"@user:localhost:1234"_s},
+                        }),
+                        QHttpServerResponder::StatusCode::Ok);
+    });
+
+    m_server.route(u"/_matrix/client/v3/login"_s, QHttpServerRequest::Method::Post, [](QHttpServerResponder &responder) {
+        // TODO
+        // if data["identifier"]["user"] != "user" or data["password"] != "1234":
+        //     abort(403)
+        responder.write(QJsonDocument(QJsonObject{
+                            {u"access_token"_s, u"token_login"_s},
+                            {u"device_id"_s, u"device_1234"_s},
+                            {u"user_id"_s, u"@user:localhost:1234"_s},
+                        }),
+                        QHttpServerResponder::StatusCode::Ok);
+    });
+
+    m_server.route(u"/_matrix/client/v3/login"_s, QHttpServerRequest::Method::Get, [](QHttpServerResponder &responder) {
+        responder.write(QJsonDocument(QJsonObject{
+                            {u"flows"_s, QJsonArray{QJsonObject{{u"type"_s, u"m.login.password"_s}}}},
+                        }),
+                        QHttpServerResponder::StatusCode::Ok);
+    });
+
+    m_server.route(u"/_matrix/client/v3/rooms/<arg>/invite"_s,
+                   QHttpServerRequest::Method::Post,
+                   [this](const QString &roomId, QHttpServerResponder &responder, const QHttpServerRequest &request) {
+                       m_invitedUsers[roomId] += QJsonDocument::fromJson(request.body()).object()[u"user_id"_s].toString();
+                       responder.write(QJsonDocument(QJsonObject{}), QHttpServerResponder::StatusCode::Ok);
+                   });
+
+    m_server.route(u"/_matrix/client/r0/sync"_s, QHttpServerRequest::Method::Get, [this](QHttpServerResponder &responder) {
+        QMap<QString, QJsonArray> stateEvents;
+        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);
+    });
+
+    QSslConfiguration config;
+    QFile key(QStringLiteral(DATA_DIR) + u"/localhost.key"_s);
+    key.open(QFile::ReadOnly);
+    config.setPrivateKey(QSslKey(&key, QSsl::Rsa));
+    config.setLocalCertificate(QSslCertificate::fromPath(QStringLiteral(DATA_DIR) + u"/localhost.crt"_s).front());
+    m_sslServer.setSslConfiguration(config);
+    if (!m_sslServer.listen(QHostAddress::LocalHost, 1234) || !m_server.bind(&m_sslServer)) {
+        qFatal() << "Server failed to listen on a port.";
+        return;
+    } else {
+        qWarning() << "Server listening";
+    }
+}
+
+QString Server::createRoom(const QString &matrixId)
+{
+    auto roomId = generateRoomId();
+    m_roomsToCreate += RoomData{
+        .members = {matrixId},
+        .id = roomId,
+        .tags = {},
+    };
+    return roomId;
+}
+
+void Server::inviteUser(const QString &roomId, const QString &matrixId)
+{
+    m_invitedUsers[roomId] += matrixId;
+}
+
+void Server::banUser(const QString &roomId, const QString &matrixId)
+{
+    m_bannedUsers[roomId] += matrixId;
+}
+
+void Server::joinUser(const QString &roomId, const QString &matrixId)
+{
+    m_joinedUsers[roomId] += matrixId;
+}
+
+QString Server::createServerNoticesRoom(const QString &matrixId)
+{
+    auto roomId = createRoom(matrixId);
+    m_roomsToCreate.last().tags = {u"m.server_notice"_s};
+    return roomId;
+}
+
+QString Server::sendEvent(const QString &roomId, const QString &eventType, const QJsonObject &content)
+{
+    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()},
+    };
+    return eventId;
+}

autotests/server.h

@@ -0,0 +1,46 @@
+// SPDX-FileCopyrightText: 2025 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include <QHttpServer>
+#include <QSslServer>
+
+struct RoomData {
+    QStringList members;
+    QString id;
+    QStringList tags;
+};
+
+class Server
+{
+public:
+    Server();
+
+    void start();
+
+    /**
+     * Create a room and place the user with id matrixId in it.
+     * Returns the room's id
+     */
+    QString createRoom(const QString &matrixId);
+
+    void inviteUser(const QString &roomId, const QString &matrixId);
+    void banUser(const QString &roomId, const QString &matrixId);
+    void joinUser(const QString &roomId, const QString &matrixId);
+
+    /**
+     * Create a server notices room.
+     */
+    QString createServerNoticesRoom(const QString &matrixId);
+    QString sendEvent(const QString &roomId, const QString &eventType, const QJsonObject &content);
+
+private:
+    QHttpServer m_server;
+    QSslServer m_sslServer;
+
+    QHash<QString, QList<QString>> m_invitedUsers;
+    QHash<QString, QList<QString>> m_bannedUsers;
+    QHash<QString, QList<QString>> m_joinedUsers;
+
+    QList<RoomData> m_roomsToCreate;
+    QMap<QString, QJsonArray> m_events;
+};

autotests/texthandlertest.cpp

@@ -8,7 +8,8 @@
 
 #include <Quotient/quotient_common.h>
 #include <Quotient/syncdata.h>
-#include <qnamespace.h>
+
+#include <Kirigami/Platform/PlatformTheme>
 
 #include "enums/messagecomponenttype.h"
 #include "models/customemojimodel.h"
@@ -43,6 +44,8 @@ private Q_SLOTS:
     void sendCustomEmoji();
     void sendCustomEmojiCode_data();
     void sendCustomEmojiCode();
+    void sendCustomTags_data();
+    void sendCustomTags();
 
     void receiveSpacelessSelfClosingTag();
     void receiveStripReply();
@@ -58,6 +61,7 @@ private Q_SLOTS:
     void receiveRichStrikethrough();
     void receiveRichtextIn();
     void receiveRichMxcUrl();
+    void receiveRichPlainUrl_data();
     void receiveRichPlainUrl();
     void receiveRichEdited_data();
     void receiveRichEdited();
@@ -249,6 +253,40 @@ void TextHandlerTest::sendCustomEmojiCode()
     QCOMPARE(testTextHandler.handleSendText(), testOutputString);
 }
 
+void TextHandlerTest::sendCustomTags_data()
+{
+    QTest::addColumn<QString>("testInputString");
+    QTest::addColumn<QString>("testOutputString");
+
+    // spoiler
+    QTest::newRow("incomplete spoiler") << u"||test"_s << u"||test"_s;
+    QTest::newRow("complete spoiler") << u"||test||"_s << u"<span data-mx-spoiler>test</span>"_s;
+    QTest::newRow("multiple spoiler") << u"||apple||banana||pear||"_s << u"<span data-mx-spoiler>apple</span>banana<span data-mx-spoiler>pear</span>"_s;
+    QTest::newRow("inside code block spoiler") << u"```||apple||```"_s << u"<code>||apple||</code>"_s;
+    QTest::newRow("outside code block spoiler") << u"||apple|| ```||banana||``` ||pear||"_s
+                                                << u"<span data-mx-spoiler>apple</span> <code>||banana||</code> <span data-mx-spoiler>pear</span>"_s;
+    QTest::newRow("complex spoiler") << u"Between `formFactor == Horizontal||Vertical` and `location == top||left||bottom||right`"_s
+                                     << u"Between <code>formFactor == Horizontal||Vertical</code> and <code>location == top||left||bottom||right</code>"_s;
+
+    // strikethrough
+    QTest::newRow("incomplete strikethrough") << u"~~test"_s << u"~~test"_s;
+    QTest::newRow("complete strikethrough") << u"~~test~~"_s << u"<del>test</del>"_s;
+    QTest::newRow("inside code block strikethrough") << u"```~~apple~~```"_s << u"<code>~~apple~~</code>"_s;
+    QTest::newRow("outside code block strikethrough") << u"~~apple~~ ```~~banana~~``` ~~pear~~"_s
+                                                      << u"<del>apple</del> <code>~~banana~~</code> <del>pear</del>"_s;
+}
+
+void TextHandlerTest::sendCustomTags()
+{
+    QFETCH(QString, testInputString);
+    QFETCH(QString, testOutputString);
+
+    TextHandler testTextHandler;
+    testTextHandler.setData(testInputString);
+
+    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
+}
+
 void TextHandlerTest::receiveSpacelessSelfClosingTag()
 {
     const QString testInputString = u"Test...<br/>...ing"_s;
@@ -413,6 +451,32 @@ void TextHandlerTest::receiveRichMxcUrl()
     QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, room->messageEvents().at(0).get()), testOutputString);
 }
 
+void TextHandlerTest::receiveRichPlainUrl_data()
+{
+    QTest::addColumn<QString>("input");
+    QTest::addColumn<QString>("output");
+
+    // This is an actual link that caused trouble which is why it's so long. Keeping
+    // so we can confirm consistent behaviour for complex urls.
+    QTest::addRow("link 1")
+        << u"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s
+        << u"<a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im</a> <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s;
+
+    // Another real case. The linkification wasn't handling it when a single link
+    // contains what looks like and email. It was broken into 3 but needs to
+    // be just single link.
+    QTest::addRow("link 2")
+        << u"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/"_s
+        << u"<a href=\"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/\">https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/</a>"_s;
+
+    QTest::addRow("email") << uR"(email@example.com <a href="mailto:email@example.com">Link already rich</a>)"_s
+                           << uR"(<a href="mailto:email@example.com">email@example.com</a> <a href="mailto:email@example.com">Link already rich</a>)"_s;
+    QTest::addRow("mxid")
+        << u"@user:kde.org <a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a>"_s
+        << u"<b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> <b><a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a></b>"_s;
+    QTest::addRow("mxid with prefix") << u"a @user:kde.org b"_s << u"a <b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> b"_s;
+}
+
 /**
  * For when your rich input string has a plain text url left in.
  *
@@ -421,46 +485,13 @@ void TextHandlerTest::receiveRichMxcUrl()
  */
 void TextHandlerTest::receiveRichPlainUrl()
 {
-    // This is an actual link that caused trouble which is why it's so long. Keeping
-    // so we can confirm consistent behaviour for complex urls.
-    const QString testInputStringLink1 =
-        u"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s;
-    const QString testOutputStringLink1 =
-        u"<a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im</a> <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s;
-
-    // Another real case. The linkification wasn't handling it when a single link
-    // contains what looks like and email. It was been broken into 3 but needs to
-    // be just single link.
-    const QString testInputStringLink2 = u"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/"_s;
-    const QString testOutputStringLink2 =
-        u"<a href=\"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/\">https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/</a>"_s;
-
-    QString testInputStringEmail = uR"(email@example.com <a href="mailto:email@example.com">Link already rich</a>)"_s;
-    QString testOutputStringEmail = uR"(<a href="mailto:email@example.com">email@example.com</a> <a href="mailto:email@example.com">Link already rich</a>)"_s;
-
-    QString testInputStringMxId = u"@user:kde.org <a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a>"_s;
-    QString testOutputStringMxId =
-        u"<b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> <b><a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a></b>"_s;
-
-    QString testInputStringMxIdWithPrefix = u"a @user:kde.org b"_s;
-    QString testOutputStringMxIdWithPrefix = u"a <b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> b"_s;
+    QFETCH(QString, input);
+    QFETCH(QString, output);
 
     TextHandler testTextHandler;
-    testTextHandler.setData(testInputStringLink1);
+    testTextHandler.setData(input);
 
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringLink1);
-
-    testTextHandler.setData(testInputStringLink2);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringLink2);
-
-    testTextHandler.setData(testInputStringEmail);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringEmail);
-
-    testTextHandler.setData(testInputStringMxId);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxId);
-
-    testTextHandler.setData(testInputStringMxIdWithPrefix);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxIdWithPrefix);
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), output);
 }
 
 void TextHandlerTest::receiveRichEdited_data()
@@ -468,9 +499,12 @@ void TextHandlerTest::receiveRichEdited_data()
     QTest::addColumn<QString>("testInputString");
     QTest::addColumn<QString>("testOutputString");
 
-    QTest::newRow("basic") << u"Edited"_s << u"Edited <span style=\"color:#000000\">(edited)</span>"_s;
+    auto theme = static_cast<Kirigami::Platform::PlatformTheme *>(qmlAttachedPropertiesObject<Kirigami::Platform::PlatformTheme>(this, true));
+
+    QTest::newRow("basic") << u"Edited"_s << u"Edited <span style=\"color:%1\">(edited)</span>"_s.arg(theme ? theme->disabledTextColor().name() : u"#000000"_s);
     QTest::newRow("multiple paragraphs") << u"<p>Edited</p>\n<p>Edited</p>"_s
-                                         << u"<p>Edited</p>\n<p>Edited <span style=\"color:#000000\">(edited)</span></p>"_s;
+                                         << u"<p>Edited</p>\n<p>Edited <span style=\"color:%1\">(edited)</span></p>"_s.arg(
+                                                theme ? theme->disabledTextColor().name() : u"#000000"_s);
 }
 
 void TextHandlerTest::receiveRichEdited()
@@ -511,8 +545,6 @@ void TextHandlerTest::receiveRichColor()
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
 
-    qInfo() << testTextHandler.handleRecieveRichText();
-
     QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
 }
 
@@ -530,6 +562,9 @@ void TextHandlerTest::componentOutput_data()
     QTest::newRow("quote") << u"<p>Text</p>\n<blockquote>\n<p>blockquote</p>\n</blockquote>"_s
                            << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, u"Text"_s, {}},
                                                       MessageComponent{MessageComponentType::Quote, u"“blockquote”"_s, {}}};
+    QTest::newRow("multiple paragraph quote") << u"<blockquote>\n<p>blockquote</p>\n<p>next paragraph</p>\n</blockquote>"_s
+                                              << QList<MessageComponent>{
+                                                     MessageComponent{MessageComponentType::Quote, u"<p>“blockquote</p>\n<p>next paragraph”</p>"_s, {}}};
     QTest::newRow("no tag first paragraph") << u"Text\n<p>Text</p>"_s
                                             << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, u"Text"_s, {}},
                                                                        MessageComponent{MessageComponentType::Text, u"Text"_s, {}}};

autotests/timelinemessagemodeltest.cpp

@@ -57,7 +57,7 @@ void TimelineMessageModelTest::switchEmptyRoom()
     auto firstRoom = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s);
     auto secondRoom = new TestUtils::TestRoom(connection, u"#secondRoom:kde.org"_s);
 
-    QSignalSpy spy(model, SIGNAL(roomChanged()));
+    QSignalSpy spy(model, SIGNAL(roomChanged(NeoChatRoom *, NeoChatRoom *)));
 
     QCOMPARE(model->room(), nullptr);
     model->setRoom(firstRoom);
@@ -77,7 +77,7 @@ void TimelineMessageModelTest::switchSyncedRoom()
     auto firstRoom = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s, u"test-messageventmodel-sync.json"_s);
     auto secondRoom = new TestUtils::TestRoom(connection, u"#secondRoom:kde.org"_s, u"test-messageventmodel-sync.json"_s);
 
-    QSignalSpy spy(model, SIGNAL(roomChanged()));
+    QSignalSpy spy(model, SIGNAL(roomChanged(NeoChatRoom *, NeoChatRoom *)));
 
     QCOMPARE(model->room(), nullptr);
     model->setRoom(firstRoom);
@@ -208,7 +208,7 @@ void TimelineMessageModelTest::idToRow()
     auto room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-min-sync.json"_s);
     model->setRoom(room);
 
-    QCOMPARE(model->eventIdToRow(u"$153456789:example.org"_s), 0);
+    QCOMPARE(model->indexforEventId(u"$153456789:example.org"_s).row(), 0);
 }
 
 void TimelineMessageModelTest::cleanup()

memorytests/CMakeLists.txt

@@ -7,16 +7,19 @@ qt_add_executable(timeline-memtest
     main.cpp
 )
 
-target_link_libraries(timeline-memtest PRIVATE neochatplugin timelineplugin)
+target_link_libraries(timeline-memtest PRIVATE neochatplugin Timelineplugin)
 target_link_libraries(timeline-memtest PUBLIC
     Qt::Core
     Qt::Quick
     Qt::Qml
     Qt::Gui
     Qt::QuickControls2
+    Qt::Widgets
+    KF6::I18nQml
     KF6::Kirigami
     QuotientQt6
-    neochat
+    LibNeoChat
+    Timeline
 )
 
 ecm_add_qml_module(timeline-memtest URI org.kde.neochat.timeline-memtest GENERATE_PLUGIN_SOURCE
@@ -30,5 +33,5 @@ ecm_add_qml_module(timeline-memtest URI org.kde.neochat.timeline-memtest GENERAT
         QtCore
         QtQuick
     IMPORTS
-        org.kde.neochat
+        org.kde.neochat.timeline
 )

memorytests/Main.qml

@@ -23,6 +23,7 @@ QQC2.ApplicationWindow {
         height: root.height
 
         contentItem: ListView {
+            cacheBuffer: 1000000
             model: messageFilterModel
 
             delegate: EventDelegate {

memorytests/main.cpp

@@ -5,6 +5,7 @@
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 
+#include <KLocalizedQmlContext>
 #include <KLocalizedString>
 
 #include "memtesttimelinemodel.h"
@@ -19,12 +20,15 @@ int main(int argc, char **argv)
     KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));
 
     QQmlApplicationEngine engine;
-    engine.loadFromModule("org.kde.neochat.timeline-memtest", "Main");
+
+    KLocalization::setupLocalizedContext(&engine);
 
     MemTestTimelineModel *memTestTimelineModel = new MemTestTimelineModel;
     MessageFilterModel *messageFilterModel = new MessageFilterModel(nullptr, memTestTimelineModel);
     engine.rootContext()->setContextProperty(u"memTestTimelineModel"_s, memTestTimelineModel);
     engine.rootContext()->setContextProperty(u"messageFilterModel"_s, messageFilterModel);
 
+    engine.loadFromModule("org.kde.neochat.timeline-memtest", "Main");
+
     return app.exec();
 }

memorytests/memtest-sync.json

@@ -241,7 +241,7 @@
           "formatted_body": "This is an example<br>text message",
           "msgtype": "m.text"
         },
-        "event_id": "$1000000000000:example.org",
+        "event_id": 0,
         "origin_server_ts": 1000000000000,
         "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
         "sender": "@example:example.org",
@@ -255,7 +255,7 @@
           "body": "This is a highlight @bob:example.org",
           "msgtype": "m.text"
         },
-        "event_id": "$1000000000001:example.org",
+        "event_id": 1,
         "origin_server_ts": 1000000000001,
         "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
         "sender": "@example:example.org",
@@ -266,11 +266,11 @@
       },
       {
         "content": {
-            "m.relates_to": {
-            "event_id": "$1000000000001:example.org",
+          "m.relates_to": {
+            "event_id": 1,
             "key": "👍",
             "rel_type": "m.annotation"
-            }
+          }
         },
         "origin_server_ts": 1000000000002,
         "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
@@ -279,7 +279,7 @@
         "unsigned": {
             "age": 390159120
         },
-        "event_id": "$1000000000002:example.org",
+        "event_id": 2,
         "age": 390159120
       },
       {
@@ -289,7 +289,7 @@
             "formatted_body": "reply",
             "m.relates_to": {
                 "m.in_reply_to": {
-                    "event_id": "$1000000000000:example.org"
+                    "event_id": 0
                 }
             },
             "msgtype": "m.text"
@@ -300,7 +300,7 @@
         "unsigned": {
             "age": 98
         },
-        "event_id": "$1000000000003:example.org",
+        "event_id": 3,
         "room_id": "!jEsUZKDJdhlrceRyVU:example.org"
       },
       {
@@ -317,7 +317,7 @@
                 "uri": "geo:51.7035,-1.14394"
             }
         },
-        "event_id": "$1000000000004:example.org",
+        "event_id": 4,
         "origin_server_ts": 1000000000004,
         "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
         "sender": "@example:example.org",
@@ -333,7 +333,7 @@
           "formatted_body": "<pre><code class=\"language-cpp\">int main(int argc, char **argv)\n{\n    QApplication app(argc, argv);\n\n    KLocalizedString::setApplicationDomain(QByteArrayLiteral(&quot;neochat&quot;));\n\n    QQmlApplicationEngine engine;\n    engine.loadFromModule(&quot;org.kde.neochat.timeline-memtest&quot;, &quot;Main&quot;);\n\n    return app.exec();\n}\n</code></pre>",
           "msgtype": "m.text"
         },
-        "event_id": "$1000000000005:example.org",
+        "event_id": 5,
         "origin_server_ts": 1000000000005,
         "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
         "sender": "@bob:example.org",
@@ -347,7 +347,7 @@
           "body": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sed fringilla risus, eget lacinia risus. Suspendisse at magna id justo sagittis suscipit. Maecenas eros quam, pulvinar a consequat sed, varius vitae risus. Cras congue est eget felis porttitor lobortis. Nam cursus, nulla ut finibus suscipit, tellus eros tincidunt ante, a volutpat velit lectus sit amet turpis. Morbi leo justo, fringilla sed rutrum a, suscipit a quam. Proin rhoncus neque eget ligula ullamcorper pellentesque. Mauris volutpat malesuada nunc. Nullam finibus enim eu nibh placerat imperdiet. Nullam in mi in diam luctus scelerisque dignissim non erat. ",
           "msgtype": "m.text"
         },
-        "event_id": "$1000000000006:example.org",
+        "event_id": 6,
         "origin_server_ts": 1000000000006,
         "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
         "sender": "@example:example.org",
@@ -363,7 +363,7 @@
           "formatted_body": "<blockquote>\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sed fringilla risus, eget lacinia risus. Suspendisse at magna id justo sagittis suscipit. Maecenas eros quam, pulvinar a consequat sed, varius vitae risus. Cras congue est eget felis porttitor lobortis. Nam cursus, nulla ut finibus suscipit, tellus eros tincidunt ante, a volutpat velit lectus sit amet turpis. Morbi leo justo, fringilla sed rutrum a, suscipit a quam. Proin rhoncus neque eget ligula ullamcorper pellentesque. Mauris volutpat malesuada nunc. Nullam finibus enim eu nibh placerat imperdiet. Nullam in mi in diam luctus scelerisque dignissim non erat.</p>\n</blockquote>",
           "msgtype": "m.text"
         },
-        "event_id": "$1000000000007:example.org",
+        "event_id": 7,
         "origin_server_ts": 1000000000007,
         "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
         "sender": "@example:example.org",
@@ -371,282 +371,6 @@
         "unsigned": {
           "age": 1232
         }
-      },
-      {
-        "content": {
-          "body": "This is an example text message",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "This is an example<br>text message",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000008:example.org",
-        "origin_server_ts": 1000000000008,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "body": "This is a highlight @bob:example.org",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000009:example.org",
-        "origin_server_ts": 1000000000009,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1233
-        }
-      },
-      {
-        "content": {
-            "m.relates_to": {
-            "event_id": "$1000000000009:example.org",
-            "key": "👍",
-            "rel_type": "m.annotation"
-            }
-        },
-        "origin_server_ts": 1000000000010,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@alice:example.org",
-        "type": "m.reaction",
-        "unsigned": {
-            "age": 390159120
-        },
-        "event_id": "$1000000000010:example.org",
-        "age": 390159120
-      },
-      {
-        "content": {
-            "body": "reply",
-            "format": "org.matrix.custom.html",
-            "formatted_body": "reply",
-            "m.relates_to": {
-                "m.in_reply_to": {
-                    "event_id": "$1000000000008:example.org"
-                }
-            },
-            "msgtype": "m.text"
-        },
-        "origin_server_ts": 1000000000011,
-        "sender": "@alice:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 98
-        },
-        "event_id": "$1000000000011:example.org",
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org"
-      },
-      {
-        "age": 96845207,
-        "content": {
-            "body": "Lat: 51.7035, Lon: -1.14394",
-            "geo_uri": "geo:51.7035,-1.14394",
-            "msgtype": "m.location",
-            "org.matrix.msc1767.text": "Lat: 51.7035, Lon: -1.14394",
-            "org.matrix.msc3488.asset": {
-                "type": "m.pin"
-            },
-            "org.matrix.msc3488.location": {
-                "uri": "geo:51.7035,-1.14394"
-            }
-        },
-        "event_id": "$1000000000012:example.org",
-        "origin_server_ts": 1000000000012,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 96845207
-        }
-      },
-      {
-        "content": {
-          "body": "```cpp\nint main(int argc, char **argv)\n{\n    QApplication app(argc, argv);\n\n    KLocalizedString::setApplicationDomain(QByteArrayLiteral(\"neochat\"));\n\n    QQmlApplicationEngine engine;\n    engine.loadFromModule(\"org.kde.neochat.timeline-memtest\", \"Main\");\n\n    return app.exec();\n}\n```",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "<pre><code class=\"language-cpp\">int main(int argc, char **argv)\n{\n    QApplication app(argc, argv);\n\n    KLocalizedString::setApplicationDomain(QByteArrayLiteral(&quot;neochat&quot;));\n\n    QQmlApplicationEngine engine;\n    engine.loadFromModule(&quot;org.kde.neochat.timeline-memtest&quot;, &quot;Main&quot;);\n\n    return app.exec();\n}\n</code></pre>",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000013:example.org",
-        "origin_server_ts": 1000000000013,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@bob:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1233
-        }
-      },
-      {
-        "content": {
-          "body": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sed fringilla risus, eget lacinia risus. Suspendisse at magna id justo sagittis suscipit. Maecenas eros quam, pulvinar a consequat sed, varius vitae risus. Cras congue est eget felis porttitor lobortis. Nam cursus, nulla ut finibus suscipit, tellus eros tincidunt ante, a volutpat velit lectus sit amet turpis. Morbi leo justo, fringilla sed rutrum a, suscipit a quam. Proin rhoncus neque eget ligula ullamcorper pellentesque. Mauris volutpat malesuada nunc. Nullam finibus enim eu nibh placerat imperdiet. Nullam in mi in diam luctus scelerisque dignissim non erat. ",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000014:example.org",
-        "origin_server_ts": 1000000000014,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "body": "> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sed fringilla risus, eget lacinia risus. Suspendisse at magna id justo sagittis suscipit. Maecenas eros quam, pulvinar a consequat sed, varius vitae risus. Cras congue est eget felis porttitor lobortis. Nam cursus, nulla ut finibus suscipit, tellus eros tincidunt ante, a volutpat velit lectus sit amet turpis. Morbi leo justo, fringilla sed rutrum a, suscipit a quam. Proin rhoncus neque eget ligula ullamcorper pellentesque. Mauris volutpat malesuada nunc. Nullam finibus enim eu nibh placerat imperdiet. Nullam in mi in diam luctus scelerisque dignissim non erat. ",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "<blockquote>\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sed fringilla risus, eget lacinia risus. Suspendisse at magna id justo sagittis suscipit. Maecenas eros quam, pulvinar a consequat sed, varius vitae risus. Cras congue est eget felis porttitor lobortis. Nam cursus, nulla ut finibus suscipit, tellus eros tincidunt ante, a volutpat velit lectus sit amet turpis. Morbi leo justo, fringilla sed rutrum a, suscipit a quam. Proin rhoncus neque eget ligula ullamcorper pellentesque. Mauris volutpat malesuada nunc. Nullam finibus enim eu nibh placerat imperdiet. Nullam in mi in diam luctus scelerisque dignissim non erat.</p>\n</blockquote>",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000015:example.org",
-        "origin_server_ts": 1000000000015,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "body": "This is an example text message",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "This is an example<br>text message",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000016:example.org",
-        "origin_server_ts": 1000000000016,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "body": "This is a highlight @bob:example.org",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000017:example.org",
-        "origin_server_ts": 1000000000017,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1233
-        }
-      },
-      {
-        "content": {
-            "m.relates_to": {
-            "event_id": "$1000000000017:example.org",
-            "key": "👍",
-            "rel_type": "m.annotation"
-            }
-        },
-        "origin_server_ts": 1000000000018,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@alice:example.org",
-        "type": "m.reaction",
-        "unsigned": {
-            "age": 390159120
-        },
-        "event_id": "$1000000000018:example.org",
-        "age": 390159120
-      },
-      {
-        "content": {
-            "body": "reply",
-            "format": "org.matrix.custom.html",
-            "formatted_body": "reply",
-            "m.relates_to": {
-                "m.in_reply_to": {
-                    "event_id": "$1000000000016:example.org"
-                }
-            },
-            "msgtype": "m.text"
-        },
-        "origin_server_ts": 1000000000019,
-        "sender": "@alice:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 98
-        },
-        "event_id": "$1000000000019:example.org",
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org"
-      },
-      {
-        "age": 96845207,
-        "content": {
-            "body": "Lat: 51.7035, Lon: -1.14394",
-            "geo_uri": "geo:51.7035,-1.14394",
-            "msgtype": "m.location",
-            "org.matrix.msc1767.text": "Lat: 51.7035, Lon: -1.14394",
-            "org.matrix.msc3488.asset": {
-                "type": "m.pin"
-            },
-            "org.matrix.msc3488.location": {
-                "uri": "geo:51.7035,-1.14394"
-            }
-        },
-        "event_id": "$1000000000020:example.org",
-        "origin_server_ts": 1000000000020,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 96845207
-        }
-      },
-      {
-        "content": {
-          "body": "```cpp\nint main(int argc, char **argv)\n{\n    QApplication app(argc, argv);\n\n    KLocalizedString::setApplicationDomain(QByteArrayLiteral(\"neochat\"));\n\n    QQmlApplicationEngine engine;\n    engine.loadFromModule(\"org.kde.neochat.timeline-memtest\", \"Main\");\n\n    return app.exec();\n}\n```",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "<pre><code class=\"language-cpp\">int main(int argc, char **argv)\n{\n    QApplication app(argc, argv);\n\n    KLocalizedString::setApplicationDomain(QByteArrayLiteral(&quot;neochat&quot;));\n\n    QQmlApplicationEngine engine;\n    engine.loadFromModule(&quot;org.kde.neochat.timeline-memtest&quot;, &quot;Main&quot;);\n\n    return app.exec();\n}\n</code></pre>",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000021:example.org",
-        "origin_server_ts": 1000000000021,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@bob:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1233
-        }
-      },
-      {
-        "content": {
-          "body": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sed fringilla risus, eget lacinia risus. Suspendisse at magna id justo sagittis suscipit. Maecenas eros quam, pulvinar a consequat sed, varius vitae risus. Cras congue est eget felis porttitor lobortis. Nam cursus, nulla ut finibus suscipit, tellus eros tincidunt ante, a volutpat velit lectus sit amet turpis. Morbi leo justo, fringilla sed rutrum a, suscipit a quam. Proin rhoncus neque eget ligula ullamcorper pellentesque. Mauris volutpat malesuada nunc. Nullam finibus enim eu nibh placerat imperdiet. Nullam in mi in diam luctus scelerisque dignissim non erat. ",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000022:example.org",
-        "origin_server_ts": 1000000000022,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "body": "> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sed fringilla risus, eget lacinia risus. Suspendisse at magna id justo sagittis suscipit. Maecenas eros quam, pulvinar a consequat sed, varius vitae risus. Cras congue est eget felis porttitor lobortis. Nam cursus, nulla ut finibus suscipit, tellus eros tincidunt ante, a volutpat velit lectus sit amet turpis. Morbi leo justo, fringilla sed rutrum a, suscipit a quam. Proin rhoncus neque eget ligula ullamcorper pellentesque. Mauris volutpat malesuada nunc. Nullam finibus enim eu nibh placerat imperdiet. Nullam in mi in diam luctus scelerisque dignissim non erat. ",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "<blockquote>\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sed fringilla risus, eget lacinia risus. Suspendisse at magna id justo sagittis suscipit. Maecenas eros quam, pulvinar a consequat sed, varius vitae risus. Cras congue est eget felis porttitor lobortis. Nam cursus, nulla ut finibus suscipit, tellus eros tincidunt ante, a volutpat velit lectus sit amet turpis. Morbi leo justo, fringilla sed rutrum a, suscipit a quam. Proin rhoncus neque eget ligula ullamcorper pellentesque. Mauris volutpat malesuada nunc. Nullam finibus enim eu nibh placerat imperdiet. Nullam in mi in diam luctus scelerisque dignissim non erat.</p>\n</blockquote>",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000023:example.org",
-        "origin_server_ts": 1000000000023,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
       }
     ],
     "limited": true,

memorytests/memtesttimelinemodel.h

@@ -39,10 +39,52 @@ public:
             testSyncFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + syncFileName);
             testSyncFile.open(QIODevice::ReadOnly);
             auto testSyncJson = QJsonDocument::fromJson(testSyncFile.readAll()).object();
+            auto timelineJson = testSyncJson["timeline"_L1].toObject();
+            timelineJson["events"_L1] = multiplyEvents(timelineJson["events"_L1].toArray(), 100);
+            testSyncJson["timeline"_L1] = timelineJson;
             Quotient::SyncRoomData roomData(id(), Quotient::JoinState::Join, testSyncJson);
             update(std::move(roomData));
         }
     }
+
+    QJsonArray multiplyEvents(QJsonArray events, int factor)
+    {
+        QJsonArray newArray;
+        int eventNum = 0;
+        int ts = 0;
+
+        for (int i = 0; i < factor; ++i) {
+            for (const auto &event : events) {
+                auto eventObject = event.toObject();
+                auto contentJson = eventObject["content"_L1].toObject();
+                if (contentJson.contains("m.relates_to"_L1)) {
+                    auto relatesToJson = contentJson["m.relates_to"_L1].toObject();
+                    if (relatesToJson.contains("m.in_reply_to"_L1)) {
+                        auto replyJson = relatesToJson["m.in_reply_to"_L1].toObject();
+                        const auto currentId = eventObject["event_id"_L1].toInt();
+                        const auto currentReplyId = replyJson["event_id"_L1].toInt();
+                        replyJson["event_id"_L1] = "$%1:example.org"_L1.arg(QString::number(eventNum - (currentId - currentReplyId)));
+                        relatesToJson["m.in_reply_to"_L1] = replyJson;
+                    } else if (relatesToJson.contains("event_id"_L1)) {
+                        const auto currentId = eventObject["event_id"_L1].toInt();
+                        const auto currentRelationId = relatesToJson["event_id"_L1].toInt();
+                        relatesToJson["event_id"_L1] = "$%1:example.org"_L1.arg(QString::number(eventNum - (currentId - currentRelationId)));
+                    }
+                    contentJson["m.relates_to"_L1] = relatesToJson;
+                    eventObject["content"_L1] = contentJson;
+                }
+                eventObject["event_id"_L1] = "$%1:example.org"_L1.arg(QString::number(eventNum));
+                eventObject["origin_server_ts"_L1] = ts;
+                auto unsignedJson = eventObject["unsigned"_L1].toObject();
+                unsignedJson["age"_L1] = ts;
+                eventObject["unsigned"_L1] = unsignedJson;
+                newArray.append(eventObject);
+                ++eventNum;
+                ++ts;
+            }
+        }
+        return newArray;
+    }
 };
 
 /**

org.kde.neochat.appdata.xml

@@ -70,10 +70,13 @@
   <summary xml:lang="ia">Conversation en ditecto sur Matrix</summary>
   <summary xml:lang="it">Chat su Matrix</summary>
   <summary xml:lang="ka">ისაუბრეთ Matrix-ზე</summary>
+  <summary xml:lang="ko">Matrix에서 대화하기</summary>
   <summary xml:lang="lv">Tērzējiet „Matrix“ tīklā</summary>
   <summary xml:lang="nl">Chat op Matrix</summary>
   <summary xml:lang="nn">Prat med via Matrix</summary>
   <summary xml:lang="pl">Rozmawiaj na Matriksie</summary>
+  <summary xml:lang="pt-BR">Bate-papo na Matrix</summary>
+  <summary xml:lang="ru">Общение в Matrix</summary>
   <summary xml:lang="sa">Matrix इत्यत्र गपशपं कुर्वन्तु</summary>
   <summary xml:lang="sl">Klepet na Matrixu</summary>
   <summary xml:lang="sv">Chatta på Matrix</summary>
@@ -102,10 +105,12 @@
     <p xml:lang="ia">NeoChat es un app de conversation que te permitte prender avantage plen del rete Matrix. Il te forni un modo secur de inviar messages de texto, videos e files audio a tui familia, collegas e amicos.</p>
     <p xml:lang="it">NeoChat è un'applicazione di chat che ti consente di sfruttare appieno la rete Matrix. Ti fornisce un modo sicuro per inviare messaggi di testo, video e file audio a familiari, colleghi e amici.</p>
     <p xml:lang="ka">NeoChat ჩატის აპია, რომელიც საშუალება გაძლევთ, Matrix-ის ქსელის საშუალებები ბოლომდე გამოიყენოთ. ის გაძლევთ უსაფრთხო გზას, გააგზავნოთ ტექსტური შეტყობინებები, ვიდეოებ და აუდიოფაილები თქვენს ოჯახთან, კოლეგებთან და მეგობრებთან.</p>
+    <p xml:lang="ko">NeoChat은 Matrix 네트워크를 사용하는 채팅 앱입니다. 텍스트 메시지, 동영상, 오디오 파일을 가족, 친구, 동료와 안전하게 공유할 수 있습니다.</p>
     <p xml:lang="lv">„NeoChat“ ir tērzēšanas programma, kas ļauj pilnvērtīgi izmantot „Matrix“ tīklu. Tā sniedz drošu veidu teksta ziņu, video un audio sūtīšanai ģimenes locekļiem, kolēģiem un draugiem.</p>
     <p xml:lang="nl">NeoChat is een chat-toepassing die u het volledige voordeel van het Matrix-netwerk laat genieten. Het levert u op een veilige manier tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden te verzenden.</p>
     <p xml:lang="nn">NeoChat er ein prateapp som lèt deg bruka all funksjonalitet i Matrix-nettverket. Du kan utveksla tekst, lyd og videoar med vennar, familie og kollegaar på ein trygg måte.</p>
     <p xml:lang="pl">NoeChat to aplikacja do rozmów, która umożliwia wykorzystanie wszystkich możliwości Matriksa. Umożliwia wysyłanie wiadomości tekstowych, filmów i dźwięków w bezpieczny sposób do twojej rodziny, kolegów i przyjaciół.</p>
+    <p xml:lang="pt-BR">O NeoChat é um aplicativo de bate-papo que permite que você aproveite ao máximo a rede Matrix. Ele oferece uma maneira segura de enviar mensagens de texto, vídeos e arquivos de áudio para sua família, colegas e amigos.</p>
     <p xml:lang="ru">NeoChat — приложение для общения, предоставляющее все преимущества сети Matrix. С его помощью можно безопасно отправлять текстовые сообщения, видеозаписи и звуковые файлы родственникам, коллегам и друзьям.</p>
     <p xml:lang="sa">NeoChat इति एकं गपशप-अनुप्रयोगं यत् भवान् Matrix-जालस्य पूर्णं लाभं ग्रहीतुं शक्नोति । एतत् भवन्तं भवतः परिवाराय, सहकारिभ्यः, मित्रेभ्यः च पाठसन्देशान्, भिडियो, श्रव्यसञ्चिकाः च प्रेषयितुं सुरक्षितं मार्गं प्रदाति ।</p>
     <p xml:lang="sl">NeoChat je aplikacija za klepet, ki vam omogoča, da v celoti izkoristite omrežje Matrix. Zagotavlja vam varen način za pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, sodelavcem in prijateljem.</p>
@@ -115,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>
@@ -139,6 +144,7 @@
     <p xml:lang="nn">NeoChat har som mål å støtta all funksjonalitet i Matrix-spesifikasjonen. Førebels er alt i den gjeldande stabile spesifikasjonen støtta, med unntak av VoIP, trådar og nokre delar av ende-til-kryptering. Det finst òg andre småting som ikkje er støtta, sidan Matrix-spesifikasjon er i stadig endring, men målet er altså støtte for alt.</p>
     <p xml:lang="pl">NeoChat w zamyśle ma być pełnowartościową aplikacją wg wytycznych Matriksa. Z tego powodu, wszystko, co jest obecnie w stabilnych wytycznych z pominięciem VoIP, wątków i niektórych części szyfrowania Użytkownik-do-Użytkownika są obecnie obsługiwane. Pominięto też kilka mniejszych rzeczy ze względu na ciągły rozwój wytycznych Matriksa, lecz celem nadal jest zapewnienie obsługi wszystkich wytycznych.</p>
     <p xml:lang="pt">O NeoChat pretende ser uma aplicação completa para a especificação do Matrix. Como tal, tudo o que existe na especificação estável actual, com as notáveis excepções do VoIP, tópicos e alguns aspectos da Encriptação Ponto-a-Ponto, são suportados. Existem mais algumas omissões, devido ao facto que a norma do Matrix está em constante evolução, mas o objectivo continua a ser oferecer o suporte eventual para a norma por inteiro.</p>
+    <p xml:lang="pt-BR">O NeoChat pretende ser um aplicativo completo para a especificação Matrix. Dessa forma, tudo na especificação estável atual, com as notáveis exceções de VoIP, tópicos e alguns aspectos da criptografia de ponta a ponta, é suportado. Há algumas outras pequenas omissões devido ao fato de a especificação Matrix estar em constante evolução, mas o objetivo continua sendo fornecer suporte eventual para toda a especificação.</p>
     <p xml:lang="ru">Целью создания NeoChat является полноценная реализация программы для спецификации Matrix. Как следствие, реализовано всё в текущей стабильной спецификации (за исключением голосовой интернет-связи, потоков и некоторых аспектов сквозного шифрования). Есть также несколько других незначительных пробелов, обусловленных постоянными изменениями спецификации Matrix. Тем не менее, стоит задача в итоге предоставить полную поддержку спецификации.</p>
     <p xml:lang="sa">NeoChat इत्यस्य उद्देश्यं Matrix विनिर्देशस्य कृते पूर्णतया विशेषतायुक्तः अनुप्रयोगः भवितुम् अस्ति । यथा तथा वर्तमानस्थिरविनिर्देशे सर्वं VoIP इत्यस्य उल्लेखनीयअपवादैः सह, थ्रेड्स तथा च End-to-End Encryption इत्यस्य केचन पक्षाः समर्थिताः सन्ति । अन्ये कतिचन लघु लोपाः सन्ति यतोहि Matrix spec निरन्तरं विकसितः अस्ति परन्तु उद्देश्यं सम्पूर्ण spec कृते अन्ततः समर्थनं प्रदातुं अवशिष्टम् अस्ति</p>
     <p xml:lang="sl">Neochat cilja, da bi bila popolna aplikacija po specifikaciji Matrixa. Kot takšna vsebuje vse v trenutni stabilni specifikaciji z pomembnimi izjemami pri VoIP, nitih in nekaterih vidikov šifriranja od konca do konca. Obstaja nekaj drugih manjših opustitev zaradi dejstva, da se specifikacija Matrix nenehno razvija, vendar cilj ostaja zagotoviti morebitno podporo celotni specifikaciji.</p>
@@ -172,6 +178,7 @@
     <p xml:lang="nn">På grunn av måten Matrix-spesifikasjonen vert utvikla på, støttar NeoChat òg nokre uferdige funksjonar:</p>
     <p xml:lang="pl">Ze względu na sposób rozwoju Matriksa, NeoChat obsługuje także kilka niestabilnych możliwości. Obecnie są to:</p>
     <p xml:lang="pt">Devido à natureza do desenvolvimento da especificação do Matrix, o NeoChat também suporta diversas funcionalidades instáveis. De momento são:</p>
+    <p xml:lang="pt-BR">Devido à natureza do desenvolvimento da especificação Matrix, o NeoChat também suporta diversos recursos instáveis. Atualmente, são eles:</p>
     <p xml:lang="ru">В силу природы разработки спецификации Matrix в NeoChat тоже предусмотрена поддержка многочисленных нестабильных возможностей. В текущей версии это следующие возможности:</p>
     <p xml:lang="sa">Matrix विनिर्देशविकासस्य प्रकृतेः कारणात् NeoChat अपि अनेकानाम् अस्थिरविशेषतानां समर्थनं करोति । सम्प्रति एते सन्ति :</p>
     <p xml:lang="sl">Zaradi narave razvoja specifikacije Matrixa NeoChat podpira tudi številne nestabilne zmožnosti. Trenutno so to:</p>
@@ -184,8 +191,8 @@
     <ul>
       <li>Polls - MSC3381</li>
       <li xml:lang="ar">التصويت - MSC3381</li>
-      <li xml:lang="ca">Enquestes - MSC3381</li>
-      <li xml:lang="ca-valencia">Enquestes - MSC3381</li>
+      <li xml:lang="ca">Votacions - MSC3381</li>
+      <li xml:lang="ca-valencia">Votacions - MSC3381</li>
       <li xml:lang="el">Δημοσκοπήσεις - MSC3381</li>
       <li xml:lang="en-GB">Polls - MSC3381</li>
       <li xml:lang="eo">Enketoj - MSC3381</li>
@@ -206,6 +213,7 @@
       <li xml:lang="nn">Avstemmingar – MSC3381</li>
       <li xml:lang="pl">Ankiety - MSC3381</li>
       <li xml:lang="pt">Inquéritos - MSC3381</li>
+      <li xml:lang="pt-BR">Enquetes - MSC3381</li>
       <li xml:lang="ru">Голосования — MSC3381</li>
       <li xml:lang="sa">मतदान - MSC3381</li>
       <li xml:lang="sl">Polls - MSC3381</li>
@@ -239,6 +247,7 @@
       <li xml:lang="nn">Klistremerke-pakkar – MSC2545</li>
       <li xml:lang="pl">Paczki naklejek - MSC2545</li>
       <li xml:lang="pt">Pacotes de Autocolantes - MSC2545</li>
+      <li xml:lang="pt-BR">Pacotes de Stickers - MSC2545</li>
       <li xml:lang="ru">Наборы стикеров — MSC2545</li>
       <li xml:lang="sa">स्टिकर पैक - MSC2545</li>
       <li xml:lang="sl">Sticker Packs - MSC2545</li>
@@ -272,6 +281,7 @@
       <li xml:lang="nn">Posisjonshendingar – MSC3488</li>
       <li xml:lang="pl">Wydarzenia w miejscach - MSC3488</li>
       <li xml:lang="pt">Eventos com Localizações - MSC3488</li>
+      <li xml:lang="pt-BR">Localização de eventos - MSC3488</li>
       <li xml:lang="ru">События местоположения — MSC3488</li>
       <li xml:lang="sa">स्थान घटनाएँ - MSC3488</li>
       <li xml:lang="sl">Location Events - MSC3488</li>
@@ -296,8 +306,8 @@
     <keyword>Matrix</keyword>
     <keyword>Kirigami</keyword>
   </keywords>
-  <developer id="kde.org">
-    <name>The KDE Community</name>
+  <developer id="org.kde">
+    <name translate="no">KDE</name>
     <url>https://kde.org</url>
   </developer>
   <metadata_license>CC0-1.0</metadata_license>
@@ -341,6 +351,7 @@
       <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
       <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
       <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="pt-BR">Visão principal com lista de salas, bate-papo e informações sobre as salas</caption>
       <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
       <caption xml:lang="sa">कक्षसूची, गपशपः, कक्षसूचना च सह मुख्यदृश्यम्</caption>
       <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
@@ -372,10 +383,12 @@
       <caption xml:lang="ia">Discoperi nove communitate con Matrix Spaces (Spatios de Matrix)</caption>
       <caption xml:lang="it">Scopri nuove comunità con Matrix Spaces</caption>
       <caption xml:lang="ka">აღმოაჩინეთ ახალი საზოგადოებები Matrix Spaces-თან ერთად</caption>
+      <caption xml:lang="ko">Matrix 스페이스에서 새로운 커뮤니티 탐험</caption>
       <caption xml:lang="lv">Atklājiet jaunas kopienas ar „Matrix“ telpām</caption>
       <caption xml:lang="nl">Ontdek nieuwe gemeenschappen met Matrix-ruimten</caption>
       <caption xml:lang="nn">Oppdag nye fellesskap med Matrix Spaces</caption>
       <caption xml:lang="pl">Odkrywaj nowe społeczności w Przestrzeniach Matriksa</caption>
+      <caption xml:lang="pt-BR">Descubra novas comunidades com os Espaços Matrix</caption>
       <caption xml:lang="ru">Поиск новых сообществ с помощью Matrix Spaces</caption>
       <caption xml:lang="sa">Matrix Spaces इत्यनेन सह नूतनानां समुदायानाम् अन्वेषणं कुर्वन्तु</caption>
       <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
@@ -420,6 +433,7 @@
       <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
       <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
       <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="pt-BR">Visão principal com lista de salas, bate-papo e informações sobre as salas</caption>
       <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
       <caption xml:lang="sa">कक्षसूची, गपशपः, कक्षसूचना च सह मुख्यदृश्यम्</caption>
       <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
@@ -458,6 +472,7 @@
       <caption xml:lang="nn">Innloggingsbilete</caption>
       <caption xml:lang="pl">Ekran logowania</caption>
       <caption xml:lang="pt">Ecrã de autenticação</caption>
+      <caption xml:lang="pt-BR">Tela de login</caption>
       <caption xml:lang="ru">Окно входа</caption>
       <caption xml:lang="sa">लॉगिन् स्क्रीन</caption>
       <caption xml:lang="sl">Prijavni zaslon</caption>
@@ -473,6 +488,11 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="25.08.0" date="2025-08-14"/>
+    <release version="25.04.3" date="2025-07-03"/>
+    <release version="25.04.2" date="2025-06-05"/>
+    <release version="25.04.1" date="2025-05-08"/>
+    <release version="25.04.0" date="2025-04-17"/>
     <release version="24.12.3" date="2025-03-06"/>
     <release version="24.12.2" date="2025-02-06"/>
     <release version="24.12.1" date="2025-01-09"/>

org.kde.neochat.desktop

@@ -109,10 +109,12 @@ Comment[hu]=Csevegés Matrixon
 Comment[ia]=Conversation en ditecto sur Matrix
 Comment[it]= su Matrix
 Comment[ka]=ჩატი Matrix-ზე
+Comment[ko]=Matrix에서 대화하기
 Comment[lv]=Tērzējiet „Matrix“ tīklā
 Comment[nl]=Chat op Matrix
 Comment[pl]=Rozmawiaj na Matriksie
 Comment[pt_BR]=Bate papo na Matrix
+Comment[ru]=Общение в Matrix
 Comment[sa]=Matrix इत्यत्र गपशपं कुर्वन्तु
 Comment[sl]=Klepet na Matrixu
 Comment[sv]=Chatta på Matrix

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

@@ -0,0 +1,122 @@
+<?xml version="1.0" ?>
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
+<!ENTITY % Russian "INCLUDE">
+]>
+<!--
+SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
+SPDX-License-Identifier: CC-BY-SA-4.0
+-->
+
+<refentry lang="&language;">
+<refentryinfo>
+<title
+>Руководство пользователя NeoChat</title>
+<author
+><firstname
+>Carl</firstname
+><surname
+>Schwan</surname
+> <contrib
+>man-страница NeoChat.</contrib
+> <email
+>carl@carlschwan.eu</email
+></author>
+<date
+>2022-11-01</date>
+<releaseinfo
+>22.09</releaseinfo>
+<productname
+>NeoChat</productname>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>
+    <command
+>neochat</command>
+  </refentrytitle>
+  <manvolnum
+>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+  <refname
+>neochat</refname>
+  <refpurpose
+>Клиент для взаимодействия с протоколом обмена сообщениями Matrix</refpurpose>
+  </refnamediv>
+  <!-- body begins here -->
+  <refsynopsisdiv id='synopsis'>
+  <cmdsynopsis
+><command
+>neochat</command
+> <arg choice="opt"
+><replaceable
+>URI</replaceable
+></arg
+> </cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsect1 id="description">
+  <title
+>Описание</title>
+  <para
+><command
+>neochat</command
+> — приложение для настольных и мобильных устройств, позволяющее общаться в чатах с помощью протокола Matrix. </para>
+</refsect1>
+
+<refsect1 id="options"
+><title
+>Параметры</title>
+<variablelist>
+  <varlistentry>
+  <term
+><option
+>URI</option
+></term>
+  <listitem>
+    <para
+>URI-адрес пользователя или комнаты в Matrix, например: matrix:u/user:example.org и matrix:r/root:example.org. NeoChat попытается открыть указанную комнату или беседу. </para>
+  </listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1 id="bug">
+  <title
+>Отчёты об ошибках</title>
+  <para
+>Сообщать об ошибках и отправлять предложения по улучшению можно по адресу <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General"
+>https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General</ulink
+></para>
+</refsect1>
+
+<refsect1>
+  <title
+>Смотрите также</title>
+  <simplelist>
+    <member
+>Список наиболее часто задаваемых вопросов о Matrix <ulink url="https://matrix.org/faq/"
+>https://matrix.org/faq/</ulink
+> </member>
+    <member
+>kf5options(7)</member>
+    <member
+>qt5options(7)</member>
+  </simplelist>
+</refsect1>
+
+<refsect1 id="copyright"
+><title
+>Авторские права</title>
+<para
+>Авторские права &copy; Tobias Fella, 2020–2022 </para>
+<para
+>Авторские права &copy; Carl Schwan, 2020–2022 </para>
+<para
+>Лицензия: стандартная общественная лицензия GNU версии 3 или любой более поздней версии &lt;<ulink url="https://www.gnu.org/licenses/gpl-3.0.html"
+>https://www.gnu.org/licenses/gpl-3.0.html</ulink
+>&gt;</para>
+</refsect1>
+</refentry>

snapcraft.yaml

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Scarlett Moore <sgmoore@kde.org>
+# SPDX-FileCopyrightText: 2024-2025 Scarlett Moore <sgmoore@kde.org>
 #
 # SPDX-License-Identifier: CC0-1.0
 ---
@@ -24,6 +24,9 @@ apps:
       - network-manager-observe
       - password-manager-service
       - accounts-service
+    environment:
+      QT_PLUGIN_PATH: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/plugins/snap/kf6-core24/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/plugins"
+      QML_IMPORT_PATH: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qml:/snap/kf6-core24/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qml"
 
 compression: lzo
 
@@ -41,11 +44,12 @@ parts:
   olm:
     source: https://gitlab.matrix.org/matrix-org/olm.git
     source-depth: 1
-    source-tag: '3.2.12'
+    source-tag: '3.2.16'
     plugin: cmake
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_POLICY_VERSION_MINIMUM=3.5
     prime:
       - -usr/include
       - -usr/lib/*/pkgconfig
@@ -81,8 +85,7 @@ parts:
     plugin: cmake
     build-environment:
       - PATH: /snap/bin:${PATH}
-      - PKG_CONFIG_PATH: "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET\
-      /pkgconfig:$PKG_CONFIG_PATH"
+      - PKG_CONFIG_PATH: "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig:$PKG_CONFIG_PATH"
     cmake-parameters:
       - -DCMAKE_INSTALL_PREFIX=/usr
       - -DCMAKE_BUILD_TYPE=Release
@@ -98,7 +101,7 @@ parts:
       - olm
       - qtkeychain
     source: https://github.com/quotient-im/libQuotient.git
-    source-tag: 0.9.1
+    source-tag: 0.9.2
     source-depth: 1
     plugin: cmake
     build-environment:
@@ -137,11 +140,24 @@ parts:
       - -usr/lib/*/pkgconfig
       - -usr/lib/*/cmake
 
+  kunifiedpush:
+    source: https://invent.kde.org/libraries/kunifiedpush.git
+    plugin: cmake
+    build-environment:
+      - PATH: /snap/bin:${PATH}
+      - PYTHONPATH: ${CRAFT_STAGE}/lib/python3.12/site-packages:${CRAFT_STAGE}/usr/lib/python3/dist-packages
+      - LD_LIBRARY_PATH: "/snap/mesa-2404/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libproxy:$LD_LIBRARY_PATH"
+    cmake-parameters:
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DBUILD_TESTING=OFF
+
   neochat:
     after:
       - qtkeychain
       - libquotient
       - kquickimageeditor
+      - kunifiedpush
     parse-info:
       - usr/share/metainfo/org.kde.neochat.appdata.xml
     source: .

src/CMakeLists.txt

@@ -1,580 +1,18 @@
-# SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carl@carlschwan.eu>
-# SPDX-FileCopyrightText: 2020-2021 Nicolas Fella <nicolas.fella@gmx.de>
-# SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
+# SPDX-FileCopyrightText: 2025 James Graham <james.h.graham@protonmail.com>
 # SPDX-License-Identifier: BSD-2-Clause
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT NEOCHAT_FLATPAK AND NOT NEOCHAT_APPIMAGE)
     add_subdirectory(purpose)
 endif()
 
-add_library(neochat STATIC
-    controller.cpp
-    controller.h
-    models/emojimodel.cpp
-    models/emojimodel.h
-    emojitones.cpp
-    emojitones.h
-    models/customemojimodel.cpp
-    models/customemojimodel.h
-    clipboard.cpp
-    clipboard.h
-    models/timelinemessagemodel.cpp
-    models/timelinemessagemodel.h
-    models/messagefiltermodel.cpp
-    models/messagefiltermodel.h
-    models/roomlistmodel.cpp
-    models/roomlistmodel.h
-    models/sortfilterspacelistmodel.cpp
-    models/sortfilterspacelistmodel.h
-    models/accountemoticonmodel.cpp
-    models/accountemoticonmodel.h
-    spacehierarchycache.cpp
-    spacehierarchycache.h
-    roommanager.cpp
-    roommanager.h
-    neochatroom.cpp
-    neochatroom.h
-    models/userlistmodel.cpp
-    models/userlistmodel.h
-    models/userfiltermodel.cpp
-    models/userfiltermodel.h
-    models/publicroomlistmodel.cpp
-    models/publicroomlistmodel.h
-    models/spacechildrenmodel.cpp
-    models/spacechildrenmodel.h
-    models/spacechildsortfiltermodel.cpp
-    models/spacechildsortfiltermodel.h
-    models/spacetreeitem.cpp
-    models/spacetreeitem.h
-    models/userdirectorylistmodel.cpp
-    models/userdirectorylistmodel.h
-    models/pushrulemodel.cpp
-    models/pushrulemodel.h
-    models/emoticonfiltermodel.cpp
-    models/emoticonfiltermodel.h
-    notificationsmanager.cpp
-    notificationsmanager.h
-    models/sortfilterroomlistmodel.cpp
-    models/sortfilterroomlistmodel.h
-    models/roomtreemodel.cpp
-    models/roomtreemodel.h
-    chatdocumenthandler.cpp
-    chatdocumenthandler.h
-    models/devicesmodel.cpp
-    models/devicesmodel.h
-    models/devicesproxymodel.cpp
-    filetype.cpp
-    filetype.h
-    login.cpp
-    login.h
-    models/webshortcutmodel.cpp
-    models/webshortcutmodel.h
-    blurhash.cpp
-    blurhash.h
-    blurhashimageprovider.cpp
-    blurhashimageprovider.h
-    models/mediamessagefiltermodel.cpp
-    models/mediamessagefiltermodel.h
-    urlhelper.cpp
-    urlhelper.h
-    windowcontroller.cpp
-    windowcontroller.h
-    linkpreviewer.cpp
-    linkpreviewer.h
-    models/completionmodel.cpp
-    models/completionmodel.h
-    models/completionproxymodel.cpp
-    models/completionproxymodel.h
-    models/actionsmodel.cpp
-    models/actionsmodel.h
-    models/serverlistmodel.cpp
-    models/serverlistmodel.h
-    models/statemodel.cpp
-    models/statemodel.h
-    models/statefiltermodel.cpp
-    models/statefiltermodel.h
-    filetransferpseudojob.cpp
-    filetransferpseudojob.h
-    models/searchmodel.cpp
-    models/searchmodel.h
-    texthandler.cpp
-    texthandler.h
-    logger.cpp
-    logger.h
-    models/stickermodel.cpp
-    models/stickermodel.h
-    models/imagepacksmodel.cpp
-    models/imagepacksmodel.h
-    events/imagepackevent.cpp
-    events/imagepackevent.h
-    models/reactionmodel.cpp
-    models/reactionmodel.h
-    delegatesizehelper.cpp
-    delegatesizehelper.h
-    models/livelocationsmodel.cpp
-    models/livelocationsmodel.h
-    models/locationsmodel.cpp
-    models/locationsmodel.h
-    locationhelper.cpp
-    locationhelper.h
-    events/pollevent.cpp
-    pollhandler.cpp
-    utils.h
-    utils.cpp
-    registration.cpp
-    neochatconnection.cpp
-    neochatconnection.h
-    jobs/neochatgetcommonroomsjob.cpp
-    jobs/neochatgetcommonroomsjob.h
-    mediasizehelper.cpp
-    mediasizehelper.h
-    eventhandler.cpp
-    enums/delegatetype.h
-    roomlastmessageprovider.cpp
-    roomlastmessageprovider.h
-    chatbarcache.cpp
-    chatbarcache.h
-    colorschemer.cpp
-    colorschemer.h
-    models/notificationsmodel.cpp
-    models/notificationsmodel.h
-    models/timelinemodel.cpp
-    models/timelinemodel.h
-    enums/pushrule.h
-    models/itinerarymodel.cpp
-    models/itinerarymodel.h
-    proxycontroller.cpp
-    proxycontroller.h
-    models/linemodel.cpp
-    models/linemodel.h
-    events/locationbeaconevent.h
-    events/widgetevent.h
-    enums/messagecomponenttype.h
-    models/messagecontentmodel.cpp
-    models/messagecontentmodel.h
-    enums/neochatroomtype.h
-    models/sortfilterroomtreemodel.cpp
-    models/sortfilterroomtreemodel.h
-    mediamanager.cpp
-    mediamanager.h
-    models/statekeysmodel.cpp
-    models/statekeysmodel.h
-    sharehandler.cpp
-    sharehandler.h
-    models/roomtreeitem.cpp
-    models/roomtreeitem.h
-    foreigntypes.h
-    models/threepidmodel.cpp
-    models/threepidmodel.h
-    threepidaddhelper.cpp
-    threepidaddhelper.h
-    identityserverhelper.cpp
-    identityserverhelper.h
-    enums/powerlevel.cpp
-    enums/powerlevel.h
-    models/permissionsmodel.cpp
-    models/permissionsmodel.h
-    threepidbindhelper.cpp
-    threepidbindhelper.h
-    models/readmarkermodel.cpp
-    models/readmarkermodel.h
-    neochatroommember.cpp
-    neochatroommember.h
-    models/threadmodel.cpp
-    models/threadmodel.h
-    enums/messagetype.h
-    messagecomponent.h
-    enums/roomsortparameter.cpp
-    enums/roomsortparameter.h
-    models/roomsortparametermodel.cpp
-    models/roomsortparametermodel.h
-    models/messagemodel.cpp
-    models/messagemodel.h
-    models/messagecontentfiltermodel.cpp
-    models/messagecontentfiltermodel.h
-    models/pinnedmessagemodel.cpp
-    models/pinnedmessagemodel.h
-    models/commonroomsmodel.cpp
-    models/commonroomsmodel.h
-)
-
-set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
-    QT_QML_SINGLETON_TYPE TRUE
-)
-
-if(ANDROID OR WIN32)
-    set_source_files_properties(qml/ShareActionStub.qml PROPERTIES
-        QT_QML_SOURCE_TYPENAME ShareAction
-    )
-endif()
-
-ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
-    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat
-    QML_FILES
-        qml/Main.qml
-        qml/AccountMenu.qml
-        qml/ExploreComponent.qml
-        qml/ExploreComponentMobile.qml
-        qml/RoomContextMenu.qml
-        qml/CollapsedRoomDelegate.qml
-        qml/RoomDelegate.qml
-        qml/RoomListPage.qml
-        qml/SpaceListContextMenu.qml
-        qml/UserInfo.qml
-        qml/UserInfoDesktop.qml
-        qml/RoomPage.qml
-        qml/ExploreRoomsPage.qml
-        qml/ManualRoomDialog.qml
-        qml/ExplorerDelegate.qml
-        qml/InviteUserPage.qml
-        qml/ImageEditorPage.qml
-        qml/NeochatMaximizeComponent.qml
-        qml/TypingPane.qml
-        qml/QuickSwitcher.qml
-        qml/HoverActions.qml
-        qml/AttachmentPane.qml
-        qml/QuickFormatBar.qml
-        qml/UserDetailDialog.qml
-        qml/CreateRoomDialog.qml
-        qml/OpenFileDialog.qml
-        qml/KeyVerificationDialog.qml
-        qml/ConfirmLogoutDialog.qml
-        qml/PowerLevelDialog.qml
-        qml/Message.qml
-        qml/EmojiItem.qml
-        qml/EmojiRow.qml
-        qml/EmojiSas.qml
-        qml/ConfirmDeactivateAccountDialog.qml
-        qml/VerificationCanceled.qml
-        qml/MessageDelegateContextMenu.qml
-        qml/FileDelegateContextMenu.qml
-        qml/MessageSourceSheet.qml
-        qml/ConfirmEncryptionDialog.qml
-        qml/RoomSearchPage.qml
-        qml/RoomPinnedMessagesPage.qml
-        qml/LocationChooser.qml
-        qml/TimelineView.qml
-        qml/InvitationView.qml
-        qml/AvatarTabButton.qml
-        qml/SpaceDrawer.qml
-        qml/OsmLocationPlugin.qml
-        qml/FullScreenMap.qml
-        qml/LocationsPage.qml
-        qml/LocationMapItem.qml
-        qml/RoomDrawer.qml
-        qml/RoomDrawerPage.qml
-        qml/DirectChatDrawerHeader.qml
-        qml/GroupChatDrawerHeader.qml
-        qml/RoomInformation.qml
-        qml/RoomMedia.qml
-        qml/ChooseRoomDialog.qml
-        qml/SpaceHomePage.qml
-        qml/SpaceHierarchyDelegate.qml
-        qml/RemoveChildDialog.qml
-        qml/SelectParentDialog.qml
-        qml/QrCodeMaximizeComponent.qml
-        qml/SelectSpacesDialog.qml
-        qml/NotificationsView.qml
-        qml/SearchPage.qml
-        qml/ServerComboBox.qml
-        qml/UserSearchPage.qml
-        qml/ManualUserDialog.qml
-        qml/RecommendedSpaceDialog.qml
-        qml/RoomTreeSection.qml
-        qml/DelegateContextMenu.qml
-        qml/ShareDialog.qml
-        qml/UnlockSSSSDialog.qml
-        qml/QrScannerPage.qml
-        qml/JoinRoomDialog.qml
-        qml/ConfirmUrlDialog.qml
-        qml/AccountSwitchDialog.qml
-        qml/ConfirmLeaveDialog.qml
-        qml/CodeMaximizeComponent.qml
-        qml/EditStateDialog.qml
-        qml/ConsentDialog.qml
-        qml/AskDirectChatConfirmation.qml
-        qml/HoverLinkIndicator.qml
-        qml/AvatarNotification.qml
-        qml/ReasonDialog.qml
-    DEPENDENCIES
-        QtCore
-        QtQuick
-    IMPORTS
-        org.kde.neochat.timeline
-        org.kde.neochat.settings
-        org.kde.neochat.devtools
-        org.kde.neochat.login
-        org.kde.neochat.chatbar
-)
-
-add_subdirectory(settings)
-add_subdirectory(timeline)
-add_subdirectory(devtools)
+add_subdirectory(libneochat)
 add_subdirectory(login)
+add_subdirectory(rooms)
+add_subdirectory(roominfo)
+add_subdirectory(messagecontent)
+add_subdirectory(timeline)
+add_subdirectory(spaces)
 add_subdirectory(chatbar)
-
-if(NOT ANDROID AND NOT WIN32)
-    qt_target_qml_sources(neochat QML_FILES
-        qml/ShareAction.qml
-        qml/GlobalMenu.qml
-        qml/EditMenu.qml
-    )
-else()
-    qt_target_qml_sources(neochat QML_FILES qml/ShareActionStub.qml)
-endif()
-
-configure_file(config-neochat.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-neochat.h)
-
-if(WIN32)
-    set_target_properties(neochat PROPERTIES OUTPUT_NAME "neochatlib")
-endif()
-
-ecm_qt_declare_logging_category(neochat
-    HEADER "messagemodel_logging.h"
-    IDENTIFIER "Message"
-    CATEGORY_NAME "org.kde.neochat.messagemodel"
-    DESCRIPTION "Neochat: messagemodel"
-    DEFAULT_SEVERITY Info
-    EXPORT NEOCHAT
-)
-
-ecm_qt_declare_logging_category(neochat
-    HEADER "publicroomlist_logging.h"
-    IDENTIFIER "PublicRoomList"
-    CATEGORY_NAME "org.kde.neochat.publicroomlistmodel"
-    DESCRIPTION "Neochat: publicroomlistmodel"
-    DEFAULT_SEVERITY Info
-    EXPORT NEOCHAT
-)
-
-ecm_qt_declare_logging_category(neochat
-    HEADER "eventhandler_logging.h"
-    IDENTIFIER "EventHandling"
-    CATEGORY_NAME "org.kde.neochat.eventhandler"
-    DEFAULT_SEVERITY Info
-)
-
-ecm_qt_declare_logging_category(neochat
-    HEADER "chatdocumenthandler_logging.h"
-    IDENTIFIER "ChatDocumentHandling"
-    CATEGORY_NAME "org.kde.neochat.chatdocumenthandler"
-    DEFAULT_SEVERITY Info
-)
-
-add_executable(neochat-app
-    main.cpp
-)
-
-if(TARGET Qt::WebView)
-    target_link_libraries(neochat-app PUBLIC Qt::WebView)
-    target_compile_definitions(neochat-app PUBLIC -DHAVE_WEBVIEW)
-endif()
-
-target_include_directories(neochat-app PRIVATE ${CMAKE_BINARY_DIR})
-
-target_link_libraries(neochat-app PRIVATE
-    neochat
-)
-
-ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)
-
-target_sources(neochat-app PRIVATE ${NEOCHAT_ICON})
-
-if(NOT ANDROID)
-    if (NOT WIN32 AND NOT APPLE)
-        target_sources(neochat PRIVATE trayicon_sni.cpp trayicon_sni.h)
-        target_link_libraries(neochat PRIVATE KF6::StatusNotifierItem)
-    else()
-        target_sources(neochat PRIVATE trayicon.cpp trayicon.h)
-    endif()
-    target_link_libraries(neochat PUBLIC KF6::WindowSystem ICU::uc)
-    target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM)
-    target_compile_definitions(neochat PUBLIC -DHAVE_ICU)
-endif()
-
-if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU)
-    target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
-    target_compile_definitions(neochat PUBLIC -DHAVE_X11=1)
-    target_sources(neochat PRIVATE runner.cpp)
-
-    if (TARGET KUnifiedPush)
-        target_sources(neochat PRIVATE fakerunner.cpp)
-    endif()
-else()
-    target_compile_definitions(neochat PUBLIC -DHAVE_X11=0)
-endif()
-
-target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums)
-target_link_libraries(neochat PRIVATE settingsplugin timelineplugin devtoolsplugin loginplugin chatbarplugin)
-target_link_libraries(neochat PUBLIC
-    Qt::Core
-    Qt::Quick
-    Qt::Qml
-    Qt::Gui
-    Qt::Multimedia
-    Qt::Network
-    Qt::QuickControls2
-    KF6::I18n
-    KF6::Kirigami
-    KF6::Notifications
-    KF6::ConfigCore
-    KF6::ConfigGui
-    KF6::CoreAddons
-    KF6::SonnetCore
-    KF6::IconThemes
-    KF6::ColorScheme
-    KF6::ItemModels
-    QuotientQt6
-    cmark::cmark
-    QCoro::Core
-    QCoro::Network
-)
-
-if (TARGET KF6::Crash)
-    target_link_libraries(neochat PUBLIC KF6::Crash)
-endif()
-
-kconfig_target_kcfg_file(neochat FILE neochatconfig.kcfg CLASS_NAME NeoChatConfig MUTATORS GENERATE_PROPERTIES DEFAULT_VALUE_GETTERS PARENT_IN_CONSTRUCTOR SINGLETON GENERATE_MOC QML_REGISTRATION)
-
-if(NEOCHAT_FLATPAK)
-    target_compile_definitions(neochat PUBLIC NEOCHAT_FLATPAK)
-endif()
-
-if(ANDROID)
-    target_sources(neochat PRIVATE notifyrc.qrc)
-    target_link_libraries(neochat PRIVATE Qt::Svg OpenSSL::SSL)
-    if(SQLite3_FOUND)
-        target_link_libraries(neochat-app PRIVATE SQLite::SQLite3)
-    endif()
-    target_sources(neochat-app PRIVATE notifyrc.qrc)
-    target_link_libraries(neochat PUBLIC Qt::Svg OpenSSL::SSL)
-    kirigami_package_breeze_icons(ICONS
-        "arrow-down-symbolic"
-        "arrow-up-symbolic"
-        "arrow-up-double-symbolic"
-        "arrow-left-symbolic"
-        "arrow-right-symbolic"
-        "checkmark"
-        "help-about"
-        "im-user"
-        "im-invisible-user"
-        "im-kick-user"
-        "mail-attachment"
-        "dialog-cancel"
-        "preferences-desktop-emoticons"
-        "preferences-security"
-        "document-open"
-        "document-save"
-        "document-send"
-        "dialog-close"
-        "edit-delete-remove"
-        "code-context"
-        "document-edit"
-        "list-user-add"
-        "list-add-user"
-        "user-others"
-        "media-playback-pause"
-        "media-playback-start"
-        "media-playback-stop"
-        "go-previous"
-        "go-up"
-        "go-down"
-        "list-add"
-        "irc-join-channel"
-        "settings-configure"
-        "configure"
-        "rating"
-        "rating-unrated"
-        "search"
-        "mail-replied-symbolic"
-        "edit-clear"
-        "edit-copy"
-        "gtk-quit"
-        "compass"
-        "computer"
-        "network-connect"
-        "list-remove-user"
-        "org.kde.neochat"
-        "org.kde.neochat.tray"
-        "preferences-system-users"
-        "preferences-desktop-theme-global"
-        "notifications"
-        "notifications-disabled"
-        "audio-volume-high"
-        "audio-volume-muted"
-        "draw-highlight"
-        "zoom-in"
-        "zoom-out"
-        "image-rotate-left-symbolic"
-        "image-rotate-right-symbolic"
-        "channel-secure-symbolic"
-        "download"
-        "smiley"
-        "tools-check-spelling"
-        "username-copy"
-        "system-switch-user"
-        "bookmark-new"
-        "bookmark-remove"
-        "favorite"
-        "window-new"
-        "globe"
-        "visibility"
-        "home"
-        "preferences-desktop-notification"
-        "computer-symbolic"
-        "gps"
-        "system-users-symbolic"
-        "map-flat"
-        "documentinfo"
-        "view-list-details"
-        "go-previous"
-        "mail-forward-symbolic"
-        "dialog-warning-symbolic"
-        "object-rotate-left"
-        "object-rotate-right"
-        "add-subtitle"
-        "security-high"
-        "security-low"
-        "security-low-symbolic"
-        "kde"
-        "list-remove-symbolic"
-        "edit-delete"
-        "user-home-symbolic"
-        "pin-symbolic"
-        "kt-restore-defaults-symbolic"
-        "user-symbolic"
-    )
-    ecm_add_android_apk(neochat-app ANDROID_DIR ${CMAKE_SOURCE_DIR}/android)
-else()
-    target_link_libraries(neochat PUBLIC Qt::Widgets KF6::KIOWidgets KF6::SyntaxHighlighting)
-    install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
-endif()
-
-if(NOT ANDROID)
-    set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
-endif()
-
-if(TARGET KF6::DBusAddons AND NOT WIN32)
-    target_link_libraries(neochat PUBLIC KF6::DBusAddons)
-    target_compile_definitions(neochat PUBLIC -DHAVE_KDBUSADDONS)
-endif()
-
-if (TARGET KF6::KIOWidgets)
-    target_compile_definitions(neochat PUBLIC -DHAVE_KIO)
-endif()
-
-if (TARGET KUnifiedPush)
-    target_compile_definitions(neochat PUBLIC -DHAVE_KUNIFIEDPUSH)
-    target_link_libraries(neochat PUBLIC KUnifiedPush)
-
-    if (NOT ANDROID)
-        configure_file(org.kde.neochat.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.kde.neochat.service)
-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.neochat.service DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
-    endif()
-endif()
-
-install(TARGETS neochat-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-
-if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
-    install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins)
-endif()
+add_subdirectory(settings)
+add_subdirectory(devtools)
+add_subdirectory(app)

src/app/CMakeLists.txt

@@ -0,0 +1,365 @@
+# SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carl@carlschwan.eu>
+# SPDX-FileCopyrightText: 2020-2021 Nicolas Fella <nicolas.fella@gmx.de>
+# SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
+# SPDX-License-Identifier: BSD-2-Clause
+
+add_library(neochat STATIC
+    controller.cpp
+    controller.h
+    roommanager.cpp
+    roommanager.h
+    models/userdirectorylistmodel.cpp
+    models/userdirectorylistmodel.h
+    notificationsmanager.cpp
+    notificationsmanager.h
+    blurhash.cpp
+    blurhash.h
+    blurhashimageprovider.cpp
+    blurhashimageprovider.h
+    windowcontroller.cpp
+    windowcontroller.h
+    models/serverlistmodel.cpp
+    models/serverlistmodel.h
+    models/notificationsmodel.cpp
+    models/notificationsmodel.h
+    proxycontroller.cpp
+    proxycontroller.h
+    mediamanager.cpp
+    mediamanager.h
+    sharehandler.cpp
+    sharehandler.h
+    foreigntypes.h
+    identityserverhelper.cpp
+    identityserverhelper.h
+    models/commonroomsmodel.cpp
+    models/commonroomsmodel.h
+    texttospeechhelper.h
+    texttospeechhelper.cpp
+)
+
+set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
+    QT_QML_SINGLETON_TYPE TRUE
+)
+
+if(ANDROID OR WIN32)
+    set_source_files_properties(qml/ShareActionStub.qml PROPERTIES
+        QT_QML_SOURCE_TYPENAME ShareAction
+    )
+    set_source_files_properties(qml/GlobalMenuStub.qml PROPERTIES
+            QT_QML_SOURCE_TYPENAME GlobalMenu
+    )
+endif()
+
+ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
+    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat
+    QML_FILES
+        qml/Main.qml
+        qml/AccountMenu.qml
+        qml/CollapsedRoomDelegate.qml
+        qml/RoomPage.qml
+        qml/ManualRoomDialog.qml
+        qml/ExplorerDelegate.qml
+        qml/NeochatMaximizeComponent.qml
+        qml/QuickSwitcher.qml
+        qml/AttachmentPane.qml
+        qml/QuickFormatBar.qml
+        qml/UserDetailDialog.qml
+        qml/OpenFileDialog.qml
+        qml/KeyVerificationDialog.qml
+        qml/ConfirmLogoutDialog.qml
+        qml/VerificationMessage.qml
+        qml/EmojiItem.qml
+        qml/EmojiRow.qml
+        qml/EmojiSas.qml
+        qml/VerificationCanceled.qml
+        qml/MessageSourceSheet.qml
+        qml/LocationChooser.qml
+        qml/InvitationView.qml
+        qml/AvatarTabButton.qml
+        qml/OsmLocationPlugin.qml
+        qml/FullScreenMap.qml
+        qml/ChooseRoomDialog.qml
+        qml/QrCodeMaximizeComponent.qml
+        qml/NotificationsView.qml
+        qml/ServerComboBox.qml
+        qml/UserSearchPage.qml
+        qml/ManualUserDialog.qml
+        qml/RecommendedSpaceDialog.qml
+        qml/ShareDialog.qml
+        qml/UnlockSSSSDialog.qml
+        qml/QrScannerPage.qml
+        qml/JoinRoomDialog.qml
+        qml/ConfirmUrlDialog.qml
+        qml/AccountSwitchDialog.qml
+        qml/ConfirmLeaveDialog.qml
+        qml/CodeMaximizeComponent.qml
+        qml/EditStateDialog.qml
+        qml/ConsentDialog.qml
+        qml/AskDirectChatConfirmation.qml
+        qml/HoverLinkIndicator.qml
+        qml/AvatarNotification.qml
+        qml/ReasonDialog.qml
+        qml/NewPollDialog.qml
+        qml/UserMenu.qml
+    DEPENDENCIES
+        QtCore
+        QtQuick
+        com.github.quotient_im.libquotient
+    IMPORTS
+        org.kde.neochat.libneochat
+        org.kde.neochat.rooms
+        org.kde.neochat.roominfo
+        org.kde.neochat.messagecontent
+        org.kde.neochat.timeline
+        org.kde.neochat.spaces
+        org.kde.neochat.settings
+        org.kde.neochat.devtools
+        org.kde.neochat.login
+        org.kde.neochat.chatbar
+        org.kde.config
+        org.kde.purpose
+        org.kde.syntaxhighlighting
+)
+
+if(NOT ANDROID AND NOT WIN32)
+    qt_target_qml_sources(neochat QML_FILES
+        qml/ShareAction.qml
+        qml/GlobalMenu.qml
+    )
+else()
+    qt_target_qml_sources(neochat QML_FILES
+            qml/ShareActionStub.qml
+            qml/GlobalMenuStub.qml
+    )
+endif()
+
+if(WIN32)
+    set_target_properties(neochat PROPERTIES OUTPUT_NAME "neochatlib")
+endif()
+
+add_executable(neochat-app
+    main.cpp
+)
+
+if(TARGET Qt::WebView)
+    target_link_libraries(neochat-app PUBLIC Qt::WebView)
+    target_compile_definitions(neochat-app PUBLIC -DHAVE_WEBVIEW)
+endif()
+
+target_include_directories(neochat-app PRIVATE ${CMAKE_BINARY_DIR})
+
+target_link_libraries(neochat-app PRIVATE
+    neochat
+)
+
+ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)
+
+target_sources(neochat-app PRIVATE ${NEOCHAT_ICON})
+
+if(NOT ANDROID)
+    if (NOT WIN32 AND NOT APPLE)
+        target_sources(neochat PRIVATE trayicon_sni.cpp trayicon_sni.h)
+        target_link_libraries(neochat PRIVATE KF6::StatusNotifierItem)
+    else()
+        target_sources(neochat PRIVATE trayicon.cpp trayicon.h)
+    endif()
+    target_link_libraries(neochat PUBLIC KF6::WindowSystem)
+    target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM)
+endif()
+
+if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU)
+    target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
+    target_compile_definitions(neochat PUBLIC -DHAVE_X11=1)
+    target_sources(neochat PRIVATE runner.cpp)
+
+    if (TARGET KUnifiedPush)
+        target_sources(neochat PRIVATE fakerunner.cpp)
+    endif()
+else()
+    target_compile_definitions(neochat PUBLIC -DHAVE_X11=0)
+endif()
+
+target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models)
+target_link_libraries(neochat PRIVATE Loginplugin Roomsplugin RoomInfoplugin MessageContentplugin Timelineplugin Spacesplugin Chatbarplugin Settingsplugin Devtoolsplugin)
+target_link_libraries(neochat PUBLIC
+    LibNeoChat
+    Timeline
+    Settings
+    Qt::Core
+    Qt::Quick
+    Qt::Qml
+    Qt::Gui
+    Qt::Multimedia
+    Qt::Network
+    Qt::QuickControls2
+    Qt::TextToSpeech
+    KF6::I18n
+    KF6::Kirigami
+    KF6::Notifications
+    KF6::ConfigCore
+    KF6::ConfigGui
+    KF6::CoreAddons
+    KF6::SonnetCore
+    KF6::IconThemes
+    KF6::ItemModels
+    QuotientQt6
+    Login
+    Rooms
+    MessageContent
+    Spaces
+)
+
+if (TARGET KF6::Crash)
+    target_link_libraries(neochat PUBLIC KF6::Crash)
+endif()
+
+kconfig_target_kcfg_file(neochat FILE neochatconfig.kcfg CLASS_NAME NeoChatConfig MUTATORS GENERATE_PROPERTIES DEFAULT_VALUE_GETTERS PARENT_IN_CONSTRUCTOR SINGLETON GENERATE_MOC QML_REGISTRATION)
+
+if(NEOCHAT_FLATPAK)
+    target_compile_definitions(neochat PUBLIC NEOCHAT_FLATPAK)
+endif()
+
+if(ANDROID)
+    target_sources(neochat PRIVATE notifyrc.qrc)
+    target_link_libraries(neochat PRIVATE Qt::Svg OpenSSL::SSL)
+    if(SQLite3_FOUND)
+        target_link_libraries(neochat-app PRIVATE SQLite::SQLite3)
+    endif()
+    target_sources(neochat-app PRIVATE notifyrc.qrc)
+    target_link_libraries(neochat PUBLIC Qt::Svg OpenSSL::SSL)
+    kirigami_package_breeze_icons(ICONS
+        "arrow-down-symbolic"
+        "arrow-up-symbolic"
+        "arrow-up-double-symbolic"
+        "arrow-left-symbolic"
+        "arrow-right-symbolic"
+        "checkmark"
+        "help-about"
+        "im-user"
+        "im-invisible-user"
+        "im-kick-user"
+        "mail-attachment"
+        "dialog-cancel"
+        "preferences-desktop-emoticons"
+        "preferences-security"
+        "document-open"
+        "document-save"
+        "document-send"
+        "dialog-close"
+        "edit-delete-remove"
+        "code-context"
+        "document-edit"
+        "list-user-add"
+        "list-add-user"
+        "user-others"
+        "media-playback-pause"
+        "media-playback-start"
+        "media-playback-stop"
+        "go-previous"
+        "go-up"
+        "go-down"
+        "list-add"
+        "irc-join-channel"
+        "settings-configure"
+        "configure"
+        "rating"
+        "rating-unrated"
+        "search"
+        "mail-replied-symbolic"
+        "edit-clear"
+        "edit-copy"
+        "gtk-quit"
+        "compass"
+        "computer"
+        "network-connect"
+        "list-remove-user"
+        "org.kde.neochat"
+        "org.kde.neochat.tray"
+        "preferences-system-users"
+        "preferences-desktop-theme-global"
+        "notifications"
+        "notifications-disabled"
+        "audio-volume-high"
+        "audio-volume-muted"
+        "draw-highlight"
+        "zoom-in"
+        "zoom-out"
+        "image-rotate-left-symbolic"
+        "image-rotate-right-symbolic"
+        "channel-secure-symbolic"
+        "download"
+        "smiley"
+        "tools-check-spelling"
+        "username-copy"
+        "system-switch-user"
+        "bookmark-new"
+        "bookmark-remove"
+        "favorite"
+        "window-new"
+        "globe"
+        "visibility"
+        "home"
+        "preferences-desktop-notification"
+        "computer-symbolic"
+        "gps"
+        "system-users-symbolic"
+        "map-flat"
+        "documentinfo"
+        "view-list-details"
+        "go-previous"
+        "mail-forward-symbolic"
+        "dialog-warning-symbolic"
+        "object-rotate-left"
+        "object-rotate-right"
+        "add-subtitle"
+        "security-high"
+        "security-low"
+        "security-low-symbolic"
+        "kde"
+        "list-remove-symbolic"
+        "edit-delete"
+        "user-home-symbolic"
+        "pin-symbolic"
+        "kt-restore-defaults-symbolic"
+        "user-symbolic"
+        "mark-location-symbolic"
+
+        ${KIRIGAMI_ADDONS_ICONS}
+    )
+    ecm_add_android_apk(neochat-app ANDROID_DIR ${CMAKE_SOURCE_DIR}/android)
+else()
+    target_link_libraries(neochat PUBLIC Qt::Widgets KF6::KIOWidgets)
+    install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
+endif()
+
+if(NOT ANDROID)
+    set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
+endif()
+
+if(TARGET KF6::DBusAddons AND NOT WIN32)
+    target_link_libraries(neochat PUBLIC KF6::DBusAddons)
+    target_compile_definitions(neochat PUBLIC -DHAVE_KDBUSADDONS)
+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})
+    endif()
+endif()
+
+install(TARGETS neochat-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+
+if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
+    install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins)
+endif()
+
+if (APPLE)
+    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.neochat")
+    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "NeoChat")
+    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING ${RELEASE_SERVICE_VERSION})
+    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION ${RELEASE_SERVICE_VERSION})
+endif ()

src/app/controller.cpp

@@ -0,0 +1,412 @@
+// SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#include "controller.h"
+
+#include <Quotient/connection.h>
+
+#include <KLocalizedString>
+
+#include <QGuiApplication>
+#include <QTimer>
+
+#include <signal.h>
+
+#include <Quotient/events/roommemberevent.h>
+#include <Quotient/qt_connection_util.h>
+#include <Quotient/settings.h>
+
+#include "accountmanager.h"
+#include "enums/roomsortparameter.h"
+#include "mediasizehelper.h"
+#include "models/actionsmodel.h"
+#include "models/messagemodel.h"
+#include "models/roomlistmodel.h"
+#include "models/roomtreemodel.h"
+#include "neochatconfig.h"
+#include "neochatconnection.h"
+#include "neochatroom.h"
+#include "notificationsmanager.h"
+#include "proxycontroller.h"
+#include "roommanager.h"
+
+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
+#include "trayicon.h"
+#elif !defined(Q_OS_ANDROID)
+#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
+
+using namespace Quotient;
+
+static std::function<bool(const Quotient::RoomEvent *)> hiddenEventFilter = [](const RoomEvent *event) -> bool {
+    if (event->isStateEvent() && !NeoChatConfig::showStateEvent()) {
+        return true;
+    }
+    if (auto roomMemberEvent = eventCast<const RoomMemberEvent>(event)) {
+        if ((roomMemberEvent->isJoin() || roomMemberEvent->isLeave()) && !NeoChatConfig::showLeaveJoinEvent()) {
+            return true;
+        } else if (roomMemberEvent->isRename() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave() && !NeoChatConfig::showRename()) {
+            return true;
+        } else if (roomMemberEvent->isAvatarUpdate() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave() && !NeoChatConfig::showAvatarUpdate()) {
+            return true;
+        }
+    }
+    return false;
+};
+
+Controller::Controller(QObject *parent)
+    : QObject(parent)
+{
+    Connection::setRoomType<NeoChatRoom>();
+
+    Connection::setDirectChatEncryptionDefault(NeoChatConfig::preferUsingEncryption());
+    connect(NeoChatConfig::self(), &NeoChatConfig::PreferUsingEncryptionChanged, this, [] {
+        Connection::setDirectChatEncryptionDefault(NeoChatConfig::preferUsingEncryption());
+    });
+
+    NeoChatConnection::setGlobalUrlPreviewDefault(NeoChatConfig::showLinkPreview());
+    connect(NeoChatConfig::self(), &NeoChatConfig::ShowLinkPreviewChanged, this, [this] {
+        NeoChatConnection::setGlobalUrlPreviewDefault(NeoChatConfig::showLinkPreview());
+        Q_EMIT globalUrlPreviewDefaultChanged();
+    });
+
+    NeoChatConnection::setKeywordPushRuleDefault(static_cast<PushRuleAction::Action>(NeoChatConfig::keywordPushRuleDefault()));
+    connect(NeoChatConfig::self(), &NeoChatConfig::KeywordPushRuleDefaultChanged, this, [] {
+        NeoChatConnection::setKeywordPushRuleDefault(static_cast<PushRuleAction::Action>(NeoChatConfig::keywordPushRuleDefault()));
+    });
+
+    ActionsModel::setAllowQuickEdit(NeoChatConfig::allowQuickEdit());
+    connect(NeoChatConfig::self(), &NeoChatConfig::AllowQuickEditChanged, this, []() {
+        ActionsModel::setAllowQuickEdit(NeoChatConfig::allowQuickEdit());
+    });
+
+    MessageModel::setHiddenFilter(hiddenEventFilter);
+    RoomListModel::setHiddenFilter(hiddenEventFilter);
+    RoomTreeModel::setHiddenFilter(hiddenEventFilter);
+    NeoChatRoom::setHiddenFilter(hiddenEventFilter);
+
+    MediaSizeHelper::setMaxSize(NeoChatConfig::mediaMaxWidth(), NeoChatConfig::mediaMaxHeight());
+    connect(NeoChatConfig::self(), &NeoChatConfig::MediaMaxWidthChanged, this, []() {
+        MediaSizeHelper::setMaxSize(NeoChatConfig::mediaMaxWidth(), NeoChatConfig::mediaMaxHeight());
+    });
+    connect(NeoChatConfig::self(), &NeoChatConfig::MediaMaxHeightChanged, this, []() {
+        MediaSizeHelper::setMaxSize(NeoChatConfig::mediaMaxWidth(), NeoChatConfig::mediaMaxHeight());
+    });
+
+    RoomSortParameter::setSortOrder(static_cast<RoomSortOrder::Order>(NeoChatConfig::sortOrder()));
+    connect(NeoChatConfig::self(), &NeoChatConfig::SortOrderChanged, this, []() {
+        RoomSortParameter::setSortOrder(static_cast<RoomSortOrder::Order>(NeoChatConfig::sortOrder()));
+    });
+
+    QList<RoomSortParameter::Parameter> configParamList;
+    const auto intList = NeoChatConfig::customSortOrder();
+    std::transform(intList.constBegin(), intList.constEnd(), std::back_inserter(configParamList), [](int param) {
+        return static_cast<RoomSortParameter::Parameter>(param);
+    });
+    RoomSortParameter::setCustomSortOrder(configParamList);
+    connect(NeoChatConfig::self(), &NeoChatConfig::CustomSortOrderChanged, this, []() {
+        QList<RoomSortParameter::Parameter> configParamList;
+        const auto intList = NeoChatConfig::customSortOrder();
+        std::transform(intList.constBegin(), intList.constEnd(), std::back_inserter(configParamList), [](int param) {
+            return static_cast<RoomSortParameter::Parameter>(param);
+        });
+        RoomSortParameter::setCustomSortOrder(configParamList);
+    });
+
+    ProxyController::instance().setApplicationProxy();
+
+#ifndef Q_OS_ANDROID
+    setQuitOnLastWindowClosed();
+    connect(NeoChatConfig::self(), &NeoChatConfig::SystemTrayChanged, this, &Controller::setQuitOnLastWindowClosed);
+#endif
+
+    QObject::connect(QGuiApplication::instance(), &QCoreApplication::aboutToQuit, QGuiApplication::instance(), [this] {
+        delete m_trayIcon;
+        NeoChatConfig::self()->save();
+    });
+
+#ifndef Q_OS_WINDOWS
+    const auto unixExitHandler = [](int) -> void {
+        QCoreApplication::quit();
+    };
+
+    const int quitSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
+
+    sigset_t blockingMask;
+    sigemptyset(&blockingMask);
+    for (const auto sig : quitSignals) {
+        sigaddset(&blockingMask, sig);
+    }
+
+    struct sigaction sa;
+    sa.sa_handler = unixExitHandler;
+    sa.sa_mask = blockingMask;
+    sa.sa_flags = 0;
+
+    for (auto sig : quitSignals) {
+        sigaction(sig, &sa, nullptr);
+    }
+#endif
+
+#ifdef HAVE_KUNIFIEDPUSH
+    auto connector = new KUnifiedPush::Connector(u"org.kde.neochat"_s);
+    connect(connector, &KUnifiedPush::Connector::endpointChanged, this, [this](const QString &endpoint) {
+        if (!m_accountManager) {
+            return;
+        }
+
+        m_endpoint = endpoint;
+        for (auto &quotientConnection : m_accountManager->accounts()->accounts()) {
+            auto connection = dynamic_cast<NeoChatConnection *>(quotientConnection);
+            connection->setupPushNotifications(endpoint);
+        }
+    });
+
+    connector->registerClient(
+        i18nc("The reason for using push notifications, as in: '[Push notifications are used for] Receiving notifications for new messages'",
+              "Receiving notifications for new messages"));
+
+#endif
+}
+
+Controller &Controller::instance()
+{
+    static Controller _instance;
+    return _instance;
+}
+
+void Controller::setAccountManager(AccountManager *manager)
+{
+    if (manager == m_accountManager) {
+        return;
+    }
+
+    if (m_accountManager) {
+        m_accountManager->disconnect(this);
+    }
+
+    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);
+    }
+}
+
+void Controller::initConnection(NeoChatConnection *connection)
+{
+    if (!connection) {
+        return;
+    }
+
+    connect(
+        connection,
+        &NeoChatConnection::syncDone,
+        this,
+        [this, connection] {
+            if (!m_endpoint.isEmpty()) {
+                connection->setupPushNotifications(m_endpoint);
+            }
+        },
+        Qt::SingleShotConnection);
+    connect(connection, &NeoChatConnection::syncDone, this, [this, connection]() {
+        m_notificationsManager.handleNotifications(connection);
+    });
+    connect(this, &Controller::globalUrlPreviewDefaultChanged, connection, &NeoChatConnection::globalUrlPreviewEnabledChanged);
+    connect(connection, &NeoChatConnection::roomAboutToBeLeft, &RoomManager::instance(), &RoomManager::roomLeft);
+    Q_EMIT connectionAdded(connection);
+}
+
+void Controller::teardownConnection(NeoChatConnection *connection)
+{
+    if (!connection) {
+        return;
+    }
+
+    connection->disconnect(this);
+    Q_EMIT connectionDropped(connection);
+}
+
+void Controller::initActiveConnection(NeoChatConnection *oldConnection, NeoChatConnection *newConnection)
+{
+    if (oldConnection) {
+        oldConnection->disconnect(this);
+    }
+
+    if (newConnection) {
+        connect(newConnection, &NeoChatConnection::errorOccured, this, &Controller::errorOccured);
+        connect(newConnection, &NeoChatConnection::badgeNotificationCountChanged, this, &Controller::updateBadgeNotificationCount);
+        newConnection->refreshBadgeNotificationCount();
+    }
+    Q_EMIT activeConnectionChanged(newConnection);
+}
+
+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;
+#endif
+}
+
+void Controller::setQuitOnLastWindowClosed()
+{
+#ifndef Q_OS_ANDROID
+    if (supportSystemTray() && NeoChatConfig::self()->systemTray()) {
+        m_trayIcon = new TrayIcon(this);
+        m_trayIcon->show();
+    } else {
+        if (m_trayIcon) {
+            delete m_trayIcon;
+            m_trayIcon = nullptr;
+        }
+    }
+#endif
+}
+
+NeoChatConnection *Controller::activeConnection() const
+{
+    if (!m_accountManager) {
+        return nullptr;
+    }
+    return m_accountManager->activeConnection();
+}
+
+void Controller::setActiveConnection(NeoChatConnection *connection)
+{
+    if (!m_accountManager) {
+        return;
+    }
+    m_accountManager->setActiveConnection(connection);
+}
+
+QStringList Controller::accountsLoading() const
+{
+    if (!m_accountManager) {
+        return {};
+    }
+    return m_accountManager->accountsLoading();
+}
+
+void Controller::listenForNotifications()
+{
+#ifdef HAVE_KUNIFIEDPUSH
+    auto connector = new KUnifiedPush::Connector(u"org.kde.neochat"_s);
+
+    auto timer = new QTimer();
+    connect(timer, &QTimer::timeout, qGuiApp, &QGuiApplication::quit);
+
+    connect(connector, &KUnifiedPush::Connector::messageReceived, [timer](const QByteArray &data) {
+        instance().m_notificationsManager.postPushNotification(data);
+        timer->stop();
+    });
+
+    // Wait five seconds to see if we received any messages or this happened to be an erroneous activation.
+    // Otherwise, messageReceived is never activated, and this daemon could stick around forever.
+    timer->start(5000);
+
+    connector->registerClient(i18n("Receiving push notifications"));
+#endif
+}
+
+void Controller::clearInvitationNotification(const QString &roomId)
+{
+    m_notificationsManager.clearInvitationNotification(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
+{
+#ifdef NEOCHAT_FLATPAK
+    return true;
+#else
+    return false;
+#endif
+}
+
+AccountRegistry *Controller::accounts()
+{
+    return m_accountManager->accounts();
+}
+
+QString Controller::loadFileContent(const QString &path) const
+{
+    QUrl url(path);
+    QFile file(url.isLocalFile() ? url.toLocalFile() : url.toString());
+    file.open(QFile::ReadOnly);
+    return QString::fromLatin1(file.readAll());
+}
+
+void Controller::removeConnection(const QString &userId)
+{
+    m_accountManager->dropConnection(userId);
+}
+
+void Controller::revertToDefaultConfig()
+{
+    const auto config = NeoChatConfig::self();
+    config->setDefaults();
+    config->save();
+}
+
+bool Controller::isImageShown(const QString &eventId)
+{
+    return m_shownImages.contains(eventId);
+}
+
+void Controller::markImageShown(const QString &eventId)
+{
+    m_shownImages.append(eventId);
+}
+
+void Controller::markImageHidden(const QString &eventId)
+{
+    m_shownImages.removeAll(eventId);
+}
+
+#include "moc_controller.cpp"

src/app/controller.h

@@ -6,6 +6,7 @@
 #include <QObject>
 #include <QQmlEngine>
 
+#include "accountmanager.h"
 #include "neochatconnection.h"
 #include "notificationsmanager.h"
 #include <Quotient/accountregistry.h>
@@ -48,9 +49,7 @@ class Controller : public QObject
      */
     Q_PROPERTY(bool isFlatpak READ isFlatpak CONSTANT)
 
-    Q_PROPERTY(QStringList accountsLoading MEMBER m_accountsLoading NOTIFY accountsLoadingChanged)
-
-    Q_PROPERTY(bool csSupported READ csSupported CONSTANT)
+    Q_PROPERTY(QStringList accountsLoading READ accountsLoading NOTIFY accountsLoadingChanged)
 
 public:
     static Controller &instance();
@@ -60,23 +59,12 @@ public:
         return &instance();
     }
 
-    void setActiveConnection(NeoChatConnection *connection);
+    void setAccountManager(AccountManager *manager);
+
     [[nodiscard]] NeoChatConnection *activeConnection() const;
+    void setActiveConnection(NeoChatConnection *connection);
 
-    /**
-     * @brief Add a new connection to the account registry.
-     */
-    void addConnection(NeoChatConnection *c);
-
-    /**
-     * @brief Drop a connection from the account registry.
-     */
-    void dropConnection(NeoChatConnection *c);
-
-    /**
-     * @brief Save an access token to the keychain for the given account.
-     */
-    void saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken);
+    QStringList accountsLoading() const;
 
     [[nodiscard]] bool supportSystemTray() const;
 
@@ -97,14 +85,10 @@ public:
 
     Q_INVOKABLE QString loadFileContent(const QString &path) const;
 
-    Quotient::AccountRegistry &accounts();
-
-    static void setTestMode(bool testMode);
+    Quotient::AccountRegistry *accounts();
 
     Q_INVOKABLE void removeConnection(const QString &userId);
 
-    bool csSupported() const;
-
     /**
      * @brief Revert all configuration values to their default.
      *
@@ -115,27 +99,27 @@ public:
 
     Q_INVOKABLE bool isImageShown(const QString &eventId);
     Q_INVOKABLE void markImageShown(const QString &eventId);
+    Q_INVOKABLE void markImageHidden(const QString &eventId);
 
 private:
     explicit Controller(QObject *parent = nullptr);
 
+    QPointer<AccountManager> m_accountManager;
+    void initConnection(NeoChatConnection *connection);
+    void teardownConnection(NeoChatConnection *connection);
+    void initActiveConnection(NeoChatConnection *oldConnection, NeoChatConnection *newConnection);
+
     QPointer<NeoChatConnection> m_connection;
     TrayIcon *m_trayIcon = nullptr;
 
-    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const QString &account);
-
-    Quotient::AccountRegistry m_accountRegistry;
-    QStringList m_accountsLoading;
-    QMap<QString, QPointer<NeoChatConnection>> m_connectionsLoading;
     QString m_endpoint;
     QStringList m_shownImages;
 
     NotificationsManager m_notificationsManager;
 
 private Q_SLOTS:
-    void invokeLogin();
     void setQuitOnLastWindowClosed();
-    void updateBadgeNotificationCount(NeoChatConnection *connection, int count);
+    void updateBadgeNotificationCount(int count);
 
 Q_SIGNALS:
     /**
@@ -146,4 +130,6 @@ Q_SIGNALS:
     void connectionDropped(NeoChatConnection *connection);
     void activeConnectionChanged(NeoChatConnection *connection);
     void accountsLoadingChanged();
+
+    void globalUrlPreviewDefaultChanged();
 };

src/app/foreigntypes.h

@@ -22,8 +22,8 @@ struct ForeignAccountRegistry {
 public:
     static Quotient::AccountRegistry *create(QQmlEngine *, QJSEngine *)
     {
-        QQmlEngine::setObjectOwnership(&Controller::instance().accounts(), QQmlEngine::CppOwnership);
-        return &Controller::instance().accounts();
+        QQmlEngine::setObjectOwnership(Controller::instance().accounts(), QQmlEngine::CppOwnership);
+        return Controller::instance().accounts();
     }
 };
 

src/app/main.cpp

@@ -45,10 +45,12 @@
 
 #include <Quotient/networkaccessmanager.h>
 
+#include "accountmanager.h"
 #include "blurhashimageprovider.h"
 #include "colorschemer.h"
 #include "controller.h"
-#include "logger.h"
+#include "login.h"
+#include "registration.h"
 #include "roommanager.h"
 #include "sharehandler.h"
 #include "windowcontroller.h"
@@ -135,6 +137,11 @@ int main(int argc, char *argv[])
     font.setHintingPreference(QFont::PreferNoHinting);
     app.setFont(font);
 #endif
+
+#ifdef Q_OS_MACOS
+    QApplication::setStyle(u"breeze"_s);
+#endif
+
     KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));
 
     QGuiApplication::setOrganizationName("KDE"_L1);
@@ -144,7 +151,7 @@ int main(int argc, char *argv[])
                      QStringLiteral(NEOCHAT_VERSION_STRING),
                      i18n("Chat on Matrix"),
                      KAboutLicense::GPL_V3,
-                     i18n("© 2018-2020 Black Hat, 2020-2024 KDE Community"));
+                     i18n("© 2018-2020 Black Hat, 2020-2025 KDE Community"));
     about.addAuthor(i18n("Carl Schwan"), i18n("Maintainer"), u"carl@carlschwan.eu"_s, u"https://carlschwan.eu"_s, QUrl(u"https://carlschwan.eu/avatar.png"_s));
     about.addAuthor(i18n("Tobias Fella"), i18n("Maintainer"), u"tobias.fella@kde.org"_s, u"https://tobiasfella.de"_s);
     about.addAuthor(i18n("James Graham"), i18n("Maintainer"), u"james.h.graham@protonmail.com"_s);
@@ -174,8 +181,6 @@ int main(int argc, char *argv[])
     KCrash::initialize();
 #endif
 
-    initLogging();
-
     Connection::setEncryptionDefault(true);
     Connection::setDirectChatEncryptionDefault(true);
 
@@ -192,6 +197,9 @@ int main(int argc, char *argv[])
     parser.addPositionalArgument(u"urls"_s, i18n("Supports matrix: url scheme"));
     parser.addOption(QCommandLineOption("ignore-ssl-errors"_L1, i18n("Ignore all SSL Errors, e.g., unsigned certificates.")));
 
+    QCommandLineOption replaceOption({QStringLiteral("replace")}, i18nc("command line description", "Replace an existing instance"));
+    parser.addOption(replaceOption);
+
     QCommandLineOption testOption("test"_L1, i18n("Only used for autotests"));
     testOption.setFlags(QCommandLineOption::HiddenFromHelp);
     parser.addOption(testOption);
@@ -208,7 +216,6 @@ int main(int argc, char *argv[])
     about.setupCommandLine(&parser);
     parser.process(app);
     about.processCommandLine(&parser);
-    Controller::setTestMode(parser.isSet("test"_L1));
 
 #ifdef HAVE_KUNIFIEDPUSH
     if (parser.isSet(dbusActivatedOption)) {
@@ -229,14 +236,13 @@ int main(int argc, char *argv[])
 #endif
 
 #ifdef HAVE_KDBUSADDONS
-    KDBusService service(KDBusService::Unique);
+    KDBusService service(KDBusService::Unique | (parser.isSet(replaceOption) ? KDBusService::Replace : KDBusService::StartupOption(0)));
 #endif
 
-    Q_IMPORT_QML_PLUGIN(org_kde_neochat_settingsPlugin)
-    Q_IMPORT_QML_PLUGIN(org_kde_neochat_timelinePlugin)
-    Q_IMPORT_QML_PLUGIN(org_kde_neochat_devtoolsPlugin)
-    Q_IMPORT_QML_PLUGIN(org_kde_neochat_loginPlugin)
-    Q_IMPORT_QML_PLUGIN(org_kde_neochat_chatbarPlugin)
+    const auto accountManager = std::make_unique<AccountManager>(parser.isSet("test"_L1));
+    Controller::instance().setAccountManager(accountManager.get());
+    LoginHelper::instance().setAccountManager(accountManager.get());
+    Registration::instance().setAccountManager(accountManager.get());
 
     qml_register_types_org_kde_neochat();
     qmlRegisterUncreatableMetaObject(Quotient::staticMetaObject, "Quotient", 1, 0, "JoinRule", u"Access to JoinRule enum only"_s);
@@ -245,32 +251,32 @@ int main(int argc, char *argv[])
 
 #ifdef HAVE_KDBUSADDONS
     service.connect(&service,
-        &KDBusService::activateRequested,
-        &RoomManager::instance(),
-        [&engine](const QStringList &arguments, const QString &workingDirectory) {
-            Q_UNUSED(workingDirectory);
+                    &KDBusService::activateRequested,
+                    &RoomManager::instance(),
+                    [&engine](const QStringList &arguments, const QString &workingDirectory) {
+                        Q_UNUSED(workingDirectory);
 
-            QWindow *window = windowFromEngine(&engine);
-            KWindowSystem::updateStartupId(window);
+                        QWindow *window = windowFromEngine(&engine);
+                        KWindowSystem::updateStartupId(window);
 
-            WindowController::instance().showAndRaiseWindow(QString());
+                        WindowController::instance().showAndRaiseWindow(QString());
 
-            // Open matrix uri
-            if (arguments.isEmpty()) {
-                return;
-            }
+                        // Open matrix uri
+                        if (arguments.isEmpty()) {
+                            return;
+                        }
 
-            auto args = arguments;
-            args.removeFirst();
-            if (args.length() == 2 && args[0] == "--share"_L1) {
-                ShareHandler::instance().setText(args[1]);
-                return;
-            }
+                        auto args = arguments;
+                        args.removeFirst();
+                        if (args.length() == 2 && args[0] == "--share"_L1) {
+                            ShareHandler::instance().setText(args[1]);
+                            return;
+                        }
 
-            for (const auto &arg : args) {
-                RoomManager::instance().resolveResource(arg);
-            }
-        });
+                        for (const auto &arg : args) {
+                            RoomManager::instance().resolveResource(arg);
+                        }
+                    });
 #endif
 
     engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
@@ -289,9 +295,6 @@ int main(int argc, char *argv[])
     engine.addImageProvider(u"blurhash"_s, new BlurhashImageProvider);
 
     engine.loadFromModule("org.kde.neochat", "Main");
-    if (engine.rootObjects().isEmpty()) {
-        return -1;
-    }
 
     if (!parser.positionalArguments().isEmpty() && !parser.isSet("share"_L1)) {
         RoomManager::instance().setUrlArgument(parser.positionalArguments()[0]);
@@ -302,9 +305,7 @@ int main(int argc, char *argv[])
     QDBusConnection::sessionBus().registerObject("/RoomRunner"_L1, runner, QDBusConnection::ExportScriptableContents);
 #endif
 
-    QWindow *window = windowFromEngine(&engine);
-
-    WindowController::instance().setWindow(window);
+    WindowController::instance().setWindow(windowFromEngine(&engine));
 
     return app.exec();
 }

src/app/models/commonroomsmodel.h

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

src/app/models/notificationsmodel.cpp

@@ -121,6 +121,10 @@ void NotificationsModel::loadData()
                 const auto &authorAvatar = avatar.isValid() && avatar.scheme() == u"mxc"_s ? avatar : QUrl();
 
                 const auto &roomEvent = eventCast<const RoomEvent>(notification.event.get());
+                if (!roomEvent) {
+                    continue;
+                }
+
                 beginInsertRows({}, m_notifications.length(), m_notifications.length());
                 m_notifications += Notification{
                     .roomId = notification.roomId,