ManualRoomDialog: Use Window.window attached property

This fixes a runtime error since applicationWindow is undefined.
ExploreRoomsPage: Fix "Enter a room address" button not working
2024-10-30 22:03:46 -04:00 · 2024-10-30 22:03:10 -04:00
631 changed files with 183759 additions and 298004 deletions
--- a/.contextProperties.ini
+++ b/.contextProperties.ini
@@ -1,2 +0,0 @@
-[General]
-disableUnqualifiedAccess = "i18nc,xi18nc,i18ncp,i18n"
--- a/.flatpak-manifest.json
+++ b/.flatpak-manifest.json
@@ -2,7 +2,7 @@
    "id": "org.kde.neochat",
    "branch": "master",
    "runtime": "org.kde.Platform",
-    "runtime-version": "6.9",
+    "runtime-version": "6.7",
    "sdk": "org.kde.Sdk",
    "command": "neochat",
    "tags": [
@@ -20,52 +20,18 @@
        "--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",
-            "config-opts": [
-                "-DBUILD_TESTING=OFF"
-            ],
+            "config-opts": [ "-DBUILD_TESTING=OFF" ],
            "buildsystem": "cmake-ninja",
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://invent.kde.org/libraries/kirigami-addons.git"
-                }
-            ]
-        },
-        {
-            "name": "opencv",
-            "config-opts": [
-                "-DBUILD_TESTS=OFF",
-                "-DWITH_GTK=OFF",
-                "-DBUILD_LIST=core,imgproc"
-            ],
-            "buildsystem": "cmake-ninja",
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/opencv/opencv"
-                }
-            ],
-            "builddir": true
+            "sources": [ { "type": "git", "url": "https://invent.kde.org/libraries/kirigami-addons.git", "commit": "34d311219e8b7209746a98b3a29b91ded05ff936" } ]
        },
        {
            "name": "kquickimageeditor",
-            "config-opts": [
-                "-DBUILD_WITH_QT6=ON",
-                "-DBUILD_TESTING=OFF"
-            ],
+            "config-opts": [ "-DBUILD_WITH_QT6=ON" ],
            "buildsystem": "cmake-ninja",
            "sources": [
                {
@@ -77,19 +43,17 @@
        {
            "name": "olm",
            "buildsystem": "cmake-ninja",
-            "config-opts": [
-                "-DOLM_TESTS=OFF"
-            ],
+            "config-opts": [ "-DOLM_TESTS=OFF" ],
            "sources": [
                {
                    "type": "git",
                    "url": "https://gitlab.matrix.org/matrix-org/olm.git",
-                    "tag": "3.2.16",
+                    "tag": "3.2.10",
                    "x-checker-data": {
                        "type": "git",
                        "tag-pattern": "^([\\d.]+)$"
                    },
-                    "commit": "7e0c8277032e40308987257b711b38af8d77cc69"
+                    "commit": "9908862979147a71dc6abaecd521be526ae77be1"
                }
            ]
        },
@@ -101,13 +65,13 @@
                "-Dvapi=false",
                "-Dgtk_doc=false",
                "-Dintrospection=false",
-                "-Dcrypto=disabled"
+                "-Dgcrypt=false"
            ],
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/libsecret/0.21/libsecret-0.21.7.tar.xz",
-                    "sha256": "6b452e4750590a2b5617adc40026f28d2f4903de15f1250e1d1c40bfd68ed55e",
+                    "url": "https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.tar.xz",
+                    "sha256": "3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d",
                    "x-checker-data": {
                        "type": "gnome",
                        "name": "libsecret",
@@ -122,13 +86,13 @@
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/0.15.0.tar.gz",
-                    "sha256": "f4254dc8f0933b06d90672d683eab08ef770acd8336e44dfa030ce041dc2ca22",
+                    "url": "https://github.com/frankosterfeld/qtkeychain/archive/0.14.2.tar.gz",
+                    "sha256": "cf2e972b783ba66334a79a30f6b3a1ea794a1dc574d6c3bebae5ffd2f0399571",
                    "x-checker-data": {
                        "type": "anitya",
                        "project-id": 4138,
                        "stable-only": true,
-                        "url-template": "https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/$version.tar.gz"
+                        "url-template": "https://github.com/frankosterfeld/qtkeychain/archive/v$version.tar.gz"
                    }
                }
            ],
@@ -136,8 +100,7 @@
                "-DBUILD_WITH_QT6=ON",
                "-DCMAKE_INSTALL_LIBDIR=/app/lib",
                "-DLIB_INSTALL_DIR=/app/lib",
-                "-DBUILD_TRANSLATIONS=NO",
-                "-DBUILD_TESTING=OFF"
+                "-DBUILD_TRANSLATIONS=NO"
            ]
        },
        {
@@ -147,7 +110,7 @@
                {
                    "type": "git",
                    "url": "https://github.com/quotient-im/libQuotient.git",
-                    "branch": "0.9.6.1",
+                    "branch": "0.8.x",
                    "disable-submodules": true
                }
            ],
@@ -160,37 +123,34 @@
        {
            "name": "cmark",
            "buildsystem": "cmake-ninja",
-            "config-opts": [
-                "-DCMARK_TESTS=OFF",
-                "-DCMAKE_BUILD_TYPE=Release",
-                "-DCMAKE_INSTALL_PREFIX=/app"
-            ],
+            "config-opts": [ "-DCMARK_TESTS=OFF" ],
            "sources": [
                {
                    "type": "git",
                    "url": "https://github.com/commonmark/cmark.git"
                }
            ],
+            "config-opts": [
+                "-DCMARK_TESTS=OFF",
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DCMAKE_INSTALL_PREFIX=/app"
+            ],
            "builddir": true
        },
        {
-            "name": "kunifiedpush",
+            "name": "qcoro",
            "buildsystem": "cmake-ninja",
-            "builddir": true,
-            "config-opts": [
-                "-DENABLE_TESTING=OFF",
-                "-DKUNIFIEDPUSH_CLIENT_ONLY=ON"
-            ],
+            "config-opts": [ "-DQCORO_BUILD_EXAMPLES=OFF", "-DBUILD_TESTING=OFF" ],
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://download.kde.org/stable/release-service/25.08.0/src/kunifiedpush-25.08.0.tar.xz",
-                    "sha256": "846db6ffc7d93f6afea7ce0d5a9f10b52792157ceb593856542279f4197f3518",
+                    "url": "https://github.com/danvratil/qcoro/archive/refs/tags/v0.7.0.tar.gz",
+                    "sha256": "23ef0217926e67c8d2eb861cf91617da2f7d8d5a9ae6c62321b21448b1669210",
                    "x-checker-data": {
                        "type": "anitya",
-                        "project-id": 8763,
+                        "project-id": 236236,
                        "stable-only": true,
-                        "url-template": "https://download.kde.org/stable/release-service/$version/src/kunifiedpush-$version.tar.xz"
+                        "url-template": "https://github.com/danvratil/qcoro/archive/refs/tags/v$version.tar.gz"
                    }
                }
            ]
@@ -198,15 +158,14 @@
        {
            "name": "neochat",
            "buildsystem": "cmake-ninja",
-            "config-opts": [
-                "-DBUILD_TESTING=OFF",
-                "-DNEOCHAT_FLATPAK=ON"
-            ],
            "sources": [
                {
                    "type": "dir",
                    "path": "."
                }
+            ],
+            "config-opts": [
+                "-DNEOCHAT_FLATPAK=ON"
            ]
        }
    ]
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,14 +5,10 @@ include:
  - project: sysadmin/ci-utilities
    file:
      - /gitlab-templates/reuse-lint.yml
-      - /gitlab-templates/json-validation.yml
-      - /gitlab-templates/xml-lint.yml
-      - /gitlab-templates/yaml-lint.yml
      - /gitlab-templates/android-qt6.yml
      - /gitlab-templates/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
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -2,44 +2,42 @@
 # SPDX-License-Identifier: BSD-2-Clause

 Dependencies:
-  - 'on': ['Linux', 'Android', 'FreeBSD', 'Windows']
-    'require':
-      'frameworks/extra-cmake-modules': '@latest-kf6'
-      'frameworks/kcoreaddons': '@latest-kf6'
-      'frameworks/kirigami': '@latest-kf6'
-      'frameworks/ki18n': '@latest-kf6'
-      'frameworks/kconfig': '@latest-kf6'
-      'frameworks/syntax-highlighting': '@latest-kf6'
-      'frameworks/kiconthemes': '@latest-kf6'
-      'frameworks/kitemmodels': '@latest-kf6'
-      'frameworks/kquickcharts': '@latest-kf6'
-      'frameworks/knotifications': '@latest-kf6'
-      'frameworks/kcolorscheme': '@latest-kf6'
-      'libraries/kquickimageeditor': '@latest-kf6'
-      'frameworks/sonnet': '@latest-kf6'
-      'frameworks/prison': '@latest-kf6'
-      'libraries/kirigami-addons': '@latest-kf6'
-      'third-party/libquotient': '@latest'
-      'third-party/qtkeychain': '@latest'
-      'third-party/cmark': '@latest'
-      'third-party/qcoro': '@latest'
-  - 'on': ['Windows', 'Linux', 'FreeBSD']
-    'require':
-      'frameworks/qqc2-desktop-style': '@latest-kf6'
-      'frameworks/kio': '@latest-kf6'
-      'frameworks/kwindowsystem': '@latest-kf6'
-      'frameworks/kstatusnotifieritem': '@latest-kf6'
-  - 'on': ['Linux', 'FreeBSD']
-    'require':
-      'frameworks/kdbusaddons': '@latest-kf6'
-      'frameworks/purpose': '@latest-kf6'
-      'libraries/kunifiedpush': '@latest-kf6'
+- 'on': ['Linux', 'Android', 'FreeBSD', 'Windows']
+  'require':
+    'frameworks/extra-cmake-modules': '@latest-kf6'
+    'frameworks/kcoreaddons': '@latest-kf6'
+    'frameworks/kirigami': '@latest-kf6'
+    'frameworks/ki18n': '@latest-kf6'
+    'frameworks/kconfig': '@latest-kf6'
+    'frameworks/syntax-highlighting': '@latest-kf6'
+    'frameworks/kitemmodels': '@latest-kf6'
+    'frameworks/kquickcharts': '@latest-kf6'
+    'frameworks/knotifications': '@latest-kf6'
+    'frameworks/kcolorscheme': '@latest-kf6'
+    'libraries/kquickimageeditor': '@latest-kf6'
+    'frameworks/sonnet': '@latest-kf6'
+    'frameworks/prison': '@latest-kf6'
+    'libraries/kirigami-addons': '@latest-kf6'
+    'third-party/libquotient': '@latest'
+    'third-party/qtkeychain': '@latest'
+    'third-party/cmark': '@latest'
+    'third-party/qcoro': '@latest'
+- 'on': ['Windows', 'Linux', 'FreeBSD']
+  'require':
+    'frameworks/qqc2-desktop-style': '@latest-kf6'
+    'frameworks/kio': '@latest-kf6'
+    'frameworks/kwindowsystem': '@latest-kf6'
+    'frameworks/kstatusnotifieritem': '@latest-kf6'
+    'frameworks/kcrash': '@latest-kf6'
+- 'on': ['Linux', 'FreeBSD']
+  'require':
+    'frameworks/kdbusaddons': '@latest-kf6'
+    'frameworks/purpose': '@latest-kf6'

-  - 'on': ['Linux']
-    'require':
-      'sdk/selenium-webdriver-at-spi': '@latest-kf6'
+- 'on': ['Linux']
+  'require':
+    'sdk/selenium-webdriver-at-spi': '@latest-kf6'

 Options:
  per-test-timeout: 90
-  require-passing-tests-on: ['Linux', 'Android', 'FreeBSD', 'Windows']
-  run-qmllint: True
+  require-passing-tests-on: [ 'Linux', 'Android', 'FreeBSD' ]
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -0,0 +1,55 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: NeoChat
+Upstream-Contact: Carl Schwan <carlschwan@kde.org>
+
+Files: 128-logo.png icons/* logo.png org.kde.neochat.svg org.kde.neochat.tray.svg android/res/drawable/neochat.png
+Copyright: 2020 Carson Black <uhhadd@gmail.com>
+License: LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+Files: android/res/drawable/splash.xml
+Copyright: 2020 Tobias Fella <tobias.fella@kde.org>
+License: BSD-2-Clause
+
+Files: .gitignore
+Copyright: None
+License: CC0-1.0
+
+Files: .gitlab/issue_templates/bug.md
+Copyright: 2021 Carl Schwan <carlschwan@kde.org>
+License: CC0-1.0
+
+Files: src/res.qrc src/res_android.qrc src/res_desktop.qrc
+Copyright: None
+License: CC0-1.0
+
+Files: cmake/Flatpak/99-noto-mono-color-emoji.conf
+Copyright: 2021 Carl Schwan <carlschwan@kde.org>
+License: BSD-2-Clause
+
+Files: src/neochatconfig.kcfg
+Copyright: 2020-2021 Carl Schwan <carlschwan@kde.org>, Tobias Fella <tobias.fella@kde.org>
+License: BSD-2-Clause
+
+Files: src/neochat.notifyrc
+Copyright: 2020 Tobias Fella <tobias.fella@kde.org>
+License: BSD-2-Clause
+
+Files: src/qml/confetti.png src/qml/glowdot.png
+Copyright: 2021 Alexey Andreyev <aa13q@ya.ru>
+License: CC0-1.0
+
+Files: .flatpak-manifest.json
+Copyright: 2020-2022 Tobias Fella <tobias.fella@kde.org>
+License: BSD-2-Clause
+
+Files: autotests/data/*
+Copyright: none
+License: CC0-1.0
+
+Files: appiumtests/data/*
+Copyright: 2023 Tobias Fella <tobias.fella@kde.org>
+License: CC0-1.0
+
+Files: src/purpose/purposeplugin.json
+Copyright: 2023 Tobias Fella <tobias.fella@kde.org>
+License: BSD-2-Clause
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,15 +7,15 @@
 cmake_minimum_required(VERSION 3.16)

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

 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})

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

 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)

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

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

 include(FeatureSummary)
 include(ECMSetupVersion)
@@ -39,7 +39,6 @@ include(ECMCheckOutboundLicense)
 include(ECMQtDeclareLoggingCategory)
 include(ECMAddAndroidApk)
 include(ECMQmlModule)
-include(ECMDeprecationSettings)
 include(GenerateExportHeader)
 include(ECMGenerateHeaders)
 if (NOT ANDROID)
@@ -52,14 +51,12 @@ endif()

 set(QUOTIENT_FORCE_NAMESPACED_INCLUDES TRUE)

-ecm_set_disabled_deprecation_versions(Qt 6.9.0 KF 6.17.0)
-
 ecm_setup_version(${PROJECT_VERSION}
    VARIABLE_PREFIX NEOCHAT
    VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
 )

-find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg TextToSpeech WebView)
+find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg WebView)
 set_package_properties(Qt6 PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
@@ -69,7 +66,7 @@ if (QT_KNOWN_POLICY_QTP0004)
 qt_policy(SET QTP0004 NEW)
 endif ()

-find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels ColorScheme IconThemes)
+find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels ColorScheme)
 set_package_properties(KF6 PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
@@ -78,7 +75,7 @@ set_package_properties(KF6Kirigami PROPERTIES
    TYPE REQUIRED
    PURPOSE "Kirigami application UI framework"
 )
-find_package(KF6KirigamiAddons 1.10.0 REQUIRED)
+find_package(KF6KirigamiAddons 0.7.2 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)
@@ -92,7 +89,7 @@ if(ANDROID)
    )
 else()
    find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem)
+    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem Crash)
    find_package(KF6SyntaxHighlighting ${KF_MIN_VERSION} REQUIRED)
    set_package_properties(KF6QQC2DesktopStyle PROPERTIES
        TYPE RUNTIME
@@ -110,7 +107,7 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU)
    find_package(KF6DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()

-find_package(QuotientQt6 0.9.3)
+find_package(QuotientQt6 0.8.2)
 set_package_properties(QuotientQt6 PROPERTIES
    TYPE REQUIRED
    DESCRIPTION "Qt wrapper around Matrix API"
@@ -118,6 +115,11 @@ set_package_properties(QuotientQt6 PROPERTIES
    PURPOSE "Talk with matrix server"
 )

+if (NOT TARGET Olm::Olm)
+    message(FATAL_ERROR "NeoChat requires Quotient with the E2EE feature enabled")
+endif()
+
+
 find_package(cmark)
 set_package_properties(cmark PROPERTIES
    TYPE REQUIRED
@@ -150,24 +152,16 @@ set_package_properties(KF6DocTools PROPERTIES DESCRIPTION
    TYPE OPTIONAL
 )

-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()
+find_package(KUnifiedPush QUIET)
+set_package_properties(KUnifiedPush PROPERTIES
+    TYPE OPTIONAL
+    PURPOSE "Push notification support"
+    URL "https://invent.kde.org/libraries/kunifiedpush"
+)

 if(ANDROID)
    find_package(Sqlite3)
-    set(BUILD_TESTING FALSE)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/android/version.gradle.in ${CMAKE_BINARY_DIR}/version.gradle)
 endif()

 ki18n_install(po)
@@ -182,12 +176,9 @@ add_definitions(-DQT_NO_FOREACH)
 add_subdirectory(src)

 if (BUILD_TESTING)
-    find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test HttpServer)
+    find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
    add_subdirectory(autotests)
-    # add_subdirectory(appiumtests)
-    if (NOT ANDROID)
-        add_subdirectory(memorytests)
-    endif()
+    add_subdirectory(appiumtests)
 endif()

 if(KF6DocTools_FOUND)
@@ -195,7 +186,7 @@ if(KF6DocTools_FOUND)
    add_subdirectory(doc)
 endif()

-feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

 if (NOT ANDROID)
    file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES src/*.cpp src/*.h)
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ A Qt/QML based Matrix client.

 <a href='https://matrix.org'><img src='https://matrix.org/docs/legacy/made-for-matrix.png' alt='Made for Matrix' height=64 target=_blank /></a>
 <a href='https://flathub.org/apps/details/org.kde.neochat'><img width='190px' alt='Download on Flathub' src='https://flathub.org/assets/badges/flathub-badge-i-en.png'/></a>
-<a href='https://snapcraft.io/neochat'><img width='190px' alt='Download on the Snap Store' src='https://apps.kde.org/store_badges/snapstore/en.svg'/></a>
+<a href='https://snapcraft.io/neochat'><img width='190px' alt='Download on the Snap Store' src='https://snapcraft.io/static/images/badges/en/snap-store-black.svg'/></a>

 ## Introduction

--- a/REUSE.toml
+++ b/REUSE.toml
@@ -1,96 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-version = 1
-SPDX-PackageName = "NeoChat"
-SPDX-PackageSupplier = "Carl Schwan <carlschwan@kde.org>"
-
-[[annotations]]
-path = ["128-logo.png", "icons/**", "logo.png", "org.kde.neochat.svg", "org.kde.neochat.tray.svg", "android/res/drawable/neochat.png", "android/neochat-playstore.png"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2020 Carson Black <uhhadd@gmail.com>"
-SPDX-License-Identifier = "LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL"
-
-[[annotations]]
-path = "android/res/drawable/splash.xml"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2020 Tobias Fella <tobias.fella@kde.org>"
-SPDX-License-Identifier = "BSD-2-Clause"
-
-[[annotations]]
-path = ".gitignore"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "None"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = ".gitlab/issue_templates/bug.md"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2021 Carl Schwan <carlschwan@kde.org>"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = ["src/res.qrc", "src/res_android.qrc", "src/res_desktop.qrc"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "None"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = "cmake/Flatpak/99-noto-mono-color-emoji.conf"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2021 Carl Schwan <carlschwan@kde.org>"
-SPDX-License-Identifier = "BSD-2-Clause"
-
-[[annotations]]
-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/app/neochat.notifyrc"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2020 Tobias Fella <tobias.fella@kde.org>"
-SPDX-License-Identifier = "BSD-2-Clause"
-
-[[annotations]]
-path = ["src/qml/confetti.png", "src/qml/glowdot.png"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2021 Alexey Andreyev <aa13q@ya.ru>"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = ".flatpak-manifest.json"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2020-2022 Tobias Fella <tobias.fella@kde.org>"
-SPDX-License-Identifier = "BSD-2-Clause"
-
-[[annotations]]
-path = "autotests/data/**"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "none"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = "appiumtests/data/**"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2023 Tobias Fella <tobias.fella@kde.org>"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = "src/purpose/purposeplugin.json"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2023 Tobias Fella <tobias.fella@kde.org>"
-SPDX-License-Identifier = "BSD-2-Clause"
-
-[[annotations]]
-path = "memorytests/memtest-sync.json"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2024 James Graham <james.h.graham@protonmail.com>"
-SPDX-License-Identifier = "BSD-2-Clause"
-
-[[annotations]]
-path = ".contextProperties.ini"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2025 Tobias Fella <tobias.fella@kde.org>"
-SPDX-License-Identifier = "BSD-2-Clause"
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -12,7 +12,7 @@ buildscript {
    }

    dependencies {
-        classpath 'com.android.tools.build:gradle:8.6.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
    }
 }

@@ -23,7 +23,8 @@ repositories {


 apply plugin: 'com.android.application'
-apply from: '../ecm-version.gradle'
+apply from: '../version.gradle'
+def timestamp = (int)(new Date().getTime()/1000)

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
@@ -78,9 +79,9 @@ android {
        targetSdkVersion qtTargetSdkVersion
        applicationId "org.kde.neochat"
        namespace "org.kde.neochat"
-        versionCode ecmVersionCode
-        versionName ecmVersionName
-        manifestPlaceholders = [versionName: ecmVersionName, versionCode: ecmVersionCode]
+        versionCode timestamp
+        versionName projectVersionFull
+        manifestPlaceholders = [versionName: projectVersionFull, versionCode: timestamp]
    }

    packagingOptions {
--- a/android/neochat-playstore.png
+++ b/android/neochat-playstore.png
--- a/android/version.gradle.in
+++ b/android/version.gradle.in
@@ -0,0 +1,6 @@
+// SPDX-FileCopyrightText: 2021 Volker Krause <vkrause@kde.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+ext {
+    projectVersionFull = "@NEOCHAT_VERSION@"
+}
--- a/appiumtests/data/sync_response_rooms.json
+++ b/appiumtests/data/sync_response_rooms.json
@@ -5,26 +5,6 @@
            "!room_id_1234:localhost:1234": {
                "state": {
                    "events": [
-                        {
-                            "content": {
-                                "m.federate": true,
-                                "predecessor": {
-                                    "event_id": "$something:example.org",
-                                    "room_id": "!oldroom:example.org"
-                                },
-                                "room_version": "11"
-                            },
-                            "event_id": "$143273582443PhrSn:example.org",
-                            "origin_server_ts": 1432735824653,
-                            "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-                            "sender": "@example:example.org",
-                            "state_key": "",
-                            "type": "m.room.create",
-                            "unsigned": {
-                                "age": 1234,
-                                "membership": "join"
-                            }
-                        },
                        {
                            "type": "m.room.member",
                            "state_key": "@user:localhost:1234",
@@ -46,26 +26,6 @@
                },
                "timeline": {
                    "events": [
-                        {
-                            "content": {
-                                "m.federate": true,
-                                "predecessor": {
-                                    "event_id": "$something:example.org",
-                                    "room_id": "!oldroom:example.org"
-                                },
-                                "room_version": "11"
-                            },
-                            "event_id": "$143273582443PhrSn:example.org",
-                            "origin_server_ts": 1432735824653,
-                            "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-                            "sender": "@example:example.org",
-                            "state_key": "",
-                            "type": "m.room.create",
-                            "unsigned": {
-                                "age": 1234,
-                                "membership": "join"
-                            }
-                        },
                        {
                            "type": "m.room.message",
                            "sender": "@user:localhost:1234",
--- a/appiumtests/login-server.py
+++ b/appiumtests/login-server.py
@@ -83,15 +83,6 @@ def create_room():
    next_sync_payload = "sync_response_new_room"
    return response

-@app.route("/_matrix/client/v3/publicRooms", methods=["POST"])
-def public_rooms():
-    if request.get_json()["filter"]["generic_search_term"] == "forbidden":
-        data = dict()
-        data["errcode"] = "M_FORBIDDEN"
-        data["error"] = "You are not allowed to search for this. Go to https://wikipedia.org for more information"
-        return data, 403
-    return dict()
-


 if __name__ == "__main__":
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -3,10 +3,6 @@

 enable_testing()

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

 ecm_add_test(
@@ -52,9 +48,15 @@ ecm_add_test(
 )

 ecm_add_test(
-    timelinemessagemodeltest.cpp
+    messageeventmodeltest.cpp
    LINK_LIBRARIES neochat Qt::Test
-    TEST_NAME timelinemessagemodeltest
+    TEST_NAME messageeventmodeltest
+)
+
+ecm_add_test(
+    actionshandlertest.cpp
+    LINK_LIBRARIES neochat Qt::Test
+    TEST_NAME actionshandlertest
 )

 ecm_add_test(
@@ -86,21 +88,3 @@ ecm_add_test(
    LINK_LIBRARIES neochat Qt::Test
    TEST_NAME messagecontentmodeltest
 )
-
-ecm_add_test(
-    actionstest.cpp
-    LINK_LIBRARIES neochat Qt::Test neochat_server
-    TEST_NAME actionstest
-)
-
-ecm_add_test(
-    servernoticestest.cpp
-    LINK_LIBRARIES neochat Qt::Test neochat_server
-    TEST_NAME servernoticestest
-)
-
-ecm_add_test(
-    roommanagertest.cpp
-    LINK_LIBRARIES neochat Qt::Test neochat_server
-    TEST_NAME roommanagertest
-)
--- a/autotests/actionshandlertest.cpp
+++ b/autotests/actionshandlertest.cpp
@@ -0,0 +1,41 @@
+// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include <QTest>
+
+#include "actionshandler.h"
+#include "chatbarcache.h"
+
+#include "testutils.h"
+
+class ActionsHandlerTest : public QObject
+{
+    Q_OBJECT
+
+private:
+    Quotient::Connection *connection = Quotient::Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+
+private Q_SLOTS:
+    void nullObject();
+};
+
+void ActionsHandlerTest::nullObject()
+{
+    QTest::ignoreMessage(QtWarningMsg, "ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.");
+    ActionsHandler::handleMessageEvent(nullptr, nullptr);
+
+    auto chatBarCache = new ChatBarCache(this);
+    QTest::ignoreMessage(QtWarningMsg, "ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.");
+    ActionsHandler::handleMessageEvent(nullptr, chatBarCache);
+
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"));
+    QTest::ignoreMessage(QtWarningMsg, "ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.");
+    ActionsHandler::handleMessageEvent(room, nullptr);
+
+    // The final one should throw no warning so we make sure.
+    QTest::failOnWarning("ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.");
+    ActionsHandler::handleMessageEvent(room, chatBarCache);
+}
+
+QTEST_GUILESS_MAIN(ActionsHandlerTest)
+#include "actionshandlertest.moc"
--- a/autotests/actionstest.cpp
+++ b/autotests/actionstest.cpp
@@ -1,151 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include <QObject>
-#include <QTest>
-#include <QSignalSpy>
-#include <QVariantList>
-
-#include "accountmanager.h"
-#include "chatbarcache.h"
-#include "models/actionsmodel.h"
-
-#include "server.h"
-#include "testutils.h"
-
-using namespace Quotient;
-
-//TODO: rainbow, rainbowme, plain, spoiler, me, join, knock, j, part, leave, nick, roomnick, myroomnick, ignore, unignore, react, ban, unban, kick
-
-class ActionsTest : public QObject
-{
-    Q_OBJECT
-
-private:
-    Connection *connection = 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();
-    void testActions_data();
-    void testInvite();
-};
-
-void ActionsTest::initTestCase()
-{
-    Connection::setRoomType<NeoChatRoom>();
-    server.start();
-    KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));
-    auto accountManager = new AccountManager(true);
-    QSignalSpy spy(accountManager, &AccountManager::connectionAdded);
-    connection = accountManager->accounts()->front();
-    auto roomId = server.createRoom(u"@user:localhost:1234"_s);
-    server.inviteUser(roomId, u"@invited:example.com"_s);
-    server.banUser(roomId, u"@banned:example.com"_s);
-    server.joinUser(roomId, u"@example:example.com"_s);
-
-    QSignalSpy syncSpy(connection, &Connection::syncDone);
-    // We need to wait for two syncs, as the next one won't have the changes yet
-    QVERIFY(syncSpy.wait());
-    QVERIFY(syncSpy.wait());
-    room = dynamic_cast<NeoChatRoom *>(connection->room(roomId));
-    QVERIFY(room);
-}
-
-void ActionsTest::testActions_data()
-{
-    QTest::addColumn<QString>("command");
-    QTest::addColumn<std::optional<QString>>("resultText");
-    QTest::addColumn<std::optional<Quotient::RoomMessageEvent::MsgType>>("type");
-
-    QTest::newRow("shrug") << u"/shrug Hello"_s << std::make_optional(u"¯\\\\\\_(ツ)\\_/¯ Hello"_s)
-                           << std::make_optional(Quotient::RoomMessageEvent::MsgType::Text);
-    QTest::newRow("lenny") << u"/lenny Hello"_s << std::make_optional(u"( ͡° ͜ʖ ͡°) Hello"_s) << std::make_optional(Quotient::RoomMessageEvent::MsgType::Text);
-    QTest::newRow("tableflip") << u"/tableflip Hello"_s << std::make_optional(u"(╯°□°）╯︵ ┻━┻ Hello"_s)
-                               << std::make_optional(Quotient::RoomMessageEvent::MsgType::Text);
-    QTest::newRow("unflip") << u"/unflip Hello"_s << std::make_optional(u"┬──┬ ノ( ゜-゜ノ) Hello"_s)
-                            << std::make_optional(Quotient::RoomMessageEvent::MsgType::Text);
-    QTest::newRow("rainbow") << u"/rainbow Hello"_s << std::optional<QString>() << std::optional<Quotient::RoomMessageEvent::MsgType>();
-    QTest::newRow("rainbowme") << u"/rainbowme Hello"_s << std::optional<QString>() << std::optional<Quotient::RoomMessageEvent::MsgType>();
-    QTest::newRow("plain") << u"/plain <b>Hello</b>"_s << std::optional<QString>() << std::optional<Quotient::RoomMessageEvent::MsgType>();
-    QTest::newRow("spoiler") << u"/spoiler Hello"_s << std::optional<QString>() << std::optional<Quotient::RoomMessageEvent::MsgType>();
-    QTest::newRow("me") << u"/me Hello"_s << std::make_optional(u"Hello"_s) << std::make_optional(Quotient::RoomMessageEvent::MsgType::Emote);
-    QTest::newRow("notice") << u"/notice Hello"_s << std::make_optional(u"Hello"_s) << std::make_optional(Quotient::RoomMessageEvent::MsgType::Notice);
-    QTest::newRow("message") << u"Hello"_s << std::make_optional(u"Hello"_s) << std::make_optional(Quotient::RoomMessageEvent::MsgType::Text);
-    QTest::newRow("invite") << u"/invite @foo:example.com"_s << std::optional<QString>() << std::optional<Quotient::RoomMessageEvent::MsgType>();
-
-    //TODO: join, knock, j, part, leave, nick, roomnick, myroomnick, ignore, unignore, react, ban, unban, kick
-}
-
-void ActionsTest::testActions()
-{
-    QFETCH(QString, command);
-    QFETCH(std::optional<QString>, resultText);
-    QFETCH(std::optional<Quotient::RoomMessageEvent::MsgType>, type);
-
-    auto cache = new ChatBarCache();
-    cache->setText(command);
-    auto result = ActionsModel::handleAction(room, cache);
-    QCOMPARE(resultText, std::get<std::optional<QString>>(result));
-    QCOMPARE(type, std::get<std::optional<Quotient::RoomMessageEvent::MsgType>>(result));
-}
-
-static ActionsModel::Action findAction(const QString &name)
-{
-    for (const auto &action : ActionsModel::allActions()) {
-        if (action.prefix == name) {
-            return action;
-        }
-    }
-
-    return {};
-}
-
-void ActionsTest::expectMessage(const QString &actionName, const QString &args, MessageType::Type type, const QString &message)
-{
-    auto action = findAction(actionName);
-    QSignalSpy spy(room, &NeoChatRoom::showMessage);
-    auto result = action.handle(args, room, nullptr);
-    auto expected = QVariantList {type, message};
-    auto signal = spy.takeFirst();
-    QCOMPARE(signal, expected);
-}
-
-void ActionsTest::testInvite()
-{
-    expectMessage(u"invite"_s, u"foo"_s, MessageType::Error, u"'foo' does not look like a matrix id."_s);
-    expectMessage(u"invite"_s, u"@invited:example.com"_s, MessageType::Information, u"@invited:example.com is already invited to this room."_s);
-    QCOMPARE(room->memberState(u"@invited:example.com"_s), Membership::Invite);
-    expectMessage(u"invite"_s, u"@banned:example.com"_s, MessageType::Information, u"@banned:example.com is banned from this room."_s);
-    QCOMPARE(room->memberState(u"@banned:example.com"_s), Membership::Ban);
-    expectMessage(u"invite"_s, connection->userId(), MessageType::Positive, u"You are already in this room."_s);
-    QCOMPARE(room->memberState(connection->userId()), Membership::Join);
-    expectMessage(u"invite"_s, u"@example:example.com"_s, MessageType::Information, u"@example:example.com is already in this room."_s);
-    QCOMPARE(room->memberState(u"@example:example.com"_s), Membership::Join);
-
-    QCOMPARE(room->memberState(u"@user:example.com"_s), Membership::Leave);
-    expectMessage(u"invite"_s, u"@user:example.com"_s, MessageType::Positive, u"@user:example.com was invited into this room."_s);
-
-    QSignalSpy spy(room, &NeoChatRoom::changed);
-    QVERIFY(spy.wait());
-
-    auto tries = 0;
-
-    while (room->memberState(u"@user:example.com"_s) != Membership::Invite) {
-        QVERIFY(spy.wait());
-        tries += 1;
-        if (tries > 3) {
-            QVERIFY(false);
-        }
-    }
-
-    QCOMPARE(room->memberState(u"@user:example.com"_s), Membership::Invite);
-}
-
-QTEST_MAIN(ActionsTest)
-#include "actionstest.moc"
--- a/autotests/chatbarcachetest.cpp
+++ b/autotests/chatbarcachetest.cpp
@@ -6,7 +6,6 @@
 #include <QObject>
 #include <QTest>

-#include <QSignalSpy>
 #include <Quotient/roommember.h>
 #include <Quotient/syncdata.h>
 #include <qtestcase.h>
@@ -33,15 +32,14 @@ private Q_SLOTS:
    void noRoom();
    void badParent();
    void reply();
-    void replyMissingUser();
    void edit();
    void attachment();
 };

 void ChatBarCacheTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
-    room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, "test-min-sync.json"_L1);
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-min-sync.json"));
 }

 void ChatBarCacheTest::empty()
@@ -61,7 +59,7 @@ void ChatBarCacheTest::empty()
 void ChatBarCacheTest::noRoom()
 {
    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache());
-    chatBarCache->setReplyId(u"$153456789:example.org"_s);
+    chatBarCache->setReplyId(QLatin1String("$153456789:example.org"));

    // These should return empty even though a reply ID has been set because the
    // ChatBarCache has no parent.
@@ -77,7 +75,7 @@ void ChatBarCacheTest::badParent()
 {
    QScopedPointer<QObject> badParent(new QObject());
    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(badParent.get()));
-    chatBarCache->setReplyId(u"$153456789:example.org"_s);
+    chatBarCache->setReplyId(QLatin1String("$153456789:example.org"));

    // These should return empty even though a reply ID has been set because the
    // ChatBarCache has no parent.
@@ -92,84 +90,57 @@ void ChatBarCacheTest::badParent()
 void ChatBarCacheTest::reply()
 {
    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);
+    chatBarCache->setText(QLatin1String("some text"));
+    chatBarCache->setAttachmentPath(QLatin1String("some/path"));
+    chatBarCache->setReplyId(QLatin1String("$153456789:example.org"));

-    QCOMPARE(chatBarCache->text(), u"some text"_s);
+    QCOMPARE(chatBarCache->text(), QLatin1String("some text"));
    QCOMPARE(chatBarCache->isReplying(), true);
-    QCOMPARE(chatBarCache->replyId(), u"$153456789:example.org"_s);
+    QCOMPARE(chatBarCache->replyId(), QLatin1String("$153456789:example.org"));
    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->relationAuthor(), room->member(QLatin1String("@example:example.org")));
+    QCOMPARE(chatBarCache->relationMessage(), QLatin1String("This is an example\ntext message"));
    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()
 {
    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));

-    chatBarCache->setText(u"some text"_s);
-    chatBarCache->setAttachmentPath(u"some/path"_s);
+    chatBarCache->setText(QLatin1String("some text"));
+    chatBarCache->setAttachmentPath(QLatin1String("some/path"));
    connect(chatBarCache.get(), &ChatBarCache::relationIdChanged, this, [](const QString &oldEventId, const QString &newEventId) {
        QCOMPARE(oldEventId, QString());
-        QCOMPARE(newEventId, QString(u"$153456789:example.org"_s));
+        QCOMPARE(newEventId, QString(QLatin1String("$153456789:example.org")));
    });
-    chatBarCache->setEditId(u"$153456789:example.org"_s);
+    chatBarCache->setEditId(QLatin1String("$153456789:example.org"));

-    QCOMPARE(chatBarCache->text(), u"some text"_s);
+    QCOMPARE(chatBarCache->text(), QLatin1String("some text"));
    QCOMPARE(chatBarCache->isReplying(), false);
    QCOMPARE(chatBarCache->replyId(), QString());
    QCOMPARE(chatBarCache->isEditing(), true);
-    QCOMPARE(chatBarCache->editId(), u"$153456789:example.org"_s);
-    QCOMPARE(chatBarCache->relationAuthor(), room->member(u"@example:example.org"_s));
-    QCOMPARE(chatBarCache->relationMessage(), u"This is an example\ntext message"_s);
+    QCOMPARE(chatBarCache->editId(), QLatin1String("$153456789:example.org"));
+    QCOMPARE(chatBarCache->relationAuthor(), room->member(QLatin1String("@example:example.org")));
+    QCOMPARE(chatBarCache->relationMessage(), QLatin1String("This is an example\ntext message"));
    QCOMPARE(chatBarCache->attachmentPath(), QString());
 }

 void ChatBarCacheTest::attachment()
 {
    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-    chatBarCache->setText(u"some text"_s);
-    chatBarCache->setEditId(u"$153456789:example.org"_s);
-    chatBarCache->setAttachmentPath(u"some/path"_s);
+    chatBarCache->setText(QLatin1String("some text"));
+    chatBarCache->setEditId(QLatin1String("$153456789:example.org"));
+    chatBarCache->setAttachmentPath(QLatin1String("some/path"));

-    QCOMPARE(chatBarCache->text(), u"some text"_s);
+    QCOMPARE(chatBarCache->text(), QLatin1String("some text"));
    QCOMPARE(chatBarCache->isReplying(), false);
    QCOMPARE(chatBarCache->replyId(), QString());
    QCOMPARE(chatBarCache->isEditing(), false);
    QCOMPARE(chatBarCache->editId(), QString());
    QCOMPARE(chatBarCache->relationAuthor(), room->member(QString()));
    QCOMPARE(chatBarCache->relationMessage(), QString());
-    QCOMPARE(chatBarCache->attachmentPath(), u"some/path"_s);
+    QCOMPARE(chatBarCache->attachmentPath(), QLatin1String("some/path"));
 }

 QTEST_MAIN(ChatBarCacheTest)
--- a/autotests/data/localhost.crt
+++ b/autotests/data/localhost.crt
@@ -1,20 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIDNTCCAh2gAwIBAgIUXbyWfTfcvVLrVB1qx36pW/7IkwMwDQYJKoZIhvcNAQEL
-BQAwQjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UE
-CgwTRGVmYXVsdCBDb21wYW55IEx0ZDAgFw0yNDEyMjQxNTAxMDNaGA8yNTcyMDcy
-NDE1MDEwM1owQjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEc
-MBoGA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKlxZ540TQ1uUDAR7ZJ9ue0PzcD2dPmblIIddyekvZS59V7X
-drhamclXpHE2EelR87Sexst0BaHH/jmrHwxCtwbeXHZ8ueJHkGHJ5DLZCCiwfG+Q
-gml7wlSXxXz37vie2tdlZh2yJSM8yvLAYceHb2zOskaGvul7ZITIS0JrPc3o6VZk
-+MYGkYtA2JfUsv3jH4oQbxOf7RXqhWNAXbB+3hlwRBwMIdyoBNK6YS9QSrTeS9jj
-UqgO5QmaQZOVvpaPf1Y/rHHLd2Qa6+a/cCJ1sr2biagb75AihpQFsK/oy6D1PP70
-zTe7hPWn/efEpmtCV7CQ8ti4cRu0Kjy0T8grtCsCAwEAAaMhMB8wHQYDVR0OBBYE
-FIFlylzwADNLfgTDNkhFeFelaEDxMA0GCSqGSIb3DQEBCwUAA4IBAQBQ2rw4GLIU
-v+GY7Qru9LttkrQPd2bZXKxDMd/jT+wjmMVtqS4MAsCuDYwaYLjU1aWyqy0mN+lY
-A17kD0VjBNBy45sYqkZveY0ks8mCScBemtrIDmjz2tiueecBIEASwEPBOZgv5/MV
-cz864FiChF+2r8Zl8bhycGy9DEpRjzYKvIQWSDHQ3zpuh3iBnjfoieLHWX2kKCpk
-ouS3V6485rHNCWsZT5IcCwfBFQkOuWRJpIazpz4AfwZh1TK9+bgiKA5EyZjSNrKw
-xGQSpMSTRQMB0/FOCL/AixhN9unVFUViqUcdtSfoHE1VyBHv9kDT/cYms/Xl4B0t
-/ZSQJ/D/Km1+
-----END CERTIFICATE-----
--- a/autotests/data/localhost.key
+++ b/autotests/data/localhost.key
@@ -1,28 +0,0 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCpcWeeNE0NblAw
-Ee2SfbntD83A9nT5m5SCHXcnpL2UufVe13a4WpnJV6RxNhHpUfO0nsbLdAWhx/45
-qx8MQrcG3lx2fLniR5BhyeQy2QgosHxvkIJpe8JUl8V89+74ntrXZWYdsiUjPMry
-wGHHh29szrJGhr7pe2SEyEtCaz3N6OlWZPjGBpGLQNiX1LL94x+KEG8Tn+0V6oVj
-QF2wft4ZcEQcDCHcqATSumEvUEq03kvY41KoDuUJmkGTlb6Wj39WP6xxy3dkGuvm
-v3AidbK9m4moG++QIoaUBbCv6Mug9Tz+9M03u4T1p/3nxKZrQlewkPLYuHEbtCo8
-tE/IK7QrAgMBAAECggEAH9qmeKrra2F4KLlOGNKS//qPGz4Z+ozhi95/NpA1Zb7Z
-3pUSCBFcROo5i2D3WA4kiymoRLpQjrv60puVcCggoWVvK4VCKsR6Y6/hOx/q9T9M
-fWrE4ZC3FVEc+uPfZJT0nja9TkrdyXSV0LITD8Ap1eI7yJ9vR5R/bqj64QcpLMrU
-QeoQIy1oTMR+qdjj33duyRwBZU3Yf8FRB2iW6OILZ8hzFo1jngec7dph9a1RK4e0
-mEPdc9ywsKlDM7P0Y7zdmjar5XtQn87GiwNhz23f1fzCC2axLtOW0Xm4e4Qumehb
-WrIi6Vfq8IWMglU7QrBJ7iR0Ls+XoKA5GxomV2IJZQKBgQDoIkOl5YGPQ3iGR+WK
-e5/2Ml4G/uURzYiOlzSsyfoPXyO4EI2BJd5HkH+EvfgRx4xKkxUZRJdzR7llYPl8
-BFYcFitvhO8SbD0mNAB5YW7f+3v1pgEN2umzoKd389Zx5WqTZ7YB1VG5RN/Q1JJL
-2JM0Xgamq2vNtx3roRPxDBeW7QKBgQC63R/bmACJbgIzfaVBX4Zie3NQG0/Hf+gF
-LnBwUmQDZOR7MY+kSiIUVMn3NuZRiCSCFBVwApruyK8r535JCibTVm5PWjvhFddY
-LgaPOCKGlm9TLScjoH1pErYgG3uJ4nXeRfXhg4mco6EkrC7RzQywrd0VDoqpuc1Y
-EKfEsYk8dwKBgE+mSh3nNOBKX1V73+f3aTiZqaeu2DyWkG+UtE9BclrJ40Cp9VPG
-AZH+o7KRWEgJdzqzYv7riSfWCWgesRv7hOxYMwktzLY+i3DLUQpVAy05ZhwwnJX7
-ckrfKfc/pGoqNLplUI8qecMfPciy14vMwR2r0Y5orTHFzi9mcqg35PQ1AoGAW2LX
-OLq+0HdHhk0Va8I+450CSRQCUUvhed87SANTPEG0Z/dWC3/h6NWKrGdh/k+5oxAV
-Z+EuSkdFPBCLt0bKtCKZ8h7sF+lplotz08kdQXsC2MfFU2wiySdIgK1QHp/tCxZl
-6LM+sqdnoJrAjwRcB3AQJkMlV1ox7ba/hbdZqYMCgYBS6+JUXSSASpm5ZHd32a8m
-xwryEZ7H6Hek6lvMHdxmwoKat5dCavxw64nrtyeeGZpg1W3zLLyamF9x/8kMyr6y
-KKvtBfJ5sCvAbt80o9Pbs6R3yDB3AKiD3s3PQK7lol1nhE/8IbsF2r8JEQVcYd/k
-oBzkl7MrMyLhhaCqSxwqQQ==
-----END PRIVATE KEY-----
--- a/autotests/data/test-min-sync-extra-sync.json
+++ b/autotests/data/test-min-sync-extra-sync.json
@@ -1,20 +0,0 @@
-{
-  "state": {
-    "events": [
-      {
-        "content": {
-          "membership": "leave"
-        },
-        "event_id": "$1432735824666PhrSA:example.org",
-        "origin_server_ts": 1432735824666,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "state_key": "@example:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "replaces_state": "$143273582443PhrSn:example.org"
-        }
-      }
-    ]
-  }
-}
--- a/autotests/data/test-min-sync.json
+++ b/autotests/data/test-min-sync.json
@@ -49,51 +49,6 @@
        "unsigned": {
          "age": 1234
        }
-      },
-      {
-        "content": {
-          "displayname": "Bob",
-          "membership": "join"
-        },
-        "event_id": "$143273blorb3PhrSn:example.org",
-        "origin_server_ts": 1432735824653,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@bob:kde.org",
-        "state_key": "@bob:kde.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      },
-      {
-        "content": {
-          "displayname": "Invited",
-          "membership": "invite"
-        },
-        "event_id": "$asdfpj443PhrSn:example.org",
-        "origin_server_ts": 1432735824653,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "state_key": "@invited:example.com",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      },
-      {
-        "content": {
-          "displayname": "Banned",
-          "membership": "ban"
-        },
-        "event_id": "$asdfpj443PhrSnasfd:example.org",
-        "origin_server_ts": 1432735824653,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@banned:example.com",
-        "state_key": "@banned:example.com",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
      }
    ]
  },
@@ -102,7 +57,7 @@
      "@alice:example.com",
      "@bob:example.com"
    ],
-    "m.invited_member_count": 1,
+    "m.invited_member_count": 0,
    "m.joined_member_count": 2
  },
  "timeline": {
--- a/autotests/data/test-pollhandlerstart-sync.json
+++ b/autotests/data/test-pollhandlerstart-sync.json
@@ -8,14 +8,14 @@
                "answers": [
                    {
                        "id": "option1",
-                        "org.matrix.msc1767.text": "option1text"
+                        "org.matrix.msc1767.text": "option1"
                    },
                    {
                        "id": "option2",
-                        "org.matrix.msc1767.text": "option2text"
+                        "org.matrix.msc1767.text": "option2"
                    }
                ],
-                "kind": "org.matrix.msc3381.poll.undisclosed",
+                "kind": "org.matrix.msc3381.poll.disclosed",
                "max_selections": 1,
                "question": {
                    "body": "test",
--- a/autotests/delegatesizehelpertest.cpp
+++ b/autotests/delegatesizehelpertest.cpp
@@ -2,7 +2,6 @@
 // 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"
@@ -31,7 +30,7 @@ void DelegateSizeHelperTest::risingPercentage_data()
    QTest::addColumn<int>("currentPercentageWidth");
    QTest::addColumn<qreal>("currentWidth");

-    QTest::newRow("zero") << qreal(0) << int(100) << qreal(0);
+    QTest::newRow("zero") << qreal(0) << int(0) << 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);
@@ -44,18 +43,16 @@ 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);

-    QCOMPARE(delegateSizeHelper.availablePercentageWidth(), currentPercentageWidth);
-    QCOMPARE(delegateSizeHelper.availableWidth(), currentWidth);
+    delegateSizeHelper.setParentWidth(parentWidth);
+
+    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
+    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
 }

 void DelegateSizeHelperTest::fallingPercentage_data()
@@ -77,18 +74,16 @@ 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);

-    QCOMPARE(delegateSizeHelper.availablePercentageWidth(), currentPercentageWidth);
-    QCOMPARE(delegateSizeHelper.availableWidth(), currentWidth);
+    delegateSizeHelper.setParentWidth(parentWidth);
+
+    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
+    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
 }

 void DelegateSizeHelperTest::equalPercentage_data()
@@ -110,18 +105,16 @@ 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);

-    QCOMPARE(delegateSizeHelper.availablePercentageWidth(), currentPercentageWidth);
-    QCOMPARE(delegateSizeHelper.availableWidth(), currentWidth);
+    delegateSizeHelper.setParentWidth(parentWidth);
+
+    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
+    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
 }

 void DelegateSizeHelperTest::equalBreakpoint_data()
@@ -131,9 +124,9 @@ void DelegateSizeHelperTest::equalBreakpoint_data()
    QTest::addColumn<int>("currentPercentageWidth");
    QTest::addColumn<qreal>("currentWidth");

-    QTest::newRow("start higher") << int(100) << int(0) << int(100) << qreal(1000);
+    QTest::newRow("start higher") << int(100) << int(0) << int(-1) << qreal(0);
    QTest::newRow("equal") << int(50) << int(50) << int(50) << qreal(500);
-    QTest::newRow("end higher") << int(0) << int(100) << int(100) << qreal(1000);
+    QTest::newRow("end higher") << int(0) << int(100) << int(-1) << qreal(0);
 }

 /**
@@ -147,18 +140,16 @@ 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);

-    QCOMPARE(delegateSizeHelper.availablePercentageWidth(), currentPercentageWidth);
-    QCOMPARE(delegateSizeHelper.availableWidth(), currentWidth);
+    delegateSizeHelper.setParentWidth(1000);
+
+    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
+    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
 }

 QTEST_GUILESS_MAIN(DelegateSizeHelperTest)
--- a/autotests/eventhandlertest.cpp
+++ b/autotests/eventhandlertest.cpp
@@ -11,8 +11,6 @@
 #include <Quotient/connection.h>
 #include <Quotient/quotient_common.h>
 #include <Quotient/syncdata.h>
-#include <qcbormap.h>
-#include <qtestcase.h>

 #include "linkpreviewer.h"
 #include "models/reactionmodel.h"
@@ -34,6 +32,8 @@ private:
 private Q_SLOTS:
    void initTestCase();

+    void eventId();
+    void nullEventId();
    void authorDisplayName();
    void nullAuthorDisplayName();
    void singleLineSidplayName();
@@ -56,21 +56,38 @@ private Q_SLOTS:
    void nullSubtitle();
    void mediaInfo();
    void nullMediaInfo();
+    void hasReply();
+    void nullHasReply();
+    void replyId();
+    void nullReplyId();
    void replyAuthor();
    void nullReplyAuthor();
+    void thread();
+    void nullThread();
    void location();
    void nullLocation();
 };

 void EventHandlerTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
-    room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-eventhandler-sync.json"_s);
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-eventhandler-sync.json"));
+}
+
+void EventHandlerTest::eventId()
+{
+    QCOMPARE(EventHandler::id(room->messageEvents().at(0).get()), QStringLiteral("$153456789:example.org"));
+}
+
+void EventHandlerTest::nullEventId()
+{
+    QTest::ignoreMessage(QtWarningMsg, "id called with event set to nullptr.");
+    QCOMPARE(EventHandler::id(nullptr), QString());
 }

 void EventHandlerTest::authorDisplayName()
 {
-    QCOMPARE(EventHandler::authorDisplayName(room, room->messageEvents().at(1).get()), u"before"_s);
+    QCOMPARE(EventHandler::authorDisplayName(room, room->messageEvents().at(1).get()), QStringLiteral("before"));
 }

 void EventHandlerTest::nullAuthorDisplayName()
@@ -84,7 +101,8 @@ void EventHandlerTest::nullAuthorDisplayName()

 void EventHandlerTest::singleLineSidplayName()
 {
-    QCOMPARE(EventHandler::singleLineAuthorDisplayname(room, room->messageEvents().at(11).get()), "Look at me I put newlines in my display name"_L1);
+    QCOMPARE(EventHandler::singleLineAuthorDisplayname(room, room->messageEvents().at(11).get()),
+             QStringLiteral("Look at me I put newlines in my display name"));
 }

 void EventHandlerTest::nullSingleLineDisplayName()
@@ -100,24 +118,17 @@ void EventHandlerTest::time()
 {
    const auto event = room->messageEvents().at(0).get();

-    QCOMPARE(EventHandler::time(room, event), QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)));
-
-    const auto txID = room->postJson("m.room.message"_L1, event->fullJson());
-    QCOMPARE(room->pendingEvents().size(), 1);
-    const auto pendingIt = room->findPendingEvent(txID);
-    QCOMPARE(EventHandler::time(room, pendingIt->event(), true), pendingIt->lastUpdated());
-
-    room->discardMessage(txID);
-    QCOMPARE(room->pendingEvents().size(), 0);
+    QCOMPARE(EventHandler::time(event), QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC));
+    QCOMPARE(EventHandler::time(event, true, QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC)), QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC));
 }

 void EventHandlerTest::nullTime()
 {
-    QTest::ignoreMessage(QtWarningMsg, "time called with room set to nullptr.");
-    QCOMPARE(EventHandler::time(nullptr, nullptr), QDateTime());
-
    QTest::ignoreMessage(QtWarningMsg, "time called with event set to nullptr.");
-    QCOMPARE(EventHandler::time(room, nullptr), QDateTime());
+    QCOMPARE(EventHandler::time(nullptr), QDateTime());
+
+    QTest::ignoreMessage(QtWarningMsg, "a value must be provided for lastUpdated for a pending event.");
+    QCOMPARE(EventHandler::time(room->messageEvents().at(0).get(), true), QDateTime());
 }

 void EventHandlerTest::timeString()
@@ -126,28 +137,20 @@ void EventHandlerTest::timeString()

    KFormat format;

-    QCOMPARE(EventHandler::timeString(room, event, false),
-             QLocale().toString(QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toLocalTime().time(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(room, event, true),
-             format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(room, event, u"hh:mm"_s),
-             QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::LocalTime)).toString(u"hh:mm"_s));
-
-    const auto txID = room->postJson("m.room.message"_L1, event->fullJson());
-    QCOMPARE(room->pendingEvents().size(), 1);
-    const auto pendingIt = room->findPendingEvent(txID);
-
-    QCOMPARE(EventHandler::timeString(room, pendingIt->event(), false, QLocale::ShortFormat, true),
-             QLocale().toString(pendingIt->lastUpdated().toLocalTime().time(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(room, pendingIt->event(), true, QLocale::ShortFormat, true),
-             format.formatRelativeDate(pendingIt->lastUpdated().toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(room, pendingIt->event(), false, QLocale::LongFormat, true),
-             QLocale().toString(pendingIt->lastUpdated().toLocalTime().time(), QLocale::LongFormat));
-    QCOMPARE(EventHandler::timeString(room, pendingIt->event(), true, QLocale::LongFormat, true),
-             format.formatRelativeDate(pendingIt->lastUpdated().toLocalTime().date(), QLocale::LongFormat));
-
-    room->discardMessage(txID);
-    QCOMPARE(room->pendingEvents().size(), 0);
+    QCOMPARE(EventHandler::timeString(event, false),
+             QLocale().toString(QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toLocalTime().time(), QLocale::ShortFormat));
+    QCOMPARE(EventHandler::timeString(event, true),
+             format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toLocalTime().date(), QLocale::ShortFormat));
+    QCOMPARE(EventHandler::timeString(event, false, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+             QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().time(), QLocale::ShortFormat));
+    QCOMPARE(EventHandler::timeString(event, true, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+             format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().date(), QLocale::ShortFormat));
+    QCOMPARE(EventHandler::timeString(event, false, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+             QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().time(), QLocale::LongFormat));
+    QCOMPARE(EventHandler::timeString(event, true, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+             format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().date(), QLocale::LongFormat));
+    QCOMPARE(EventHandler::timeString(event, QStringLiteral("hh:mm")),
+             QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toString(QStringLiteral("hh:mm")));
 }

 void EventHandlerTest::highlighted()
@@ -184,10 +187,10 @@ void EventHandlerTest::body()
 {
    const auto event = room->messageEvents().at(0).get();

-    QCOMPARE(EventHandler::richBody(room, event), u"<b>This is an example<br>text message</b>"_s);
-    QCOMPARE(EventHandler::richBody(room, event, true), u"<b>This is an example text message</b>"_s);
-    QCOMPARE(EventHandler::plainBody(room, event), u"This is an example\ntext message"_s);
-    QCOMPARE(EventHandler::plainBody(room, event, true), u"This is an example text message"_s);
+    QCOMPARE(EventHandler::richBody(room, event), QStringLiteral("<b>This is an example<br>text message</b>"));
+    QCOMPARE(EventHandler::richBody(room, event, true), QStringLiteral("<b>This is an example text message</b>"));
+    QCOMPARE(EventHandler::plainBody(room, event), QStringLiteral("This is an example\ntext message"));
+    QCOMPARE(EventHandler::plainBody(room, event, true), QStringLiteral("This is an example text message"));
 }

 void EventHandlerTest::nullBody()
@@ -210,11 +213,13 @@ void EventHandlerTest::genericBody_data()
    QTest::addColumn<int>("eventNum");
    QTest::addColumn<QString>("output");

-    QTest::newRow("message") << 0 << u"<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message"_s;
-    QTest::newRow("member") << 1 << u"<a href=\"https://matrix.to/#/@example:example.org\">after</a> changed their display name and updated their avatar"_s;
-    QTest::newRow("message 2") << 2 << u"<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message"_s;
-    QTest::newRow("reaction") << 3 << u"Unknown event"_s;
-    QTest::newRow("video") << 4 << u"<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message"_s;
+    QTest::newRow("message") << 0 << QStringLiteral("<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message");
+    QTest::newRow("member") << 1
+                            << QStringLiteral(
+                                   "<a href=\"https://matrix.to/#/@example:example.org\">after</a> changed their display name and updated their avatar");
+    QTest::newRow("message 2") << 2 << QStringLiteral("<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message");
+    QTest::newRow("reaction") << 3 << QStringLiteral("Unknown event");
+    QTest::newRow("video") << 4 << QStringLiteral("<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message");
 }

 void EventHandlerTest::genericBody()
@@ -236,19 +241,19 @@ void EventHandlerTest::nullGenericBody()

 void EventHandlerTest::markdownBody()
 {
-    QCOMPARE(EventHandler::markdownBody(room->messageEvents().at(0).get()), u"This is an example\ntext message"_s);
+    QCOMPARE(EventHandler::markdownBody(room->messageEvents().at(0).get()), QStringLiteral("This is an example\ntext message"));
 }

 void EventHandlerTest::markdownBodyReply()
 {
-    QCOMPARE(EventHandler::markdownBody(room->messageEvents().at(5).get()), u"reply"_s);
+    QCOMPARE(EventHandler::markdownBody(room->messageEvents().at(5).get()), QStringLiteral("reply"));
 }

 void EventHandlerTest::subtitle()
 {
-    QCOMPARE(EventHandler::subtitleText(room, room->messageEvents().at(0).get()), u"after: This is an example text message"_s);
+    QCOMPARE(EventHandler::subtitleText(room, room->messageEvents().at(0).get()), QStringLiteral("after: This is an example text message"));
    QCOMPARE(EventHandler::subtitleText(room, room->messageEvents().at(2).get()),
-             u"after: This is a highlight @bob:kde.org and this is a link https://kde.org"_s);
+             QStringLiteral("after: This is a highlight @bob:kde.org and this is a link https://kde.org"));
 }

 void EventHandlerTest::nullSubtitle()
@@ -264,21 +269,21 @@ void EventHandlerTest::mediaInfo()
 {
    auto event = room->messageEvents().at(4).get();
    auto mediaInfo = EventHandler::mediaInfo(room, event);
-    auto thumbnailInfo = mediaInfo["tempInfo"_L1].toMap();
+    auto thumbnailInfo = mediaInfo["tempInfo"_ls].toMap();

-    QCOMPARE(mediaInfo["source"_L1], room->makeMediaUrl(event->id(), QUrl("mxc://kde.org/1234567"_L1)));
-    QCOMPARE(mediaInfo["mimeType"_L1], u"video/mp4"_s);
-    QCOMPARE(mediaInfo["mimeIcon"_L1], u"video-mp4"_s);
-    QCOMPARE(mediaInfo["size"_L1], 62650636);
-    QCOMPARE(mediaInfo["duration"_L1], 10);
-    QCOMPARE(mediaInfo["width"_L1], 1920);
-    QCOMPARE(mediaInfo["height"_L1], 1080);
-    QCOMPARE(thumbnailInfo["source"_L1], room->makeMediaUrl(event->id(), QUrl("mxc://kde.org/2234567"_L1)));
-    QCOMPARE(thumbnailInfo["mimeType"_L1], u"image/jpeg"_s);
-    QCOMPARE(thumbnailInfo["mimeIcon"_L1], u"image-jpeg"_s);
-    QCOMPARE(thumbnailInfo["size"_L1], 382249);
-    QCOMPARE(thumbnailInfo["width"_L1], 800);
-    QCOMPARE(thumbnailInfo["height"_L1], 450);
+    QCOMPARE(mediaInfo["source"_ls], room->makeMediaUrl(event->id(), QUrl("mxc://kde.org/1234567"_ls)));
+    QCOMPARE(mediaInfo["mimeType"_ls], QStringLiteral("video/mp4"));
+    QCOMPARE(mediaInfo["mimeIcon"_ls], QStringLiteral("video-mp4"));
+    QCOMPARE(mediaInfo["size"_ls], 62650636);
+    QCOMPARE(mediaInfo["duration"_ls], 10);
+    QCOMPARE(mediaInfo["width"_ls], 1920);
+    QCOMPARE(mediaInfo["height"_ls], 1080);
+    QCOMPARE(thumbnailInfo["source"_ls], room->makeMediaUrl(event->id(), QUrl("mxc://kde.org/2234567"_ls)));
+    QCOMPARE(thumbnailInfo["mimeType"_ls], QStringLiteral("image/jpeg"));
+    QCOMPARE(thumbnailInfo["mimeIcon"_ls], QStringLiteral("image-jpeg"));
+    QCOMPARE(thumbnailInfo["size"_ls], 382249);
+    QCOMPARE(thumbnailInfo["width"_ls], 800);
+    QCOMPARE(thumbnailInfo["height"_ls], 450);
 }

 void EventHandlerTest::nullMediaInfo()
@@ -290,6 +295,30 @@ void EventHandlerTest::nullMediaInfo()
    QCOMPARE(EventHandler::mediaInfo(room, nullptr), QVariantMap());
 }

+void EventHandlerTest::hasReply()
+{
+    QCOMPARE(EventHandler::hasReply(room->messageEvents().at(5).get()), true);
+    QCOMPARE(EventHandler::hasReply(room->messageEvents().at(0).get()), false);
+}
+
+void EventHandlerTest::nullHasReply()
+{
+    QTest::ignoreMessage(QtWarningMsg, "hasReply called with event set to nullptr.");
+    QCOMPARE(EventHandler::hasReply(nullptr), false);
+}
+
+void EventHandlerTest::replyId()
+{
+    QCOMPARE(EventHandler::replyId(room->messageEvents().at(5).get()), QStringLiteral("$153456789:example.org"));
+    QCOMPARE(EventHandler::replyId(room->messageEvents().at(0).get()), QStringLiteral(""));
+}
+
+void EventHandlerTest::nullReplyId()
+{
+    QTest::ignoreMessage(QtWarningMsg, "replyId called with event set to nullptr.");
+    QCOMPARE(EventHandler::replyId(nullptr), QString());
+}
+
 void EventHandlerTest::replyAuthor()
 {
    auto replyEvent = room->messageEvents().at(0).get();
@@ -315,11 +344,34 @@ void EventHandlerTest::nullReplyAuthor()
    QCOMPARE(EventHandler::replyAuthor(room, nullptr), RoomMember());
 }

+void EventHandlerTest::thread()
+{
+    QCOMPARE(EventHandler::isThreaded(room->messageEvents().at(0).get()), false);
+    QCOMPARE(EventHandler::threadRoot(room->messageEvents().at(0).get()), QString());
+
+    QCOMPARE(EventHandler::isThreaded(room->messageEvents().at(9).get()), true);
+    QCOMPARE(EventHandler::threadRoot(room->messageEvents().at(9).get()), QStringLiteral("$threadroot:example.org"));
+    QCOMPARE(EventHandler::replyId(room->messageEvents().at(9).get()), QStringLiteral("$threadroot:example.org"));
+
+    QCOMPARE(EventHandler::isThreaded(room->messageEvents().at(10).get()), true);
+    QCOMPARE(EventHandler::threadRoot(room->messageEvents().at(10).get()), QStringLiteral("$threadroot:example.org"));
+    QCOMPARE(EventHandler::replyId(room->messageEvents().at(10).get()), QStringLiteral("$threadmessage1:example.org"));
+}
+
+void EventHandlerTest::nullThread()
+{
+    QTest::ignoreMessage(QtWarningMsg, "isThreaded called with event set to nullptr.");
+    QCOMPARE(EventHandler::isThreaded(nullptr), false);
+
+    QTest::ignoreMessage(QtWarningMsg, "threadRoot called with event set to nullptr.");
+    QCOMPARE(EventHandler::threadRoot(nullptr), QString());
+}
+
 void EventHandlerTest::location()
 {
-    QCOMPARE(EventHandler::latitude(room->messageEvents().at(7).get()), u"51.7035"_s.toFloat());
-    QCOMPARE(EventHandler::longitude(room->messageEvents().at(7).get()), u"-1.14394"_s.toFloat());
-    QCOMPARE(EventHandler::locationAssetType(room->messageEvents().at(7).get()), u"m.pin"_s);
+    QCOMPARE(EventHandler::latitude(room->messageEvents().at(7).get()), QStringLiteral("51.7035").toFloat());
+    QCOMPARE(EventHandler::longitude(room->messageEvents().at(7).get()), QStringLiteral("-1.14394").toFloat());
+    QCOMPARE(EventHandler::locationAssetType(room->messageEvents().at(7).get()), QStringLiteral("m.pin"));
 }

 void EventHandlerTest::nullLocation()
--- a/autotests/linkpreviewertest.cpp
+++ b/autotests/linkpreviewertest.cpp
@@ -38,8 +38,8 @@ private Q_SLOTS:

 void LinkPreviewerTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:example.org"_s);
-    room = new TestUtils::TestRoom(connection, u"!test:example.org"_s);
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:example.org"));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("!test:example.org"));
 }

 void LinkPreviewerTest::linkPreviewsMatch_data()
@@ -47,9 +47,9 @@ void LinkPreviewerTest::linkPreviewsMatch_data()
    QTest::addColumn<QString>("inputString");
    QTest::addColumn<QUrl>("testOutputLink");

-    QTest::newRow("plainHttps") << u"https://kde.org"_s << QUrl(u"https://kde.org"_s);
-    QTest::newRow("richHttps") << u"<a href=\"https://kde.org\">Rich Link</a>"_s << QUrl(u"https://kde.org"_s);
-    QTest::newRow("richHttpsLinkDescription") << u"<a href=\"https://kde.org\">https://kde.org</a>"_s << QUrl(u"https://kde.org"_s);
+    QTest::newRow("plainHttps") << QStringLiteral("https://kde.org") << QUrl("https://kde.org"_ls);
+    QTest::newRow("richHttps") << QStringLiteral("<a href=\"https://kde.org\">Rich Link</a>") << QUrl("https://kde.org"_ls);
+    QTest::newRow("richHttpsLinkDescription") << QStringLiteral("<a href=\"https://kde.org\">https://kde.org</a>") << QUrl("https://kde.org"_ls);
 }

 void LinkPreviewerTest::linkPreviewsMatch()
@@ -67,8 +67,8 @@ void LinkPreviewerTest::multipleLinkPreviewsMatch_data()
    QTest::addColumn<QString>("inputString");
    QTest::addColumn<QList<QUrl>>("testOutputLinks");

-    QTest::newRow("multipleHttps") << u"www.example.org https://kde.org"_s << QList{QUrl(u"www.example.org"_s), QUrl(u"https://kde.org"_s)};
-    QTest::newRow("multipleHttps1Invalid") << u"www.example.org mxc://example.org/SEsfnsuifSDFSSEF"_s << QList{QUrl(u"www.example.org"_s)};
+    QTest::newRow("multipleHttps") << QStringLiteral("www.example.org https://kde.org") << QList{QUrl("www.example.org"_ls), QUrl("https://kde.org"_ls)};
+    QTest::newRow("multipleHttps1Invalid") << QStringLiteral("www.example.org mxc://example.org/SEsfnsuifSDFSSEF") << QList{QUrl("www.example.org"_ls)};
 }

 void LinkPreviewerTest::multipleLinkPreviewsMatch()
@@ -85,9 +85,9 @@ void LinkPreviewerTest::linkPreviewsReject_data()
 {
    QTest::addColumn<QString>("inputString");

-    QTest::newRow("mxc") << u"mxc://example.org/SEsfnsuifSDFSSEF"_s;
-    QTest::newRow("matrixTo") << u"https://matrix.to/#/@alice:example.org"_s;
-    QTest::newRow("noSpace") << u"testhttps://kde.org"_s;
+    QTest::newRow("mxc") << QStringLiteral("mxc://example.org/SEsfnsuifSDFSSEF");
+    QTest::newRow("matrixTo") << QStringLiteral("https://matrix.to/#/@alice:example.org");
+    QTest::newRow("noSpace") << QStringLiteral("testhttps://kde.org");
 }

 void LinkPreviewerTest::linkPreviewsReject()
--- a/autotests/mediasizehelpertest.cpp
+++ b/autotests/mediasizehelpertest.cpp
@@ -25,7 +25,6 @@ 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))));
 }

@@ -61,7 +60,6 @@ void MediaSizeHelperTest::limits()
    QFETCH(QSize, currentSize);

    MediaSizeHelper mediasizehelper;
-    mediasizehelper.setMaxSize(540, 540);
    mediasizehelper.setMediaWidth(mediaWidth);
    mediasizehelper.setMediaHeight(mediaHeight);
    mediasizehelper.setContentMaxWidth(contentMaxWidth);
--- a/autotests/messagecontentmodeltest.cpp
+++ b/autotests/messagecontentmodeltest.cpp
@@ -10,9 +10,8 @@
 #include <Quotient/roommember.h>
 #include <Quotient/syncdata.h>

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

-#include "neochatconnection.h"
 #include "testutils.h"

 using namespace Quotient;
@@ -33,25 +32,25 @@ private Q_SLOTS:

 void MessageContentModelTest::initTestCase()
 {
-    connection = new NeoChatConnection;
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
 }

 void MessageContentModelTest::missingEvent()
 {
-    auto room = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s);
-    auto model1 = EventMessageContentModel(room, u"$153456789:example.org"_s);
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#firstRoom:kde.org"));
+    auto model1 = MessageContentModel(room, "$153456789:example.org"_L1);

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

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

    QCOMPARE(model2.rowCount(), 1);
    QCOMPARE(model2.data(model2.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);
-    QCOMPARE(model2.data(model2.index(0), MessageContentModel::DisplayRole), u"Loading reply…"_s);
+    QCOMPARE(model2.data(model2.index(0), MessageContentModel::DisplayRole), "Loading reply"_L1);

-    room->syncNewEvents(u"test-min-sync.json"_s);
+    room->syncNewEvents(QLatin1String("test-min-sync.json"));
    QCOMPARE(model1.rowCount(), 2);
    QCOMPARE(model1.data(model1.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Author);
    QCOMPARE(model1.data(model1.index(1), MessageContentModel::ComponentTypeRole), MessageComponentType::Text);
--- a/autotests/timelinemessagemodeltest.cpp
+++ b/autotests/timelinemessagemodeltest.cpp
@@ -10,20 +10,20 @@
 #include <Quotient/syncdata.h>

 #include "enums/delegatetype.h"
-#include "models/timelinemessagemodel.h"
+#include "models/messageeventmodel.h"
 #include "neochatroom.h"

 #include "testutils.h"

 using namespace Quotient;

-class TimelineMessageModelTest : public QObject
+class MessageEventModelTest : public QObject
 {
    Q_OBJECT

 private:
    Connection *connection = nullptr;
-    TimelineMessageModel *model = nullptr;
+    MessageEventModel *model = nullptr;

 private Q_SLOTS:
    void initTestCase();
@@ -40,70 +40,70 @@ private Q_SLOTS:
    void cleanup();
 };

-void TimelineMessageModelTest::initTestCase()
+void MessageEventModelTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
 }

-void TimelineMessageModelTest::init()
+void MessageEventModelTest::init()
 {
    QCOMPARE(model, nullptr);
-    model = new TimelineMessageModel;
+    model = new MessageEventModel;
 }

 // Make sure that basic empty rooms can be switched without crashing.
-void TimelineMessageModelTest::switchEmptyRoom()
+void MessageEventModelTest::switchEmptyRoom()
 {
-    auto firstRoom = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s);
-    auto secondRoom = new TestUtils::TestRoom(connection, u"#secondRoom:kde.org"_s);
+    auto firstRoom = new TestUtils::TestRoom(connection, QStringLiteral("#firstRoom:kde.org"));
+    auto secondRoom = new TestUtils::TestRoom(connection, QStringLiteral("#secondRoom:kde.org"));

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

    QCOMPARE(model->room(), nullptr);
    model->setRoom(firstRoom);
    QCOMPARE(spy.count(), 1);
-    QCOMPARE(model->room()->id(), u"#firstRoom:kde.org"_s);
+    QCOMPARE(model->room()->id(), QStringLiteral("#firstRoom:kde.org"));
    model->setRoom(secondRoom);
    QCOMPARE(spy.count(), 2);
-    QCOMPARE(model->room()->id(), u"#secondRoom:kde.org"_s);
+    QCOMPARE(model->room()->id(), QStringLiteral("#secondRoom:kde.org"));
    model->setRoom(nullptr);
    QCOMPARE(spy.count(), 3);
    QCOMPARE(model->room(), nullptr);
 }

 // Make sure that rooms with some events can be switched without crashing
-void TimelineMessageModelTest::switchSyncedRoom()
+void MessageEventModelTest::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);
+    auto firstRoom = new TestUtils::TestRoom(connection, QStringLiteral("#firstRoom:kde.org"), QLatin1String("test-messageventmodel-sync.json"));
+    auto secondRoom = new TestUtils::TestRoom(connection, QStringLiteral("#secondRoom:kde.org"), QLatin1String("test-messageventmodel-sync.json"));

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

    QCOMPARE(model->room(), nullptr);
    model->setRoom(firstRoom);
    QCOMPARE(spy.count(), 1);
-    QCOMPARE(model->room()->id(), u"#firstRoom:kde.org"_s);
+    QCOMPARE(model->room()->id(), QStringLiteral("#firstRoom:kde.org"));
    model->setRoom(secondRoom);
    QCOMPARE(spy.count(), 2);
-    QCOMPARE(model->room()->id(), u"#secondRoom:kde.org"_s);
+    QCOMPARE(model->room()->id(), QStringLiteral("#secondRoom:kde.org"));
    model->setRoom(nullptr);
    QCOMPARE(spy.count(), 3);
    QCOMPARE(model->room(), nullptr);
 }

-void TimelineMessageModelTest::simpleTimeline()
+void MessageEventModelTest::simpleTimeline()
 {
-    auto room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-messageventmodel-sync.json"_s);
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-messageventmodel-sync.json"));

    model->setRoom(room);
    QCOMPARE(model->rowCount(), 2);

-    QCOMPARE(model->data(model->index(0), TimelineMessageModel::DelegateTypeRole), DelegateType::State);
-    QCOMPARE(model->data(model->index(0)), u"changed their display name to Example Changed"_s);
+    QCOMPARE(model->data(model->index(0), MessageEventModel::DelegateTypeRole), DelegateType::State);
+    QCOMPARE(model->data(model->index(0)), QStringLiteral("changed their display name to Example Changed"));

-    QCOMPARE(model->data(model->index(1)), u"<b>This is an example<br>text message</b>"_s);
-    QCOMPARE(model->data(model->index(1), TimelineMessageModel::DelegateTypeRole), DelegateType::Message);
-    QCOMPARE(model->data(model->index(1), TimelineMessageModel::EventIdRole), u"$153456789:example.org"_s);
+    QCOMPARE(model->data(model->index(1)), QStringLiteral("<b>This is an example<br>text message</b>"));
+    QCOMPARE(model->data(model->index(1), MessageEventModel::DelegateTypeRole), DelegateType::Message);
+    QCOMPARE(model->data(model->index(1), MessageEventModel::EventIdRole), QStringLiteral("$153456789:example.org"));

    QTest::ignoreMessage(QtWarningMsg, "Index QModelIndex(-1,-1,0x0,QObject(0x0)) is not valid (expected valid)");
    QCOMPARE(model->data(model->index(-1)), QVariant());
@@ -111,37 +111,33 @@ void TimelineMessageModelTest::simpleTimeline()
    QCOMPARE(model->data(model->index(model->rowCount())), QVariant());
 }

-// Sync some events into the TimelineMessageModel's current room and don't crash.
-void TimelineMessageModelTest::syncNewEvents()
+// Sync some events into the MessageEventModel's current room and don't crash.
+void MessageEventModelTest::syncNewEvents()
 {
-    auto room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s);
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"));
    QSignalSpy spy(room, SIGNAL(aboutToAddNewMessages(Quotient::RoomEventsRange)));

    model->setRoom(room);
    QCOMPARE(model->rowCount(), 0);

-    room->syncNewEvents(u"test-messageventmodel-sync.json"_s);
+    room->syncNewEvents(QLatin1String("test-messageventmodel-sync.json"));

    QCOMPARE(model->rowCount(), 2);
    QCOMPARE(spy.count(), 1);
 }

 // Check the adding of pending events to the room doesn't cause any issues in the model.
-void TimelineMessageModelTest::pendingEvent()
+void MessageEventModelTest::pendingEvent()
 {
    QSignalSpy spyInsert(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
    QSignalSpy spyRemove(model, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
    QSignalSpy spyChanged(model, SIGNAL(dataChanged(const QModelIndex, const QModelIndex, const QList<int> &)));

-    auto room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s);
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"));
    model->setRoom(room);
    QCOMPARE(model->rowCount(), 0);

-#if Quotient_VERSION_MINOR > 9
-    auto txnId = room->postText("New plain message"_L1);
-#else
-    auto txnId = room->postPlainText("New plain message"_L1);
-#endif
+    auto txnId = room->postPlainText("New plain message"_ls);
    QCOMPARE(model->rowCount(), 1);
    QCOMPARE(spyInsert.count(), 1);

@@ -149,30 +145,26 @@ void TimelineMessageModelTest::pendingEvent()
    QCOMPARE(model->rowCount(), 0);
    QCOMPARE(spyRemove.count(), 1);

-#if Quotient_VERSION_MINOR > 9
-    txnId = room->postText("New plain message"_L1);
-#else
-    txnId = room->postPlainText("New plain message"_L1);
-#endif
+    txnId = room->postPlainText("New plain message"_ls);
    QCOMPARE(model->rowCount(), 1);
    QCOMPARE(spyInsert.count(), 2);

    // We need to manually set the transaction ID of the new message as it will be
    // different every time.
    QFile testSyncFile;
-    testSyncFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + u"test-pending-sync.json"_s);
-    QVERIFY(testSyncFile.open(QIODevice::ReadOnly));
+    testSyncFile.setFileName(QLatin1String(DATA_DIR) + u'/' + QLatin1String("test-pending-sync.json"));
+    testSyncFile.open(QIODevice::ReadOnly);
    auto testSyncJson = QJsonDocument::fromJson(testSyncFile.readAll());
    auto root = testSyncJson.object();
-    auto timeline = root["timeline"_L1].toObject();
-    auto events = timeline["events"_L1].toArray();
+    auto timeline = root["timeline"_ls].toObject();
+    auto events = timeline["events"_ls].toArray();
    auto firstEvent = events[0].toObject();
-    firstEvent.insert("unsigned"_L1, QJsonObject{{"transaction_id"_L1, txnId}});
+    firstEvent.insert(QLatin1String("unsigned"), QJsonObject{{QLatin1String("transaction_id"), txnId}});
    events[0] = firstEvent;
-    timeline.insert("events"_L1, events);
-    root.insert("timeline"_L1, timeline);
+    timeline.insert("events"_ls, events);
+    root.insert("timeline"_ls, timeline);
    testSyncJson.setObject(root);
-    SyncRoomData roomData(u"@bob:kde.org"_s, JoinState::Join, testSyncJson.object());
+    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, testSyncJson.object());
    room->update(std::move(roomData));

    QCOMPARE(model->rowCount(), 1);
@@ -182,7 +174,7 @@ void TimelineMessageModelTest::pendingEvent()
    auto isPendingChanged = false;
    for (auto signal : spyChanged) {
        auto roles = signal.at(2).toList();
-        if (roles.contains(TimelineMessageModel::IsPendingRole)) {
+        if (roles.contains(MessageEventModel::IsPendingRole)) {
            isPendingChanged = true;
        }
    }
@@ -190,33 +182,33 @@ void TimelineMessageModelTest::pendingEvent()
 }

 // Make sure that the signals are disconnecting correctly when a room is switched.
-void TimelineMessageModelTest::disconnect()
+void MessageEventModelTest::disconnect()
 {
-    auto room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s);
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"));
    model->setRoom(room);

    QSignalSpy spy(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)));

    model->setRoom(nullptr);
-    room->syncNewEvents(u"test-messageventmodel-sync.json"_s);
+    room->syncNewEvents(QLatin1String("test-messageventmodel-sync.json"));

    QCOMPARE(spy.count(), 0);
 }

-void TimelineMessageModelTest::idToRow()
+void MessageEventModelTest::idToRow()
 {
-    auto room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-min-sync.json"_s);
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-min-sync.json"));
    model->setRoom(room);

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

-void TimelineMessageModelTest::cleanup()
+void MessageEventModelTest::cleanup()
 {
    delete model;
    model = nullptr;
    QCOMPARE(model, nullptr);
 }

-QTEST_MAIN(TimelineMessageModelTest)
-#include "timelinemessagemodeltest.moc"
+QTEST_MAIN(MessageEventModelTest)
+#include "messageeventmodeltest.moc"
--- a/autotests/neochatroomtest.cpp
+++ b/autotests/neochatroomtest.cpp
@@ -27,8 +27,8 @@ private Q_SLOTS:

 void NeoChatRoomTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
-    room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-min-sync.json"_s);
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), "test-min-sync.json"_ls);
 }

 void NeoChatRoomTest::eventTest()
--- a/autotests/pollhandlertest.cpp
+++ b/autotests/pollhandlertest.cpp
@@ -31,8 +31,8 @@ private Q_SLOTS:

 void PollHandlerTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
-    room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-pollhandlerstart-sync.json"_s);
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), "test-pollhandlerstart-sync.json"_ls);
 }

 // Basically don't crash.
@@ -41,32 +41,29 @@ void PollHandlerTest::nullObject()
    auto pollHandler = PollHandler();

    QCOMPARE(pollHandler.hasEnded(), false);
-    QCOMPARE(pollHandler.numAnswers(), 0);
+    QCOMPARE(pollHandler.answerCount(), 0);
    QCOMPARE(pollHandler.question(), QString());
-    QCOMPARE(pollHandler.kind(), PollKind::Disclosed);
+    QCOMPARE(pollHandler.options(), QJsonArray());
+    QCOMPARE(pollHandler.answers(), QJsonObject());
+    QCOMPARE(pollHandler.counts(), QJsonObject());
+    QCOMPARE(pollHandler.kind(), QString());
 }

 void PollHandlerTest::poll()
 {
    auto startEvent = eventCast<const PollStartEvent>(room->messageEvents().at(0).get());
-    auto pollHandler = PollHandler(room, startEvent->id());
+    auto pollHandler = PollHandler(room, startEvent);

-    QList<Quotient::EventContent::Answer> options = {EventContent::Answer{"option1"_L1, "option1"_L1}, EventContent::Answer{"option2"_L1, "option2"_L1}};
+    auto options = QJsonArray{QJsonObject{{"id"_ls, "option1"_ls}, {"org.matrix.msc1767.text"_ls, "option1"_ls}},
+                              QJsonObject{{"id"_ls, "option2"_ls}, {"org.matrix.msc1767.text"_ls, "option2"_ls}}};

-    const auto answer0 = pollHandler.answerAtRow(0);
-    const auto answer1 = pollHandler.answerAtRow(1);
    QCOMPARE(pollHandler.hasEnded(), false);
-    QCOMPARE(pollHandler.numAnswers(), 2);
-    QCOMPARE(pollHandler.question(), u"test"_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);
+    QCOMPARE(pollHandler.answerCount(), 0);
+    QCOMPARE(pollHandler.question(), QStringLiteral("test"));
+    QCOMPARE(pollHandler.options(), options);
+    QCOMPARE(pollHandler.answers(), QJsonObject());
+    QCOMPARE(pollHandler.counts(), QJsonObject());
+    QCOMPARE(pollHandler.kind(), QStringLiteral("org.matrix.msc3381.poll.disclosed"));
 }

 QTEST_GUILESS_MAIN(PollHandlerTest)
--- a/autotests/reactionmodeltest.cpp
+++ b/autotests/reactionmodeltest.cpp
@@ -9,7 +9,6 @@

 #include <Quotient/events/roommessageevent.h>

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

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

 private Q_SLOTS:
    void initTestCase();

+    void nullModel();
    void basicReaction();
    void newReaction();
 };

 void ReactionModelTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
-    room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-reactionmodel-sync.json"_s);
-    parentModel = new EventMessageContentModel(room, "123456"_L1);
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-reactionmodel-sync.json"));
+}
+
+void ReactionModelTest::nullModel()
+{
+    auto model = ReactionModel(nullptr, nullptr);
+
+    QCOMPARE(model.rowCount(), 0);
+    QCOMPARE(model.data(model.index(0), ReactionModel::TextContentRole), QVariant());
 }

 void ReactionModelTest::basicReaction()
 {
    auto event = eventCast<const RoomMessageEvent>(room->messageEvents().at(0).get());
-    auto model = ReactionModel(parentModel, event->id(), room);
+    auto model = ReactionModel(event, room);

    QCOMPARE(model.rowCount(), 1);
-    QCOMPARE(model.data(model.index(0), ReactionModel::TextContentRole), u"<span style=\"font-family: 'emoji';\">👍</span>"_s);
-    QCOMPARE(model.data(model.index(0), ReactionModel::ReactionRole), u"👍"_s);
-    QCOMPARE(model.data(model.index(0), ReactionModel::ToolTipRole), u"Alice Margatroid reacted with <span style=\"font-family: 'emoji';\">👍</span>"_s);
+    QCOMPARE(model.data(model.index(0), ReactionModel::TextContentRole), QStringLiteral("<span style=\"font-family: 'emoji';\">👍</span>"));
+    QCOMPARE(model.data(model.index(0), ReactionModel::ReactionRole), QStringLiteral("👍"));
+    QCOMPARE(model.data(model.index(0), ReactionModel::ToolTipRole),
+             QStringLiteral("Alice Margatroid reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
    QCOMPARE(model.data(model.index(0), ReactionModel::HasLocalMember), false);
 }

 void ReactionModelTest::newReaction()
 {
    auto event = eventCast<const RoomMessageEvent>(room->messageEvents().at(0).get());
-    auto model = new ReactionModel(parentModel, event->id(), room);
+    auto model = new ReactionModel(event, room);

    QCOMPARE(model->rowCount(), 1);
-    QCOMPARE(model->data(model->index(0), ReactionModel::ToolTipRole), u"Alice Margatroid reacted with <span style=\"font-family: 'emoji';\">👍</span>"_s);
+    QCOMPARE(model->data(model->index(0), ReactionModel::ToolTipRole),
+             QStringLiteral("Alice Margatroid reacted with <span style=\"font-family: 'emoji';\">👍</span>"));

    QSignalSpy spy(model, SIGNAL(modelReset()));

-    room->syncNewEvents(u"test-reactionmodel-extra-sync.json"_s);
+    room->syncNewEvents(QLatin1String("test-reactionmodel-extra-sync.json"));
    QCOMPARE(model->rowCount(), 2);
    QCOMPARE(spy.count(), 2); // Once for each of the 2 new reactions.
-    QCOMPARE(model->data(model->index(1), ReactionModel::ReactionRole), u"😆"_s);
+    QCOMPARE(model->data(model->index(1), ReactionModel::ReactionRole), QStringLiteral("😆"));
    QCOMPARE(model->data(model->index(0), ReactionModel::ToolTipRole),
-             u"Alice Margatroid and Bob reacted with <span style=\"font-family: 'emoji';\">👍</span>"_s);
+             QStringLiteral("Alice Margatroid and Bob reacted with <span style=\"font-family: 'emoji';\">👍</span>"));

    delete model;
 }
--- a/autotests/roommanagertest.cpp
+++ b/autotests/roommanagertest.cpp
@@ -1,141 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include <QObject>
-#include <QSignalSpy>
-#include <QTest>
-#include <QVariantList>
-
-#include "accountmanager.h"
-#include "models/actionsmodel.h"
-#include "roommanager.h"
-
-#include "server.h"
-#include "testutils.h"
-
-using namespace Quotient;
-
-class RoomManagerTest : public QObject
-{
-    Q_OBJECT
-
-private:
-    NeoChatConnection *connection = nullptr;
-    NeoChatRoom *room = nullptr;
-
-    Server server;
-
-private Q_SLOTS:
-    void initTestCase();
-    void testMaximizeMedia();
-    void testResolveMatrixLinks();
-};
-
-void RoomManagerTest::initTestCase()
-{
-    Connection::setRoomType<NeoChatRoom>();
-    server.start();
-    KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));
-    auto accountManager = new AccountManager(true);
-    QSignalSpy spy(accountManager, &AccountManager::connectionAdded);
-    connection = dynamic_cast<NeoChatConnection *>(accountManager->accounts()->front());
-    QVERIFY(connection);
-    auto roomId = server.createRoom(u"@user:localhost:1234"_s);
-
-    QSignalSpy syncSpy(connection, &Connection::syncDone);
-    // We need to wait for two syncs, as the next one won't have the changes yet
-    QVERIFY(syncSpy.wait());
-    QVERIFY(syncSpy.wait());
-    room = dynamic_cast<NeoChatRoom *>(connection->room(roomId));
-    QVERIFY(room);
-    RoomManager::instance().setConnection(connection);
-    QSignalSpy roomSpy(&RoomManager::instance(), &RoomManager::currentRoomChanged);
-    RoomManager::instance().resolveResource(room->id());
-    QVERIFY(roomSpy.size() > 0);
-}
-
-void RoomManagerTest::testMaximizeMedia()
-{
-    QSignalSpy spy(&RoomManager::instance(), &RoomManager::showMaximizedMedia);
-    QSignalSpy syncSpy(connection, &Connection::syncDone);
-
-    QTest::ignoreMessage(QtMsgType::QtWarningMsg, "Tried to open media for empty event id");
-    RoomManager::instance().maximizeMedia(QString());
-    QVERIFY(!spy.wait(10));
-
-    QTest::ignoreMessage(QtMsgType::QtWarningMsg, "Tried to open media for unknown event id \"Doesn't exist\"");
-    RoomManager::instance().maximizeMedia(u"Doesn't exist"_s);
-    QVERIFY(!spy.wait(10));
-
-    const auto eventWithoutMedia = server.sendEvent(room->id(),
-                                                    u"m.room.message"_s,
-                                                    QJsonObject({
-                                                        {u"body"_s, u"Foo"_s},
-                                                        {u"format"_s, u"org.matrix.custom.html"_s},
-                                                        {u"formatted_body"_s, u"Foo"_s},
-                                                        {u"msgtype"_s, u"m.text"_s},
-                                                    }));
-    QVERIFY(syncSpy.wait());
-    QVERIFY(syncSpy.wait());
-    QTest::ignoreMessage(QtMsgType::QtWarningMsg, u"Tried to open media for unknown event id \"%1\""_s.arg(eventWithoutMedia).toLatin1().data());
-    RoomManager::instance().maximizeMedia(eventWithoutMedia);
-    QVERIFY(!spy.wait(10));
-
-    // NOTE: This is supposed to test that maximizing pending media works correctly. This probably doesn't work in the UI yet, but at least the backend supports
-    // it. If the server ever learns how to process events, this becomes pointless and we need to find a way of preventing *these* events from arriving
-    auto pendingEventWithoutMedia = room->postText(u"Hello"_s);
-    QTest::ignoreMessage(QtMsgType::QtWarningMsg, u"Tried to open media for unknown event id \"%1\""_s.arg(pendingEventWithoutMedia).toLatin1().data());
-    RoomManager::instance().maximizeMedia(pendingEventWithoutMedia);
-    QVERIFY(!spy.wait(10));
-
-    const auto eventWithMedia = server.sendEvent(room->id(),
-                                                 u"m.room.message"_s,
-                                                 QJsonObject({
-                                                     {u"body"_s, u"Foo"_s},
-                                                     {u"filename"_s, u"foo.jpg"_s},
-                                                     {u"info"_s,
-                                                      QJsonObject{
-                                                          {u"h"_s, 1000},
-                                                          {u"w"_s, 2000},
-                                                          {u"size"_s, 10000},
-                                                          {u"mimetype"_s, u"image/png"_s},
-                                                      }},
-                                                     {u"msgtype"_s, u"m.image"_s},
-                                                     {u"url"_s, u"mxc://foo.bar/asdf"_s},
-                                                 }));
-    QVERIFY(syncSpy.wait());
-    QVERIFY(syncSpy.wait());
-    QVERIFY(syncSpy.wait());
-    RoomManager::instance().maximizeMedia(eventWithMedia);
-    QVERIFY(spy.size() == 1);
-    QVERIFY(spy[0][0] == 0);
-
-    auto pendingEventWithMedia = room->postJson(u"m.room.message"_s,
-                                                QJsonObject({
-                                                    {u"body"_s, u"Foo"_s},
-                                                    {u"filename"_s, u"foo.jpg"_s},
-                                                    {u"info"_s,
-                                                     QJsonObject{
-                                                         {u"h"_s, 1000},
-                                                         {u"w"_s, 2000},
-                                                         {u"size"_s, 10000},
-                                                         {u"mimetype"_s, u"image/png"_s},
-                                                     }},
-                                                    {u"msgtype"_s, u"m.image"_s},
-                                                    {u"url"_s, u"mxc://foo.bar/asdf"_s},
-                                                }));
-    RoomManager::instance().maximizeMedia(pendingEventWithMedia);
-    QVERIFY(spy.size() == 2);
-    QVERIFY(spy[1][0] == 0);
-}
-
-void RoomManagerTest::testResolveMatrixLinks()
-{
-    // Test if resolving a non-joined room will bring up the confirmation dialog.
-    const QSignalSpy askToJoinSpy(&RoomManager::instance(), &RoomManager::askJoinRoom);
-    RoomManager::instance().resolveResource(QStringLiteral("matrix:r/testbuild:matrix.org"), QStringLiteral("join"));
-    QTRY_COMPARE(askToJoinSpy.size(), 1);
-}
-
-QTEST_MAIN(RoomManagerTest)
-#include "roommanagertest.moc"
--- a/autotests/server.cpp
+++ b/autotests/server.cpp
@@ -1,371 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#include "server.h"
-
-#include <QFile>
-#include <QHttpServerResponder>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QNetworkReply>
-#include <QSslCertificate>
-#include <QSslKey>
-#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) {
-                       Changes changes;
-                       changes.invitations += Changes::InviteUser{
-                           .userId = QJsonDocument::fromJson(request.body()).object()[u"user_id"_s].toString(),
-                           .roomId = roomId,
-                       };
-                       m_state += changes;
-                       responder.write(QJsonDocument(QJsonObject{}), QHttpServerResponder::StatusCode::Ok);
-                   });
-
-    m_server.route(u"/_matrix/client/r0/sync"_s, QHttpServerRequest::Method::Get, this, &Server::sync);
-
-    QSslConfiguration config;
-    QFile key(QStringLiteral(DATA_DIR) + u"/localhost.key"_s);
-    void(key.open(QFile::ReadOnly));
-    config.setPrivateKey(QSslKey(&key, QSsl::Rsa));
-    config.setLocalCertificate(QSslCertificate::fromPath(QStringLiteral(DATA_DIR) + u"/localhost.crt"_s).front());
-    m_sslServer.setSslConfiguration(config);
-    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)
-{
-    const auto roomId = generateRoomId();
-    Changes changes;
-    changes.newRooms += Changes::NewRoom{
-        .initialMembers = {matrixId},
-        .roomId = {roomId},
-        .tags = {},
-    };
-    m_state += changes;
-    return roomId;
-}
-
-void Server::inviteUser(const QString &roomId, const QString &matrixId)
-{
-    Changes changes;
-    changes.invitations += Changes::InviteUser{
-        .userId = matrixId,
-        .roomId = roomId,
-    };
-    m_state += changes;
-}
-
-void Server::banUser(const QString &roomId, const QString &matrixId)
-{
-    Changes changes;
-    changes.bans += Changes::BanUser{
-        .userId = matrixId,
-        .roomId = roomId,
-    };
-    m_state += changes;
-}
-
-void Server::joinUser(const QString &roomId, const QString &matrixId)
-{
-    Changes changes;
-    changes.joins += Changes::JoinUser{
-        .userId = matrixId,
-        .roomId = roomId,
-    };
-    m_state += changes;
-}
-
-QString Server::createServerNoticesRoom(const QString &matrixId)
-{
-    const auto roomId = generateRoomId();
-    Changes changes;
-    changes.newRooms += Changes::NewRoom{
-        .initialMembers = {matrixId},
-        .roomId = {roomId},
-        .tags = {u"m.server_notice"_s},
-    };
-    m_state += changes;
-    return roomId;
-}
-
-QString Server::sendEvent(const QString &roomId, const QString &eventType, const QJsonObject &content)
-{
-    Changes changes;
-    const auto eventId = generateEventId();
-    changes.events += Changes::Event{
-        .fullJson = QJsonObject{{u"type"_s, eventType},
-                                {u"content"_s, content},
-                                {u"sender"_s, u"@foo:server.com"_s},
-                                {u"event_id"_s, eventId},
-                                {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                                {u"room_id"_s, roomId}},
-    };
-    m_state += changes;
-    return eventId;
-}
-
-void Server::sync(const QHttpServerRequest &request, QHttpServerResponder &responder)
-{
-    QJsonObject joinRooms;
-    auto token = request.query().queryItemValue(u"since"_s).toInt();
-
-    for (const auto &change : m_state.mid(token)) {
-        for (const auto &newRoom : change.newRooms) {
-            QJsonArray stateEvents;
-            stateEvents += QJsonObject{
-                {u"content"_s, QJsonObject{{u"room_version"_s, u"11"_s}}},
-                {u"event_id"_s, generateEventId()},
-                {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                {u"room_id"_s, newRoom.roomId},
-                {u"sender"_s, newRoom.initialMembers[0]},
-                {u"state_key"_s, QString()},
-                {u"type"_s, u"m.room.create"_s},
-                {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-            };
-            for (const auto &member : newRoom.initialMembers) {
-                stateEvents += QJsonObject{
-                    {u"content"_s, QJsonObject{{u"displayname"_s, u"User"_s}, {u"membership"_s, u"join"_s}}},
-                    {u"event_id"_s, generateEventId()},
-                    {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                    {u"room_id"_s, newRoom.roomId},
-                    {u"sender"_s, member},
-                    {u"state_key"_s, member},
-                    {u"type"_s, u"m.room.member"_s},
-                    {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-                };
-            }
-
-            auto room = QJsonObject{{u"state"_s, QJsonObject{{u"events"_s, stateEvents}}}};
-
-            QJsonArray roomAccountData;
-            QJsonObject tags;
-            for (const auto &tag : newRoom.tags) {
-                tags[tag] = QJsonObject();
-            }
-            if (!tags.empty()) {
-                roomAccountData += QJsonObject{{u"type"_s, u"m.tag"_s}, {u"content"_s, QJsonObject{{u"tags"_s, tags}}}};
-            }
-
-            if (roomAccountData.size() > 0) {
-                room[u"account_data"] = QJsonObject{{u"events"_s, roomAccountData}};
-            }
-
-            joinRooms[newRoom.roomId] = room;
-        }
-    }
-
-    for (const auto &change : m_state.mid(token)) {
-        for (const auto &invitation : change.invitations) {
-            // TODO: The invitation could be for a room we haven't joined yet. Shouldn't be necessary for now, though.
-            auto stateEvents = joinRooms[invitation.roomId][u"state"_s][u"events"_s].toArray();
-            stateEvents += QJsonObject{
-                {u"content"_s, QJsonObject{{u"displayname"_s, u"User"_s}, {u"membership"_s, u"invite"_s}}},
-                {u"event_id"_s, generateEventId()},
-                {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                {u"room_id"_s, invitation.roomId},
-                {u"sender"_s, u"@user:localhost:1234"_s},
-                {u"state_key"_s, invitation.userId},
-                {u"type"_s, u"m.room.member"_s},
-                {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-            };
-            if (joinRooms.contains(invitation.roomId)) {
-                auto room = joinRooms[invitation.roomId].toObject();
-                room[u"state"_s] = QJsonObject{{u"events"_s, stateEvents}};
-                joinRooms[invitation.roomId] = room;
-            } else {
-                joinRooms[invitation.roomId] = QJsonObject{{u"state"_s,
-                                                            QJsonObject{
-                                                                {u"events"_s, stateEvents},
-                                                            }}};
-            }
-        }
-    }
-
-    for (const auto &change : m_state.mid(token)) {
-        for (const auto &ban : change.bans) {
-            // TODO: The ban could be for a room we haven't joined yet. Shouldn't be necessary for now, though.
-            auto stateEvents = joinRooms[ban.roomId][u"state"_s][u"events"_s].toArray();
-            stateEvents += QJsonObject{
-                {u"content"_s, QJsonObject{{u"displayname"_s, u"User"_s}, {u"membership"_s, u"ban"_s}}},
-                {u"event_id"_s, generateEventId()},
-                {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                {u"room_id"_s, ban.roomId},
-                {u"sender"_s, u"@user:localhost:1234"_s},
-                {u"state_key"_s, ban.userId},
-                {u"type"_s, u"m.room.member"_s},
-                {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-            };
-            if (joinRooms.contains(ban.roomId)) {
-                auto room = joinRooms[ban.roomId].toObject();
-                room[u"state"_s] = QJsonObject{{u"events"_s, stateEvents}};
-                joinRooms[ban.roomId] = room;
-            } else {
-                joinRooms[ban.roomId] = QJsonObject{{u"state"_s,
-                                                     QJsonObject{
-                                                         {u"events"_s, stateEvents},
-                                                     }}};
-            }
-        }
-    }
-
-    for (const auto &change : m_state.mid(token)) {
-        for (const auto &join : change.joins) {
-            // TODO: The join could be for a room we haven't joined yet. Shouldn't be necessary for now, though.
-            auto stateEvents = joinRooms[join.roomId][u"state"_s][u"events"_s].toArray();
-            stateEvents += QJsonObject{
-                {u"content"_s, QJsonObject{{u"displayname"_s, u"User"_s}, {u"membership"_s, u"join"_s}}},
-                {u"event_id"_s, generateEventId()},
-                {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
-                {u"room_id"_s, join.roomId},
-                {u"sender"_s, u"@user:localhost:1234"_s},
-                {u"state_key"_s, join.userId},
-                {u"type"_s, u"m.room.member"_s},
-                {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
-            };
-            if (joinRooms.contains(join.roomId)) {
-                auto room = joinRooms[join.roomId].toObject();
-                room[u"state"_s] = QJsonObject{{u"events"_s, stateEvents}};
-                joinRooms[join.roomId] = room;
-            } else {
-                joinRooms[join.roomId] = QJsonObject{{u"state"_s,
-                                                      QJsonObject{
-                                                          {u"events"_s, stateEvents},
-                                                      }}};
-            }
-        }
-    }
-
-    for (const auto &change : m_state.mid(token)) {
-        for (const auto &event : change.events) {
-            // TODO the room might be in a different join state.
-            auto timeline = joinRooms[event.fullJson[u"room_id"_s].toString()][u"timeline"_s][u"events"_s].toArray();
-            timeline += event.fullJson;
-            if (joinRooms.contains(event.fullJson[u"room_id"_s].toString())) {
-                auto room = joinRooms[event.fullJson[u"room_id"_s].toString()].toObject();
-                room[u"timeline"_s] = QJsonObject{{u"events"_s, timeline}};
-                joinRooms[event.fullJson[u"room_id"_s].toString()] = room;
-            } else {
-                joinRooms[event.fullJson[u"room_id"_s].toString()] = QJsonObject{
-                    {u"timeline"_s, QJsonObject{{u"events"_s, timeline}}},
-                };
-            }
-        }
-    }
-
-    QJsonObject syncData = {
-        // {u"account_data"_s, QJsonObject {}},
-        // {u"presence"_s, QJsonObject {}},
-        {u"next_batch"_s, QString::number(m_state.size())},
-    };
-
-    QJsonObject rooms;
-    if (!joinRooms.isEmpty()) {
-        rooms[u"join"_s] = joinRooms;
-    }
-
-    if (!rooms.empty()) {
-        syncData[u"rooms"_s] = rooms;
-    }
-
-    qWarning() << syncData;
-    responder.write(QJsonDocument(syncData), QHttpServerResponder::StatusCode::Ok);
-}
--- a/autotests/server.h
+++ b/autotests/server.h
@@ -1,78 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#include <QHttpServer>
-#include <QJsonObject>
-#include <QSslServer>
-
-struct Changes {
-    struct NewRoom {
-        QStringList initialMembers;
-        QString roomId;
-        QStringList tags;
-    };
-    QList<NewRoom> newRooms;
-
-    struct InviteUser {
-        QString userId;
-        QString roomId;
-    };
-    QList<InviteUser> invitations;
-
-    struct BanUser {
-        QString userId;
-        QString roomId;
-    };
-    QList<BanUser> bans;
-
-    struct JoinUser {
-        QString userId;
-        QString roomId;
-    };
-    QList<JoinUser> joins;
-
-    struct Event {
-        QJsonObject fullJson;
-    };
-    QList<Event> events;
-};
-
-struct RoomData {
-    QStringList members;
-    QString id;
-    QStringList tags;
-};
-
-class Server : public QObject
-{
-    Q_OBJECT
-
-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;
-
-    void sync(const QHttpServerRequest &request, QHttpServerResponder &responder);
-
-    QList<Changes> m_state;
-};
--- a/autotests/servernoticestest.cpp
+++ b/autotests/servernoticestest.cpp
@@ -1,87 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include <QObject>
-#include <QSignalSpy>
-#include <QTest>
-
-#include <KLocalizedString>
-
-#include <Quotient/connection.h>
-#include <Quotient/eventstats.h>
-#include <Quotient/quotient_common.h>
-#include <Quotient/syncdata.h>
-
-#include "accountmanager.h"
-#include "neochatroom.h"
-#include "roommanager.h"
-#include "server.h"
-
-#include "testutils.h"
-
-using namespace Quotient;
-
-class ServerNoticesTest : public QObject
-{
-    Q_OBJECT
-
-private:
-    NeoChatConnection *connection = nullptr;
-    Server server;
-
-private Q_SLOTS:
-    void initTestCase();
-    void test();
-};
-
-void ServerNoticesTest::initTestCase()
-{
-    Connection::setRoomType<NeoChatRoom>();
-    server.start();
-    KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));
-    auto accountManager = new AccountManager(true);
-    QSignalSpy spy(accountManager, &AccountManager::connectionAdded);
-    connection = dynamic_cast<NeoChatConnection *>(accountManager->accounts()->front());
-    QVERIFY(connection);
-    auto roomId = server.createRoom(u"@user:localhost:1234"_s);
-    RoomManager::instance().setConnection(connection);
-
-    QSignalSpy syncSpy(connection, &Connection::syncDone);
-    // We need to wait for two syncs, as the next one won't have the changes yet
-    QVERIFY(syncSpy.wait());
-    QVERIFY(syncSpy.wait());
-    auto room = dynamic_cast<NeoChatRoom *>(connection->room(roomId));
-    QVERIFY(room);
-}
-
-void ServerNoticesTest::test()
-{
-    auto roomTreeModel = RoomManager::instance().roomTreeModel();
-    QCOMPARE(roomTreeModel->rowCount(roomTreeModel->index(NeoChatRoomType::ServerNotice, 0)), 0);
-    auto sortFilterRoomTreeModel = RoomManager::instance().sortFilterRoomTreeModel();
-    const auto roomId = server.createServerNoticesRoom(u"@user:localhost:1234"_s);
-    QSignalSpy syncSpy(connection, &Connection::syncDone);
-    QVERIFY(syncSpy.wait());
-    QVERIFY(syncSpy.wait());
-    const auto room = dynamic_cast<NeoChatRoom *>(connection->room(roomId));
-    QVERIFY(connection->room(roomId)->isServerNoticeRoom());
-    QCOMPARE(roomTreeModel->rowCount(roomTreeModel->index(NeoChatRoomType::ServerNotice, 0)), 1);
-    QCOMPARE(sortFilterRoomTreeModel->mapFromSource(roomTreeModel->indexForRoom(room)).parent().row(), 1 /* Below the normal room */);
-    server.sendEvent(roomId,
-                     u"m.room.message"_s,
-                     QJsonObject{
-                         {u"body"_s, u"Foo"_s},
-                         {u"format"_s, u"org.matrix.custom.html"_s},
-                         {u"formatted_body"_s, u"Foo"_s},
-                         {u"msgtype"_s, u"m.text"_s},
-                     });
-    QVERIFY(syncSpy.wait());
-    QVERIFY(syncSpy.wait());
-    sortFilterRoomTreeModel->invalidate();
-    QCOMPARE(sortFilterRoomTreeModel->mapFromSource(roomTreeModel->indexForRoom(room)).parent().row(), 0);
-    room->markAllMessagesAsRead();
-    QCOMPARE(sortFilterRoomTreeModel->mapFromSource(roomTreeModel->indexForRoom(room)).parent().row(), 1 /* Below the normal room */);
-}
-
-QTEST_GUILESS_MAIN(ServerNoticesTest)
-#include "servernoticestest.moc"
--- a/autotests/testutils.h
+++ b/autotests/testutils.h
@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL

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

@@ -32,8 +31,8 @@ public:
    {
        if (!syncFileName.isEmpty()) {
            QFile testSyncFile;
-            testSyncFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + syncFileName);
-            Q_UNUSED(testSyncFile.open(QIODevice::ReadOnly));
+            testSyncFile.setFileName(QLatin1String(DATA_DIR) + u'/' + syncFileName);
+            testSyncFile.open(QIODevice::ReadOnly);
            const auto testSyncJson = QJsonDocument::fromJson(testSyncFile.readAll());
            Quotient::SyncRoomData roomData(id(), Quotient::JoinState::Join, testSyncJson.object());
            update(std::move(roomData));
@@ -46,8 +45,8 @@ inline Quotient::event_ptr_tt<EventT> loadEventFromFile(const QString &eventFile
 {
    if (!eventFileName.isEmpty()) {
        QFile testEventFile;
-        testEventFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + eventFileName);
-        Q_UNUSED(testEventFile.open(QIODevice::ReadOnly));
+        testEventFile.setFileName(QLatin1String(DATA_DIR) + u'/' + eventFileName);
+        testEventFile.open(QIODevice::ReadOnly);
        auto testSyncJson = QJsonDocument::fromJson(testEventFile.readAll()).object();
        return Quotient::loadEvent<EventT>(testSyncJson);
    }
--- a/autotests/texthandlertest.cpp
+++ b/autotests/texthandlertest.cpp
@@ -8,8 +8,7 @@

 #include <Quotient/quotient_common.h>
 #include <Quotient/syncdata.h>
-
-#include <Kirigami/Platform/PlatformTheme>
+#include <qnamespace.h>

 #include "enums/messagecomponenttype.h"
 #include "models/customemojimodel.h"
@@ -34,10 +33,6 @@ private Q_SLOTS:
    void stripDisallowedTags();
    void stripDisallowedAttributes();
    void emptyCodeTags();
-    void addStyle_data();
-    void addStyle();
-    void dontAddStyle_data();
-    void dontAddStyle();

    void sendSimpleStringCase();
    void sendSingleParaMarkup();
@@ -48,8 +43,6 @@ private Q_SLOTS:
    void sendCustomEmoji();
    void sendCustomEmojiCode_data();
    void sendCustomEmojiCode();
-    void sendCustomTags_data();
-    void sendCustomTags();

    void receiveSpacelessSelfClosingTag();
    void receiveStripReply();
@@ -65,63 +58,53 @@ private Q_SLOTS:
    void receiveRichStrikethrough();
    void receiveRichtextIn();
    void receiveRichMxcUrl();
-    void receiveRichPlainUrl_data();
    void receiveRichPlainUrl();
    void receiveRichEdited_data();
    void receiveRichEdited();
    void receiveLineSeparator();
    void receiveRichCodeUrl();
-    void receiveRichColor();

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

 void TextHandlerTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
-    connection->setAccountData(u"im.ponies.user_emotes"_s,
-                               QJsonObject{{"images"_L1,
-                                            QJsonObject{{"test"_L1,
-                                                         QJsonObject{{"body"_L1, "Test custom emoji"_L1},
-                                                                     {"url"_L1, "mxc://example.org/test"_L1},
-                                                                     {"usage"_L1, QJsonArray{"emoticon"_L1}}}}}}});
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    connection->setAccountData("im.ponies.user_emotes"_ls,
+                               QJsonObject{{"images"_ls,
+                                            QJsonObject{{"test"_ls,
+                                                         QJsonObject{{"body"_ls, "Test custom emoji"_ls},
+                                                                     {"url"_ls, "mxc://example.org/test"_ls},
+                                                                     {"usage"_ls, QJsonArray{"emoticon"_ls}}}}}}});
    CustomEmojiModel::instance().setConnection(static_cast<NeoChatConnection *>(connection));

-    room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-texthandler-sync.json"_s);
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-texthandler-sync.json"));
 }

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

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString1);

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

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

 void TextHandlerTest::stripDisallowedTags()
 {
-    const QString testInputString = u"<p>Allowed</p> <span>Allowed</span> <body>Disallowed</body>"_s;
-    const QString testOutputString = u"<p>Allowed</p> <span>Allowed</span> Disallowed"_s;
+    const QString testInputString = QStringLiteral("<p>Allowed</p> <span>Allowed</span> <body>Disallowed</body>");
+    const QString testOutputString = QStringLiteral("<p>Allowed</p> <span>Allowed</span> Disallowed");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -132,8 +115,8 @@ void TextHandlerTest::stripDisallowedTags()

 void TextHandlerTest::stripDisallowedAttributes()
 {
-    const QString testInputString = u"<p style=\"font-size:50px;\" color=#FFFFFF>Test</p>"_s;
-    const QString testOutputString = u"Test"_s;
+    const QString testInputString = QStringLiteral("<p style=\"font-size:50px;\" color=#FFFFFF>Test</p>");
+    const QString testOutputString = QStringLiteral("Test");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -148,8 +131,8 @@ void TextHandlerTest::stripDisallowedAttributes()
 */
 void TextHandlerTest::emptyCodeTags()
 {
-    const QString testInputString = u"<pre><code></code></pre>"_s;
-    const QString testOutputString = u"<pre><code></code></pre>"_s;
+    const QString testInputString = QStringLiteral("<pre><code></code></pre>");
+    const QString testOutputString = QStringLiteral("<pre><code></code></pre>");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -158,60 +141,10 @@ void TextHandlerTest::emptyCodeTags()
    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
 }

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

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -221,10 +154,11 @@ void TextHandlerTest::sendSimpleStringCase()

 void TextHandlerTest::sendSingleParaMarkup()
 {
-    const QString testInputString =
-        u"Text para with **bold**, *italic*, [link](https://kde.org), ![image](mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e), `inline code`."_s;
-    const QString testOutputString =
-        u"Text para with <strong>bold</strong>, <em>italic</em>, <a href=\"https://kde.org\">link</a>, <img src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e\" alt=\"image\">, <code>inline code</code>."_s;
+    const QString testInputString = QStringLiteral(
+        "Text para with **bold**, *italic*, [link](https://kde.org), ![image](mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e), `inline code`.");
+    const QString testOutputString = QStringLiteral(
+        "Text para with <strong>bold</strong>, <em>italic</em>, <a href=\"https://kde.org\">link</a>, <img "
+        "src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e\" alt=\"image\">, <code>inline code</code>.");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -235,9 +169,11 @@ void TextHandlerTest::sendSingleParaMarkup()
 void TextHandlerTest::sendMultipleSectionMarkup()
 {
    const QString testInputString =
-        u"Text para\n> blockquote\n* List 1\n* List 2\n1. one\n2. two\n# Heading 1\n## Heading 2\nhorizontal rule\n\n---\n```\ncodeblock\n```"_s;
-    const QString testOutputString =
-        u"<p>Text para</p>\n<blockquote>\n<p>blockquote</p>\n</blockquote>\n<ul>\n<li>List 1</li>\n<li>List 2</li>\n</ul>\n<ol>\n<li>one</li>\n<li>two</li>\n</ol>\n<h1>Heading 1</h1>\n<h2>Heading 2</h2>\n<p>horizontal rule</p>\n<hr>\n<pre><code>codeblock\n</code></pre>"_s;
+        QStringLiteral("Text para\n> blockquote\n* List 1\n* List 2\n1. one\n2. two\n# Heading 1\n## Heading 2\nhorizontal rule\n\n---\n```\ncodeblock\n```");
+    const QString testOutputString = QStringLiteral(
+        "<p>Text para</p>\n<blockquote>\n<p>blockquote</p>\n</blockquote>\n<ul>\n<li>List 1</li>\n<li>List "
+        "2</li>\n</ul>\n<ol>\n<li>one</li>\n<li>two</li>\n</ol>\n<h1>Heading 1</h1>\n<h2>Heading 2</h2>\n<p>horizontal "
+        "rule</p>\n<hr>\n<pre><code>codeblock\n</code></pre>");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -247,8 +183,8 @@ void TextHandlerTest::sendMultipleSectionMarkup()

 void TextHandlerTest::sendBadLinks()
 {
-    const QString testInputString = u"[link](kde.org), ![image](https://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e)"_s;
-    const QString testOutputString = u"<a>link</a>, <img alt=\"image\">"_s;
+    const QString testInputString = QStringLiteral("[link](kde.org), ![image](https://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e)");
+    const QString testOutputString = QStringLiteral("<a>link</a>, <img alt=\"image\">");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -261,9 +197,9 @@ void TextHandlerTest::sendBadLinks()
 */
 void TextHandlerTest::sendEscapeCode()
 {
-    const QString testInputString = u"```\n<p>Test <span style=\"font-size:50px;\">some</span> code</p>\n```"_s;
+    const QString testInputString = QStringLiteral("```\n<p>Test <span style=\"font-size:50px;\">some</span> code</p>\n```");
    const QString testOutputString =
-        u"<pre><code>&lt;p&gt;Test &lt;span style=&quot;font-size:50px;&quot;&gt;some&lt;/span&gt; code&lt;/p&gt;\n</code></pre>"_s;
+        QStringLiteral("<pre><code>&lt;p&gt;Test &lt;span style=&quot;font-size:50px;&quot;&gt;some&lt;/span&gt; code&lt;/p&gt;\n</code></pre>");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -273,8 +209,8 @@ void TextHandlerTest::sendEscapeCode()

 void TextHandlerTest::sendCodeClass()
 {
-    const QString testInputString = u"```html\nsome code\n```\n<pre><code class=\"code-underline\">some more code</code></pre>"_s;
-    const QString testOutputString = u"<pre><code class=\"language-html\">some code\n</code></pre>\n<pre><code>some more code</code></pre>"_s;
+    const QString testInputString = QStringLiteral("```html\nsome code\n```\n<pre><code class=\"code-underline\">some more code</code></pre>");
+    const QString testOutputString = QStringLiteral("<pre><code class=\"language-html\">some code\n</code></pre>\n<pre><code>some more code</code></pre>");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -284,9 +220,9 @@ void TextHandlerTest::sendCodeClass()

 void TextHandlerTest::sendCustomEmoji()
 {
-    const QString testInputString = u":test:"_s;
+    const QString testInputString = QStringLiteral(":test:");
    const QString testOutputString =
-        u"<img data-mx-emoticon=\"\" src=\"mxc://example.org/test\" alt=\":test:\" title=\":test:\" height=\"32\" vertical-align=\"middle\" />"_s;
+        QStringLiteral("<img data-mx-emoticon=\"\" src=\"mxc://example.org/test\" alt=\":test:\" title=\":test:\" height=\"32\" vertical-align=\"middle\" />");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -299,8 +235,8 @@ void TextHandlerTest::sendCustomEmojiCode_data()
    QTest::addColumn<QString>("testInputString");
    QTest::addColumn<QString>("testOutputString");

-    QTest::newRow("inline") << u"`:test:`"_s << u"<code>:test:</code>"_s;
-    QTest::newRow("block") << u"```\n:test:\n```"_s << u"<pre><code>:test:\n</code></pre>"_s;
+    QTest::newRow("inline") << QStringLiteral("`:test:`") << QStringLiteral("<code>:test:</code>");
+    QTest::newRow("block") << QStringLiteral("```\n:test:\n```") << QStringLiteral("<pre><code>:test:\n</code></pre>");
 }

 // Custom emojis in code blocks should be left alone.
@@ -315,45 +251,11 @@ 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;
-    const QString testRichOutputString = u"Test...<br/>...ing"_s;
-    const QString testPlainOutputString = u"Test...\n...ing"_s;
+    const QString testInputString = QStringLiteral("Test...<br/>...ing");
+    const QString testRichOutputString = QStringLiteral("Test...<br/>...ing");
+    const QString testPlainOutputString = QStringLiteral("Test...\n...ing");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -364,9 +266,10 @@ void TextHandlerTest::receiveSpacelessSelfClosingTag()

 void TextHandlerTest::receiveStripReply()
 {
-    const QString testInputString =
-        u"<mx-reply><blockquote><a href=\"https://matrix.to/#/!somewhere:example.org/$event:example.org\">In reply to</a><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a><br />Message replied to.</blockquote></mx-reply>Reply message."_s;
-    const QString testOutputString = u"Reply message."_s;
+    const QString testInputString = QStringLiteral(
+        "<mx-reply><blockquote><a href=\"https://matrix.to/#/!somewhere:example.org/$event:example.org\">In reply to</a><a "
+        "href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a><br />Message replied to.</blockquote></mx-reply>Reply message.");
+    const QString testOutputString = QStringLiteral("Reply message.");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -380,10 +283,10 @@ void TextHandlerTest::receiveRichInPlainOut_data()
    QTest::addColumn<QString>("testInputString");
    QTest::addColumn<QString>("testOutputString");

-    QTest::newRow("ampersand") << u"a &amp; b"_s << u"a & b"_s;
-    QTest::newRow("quote") << u"&quot;a and b&quot;"_s << u"\"a and b\""_s;
-    QTest::newRow("new line") << u"new<br>line"_s << u"new\nline"_s;
-    QTest::newRow("unescape") << u"can&#x27;t"_s << u"can't"_s;
+    QTest::newRow("ampersand") << QStringLiteral("a &amp; b") << QStringLiteral("a & b");
+    QTest::newRow("quote") << QStringLiteral("&quot;a and b&quot;") << QStringLiteral("\"a and b\"");
+    QTest::newRow("new line") << QStringLiteral("new<br>line") << QStringLiteral("new\nline");
+    QTest::newRow("unescape") << QStringLiteral("can&#x27;t") << QStringLiteral("can't");
 }

 void TextHandlerTest::receiveRichInPlainOut()
@@ -399,14 +302,13 @@ void TextHandlerTest::receiveRichInPlainOut()

 void TextHandlerTest::receivePlainTextIn()
 {
-    const QString testInputString = u"<plain text in tag bracket>\nTest link https://kde.org."_s;
-    const QString testOutputStringRich =
-        u"&lt;plain text in tag bracket&gt;<br>Test link <a href=\"https://kde.org\" style=\"text-decoration: none;\">https://kde.org</a>."_s;
-    QString testOutputStringPlain = u"<plain text in tag bracket>\nTest link https://kde.org."_s;
+    const QString testInputString = QStringLiteral("<plain text in tag bracket>\nTest link https://kde.org.");
+    const QString testOutputStringRich = QStringLiteral("&lt;plain text in tag bracket&gt;<br>Test link <a href=\"https://kde.org\">https://kde.org</a>.");
+    QString testOutputStringPlain = QStringLiteral("<plain text in tag bracket>\nTest link https://kde.org.");

    // Make sure quotes are maintained in a plain string.
-    const QString testInputString2 = u"last line is \"Time to switch to a new topic.\""_s;
-    const QString testOutputString2 = u"last line is \"Time to switch to a new topic.\""_s;
+    const QString testInputString2 = QStringLiteral("last line is \"Time to switch to a new topic.\"");
+    const QString testOutputString2 = QStringLiteral("last line is \"Time to switch to a new topic.\"");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -421,12 +323,12 @@ void TextHandlerTest::receivePlainTextIn()

 void TextHandlerTest::receiveStripNewlines()
 {
-    const QString testInputStringPlain = u"Test\nmany\nnew\nlines."_s;
-    const QString testInputStringRich = u"Test<br>many<br />new<br>lines."_s;
-    const QString testOutputString = u"Test many new lines."_s;
+    const QString testInputStringPlain = QStringLiteral("Test\nmany\nnew\nlines.");
+    const QString testInputStringRich = QStringLiteral("Test<br>many<br />new<br>lines.");
+    const QString testOutputString = QStringLiteral("Test many new lines.");

-    const QString testInputStringPlain2 = u"* List\n* Items"_s;
-    const QString testOutputString2 = u"List Items"_s;
+    const QString testInputStringPlain2 = QStringLiteral("* List\n* Items");
+    const QString testOutputString2 = QStringLiteral("List Items");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputStringPlain);
@@ -448,8 +350,8 @@ void TextHandlerTest::receiveStripNewlines()
 */
 void TextHandlerTest::receivePlainStripHtml()
 {
-    const QString testInputString = u"<p>Test</p> <pre><code>Some code <strong>with tags</strong></code></pre>"_s;
-    const QString testOutputString = u"Test Some code <strong>with tags</strong>"_s;
+    const QString testInputString = QStringLiteral("<p>Test</p> <pre><code>Some code <strong>with tags</strong></code></pre>");
+    const QString testOutputString = QStringLiteral("Test Some code <strong>with tags</strong>");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -459,8 +361,8 @@ void TextHandlerTest::receivePlainStripHtml()

 void TextHandlerTest::receivePlainStripMarkup()
 {
-    const QString testInputString = u"**bold** `<p>inline code</p>` *italic*"_s;
-    const QString testOutputString = u"bold <p>inline code</p> italic"_s;
+    const QString testInputString = QStringLiteral("**bold** `<p>inline code</p>` *italic*");
+    const QString testOutputString = QStringLiteral("bold <p>inline code</p> italic");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -470,8 +372,8 @@ void TextHandlerTest::receivePlainStripMarkup()

 void TextHandlerTest::receiveRichUserPill()
 {
-    const QString testInputString = u"<p><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></p>"_s;
-    const QString testOutputString = u"<b><a href=\"https://matrix.to/#/@alice:example.org\" style=\"text-decoration: none;\">@alice:example.org</a></b>"_s;
+    const QString testInputString = QStringLiteral("<p><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></p>");
+    const QString testOutputString = QStringLiteral("<b><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></b>");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -481,8 +383,8 @@ void TextHandlerTest::receiveRichUserPill()

 void TextHandlerTest::receiveRichStrikethrough()
 {
-    const QString testInputString = u"<p><del>Test</del></p>"_s;
-    const QString testOutputString = u"<s>Test</s>"_s;
+    const QString testInputString = QStringLiteral("<p><del>Test</del></p>");
+    const QString testOutputString = QStringLiteral("<s>Test</s>");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -492,8 +394,8 @@ void TextHandlerTest::receiveRichStrikethrough()

 void TextHandlerTest::receiveRichtextIn()
 {
-    const QString testInputString = u"<p>Test</p> <pre><code>Some code <strong>with tags</strong></code></pre>"_s;
-    const QString testOutputString = u"<p>Test</p> <pre><code>Some code &lt;strong&gt;with tags&lt;/strong&gt;</code></pre>"_s;
+    const QString testInputString = QStringLiteral("<p>Test</p> <pre><code>Some code <strong>with tags</strong></code></pre>");
+    const QString testOutputString = QStringLiteral("<p>Test</p> <pre><code>Some code &lt;strong&gt;with tags&lt;/strong&gt;</code></pre>");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -503,10 +405,15 @@ void TextHandlerTest::receiveRichtextIn()

 void TextHandlerTest::receiveRichMxcUrl()
 {
-    const QString testInputString =
-        u"<img src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e\" alt=\"image\"><img src=\"mxc://kde.org/34c3464b3a1bd7f55af2d559e07d2c773c430e73\" alt=\"image\">"_s;
-    const QString testOutputString =
-        u"<img src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e?user_id=@bob:kde.org&room_id=%23myroom:kde.org&event_id=$143273582443PhrSn:example.org\" alt=\"image\"><img src=\"mxc://kde.org/34c3464b3a1bd7f55af2d559e07d2c773c430e73?user_id=@bob:kde.org&room_id=%23myroom:kde.org&event_id=$143273582443PhrSn:example.org\" alt=\"image\">"_s;
+    const QString testInputString = QStringLiteral(
+        "<img src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e\" alt=\"image\"><img src=\"mxc://kde.org/34c3464b3a1bd7f55af2d559e07d2c773c430e73\" "
+        "alt=\"image\">");
+    const QString testOutputString = QStringLiteral(
+        "<img "
+        "src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e?user_id=@bob:kde.org&room_id=%23myroom:kde.org&event_id=$143273582443PhrSn:example.org\" "
+        "alt=\"image\"><img "
+        "src=\"mxc://kde.org/34c3464b3a1bd7f55af2d559e07d2c773c430e73?user_id=@bob:kde.org&room_id=%23myroom:kde.org&event_id=$143273582443PhrSn:example.org\" "
+        "alt=\"image\">");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -514,34 +421,6 @@ void TextHandlerTest::receiveRichMxcUrl()
    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, room->messageEvents().at(0).get()), testOutputString);
 }

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

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

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

 void TextHandlerTest::receiveRichEdited_data()
@@ -564,12 +487,9 @@ void TextHandlerTest::receiveRichEdited_data()
    QTest::addColumn<QString>("testInputString");
    QTest::addColumn<QString>("testOutputString");

-    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:%1\">(edited)</span></p>"_s.arg(
-                                                theme ? theme->disabledTextColor().name() : u"#000000"_s);
+    QTest::newRow("basic") << QStringLiteral("Edited") << QStringLiteral("Edited <span style=\"color:#000000\">(edited)</span>");
+    QTest::newRow("multiple paragraphs") << QStringLiteral("<p>Edited</p>\n<p>Edited</p>")
+                                         << QStringLiteral("<p>Edited</p>\n<p>Edited <span style=\"color:#000000\">(edited)</span></p>");
 }

 void TextHandlerTest::receiveRichEdited()
@@ -586,70 +506,61 @@ void TextHandlerTest::receiveRichEdited()

 void TextHandlerTest::receiveLineSeparator()
 {
-    auto text = u"foo\u2028bar"_s;
+    auto text = QStringLiteral("foo\u2028bar");
    TextHandler textHandler;
    textHandler.setData(text);
-    QCOMPARE(textHandler.handleRecievePlainText(Qt::PlainText, true), u"foo bar"_s);
+    QCOMPARE(textHandler.handleRecievePlainText(Qt::PlainText, true), QStringLiteral("foo bar"));
 }

 void TextHandlerTest::receiveRichCodeUrl()
 {
-    auto input = u"<code>https://kde.org</code>"_s;
+    auto input = QStringLiteral("<code>https://kde.org</code>");
    TextHandler testTextHandler;
    testTextHandler.setData(input);
    QCOMPARE(testTextHandler.handleRecieveRichText(), input);
 }

-void TextHandlerTest::receiveRichColor()
-{
-    const QString testInputString =
-        u"<span data-mx-color=\"#ff00be\">¯</span><span data-mx-color=\"#ff3b1d\">\\</span><span data-mx-color=\"#ffa600\">_</span><span data-mx-color=\"#64d200\">(</span><span data-mx-color=\"#00e261\">ツ</span><span data-mx-color=\"#00e7ff\">)</span><span data-mx-color=\"#00e1ff\">_</span><span data-mx-color=\"#00bdff\">/</span><span data-mx-color=\"#ff60ff\">¯</span>"_s;
-    const QString testOutputString =
-        u"<span style=\"color: #ff00be;\">¯</span><span style=\"color: #ff3b1d;\">\\</span><span style=\"color: #ffa600;\">_</span><span style=\"color: #64d200;\">(</span><span style=\"color: #00e261;\">ツ</span><span style=\"color: #00e7ff;\">)</span><span style=\"color: #00e1ff;\">_</span><span style=\"color: #00bdff;\">/</span><span style=\"color: #ff60ff;\">¯</span>"_s;
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-}
-
 void TextHandlerTest::componentOutput_data()
 {
    QTest::addColumn<QString>("testInputString");
    QTest::addColumn<QList<MessageComponent>>("testOutputComponents");

-    QTest::newRow("multiple paragraphs") << u"<p>Text</p>\n<p>Text</p>"_s
-                                         << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, u"Text"_s, {}},
-                                                                    MessageComponent{MessageComponentType::Text, u"Text"_s, {}}};
-    QTest::newRow("code") << u"<p>Text</p>\n<pre><code class=\"language-html\">Some code\n</code></pre>"_s
-                          << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, u"Text"_s, {}},
-                                                     MessageComponent{MessageComponentType::Code, u"Some code"_s, QVariantMap{{u"class"_s, u"html"_s}}}};
-    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
+    QTest::newRow("multiple paragraphs") << QStringLiteral("<p>Text</p>\n<p>Text</p>")
+                                         << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                                    MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};
+    QTest::newRow("code") << QStringLiteral("<p>Text</p>\n<pre><code class=\"language-html\">Some code\n</code></pre>")
+                          << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                     MessageComponent{MessageComponentType::Code,
+                                                                      QStringLiteral("Some code"),
+                                                                      QVariantMap{{QStringLiteral("class"), QStringLiteral("html")}}}};
+    QTest::newRow("quote") << QStringLiteral("<p>Text</p>\n<blockquote>\n<p>blockquote</p>\n</blockquote>")
+                           << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                      MessageComponent{MessageComponentType::Quote, QStringLiteral("\"blockquote\""), {}}};
+    QTest::newRow("no tag first paragraph") << QStringLiteral("Text\n<p>Text</p>")
+                                            << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                                       MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};
+    QTest::newRow("no tag last paragraph") << QStringLiteral("<p>Text</p>\nText")
+                                           << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                                      MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};
+    QTest::newRow("inline code") << QStringLiteral("<p><code>https://kde.org</code></p>\n<p>Text</p>")
+                                 << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("<code>https://kde.org</code>"), {}},
+                                                            MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};
+    QTest::newRow("inline code single block") << QStringLiteral("<code>https://kde.org</code>")
                                              << 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, {}}};
-    QTest::newRow("no tag last paragraph") << u"<p>Text</p>\nText"_s
-                                           << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, u"Text"_s, {}},
-                                                                      MessageComponent{MessageComponentType::Text, u"Text"_s, {}}};
-    QTest::newRow("inline code") << u"<p><code>https://kde.org</code></p>\n<p>Text</p>"_s
-                                 << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, u"<code>https://kde.org</code>"_s, {}},
-                                                            MessageComponent{MessageComponentType::Text, u"Text"_s, {}}};
-    QTest::newRow("inline code single block") << u"<code>https://kde.org</code>"_s
-                                              << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, u"<code>https://kde.org</code>"_s, {}}};
+                                                     MessageComponent{MessageComponentType::Text, QStringLiteral("<code>https://kde.org</code>"), {}}};
    QTest::newRow("long start tag")
-        << u"Ah, you mean something like<br/><pre data-md=\"```\"><code class=\"language-qml\"># main.qml\nimport CustomQml\n...\nControls.TextField { id: someField }\nCustomQml {\n    someTextProperty: someField.text\n}\n</code></pre>Sure you can, it's still local to the same file where you defined the id"_s
+        << QStringLiteral(
+               "Ah, you mean something like<br/><pre data-md=\"```\"><code class=\"language-qml\"># main.qml\nimport CustomQml\n...\nControls.TextField { id: "
+               "someField }\nCustomQml {\n    someTextProperty: someField.text\n}\n</code></pre>Sure you can, it's still local to the same file where you "
+               "defined the id")
        << QList<MessageComponent>{
-               MessageComponent{MessageComponentType::Text, u"Ah, you mean something like<br/>"_s, {}},
+               MessageComponent{MessageComponentType::Text, QStringLiteral("Ah, you mean something like<br/>"), {}},
               MessageComponent{
                   MessageComponentType::Code,
-                   u"# main.qml\nimport CustomQml\n...\nControls.TextField { id: someField }\nCustomQml {\n    someTextProperty: someField.text\n}"_s,
-                   QVariantMap{{u"class"_s, u"qml"_s}}},
-               MessageComponent{MessageComponentType::Text, u"Sure you can, it's still local to the same file where you defined the id"_s, {}}};
+                   QStringLiteral(
+                       "# main.qml\nimport CustomQml\n...\nControls.TextField { id: someField }\nCustomQml {\n    someTextProperty: someField.text\n}"),
+                   QVariantMap{{QStringLiteral("class"), QStringLiteral("qml")}}},
+               MessageComponent{MessageComponentType::Text, QStringLiteral("Sure you can, it's still local to the same file where you defined the id"), {}}};
 }

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

-void TextHandlerTest::updateSpoiler_data()
-{
-    QTest::addColumn<QString>("testInputString");
-    QTest::addColumn<QString>("testOutputString");
-    QTest::addColumn<bool>("spoilerRevealed");
-
-    auto theme = static_cast<Kirigami::Platform::PlatformTheme *>(qmlAttachedPropertiesObject<Kirigami::Platform::PlatformTheme>(this, true));
-    QTest::newRow("same length") << u"<span data-mx-spoiler style=\"color: #123456; background: #123456;\">Test<span>"_s
-                                 << u"<span data-mx-spoiler style=\"color: transparent; background: %1;\">Test<span>"_s.arg(
-                                        theme->alternateBackgroundColor().name())
-                                 << false;
-    QTest::newRow("different length") << u"<span data-mx-spoiler style=\"color: short; background: looooooooooong;\">Test<span>"_s
-                                      << u"<span data-mx-spoiler style=\"color: transparent; background: %1;\">Test<span>"_s.arg(
-                                             theme->alternateBackgroundColor().name())
-                                      << false;
-    QTest::newRow("spoiler revealed")
-        << u"<span data-mx-spoiler style=\"color: transparent; background: %1;\">Test<span>"_s.arg(theme->alternateBackgroundColor().name())
-        << u"<span data-mx-spoiler style=\"color: %1; background: %2;\">Test<span>"_s.arg(theme->textColor().name(), theme->alternateBackgroundColor().name())
-        << true;
-}
-
-void TextHandlerTest::updateSpoiler()
-{
-    QFETCH(QString, testInputString);
-    QFETCH(QString, testOutputString);
-    QFETCH(bool, spoilerRevealed);
-
-    QCOMPARE(TextHandler::updateSpoilerText(this, testInputString, spoilerRevealed), testOutputString);
-}
-
 QTEST_MAIN(TextHandlerTest)
 #include "texthandlertest.moc"
--- a/memorytests/CMakeLists.txt
+++ b/memorytests/CMakeLists.txt
@@ -1,36 +0,0 @@
-# SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
-# SPDX-License-Identifier: BSD-2-Clause
-
-add_definitions(-DDATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}" )
-
-qt_add_executable(timeline_memtest
-    main.cpp
-)
-
-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
-    QuotientQt6
-    LibNeoChat
-    Timeline
-)
-
-ecm_add_qml_module(timeline_memtest URI org.kde.neochat.timeline_memtest GENERATE_PLUGIN_SOURCE
-    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/timeline_memtest
-    QML_FILES
-        Main.qml
-    SOURCES
-        memtesttimelinemodel.cpp
-        memtesttimelinemodel.h
-    DEPENDENCIES
-        QtCore
-        QtQuick
-    IMPORTS
-        org.kde.neochat.timeline
-)
--- a/memorytests/Main.qml
+++ b/memorytests/Main.qml
@@ -1,34 +0,0 @@
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-import QtQuick
-import QtQuick.Controls as QQC2
-
-import org.kde.kirigami as Kirigami
-
-import org.kde.neochat
-
-QQC2.ApplicationWindow {
-    id: root
-
-    title: "Timeline Memory Test"
-
-    minimumWidth: Kirigami.Units.gridUnit * 30
-    minimumHeight: Kirigami.Units.gridUnit * 30
-
-    visible: true
-
-    QQC2.ScrollView {
-        width: root.width
-        height: root.height
-
-        contentItem: ListView {
-            cacheBuffer: 1000000
-            model: messageFilterModel
-
-            delegate: EventDelegate {
-                room: memTestTimelineModel.room
-            }
-        }
-    }
-}
--- a/memorytests/main.cpp
+++ b/memorytests/main.cpp
@@ -1,34 +0,0 @@
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include <QApplication>
-#include <QQmlApplicationEngine>
-#include <QQmlContext>
-
-#include <KLocalizedQmlContext>
-#include <KLocalizedString>
-
-#include "memtesttimelinemodel.h"
-#include "models/messagefiltermodel.h"
-
-using namespace Qt::StringLiterals;
-
-int main(int argc, char **argv)
-{
-    QApplication app(argc, argv);
-
-    KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));
-
-    QQmlApplicationEngine engine;
-
-    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();
-}
--- a/memorytests/memtest-sync.json
+++ b/memorytests/memtest-sync.json
@@ -1,379 +0,0 @@
-{
-  "ephemeral": {
-    "events": [
-      {
-        "content": {
-          "$1000000000000:example.org": {
-            "m.read": {
-              "@alice:example.org": {
-                "ts": 1000000000000
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1000000000000:example.org": {
-            "m.read": {
-              "@bob:example.org": {
-                "ts": 1000000000000
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1000000000003:example.org": {
-            "m.read": {
-              "@tim:example.org": {
-                "ts": 1000000000000
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1000000000003:example.org": {
-            "m.read": {
-              "@example:example.org": {
-                "ts": 1000000000000
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1000000000003:example.org": {
-            "m.read": {
-              "@jeff:example.org": {
-                "ts": 1000000000000
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1000000000003:example.org": {
-            "m.read": {
-              "@tina:example.org": {
-                "ts": 1000000000000
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1000000000003:example.org": {
-            "m.read": {
-              "@sally:example.org": {
-                "ts": 1000000000000
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1000000000003:example.org": {
-            "m.read": {
-              "@fred:example.org": {
-                "ts": 1000000000000
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      }
-    ]
-  },
-  "state": {
-    "events": [
-      {
-        "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Example",
-          "membership": "join"
-        },
-        "event_id": "$143273582555PhrSn:example.org",
-        "origin_server_ts": 1000000000000,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "example:example.org",
-        "state_key": "@example:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      },
-      {
-        "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Alice",
-          "membership": "join",
-          "reason": "Looking for support"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1000000000000,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "alice:example.org",
-        "state_key": "@alice:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      },
-      {
-        "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Bob",
-          "membership": "join"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1000000000000,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "bob:example.org",
-        "state_key": "@bob:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      },
-      {
-        "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Tim",
-          "membership": "join"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1000000000000,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "tim:example.org",
-        "state_key": "@tim:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      },
-      {
-        "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Jeff",
-          "membership": "join"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1000000000000,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "jeff:example.org",
-        "state_key": "@jeff:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      },
-      {
-        "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Tina",
-          "membership": "join"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1000000000000,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "tina:example.org",
-        "state_key": "@tina:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      },
-      {
-        "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Sally",
-          "membership": "join"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1000000000000,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "sally:example.org",
-        "state_key": "@sally:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      },
-      {
-        "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Fred",
-          "membership": "join"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1000000000000,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "fred:example.org",
-        "state_key": "@fred:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      }
-    ]
-  },
-  "timeline": {
-    "events": [
-      {
-        "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": 0,
-        "origin_server_ts": 1000000000000,
-        "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": 1,
-        "origin_server_ts": 1000000000001,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1233
-        }
-      },
-      {
-        "content": {
-          "m.relates_to": {
-            "event_id": 1,
-            "key": "👍",
-            "rel_type": "m.annotation"
-          }
-        },
-        "origin_server_ts": 1000000000002,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@alice:example.org",
-        "type": "m.reaction",
-        "unsigned": {
-            "age": 390159120
-        },
-        "event_id": 2,
-        "age": 390159120
-      },
-      {
-        "content": {
-            "body": "reply",
-            "format": "org.matrix.custom.html",
-            "formatted_body": "reply",
-            "m.relates_to": {
-                "m.in_reply_to": {
-                    "event_id": 0
-                }
-            },
-            "msgtype": "m.text"
-        },
-        "origin_server_ts": 1000000000003,
-        "sender": "@alice:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 98
-        },
-        "event_id": 3,
-        "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": 4,
-        "origin_server_ts": 1000000000004,
-        "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": 5,
-        "origin_server_ts": 1000000000005,
-        "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": 6,
-        "origin_server_ts": 1000000000006,
-        "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": 7,
-        "origin_server_ts": 1000000000007,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      }
-    ],
-    "limited": true,
-    "prev_batch": "t34-23535_0_0"
-  }
-}
--- a/memorytests/memtesttimelinemodel.cpp
+++ b/memorytests/memtesttimelinemodel.cpp
@@ -1,36 +0,0 @@
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include "memtesttimelinemodel.h"
-
-#include <Quotient/events/eventcontent.h>
-#include <Quotient/events/roommessageevent.h>
-
-using namespace Quotient;
-
-MemTestTimelineModel::MemTestTimelineModel(QObject *parent)
-    : MessageModel(parent)
-{
-    beginResetModel();
-    m_connection = Connection::makeMockConnection(u"@bob:example.org"_s);
-    m_room = new MemTestRoom(m_connection, u"#memtestroom:example.org"_s, u"memtest-sync.json"_s);
-
-    for (const auto &eventIt : m_room->messageEvents()) {
-        Q_EMIT newEventAdded(eventIt.event());
-    }
-
-    endResetModel();
-}
-
-std::optional<std::reference_wrapper<const RoomEvent>> MemTestTimelineModel::getEventForIndex(QModelIndex index) const
-{
-    return *m_room->messageEvents().at(index.row()).event();
-}
-
-int MemTestTimelineModel::rowCount(const QModelIndex &parent) const
-{
-    Q_UNUSED(parent);
-    return m_room->messageEvents().size();
-}
-
-#include "moc_memtesttimelinemodel.cpp"
--- a/memorytests/memtesttimelinemodel.h
+++ b/memorytests/memtesttimelinemodel.h
@@ -1,121 +0,0 @@
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#pragma once
-
-#include <QAbstractListModel>
-#include <QQmlEngine>
-
-#include <Quotient/events/roomevent.h>
-#include <Quotient/syncdata.h>
-
-#include "models/messagemodel.h"
-
-namespace Quotient
-{
-class Connection;
-}
-
-class NeoChatRoom;
-
-class MemTestRoom : public NeoChatRoom
-{
-public:
-    MemTestRoom(Quotient::Connection *connection, const QString &roomName, const QString &syncFileName = {})
-        : NeoChatRoom(connection, roomName, Quotient::JoinState::Join)
-    {
-        syncNewEvents(syncFileName);
-    }
-
-    void update(Quotient::SyncRoomData &&data, bool fromCache = false)
-    {
-        Room::updateData(std::move(data), fromCache);
-    }
-
-    void syncNewEvents(const QString &syncFileName)
-    {
-        if (!syncFileName.isEmpty()) {
-            QFile testSyncFile;
-            testSyncFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + syncFileName);
-            auto ok = testSyncFile.open(QIODevice::ReadOnly);
-            if (!ok) {
-                qWarning() << "Failed to open" << testSyncFile.fileName() << testSyncFile.errorString();
-            }
-
-            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;
-    }
-};
-
-/**
- * @class MemTestTimelineModel
- *
- * This is a special version of the MessageModel design to load an unchanging set
- * of events from a json file so that timeline memory optimisations can be measured.
- */
-class MemTestTimelineModel : public MessageModel
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-public:
-    explicit MemTestTimelineModel(QObject *parent = nullptr);
-
-    /**
-     * @brief Number of rows in the model.
-     *
-     * @sa QAbstractItemModel::rowCount
-     */
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-
-private:
-    QPointer<Quotient::Connection> m_connection;
-
-    std::vector<Quotient::RoomEventPtr> m_events;
-
-    std::optional<std::reference_wrapper<const Quotient::RoomEvent>> getEventForIndex(QModelIndex index) const override;
-};
--- a/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -19,7 +19,6 @@ Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[gl]=NeoChat
 Name[he]=NeoChat
-Name[hi]=नियोचैट
 Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
@@ -37,13 +36,13 @@ Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[ro]=NeoChat
 Name[ru]=NeoChat
-Name[sa]=नवचैट्
 Name[sk]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[tr]=NeoChat
 Name[uk]=NeoChat
+Name[x-test]=xxNeoChatxx
 Name[zh_CN]=NeoChat
 Name[zh_TW]=NeoChat
 GenericName=Matrix Client
@@ -62,7 +61,6 @@ GenericName[fi]=Matrix-asiakas
 GenericName[fr]=Client « Matrix »
 GenericName[gl]=Cliente de Matrix
 GenericName[he]=לקוח Matrix
-GenericName[hi]=मैट्रिक्स क्लाइंट
 GenericName[hu]=Matrix kliens
 GenericName[ia]=Cliente de Matrice
 GenericName[id]=Klien Matrix
@@ -80,48 +78,56 @@ GenericName[pt]=Cliente de Matrix
 GenericName[pt_BR]=Cliente Matrix
 GenericName[ro]=Client Matrix
 GenericName[ru]=Клиент Matrix
-GenericName[sa]=मैट्रिक्स क्लाइंट
 GenericName[sk]=Matrix Client
 GenericName[sl]=Odjemalec Matrix
 GenericName[sv]=Matrix-klient
 GenericName[ta]=Matrix வாங்கி
 GenericName[tr]=Matrix İstemcisi
 GenericName[uk]=Клієнт Matrix
+GenericName[x-test]=xxMatrix Clientxx
 GenericName[zh_CN]=Matrix 客户端
 GenericName[zh_TW]=Matrix 用戶端
-Comment=Chat on Matrix
-Comment[ar]=دردش على ماتركس
-Comment[ca]=Xat a Matrix
-Comment[ca@valencia]=Xat a Matrix
-Comment[de]=Über Matrix unterhalten
-Comment[en_GB]=Chat on Matrix
-Comment[eo]=Babilo en Matrix
-Comment[es]=Chat en Matrix
-Comment[eu]=Berriketa Matrix-en
-Comment[fi]=Keskustele Matrixissä
-Comment[fr]=Clavarder sur Matrix
-Comment[gl]=Charle en Matrix
-Comment[he]=התכתבות דרך Matrix
-Comment[hi]=मैट्रिक्स पर चैट करें
-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[ro]=Discutați pe Matrix
-Comment[ru]=Общение в Matrix
-Comment[sa]=Matrix इत्यत्र गपशपं कुर्वन्तु
-Comment[sl]=Klepet na Matrixu
-Comment[sv]=Chatta på Matrix
-Comment[ta]=மேட்ரிக்ஸில் உரையாட உதவும்
-Comment[tr]=Matrix üzerinde sohbet edin
-Comment[uk]=Спілкування у Matrix
-Comment[zh_CN]=在 Matrix 上聊天
-Comment[zh_TW]=在 Matrix 上聊天
+Comment=Client for the Matrix protocol
+Comment[ar]=عميل لميفاق ماتركس
+Comment[az]=Matrix protokolu üçün müştəri
+Comment[ca]=Client per al protocol Matrix
+Comment[ca@valencia]=Client per al protocol Matrix
+Comment[de]=Programm für das Matrix-Protokoll
+Comment[el]=Πελάτης για το πρωτόκολλο Matrix
+Comment[en_GB]=Client for the Matrix protocol
+Comment[eo]=Kliento por la Matrix-protokolo
+Comment[es]=Cliente para el protocolo Matrix
+Comment[eu]=Matrix protokolorako bezeroa
+Comment[fi]=Asiakas Matrix-yhteyskäytännölle
+Comment[fr]=Client pour le protocole « Matrix »
+Comment[gl]=Cliente para o protocolo Matrix.
+Comment[he]=לקוח לפרוטוקול Matrix
+Comment[hu]=Kliens a Matrix protokollhoz
+Comment[ia]=Cliente per le protocollo de Matrix
+Comment[id]=Klien untuk protokol Matrix
+Comment[ie]=Un cliente del protocol Matrix
+Comment[it]=Client per il protocollo Matrix
+Comment[ka]=კლიენტი Matrix-ის პროტოკოლისთვის
+Comment[ko]=Matrix 프로토콜용 클라이언트
+Comment[lt]=Matrix protokolo kliento programa
+Comment[lv]=Klients „Matrix“ protokolam
+Comment[nl]=Client voor het Matrix-protocol
+Comment[nn]=Klient for Matrix-protokollen
+Comment[pa]=ਮੈਟਰਿਕਸ ਪਰੋਟੋਕਾਲ ਲਈ ਕਲਾਈਂਟ ਹੈ
+Comment[pl]=Program obsługi protokołu Matriksa
+Comment[pt]=Cliente para o protocolo Matrix
+Comment[pt_BR]=Cliente para o protocolo Matrix
+Comment[ro]=Client pentru protocolul Matrix
+Comment[ru]=Клиент для протокола Matrix
+Comment[sk]=Klient protokolu Matrix
+Comment[sl]=Odjemalec za protokol Matrix
+Comment[sv]=Klient för protokollet Matrix
+Comment[ta]=Matrix நெறிமுறைக்கான வாங்கி
+Comment[tr]=Matrix protokolü için istemci
+Comment[uk]=Клієнт протоколу Matrix
+Comment[x-test]=xxClient for the Matrix protocolxx
+Comment[zh_CN]=为 Matrix 协议打造的客户端
+Comment[zh_TW]=Matrix 通訊協定的用戶端
 MimeType=x-scheme-handler/matrix;
 Exec=neochat %u
 Terminal=false
--- a/po/ar/neochat.po
+++ b/po/ar/neochat.po
--- a/po/ast/neochat.po
+++ b/po/ast/neochat.po
--- a/po/az/neochat.po
+++ b/po/az/neochat.po
--- a/po/ca/neochat.po
+++ b/po/ca/neochat.po
--- a/po/ca@valencia/neochat.po
+++ b/po/ca@valencia/neochat.po
--- a/po/cs/neochat.po
+++ b/po/cs/neochat.po
--- a/po/da/neochat.po
+++ b/po/da/neochat.po
--- a/po/de/neochat.po
+++ b/po/de/neochat.po
--- a/po/el/neochat.po
+++ b/po/el/neochat.po
--- a/po/en_GB/neochat.po
+++ b/po/en_GB/neochat.po
--- a/po/eo/neochat.po
+++ b/po/eo/neochat.po
--- a/po/es/neochat.po
+++ b/po/es/neochat.po
--- a/po/eu/neochat.po
+++ b/po/eu/neochat.po
--- a/po/fi/neochat.po
+++ b/po/fi/neochat.po
--- a/po/fr/neochat.po
+++ b/po/fr/neochat.po
--- a/po/ga/neochat.po
+++ b/po/ga/neochat.po
--- a/po/gl/neochat.po
+++ b/po/gl/neochat.po
--- a/po/he/neochat.po
+++ b/po/he/neochat.po
--- a/po/hi/neochat.po
+++ b/po/hi/neochat.po
--- a/po/hu/neochat.po
+++ b/po/hu/neochat.po
--- a/po/ia/neochat.po
+++ b/po/ia/neochat.po
--- a/po/id/neochat.po
+++ b/po/id/neochat.po
--- a/po/ie/neochat.po
+++ b/po/ie/neochat.po
--- a/po/it/neochat.po
+++ b/po/it/neochat.po
--- a/po/ja/neochat.po
+++ b/po/ja/neochat.po
--- a/po/ka/neochat.po
+++ b/po/ka/neochat.po
--- a/po/ko/neochat.po
+++ b/po/ko/neochat.po
--- a/po/lt/neochat.po
+++ b/po/lt/neochat.po
--- a/po/lv/neochat.po
+++ b/po/lv/neochat.po
--- a/po/nl/neochat.po
+++ b/po/nl/neochat.po
--- a/po/nn/neochat.po
+++ b/po/nn/neochat.po
--- a/po/pa/neochat.po
+++ b/po/pa/neochat.po
--- a/po/pl/neochat.po
+++ b/po/pl/neochat.po
--- a/po/pt/neochat.po
+++ b/po/pt/neochat.po
--- a/po/pt_BR/docs/neochat/man-neochat.1.docbook
+++ b/po/pt_BR/docs/neochat/man-neochat.1.docbook
@@ -1,122 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
-<!ENTITY % Brazilian-Portuguese "INCLUDE">
-]>
-<!--
-SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
-<refentry lang="&language;">
-<refentryinfo>
-<title
->Manual do Usuário do NeoChat</title>
-<author
-><firstname
->Carl</firstname
-><surname
->Schwan</surname
-> <contrib
->NeoChat man page.</contrib
-> <email
->carl@carlschwan.eu</email
-></author>
-<date
->01/11/2022</date>
-<releaseinfo
->22.09</releaseinfo>
-<productname
->NeoChat</productname>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>
-    <command
->neochat</command>
-  </refentrytitle>
-  <manvolnum
->1</manvolnum>
-</refmeta>
-
-<refnamediv>
-  <refname
->neochat</refname>
-  <refpurpose
->Cliente para interação com o protocolo de mensagens Matrix.</refpurpose>
-  </refnamediv>
-  <!-- body begins here -->
-  <refsynopsisdiv id='synopsis'>
-  <cmdsynopsis
-><command
->neochat</command
-> <arg choice="opt"
-><replaceable
->URI</replaceable
-></arg
-> </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsect1 id="description">
-  <title
->Descrição</title>
-  <para
->O <command
->neochat</command
-> é um aplicativo de bate-papo para o protocolo Matrix. Ele funciona tanto em computadores quanto em dispositivos móveis. </para>
-</refsect1>
-
-<refsect1 id="options"
-><title
->Opções</title>
-<variablelist>
-  <varlistentry>
-  <term
-><option
->URI</option
-></term>
-  <listitem>
-    <para
->O URI da matriz para um usuário ou uma sala. Por exemplo, matrix:u/usuário:exemplo.org e matrix:r/root:exemplo.org. Isso fará com que o NeoChat tente abrir a sala ou conversa especificada. </para>
-  </listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1 id="bug">
-  <title
->Relatar bugs</title>
-  <para
->Você pode reportar erros e solicitar novas funcionalidades em <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General"
->https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General</ulink
-></para>
-</refsect1>
-
-<refsect1>
-  <title
->Veja também</title>
-  <simplelist>
-    <member
->Lista de perguntas frequentes sobre o Matrix <ulink url="https://matrix.org/faq/"
->https://matrix.org/faq/</ulink
-> </member>
-    <member
->kf5options(7)</member>
-    <member
->qt5options(7)</member>
-  </simplelist>
-</refsect1>
-
-<refsect1 id="copyright"
-><title
->Direitos autorais</title>
-<para
->Direitos autorais &copy; 2020-2022 Tobias Fella </para>
-<para
->Direitos autorais &copy; 2020-2022 Carl Schwan </para>
-<para
->Licença: GNU General Public Versão 3 ou posterior <ulink url="https://www.gnu.org/licenses/gpl-3.0.html"
->https://www.gnu.org/licenses/gpl-3.0.html</ulink
->&gt;</para>
-</refsect1>
-</refentry>
--- a/po/pt_BR/neochat.po
+++ b/po/pt_BR/neochat.po
--- a/po/ro/neochat.po
+++ b/po/ro/neochat.po
--- a/po/ru/docs/neochat/man-neochat.1.docbook
+++ b/po/ru/docs/neochat/man-neochat.1.docbook
@@ -1,122 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
-<!ENTITY % Russian "INCLUDE">
-]>
-<!--
-SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
-<refentry lang="&language;">
-<refentryinfo>
-<title
->Руководство пользователя NeoChat</title>
-<author
-><firstname
->Carl</firstname
-><surname
->Schwan</surname
-> <contrib
->man-страница NeoChat.</contrib
-> <email
->carl@carlschwan.eu</email
-></author>
-<date
->2022-11-01</date>
-<releaseinfo
->22.09</releaseinfo>
-<productname
->NeoChat</productname>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>
-    <command
->neochat</command>
-  </refentrytitle>
-  <manvolnum
->1</manvolnum>
-</refmeta>
-
-<refnamediv>
-  <refname
->neochat</refname>
-  <refpurpose
->Клиент для взаимодействия с протоколом обмена сообщениями Matrix</refpurpose>
-  </refnamediv>
-  <!-- body begins here -->
-  <refsynopsisdiv id='synopsis'>
-  <cmdsynopsis
-><command
->neochat</command
-> <arg choice="opt"
-><replaceable
->URI</replaceable
-></arg
-> </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsect1 id="description">
-  <title
->Описание</title>
-  <para
-><command
->neochat</command
-> — приложение для настольных и мобильных устройств, позволяющее общаться в чатах с помощью протокола Matrix. </para>
-</refsect1>
-
-<refsect1 id="options"
-><title
->Параметры</title>
-<variablelist>
-  <varlistentry>
-  <term
-><option
->URI</option
-></term>
-  <listitem>
-    <para
->URI-адрес пользователя или комнаты в Matrix, например: matrix:u/user:example.org и matrix:r/root:example.org. NeoChat попытается открыть указанную комнату или беседу. </para>
-  </listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1 id="bug">
-  <title
->Отчёты об ошибках</title>
-  <para
->Сообщать об ошибках и отправлять предложения по улучшению можно по адресу <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General"
->https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General</ulink
-></para>
-</refsect1>
-
-<refsect1>
-  <title
->Смотрите также</title>
-  <simplelist>
-    <member
->Список наиболее часто задаваемых вопросов о Matrix <ulink url="https://matrix.org/faq/"
->https://matrix.org/faq/</ulink
-> </member>
-    <member
->kf5options(7)</member>
-    <member
->qt5options(7)</member>
-  </simplelist>
-</refsect1>
-
-<refsect1 id="copyright"
-><title
->Авторские права</title>
-<para
->Авторские права &copy; Tobias Fella, 2020–2022 </para>
-<para
->Авторские права &copy; Carl Schwan, 2020–2022 </para>
-<para
->Лицензия: стандартная общественная лицензия GNU версии 3 или любой более поздней версии &lt;<ulink url="https://www.gnu.org/licenses/gpl-3.0.html"
->https://www.gnu.org/licenses/gpl-3.0.html</ulink
->&gt;</para>
-</refsect1>
-</refentry>
--- a/po/ru/neochat.po
+++ b/po/ru/neochat.po
--- a/po/sa/neochat.po
+++ b/po/sa/neochat.po
--- a/po/sk/neochat.po
+++ b/po/sk/neochat.po
--- a/po/sl/neochat.po
+++ b/po/sl/neochat.po
--- a/po/sv/neochat.po
+++ b/po/sv/neochat.po
--- a/po/ta/neochat.po
+++ b/po/ta/neochat.po
--- a/po/tok/neochat.po
+++ b/po/tok/neochat.po
--- a/po/tr/neochat.po
+++ b/po/tr/neochat.po
--- a/po/uk/neochat.po
+++ b/po/uk/neochat.po
--- a/po/zh_CN/neochat.po
+++ b/po/zh_CN/neochat.po
--- a/po/zh_TW/neochat.po
+++ b/po/zh_TW/neochat.po
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,9 +1,9 @@
-# SPDX-FileCopyrightText: 2024-2025 Scarlett Moore <sgmoore@kde.org>
+# SPDX-FileCopyrightText: 2024 Scarlett Moore <sgmoore@kde.org>
 #
 # SPDX-License-Identifier: CC0-1.0
 ---
 name: neochat
-base: core24
+base: core22
 adopt-info: neochat
 grade: stable
 confinement: strict
@@ -24,16 +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

-package-repositories:
-  - type: apt
-    ppa: ubuntu-toolchain-r/test
-
 slots:
  session-dbus-interface:
    interface: dbus
@@ -44,12 +37,11 @@ parts:
  olm:
    source: https://gitlab.matrix.org/matrix-org/olm.git
    source-depth: 1
-    source-tag: '3.2.16'
+    source-tag: '3.2.12'
    plugin: cmake
    cmake-parameters:
      - -DCMAKE_BUILD_TYPE=Release
      - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_POLICY_VERSION_MINIMUM=3.5
    prime:
      - -usr/include
      - -usr/lib/*/pkgconfig
@@ -84,8 +76,7 @@ parts:
    source-depth: 1
    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
@@ -101,13 +92,9 @@ parts:
      - olm
      - qtkeychain
    source: https://github.com/quotient-im/libQuotient.git
-    source-tag: 0.9.2
+    source-tag: 0.8.2
    source-depth: 1
    plugin: cmake
-    build-environment:
-      - PATH: /snap/bin:${PATH}
-    build-snaps:
-      - cmake
    build-packages:
      - libssl-dev
    cmake-parameters:
@@ -126,10 +113,6 @@ parts:
    source-tag: 'v0.3.0'
    source-depth: 1
    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
@@ -140,32 +123,16 @@ 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: .
+    source: https://invent.kde.org/network/neochat.git
+    source-tag: 'v24.08.1'
    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"
    build-packages:
      - cmark
      - libcmark-dev
@@ -189,12 +156,3 @@ parts:
    prime:
      - usr/lib/*/libcmark.so*

-  gpu-2404:
-    after: [neochat]
-    source: https://github.com/canonical/gpu-snap.git
-    plugin: dump
-    override-prime: |
-      craftctl default
-      ${CRAFT_PART_SRC}/bin/gpu-2404-cleanup mesa-2404
-    prime:
-      - bin/gpu-2404-wrapper
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,18 +1,570 @@
-# SPDX-FileCopyrightText: 2025 James Graham <james.h.graham@protonmail.com>
+# 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

 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT NEOCHAT_FLATPAK AND NOT NEOCHAT_APPIMAGE)
    add_subdirectory(purpose)
 endif()

-add_subdirectory(libneochat)
-add_subdirectory(login)
-add_subdirectory(rooms)
-add_subdirectory(roominfo)
-add_subdirectory(messagecontent)
-add_subdirectory(timeline)
-add_subdirectory(spaces)
-add_subdirectory(chatbar)
+add_library(neochat STATIC
+    controller.cpp
+    controller.h
+    actionshandler.cpp
+    actionshandler.h
+    models/emojimodel.cpp
+    models/emojimodel.h
+    emojitones.cpp
+    emojitones.h
+    models/customemojimodel.cpp
+    models/customemojimodel.h
+    clipboard.cpp
+    clipboard.h
+    models/messageeventmodel.cpp
+    models/messageeventmodel.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
+    events/joinrulesevent.cpp
+    events/joinrulesevent.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/neochatdeactivateaccountjob.cpp
+    jobs/neochatdeactivateaccountjob.h
+    jobs/neochatdeletedevicejob.cpp
+    jobs/neochatdeletedevicejob.h
+    jobs/neochatchangepasswordjob.cpp
+    jobs/neochatchangepasswordjob.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
+    jobs/neochatadd3pidjob.cpp
+    jobs/neochatadd3pidjob.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
+)
+
+set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
+    QT_QML_SINGLETON_TYPE TRUE
+)
+
+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/ContextMenu.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/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(app)
+add_subdirectory(login)
+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()
+    set_source_files_properties(qml/ShareActionStub.qml PROPERTIES
+        QT_RESOURCE_ALIAS qml/ShareAction.qml
+    )
+    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 "messageeventmodel_logging.h"
+    IDENTIFIER "MessageEvent"
+    CATEGORY_NAME "org.kde.neochat.messageeventmodel"
+    DESCRIPTION "Neochat: messageeventmodel"
+    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::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"
+        "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-low"
+        "security-low-symbolic"
+        "kde"
+        "list-remove-symbolic"
+        "edit-delete"
+    )
+    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()
--- a/src/actionshandler.cpp
+++ b/src/actionshandler.cpp
@@ -0,0 +1,144 @@
+// SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org>
+// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "actionshandler.h"
+
+#include "chatbarcache.h"
+#include "models/actionsmodel.h"
+#include "neochatconfig.h"
+#include "texthandler.h"
+
+using namespace Quotient;
+using namespace Qt::StringLiterals;
+
+void ActionsHandler::handleMessageEvent(NeoChatRoom *room, ChatBarCache *chatBarCache)
+{
+    if (room == nullptr || chatBarCache == nullptr) {
+        qWarning() << "ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.";
+        return;
+    }
+
+    if (!chatBarCache->attachmentPath().isEmpty()) {
+        QUrl url(chatBarCache->attachmentPath());
+        auto path = url.isLocalFile() ? url.toLocalFile() : url.toString();
+        room->uploadFile(QUrl(path), chatBarCache->text().isEmpty() ? path.mid(path.lastIndexOf(u'/') + 1) : chatBarCache->text());
+        chatBarCache->setAttachmentPath({});
+        chatBarCache->setText({});
+        return;
+    }
+
+    const auto handledText = handleMentions(chatBarCache);
+    const auto result = handleQuickEdit(room, handledText);
+    if (!result) {
+        handleMessage(room, handledText, chatBarCache);
+    }
+}
+
+QString ActionsHandler::handleMentions(ChatBarCache *chatBarCache)
+{
+    const auto mentions = chatBarCache->mentions();
+    std::sort(mentions->begin(), mentions->end(), [](const auto &a, const auto &b) -> bool {
+        return a.cursor.anchor() > b.cursor.anchor();
+    });
+
+    auto handledText = chatBarCache->text();
+    for (const auto &mention : *mentions) {
+        if (mention.text.isEmpty() || mention.id.isEmpty()) {
+            continue;
+        }
+        handledText = handledText.replace(mention.cursor.anchor(),
+                                          mention.cursor.position() - mention.cursor.anchor(),
+                                          QStringLiteral("[%1](https://matrix.to/#/%2)").arg(mention.text.toHtmlEscaped(), mention.id));
+    }
+    mentions->clear();
+
+    return handledText;
+}
+
+bool ActionsHandler::handleQuickEdit(NeoChatRoom *room, const QString &handledText)
+{
+    if (room == nullptr) {
+        return false;
+    }
+
+    if (NeoChatConfig::allowQuickEdit()) {
+        QRegularExpression sed(QStringLiteral("^s/([^/]*)/([^/]*)(/g)?$"));
+        auto match = sed.match(handledText);
+        if (match.hasMatch()) {
+            const QString regex = match.captured(1);
+            const QString replacement = match.captured(2).toHtmlEscaped();
+            const QString flags = match.captured(3);
+
+            for (auto it = room->messageEvents().crbegin(); it != room->messageEvents().crend(); it++) {
+                if (const auto event = eventCast<const RoomMessageEvent>(&**it)) {
+#if Quotient_VERSION_MINOR > 8
+                    if (event->senderId() == room->localMember().id() && event->has<EventContent::TextContent>()) {
+#else
+                    if (event->senderId() == room->localMember().id() && event->hasTextContent()) {
+#endif
+                        QString originalString;
+                        if (event->content()) {
+#if Quotient_VERSION_MINOR > 8
+                            originalString = event->get<EventContent::TextContent>()->body;
+#else
+                            originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content())->body;
+#endif
+                        } else {
+                            originalString = event->plainBody();
+                        }
+                        if (flags == "/g"_L1) {
+                            room->postHtmlMessage(handledText, originalString.replace(regex, replacement), event->msgtype(), {}, event->id());
+                        } else {
+                            room->postHtmlMessage(handledText,
+                                                  originalString.replace(originalString.indexOf(regex), regex.size(), replacement),
+                                                  event->msgtype(),
+                                                  {},
+                                                  event->id());
+                        }
+                        return true;
+                    }
+                }
+            }
+        }
+    }
+    return false;
+}
+
+void ActionsHandler::handleMessage(NeoChatRoom *room, QString handledText, ChatBarCache *chatBarCache)
+{
+    if (room == nullptr) {
+        return;
+    }
+
+    auto messageType = RoomMessageEvent::MsgType::Text;
+
+    if (handledText.startsWith(QLatin1Char('/'))) {
+        for (const auto &action : ActionsModel::instance().allActions()) {
+            if (handledText.indexOf(action.prefix) == 1
+                && (handledText.indexOf(" "_ls) == action.prefix.length() + 1 || handledText.length() == action.prefix.length() + 1)) {
+                handledText = action.handle(handledText.mid(action.prefix.length() + 1).trimmed(), room, chatBarCache);
+                if (action.messageType.has_value()) {
+                    messageType = *action.messageType;
+                }
+                if (action.messageAction) {
+                    break;
+                } else {
+                    return;
+                }
+            }
+        }
+    }
+
+    TextHandler textHandler;
+    textHandler.setData(handledText);
+    handledText = textHandler.handleSendText();
+
+    if (handledText.length() == 0) {
+        return;
+    }
+
+    room->postMessage(chatBarCache->text(), handledText, messageType, chatBarCache->replyId(), chatBarCache->editId(), chatBarCache->threadId());
+}
+
+#include "moc_actionshandler.cpp"
--- a/src/actionshandler.h
+++ b/src/actionshandler.h
@@ -0,0 +1,43 @@
+// SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org>
+// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <QString>
+
+class ChatBarCache;
+class NeoChatRoom;
+
+/**
+ * @class ActionsHandler
+ *
+ * This class contains functions to handle chat messages ready for posting to a room.
+ *
+ * Everything that needs to be done to prepare the message for posting in a room
+ * including:
+ *  - File handling
+ *  - User mentions
+ *  - Quick edits
+ *  - Chat actions
+ *  - Custom emojis
+ *
+ * @note A chat action is a message starting with /, resulting in something other
+ *       than a normal message being sent (e.g. /me, /join).
+ *
+ * @sa ActionsModel, NeoChatRoom
+ */
+class ActionsHandler
+{
+public:
+    /**
+     * @brief Pre-process text and send message event.
+     */
+    static void handleMessageEvent(NeoChatRoom *room, ChatBarCache *chatBarCache);
+
+private:
+    static QString handleMentions(ChatBarCache *chatBarCache);
+    static bool handleQuickEdit(NeoChatRoom *room, const QString &handledText);
+
+    static void handleMessage(NeoChatRoom *room, QString handledText, ChatBarCache *chatBarCache);
+};
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -1,365 +0,0 @@
-# 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
-    )
-else()
-    set(EXTRA_IMPORTS org.kde.purpose)
-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
-        qml/MeetingDialog.qml
-    DEPENDENCIES
-        QtCore
-        QtQuick
-        io.github.quotient_im.libquotient
-    IMPORTS
-        org.kde.neochat.libneochat
-        org.kde.neochat.rooms
-        org.kde.neochat.roominfo
-        org.kde.neochat.messagecontent
-        org.kde.neochat.timeline
-        org.kde.neochat.spaces
-        org.kde.neochat.settings
-        org.kde.neochat.devtools
-        org.kde.neochat.login
-        org.kde.neochat.chatbar
-        org.kde.config
-        org.kde.syntaxhighlighting
-        ${EXTRA_IMPORTS}
-)
-
-if(NOT ANDROID AND NOT WIN32)
-    qt_target_qml_sources(neochat QML_FILES
-        qml/ShareAction.qml
-        qml/GlobalMenu.qml
-    )
-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
-    KF6::IconThemes
-)
-
-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::ItemModels
-    KF6::I18nQml
-    KirigamiApp
-    QuotientQt6
-    Login
-    Rooms
-    MessageContent
-    Spaces
-)
-
-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"
-        "amarok_playcount"
-
-        ${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)
-    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)
-    # krunner plugin must be the same as the app id for flatpak to export it
-    install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins RENAME org.kde.neochat.desktop)
-endif()
-
-if (APPLE)
-    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.neochat")
-    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "NeoChat")
-    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING ${RELEASE_SERVICE_VERSION})
-    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION ${RELEASE_SERVICE_VERSION})
-endif ()
--- a/src/app/controller.cpp
+++ b/src/app/controller.cpp
@@ -1,382 +0,0 @@
-// 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 "enums/roomsortparameter.h"
-#include "general_logging.h"
-#include "mediasizehelper.h"
-#include "models/actionsmodel.h"
-#include "models/messagemodel.h"
-#include "models/roomlistmodel.h"
-#include "models/roomtreemodel.h"
-#include "neochatconfig.h"
-#include "neochatroom.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
-
-#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
-
-    connect(QGuiApplication::instance(), &QCoreApplication::aboutToQuit, QGuiApplication::instance(), [this] {
-#ifndef Q_OS_ANDROID
-        delete m_trayIcon;
-#endif
-        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) {
-        return;
-    }
-
-    connect(m_accountManager, &AccountManager::errorOccured, this, &Controller::errorOccured);
-    connect(m_accountManager, &AccountManager::accountsLoadingChanged, this, &Controller::accountsLoadingChanged);
-    connect(m_accountManager, &AccountManager::connectionAdded, this, &Controller::initConnection);
-    connect(m_accountManager, &AccountManager::connectionDropped, this, &Controller::teardownConnection);
-    connect(m_accountManager, &AccountManager::activeConnectionChanged, this, &Controller::initActiveConnection);
-}
-
-void Controller::initConnection(NeoChatConnection *connection)
-{
-    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
-    QStringList unsupportedPlatforms{u"GNOME"_s, u"Pantheon"_s};
-    return !unsupportedPlatforms.contains(QString::fromLatin1(qgetenv("XDG_CURRENT_DESKTOP")));
-#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;
-    }
-#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) {
-        NotificationsManager::postPushNotification(data);
-    });
-
-    // 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)
-{
-    qGuiApp->setBadgeNumber(count);
-}
-
-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());
-    if (!file.open(QFile::ReadOnly)) {
-        qCWarning(GENERAL) << "Failed to open file" << path;
-        return {};
-    }
-    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"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Joshua Goins	80ebe71f6a	ManualRoomDialog: Use Window.window attached property This fixes a runtime error since applicationWindow is undefined.	2024-10-30 22:03:46 -04:00
Joshua Goins	02578dd38f	ExploreRoomsPage: Fix "Enter a room address" button not working This was due to an undefined applicationWindow singleton, but we don't actually need it and can use Overlay.overlay directly.	2024-10-30 22:03:10 -04:00