GIT_SILENT Sync po/docbooks with svn

Fix binary stripping of APKs with Qt 5.15.10
This fixes APKs on binary factory having exploded in size 3x-5x after the Qt 5.15.10 update. This also affects release packages and will need to be backported to those (in Craft).
2023-07-14 03:32:18 +00:00 · 2023-07-08 11:54:54 +02:00 · 2023-07-04 05:10:36 +00:00 · 2023-07-04 04:03:13 +00:00 · 2023-07-03 03:58:27 +00:00 · 2023-07-03 03:50:48 +00:00
355 changed files with 72042 additions and 103900 deletions
--- a/.flatpak-manifest.json
+++ b/.flatpak-manifest.json
@@ -41,7 +41,6 @@
        {
            "name": "olm",
            "buildsystem": "cmake-ninja",
-            "config-opts": [ "-DOLM_TESTS=OFF" ],
            "sources": [
                {
                    "type": "git",
@@ -112,14 +111,12 @@
                }
            ],
            "config-opts": [
-                "-DQuotient_ENABLE_E2EE=ON",
-                "-DBUILD_TESTING=OFF"
+                "-DQuotient_ENABLE_E2EE=ON"
            ]
        },
        {
            "name": "cmark",
            "buildsystem": "cmake-ninja",
-            "config-opts": [ "-DCMARK_TESTS=OFF" ],
            "sources": [
                {
                    "type": "git",
@@ -136,7 +133,6 @@
        {
            "name": "qcoro",
            "buildsystem": "cmake-ninja",
-            "config-opts": [ "-DQCORO_BUILD_EXAMPLES=OFF", "-DBUILD_TESTING=OFF" ],
            "sources": [
                {
                    "type": "archive",
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-build*
+build
 .clang-format
 .DS_Store
 .kdev4/
@@ -10,5 +10,3 @@ kate.project.ctags.*
 *.user
 .flatpak-builder/
 .idea/
-cmake-build-*
-src/res.generated.qrc
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ include:
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
-#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml
-#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
 #  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -11,7 +11,6 @@ Dependencies:
    'frameworks/kconfig': '@stable'
    'frameworks/syntax-highlighting': '@stable'
    'frameworks/kitemmodels': '@stable'
-    'frameworks/kquickcharts': '@stable'
    'frameworks/knotifications': '@stable'
    'libraries/kquickimageeditor': '@stable'
    'frameworks/sonnet': '@stable'
@@ -39,7 +38,6 @@ Dependencies:
    'frameworks/kconfig': '@latest-kf6'
    'frameworks/syntax-highlighting': '@latest-kf6'
    'frameworks/kitemmodels': '@latest-kf6'
-    'frameworks/kquickcharts': '@latest-kf6'
    'frameworks/knotifications': '@latest-kf6'
    'libraries/kquickimageeditor': '@latest-kf6'
    'frameworks/sonnet': '@latest-kf6'
@@ -57,12 +55,6 @@ Dependencies:
 - 'on': ['Linux/Qt6', 'FreeBSD/Qt6']
  'require':
    'frameworks/kdbusaddons': '@latest-kf6'
-    'frameworks/kstatusnotifieritem': '@latest-kf6'
-
- 'on': ['Linux/Qt6', 'Linux/Qt5']
-  'require':
-    'sdk/selenium-webdriver-at-spi': '@latest-kf6'

 Options:
-  per-test-timeout: 90
-  require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD', 'Windows' ]
+  require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD', 'Windows/Qt5' ]
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,13 +8,13 @@ cmake_minimum_required(VERSION 3.16)

 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "23")
-set(RELEASE_SERVICE_VERSION_MINOR "11")
-set(RELEASE_SERVICE_VERSION_MICRO "70")
+set(RELEASE_SERVICE_VERSION_MINOR "04")
+set(RELEASE_SERVICE_VERSION_MICRO "3")
 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 "5.105.0")
+set(KF_MIN_VERSION "5.91.0")
 set(QT_MIN_VERSION "5.15.2")
 if (ANDROID)
    set(QT_MIN_VERSION "5.15.10")
@@ -27,7 +27,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 5.105)
+set(KDE_COMPILERSETTINGS_LEVEL 5.84)

 include(FeatureSummary)
 include(ECMSetupVersion)
@@ -39,7 +39,6 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMAddAppIcon)
 include(KDEGitCommitHooks)
 include(ECMCheckOutboundLicense)
-include(ECMQtDeclareLoggingCategory)
 if (NOT ANDROID)
    include(KDEClangFormat)
 endif()
@@ -48,41 +47,17 @@ if(NEOCHAT_FLATPAK)
    include(cmake/Flatpak.cmake)
 endif()

-if(QT_MAJOR_VERSION STREQUAL "6")
-    set(BASICLISTITEM_BOLD "font.bold")
-    set(OVERLAYSHEET_OPEN "onOpened")
-    set(QTQUICK_MODULE_QML_VERSION "")
-    set(QTLOCATION_MODULE_QML_VERSION "")
-    set(QTMULTIMEDIA_MODULE_QML_VERSION "")
-    set(QTMULTIMEDIA_AUDIO "MediaPlayer")
-    # in Audio qt6 we don't have it but we disable it in qt5 => it seems ok
-    set(QTMULTIMEDIA_AUDIO_AUTOLOAD "")
-    # In Video qml qt6 we don't have it.
-    set(QTMULTIMEDIA_VIDEO_FLUSHMODE "")
-else()
-    set(BASICLISTITEM_BOLD "bold")
-    set(OVERLAYSHEET_OPEN "onSheetOpenChanged")
-    set(QTQUICK_MODULE_QML_VERSION "2.15")
-    set(QTLOCATION_MODULE_QML_VERSION "5.15")
-    set(QTMULTIMEDIA_MODULE_QML_VERSION "5.15")
-    set(QTMULTIMEDIA_AUDIO "Audio")
-    set(QTMULTIMEDIA_AUDIO_AUTOLOAD "autoLoad: false")
-    set(QTMULTIMEDIA_VIDEO_FLUSHMODE "flushMode: VideoOutput.FirstFrame")
-endif()
-
-set(QUOTIENT_FORCE_NAMESPACED_INCLUDES TRUE)
-
 ecm_setup_version(${PROJECT_VERSION}
    VARIABLE_PREFIX NEOCHAT
    VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
 )

-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg WebView)
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg)
 set_package_properties(Qt${QT_MAJOR_VERSION} PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
 )
-find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels SyntaxHighlighting)
+find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels)
 set_package_properties(KF${QT_MAJOR_VERSION} PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
@@ -93,9 +68,11 @@ set_package_properties(KF${QT_MAJOR_VERSION}Kirigami2 PROPERTIES
        )
 find_package(KF${QT_MAJOR_VERSION}KirigamiAddons 0.7.2 REQUIRED)

-if(QT_MAJOR_VERSION STREQUAL "6")
-    find_package(KF6StatusNotifierItem ${KF_MIN_VERSION} REQUIRED)
-endif()
+find_package(Qt${QT_MAJOR_VERSION}Keychain)
+set_package_properties(Qt${QT_MAJOR_VERSION}Keychain PROPERTIES
+    TYPE REQUIRED
+    PURPOSE "Secure storage of account secrets"
+)

 if(ANDROID)
    find_package(OpenSSL)
@@ -116,23 +93,14 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
    find_package(KF${QT_MAJOR_VERSION}DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()

-if(QT_MAJOR_VERSION STREQUAL "6" AND NOT ANDROID AND NOT WIN32)
-    set(QUOTIENT_SUFFIX "Qt6")
-endif()
-
-find_package(Quotient${QUOTIENT_SUFFIX} 0.7)
-set_package_properties(Quotient${QUOTIENT_SUFFIX} PROPERTIES
+find_package(Quotient 0.6)
+set_package_properties(Quotient PROPERTIES
    TYPE REQUIRED
    DESCRIPTION "Qt wrapper around Matrix API"
    URL "https://github.com/quotient-im/libQuotient/"
    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
@@ -143,8 +111,6 @@ set_package_properties(cmark PROPERTIES

 ecm_find_qmlmodule(org.kde.kquickimageeditor 1.0)
 ecm_find_qmlmodule(org.kde.kitemmodels 1.0)
-ecm_find_qmlmodule(org.kde.quickcharts 1.0)
-ecm_find_qmlmodule(QtLocation ${QTLOCATION_MODULE_QML_VERSION})

 find_package(KQuickImageEditor COMPONENTS)
 set_package_properties(KQuickImageEditor PROPERTIES
@@ -164,8 +130,13 @@ set_package_properties(KF${QT_MAJOR_VERSION}DocTools PROPERTIES DESCRIPTION
    TYPE OPTIONAL
 )

+find_package(Sqlite3)
+
+if(NOT Quotient_VERSION_MINOR GREATER 6)
+    cmake_policy(SET CMP0063 OLD)
+endif()
+
 if(ANDROID)
-    find_package(Sqlite3)
    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/android/version.gradle.in ${CMAKE_BINARY_DIR}/version.gradle)
 endif()

@@ -179,11 +150,9 @@ install(FILES org.kde.neochat.tray.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/h
 add_definitions(-DQT_NO_FOREACH)

 add_subdirectory(src)
-
-if (BUILD_TESTING)
+if (BUILD_TESTING AND Quotient_VERSION_MINOR GREATER 6)
    find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
    add_subdirectory(autotests)
-    add_subdirectory(appiumtests)
 endif()

 if(KF${QT_MAJOR_VERSION}DocTools_FOUND)
@@ -204,9 +173,3 @@ file(GLOB_RECURSE ALL_SOURCE_FILES *.cpp *.h *.qml)
 # Fixes the test by excluding this directory
 list(FILTER ALL_SOURCE_FILES EXCLUDE REGEX [[_(install|build)/.*]])
 ecm_check_outbound_license(LICENSES GPL-3.0-only FILES ${ALL_SOURCE_FILES})
-
-ecm_qt_install_logging_categories(
-        EXPORT NEOCHAT
-        FILE neochat.categories
-        DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
-        )
--- a/README.md
+++ b/README.md
@@ -1,51 +1,24 @@
 <!--
    SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carlschwan@kde.org>
    SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
-    SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
    SPDX-License-Identifier: CC0-1.0
 -->
-
 # NeoChat

-A Qt/QML based Matrix client.
+NeoChat is a client for Matrix, the decentralized communication protocol for instant
+messaging. It is a fork of Spectral, using KDE frameworks, most notably Kirigami,
+KConfig and KI18n.

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

-## Introduction
-
-NeoChat is a client for [Matrix](https://matrix.org), the decentralized communication protocol for instant
-messaging. It is a fork of Spectral, using KDE frameworks, most notably [Kirigami](https://invent.kde.org/frameworks/kirigami)
-to provide a convergent experience across multiple platforms.
-
-NeoChat also make use of other KDE Frameworks as well as [libQuotient](https://github.com/quotient-im/libQuotient), a
-Qt-based SDK for the [Matrix Protocol](https://spec.matrix.org/).
-
-![Timeline](https://cdn.kde.org/screenshots/neochat/application.png)
-
-## Features
-
-NeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions
-of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly
-evolving but the aim remains to provide eventual support for the entire spec.
-
-Due to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:
- Polls - MSC3381
- Sticker Packs - MSC2545
- Location Events - MSC3488

 ## Get it

-Details where to find stable releases for NeoChat can be found on its [homepage](https://apps.kde.org/neochat).
+A stable release [is available](https://apps.kde.org/neochat) for download for Linux distributions.

-In addition to the stable builds, unstable nightly builds are available for all platforms. These can be downloaded
-from the [binary factory](https://binary-factory.kde.org/). There are unstable versions for the following platforms
-in addition to stable ones:
- Android
- MacOS
- Windows

-Additionally the nightly Flatpak version can be obtained from the nightly Flatpak repo using the following commands in your terminal:
+Along with the stable release, a Flatpak version is available for the nightly
+version:

 ```
 flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
@@ -53,53 +26,42 @@ flatpak remote-add --if-not-exists kdeapps --from https://distribute.kde.org/kde
 flatpak install kdeapps org.kde.neochat
 ```

-The unstable Android version can also be obtained from the [KDE nightly F-Droid repo](https://community.kde.org/Android/FDroid).
+A nightly build is also available for Android in the [KDE nightly F-Droid repo](https://community.kde.org/Android/FDroid)
+and can also directly be downloaded from the [binary factory](https://binary-factory.kde.org/view/Android/job/NeoChat_Nightly_android-arm64/).

-## Running
+Nightly builds for [Windows](https://binary-factory.kde.org/job/NeoChat_Nightly_win64/), [MacOS](https://binary-factory.kde.org/job/NeoChat_Nightly_macos/) and [AppImages](https://binary-factory.kde.org/job/NeoChat_Nightly_appimage/) can also be downloaded from the [binary factory](https://binary-factory.kde.org/search/?q=neochat).

-Just start the executable in your preferred way - either from the build directory or from the installed location.
+![Timeline](https://cdn.kde.org/screenshots/neochat/application.png)

-## Building NeoChat
+## Features

-The best way to build KDE apps during development is to use `kdesrc-build`. The full instructions for this can be found on
-the KDE community website's get involved section under [development](https://community.kde.org/Get_Involved/development). This
-is primarily aimed at Linux development.
+* Sending messages
+* Sending files from clipboard and filesystem
+* Reply to message (right-click on a message to access menu)
+* Start a private chat (but not encrypted)
+* Show notifications, for the moment there is only a global switch
+to disable it. We plan to implement the configuration part of the
+specification soon.
+* Autocompletion of usernames in chat
+* Emoji picker
+* Basic room setting page
+* Send and accept invitations
+* /rainbow <message> (very important)
+* /me <message>

-For Windows and Android [Craft](https://invent.kde.org/packaging/craft) is the primary choice. There are guides for setting up
-development environments for [Windows](https://community.kde.org/Get_Involved/development/Windows) and [Android](https://develop.kde.org/docs/packaging/android/building_applications/).
-
-## Tests
-
-Tests are in the repository under [autotests](autotests) and should all pass for any contribution.
-
-The project has CI setup to test new commits to the repository. All tests are expected to pass for a merge request to
-be complete.
-
-Current build status
-
-![coverage](https://invent.kde.org/network/neochat/badges/master/pipeline.svg)
-
-Currently the number of tests is limited, but growing. If anyone wants to help improve this, those
-contributions would be especially welcome.
-
-## Contributing
-
-As is the case throughout the KDE ecosystem contributions are welcome from all. The code base is managed in the
-[NeoChat repository](https://invent.kde.org/network/neochat) of the KDE Gitlab instance.
-
- [Code of Conduct](https://kde.org/code-of-conduct)
- [Report a Bug](https://bugs.kde.org/enter_bug.cgi?format=guided&product=neochat)
- [Feature Request](https://community.kde.org/Infrastructure/GitLab#Submitting_a_merge_request)
- [Create a Merge Request](https://community.kde.org/Infrastructure/GitLab#Submitting_a_merge_request)
- [Translation](https://community.kde.org/Get_Involved/translation)
+NeoChat is still missing a few features to become a full-featured
+Matrix client (most notably encryption support and video chat support).
+We welcome contributions in this direction.

 ## Contact

-The best place to reach the maintainers is on the KDE Matrix instance in the NeoChat channel, [#neochat:kde.org](https://matrix.to/#/#neochat:kde.org).
+You can reach the maintainers at [#neochat:kde.org](https://matrix.to/#/#neochat:kde.org), if you are already on Matrix.
+Development happens in http://invent.kde.org/network/neochat (not in GitHub).

 ## Acknowledgement

-This program utilizes [libQuotient](https://github.com/quotient-im/libQuotient/) as its Matrix SDK.
+This program utilizes [libQuotient](https://github.com/quotient-im/libQuotient/)
+library and some C++ models from [Quaternion](https://github.com/quotient-im/Quaternion/).

 This program is a fork of [Spectral](https://gitlab.com/spectral-im/spectral/).

--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -9,7 +9,7 @@
          android:versionName="${versionName}"
          android:versionCode="${versionCode}"
          android:installLocation="auto">
-    <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="NeoChat" android:icon="@drawable/neochat" android:usesCleartextTraffic="true">
+    <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="NeoChat" android:icon="@drawable/neochat">
        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"
                  android:name="org.qtproject.qt5.android.bindings.QtActivity"
                  android:label="NeoChat"
--- a/appiumtests/CMakeLists.txt
+++ b/appiumtests/CMakeLists.txt
@@ -1,23 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# SPDX-FileCopyrightText: 2022 Harald Sitter <sitter@kde.org>
-
-
-if(NOT BUILD_TESTING OR NOT CMAKE_SYSTEM_NAME MATCHES "Linux")
-    return()
-endif()
-
-find_package(SeleniumWebDriverATSPI)
-set_package_properties(SeleniumWebDriverATSPI PROPERTIES
-    DESCRIPTION "Server component for selenium tests using Linux accessibility infrastructure"
-    PURPOSE "Needed for GUI tests"
-    URL "https://invent.kde.org/sdk/selenium-webdriver-at-spi"
-    TYPE OPTIONAL
-)
-if(NOT SeleniumWebDriverATSPI_FOUND)
-    return()
-endif()
-
-add_test(
-   NAME logintest
-   COMMAND selenium-webdriver-at-spi-run ${CMAKE_CURRENT_SOURCE_DIR}/logintest.py
-)
--- a/appiumtests/login-server.py
+++ b/appiumtests/login-server.py
@@ -1,42 +0,0 @@
-# SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-
-
-from flask import Flask, request, abort
-app = Flask(__name__)
-
-@app.route("/_matrix/client/v3/login", methods=["GET"])
-def login_get():
-    result = dict()
-    result["flows"] = [dict()]
-    result["flows"][0]["type"] = "m.login.password"
-    return result
-
-@app.route("/_matrix/client/v3/login", methods=["POST"])
-def login_post():
-    data = request.get_json()
-    if data["identifier"]["user"] != "user" or data["password"] != "1234":
-        abort(403)
-    print(data)
-    result = dict()
-    result["access_token"] = "token_1234"
-    result["device_id"] = "device_1234"
-    result["user_id"] = "@user:localhost:1234"
-    return result
-
-@app.route("/_matrix/client/r0/sync")
-def sync():
-    result = dict()
-    result["next_batch"] = "batch1234"
-    return result
-
-@app.route("/.well-known/matrix/client")
-def well_known():
-    reply = dict()
-    reply["m.homeserver"] = dict()
-    reply["m.homeserver"]["base_url"] = "https://localhost:1234"
-    return reply
-
-
-if __name__ == "__main__":
-    app.run(ssl_context='adhoc', port=1234)
--- a/appiumtests/logintest.py
+++ b/appiumtests/logintest.py
@@ -1,49 +0,0 @@
-#!/usr/bin/env python3
-
-# SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: 2021-2022 Harald Sitter <sitter@kde.org>
-# SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-
-import unittest
-from appium import webdriver
-from appium.webdriver.common.appiumby import AppiumBy
-from selenium.webdriver.support.ui import WebDriverWait
-import os
-import time
-import subprocess
-import sys
-
-class LoginTest(unittest.TestCase):
-    @classmethod
-    def setUpClass(self):
-        desired_caps = {}
-        desired_caps["app"] = "neochat --ignore-ssl-errors"
-        desired_caps["timeouts"] = {'implicit': 10000}
-        self.driver = webdriver.Remote(
-            command_executor='http://127.0.0.1:4723',
-            desired_capabilities=desired_caps)
-        self.mockServerProcess = subprocess.Popen([sys.executable, os.path.join(os.path.dirname(__file__), "login-server.py")])
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        if not self._outcome.result.wasSuccessful():
-            self.driver.get_screenshot_as_file("failed_test_shot_{}.png".format(self.id()))
-
-    @classmethod
-    def tearDownClass(self):
-        self.mockServerProcess.terminate()
-        self.driver.quit()
-
-    def test_login(self):
-        self.driver.find_element(by=AppiumBy.NAME, value="Login").click()
-
-        self.driver.find_element(by=AppiumBy.NAME, value="Matrix ID").send_keys("@user:localhost:1234")
-        self.driver.find_element(by=AppiumBy.NAME, value="Continue").click()
-        self.driver.find_element(by=AppiumBy.NAME, value="Password").send_keys("1234")
-        self.driver.find_element(by=AppiumBy.NAME, value="Login").click()
-        self.driver.find_element(by=AppiumBy.NAME, value="Join some rooms to get started").click()
-
-if __name__ == '__main__':
-    unittest.main()
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -5,7 +5,7 @@ enable_testing()

 ecm_add_test(
    neochatroomtest.cpp
-    LINK_LIBRARIES neochat Qt::Test
+    LINK_LIBRARIES neochat Qt::Test Quotient
    TEST_NAME neochatroomtest
 )

@@ -14,21 +14,3 @@ ecm_add_test(
    LINK_LIBRARIES neochat Qt::Test
    TEST_NAME texthandlertest
 )
-
-ecm_add_test(
-    delegatesizehelpertest.cpp
-    LINK_LIBRARIES neochat Qt::Test
-    TEST_NAME delegatesizehelpertest
-)
-
-ecm_add_test(
-    mediasizehelpertest.cpp
-    LINK_LIBRARIES neochat Qt::Test
-    TEST_NAME mediasizehelpertest
-)
-
-ecm_add_test(
-    eventhandlertest.cpp
-    LINK_LIBRARIES neochat Qt::Test
-    TEST_NAME eventhandlertest
-)
--- a/autotests/delegatesizehelpertest.cpp
+++ b/autotests/delegatesizehelpertest.cpp
@@ -1,156 +0,0 @@
-// 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 <QObject>
-#include <QTest>
-
-#include "delegatesizehelper.h"
-
-class DelegateSizeHelperTest : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-    void risingPercentage_data();
-    void risingPercentage();
-
-    void fallingPercentage_data();
-    void fallingPercentage();
-
-    void equalPercentage_data();
-    void equalPercentage();
-
-    void equalBreakpoint_data();
-    void equalBreakpoint();
-};
-
-void DelegateSizeHelperTest::risingPercentage_data()
-{
-    QTest::addColumn<qreal>("parentWidth");
-    QTest::addColumn<int>("currentPercentageWidth");
-    QTest::addColumn<qreal>("currentWidth");
-
-    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);
-    QTest::newRow("three hundred") << qreal(300) << int(100) << qreal(300);
-}
-
-void DelegateSizeHelperTest::risingPercentage()
-{
-    QFETCH(qreal, parentWidth);
-    QFETCH(int, currentPercentageWidth);
-    QFETCH(qreal, currentWidth);
-
-    DelegateSizeHelper delegateSizeHelper;
-    delegateSizeHelper.setStartBreakpoint(100);
-    delegateSizeHelper.setEndBreakpoint(200);
-    delegateSizeHelper.setStartPercentWidth(0);
-    delegateSizeHelper.setEndPercentWidth(100);
-
-    delegateSizeHelper.setParentWidth(parentWidth);
-
-    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
-    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
-}
-
-void DelegateSizeHelperTest::fallingPercentage_data()
-{
-    QTest::addColumn<qreal>("parentWidth");
-    QTest::addColumn<int>("currentPercentageWidth");
-    QTest::addColumn<qreal>("currentWidth");
-
-    QTest::newRow("zero") << qreal(0) << int(100) << qreal(0);
-    QTest::newRow("one hundred") << qreal(100) << int(100) << qreal(100);
-    QTest::newRow("one fifty") << qreal(150) << int(50) << qreal(75);
-    QTest::newRow("two hundred") << qreal(200) << int(0) << qreal(0);
-    QTest::newRow("three hundred") << qreal(300) << int(0) << qreal(0);
-}
-
-void DelegateSizeHelperTest::fallingPercentage()
-{
-    QFETCH(qreal, parentWidth);
-    QFETCH(int, currentPercentageWidth);
-    QFETCH(qreal, currentWidth);
-
-    DelegateSizeHelper delegateSizeHelper;
-    delegateSizeHelper.setStartBreakpoint(100);
-    delegateSizeHelper.setEndBreakpoint(200);
-    delegateSizeHelper.setStartPercentWidth(100);
-    delegateSizeHelper.setEndPercentWidth(0);
-
-    delegateSizeHelper.setParentWidth(parentWidth);
-
-    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
-    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
-}
-
-void DelegateSizeHelperTest::equalPercentage_data()
-{
-    QTest::addColumn<qreal>("parentWidth");
-    QTest::addColumn<int>("currentPercentageWidth");
-    QTest::addColumn<qreal>("currentWidth");
-
-    QTest::newRow("zero") << qreal(0) << int(50) << qreal(0);
-    QTest::newRow("one hundred") << qreal(100) << int(50) << qreal(50);
-    QTest::newRow("one fifty") << qreal(150) << int(50) << qreal(75);
-    QTest::newRow("two hundred") << qreal(200) << int(50) << qreal(100);
-    QTest::newRow("three hundred") << qreal(300) << int(50) << qreal(150);
-}
-
-void DelegateSizeHelperTest::equalPercentage()
-{
-    QFETCH(qreal, parentWidth);
-    QFETCH(int, currentPercentageWidth);
-    QFETCH(qreal, currentWidth);
-
-    DelegateSizeHelper delegateSizeHelper;
-    delegateSizeHelper.setStartBreakpoint(100);
-    delegateSizeHelper.setEndBreakpoint(200);
-    delegateSizeHelper.setStartPercentWidth(50);
-    delegateSizeHelper.setEndPercentWidth(50);
-
-    delegateSizeHelper.setParentWidth(parentWidth);
-
-    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
-    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
-}
-
-void DelegateSizeHelperTest::equalBreakpoint_data()
-{
-    QTest::addColumn<int>("startPercentageWidth");
-    QTest::addColumn<int>("endPercentageWidth");
-    QTest::addColumn<int>("currentPercentageWidth");
-    QTest::addColumn<qreal>("currentWidth");
-
-    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(-1) << qreal(0);
-}
-
-/**
- * We expect a default return except in the case where the the two percentages are
- * equal as that case can be calculated without dividing by zero.
- */
-void DelegateSizeHelperTest::equalBreakpoint()
-{
-    QFETCH(int, startPercentageWidth);
-    QFETCH(int, endPercentageWidth);
-    QFETCH(int, currentPercentageWidth);
-    QFETCH(qreal, currentWidth);
-
-    DelegateSizeHelper delegateSizeHelper;
-    delegateSizeHelper.setStartBreakpoint(100);
-    delegateSizeHelper.setEndBreakpoint(100);
-    delegateSizeHelper.setStartPercentWidth(startPercentageWidth);
-    delegateSizeHelper.setEndPercentWidth(endPercentageWidth);
-
-    delegateSizeHelper.setParentWidth(1000);
-
-    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
-    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
-}
-
-QTEST_GUILESS_MAIN(DelegateSizeHelperTest)
-#include "delegatesizehelpertest.moc"
--- a/autotests/eventhandlertest.cpp
+++ b/autotests/eventhandlertest.cpp
@@ -1,729 +0,0 @@
-// 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 <QObject>
-#include <QTest>
-
-#include "eventhandler.h"
-
-#include <KFormat>
-
-#include <Quotient/connection.h>
-#include <Quotient/quotient_common.h>
-#include <Quotient/syncdata.h>
-
-#include "enums/delegatetype.h"
-#include "linkpreviewer.h"
-#include "models/reactionmodel.h"
-#include "neochatroom.h"
-#include "utils.h"
-
-using namespace Quotient;
-
-class TestRoom : public NeoChatRoom
-{
-public:
-    using NeoChatRoom::NeoChatRoom;
-
-    void update(SyncRoomData &&data, bool fromCache = false)
-    {
-        Room::updateData(std::move(data), fromCache);
-    }
-};
-
-class EventHandlerTest : public QObject
-{
-    Q_OBJECT
-
-private:
-    Connection *connection = nullptr;
-    TestRoom *room = nullptr;
-    EventHandler eventHandler;
-
-private Q_SLOTS:
-    void initTestCase();
-
-    void eventId();
-    void delegateType_data();
-    void delegateType();
-    void author();
-    void authorDisplayName();
-    void time();
-    void timeString();
-    void highlighted();
-    void hidden();
-    void body();
-    void genericBody_data();
-    void genericBody();
-    void mediaInfo();
-    void linkPreviewer();
-    void reactions();
-    void hasReply();
-    void replyId();
-    void replyDelegateType();
-    void replyAuthor();
-    void replyBody();
-    void replyMediaInfo();
-    void location();
-    void readMarkers();
-};
-
-void EventHandlerTest::initTestCase()
-{
-    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
-
-    const auto json = QJsonDocument::fromJson(R"EVENT({
-  "account_data": {
-    "events": [
-      {
-        "content": {
-          "tags": {
-            "u.work": {
-              "order": 0.9
-            }
-          }
-        },
-        "type": "m.tag"
-      },
-      {
-        "content": {
-          "custom_config_key": "custom_config_value"
-        },
-        "type": "org.example.custom.room.config"
-      }
-    ]
-  },
-  "ephemeral": {
-    "events": [
-      {
-        "content": {
-          "user_ids": [
-            "@alice:matrix.org",
-            "@bob:example.com"
-          ]
-        },
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "type": "m.typing"
-      },
-      {
-        "content": {
-          "$153456789:example.org": {
-            "m.read": {
-              "@alice:matrix.org": {
-                "ts": 1436451550453
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1532735824654:example.org": {
-            "m.read": {
-              "@bob:example.com": {
-                "ts": 1436451550453
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1532735824654:example.org": {
-            "m.read": {
-              "@tim:example.com": {
-                "ts": 1436451550454
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1532735824654:example.org": {
-            "m.read": {
-              "@jeff:example.com": {
-                "ts": 1436451550455
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1532735824654:example.org": {
-            "m.read": {
-              "@tina:example.com": {
-                "ts": 1436451550456
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1532735824654:example.org": {
-            "m.read": {
-              "@sally:example.com": {
-                "ts": 1436451550457
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1532735824654:example.org": {
-            "m.read": {
-              "@fred:example.com": {
-                "ts": 1436451550458
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      }
-    ]
-  },
-  "state": {
-    "events": [
-      {
-        "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Alice Margatroid",
-          "membership": "join",
-          "reason": "Looking for support"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1432735824653,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "state_key": "@alice:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      }
-    ]
-  },
-  "summary": {
-    "m.heroes": [
-      "@alice:example.com",
-      "@bob:example.com"
-    ],
-    "m.invited_member_count": 0,
-    "m.joined_member_count": 2
-  },
-  "timeline": {
-    "events": [
-      {
-        "content": {
-          "body": "This is an example\ntext message",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "<b>This is an example<br>text message</b>",
-          "msgtype": "m.text"
-        },
-        "event_id": "$153456789:example.org",
-        "origin_server_ts": 1432735824654,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "avatar_url": "mxc://kde.org/123456",
-          "displayname": "after",
-          "membership": "join"
-        },
-        "origin_server_ts": 1690651134736,
-        "sender": "@example:example.org",
-        "state_key": "@example:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "replaces_state": "$1234567890:example.org",
-          "prev_content": {
-            "avatar_url": "mxc://kde.org/12345",
-            "displayname": "before",
-            "membership": "join"
-          },
-          "prev_sender": "@example:example.orgg",
-          "age": 1234
-        },
-        "event_id": "$143273583553PhrSn:example.org",
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org"
-      },
-      {
-        "content": {
-          "body": "This is a highlight @bob:kde.org and this is a link https://kde.org",
-          "format": "org.matrix.custom.html",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1532735824654:example.org",
-        "origin_server_ts": 1532735824654,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1233
-        }
-      },
-      {
-        "content": {
-            "m.relates_to": {
-            "event_id": "$153456789:example.org",
-            "key": "👍",
-            "rel_type": "m.annotation"
-            }
-        },
-        "origin_server_ts": 1690322545182,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@alice:matrix.org",
-        "type": "m.reaction",
-        "unsigned": {
-            "age": 390159120
-        },
-        "event_id": "$163456789:example.org",
-        "age": 390159120
-      },
-      {
-        "age": 4926305285,
-        "content": {
-            "body": "video caption",
-            "filename": "video.mp4",
-            "info": {
-                "duration": 10,
-                "h": 1080,
-                "mimetype": "video/mp4",
-                "size": 62650636,
-                "w": 1920,
-                "thumbnail_info": {
-                    "h": 450,
-                    "mimetype": "image/jpeg",
-                    "size": 382249,
-                    "w": 800
-                },
-                "thumbnail_url": "mxc://kde.org/2234567"
-            },
-            "msgtype": "m.video",
-            "url": "mxc://kde.org/1234567"
-        },
-        "event_id": "$263456789:example.org",
-        "origin_server_ts": 1685793783330,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 4926305285
-        },
-        "user_id": "@example:example.org"
-      },
-      {
-        "content": {
-            "body": "> <@example:example.org> This is an example\ntext message\n\nreply",
-            "format": "org.matrix.custom.html",
-            "formatted_body": "<mx-reply><blockquote><a href=\"https://matrix.to/#/!jEsUZKDJdhlrceRyVU:example.org/$153456789:example.org?via=kde.org&via=matrix.org\">In reply to</a> <a href=\"https://matrix.to/#/@example:example.org\">@example:example.org</a><br><b>This is an example<br>text message</b></blockquote></mx-reply>reply",
-            "m.relates_to": {
-                "m.in_reply_to": {
-                    "event_id": "$153456789:example.org"
-                }
-            },
-            "msgtype": "m.text"
-        },
-        "origin_server_ts": 1690725965572,
-        "sender": "@alice:matrix.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 98
-        },
-        "event_id": "$154456789:example.org",
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org"
-      },
-      {
-        "content": {
-            "body": "> <@example:example.org> video caption\n\nreply",
-            "m.relates_to": {
-                "m.in_reply_to": {
-                    "event_id": "$263456789:example.org"
-                }
-            },
-            "msgtype": "m.text"
-        },
-        "origin_server_ts": 1690725965573,
-        "sender": "@alice:matrix.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 98
-        },
-        "event_id": "$154456799:example.org",
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org"
-      },
-      {
-        "age": 96845207,
-        "content": {
-            "body": "Lat: 51.7035, Lon: -1.14394",
-            "geo_uri": "geo:51.7035,-1.14394",
-            "msgtype": "m.location",
-            "org.matrix.msc1767.text": "Lat: 51.7035, Lon: -1.14394",
-            "org.matrix.msc3488.asset": {
-                "type": "m.pin"
-            },
-            "org.matrix.msc3488.location": {
-                "uri": "geo:51.7035,-1.14394"
-            }
-        },
-        "event_id": "$1544567999:example.org",
-        "origin_server_ts": 1690821582876,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 96845207
-        }
-      }
-    ],
-    "limited": true,
-    "prev_batch": "t34-23535_0_0"
-  }
-})EVENT");
-    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, json.object());
-    room->update(std::move(roomData));
-
-    eventHandler.setRoom(room);
-}
-
-void EventHandlerTest::eventId()
-{
-    eventHandler.setEvent(room->messageEvents().at(0).get());
-
-    QCOMPARE(eventHandler.getId(), QStringLiteral("$153456789:example.org"));
-}
-
-void EventHandlerTest::delegateType_data()
-{
-    QTest::addColumn<int>("eventNum");
-    QTest::addColumn<DelegateType::Type>("delegateType");
-
-    QTest::newRow("message") << 0 << DelegateType::Message;
-    QTest::newRow("state") << 1 << DelegateType::State;
-    QTest::newRow("message 2") << 2 << DelegateType::Message;
-    QTest::newRow("reaction") << 3 << DelegateType::Other;
-    QTest::newRow("video") << 4 << DelegateType::Video;
-    QTest::newRow("location") << 7 << DelegateType::Location;
-}
-
-void EventHandlerTest::delegateType()
-{
-    QFETCH(int, eventNum);
-    QFETCH(DelegateType::Type, delegateType);
-
-    eventHandler.setEvent(room->messageEvents().at(eventNum).get());
-
-    QCOMPARE(eventHandler.getDelegateType(), delegateType);
-}
-
-void EventHandlerTest::author()
-{
-    auto event = room->messageEvents().at(0).get();
-    auto author = room->user(event->senderId());
-    eventHandler.setEvent(event);
-
-    auto eventHandlerAuthor = eventHandler.getAuthor();
-
-    QCOMPARE(eventHandlerAuthor["isLocalUser"_ls], author->id() == room->localUser()->id());
-    QCOMPARE(eventHandlerAuthor["id"_ls], author->id());
-    QCOMPARE(eventHandlerAuthor["displayName"_ls], author->displayname(room));
-    QCOMPARE(eventHandlerAuthor["avatarSource"_ls], room->avatarForMember(author));
-    QCOMPARE(eventHandlerAuthor["avatarMediaId"_ls], author->avatarMediaId(room));
-    QCOMPARE(eventHandlerAuthor["color"_ls], Utils::getUserColor(author->hueF()));
-    QCOMPARE(eventHandlerAuthor["object"_ls], QVariant::fromValue(author));
-}
-
-void EventHandlerTest::authorDisplayName()
-{
-    auto event = room->messageEvents().at(1).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getAuthorDisplayName(), QStringLiteral("before"));
-}
-
-void EventHandlerTest::time()
-{
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getTime(), QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC));
-    QCOMPARE(eventHandler.getTime(true, QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC)), QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC));
-}
-
-void EventHandlerTest::timeString()
-{
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    KFormat format;
-
-    QCOMPARE(eventHandler.getTimeString(false),
-             QLocale().toString(QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toLocalTime().time(), QLocale::ShortFormat));
-    QCOMPARE(eventHandler.getTimeString(true),
-             format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(eventHandler.getTimeString(false, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
-             QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().time(), QLocale::ShortFormat));
-    QCOMPARE(eventHandler.getTimeString(true, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
-             format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(eventHandler.getTimeString(false, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
-             QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().time(), QLocale::LongFormat));
-    QCOMPARE(eventHandler.getTimeString(true, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
-             format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().date(), QLocale::LongFormat));
-}
-
-void EventHandlerTest::highlighted()
-{
-    auto event = room->messageEvents().at(2).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isHighlighted(), true);
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isHighlighted(), false);
-}
-
-void EventHandlerTest::hidden()
-{
-    auto event = room->messageEvents().at(3).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isHidden(), true);
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isHidden(), false);
-}
-
-void EventHandlerTest::body()
-{
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getRichBody(), QStringLiteral("<b>This is an example<br>text message</b>"));
-    QCOMPARE(eventHandler.getRichBody(true), QStringLiteral("<b>This is an example text message</b>"));
-    QCOMPARE(eventHandler.getPlainBody(), QStringLiteral("This is an example\ntext message"));
-    QCOMPARE(eventHandler.getPlainBody(true), QStringLiteral("This is an example text message"));
-}
-
-void EventHandlerTest::genericBody_data()
-{
-    QTest::addColumn<int>("eventNum");
-    QTest::addColumn<QString>("output");
-
-    QTest::newRow("message") << 0 << QStringLiteral("sent a message");
-    QTest::newRow("member") << 1 << QStringLiteral("changed their display name and updated their avatar");
-    QTest::newRow("message 2") << 2 << QStringLiteral("sent a message");
-    QTest::newRow("reaction") << 3 << QStringLiteral("Unknown event");
-    QTest::newRow("video") << 4 << QStringLiteral("sent a message");
-}
-
-void EventHandlerTest::genericBody()
-{
-    QFETCH(int, eventNum);
-    QFETCH(QString, output);
-
-    eventHandler.setEvent(room->messageEvents().at(eventNum).get());
-
-    QCOMPARE(eventHandler.getGenericBody(), output);
-}
-
-void EventHandlerTest::mediaInfo()
-{
-    auto event = room->messageEvents().at(4).get();
-    eventHandler.setEvent(event);
-
-    auto mediaInfo = eventHandler.getMediaInfo();
-    auto thumbnailInfo = mediaInfo["tempInfo"_ls].toMap();
-
-    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::linkPreviewer()
-{
-    auto event = room->messageEvents().at(2).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getLinkPreviewer()->url(), QUrl("https://kde.org"_ls));
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getLinkPreviewer(), nullptr);
-}
-
-void EventHandlerTest::reactions()
-{
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReactions()->rowCount(), 1);
-}
-
-void EventHandlerTest::hasReply()
-{
-    auto event = room->messageEvents().at(5).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.hasReply(), true);
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.hasReply(), false);
-}
-
-void EventHandlerTest::replyId()
-{
-    auto event = room->messageEvents().at(5).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReplyId(), QStringLiteral("$153456789:example.org"));
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReplyId(), QStringLiteral(""));
-}
-
-void EventHandlerTest::replyDelegateType()
-{
-    auto event = room->messageEvents().at(5).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReplyDelegateType(), DelegateType::Message);
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReplyDelegateType(), DelegateType::Other);
-}
-
-void EventHandlerTest::replyAuthor()
-{
-    auto event = room->messageEvents().at(5).get();
-    auto replyEvent = room->messageEvents().at(0).get();
-    auto replyAuthor = room->user(replyEvent->senderId());
-    eventHandler.setEvent(event);
-
-    auto eventHandlerReplyAuthor = eventHandler.getReplyAuthor();
-
-    QCOMPARE(eventHandlerReplyAuthor["isLocalUser"_ls], replyAuthor->id() == room->localUser()->id());
-    QCOMPARE(eventHandlerReplyAuthor["id"_ls], replyAuthor->id());
-    QCOMPARE(eventHandlerReplyAuthor["displayName"_ls], replyAuthor->displayname(room));
-    QCOMPARE(eventHandlerReplyAuthor["avatarSource"_ls], room->avatarForMember(replyAuthor));
-    QCOMPARE(eventHandlerReplyAuthor["avatarMediaId"_ls], replyAuthor->avatarMediaId(room));
-    QCOMPARE(eventHandlerReplyAuthor["color"_ls], Utils::getUserColor(replyAuthor->hueF()));
-    QCOMPARE(eventHandlerReplyAuthor["object"_ls], QVariant::fromValue(replyAuthor));
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReplyAuthor(), room->getUser(nullptr));
-}
-
-void EventHandlerTest::replyBody()
-{
-    auto event = room->messageEvents().at(5).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReplyRichBody(), QStringLiteral("<b>This is an example<br>text message</b>"));
-    QCOMPARE(eventHandler.getReplyRichBody(true), QStringLiteral("<b>This is an example text message</b>"));
-    QCOMPARE(eventHandler.getReplyPlainBody(), QStringLiteral("This is an example\ntext message"));
-    QCOMPARE(eventHandler.getReplyPlainBody(true), QStringLiteral("This is an example text message"));
-}
-
-void EventHandlerTest::replyMediaInfo()
-{
-    auto event = room->messageEvents().at(6).get();
-    auto replyEvent = room->messageEvents().at(4).get();
-    eventHandler.setEvent(event);
-
-    auto mediaInfo = eventHandler.getReplyMediaInfo();
-    auto thumbnailInfo = mediaInfo["tempInfo"_ls].toMap();
-
-    QCOMPARE(mediaInfo["source"_ls], room->makeMediaUrl(replyEvent->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(replyEvent->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::location()
-{
-    auto event = room->messageEvents().at(7).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getLatitude(), QStringLiteral("51.7035").toFloat());
-    QCOMPARE(eventHandler.getLongitude(), QStringLiteral("-1.14394").toFloat());
-    QCOMPARE(eventHandler.getLocationAssetType(), QStringLiteral("m.pin"));
-}
-
-void EventHandlerTest::readMarkers()
-{
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.hasReadMarkers(), true);
-
-    auto readMarkers = eventHandler.getReadMarkers();
-
-    QCOMPARE(readMarkers.size(), 1);
-    QCOMPARE(readMarkers[0].toMap()["id"_ls], QStringLiteral("@alice:matrix.org"));
-
-    QCOMPARE(eventHandler.getNumberExcessReadMarkers(), QString());
-    QCOMPARE(eventHandler.getReadMarkersString(), QStringLiteral("1 user: @alice:matrix.org"));
-
-    event = room->messageEvents().at(2).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.hasReadMarkers(), true);
-
-    readMarkers = eventHandler.getReadMarkers();
-
-    QCOMPARE(readMarkers.size(), 5);
-
-    QCOMPARE(eventHandler.getNumberExcessReadMarkers(), QStringLiteral("+ 1"));
-    // There are no guarantees on the order of the users it will be different every time so don't match the whole string.
-    QCOMPARE(eventHandler.getReadMarkersString().startsWith(QStringLiteral("6 users:")), true);
-}
-
-QTEST_MAIN(EventHandlerTest)
-#include "eventhandlertest.moc"
--- a/autotests/mediasizehelpertest.cpp
+++ b/autotests/mediasizehelpertest.cpp
@@ -1,72 +0,0 @@
-// 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 <QObject>
-#include <QTest>
-#include <qglobal.h>
-#include <qtestcase.h>
-
-#include <cmath>
-
-#include "mediasizehelper.h"
-#include "neochatconfig.h"
-
-class MediaSizeHelperTest : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-    void uninitialized();
-
-    void limits_data();
-    void limits();
-};
-
-void MediaSizeHelperTest::uninitialized()
-{
-    MediaSizeHelper mediasizehelper;
-    QCOMPARE(mediasizehelper.currentSize(), QSize(540, qRound(qreal(NeoChatConfig::self()->mediaMaxWidth()) / qreal(16.0) * qreal(9.0))));
-}
-
-void MediaSizeHelperTest::limits_data()
-{
-    QTest::addColumn<qreal>("mediaWidth");
-    QTest::addColumn<qreal>("mediaHeight");
-    QTest::addColumn<qreal>("contentMaxWidth");
-    QTest::addColumn<qreal>("contentMaxHeight");
-    QTest::addColumn<QSize>("currentSize");
-
-    QTest::newRow("media smaller than content limits") << qreal(200) << qreal(150) << qreal(400) << qreal(900) << QSize(200, 150);
-    QTest::newRow("media smaller than max limits") << qreal(200) << qreal(150) << qreal(-1) << qreal(-1) << QSize(200, 150);
-
-    QTest::newRow("limit by max width") << qreal(600) << qreal(50) << qreal(-1) << qreal(-1) << QSize(540, qRound(qreal(540) / (qreal(600) / qreal(50))));
-    QTest::newRow("limit by max height") << qreal(50) << qreal(600) << qreal(-1) << qreal(-1) << QSize(qRound(qreal(540) * (qreal(50) / qreal(600))), 540);
-
-    QTest::newRow("limit by content width") << qreal(600) << qreal(50) << qreal(300) << qreal(-1) << QSize(300, qRound(qreal(300) / (qreal(600) / qreal(50))));
-    QTest::newRow("limit by content height") << qreal(50) << qreal(600) << qreal(-1) << qreal(300) << QSize(qRound(qreal(300) * (qreal(50) / qreal(600))), 300);
-
-    QTest::newRow("limit by content width tall media")
-        << qreal(400) << qreal(600) << qreal(100) << qreal(400) << QSize(100, qRound(qreal(100) / (qreal(400) / qreal(600))));
-    QTest::newRow("limit by content height wide media")
-        << qreal(1000) << qreal(600) << qreal(400) << qreal(100) << QSize(qRound(qreal(100) * (qreal(1000) / qreal(600))), 100);
-}
-
-void MediaSizeHelperTest::limits()
-{
-    QFETCH(qreal, mediaWidth);
-    QFETCH(qreal, mediaHeight);
-    QFETCH(qreal, contentMaxWidth);
-    QFETCH(qreal, contentMaxHeight);
-    QFETCH(QSize, currentSize);
-
-    MediaSizeHelper mediasizehelper;
-    mediasizehelper.setMediaWidth(mediaWidth);
-    mediasizehelper.setMediaHeight(mediaHeight);
-    mediasizehelper.setContentMaxWidth(contentMaxWidth);
-    mediasizehelper.setContentMaxHeight(contentMaxHeight);
-
-    QCOMPARE(mediasizehelper.currentSize(), currentSize);
-}
-
-QTEST_GUILESS_MAIN(MediaSizeHelperTest)
-#include "mediasizehelpertest.moc"
--- a/autotests/neochatroomtest.cpp
+++ b/autotests/neochatroomtest.cpp
@@ -7,9 +7,9 @@

 #include "neochatroom.h"

-#include <Quotient/connection.h>
-#include <Quotient/quotient_common.h>
-#include <Quotient/syncdata.h>
+#include <connection.h>
+#include <quotient_common.h>
+#include <syncdata.h>

 using namespace Quotient;

@@ -144,5 +144,5 @@ void NeoChatRoomTest::eventTest()
    QCOMPARE(room->timelineSize(), 1);
 }

-QTEST_GUILESS_MAIN(NeoChatRoomTest)
+QTEST_MAIN(NeoChatRoomTest)
 #include "neochatroomtest.moc"
--- a/autotests/texthandlertest.cpp
+++ b/autotests/texthandlertest.cpp
@@ -6,11 +6,9 @@

 #include "texthandler.h"

-#include <Quotient/quotient_common.h>
-#include <Quotient/syncdata.h>
-#include <qnamespace.h>
-
-#include "utils.h"
+#include <connection.h>
+#include <quotient_common.h>
+#include <syncdata.h>

 using namespace Quotient;

@@ -51,8 +49,7 @@ private Q_SLOTS:
    void receiveStripReply();
    void receivePlainTextIn();

-    void receiveRichInPlainOut_data();
-    void receiveRichInPlainOut();
+    void recieveRichInPlainOut();
    void receivePlainStripHtml();
    void receivePlainStripMarkup();
    void receiveStripNewlines();
@@ -62,17 +59,11 @@ private Q_SLOTS:
    void receiveRichtextIn();
    void receiveRichMxcUrl();
    void receiveRichPlainUrl();
-    void receiveRichEmote();
-    void receiveRichEdited_data();
-    void receiveRichEdited();
-    void receiveLineSeparator();

-    void linkPreviewsMatch_data();
-    void linkPreviewsMatch();
-    void linkPreviewsReject_data();
-    void linkPreviewsReject();
+    void receiveLineSeparator();
 };

+#ifdef QUOTIENT_07
 void TextHandlerTest::initTestCase()
 {
    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
@@ -157,44 +148,7 @@ void TextHandlerTest::initTestCase()
        "sender": "@example:example.org",
        "type": "m.room.message",
        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "body": "/me This is an emote.",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "This is an emote.",
-          "msgtype": "m.emote"
-        },
-        "event_id": "$153273582443PhrSn:example.org",
-        "origin_server_ts": 1532735824654,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1231
-        }
-      },
-      {
-        "content": {
-            "body": "tested",
-            "msgtype": "m.text"
-        },
-        "event_id": "$zrCiBxBnqqTn0Z5FY78qSZAszno_w8nJJXzfBULG-3E",
-        "origin_server_ts": 1680948575928,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 1747776,
-            "m.relations": {
-                "m.replace": {
-                    "event_id": "$UX0PlpyI7vYO32iHMuuYEP7ECMh4sX3XLGiB2SwM4mQ",
-                    "origin_server_ts": 1680948580992,
-                    "sender": "@example:example.org"
-                }
-            }
+          "age": 1235
        }
      }
    ],
@@ -205,6 +159,7 @@ void TextHandlerTest::initTestCase()
    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, json.object());
    room->update(std::move(roomData));
 }
+#endif

 void TextHandlerTest::allowedAttributes()
 {
@@ -356,25 +311,15 @@ void TextHandlerTest::receiveStripReply()
    QCOMPARE(testTextHandler.handleRecievePlainText(), testOutputString);
 }

-void TextHandlerTest::receiveRichInPlainOut_data()
+void TextHandlerTest::recieveRichInPlainOut()
 {
-    QTest::addColumn<QString>("testInputString");
-    QTest::addColumn<QString>("testOutputString");
-
-    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");
-}
-
-void TextHandlerTest::receiveRichInPlainOut()
-{
-    QFETCH(QString, testInputString);
-    QFETCH(QString, testOutputString);
+    const QString testInputString = QStringLiteral("a &amp; b");
+    const QString testOutputString = QStringLiteral("a & b");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);

-    QCOMPARE(testTextHandler.handleRecievePlainText(Qt::RichText), testOutputString);
+    QCOMPARE(testTextHandler.handleRecievePlainText(), testOutputString);
 }

 void TextHandlerTest::receivePlainTextIn()
@@ -480,6 +425,7 @@ void TextHandlerTest::receiveRichtextIn()
    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
 }

+#ifdef QUOTIENT_07
 void TextHandlerTest::receiveRichMxcUrl()
 {
    const QString testInputString = QStringLiteral(
@@ -495,8 +441,9 @@ void TextHandlerTest::receiveRichMxcUrl()
    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);

-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, room->messageEvents().at(0).get()), testOutputString);
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, room->messageEvents().back().get()), testOutputString);
 }
+#endif

 /**
 * For when your rich input string has a plain text url left in.
@@ -553,45 +500,6 @@ void TextHandlerTest::receiveRichPlainUrl()
    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxId);
 }

-// Test that user pill is add to an emote message.
-// N.B. The second message in the test timeline is marked as an emote.
-void TextHandlerTest::receiveRichEmote()
-{
-    auto event = room->messageEvents().at(1).get();
-    auto author = room->user(event->senderId());
-    const QString testInputString = QStringLiteral("This is an emote.");
-    const QString testOutputString = QStringLiteral("* <a href=\"https://matrix.to/#/@example:example.org\" style=\"color:")
-        + Utils::getUserColor(author->hueF()).name() + QStringLiteral("\">@example:example.org</a> This is an emote.");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, event), testOutputString);
-}
-
-void TextHandlerTest::receiveRichEdited_data()
-{
-    QTest::addColumn<QString>("testInputString");
-    QTest::addColumn<QString>("testOutputString");
-
-    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>");
-    QTest::newRow("blockquote") << QStringLiteral("<blockquote>Edited</blockquote>")
-                                << QStringLiteral("<blockquote>Edited</blockquote><p> <span style=\"color:#000000\">(edited)</span></p>");
-}
-
-void TextHandlerTest::receiveRichEdited()
-{
-    QFETCH(QString, testInputString);
-    QFETCH(QString, testOutputString);
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, room->messageEvents().at(2).get()), testOutputString);
-}
-
 void TextHandlerTest::receiveLineSeparator()
 {
    auto text = QStringLiteral("foo\u2028bar");
@@ -600,52 +508,5 @@ void TextHandlerTest::receiveLineSeparator()
    QCOMPARE(textHandler.handleRecievePlainText(Qt::PlainText, true), QStringLiteral("foo bar"));
 }

-void TextHandlerTest::linkPreviewsMatch_data()
-{
-    QTest::addColumn<QString>("testInputString");
-    QTest::addColumn<QList<QUrl>>("testOutputLinks");
-
-    QTest::newRow("plainHttps") << QStringLiteral("https://kde.org") << QList<QUrl>({QUrl("https://kde.org"_ls)});
-    QTest::newRow("richHttps") << QStringLiteral("<a href=\"https://kde.org\">Rich Link</a>") << QList<QUrl>({QUrl("https://kde.org"_ls)});
-    QTest::newRow("plainWww") << QStringLiteral("www.example.org") << QList<QUrl>({QUrl("www.example.org"_ls)});
-    QTest::newRow("multipleHttps") << QStringLiteral("https://kde.org www.example.org")
-                                   << QList<QUrl>({
-                                          QUrl("https://kde.org"_ls),
-                                          QUrl("www.example.org"_ls),
-                                      });
-}
-
-void TextHandlerTest::linkPreviewsMatch()
-{
-    QFETCH(QString, testInputString);
-    QFETCH(QList<QUrl>, testOutputLinks);
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.getLinkPreviews(), testOutputLinks);
-}
-
-void TextHandlerTest::linkPreviewsReject_data()
-{
-    QTest::addColumn<QString>("testInputString");
-    QTest::addColumn<QList<QUrl>>("testOutputLinks");
-
-    QTest::newRow("mxc") << QStringLiteral("mxc://example.org/SEsfnsuifSDFSSEF") << QList<QUrl>();
-    QTest::newRow("matrixTo") << QStringLiteral("https://matrix.to/#/@alice:example.org") << QList<QUrl>();
-    QTest::newRow("noSpace") << QStringLiteral("testhttps://kde.org") << QList<QUrl>();
-}
-
-void TextHandlerTest::linkPreviewsReject()
-{
-    QFETCH(QString, testInputString);
-    QFETCH(QList<QUrl>, testOutputLinks);
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.getLinkPreviews(), testOutputLinks);
-}
-
 QTEST_MAIN(TextHandlerTest)
 #include "texthandlertest.moc"
--- a/icons/300-apps-neochat.png
+++ b/icons/300-apps-neochat.png
--- a/icons/windows/promoimage-1920x1080.png
+++ b/icons/windows/promoimage-1920x1080.png
--- a/icons/windows/storelogo-1080x1080.png
+++ b/icons/windows/storelogo-1080x1080.png
--- a/icons/windows/storelogo-720x1080.png
+++ b/icons/windows/storelogo-720x1080.png
--- a/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
@@ -18,7 +18,6 @@
  <name xml:lang="de">NeoChat</name>
  <name xml:lang="el">NeoChat</name>
  <name xml:lang="en-GB">NeoChat</name>
-  <name xml:lang="eo">NeoChat</name>
  <name xml:lang="es">NeoChat</name>
  <name xml:lang="eu">NeoChat</name>
  <name xml:lang="fi">NeoChat</name>
@@ -46,26 +45,42 @@
  <name xml:lang="uk">NeoChat</name>
  <name xml:lang="x-test">xxNeoChatxx</name>
  <name xml:lang="zh-CN">NeoChat</name>
-  <summary>Chat with your friends on matrix</summary>
-  <summary xml:lang="ar">دردش مع أصدقائك على ماتركس</summary>
-  <summary xml:lang="ca">Xategeu amb els vostres amics a Matrix</summary>
-  <summary xml:lang="ca-valencia">Xategeu amb els vostres amics a Matrix</summary>
-  <summary xml:lang="eo">Babilu kun viaj amikoj sur matrix</summary>
-  <summary xml:lang="es">Charle con sus amigos en matrix</summary>
-  <summary xml:lang="eu">Berriketan jardun zure lagunekin «Matrix»en</summary>
-  <summary xml:lang="fr">Discuter avec vos ami(e)s sur le réseau Matrix</summary>
-  <summary xml:lang="gl">Charle coas súas amizades en Matrix.</summary>
-  <summary xml:lang="it">Conversa con i tuoi contatti su matrix</summary>
-  <summary xml:lang="ka">ესაუბრეთ მეგობრებს Matrix-ზე</summary>
-  <summary xml:lang="ko">Matrix를 사용하여 친구들과 대화하기</summary>
-  <summary xml:lang="nl">Met uw vrienden chatten op matrix</summary>
-  <summary xml:lang="nn">Prat med vennar på Matrix</summary>
-  <summary xml:lang="sl">Klepet z vašimi prijatelji na matrixu</summary>
-  <summary xml:lang="sv">Chatta med dina vänner på Matrix</summary>
-  <summary xml:lang="ta">மேட்ரிக்ஸு மூலம் உங்கள் நண்பர்களிடம் பேசலாம்</summary>
-  <summary xml:lang="tr">Matrix'te arkadaşlarınızla sohbet edin</summary>
-  <summary xml:lang="uk">Спілкуйтеся з вашими друзями у matrix</summary>
-  <summary xml:lang="x-test">xxChat with your friends on matrixxx</summary>
+  <summary>A client for matrix, the decentralized communication protocol</summary>
+  <summary xml:lang="ar">عميل لماتركس، ميفاق الاتصال اللامركزي</summary>
+  <summary xml:lang="az">Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu</summary>
+  <summary xml:lang="ca">Un client de Matrix, el protocol de comunicacions descentralitzat</summary>
+  <summary xml:lang="ca-valencia">Un client de Matrix, el protocol de comunicacions descentralitzat</summary>
+  <summary xml:lang="cs">Klient pro decentralizovaný komunikační protokol matrix</summary>
+  <summary xml:lang="de">Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll</summary>
+  <summary xml:lang="el">Ένας πελάτης για το Matrix, το αποκεντρωμένο πρωτόκολλο επικοινωνίας</summary>
+  <summary xml:lang="en-GB">A client for matrix, the decentralised communication protocol</summary>
+  <summary xml:lang="es">Un cliente para Matrix, el protocolo de comunicaciones descentralizado</summary>
+  <summary xml:lang="eu">Matrix, deszentralizatutako komunikazio protokolorako bezero bat</summary>
+  <summary xml:lang="fi">Asiakas Matrixille, hajautetulle viestintäyhteyskäytännölle</summary>
+  <summary xml:lang="fr">Un client pour « Matrix », le protocole décentralisé de communications.</summary>
+  <summary xml:lang="gl">Un cliente para Matrix, o protocolo de comunicación descentralizada</summary>
+  <summary xml:lang="hu">Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz</summary>
+  <summary xml:lang="ia">Un cliente per Matrix, le protocollo de communication decentralisate</summary>
+  <summary xml:lang="id">Klien untuk matrix, protokol komunikasi terdesentralisasi</summary>
+  <summary xml:lang="ie">Un cliente de Matrix, li protocol de communication decentralisat</summary>
+  <summary xml:lang="it">Un client per matrix, il protocollo di comunicazione decentralizzato</summary>
+  <summary xml:lang="ka">კლიენტი Matrix-სთვის, დეცენტრალიზებული კომუნიკაციის პროტოკოლისთვის</summary>
+  <summary xml:lang="ko">Matrix, 분산 대화 프로토콜 클라이언트</summary>
+  <summary xml:lang="nl">Een client voor matrix, het gedecentraliseerde communicatieprotocol</summary>
+  <summary xml:lang="nn">Ein klient for Matrix – protokollen for desentralisert kommunikasjon</summary>
+  <summary xml:lang="pa">ਮੈਟਰਿਕਸ, ਸਰਬ-ਸਾਂਝੇ ਸੰਚਾਰ ਪਰੋਟੋਕਾਲ, ਲਈ ਕਲਾਈਂਟ ਹੈ</summary>
+  <summary xml:lang="pl">Program do obsługi matriksa, rozproszonego protokołu porozumiewania się</summary>
+  <summary xml:lang="pt">Um cliente para o Matrix, o protocolo de comunicação descentralizado</summary>
+  <summary xml:lang="pt-BR">Um cliente do Matrix, o protocolo de comunicação descentralizado</summary>
+  <summary xml:lang="ru">Клиент для Matrix — децентрализованного коммуникационного протокола</summary>
+  <summary xml:lang="sk">Klient pre matrix, decentralizovaný komunikačný protokol</summary>
+  <summary xml:lang="sl">Odjemalec za matrix, decentralizirani komunikacijski protokol</summary>
+  <summary xml:lang="sv">En klient för Matrix, det decentraliserade kommunikationsprotokollet</summary>
+  <summary xml:lang="ta">மையமில்லா தகவல் பரிமாற்ற நெறிமுறையான மேட்ரிக்ஸுக்கான செயலி</summary>
+  <summary xml:lang="tr">Merkezi olmayan iletişim protokolü Matrix için bir istemci</summary>
+  <summary xml:lang="uk">Клієнт matrix, децентралізованого протоколу обміну даними</summary>
+  <summary xml:lang="x-test">xxA client for matrix, the decentralized communication protocolxx</summary>
+  <summary xml:lang="zh-CN">分布式通讯协议 Matrix 的客户端</summary>
  <description>
    <p>NeoChat is a client for Matrix, the decentralized communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami
 to provide a convergent experience across multiple platforms.</p>
@@ -73,22 +88,17 @@ to provide a convergent experience across multiple platforms.</p>
    <p xml:lang="ca">El NeoChat és un client de Matrix, el protocol descentralitzat de comunicacions de missatgeria instantània. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics. Fa servir els Frameworks de KDE i, sobretot, el Kirigami per a proporcionar una experiència convergent a través de diverses plataformes.</p>
    <p xml:lang="ca-valencia">NeoChat és un client de Matrix, el protocol descentralitzat de comunicacions de missatgeria instantània. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics. Utilitza els Frameworks de KDE i, sobretot, Kirigami per a proporcionar una experiència convergent a través de diverses plataformes.</p>
    <p xml:lang="en-GB">NeoChat is a client for Matrix, the decentralised communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami to provide a convergent experience across multiple platforms.</p>
-    <p xml:lang="eo">NeoChat estas kliento por Matrix, la malcentra komunikoprotokolo por tuja mesaĝado. Ĝi ebligas al vi sendi tekstmesaĝojn, filmetojn kaj sondosierojn al via familio, kolegoj kaj amikoj. Ĝi uzas KDE-framojn kaj precipe Kirigami por disponigi konverĝan sperton tra pluraj platformoj.</p>
    <p xml:lang="es">NeoChat es un cliente para Matrix, el protocolo de comunicaciones descentralizado para mensajería instantánea. Le permite enviar mensajes de texto, vídeos y archivos de sonido a su familia, compañeros de trabajo y amigos. Usa la infraestructura de KDE y, en particular, Kirigami para proporcionar una experiencia convergente en muchas plataformas.</p>
-    <p xml:lang="eu">NeoChat «Matrix»erako, bat-bateko mezularitzarako komunikazio deszentralizatuko protokolorako, bezero bat da. Zure sendiari, kide eta lagunei testu mezuak, bideo eta audio fitxategiak bidaltzeko aukera ematen dizu. «KDE Frameworks» eta bereziki «Kirigami» erabiltzen ditu plataforma anitzen artean esperientzia konbergente bat eskaintzeko.</p>
    <p xml:lang="fi">NeoChat on asiakassovellus Matrixille, hajautetulle pikaviestinyhteyskäytännölle. Sillä voi lähettää teksti-, video- ja ääniviestejä perheelle, tutuille ja ystäville. Se käyttää KDE-kehystä ja erityisesti Kirigamia tuottaakseen mukautuvan monialustaisen käyttökokemuksen.</p>
    <p xml:lang="fr">NeoChat est un client pour le protocole Matrix, un protocole décentralisé de communications pour messagerie instantané. Il vous permet d'envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos amis. Il utilise les environnements de développement et plus précisément Kirigami pour fournir une expérience convergente sur plusieurs plate-formes. </p>
-    <p xml:lang="gl">NeoChat é un cliente para Matrix, o protocolo de comunicación descentralizada para mensaxaría instantánea. Podes enviar mensaxes de texto, vídeos e ficheiros de son á túa familia, colegas e amizades. Usas infraestruturas de KDE e principalmente Kirigami para proporcionar unha experiencia de uso converxente para varias plataformas.</p>
+    <p xml:lang="gl">NeoChat é un cliente para Matrix, o protocolo de comunicación descentralizada para mensaxería instantánea. Podes enviar mensaxes de texto, vídeos e ficheiros de son á túa familia, colegas e amizades. Usas infraestruturas de KDE e principalmente Kirigami para proporcionar unha experiencia de uso converxente para varias plataformas.</p>
    <p xml:lang="ia">NeoChat es un cliente per Matrix, le protocollo de communication decentralisate per messager instantanee. Illo te permitte inviar messager de texto, files de video e audio a tu familia, collegas e amicos usante. Illo usa KDE frameworks e super toto Kirigamii forni un experientia convergente trans platteforme multiple.</p>
    <p xml:lang="it">NeoChat è un client per Matrix, il protocollo di comunicazione decentralizzato per la messaggistica istantanea. Ti consente di inviare messaggi di testo, video e file audio a familiari, colleghi e amici. Utilizza i framework KDE e in particolare Kirigami per fornire un'esperienza convergente su più piattaforme.</p>
-    <p xml:lang="ka">NeoChat არის Matrix კლიენტი. ის საშუალებას გაძლევთ გაგზავნოთ ტექსტური შეტყობინებები, ვიდეოები და აუდიო ფაილები თქვენს ოჯახს, კოლეგებსა და მეგობრებს მატრიქსის პროტოკოლის გამოყენებით.</p>
-    <p xml:lang="ko">NeoChat은 분산형 인스턴트 메시징 통신 프로토콜인 Matrix 클라이언트입니다. 가족, 동료, 친구에게 텍스트 메시지, 동영상, 오디오 파일을 전송할 수 있습니다. KDE 프레임워크와 Kirigami를 사용하여 다양한 플랫폼에서 일관적인 사용자 경험을 제공합니다.</p>
+    <p xml:lang="ka">NeoChat არის Matrix კლიენტი. ის საშუალებას გაძლევთ გაგზავნოთ ტექსტური შეტყობინებები, ვიდეოები და აუდიო ფაილები თქვენს ოჯახს, კოლეგებსა და მეგობრებს მატრიქსის პროტოკოლის გამოყენებით. ის იყენებს KDE-ის შესაძლებლობებს და განსაკუთრებით კი Kirigami-ის, რათა პლატფორმებს შორის თავსებადობა უზრუნველყოს.</p>
    <p xml:lang="nl">NeoChat is een client voor Matrix, het gedecentraliseerde communicatieprotocol voor instant messages. Het biedt u het verzenden van tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden. Het gebruik KDE frameworks en het meest opmerkelijk Kirigami om een convergente ervaring te leveren op meerdere platforms.</p>
    <p xml:lang="nn">NeoChat er ein klient for Matrix, ein protokoll for desentralisert kommunikasjon. Du kan utveksla tekst, lyd og videoar med kollegaar, vennar og familie. Programmet brukar KDE Frameworks og Kirigami for å gje ei brukarflate tilpassa ulike plattformer.</p>
    <p xml:lang="pl">NeoChat jest programem do Matriksa, protokołu rozproszonego porozumiewania się w czasie rzeczywistym. Umożliwia wysyłanie wiadomości tekstowych, filmów oraz dźwięku do twojej rodziny, znajomych oraz przyjaciół. Używa szkieletów KDE i głównie Kirigami, aby zapewnić spójne wrażenia na wielu platformach</p>
-    <p xml:lang="pt">O NeoChat é um cliente do Matrix. O mesmo permite-lhe enviar mensagens de texto, ficheiros de vídeo e áudio para a sua família, colegas e amigos com o protocolo Matrix. Usa as plataformas do KDE, e principalmente o Kirigami, para oferecer uma experiência convergente entre várias plataformas.</p>
-    <p xml:lang="sl">Neochat je odjemalec za Matrix, decentralizirani komunikacijski protokol za takojšnje sporočanje. Omogoča vam pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek svoji družini, sodelavcem in prijateljem. Uporablja okvire ogrodje KDE frameworks in predvsem Kirigami za zagotavljanje konvergentne izkušnje na več platformah.</p>
-    <p xml:lang="sv">NeoChat är en klient för Matrix, det decentraliserade kommunikationsprotokollet för direktmeddelanden. Den låter dig skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner. Den använder KDE Ramverk, i synnerhet Kirigami, för att tillhandahålla en konvergent upplevelse på flera plattformar.</p>
+    <p xml:lang="sl">Neochat je odjemalec za Matrix, decentralizirani komunikacijski protokol za takojšnje sporočanje. Omogoča vam pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek svoji družini, sodelavcem in prijateljem. Uporablja okvire KDE in predvsem Kirigami, da zagotavlja konvergentno izkušnjo na več platformah.</p>
    <p xml:lang="tr">NeoChat, anlık iletileşme için merkezi olmayan iletişim protokolü olan Matrix için bir istemcidir. Ailenize, iş arkadaşlarınıza ve arkadaşlarınıza metin iletiler, videolar ve ses dosyaları göndermenize olanak tanır. Birden çok platformda yakınsak bir deneyim sağlamak için KDE Frameworks ve en önemlilerinden Kirigami'yi kullanır.</p>
    <p xml:lang="uk">NeoChat — клієнт Matrix, децентралізованого протоколу спілкування для миттєвого обміну повідомленнями. За його допомогою ви можете надсилати текстові повідомлення, відео та звукові файли вашій родин, колегами та друзям. У програмі використано бібліотеки KDE, зокрема Kirigami, для надання однорідного середовища на декількох програмних та апаратних платформах.</p>
    <p xml:lang="x-test">xxNeoChat is a client for Matrix, the decentralized communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami to provide a convergent experience across multiple platforms.xx</p>
@@ -97,22 +107,17 @@ to provide a convergent experience across multiple platforms.</p>
    <p xml:lang="ca">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de la VoIP, fils i alguns aspectes de l'encriptatge d'extrem a extrem. Hi ha algunes altres omissions més petites a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu segueix sent proporcionar suport eventual per a tota l'especificació.</p>
    <p xml:lang="ca-valencia">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de VoIP, fils i alguns aspectes de l'encriptació d'extrem a extrem. Hi ha algunes altres omissions més xicotetes a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu seguix sent proporcionar suport eventual per a tota l'especificació.</p>
    <p xml:lang="en-GB">NeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.</p>
-    <p xml:lang="eo">NeoChat celas esti plene kapabla aplikaĵo por la Matrix-specifo. Kiel tia, ĉio en la nuna stabila specifo kun la rimarkindaj esceptoj de VoIP, fadenoj kaj kelkaj aspektoj de Fin-al-Fina Ĉifrado estas subtenataj. Estas kelkaj aliaj pli malgrandaj preterlasoj pro la fakto, ke la Matrix-speco konstante evoluas, sed la celo restas provizi finfine subtenon por la tuta specifaĵo.</p>
    <p xml:lang="es">NeoChat pretende ser una aplicación con todas las funciones para la especificación de Matrix. Como tal, admite todo en la especificación estable actual, con las notables excepciones de VoIP, subprocesos y algunas funciones de cifrado de extremo a extremo. Existen algunas omisiones menos importantes debido al hecho de que la especificación de Matrix está en constante evolución, pero el objetivo sigue siendo brindar compatibilidad final con toda la especificación.</p>
-    <p xml:lang="eu">«NeoChat»ek «Matrix» zehaztapenaren ezaugarri guztiak eskaintzen dituen aplikazio bat izan nahi du. Beraz, egungo zehaztapen egonkorrean dagoen guztiaren euskarria du, VoIP, hariak eta muturren artean zifratzeko salbuespen nabarmenekin. Badira beste ez-betetze txikiago batzuk, «Matrix»en zehaztapena etengabe eboluzioan dagoelako, baina azken helburua zehaztapen osoaren euskarria ematea izaten jarraitzen du.</p>
    <p xml:lang="fi">NeoChat pyrkii olemaan Matrix-määritelmän täysominaisuuksinen sovellus, joten se tukee kaikkea nykyisessä vakaassa määritelmässä muutamaa huomattavaa poikkeusta lukuun ottamatta (VoIP, säikeet ja jotkin piirteet päästä päähän -salauksessa). Joitakin pienempiäkin puutteita on Matrix-määritelmän jatkuvan kehityksen vuoksi, mutta lopputavoitteena on tarjota määritelmän täysi tuki.</p>
    <p xml:lang="fr">L'objectif de NeoChat est d'être une application complète pour le protocole Matrix. En tant que tel, tout dans la spécification stable actuelle avec les exceptions notables de VoIP, les processus et certains aspects du chiffrement de bout en bout sont pris en charge. Il y a quelques autres petites omissions en raison du fait que la spécification du protocole Matrix est en constante évolution. Cependant, l'objectif reste de fournir un soutien éventuel pour l'ensemble de la spécification.</p>
    <p xml:lang="gl">NeoChat pretende ser unha aplicación completa para a especificación de Matrix. Coas excepcións de VoIP, conversas fiadas e algúns aspectos da cifraxe de extremo a extremo, a versión estábel segue as especificacións. Existen algunhas outras pequenas omisións debido ao feito de que Matrix está en continua evolución pero a intención é implementar a especificación completa.</p>
    <p xml:lang="ia">NeoChat aspira a esser un application plenemente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
    <p xml:lang="it">NeoChat mira ad essere un'applicazione completa per le specifiche Matrix. Pertanto, sono supportati tutti gli elementi dell'attuale specifica stabile con le notevoli eccezioni di VoIP, conversazioni e alcuni aspetti della cifratura end-to-end. Ci sono alcune altre piccole omissioni dovute al fatto che le specifiche Matrix sono in continua evoluzione, ma l'obiettivo rimane quello di fornire un eventuale supporto per l'intera specifica.</p>
    <p xml:lang="ka">NeoChat-ი მიზნად ისახავს Matrix სპეციფიკაციის სრული განხორციელება ჰქონდეს. როგორც ასეთი, ყველაფერი მიმდინარე სპეციფიკაციიდან, VoIP-ის, ძაფებისა და გამჭოლი დაშიფვრის ზოგიერთი ასპექტის გარდა, მხარდაჭერილია. შეძლება ასევე იყოს მცირე ლაფსუსებიც იმის გამო, რომ Matrix-ის სპეციფიკაცია მუდმივად ვითარგდება, მაგრამ ჩვენი მიზანი მისი სრული მხარდაჭერაა.</p>
-    <p xml:lang="ko">NeoChat은 Matrix 표준을 따르는 프로그램을 목표로 합니다. 현재 안정 버전의 표준에서 제공하는 기능의 대부분을 지원하며, VoIP, 스레드, 일부 종단간 암호화와 같은 기능은 아직 지원하지 않습니다. Matrix 표준은 계속하여 진화 중이기 때문에 일부 기능이 빠져 있을 수도 있지만 장기적으로는 전체 표준을 지원하는 것이 목표입니다.</p>
    <p xml:lang="nl">NeoChat richt zich op het volledig bieden van alle mogelijkheden van de Matrix-specificatie. Alles in de huidige stabiele specificatie met merkbare uitzondering van VoIP, gekoppelde discussies en sommige aspecten van eind-tot-eind versleuteling worden ondersteund. Er zijn een paar andere kleinere omissies vanwege het feit dat de Matrix specificatie constant evolueert maar het doel blijft het eventueel bieden van ondersteuning van de gehele specificatie.</p>
    <p xml:lang="nn">NeoChat har som mål å støtta all funksjonalitet i Matrix-spesifikasjonen. Førebels er alt i den gjeldande stabile spesifikasjonen støtta, med unntak av VoIP, trådar og nokre delar av ende-til-kryptering. Det finst òg andre småting som ikkje er støtta, sidan Matrix-spesifikasjon er i stadig endring, men målet er altså støtte for alt.</p>
    <p xml:lang="pl">NeoChat w zamyśle ma być pełnowartościową aplikacją wg wytycznych Matriksa. Z tego powodu, wszystko, co jest obecnie w stabilnych wytycznych z pominięciem VoIP, wątków i niektórych części szyfrowania Użytkownik-do-Użytkownika są obecnie obsługiwane. Pominięto też kilka mniejszych rzeczy ze względu na ciągły rozwój wytycznych Matriksa, lecz celem nadal jest zapewnienie obsługi wszystkich wytycznych.</p>
-    <p xml:lang="pt">O NeoChat pretende ser uma aplicação completa para a especificação do Matrix. Como tal, tudo o que existe na especificação estável actual, com as notáveis excepções do VoIP, tópicos e alguns aspectos da Encriptação Ponto-a-Ponto, são suportados. Existem mais algumas omissões, devido ao facto que a norma do Matrix está em constante evolução, mas o objectivo continua a ser oferecer o suporte eventual para a norma por inteiro.</p>
    <p xml:lang="sl">Neochat cilja, da bi bila popolna aplikacija po specifikaciji Matrixa. Kot takšna vsebuje vse v trenutni stabilni specifikaciji z pomembnimi izjemami pri VoIP, nitih in nekaterih vidikov šifriranja od konca do konca. Obstaja nekaj drugih manjših opustitev zaradi dejstva, da se specifikacija Matrix nenehno razvija, vendar cilj ostaja zagotoviti morebitno podporo celotni specifikaciji.</p>
-    <p xml:lang="sv">NeoChat har som mål att vara ett fullständigt program enligt Matrix-specifikationen. Som sådant stöds allt i den nuvarande stabila specifikationen, med de nämnvärda undantagen VoIP, trådar och några aspekter av kryptering hela vägen. Det finns några ytterligare utelämnanden på grund av att Matrix-specifikationen hela tiden utvecklas, men målet förblir att till slut erbjuda stöd för hela specifikationen.</p>
    <p xml:lang="tr">NeoChat, Matrix belirtimi için tam özellikli bir uygulama olmayı hedefler. Bu nedenle; VoIP, ileti zincirleri ve Uçtan Uca Şifreleme'nin bazı yönleri gibi dikkate değer istisnalar dışında var olan kararlı belirtimdeki her şey desteklenir. Matrix belirtiminin sürekli gelişmesi nedeniyle birkaç küçük eksiklik daha var; ancak amaç tüm belirtim için nihai destek sağlamak olmayı sürdürüyor.</p>
    <p xml:lang="uk">Метою створення NeoChat є повноцінна реалізація програми для специфікації Matrix. Як наслідок, реалізовано усе у поточній стабільній специфікації, окрім голосового інтернет-зв'язку, потоків та деяких аспектів міжвузлового шифрування. Є також декілька інших незначних прогалин через те, що специфікація Matrix постійно змінюється, але метою лишається повна підтримка специфікації.</p>
    <p xml:lang="x-test">xxNeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.xx</p>
@@ -121,103 +126,40 @@ to provide a convergent experience across multiple platforms.</p>
    <p xml:lang="ca">A causa de la naturalesa del desenvolupament de l'especificació de Matrix, el NeoChat també implementa nombroses característiques inestables. Actualment són:</p>
    <p xml:lang="ca-valencia">A causa de la naturalea del desenvolupament de l'especificació de Matrix, NeoChat també implementa nombroses característiques inestables. Actualment són:</p>
    <p xml:lang="en-GB">Due to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:</p>
-    <p xml:lang="eo">Pro la naturo de la Matrix-specifevoluo NeoChat ankaŭ subtenas multajn malstabilajn funkciojn. Nuntempe ĉi tiuj estas:</p>
    <p xml:lang="es">Debido a la naturaleza del desarrollo de la especificación de Matrix, NeoChat también permite numerosas funciones no estables, como:</p>
-    <p xml:lang="eu">«Matrix» zehaztapenaren garapenaren izaeragatik, «Neo¢hat»ek ezaugarri ezegonkor ugari ere onartzen ditu. Gaur egun hauek:</p>
    <p xml:lang="fi">Matrix-määritelmän kehittyessä NeoChat tukee myös monia epävakaita ominaisuuksia. Tällä hetkellä näitä ovat:</p>
    <p xml:lang="fr">En raison de la nature du développement des spécifications du protocole Matrix, NeoChat prend également en charge de nombreuses fonctionnalités instables. Actuellement, ce sont :</p>
    <p xml:lang="gl">Debido á natureza do desenvolvemento da especificación de Matrix, NeoChat tamén inclúe varias funcionalidades non estábeis:</p>
    <p xml:lang="ia">Debite al natura del disveloppamento de specification de Matrix NeoChat tamben supporta numerose characteristicas instabile. Currentemente istes es:</p>
    <p xml:lang="it">A causa della natura dello sviluppo delle specifiche Matrix, NeoChat supporta anche numerose funzionalità instabili. Attualmente queste sono:</p>
    <p xml:lang="ka">Matrix-ის სპეციფიკაციის განვითარების ბუნების გამო NeoChat-ს ასევე აქვს უამრავი არასტაბილური ფუნქციაც. ახლა ისინია:</p>
-    <p xml:lang="ko">Matrix 표준 개발의 특징으로 인하여 NeoChat은 일부 실험적인 기능을 지원합니다. 현재 지원하는 기능은 다음과 같습니다.</p>
    <p xml:lang="nl">Vanwege de aard van de ontwikkeling van de Matrix specificatie ondersteunt NeoChat ook talloze onstabiele mogelijkheden. Dit zijn nu:</p>
    <p xml:lang="nn">På grunn av måten Matrix-spesifikasjonen vert utvikla på, støttar NeoChat òg nokre uferdige funksjonar:</p>
    <p xml:lang="pl">Ze względu na sposób rozwoju Matriksa, NeoChat obsługuje także kilka niestabilnych możliwości. Obecnie są to:</p>
-    <p xml:lang="pt">Devido à natureza do desenvolvimento da especificação do Matrix, o NeoChat também suporta diversas funcionalidades instáveis. De momento são:</p>
    <p xml:lang="sl">Zaradi narave razvoja specifikacije Matrixa NeoChat podpira tudi številne nestabilne zmožnosti. Trenutno so to:</p>
-    <p xml:lang="sv">På grund av sättet Matrix-specifikationens utvecklas, stöder NeoChat också ett stor antal instabila funktioner. För närvarande är de:</p>
-    <p xml:lang="ta">மேட்ரிக்ஸு நெறிமுறை வரையறுக்கப்படும் வித‍த்தின் காரணமாக, பல நிலையற்ற அம்சங்களையும் நியோச்சாட் ஆதரிக்கிறது. தற்போது ஆதரிக்கப்படுபவை:</p>
    <p xml:lang="tr">NeoChat, Matrix belirtimi geliştirmesinin doğası gereği çok sayıda kararsız özelliği de destekler. Şu anda bunlar:</p>
    <p xml:lang="uk">Через природу розробки специфікації Matrix, у NeoChat також передбачено підтримку численних нестабільних можливостей. У поточній версії цими можливостями є:</p>
    <p xml:lang="x-test">xxDue to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:xx</p>
-    <ul>
-      <li>Polls - MSC3381</li>
-      <li xml:lang="ar">التصويت - MSC3381</li>
-      <li xml:lang="ca">Enquestes - MSC3381</li>
-      <li xml:lang="ca-valencia">Enquestes - MSC3381</li>
-      <li xml:lang="en-GB">Polls - MSC3381</li>
-      <li xml:lang="eo">Enketoj - MSC3381</li>
-      <li xml:lang="es">Encuestas - MSC3381</li>
-      <li xml:lang="eu">Polls - MSC3381</li>
-      <li xml:lang="fi">Kyselyt – MSC3381</li>
-      <li xml:lang="fr">Sondages - MSC3381</li>
-      <li xml:lang="gl">Enquisas — MSC3381</li>
-      <li xml:lang="ia">Inquestas - MSC3381</li>
-      <li xml:lang="it">Sondaggi - MSC3381</li>
-      <li xml:lang="ka">Polls - MSC3381</li>
-      <li xml:lang="ko">투표 - MSC3381</li>
-      <li xml:lang="nl">Polls - MSC3381</li>
-      <li xml:lang="nn">Avstemmingar – MSC3381</li>
-      <li xml:lang="pl">Ankiety - MSC3381</li>
-      <li xml:lang="pt">Inquéritos - MSC3381</li>
-      <li xml:lang="sl">Polls - MSC3381</li>
-      <li xml:lang="sv">Polls - MSC3381</li>
-      <li xml:lang="ta">வாக்கெடுப்புகள் - MSC3381</li>
-      <li xml:lang="tr">Anketler - MSC3381</li>
-      <li xml:lang="uk">Опитування - MSC3381</li>
-      <li xml:lang="x-test">xxPolls - MSC3381xx</li>
-      <li>Sticker Packs - MSC2545</li>
-      <li xml:lang="ar">حزم الملصقات - MSC2545</li>
-      <li xml:lang="ca">Paquets d'adhesius - MSC2545</li>
-      <li xml:lang="ca-valencia">Paquets d'adhesius - MSC2545</li>
-      <li xml:lang="en-GB">Sticker Packs - MSC2545</li>
-      <li xml:lang="eo">Glumark-Pakoj - MSC2545</li>
-      <li xml:lang="es">Paquetes de pegatinas - MSC2545</li>
-      <li xml:lang="eu">Eranskailu paketeak - MSC2545</li>
-      <li xml:lang="fi">Tarrapakkaukset – MSC2545</li>
-      <li xml:lang="fr">Paquets d'auto-collants - MSC2545</li>
-      <li xml:lang="gl">Paquetes de adhesivos — MSC2545</li>
-      <li xml:lang="ia">Etiquetta gummate (sticker) -MSC2545</li>
-      <li xml:lang="it">Pacchetti di adesivi - MSC2545</li>
-      <li xml:lang="ka">სტიკერების პაკეტები - MSC2545</li>
-      <li xml:lang="ko">스티커 팩 - MSC2545</li>
-      <li xml:lang="nl">Sticker Packs - MSC2545</li>
-      <li xml:lang="nn">Klistremerke-pakkar – MSC2545</li>
-      <li xml:lang="pl">Paczki naklejek - MSC2545</li>
-      <li xml:lang="pt">Pacotes de Autocolantes - MSC2545</li>
-      <li xml:lang="sl">Sticker Packs - MSC2545</li>
-      <li xml:lang="sv">Sticker Packs - MSC2545</li>
-      <li xml:lang="ta">ஒட்டி தொகுப்புகள் - MSC2545</li>
-      <li xml:lang="tr">Yapışkan Paketleri - MSC2545</li>
-      <li xml:lang="uk">Пакунки наліпок - MSC2545</li>
-      <li xml:lang="x-test">xxSticker Packs - MSC2545xx</li>
-      <li>Location Events - MSC3488</li>
-      <li xml:lang="ar">موقع الأحداث - MSC3488</li>
-      <li xml:lang="ca">Esdeveniments d'ubicació - MSC3488</li>
-      <li xml:lang="ca-valencia">Esdeveniments d'ubicació - MSC3488</li>
-      <li xml:lang="en-GB">Location Events - MSC3488</li>
-      <li xml:lang="eo">Lokaj Eventoj - MSC3488</li>
-      <li xml:lang="es">Eventos de ubicación - MSC3488</li>
-      <li xml:lang="eu">Kokaleku-gertaerak - MSC3488</li>
-      <li xml:lang="fi">Sijaintitapahtumat – MSC3488</li>
-      <li xml:lang="fr">Événements de lieu - MSC3488</li>
-      <li xml:lang="gl">Localización de eventos — MSC3488</li>
-      <li xml:lang="ia">Eventos de Location - MSC3488</li>
-      <li xml:lang="it">Località eventi - MSC3488</li>
-      <li xml:lang="ka">მდებარეობის მოვლენები - MSC3488</li>
-      <li xml:lang="ko">위치 이벤트 - MSC3488</li>
-      <li xml:lang="nl">Locatie gebeurtenissen - MSC3488</li>
-      <li xml:lang="nn">Posisjonshendingar – MSC3488</li>
-      <li xml:lang="pl">Wydarzenia w miejscach - MSC3488</li>
-      <li xml:lang="pt">Eventos com Localizações - MSC3488</li>
-      <li xml:lang="sl">Location Events - MSC3488</li>
-      <li xml:lang="sv">Location Events - MSC3488</li>
-      <li xml:lang="ta">இட நிகழ்வுகள் - MSC3488</li>
-      <li xml:lang="tr">Konum Etkinlikleri - MSC3488</li>
-      <li xml:lang="uk">Місцеві зустрічі - MSC3488</li>
-      <li xml:lang="x-test">xxLocation Events - MSC3488xx</li>
+    <ul>&gt;
    </ul>
+    <ul xml:lang="ca">&gt;</ul>
+    <ul xml:lang="ca-valencia">&gt;</ul>
+    <ul xml:lang="cs">&gt;</ul>
+    <ul xml:lang="en-GB">&gt;</ul>
+    <ul xml:lang="es">&gt;</ul>
+    <ul xml:lang="fi">&gt;</ul>
+    <ul xml:lang="fr">&gt;</ul>
+    <ul xml:lang="gl">&gt;</ul>
+    <ul xml:lang="ia">&gt;</ul>
+    <ul xml:lang="it">&gt;</ul>
+    <ul xml:lang="ka">&gt;</ul>
+    <ul xml:lang="nl">&gt;</ul>
+    <ul xml:lang="nn">&gt;</ul>
+    <ul xml:lang="pl">&gt;</ul>
+    <ul xml:lang="pt-BR">&gt;</ul>
+    <ul xml:lang="sl">&gt;</ul>
+    <ul xml:lang="uk">&gt;</ul>
+    <ul xml:lang="x-test">xx&gt;xx</ul>
  </description>
  <url type="homepage">https://apps.kde.org/neochat/</url>
  <url type="bugtracker">https://bugs.kde.org/buglist.cgi?component=General&amp;product=NeoChat</url>
@@ -233,7 +175,6 @@ to provide a convergent experience across multiple platforms.</p>
  <developer_name xml:lang="de">Die KDE-Gemeinschaft</developer_name>
  <developer_name xml:lang="el">Η Κοινότητα του KDE</developer_name>
  <developer_name xml:lang="en-GB">The KDE Community</developer_name>
-  <developer_name xml:lang="eo">La KDE-Komunumo</developer_name>
  <developer_name xml:lang="es">La comunidad KDE</developer_name>
  <developer_name xml:lang="eu">KDE komunitatea</developer_name>
  <developer_name xml:lang="fi">KDE-yhteisö</developer_name>
@@ -266,11 +207,6 @@ to provide a convergent experience across multiple platforms.</p>
  <custom>
    <value key="KDE::matrix">#neochat:kde.org</value>
    <value key="KDE::windows_store">https://www.microsoft.com/store/apps/9PNXWVNRC29H</value>
-    <value key="KDE::mastodon">https://kde.social/@neochat</value>
-    <value key="KDE::windows_store::StoreLogo9x16">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/storelogo-720x1080.png</value>
-    <value key="KDE::windows_store::StoreLogoSquare">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/storelogo-1080x1080.png</value>
-    <value key="KDE::windows_store::Icon">https://invent.kde.org/network/neochat/-/raw/master/icons/300-apps-neochat.png</value>
-    <value key="KDE::windows_store::PromotionalArt16x9">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/promoimage-1920x1080.png</value>
  </custom>
  <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
  <screenshots>
@@ -280,87 +216,15 @@ to provide a convergent experience across multiple platforms.</p>
    <screenshot type="default">
      <image>https://cdn.kde.org/screenshots/neochat/application.png</image>
    </screenshot>
-    <screenshot x-kde-os="windows">
-      <image>https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Timeline.png</image>
-      <caption>Main view with room list, chat, and room information</caption>
-      <caption xml:lang="ar">العرض الرئيسة مع قائمة الغرف والدردشات و معلومات الغرفة</caption>
-      <caption xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</caption>
-      <caption xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</caption>
-      <caption xml:lang="eo">Ĉefa vido kun ĉambra listo, babilejo kaj ĉambra informo</caption>
-      <caption xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</caption>
-      <caption xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</caption>
-      <caption xml:lang="fi">Päänäkymä, jossa huoneluettelo, keskustelu ja huoneen tiedot</caption>
-      <caption xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</caption>
-      <caption xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</caption>
-      <caption xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</caption>
-      <caption xml:lang="ka">მთავარი ხედი სურათების სიით, ჩატით და ოთახის ინფორმაციით</caption>
-      <caption xml:lang="ko">대화방 목록, 채팅, 대화방 정보가 표시된 주 보기</caption>
-      <caption xml:lang="nl">Hoofdweergave met lijst met rooms, chat en roominformatie</caption>
-      <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
-      <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
-      <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
-      <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
-      <caption xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</caption>
-      <caption xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</caption>
-      <caption xml:lang="tr">Oda listesini, sohbet penceresini ve oda bilgisini gösteren ana görünüm</caption>
-      <caption xml:lang="uk">Головна панель із списком кімнат, спілкуванням та даними щодо кімнати</caption>
-      <caption xml:lang="x-test">xxMain view with room list, chat, and room informationxx</caption>
-    </screenshot>
-    <screenshot x-kde-os="windows">
-      <image>https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Login.png</image>
-      <caption>Login screen</caption>
-      <caption xml:lang="ar">شاشة الدخول</caption>
-      <caption xml:lang="ca">Pantalla d'inici de sessió</caption>
-      <caption xml:lang="ca-valencia">Pantalla d'inici de sessió</caption>
-      <caption xml:lang="eo">Ensaluta ekrano</caption>
-      <caption xml:lang="es">Pantalla de inicio de sesión</caption>
-      <caption xml:lang="eu">Saio-hasteko pantaila</caption>
-      <caption xml:lang="fi">Kirjautumisnäkymä</caption>
-      <caption xml:lang="fr">Écran de connexion</caption>
-      <caption xml:lang="gl">Pantalla de identificación.</caption>
-      <caption xml:lang="it">Schermata di accesso</caption>
-      <caption xml:lang="ka">შესვლის ეკრანი</caption>
-      <caption xml:lang="ko">로그인 화면</caption>
-      <caption xml:lang="nl">Aanmeldscherm</caption>
-      <caption xml:lang="nn">Innloggingsbilete</caption>
-      <caption xml:lang="pl">Ekran logowania</caption>
-      <caption xml:lang="pt">Ecrã de autenticação</caption>
-      <caption xml:lang="sl">Prijavni zaslon</caption>
-      <caption xml:lang="sv">Inloggningsfönster</caption>
-      <caption xml:lang="ta">நுழைவுத் திரை</caption>
-      <caption xml:lang="tr">Oturum açma ekranı</caption>
-      <caption xml:lang="uk">Вікно входу</caption>
-      <caption xml:lang="x-test">xxLogin screenxx</caption>
-    </screenshot>
  </screenshots>
  <content_rating type="oars-1.1">
    <content_attribute id="social-chat">intense</content_attribute>
  </content_rating>
  <releases>
-    <release version="23.08.0" date="2023-08-24">
-      <url>https://kde.org/announcements/gear/23.08.0/#neochathttpsappskdeorgneochat</url>
-      <description>
-        <p>Apart from a visual overhaul, NeoChat can now display location events and also a map with the location of all the users currently broadcasting their location using Itineray's Matrix integration. Great for locating where your friends are.</p>
-      </description>
-    </release>
    <release version="23.04.3" date="2023-07-06"/>
    <release version="23.04.2" date="2023-06-08"/>
    <release version="23.04.1" date="2023-05-11"/>
-    <release version="23.04.0" date="2023-04-20">
-      <url>https://kde.org/announcements/gear/23.04.0/#neochathttpsappskdeorgneochat</url>
-      <description>
-        <p>NeoChat improves its design with tweaks that provide a more compact layout and a simpler menu which works better for the collapsed room list.</p>
-        <p>We have also improved the video controls, added a new command /knock &lt;room-id&gt; to send a knock event to a room, and you can now edit a prior message inline, within the chat pane.</p>
-        <p>Other usability improvements include an overhaul of the keyboard navigation and shortcuts like Ctrl+PgUp/PgDn that allow you to skip from room to room.</p>
-      </description>
-      <artifacts>
-        <artifact type="binary" platform="x86_64-windows-msvc">
-          <location>https://download.kde.org/stable/release-service/23.04.0/windows/neochat-23.04.0-512-windows-cl-msvc2019-x86_64.exe</location>
-          <checksum type="sha256">85e17fdd9b128bfdd171a93b11f7a95febeff0a00df9261df11f6ff67637686d</checksum>
-          <size type="download">58032464</size>
-        </artifact>
-      </artifacts>
-    </release>
+    <release version="23.04.0" date="2023-04-20"/>
    <release version="23.01" date="2023-01-30">
      <url>https://plasma-mobile.org/2023/01/30/january-blog-post/</url>
      <description>
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -11,7 +11,6 @@ Name[cs]=NeoChat
 Name[de]=NeoChat
 Name[el]=NeoChat
 Name[en_GB]=NeoChat
-Name[eo]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
 Name[fi]=NeoChat
@@ -50,7 +49,6 @@ GenericName[cs]=Klient protokolu Matrix
 GenericName[de]=Matrix-Programm
 GenericName[el]=Εφαρμογή του Matrix
 GenericName[en_GB]=Matrix Client
-GenericName[eo]=Matrix-Kliento
 GenericName[es]=Cliente para Matrix
 GenericName[eu]=Matrix bezeroa
 GenericName[fi]=Matrix-asiakas
@@ -88,12 +86,11 @@ 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[gl]=Cliente para o protocolo Matrix
 Comment[hu]=Kliens a Matrix protokollhoz
 Comment[ia]=Cliente per le protocollo de Matrix
 Comment[id]=Klien untuk protokol Matrix
--- a/po/ar/neochat.po
+++ b/po/ar/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/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/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/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/neochat.po
+++ b/po/pt_BR/neochat.po
--- a/po/ru/neochat.po
+++ b/po/ru/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/docs/neochat/man-neochat.1.docbook
+++ b/po/sv/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 % Swedish "INCLUDE">
-]>
-<!--
-SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
-<refentry lang="&language;">
-<refentryinfo>
-<title
->NeoChat användarmanual</title>
-<author
-><firstname
->Carl</firstname
-><surname
->Schwan</surname
-> <contrib
->NeoChat manualsida.</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
->Klient för att interagera med meddelandeprotokollet 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
->Beskrivning</title>
-  <para
-><command
->neochat</command
-> är ett chattprogram för protokollet matrix som fungerar både på skrivbord och mobil. </para>
-</refsect1>
-
-<refsect1 id="options"
-><title
->Väljare</title>
-<variablelist>
-  <varlistentry>
-  <term
-><option
->URI</option
-></term>
-  <listitem>
-    <para
->Matrix webbadress för en användare eller ett rum, t.ex. matrix:u/användare:exempel.org. Det gör att NeoChat försöker öppna det angivna rummet eller konversationen. </para>
-  </listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1 id="bug">
-  <title
->Rapportera fel</title>
-  <para
->Rapportera fel och funktionsönskemål på <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
->Se också</title>
-  <simplelist>
-    <member
->En lista över vanliga frågor om 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
->Copyright</title>
-<para
->Copyright &copy; 2020-2022 Tobias Fella </para>
-<para
->Copyright &copy; 2020-2022 Carl Schwan </para>
-<para
->Licens: GNU General Public Version 3 eller senare &lt;<ulink url="https://wwwgnuorg/licenses/gpl-html"
->http://www.gnu.org/licenses/gpl-3.0.html</ulink
->&gt;</para>
-</refsect1>
-</refentry>
--- a/po/sv/neochat.po
+++ b/po/sv/neochat.po
--- a/po/ta/neochat.po
+++ b/po/ta/neochat.po
--- a/po/tok/neochat.po
+++ b/po/tok/neochat.po
--- a/po/tr/neochat.po
+++ b/po/tr/neochat.po
--- a/po/uk/neochat.po
+++ b/po/uk/neochat.po
--- a/po/zh_CN/neochat.po
+++ b/po/zh_CN/neochat.po
--- a/po/zh_TW/neochat.po
+++ b/po/zh_TW/neochat.po
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,187 +3,81 @@
 # SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
 # SPDX-License-Identifier: BSD-2-Clause

-configure_file(qml/Page/RoomList/RoomDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Page/RoomList/RoomDelegate.qml)
-configure_file(qml/Component/QuickSwitcher.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/QuickSwitcher.qml)
-configure_file(qml/Dialog/PowerLevelDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/PowerLevelDialog.qml)
-configure_file(qml/Component/Timeline/AudioDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/AudioDelegate.qml)
-configure_file(qml/Component/Timeline/VideoDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/VideoDelegate.qml)
-configure_file(qml/Component/Timeline/OsmLocationPlugin.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/OsmLocationPlugin.qml)
-
-configure_file(res.qrc ${CMAKE_CURRENT_SOURCE_DIR}/res.generated.qrc)
-
 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
    matriximageprovider.cpp
-    matriximageprovider.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
+    neochatuser.cpp
    models/userlistmodel.cpp
-    models/userlistmodel.h
    models/userfiltermodel.cpp
-    models/userfiltermodel.h
    models/publicroomlistmodel.cpp
-    models/publicroomlistmodel.h
    models/userdirectorylistmodel.cpp
-    models/userdirectorylistmodel.h
-    models/pushrulemodel.cpp
-    models/pushrulemodel.h
-    models/emoticonfiltermodel.cpp
-    models/emoticonfiltermodel.h
+    models/keywordnotificationrulemodel.cpp
    notificationsmanager.cpp
-    notificationsmanager.h
    models/sortfilterroomlistmodel.cpp
-    models/sortfilterroomlistmodel.h
    chatdocumenthandler.cpp
-    chatdocumenthandler.h
    models/devicesmodel.cpp
-    models/devicesmodel.h
-    models/devicesproxymodel.cpp
    filetypesingleton.cpp
-    filetypesingleton.h
    login.cpp
-    login.h
+    stickerevent.cpp
    models/webshortcutmodel.cpp
-    models/webshortcutmodel.h
    blurhash.cpp
-    blurhash.h
    blurhashimageprovider.cpp
-    blurhashimageprovider.h
-    models/mediamessagefiltermodel.cpp
-    models/mediamessagefiltermodel.h
+    joinrulesevent.cpp
+    models/collapsestateproxymodel.cpp
    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
-    registration.cpp
-    neochatconnection.cpp
-    neochatconnection.h
-    jobs/neochatdeactivateaccountjob.cpp
-    jobs/neochatdeactivateaccountjob.h
-    jobs/neochatdeletedevicejob.cpp
-    jobs/neochatdeletedevicejob.h
-    jobs/neochatchangepasswordjob.cpp
-    jobs/neochatchangepasswordjob.h
-    mediasizehelper.cpp
-    mediasizehelper.h
-    eventhandler.cpp
-    enums/delegatetype.h
-    messageformatter.cpp
-)
-
-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 "eventhandler_logging.h"
-    IDENTIFIER "EventHandling"
-    CATEGORY_NAME "org.kde.neochat.eventhandler"
-    DEFAULT_SEVERITY Info
 )

 add_executable(neochat-app
    main.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/res.generated.qrc
+    res.qrc
 )

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

+if(Quotient_VERSION_MINOR GREATER 6)
+    target_compile_definitions(neochat PUBLIC QUOTIENT_07)
+    target_sources(neochat PRIVATE pollevent.cpp pollhandler.cpp)
+else()
+    target_compile_definitions(neochat PUBLIC QUOTIENT_VERSION=\"${Quotient_VERSION}\")
+    target_sources(neochat PRIVATE neochataccountregistry.cpp)
+endif()
+
 ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)

 target_sources(neochat-app PRIVATE ${NEOCHAT_ICON})

 if(NOT ANDROID)
-    target_sources(neochat PRIVATE colorschemer.cpp colorschemer.h)
+    target_sources(neochat PRIVATE colorschemer.cpp)
    if (NOT WIN32 AND NOT APPLE)
-        target_sources(neochat PRIVATE trayicon_sni.cpp trayicon_sni.h)
-        if(QT_MAJOR_VERSION STREQUAL "6")
-            target_link_libraries(neochat PRIVATE KF6::StatusNotifierItem)
-        endif()
+        target_sources(neochat PRIVATE trayicon_sni.cpp)
    else()
-        target_sources(neochat PRIVATE trayicon.cpp trayicon.h)
+        target_sources(neochat PRIVATE trayicon.cpp)
    endif()
    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::ConfigWidgets KF${QT_MAJOR_VERSION}::WindowSystem)
    target_compile_definitions(neochat PUBLIC -DHAVE_COLORSCHEME)
@@ -200,8 +94,7 @@ else()
 endif()

 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR})
-target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 Qt::Xml KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::Kirigami2 KF${QT_MAJOR_VERSION}::Notifications KF${QT_MAJOR_VERSION}::ConfigCore KF${QT_MAJOR_VERSION}::ConfigGui KF${QT_MAJOR_VERSION}::CoreAddons KF${QT_MAJOR_VERSION}::SonnetCore  KF${QT_MAJOR_VERSION}::ItemModels KF${QT_MAJOR_VERSION}::SyntaxHighlighting Quotient${QUOTIENT_SUFFIX} cmark::cmark QCoro::Core)
-
+target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::Kirigami2 KF${QT_MAJOR_VERSION}::Notifications KF${QT_MAJOR_VERSION}::ConfigCore KF${QT_MAJOR_VERSION}::ConfigGui KF${QT_MAJOR_VERSION}::CoreAddons KF${QT_MAJOR_VERSION}::SonnetCore  KF${QT_MAJOR_VERSION}::ItemModels Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES} QCoro::Core)
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)

 if(NEOCHAT_FLATPAK)
@@ -282,10 +175,6 @@ if(ANDROID)
        "window-new"
        "globe"
        "visibility"
-        "home"
-        "preferences-desktop-notification"
-        "computer-symbolic"
-        "gps"
    )
 else()
    target_link_libraries(neochat PUBLIC Qt::Widgets KF${QT_MAJOR_VERSION}::KIOWidgets)
--- a/src/actionshandler.cpp
+++ b/src/actionshandler.cpp
@@ -3,17 +3,23 @@

 #include "actionshandler.h"

-#include <Quotient/csapi/joining.h>
-#include <Quotient/events/roommemberevent.h>
+#include "controller.h"
+
+#include <csapi/joining.h>
+#include <events/roommemberevent.h>

 #include <cmark.h>

 #include <KLocalizedString>
 #include <QStringBuilder>

+#include "controller.h"
 #include "models/actionsmodel.h"
 #include "models/customemojimodel.h"
 #include "neochatconfig.h"
+#include "neochatroom.h"
+#include "neochatuser.h"
+#include "roommanager.h"
 #include "texthandler.h"

 using namespace Quotient;
@@ -44,7 +50,7 @@ void ActionsHandler::handleNewMessage()
    if (!m_room->chatBoxAttachmentPath().isEmpty()) {
        QUrl url(m_room->chatBoxAttachmentPath());
        auto path = url.isLocalFile() ? url.toLocalFile() : url.toString();
-        m_room->uploadFile(QUrl(path), m_room->chatBoxText().isEmpty() ? path.mid(path.lastIndexOf(u'/') + 1) : m_room->chatBoxText());
+        m_room->uploadFile(path, m_room->chatBoxText().isEmpty() ? path.mid(path.lastIndexOf('/') + 1) : m_room->chatBoxText());
        m_room->setChatBoxAttachmentPath({});
        m_room->setChatBoxText({});
        return;
@@ -97,7 +103,7 @@ QString ActionsHandler::handleMentions(QString handledText, const bool &isEdit)
 void ActionsHandler::handleMessage(const QString &text, QString handledText, const bool &isEdit)
 {
    if (NeoChatConfig::allowQuickEdit()) {
-        QRegularExpression sed(QStringLiteral("^s/([^/]*)/([^/]*)(/g)?$"));
+        QRegularExpression sed("^s/([^/]*)/([^/]*)(/g)?$");
        auto match = sed.match(text);
        if (match.hasMatch()) {
            const QString regex = match.captured(1);
@@ -113,13 +119,13 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, con
                        } else {
                            originalString = event->plainBody();
                        }
-                        if (flags == "/g"_ls) {
-                            m_room->postHtmlMessage(handledText, originalString.replace(regex, replacement), event->msgtype(), {}, event->id());
+                        if (flags == "/g") {
+                            m_room->postHtmlMessage(handledText, originalString.replace(regex, replacement), event->msgtype(), "", event->id());
                        } else {
                            m_room->postHtmlMessage(handledText,
                                                    originalString.replace(originalString.indexOf(regex), regex.size(), replacement),
                                                    event->msgtype(),
-                                                    {},
+                                                    "",
                                                    event->id());
                        }
                        return;
@@ -133,7 +139,7 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, con
    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.indexOf(" ") == action.prefix.length() + 1 || handledText.length() == action.prefix.length() + 1)) {
                handledText = action.handle(handledText.mid(action.prefix.length() + 1).trimmed(), m_room);
                if (action.messageType.has_value()) {
                    messageType = *action.messageType;
@@ -152,35 +158,33 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, con
    textHandler.setData(handledText);
    handledText = textHandler.handleSendText();

-    if (handledText.count("<p>"_ls) == 1 && handledText.count("</p>"_ls) == 1) {
-        handledText.remove("<p>"_ls);
-        handledText.remove("</p>"_ls);
+    if (handledText.count("<p>") == 1 && handledText.count("</p>") == 1) {
+        handledText.remove("<p>");
+        handledText.remove("</p>");
    }

    if (handledText.length() == 0) {
        return;
    }

-    m_room->postMessage(text, handledText, messageType, m_room->chatBoxReplyId(), isEdit ? m_room->chatBoxEditId() : QString());
+    m_room->postMessage(text, handledText, messageType, m_room->chatBoxReplyId(), isEdit ? m_room->chatBoxEditId() : "");
 }

 void ActionsHandler::checkEffects(const QString &text)
 {
    std::optional<QString> effect = std::nullopt;
-    if (text.contains(QStringLiteral("\u2744"))) {
+    if (text.contains("\u2744")) {
        effect = QLatin1String("snowflake");
-    } else if (text.contains(QStringLiteral("\u1F386"))) {
+    } else if (text.contains("\u1F386")) {
        effect = QLatin1String("fireworks");
-    } else if (text.contains(QStringLiteral("\u2F387"))) {
+    } else if (text.contains("\u2F387")) {
        effect = QLatin1String("fireworks");
-    } else if (text.contains(QStringLiteral("\u1F389"))) {
+    } else if (text.contains("\u1F389")) {
        effect = QLatin1String("confetti");
-    } else if (text.contains(QStringLiteral("\u1F38A"))) {
+    } else if (text.contains("\u1F38A")) {
        effect = QLatin1String("confetti");
    }
    if (effect.has_value()) {
        Q_EMIT showEffect(*effect);
    }
 }
-
-#include "moc_actionshandler.cpp"
--- a/src/actionshandler.h
+++ b/src/actionshandler.h
@@ -5,37 +5,20 @@

 #include <QObject>

-#include <Quotient/events/roommessageevent.h>
+#include <events/roommessageevent.h>

 #include "neochatroom.h"

+class CustomEmojiModel;
 class NeoChatRoom;

-/**
- * @class ActionsHandler
- *
- * This class handles 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
- */
+/// \brief Handles user interactions with NeoChat (joining room, creating room,
+/// sending message). Account management is handled by Controller.
 class ActionsHandler : public QObject
 {
    Q_OBJECT

-    /**
-     * @brief The room that messages will be sent to.
-     */
+    /// \brief The room that messages will be sent to.
    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)

 public:
@@ -46,7 +29,7 @@ public:

 Q_SIGNALS:
    void roomChanged();
-    void showEffect(const QString &effect);
+    void showEffect(QString effect);

 public Q_SLOTS:

--- a/src/blurhash.h
+++ b/src/blurhash.h
@@ -5,24 +5,6 @@

 #include <stdint.h>

-/**
- * @brief Returns the pixel array of the result image given the blurhash string.
- *
- * @param blurhash a string representing the blurhash to be decoded.
- * @param width the width of the resulting image.
- * @param height the height of the resulting image.
- * @param punch the factor to improve the contrast, default = 1.
- * @param nChannels the number of channels in the resulting image array, 3 = RGB, 4 = RGBA.
- *
- * @return A pointer to memory region where pixels are stored in (H, W, C) format.
- */
 uint8_t *decode(const char *blurhash, int width, int height, int punch, int nChannels);

-/**
- * @brief Checks if the Blurhash is valid or not.
- *
- * @param blurhash a string representing the blurhash.
- *
- * @return A bool (true if it is a valid blurhash, else false).
- */
 bool isValidBlurhash(const char *blurhash);
--- a/src/blurhashimageprovider.h
+++ b/src/blurhashimageprovider.h
@@ -5,22 +5,9 @@

 #include <QQuickImageProvider>

-/**
- * @class BlurhashImageProvider
- *
- * A QQuickImageProvider for blurhashes.
- *
- * @sa QQuickImageProvider
- */
 class BlurhashImageProvider : public QQuickImageProvider
 {
 public:
    BlurhashImageProvider();
-
-    /**
-     * @brief Return an image for a given ID.
-     *
-     * @sa QQuickImageProvider::requestImage
-     */
    QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override;
-};
+};
--- a/src/chatdocumenthandler.cpp
+++ b/src/chatdocumenthandler.cpp
@@ -14,6 +14,10 @@
 #include <Sonnet/BackgroundChecker>
 #include <Sonnet/Settings>

+#include "models/actionsmodel.h"
+#include "models/roomlistmodel.h"
+#include "neochatroom.h"
+
 class SyntaxHighlighter : public QSyntaxHighlighter
 {
 public:
@@ -134,13 +138,12 @@ int ChatDocumentHandler::completionStartIndex() const
        return 0;
    }

-#if !defined(Q_OS_ANDROID) && QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
+#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
    const long long cursor = cursorPosition();
 #else
    const auto cursor = cursorPosition();
 #endif
    const auto &text = getText();
-
    auto start = std::min(cursor, text.size()) - 1;
    while (start > -1) {
        if (text.at(start) == QLatin1Char(' ')) {
@@ -218,21 +221,21 @@ void ChatDocumentHandler::setRoom(NeoChatRoom *room)
 void ChatDocumentHandler::complete(int index)
 {
    if (m_completionModel->autoCompletionType() == CompletionModel::User) {
-        auto name = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::DisplayNameRole).toString();
-        auto id = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::SubtitleRole).toString();
+        auto name = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Text).toString();
+        auto id = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
        auto text = getText();
        auto at = text.lastIndexOf(QLatin1Char('@'), cursorPosition() - 1);
        QTextCursor cursor(document()->textDocument());
        cursor.setPosition(at);
        cursor.setPosition(cursorPosition(), QTextCursor::KeepAnchor);
-        cursor.insertText(name + QStringLiteral(" "));
+        cursor.insertText(name % " ");
        cursor.setPosition(at);
        cursor.setPosition(cursor.position() + name.size(), QTextCursor::KeepAnchor);
        cursor.setKeepPositionOnInsert(true);
        pushMention({cursor, name, 0, 0, id});
        m_highlighter->rehighlight();
    } else if (m_completionModel->autoCompletionType() == CompletionModel::Command) {
-        auto command = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedTextRole).toString();
+        auto command = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
        auto text = getText();
        auto at = text.lastIndexOf(QLatin1Char('/'));
        QTextCursor cursor(document()->textDocument());
@@ -240,20 +243,20 @@ void ChatDocumentHandler::complete(int index)
        cursor.setPosition(cursorPosition(), QTextCursor::KeepAnchor);
        cursor.insertText(QStringLiteral("/%1 ").arg(command));
    } else if (m_completionModel->autoCompletionType() == CompletionModel::Room) {
-        auto alias = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::SubtitleRole).toString();
+        auto alias = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
        auto text = getText();
        auto at = text.lastIndexOf(QLatin1Char('#'), cursorPosition() - 1);
        QTextCursor cursor(document()->textDocument());
        cursor.setPosition(at);
        cursor.setPosition(cursorPosition(), QTextCursor::KeepAnchor);
-        cursor.insertText(alias + QStringLiteral(" "));
+        cursor.insertText(alias % " ");
        cursor.setPosition(at);
        cursor.setPosition(cursor.position() + alias.size(), QTextCursor::KeepAnchor);
        cursor.setKeepPositionOnInsert(true);
        pushMention({cursor, alias, 0, 0, alias});
        m_highlighter->rehighlight();
    } else if (m_completionModel->autoCompletionType() == CompletionModel::Emoji) {
-        auto shortcode = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedTextRole).toString();
+        auto shortcode = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
        auto text = getText();
        auto at = text.lastIndexOf(QLatin1Char(':'));
        QTextCursor cursor(document()->textDocument());
@@ -321,37 +324,3 @@ void ChatDocumentHandler::pushMention(const Mention mention) const
        m_room->mentions()->push_back(mention);
    }
 }
-
-QColor ChatDocumentHandler::mentionColor() const
-{
-    return m_mentionColor;
-}
-
-void ChatDocumentHandler::setMentionColor(const QColor &color)
-{
-    if (m_mentionColor == color) {
-        return;
-    }
-    m_mentionColor = color;
-    m_highlighter->mentionFormat.setForeground(m_mentionColor);
-    m_highlighter->rehighlight();
-    Q_EMIT mentionColorChanged();
-}
-
-QColor ChatDocumentHandler::errorColor() const
-{
-    return m_errorColor;
-}
-
-void ChatDocumentHandler::setErrorColor(const QColor &color)
-{
-    if (m_errorColor == color) {
-        return;
-    }
-    m_errorColor = color;
-    m_highlighter->errorFormat.setForeground(m_errorColor);
-    m_highlighter->rehighlight();
-    Q_EMIT errorColorChanged();
-}
-
-#include "moc_chatdocumenthandler.cpp"
--- a/src/chatdocumenthandler.h
+++ b/src/chatdocumenthandler.h
@@ -8,53 +8,13 @@
 #include <QTextCursor>

 #include "models/completionmodel.h"
+#include "models/userlistmodel.h"
 #include "neochatroom.h"

+class QTextDocument;
 class NeoChatRoom;
 class SyntaxHighlighter;

-/**
- * @class ChatDocumentHandler
- *
- * Handle the QQuickTextDocument of a qml text item.
- *
- * The class provides functionality to highlight text in the text document as well
- * as providing completion functionality via a CompletionModel.
- *
- * The ChatDocumentHandler is also linked to a NeoChatRoom to provide functionality
- * to save the chat document text when switching between rooms.
- *
- * To get the full functionality the cursor position and text selection information
- * need to be passed in. For example:
- *
- * @code{.qml}
- * import QtQuick 2.0
- * import QtQuick.Controls 2.15 as QQC2
- *
- * import org.kde.kirigami 2.12 as Kirigami
- * import org.kde.neochat 1.0
- *
- * QQC2.TextArea {
- *      id: textField
- *
- *      // Set this to a NeoChatRoom object.
- *      property var room
- *
- *      ChatDocumentHandler {
- *          id: documentHandler
- *          document: textField.textDocument
- *          cursorPosition: textField.cursorPosition
- *          selectionStart: textField.selectionStart
- *          selectionEnd: textField.selectionEnd
- *          mentionColor: Kirigami.Theme.linkColor
- *          errorColor: Kirigami.Theme.negativeTextColor
- *          room: textField.room
- *      }
- * }
- * @endcode
- *
- * @sa QQuickTextDocument, CompletionModel, NeoChatRoom
- */
 class ChatDocumentHandler : public QObject
 {
    Q_OBJECT
@@ -66,50 +26,15 @@ class ChatDocumentHandler : public QObject
     * from the correct parameters in the assigned room.
     */
    Q_PROPERTY(bool isEdit READ isEdit WRITE setIsEdit NOTIFY isEditChanged)
-
-    /**
-     * @brief The QQuickTextDocument that is being handled.
-     */
    Q_PROPERTY(QQuickTextDocument *document READ document WRITE setDocument NOTIFY documentChanged)
-
-    /**
-     * @brief The current saved cursor position.
-     */
    Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged)
-
-    /**
-     * @brief The start position of any currently selected text.
-     */
    Q_PROPERTY(int selectionStart READ selectionStart WRITE setSelectionStart NOTIFY selectionStartChanged)
-
-    /**
-     * @brief The end position of any currently selected text.
-     */
    Q_PROPERTY(int selectionEnd READ selectionEnd WRITE setSelectionEnd NOTIFY selectionEndChanged)

-    /**
-     * @brief The current CompletionModel.
-     *
-     * This is typically provided to a qml component to visualise the current
-     * completion results.
-     */
    Q_PROPERTY(CompletionModel *completionModel READ completionModel NOTIFY completionModelChanged)

-    /**
-     * @brief The current room that the the text document is being handled for.
-     */
    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)

-    /**
-     * @brief The color to highlight user mentions.
-     */
-    Q_PROPERTY(QColor mentionColor READ mentionColor WRITE setMentionColor NOTIFY mentionColorChanged)
-
-    /**
-     * @brief The color to highlight spelling errors.
-     */
-    Q_PROPERTY(QColor errorColor READ errorColor WRITE setErrorColor NOTIFY errorColorChanged)
-
 public:
    explicit ChatDocumentHandler(QObject *parent = nullptr);

@@ -135,13 +60,6 @@ public:

    void updateCompletions();
    CompletionModel *completionModel() const;
-
-    [[nodiscard]] QColor mentionColor() const;
-    void setMentionColor(const QColor &color);
-
-    [[nodiscard]] QColor errorColor() const;
-    void setErrorColor(const QColor &color);
-
 Q_SIGNALS:
    void isEditChanged();
    void documentChanged();
@@ -150,22 +68,17 @@ Q_SIGNALS:
    void completionModelChanged();
    void selectionStartChanged();
    void selectionEndChanged();
-    void errorColorChanged();
-    void mentionColorChanged();

 private:
    int completionStartIndex() const;

-    bool m_isEdit = false;
+    bool m_isEdit;

-    QPointer<QQuickTextDocument> m_document;
+    QQuickTextDocument *m_document;

    QPointer<NeoChatRoom> m_room;
    bool completionVisible = false;

-    QColor m_mentionColor;
-    QColor m_errorColor;
-
    int m_cursorPosition;
    int m_selectionStart;
    int m_selectionEnd;
--- a/src/clipboard.cpp
+++ b/src/clipboard.cpp
@@ -62,10 +62,10 @@ QString Clipboard::saveImage(QString localPath) const
 void Clipboard::saveText(QString message)
 {
    static QRegularExpression re(QStringLiteral("<[^>]*>"));
-    auto *mimeData = new QMimeData; // ownership is transferred to clipboard
-    mimeData->setHtml(message);
-    mimeData->setText(message.replace(re, QString()));
-    m_clipboard->setMimeData(mimeData);
+    auto *mineData = new QMimeData; // ownership is transferred to clipboard
+    mineData->setHtml(message);
+    mineData->setText(message.replace(re, QString()));
+    m_clipboard->setMimeData(mineData);
 }

 void Clipboard::setImage(const QUrl &url)
@@ -79,5 +79,3 @@ void Clipboard::setImage(const QUrl &url)
        }
    }
 }
-
-#include "moc_clipboard.cpp"
--- a/src/clipboard.h
+++ b/src/clipboard.h
@@ -9,60 +9,23 @@ class QClipboard;
 class QImage;

 /**
- * @class Clipboard
- *
 * Clipboard proxy
- *
- * Used to set and retrieve content from the clipboard.
 */
 class Clipboard : public QObject
 {
    Q_OBJECT
-
-    /**
-     * @brief Whether the current clipboard content is an image.
-     */
    Q_PROPERTY(bool hasImage READ hasImage NOTIFY imageChanged)
-
-    /**
-     * @brief Return the current clipboard content image.
-     *
-     * Returns a null image if the clipboard does not contain an image or if it
-     * contains an image in an unsupported image format.
-     */
    Q_PROPERTY(QImage image READ image NOTIFY imageChanged)

 public:
    explicit Clipboard(QObject *parent = nullptr);

    [[nodiscard]] bool hasImage() const;
-
    [[nodiscard]] QImage image() const;

-    /**
-     * @brief Save the current clipboard image to file.
-     *
-     * If the clipboard does not contain an image or if it contains an image in an
-     * unsupported image format nothing happens.
-     *
-     * The given file path must be both valid and local or nothing happens.
-     *
-     * @param localPath the path to save the image. A default path for the app cache
-     *                  will be used if available and this is empty.
-     *
-     * @return A QString with the path that the image was saved to. The string will
-     *         be empty if nothing was saved.
-     */
    Q_INVOKABLE QString saveImage(QString localPath = {}) const;

-    /**
-     * @brief Set the clipboard content to the input message.
-     */
    Q_INVOKABLE void saveText(QString message);
-
-    /**
-     * @brief Set the clipboard content to the input image.
-     */
    Q_INVOKABLE void setImage(const QUrl &image);

 private:
--- a/src/colorschemer.cpp
+++ b/src/colorschemer.cpp
@@ -44,5 +44,3 @@ QString ColorSchemer::nameForIndex(int index) const
 {
    return c->model()->data(c->model()->index(index, 0), Qt::DisplayRole).toString();
 }
-
-#include "moc_colorschemer.cpp"
--- a/src/colorschemer.h
+++ b/src/colorschemer.h
@@ -8,53 +8,18 @@
 class QAbstractItemModel;
 class KColorSchemeManager;

-/**
- * @class ColorSchemer
- *
- * A class to provide a wrapper around KColorSchemeManager to make it available in
- * QML.
- *
- * @sa KColorSchemeManager
- */
 class ColorSchemer : public QObject
 {
    Q_OBJECT
-
-    /**
-     * @brief A QAbstractItemModel of all available color schemes.
-     *
-     * @sa QAbstractItemModel
-     */
    Q_PROPERTY(QAbstractItemModel *model READ model CONSTANT)
-
 public:
-    explicit ColorSchemer(QObject *parent = nullptr);
+    ColorSchemer(QObject *parent = nullptr);
    ~ColorSchemer();

    QAbstractItemModel *model() const;
-
-    /**
-     * @brief Activates the KColorScheme identified by the provided index.
-     *
-     * @sa KColorScheme
-     */
    Q_INVOKABLE void apply(int idx);
-
-    /**
-     * @brief Activates the KColorScheme with the given name.
-     *
-     * @sa KColorScheme
-     */
    Q_INVOKABLE void apply(const QString &name);
-
-    /**
-     * @brief Returns the index for the scheme with the given name.
-     */
    Q_INVOKABLE int indexForScheme(const QString &name) const;
-
-    /**
-     * @brief Returns the name for the scheme with the given index.
-     */
    Q_INVOKABLE QString nameForIndex(int index) const;

 private:
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -21,6 +21,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QGuiApplication>
+#include <QImageReader>
 #include <QNetworkProxy>
 #include <QQuickTextDocument>
 #include <QQuickWindow>
@@ -30,17 +31,27 @@

 #include <signal.h>

-#include <Quotient/accountregistry.h>
-#include <Quotient/connection.h>
-#include <Quotient/csapi/logout.h>
-#include <Quotient/csapi/notifications.h>
-#include <Quotient/eventstats.h>
-#include <Quotient/jobs/downloadfilejob.h>
-#include <Quotient/qt_connection_util.h>
-#include <Quotient/user.h>
+#ifdef QUOTIENT_07
+#include "accountregistry.h"
+#else
+#include "neochataccountregistry.h"
+#endif
+
+#include <connection.h>
+#include <csapi/content-repo.h>
+#include <csapi/logout.h>
+#include <csapi/profile.h>
+#include <jobs/downloadfilejob.h>
+#include <qt_connection_util.h>
+
+#ifdef QUOTIENT_07
+#include <csapi/notifications.h>
+#include <eventstats.h>
+#endif

 #include "neochatconfig.h"
 #include "neochatroom.h"
+#include "neochatuser.h"
 #include "notificationsmanager.h"
 #include "roommanager.h"
 #include "windowcontroller.h"
@@ -57,12 +68,29 @@ Controller::Controller(QObject *parent)
    : QObject(parent)
 {
    Connection::setRoomType<NeoChatRoom>();
+    Connection::setUserType<NeoChatUser>();

    setApplicationProxy();

 #ifndef Q_OS_ANDROID
-    setQuitOnLastWindowClosed();
-    connect(NeoChatConfig::self(), &NeoChatConfig::SystemTrayChanged, this, &Controller::setQuitOnLastWindowClosed);
+    if (NeoChatConfig::self()->systemTray()) {
+        m_trayIcon = new TrayIcon(this);
+        m_trayIcon->show();
+        connect(m_trayIcon, &TrayIcon::showWindow, this, &Controller::showWindow);
+        QGuiApplication::setQuitOnLastWindowClosed(false);
+    }
+    connect(NeoChatConfig::self(), &NeoChatConfig::SystemTrayChanged, this, [this]() {
+        if (NeoChatConfig::self()->systemTray()) {
+            m_trayIcon = new TrayIcon(this);
+            m_trayIcon->show();
+            connect(m_trayIcon, &TrayIcon::showWindow, this, &Controller::showWindow);
+        } else {
+            disconnect(m_trayIcon, &TrayIcon::showWindow, this, &Controller::showWindow);
+            delete m_trayIcon;
+            m_trayIcon = nullptr;
+        }
+        QGuiApplication::setQuitOnLastWindowClosed(!NeoChatConfig::self()->systemTray());
+    });
 #endif

    QTimer::singleShot(0, this, [this] {
@@ -97,21 +125,97 @@ Controller::Controller(QObject *parent)
    }
 #endif

+    connect(&AccountRegistry::instance(), &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
+
+#ifdef QUOTIENT_07
    static int oldAccountCount = 0;
-    connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, [this]() {
-        if (m_accountRegistry.size() > oldAccountCount) {
-            auto connection = dynamic_cast<NeoChatConnection *>(m_accountRegistry.accounts()[m_accountRegistry.size() - 1]);
-            connect(connection, &NeoChatConnection::syncDone, this, [connection]() {
-                NotificationsManager::instance().handleNotifications(connection);
+    connect(&AccountRegistry::instance(), &AccountRegistry::accountCountChanged, this, [=]() {
+        if (AccountRegistry::instance().size() > oldAccountCount) {
+            auto connection = AccountRegistry::instance().accounts()[AccountRegistry::instance().size() - 1];
+            connect(connection, &Connection::syncDone, this, [=]() {
+                handleNotifications(connection);
            });
        }
-        oldAccountCount = m_accountRegistry.size();
+        oldAccountCount = AccountRegistry::instance().size();
    });
+#endif
+}

-    QTimer::singleShot(0, this, [this] {
-        m_pushRuleModel = new PushRuleModel;
+#ifdef QUOTIENT_07
+void Controller::handleNotifications(QPointer<Quotient::Connection> connection)
+{
+    static QStringList initial;
+    static QStringList oldNotifications;
+    auto job = connection->callApi<GetNotificationsJob>();
+
+    connect(job, &BaseJob::success, this, [job, connection]() {
+        const auto notifications = job->jsonData()["notifications"].toArray();
+        if (!initial.contains(connection->user()->id())) {
+            initial.append(connection->user()->id());
+            for (const auto &n : notifications) {
+                oldNotifications += n.toObject()["event"].toObject()["event_id"].toString();
+            }
+            return;
+        }
+        for (const auto &n : notifications) {
+            const auto notification = n.toObject();
+            if (notification["read"].toBool()) {
+                oldNotifications.removeOne(notification["event"].toObject()["event_id"].toString());
+                continue;
+            }
+            if (oldNotifications.contains(notification["event"].toObject()["event_id"].toString())) {
+                continue;
+            }
+            oldNotifications += notification["event"].toObject()["event_id"].toString();
+            auto room = connection->room(notification["room_id"].toString());
+
+            // If room exists, room is NOT active OR the application is NOT active, show notification
+            if (room
+                && !(RoomManager::instance().currentRoom() && room->id() == RoomManager::instance().currentRoom()->id()
+                     && QGuiApplication::applicationState() == Qt::ApplicationActive)) {
+                // The room might have been deleted (for example rejected invitation).
+                auto sender = room->user(notification["event"].toObject()["sender"].toString());
+
+                QString body;
+
+                if (notification["event"].toObject()["type"].toString() == "org.matrix.msc3381.poll.start") {
+                    body = notification["event"]
+                               .toObject()["content"]
+                               .toObject()["org.matrix.msc3381.poll.start"]
+                               .toObject()["question"]
+                               .toObject()["body"]
+                               .toString();
+                } else {
+                    body = notification["event"].toObject()["content"].toObject()["body"].toString();
+                }
+
+                if (notification["event"]["type"] == "m.room.encrypted") {
+#ifdef Quotient_E2EE_ENABLED
+                    auto decrypted = connection->decryptNotification(notification);
+                    body = decrypted["content"].toObject()["body"].toString();
+#endif
+                    if (body.isEmpty()) {
+                        body = i18n("Encrypted Message");
+                    }
+                }
+
+                QImage avatar_image;
+                if (!sender->avatarUrl(room).isEmpty()) {
+                    avatar_image = sender->avatar(128, room);
+                } else {
+                    avatar_image = room->avatar(128);
+                }
+                NotificationsManager::instance().postNotification(dynamic_cast<NeoChatRoom *>(room),
+                                                                  sender->displayname(room),
+                                                                  body,
+                                                                  avatar_image,
+                                                                  notification["event"].toObject()["event_id"].toString(),
+                                                                  true);
+            }
+        }
    });
 }
+#endif

 Controller &Controller::instance()
 {
@@ -119,63 +223,128 @@ Controller &Controller::instance()
    return _instance;
 }

-void Controller::toggleWindow()
+void Controller::showWindow()
 {
-    auto &instance = WindowController::instance();
-    auto window = instance.window();
-    if (window->isVisible()) {
-        if (window->windowStates() & Qt::WindowMinimized) {
-            window->showNormal();
-            window->requestActivate();
-        } else {
-            window->close();
-        }
-    } else {
-        instance.showAndRaiseWindow({});
-        instance.window()->requestActivate();
-    }
+    WindowController::instance().showAndRaiseWindow(QString());
 }

-void Controller::addConnection(NeoChatConnection *c)
+void Controller::loginWithAccessToken(const QString &serverAddr, const QString &user, const QString &token, const QString &deviceName)
+{
+    if (user.isEmpty() || token.isEmpty()) {
+        return;
+    }
+
+    QUrl serverUrl(serverAddr);
+
+    auto conn = new Connection();
+    if (serverUrl.isValid()) {
+        conn->setHomeserver(serverUrl);
+    }
+
+    connect(conn, &Connection::connected, this, [this, conn, deviceName] {
+        AccountSettings account(conn->userId());
+        account.setKeepLoggedIn(true);
+        account.setHomeserver(conn->homeserver());
+        account.setDeviceId(conn->deviceId());
+        account.setDeviceName(deviceName);
+        if (!saveAccessTokenToKeyChain(account, conn->accessToken())) {
+            qWarning() << "Couldn't save access token";
+        }
+        account.sync();
+        addConnection(conn);
+        setActiveConnection(conn);
+    });
+    connect(conn, &Connection::networkError, this, [this](QString error, const QString &, int, int) {
+        Q_EMIT errorOccured(i18n("Network Error: %1", error));
+    });
+    conn->assumeIdentity(user, token, deviceName);
+}
+
+void Controller::logout(Connection *conn, bool serverSideLogout)
+{
+    if (!conn) {
+        qCritical() << "Attempt to logout null connection";
+        return;
+    }
+
+    SettingsGroup("Accounts").remove(conn->userId());
+
+    QKeychain::DeletePasswordJob job(qAppName());
+    job.setAutoDelete(true);
+    job.setKey(conn->userId());
+    QEventLoop loop;
+    QKeychain::DeletePasswordJob::connect(&job, &QKeychain::Job::finished, &loop, &QEventLoop::quit);
+    job.start();
+    loop.exec();
+
+    if (AccountRegistry::instance().count() > 1) {
+        // Only set the connection if the the account being logged out is currently active
+        if (conn == activeConnection()) {
+            setActiveConnection(AccountRegistry::instance().accounts()[0]);
+        }
+    } else {
+        setActiveConnection(nullptr);
+    }
+    if (!serverSideLogout) {
+        return;
+    }
+    conn->logout();
+}
+
+void Controller::addConnection(Connection *c)
 {
    Q_ASSERT_X(c, __FUNCTION__, "Attempt to add a null connection");

-    m_accountRegistry.add(c);
+#ifndef QUOTIENT_07
+    AccountRegistry::instance().add(c);
+#endif

    c->setLazyLoading(true);

-    connect(c, &NeoChatConnection::syncDone, this, [this, c] {
+    connect(c, &Connection::syncDone, this, [this, c] {
+        setBusy(false);
+
        Q_EMIT syncDone();

        c->sync(30000);
        c->saveState();
    });
-    connect(c, &NeoChatConnection::loggedOut, this, [this, c] {
+    connect(c, &Connection::loggedOut, this, [this, c] {
        dropConnection(c);
    });

-    connect(c, &NeoChatConnection::requestFailed, this, [this](BaseJob *job) {
-        if (job->error() == BaseJob::UserConsentRequired) {
+    connect(c, &Connection::requestFailed, this, [this](BaseJob *job) {
+        if (job->error() == BaseJob::UserConsentRequiredError) {
            Q_EMIT userConsentRequired(job->errorUrl());
        }
    });

+    setBusy(true);
+
    c->sync();

    Q_EMIT connectionAdded(c);
+    Q_EMIT accountCountChanged();
 }

-void Controller::dropConnection(NeoChatConnection *c)
+void Controller::dropConnection(Connection *c)
 {
    Q_ASSERT_X(c, __FUNCTION__, "Attempt to drop a null connection");

-    m_accountRegistry.drop(c);
+#ifndef QUOTIENT_07
+    AccountRegistry::instance().drop(c);
+#endif
+
    Q_EMIT connectionDropped(c);
+    Q_EMIT accountCountChanged();
+#ifndef QUOTIENT_07
+    c->deleteLater();
+#endif
 }

 void Controller::invokeLogin()
 {
-    const auto accounts = SettingsGroup("Accounts"_ls).childGroups();
+    const auto accounts = SettingsGroup("Accounts").childGroups();
    QString id = NeoChatConfig::self()->activeConnection();
    for (const auto &accountId : accounts) {
        AccountSettings account{accountId};
@@ -189,39 +358,39 @@ void Controller::invokeLogin()
                AccountSettings account{accountId};
                QString accessToken;
                if (accessTokenLoadingJob->error() == QKeychain::Error::NoError) {
-                    accessToken = QString::fromLatin1(accessTokenLoadingJob->binaryData());
+                    accessToken = accessTokenLoadingJob->binaryData();
                } else {
                    return;
                }

-                auto connection = new NeoChatConnection(account.homeserver());
-                connect(connection, &NeoChatConnection::connected, this, [this, connection, id] {
+                auto connection = new Connection(account.homeserver());
+                connect(connection, &Connection::connected, this, [this, connection, id] {
                    connection->loadState();
                    addConnection(connection);
                    if (connection->userId() == id) {
                        setActiveConnection(connection);
-                        connectSingleShot(connection, &NeoChatConnection::syncDone, this, &Controller::initiated);
+                        connectSingleShot(connection, &Connection::syncDone, this, &Controller::initiated);
                    }
                });
-                connect(connection, &NeoChatConnection::loginError, this, [this, connection](const QString &error, const QString &) {
-                    if (error == "Unrecognised access token"_ls) {
+                connect(connection, &Connection::loginError, this, [this, connection](const QString &error, const QString &) {
+                    if (error == "Unrecognised access token") {
                        Q_EMIT errorOccured(i18n("Login Failed: Access Token invalid or revoked"));
-                        connection->logout(false);
-                    } else if (error == "Connection closed"_ls) {
+                        logout(connection, false);
+                    } else if (error == "Connection closed") {
                        Q_EMIT errorOccured(i18n("Login Failed: %1", error));
                        // Failed due to network connection issue. This might happen when the homeserver is
                        // temporary down, or the user trying to re-launch NeoChat in a network that cannot
                        // connect to the homeserver. In this case, we don't want to do logout().
                    } else {
                        Q_EMIT errorOccured(i18n("Login Failed: %1", error));
-                        connection->logout(true);
+                        logout(connection, true);
                    }
                    Q_EMIT initiated();
                });
-                connect(connection, &NeoChatConnection::networkError, this, [this](const QString &error, const QString &, int, int) {
+                connect(connection, &Connection::networkError, this, [this](const QString &error, const QString &, int, int) {
                    Q_EMIT errorOccured(i18n("Network Error: %1", error));
                });
-                connection->assumeIdentity(account.userId(), accessToken);
+                connection->assumeIdentity(account.userId(), accessToken, account.deviceId());
            });
        }
    }
@@ -237,7 +406,7 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const Accoun
    job->setKey(account.userId());

    // Handling of errors
-    connect(job, &QKeychain::Job::finished, this, [this, job]() {
+    connect(job, &QKeychain::Job::finished, this, [this, &account, job]() {
        if (job->error() == QKeychain::Error::NoError) {
            return;
        }
@@ -284,37 +453,132 @@ bool Controller::saveAccessTokenToKeyChain(const AccountSettings &account, const
    return true;
 }

+void Controller::changeAvatar(Connection *conn, const QUrl &localFile)
+{
+    auto job = conn->uploadFile(localFile.toLocalFile());
+#ifdef QUOTIENT_07
+    if (isJobPending(job)) {
+#else
+    if (isJobRunning(job)) {
+#endif
+        connect(job, &BaseJob::success, this, [conn, job] {
+            conn->callApi<SetAvatarUrlJob>(conn->userId(), job->contentUri());
+        });
+    }
+}
+
+void Controller::markAllMessagesAsRead(Connection *conn)
+{
+    const auto rooms = conn->allRooms();
+    for (auto room : rooms) {
+        room->markAllMessagesAsRead();
+    }
+}
+
 bool Controller::supportSystemTray() const
 {
 #ifdef Q_OS_ANDROID
    return false;
 #else
-    auto de = QString::fromLatin1(qgetenv("XDG_CURRENT_DESKTOP"));
+    QString de = getenv("XDG_CURRENT_DESKTOP");
    return de != QStringLiteral("GNOME") && de != QStringLiteral("Pantheon");
 #endif
 }

-void Controller::setQuitOnLastWindowClosed()
+void Controller::changePassword(Connection *connection, const QString &currentPassword, const QString &newPassword)
 {
-#ifndef Q_OS_ANDROID
-    if (NeoChatConfig::self()->systemTray()) {
-        m_trayIcon = new TrayIcon(this);
-        m_trayIcon->show();
-        connect(m_trayIcon, &TrayIcon::toggleWindow, this, &Controller::toggleWindow);
-    } else {
-        if (m_trayIcon) {
-            disconnect(m_trayIcon, &TrayIcon::toggleWindow, this, &Controller::toggleWindow);
-            delete m_trayIcon;
-            m_trayIcon = nullptr;
+    NeochatChangePasswordJob *job = connection->callApi<NeochatChangePasswordJob>(newPassword, false);
+    connect(job, &BaseJob::result, this, [this, job, currentPassword, newPassword, connection] {
+        if (job->error() == 103) {
+            QJsonObject replyData = job->jsonData();
+            QJsonObject authData;
+            authData["session"] = replyData["session"];
+            authData["password"] = currentPassword;
+            authData["type"] = "m.login.password";
+            authData["user"] = connection->user()->id();
+            QJsonObject identifier = {{"type", "m.id.user"}, {"user", connection->user()->id()}};
+            authData["identifier"] = identifier;
+            NeochatChangePasswordJob *innerJob = connection->callApi<NeochatChangePasswordJob>(newPassword, false, authData);
+            connect(innerJob, &BaseJob::success, this, [this]() {
+                Q_EMIT passwordStatus(PasswordStatus::Success);
+            });
+            connect(innerJob, &BaseJob::failure, this, [innerJob, this]() {
+                if (innerJob->jsonData()["errcode"] == "M_FORBIDDEN") {
+                    Q_EMIT passwordStatus(PasswordStatus::Wrong);
+                } else {
+                    Q_EMIT passwordStatus(PasswordStatus::Other);
+                }
+            });
        }
-    }
-    QGuiApplication::setQuitOnLastWindowClosed(!NeoChatConfig::self()->systemTray());
-#else
-    return;
-#endif
+    });
 }

-NeoChatConnection *Controller::activeConnection() const
+bool Controller::setAvatar(Connection *connection, const QUrl &avatarSource)
+{
+    User *localUser = connection->user();
+    QString decoded = avatarSource.path();
+    if (decoded.isEmpty()) {
+#ifdef QUOTIENT_07
+        connection->callApi<SetAvatarUrlJob>(localUser->id(), avatarSource);
+#else
+        connection->callApi<SetAvatarUrlJob>(localUser->id(), QString());
+#endif
+        return true;
+    }
+    if (QImageReader(decoded).read().isNull()) {
+        return false;
+    } else {
+        return localUser->setAvatar(decoded);
+    }
+}
+
+NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Omittable<QJsonObject> &auth)
+#ifdef QUOTIENT_07
+    : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), "/_matrix/client/r0/account/password")
+#else
+    : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), QStringLiteral("/_matrix/client/r0/account/password"))
+#endif
+{
+    QJsonObject _data;
+    addParam<>(_data, QStringLiteral("new_password"), newPassword);
+    addParam<IfNotEmpty>(_data, QStringLiteral("logout_devices"), logoutDevices);
+    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
+    setRequestData(_data);
+}
+
+int Controller::accountCount() const
+{
+    return AccountRegistry::instance().count();
+}
+
+bool Controller::quitOnLastWindowClosed()
+{
+    return QGuiApplication::quitOnLastWindowClosed();
+}
+
+void Controller::setQuitOnLastWindowClosed(bool value)
+{
+    if (quitOnLastWindowClosed() != value) {
+        QGuiApplication::setQuitOnLastWindowClosed(value);
+        Q_EMIT quitOnLastWindowClosedChanged();
+    }
+}
+
+bool Controller::busy() const
+{
+    return m_busy;
+}
+
+void Controller::setBusy(bool busy)
+{
+    if (m_busy == busy) {
+        return;
+    }
+    m_busy = busy;
+    Q_EMIT busyChanged();
+}
+
+Connection *Controller::activeConnection() const
 {
    if (m_connection.isNull()) {
        return nullptr;
@@ -322,34 +586,33 @@ NeoChatConnection *Controller::activeConnection() const
    return m_connection;
 }

-void Controller::setActiveConnection(NeoChatConnection *connection)
+void Controller::setActiveConnection(Connection *connection)
 {
    if (connection == m_connection) {
        return;
    }
    if (m_connection != nullptr) {
-        disconnect(m_connection, &NeoChatConnection::syncError, this, nullptr);
-        disconnect(m_connection, &NeoChatConnection::accountDataChanged, this, nullptr);
+        disconnect(m_connection, &Connection::syncError, this, nullptr);
    }
    m_connection = connection;
    if (connection != nullptr) {
        NeoChatConfig::self()->setActiveConnection(connection->userId());
-        connect(connection, &NeoChatConnection::networkError, this, [this]() {
+        connect(connection, &Connection::networkError, this, [this]() {
            if (!m_isOnline) {
                return;
            }
            m_isOnline = false;
            Q_EMIT isOnlineChanged(false);
        });
-        connect(connection, &NeoChatConnection::syncDone, this, [this] {
+        connect(connection, &Connection::syncDone, this, [this] {
            if (m_isOnline) {
                return;
            }
            m_isOnline = true;
            Q_EMIT isOnlineChanged(true);
        });
-        connect(connection, &NeoChatConnection::requestFailed, this, [](BaseJob *job) {
-            if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"_ls].toString() == "M_TOO_LARGE"_ls) {
+        connect(connection, &Connection::requestFailed, this, [=](BaseJob *job) {
+            if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"].toString() == "M_TOO_LARGE"_ls) {
                RoomManager::instance().warning(i18n("File too large to download."), i18n("Contact your matrix server administrator for support."));
            }
        });
@@ -361,16 +624,39 @@ void Controller::setActiveConnection(NeoChatConnection *connection)
    Q_EMIT activeConnectionIndexChanged();
 }

-PushRuleModel *Controller::pushRuleModel() const
-{
-    return m_pushRuleModel;
-}
-
 void Controller::saveWindowGeometry()
 {
    WindowController::instance().saveGeometry();
 }

+NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth)
+#ifdef QUOTIENT_07
+    : Quotient::BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId).toLatin1())
+#else
+    : Quotient::BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId))
+#endif
+{
+    QJsonObject _data;
+    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
+    setRequestData(std::move(_data));
+}
+
+void Controller::createRoom(const QString &name, const QString &topic)
+{
+    auto createRoomJob = m_connection->createRoom(Connection::PublishRoom, "", name, topic, QStringList());
+    connect(createRoomJob, &CreateRoomJob::failure, this, [this, createRoomJob] {
+        Q_EMIT errorOccured(i18n("Room creation failed: \"%1\"", createRoomJob->errorString()));
+    });
+    connectSingleShot(
+        this,
+        &Controller::roomAdded,
+        this,
+        [this](NeoChatRoom *room) {
+            RoomManager::instance().enterRoom(room);
+        },
+        Qt::QueuedConnection);
+}
+
 bool Controller::isOnline() const
 {
    return m_isOnline;
@@ -379,16 +665,16 @@ bool Controller::isOnline() const
 // TODO: Remove in favor of RoomManager::joinRoom
 void Controller::joinRoom(const QString &alias)
 {
-    if (!alias.contains(":"_ls)) {
+    if (!alias.contains(":")) {
        Q_EMIT errorOccured(i18n("The room id you are trying to join is not valid"));
        return;
    }

-    const auto knownServer = alias.mid(alias.indexOf(":"_ls) + 1);
+    const auto knownServer = alias.mid(alias.indexOf(":") + 1);
    RoomManager::instance().joinRoom(m_connection, alias, QStringList{knownServer});
 }

-void Controller::openOrCreateDirectChat(User *user)
+void Controller::openOrCreateDirectChat(NeoChatUser *user)
 {
    const auto existing = activeConnection()->directChats();

@@ -438,6 +724,20 @@ bool Controller::hasWindowSystem() const
 #endif
 }

+QString Controller::plainText(QQuickTextDocument *document) const
+{
+    return document->textDocument()->toPlainText();
+}
+
+bool Controller::encryptionSupported() const
+{
+#ifdef QUOTIENT_07
+    return Quotient::encryptionSupported();
+#else
+    return false;
+#endif
+}
+
 void Controller::forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item)
 {
    // HACK: Workaround bug QTBUG 93281
@@ -476,10 +776,29 @@ void Controller::setApplicationProxy()

 int Controller::activeConnectionIndex() const
 {
-    auto result = std::find_if(m_accountRegistry.accounts().begin(), m_accountRegistry.accounts().end(), [this](const auto &it) {
+#ifdef QUOTIENT_07
+    auto result = std::find_if(Accounts.accounts().begin(), Accounts.accounts().end(), [this](const auto &it) {
        return it == m_connection;
    });
-    return result - m_accountRegistry.accounts().begin();
+    return result - Accounts.accounts().begin();
+#else
+    for (int i = 0; i < AccountRegistry::instance().rowCount(); i++) {
+        if (AccountRegistry::instance().data(AccountRegistry::instance().index(i, 0), AccountRegistry::UserIdRole).toString() == m_connection->userId()) {
+            return i;
+        }
+    }
+    return 0;
+#endif
+}
+
+int Controller::quotientMinorVersion() const
+{
+// TODO libQuotient 0.7: Replace with version function from libQuotient
+#ifdef QUOTIENT_07
+    return 7;
+#else
+    return 6;
+#endif
 }

 bool Controller::isFlatpak() const
@@ -490,10 +809,3 @@ bool Controller::isFlatpak() const
    return false;
 #endif
 }
-
-AccountRegistry &Controller::accounts()
-{
-    return m_accountRegistry;
-}
-
-#include "moc_controller.cpp"
--- a/src/controller.h
+++ b/src/controller.h
@@ -3,25 +3,24 @@

 #pragma once

-#include "models/pushrulemodel.h"
 #include <QObject>
 #include <QQuickItem>

 #include <KFormat>

-#include "neochatconnection.h"
-#include <Quotient/accountregistry.h>
-#include <Quotient/jobs/basejob.h>
-#include <Quotient/settings.h>
+#include <jobs/basejob.h>
+#include <settings.h>

 class NeoChatRoom;
+class NeoChatUser;
 class TrayIcon;
+class QWindow;
 class QQuickTextDocument;

 namespace Quotient
 {
+class Connection;
 class Room;
-class User;
 }

 namespace QKeychain
@@ -29,147 +28,86 @@ namespace QKeychain
 class ReadPasswordJob;
 }

-/**
- * @class Controller
- *
- * A singleton class designed to help manage the application.
- *
- * There are also a bunch of helper functions that currently don't fit anywhere
- * else.
- */
 class Controller : public QObject
 {
    Q_OBJECT
-
-    /**
-     * @brief The current connection for the rest of NeoChat to use.
-     */
-    Q_PROPERTY(NeoChatConnection *activeConnection READ activeConnection WRITE setActiveConnection NOTIFY activeConnectionChanged)
-
-    /**
-     * @brief The PushRuleModel that has the active connection's push rules.
-     */
-    Q_PROPERTY(PushRuleModel *pushRuleModel READ pushRuleModel CONSTANT)
-
-    /**
-     * @brief The row number in the accounts directory of the active connection.
-     */
-    Q_PROPERTY(int activeConnectionIndex READ activeConnectionIndex NOTIFY activeConnectionIndexChanged)
-
-    /**
-     * @brief Whether the OS NeoChat is running on supports sytem tray icons.
-     */
+    Q_PROPERTY(int accountCount READ accountCount NOTIFY accountCountChanged)
+    Q_PROPERTY(bool quitOnLastWindowClosed READ quitOnLastWindowClosed WRITE setQuitOnLastWindowClosed NOTIFY quitOnLastWindowClosedChanged)
+    Q_PROPERTY(Quotient::Connection *activeConnection READ activeConnection WRITE setActiveConnection NOTIFY activeConnectionChanged)
+    Q_PROPERTY(bool busy READ busy WRITE setBusy NOTIFY busyChanged)
    Q_PROPERTY(bool supportSystemTray READ supportSystemTray CONSTANT)
-
-    /**
-     * @brief Whether KWindowSystem specific features are available.
-     */
    Q_PROPERTY(bool hasWindowSystem READ hasWindowSystem CONSTANT)
-
-    /**
-     * @brief Whether NeoChat is currently able to connect to the server.
-     */
    Q_PROPERTY(bool isOnline READ isOnline NOTIFY isOnlineChanged)
-
-    /**
-     * @brief Whether NeoChat is running as a flatpak.
-     *
-     * This is the only way to gate NeoChat features in flatpaks in QML.
-     */
+    Q_PROPERTY(bool encryptionSupported READ encryptionSupported CONSTANT)
+    Q_PROPERTY(int activeConnectionIndex READ activeConnectionIndex NOTIFY activeConnectionIndexChanged)
+    Q_PROPERTY(int quotientMinorVersion READ quotientMinorVersion CONSTANT)
    Q_PROPERTY(bool isFlatpak READ isFlatpak CONSTANT)

 public:
-    /**
-     * @brief Defines the status after an attempt to change the password on an account.
-     */
-    enum PasswordStatus {
-        Success, /**< The password was successfully changed. */
-        Wrong, /**< The current password entered was wrong. */
-        Other, /**< An unknown problem occurred. */
-    };
-    Q_ENUM(PasswordStatus)
-
    static Controller &instance();

-    void setActiveConnection(NeoChatConnection *connection);
-    [[nodiscard]] NeoChatConnection *activeConnection() const;
+    void setActiveConnection(Quotient::Connection *connection);
+    [[nodiscard]] Quotient::Connection *activeConnection() const;

-    [[nodiscard]] PushRuleModel *pushRuleModel() const;
+    void addConnection(Quotient::Connection *c);
+    void dropConnection(Quotient::Connection *c);

-    /**
-     * @brief Add a new connection to the account registry.
-     */
-    void addConnection(NeoChatConnection *c);
+    Q_INVOKABLE void loginWithAccessToken(const QString &, const QString &, const QString &, const QString &);

-    /**
-     * @brief Drop a connection from the account registry.
-     */
-    void dropConnection(NeoChatConnection *c);
+    Q_INVOKABLE void changePassword(Quotient::Connection *connection, const QString &currentPassword, const QString &newPassword);

-    int activeConnectionIndex() const;
+    Q_INVOKABLE bool setAvatar(Quotient::Connection *connection, const QUrl &avatarSource);

-    /**
-     * @brief Save an access token to the keychain for the given account.
-     */
-    bool saveAccessTokenToKeyChain(const Quotient::AccountSettings &account, const QByteArray &accessToken);
+    [[nodiscard]] int accountCount() const;

-    /**
-     * @brief Join a room.
-     */
-    Q_INVOKABLE void joinRoom(const QString &alias);
+    [[nodiscard]] static bool quitOnLastWindowClosed();
+    void setQuitOnLastWindowClosed(bool value);

-    /**
-     * @brief Join a direct chat with the given user.
-     *
-     * If a direct chat with the user doesn't exist one is created and then joined.
-     */
-    Q_INVOKABLE void openOrCreateDirectChat(Quotient::User *user);
+    [[nodiscard]] bool busy() const;
+    void setBusy(bool busy);

    [[nodiscard]] bool supportSystemTray() const;

-    /**
-     * @brief Set the background blur status of the given item.
-     */
-    Q_INVOKABLE void setBlur(QQuickItem *item, bool blur);
+    bool saveAccessTokenToKeyChain(const Quotient::AccountSettings &account, const QByteArray &accessToken);
+
+    int activeConnectionIndex() const;
+
+    enum PasswordStatus {
+        Success,
+        Wrong,
+        Other,
+    };
+    Q_ENUM(PasswordStatus);
+
+    /// \brief Create new room for a group chat.
+    Q_INVOKABLE void createRoom(const QString &name, const QString &topic);
+
+    /// \brief Join a room.
+    Q_INVOKABLE void joinRoom(const QString &alias);

    bool isOnline() const;

-    /**
-     * @brief Sets the QNetworkProxy for the application.
-     *
-     * @sa QNetworkProxy::setApplicationProxy
-     */
-    Q_INVOKABLE void setApplicationProxy();
-
-    bool isFlatpak() const;
-
-    /**
-     * @brief Return a string for the input timestamp.
-     *
-     * The output format depends on the KFormat::DurationFormatOptions chosen.
-     *
-     * @sa KFormat::DurationFormatOptions
-     */
    Q_INVOKABLE QString formatDuration(quint64 msecs, KFormat::DurationFormatOptions options = KFormat::DefaultDuration) const;
-
-    /**
-     * @brief Return a human readable string for a given input number of bytes.
-     */
    Q_INVOKABLE QString formatByteSize(double size, int precision = 1) const;

-    /**
-     * @brief Force a QQuickTextDocument to refresh when images are loaded.
-     *
-     * HACK: This is a workaround for QTBUG 93281.
-     */
+    Q_INVOKABLE void openOrCreateDirectChat(NeoChatUser *user);
+
+    Q_INVOKABLE void setBlur(QQuickItem *item, bool blur);
+    Q_INVOKABLE QString plainText(QQuickTextDocument *document) const;
+    bool encryptionSupported() const;
+
    Q_INVOKABLE void forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item);

-    Quotient::AccountRegistry &accounts();
+    Q_INVOKABLE void setApplicationProxy();
+
+    int quotientMinorVersion() const;
+    bool isFlatpak() const;

 private:
    explicit Controller(QObject *parent = nullptr);

-    QPointer<NeoChatConnection> m_connection;
+    QPointer<Quotient::Connection> m_connection;
+    bool m_busy = false;
    TrayIcon *m_trayIcon = nullptr;

    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const Quotient::AccountSettings &account);
@@ -180,33 +118,57 @@ private:
    QMap<Quotient::Room *, int> m_notificationCounts;

    bool hasWindowSystem() const;
-
-    QPointer<PushRuleModel> m_pushRuleModel;
-    Quotient::AccountRegistry m_accountRegistry;
+#ifdef QUOTIENT_07
+    void handleNotifications(QPointer<Quotient::Connection> connection);
+#endif

 private Q_SLOTS:
    void invokeLogin();
-    void toggleWindow();
-    void setQuitOnLastWindowClosed();
+    void showWindow();

 Q_SIGNALS:
+    void busyChanged();
    /// Error occurred because of user inputs
    void errorOccured(const QString &error);

    /// Error occurred because of server or bug in NeoChat
    void globalErrorOccured(QString error, QString detail);
    void syncDone();
-    void connectionAdded(NeoChatConnection *connection);
-    void connectionDropped(NeoChatConnection *connection);
+    void connectionAdded(Quotient::Connection *_t1);
+    void connectionDropped(Quotient::Connection *_t1);
+    void accountCountChanged();
    void initiated();
+    void notificationClicked(const QString &_t1, const QString &_t2);
    void quitOnLastWindowClosedChanged();
    void unreadCountChanged();
    void activeConnectionChanged();
-    void passwordStatus(Controller::PasswordStatus status);
+    void passwordStatus(Controller::PasswordStatus _t1);
    void userConsentRequired(QUrl url);
+    void testConnectionResult(const QString &connection, bool usable);
    void isOnlineChanged(bool isOnline);
+    void keyVerificationRequest(int timeLeft, Quotient::Connection *connection, const QString &transactionId, const QString &deviceId);
+    void keyVerificationStart();
+    void keyVerificationAccept(const QString &commitment);
+    void keyVerificationKey(const QString &sas);
    void activeConnectionIndexChanged();
+    void roomAdded(NeoChatRoom *room);

 public Q_SLOTS:
+    void logout(Quotient::Connection *conn, bool serverSideLogout);
+    void changeAvatar(Quotient::Connection *conn, const QUrl &localFile);
+    static void markAllMessagesAsRead(Quotient::Connection *conn);
    void saveWindowGeometry();
 };
+
+// TODO libQuotient 0.7: Drop
+class NeochatChangePasswordJob : public Quotient::BaseJob
+{
+public:
+    explicit NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
+};
+
+class NeochatDeleteDeviceJob : public Quotient::BaseJob
+{
+public:
+    explicit NeochatDeleteDeviceJob(const QString &deviceId, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
+};
--- a/src/delegatesizehelper.cpp
+++ b/src/delegatesizehelper.cpp
@@ -1,155 +0,0 @@
-// 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 "delegatesizehelper.h"
-
-#include <cmath>
-
-#include <QDebug>
-
-DelegateSizeHelper::DelegateSizeHelper(QObject *parent)
-    : QObject(parent)
-{
-}
-
-qreal DelegateSizeHelper::parentWidth() const
-{
-    return m_parentWidth;
-}
-
-void DelegateSizeHelper::setParentWidth(qreal parentWidth)
-{
-    if (parentWidth == m_parentWidth) {
-        return;
-    }
-    m_parentWidth = parentWidth;
-    Q_EMIT parentWidthChanged();
-    Q_EMIT currentPercentageWidthChanged();
-    Q_EMIT currentWidthChanged();
-}
-
-qreal DelegateSizeHelper::startBreakpoint() const
-{
-    return m_startBreakpoint;
-}
-
-void DelegateSizeHelper::setStartBreakpoint(qreal startBreakpoint)
-{
-    if (startBreakpoint == m_startBreakpoint) {
-        return;
-    }
-    m_startBreakpoint = startBreakpoint;
-    Q_EMIT startBreakpointChanged();
-}
-
-qreal DelegateSizeHelper::endBreakpoint() const
-{
-    return m_endBreakpoint;
-}
-
-void DelegateSizeHelper::setEndBreakpoint(qreal endBreakpoint)
-{
-    if (endBreakpoint == m_endBreakpoint) {
-        return;
-    }
-    m_endBreakpoint = endBreakpoint;
-    Q_EMIT endBreakpointChanged();
-}
-
-int DelegateSizeHelper::startPercentWidth() const
-{
-    return m_startPercentWidth;
-}
-
-void DelegateSizeHelper::setStartPercentWidth(int startPercentWidth)
-{
-    if (startPercentWidth == m_startPercentWidth) {
-        return;
-    }
-    m_startPercentWidth = startPercentWidth;
-    Q_EMIT startPercentWidthChanged();
-}
-
-int DelegateSizeHelper::endPercentWidth() const
-{
-    return m_endPercentWidth;
-}
-
-void DelegateSizeHelper::setEndPercentWidth(int endPercentWidth)
-{
-    if (endPercentWidth == m_endPercentWidth) {
-        return;
-    }
-    m_endPercentWidth = endPercentWidth;
-    Q_EMIT endPercentWidthChanged();
-}
-
-qreal DelegateSizeHelper::maxWidth() const
-{
-    return m_maxWidth;
-}
-
-void DelegateSizeHelper::setMaxWidth(qreal maxWidth)
-{
-    if (maxWidth == m_maxWidth) {
-        return;
-    }
-    m_maxWidth = maxWidth;
-    Q_EMIT maxWidthChanged();
-}
-
-int DelegateSizeHelper::calculateCurrentPercentageWidth() const
-{
-    // Don't do anything if m_parentWidth hasn't been set yet.
-    if (m_parentWidth < 0) {
-        return -1;
-    }
-    // Don't bother with calculations for a horizontal line.
-    if (m_startPercentWidth == m_endPercentWidth) {
-        return m_startPercentWidth;
-    }
-    // Dividing by zero is a bad idea.
-    if (m_startBreakpoint == m_endBreakpoint) {
-        qWarning() << "DelegateSizeHelper::calculateCurrentPercentageWidth() - m_startBreakpoint is equal to m_endBreakpoint this would lead to divide by "
-                      "zero, aborting";
-        return -1;
-    }
-
-    // Fit to y = mx + c
-    qreal m = (m_endPercentWidth - m_startPercentWidth) / (m_endBreakpoint - m_startBreakpoint);
-    qreal c = m_startPercentWidth - m * m_startBreakpoint;
-
-    // This allows us to clamp correctly if the start or end width is bigger.
-    bool endPercentBigger = m_endPercentWidth > m_startPercentWidth;
-    int maxPercentWidth = endPercentBigger ? m_endPercentWidth : m_startPercentWidth;
-    int minPercentWidth = endPercentBigger ? m_startPercentWidth : m_endPercentWidth;
-
-    int calcPercentWidth = std::round(m * m_parentWidth + c);
-    return std::clamp(calcPercentWidth, minPercentWidth, maxPercentWidth);
-}
-
-int DelegateSizeHelper::currentPercentageWidth() const
-{
-    return calculateCurrentPercentageWidth();
-}
-
-qreal DelegateSizeHelper::currentWidth() const
-{
-    if (m_parentWidth < 0) {
-        return 0.0;
-    }
-    int percentWidth = calculateCurrentPercentageWidth();
-    // - 1 means bad input values so don't try to calculate.
-    if (percentWidth == -1) {
-        return 0.0;
-    }
-
-    qreal absoluteWidth = m_parentWidth * percentWidth * 0.01;
-    if (m_maxWidth < 0.0) {
-        return std::round(absoluteWidth);
-    } else {
-        return std::round(std::min(absoluteWidth, m_maxWidth));
-    }
-}
-
-#include "moc_delegatesizehelper.cpp"
--- a/src/delegatesizehelper.h
+++ b/src/delegatesizehelper.h
@@ -1,123 +0,0 @@
-// 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
-
-#pragma once
-
-#include <QObject>
-
-/**
- * @class DelegateSizeHelper
- *
- * A class to help calculate the current width of a chat delegate/bar.
- *
- * The aim is to support a dynamic sizing based upon the width of the page. There is
- * a built in curve that allows the width to transition between two percentages based
- * upon a start and finish break point. This is to provide better convergence where
- * generally the delegate will need to fill all or most the screen when thin but
- * should max out in size and only fill a lower percentage of the screen when wide.
- *
- * @note While the main intended usage is to start with a high percentage when the parentWidth
- *       is small and transition to a lower one when large, the math is setup for the
- *       general case so any combination of parameters works.
- */
-class DelegateSizeHelper : public QObject
-{
-    Q_OBJECT
-
-    /**
-     * @brief The width of the component's parent.
-     */
-    Q_PROPERTY(qreal parentWidth READ parentWidth WRITE setParentWidth NOTIFY parentWidthChanged)
-
-    /**
-     * @brief The width (in px) when the width percentage should start to transition.
-     */
-    Q_PROPERTY(qreal startBreakpoint READ startBreakpoint WRITE setStartBreakpoint NOTIFY startBreakpointChanged)
-
-    /**
-     * @brief The width (in px) when the width percentage should finish transitioning.
-     */
-    Q_PROPERTY(qreal endBreakpoint READ endBreakpoint WRITE setEndBreakpoint NOTIFY endBreakpointChanged)
-
-    /**
-     * @brief The width (in %) of the component at or before the startBreakpoint.
-     *
-     * @sa startBreakpoint
-     */
-    Q_PROPERTY(int startPercentWidth READ startPercentWidth WRITE setStartPercentWidth NOTIFY startPercentWidthChanged)
-
-    /**
-     * @brief The width (in %) of the component at or after the endBreakpoint.
-     *
-     * @sa endBreakpoint
-     */
-    Q_PROPERTY(int endPercentWidth READ endPercentWidth WRITE setEndPercentWidth NOTIFY endPercentWidthChanged)
-
-    /**
-     * @brief The absolute maximum width (in px) the component can be.
-     */
-    Q_PROPERTY(qreal maxWidth READ maxWidth WRITE setMaxWidth NOTIFY maxWidthChanged)
-
-    /**
-     * @brief The width (in %) of the component at the current parentWidth.
-     *
-     * Will return -1 if no parentWidth is set or startBreakpoint == endBreakpoint.
-     *
-     * @sa parentWidth, startBreakpoint, endBreakpoint
-     */
-    Q_PROPERTY(int currentPercentageWidth READ currentPercentageWidth NOTIFY currentPercentageWidthChanged)
-
-    /**
-     * @brief The width (in px) of the component at the current parentWidth.
-     *
-     * Will return 0.0 if no parentWidth is set.
-     *
-     * @sa parentWidth
-     */
-    Q_PROPERTY(qreal currentWidth READ currentWidth NOTIFY currentWidthChanged)
-
-public:
-    explicit DelegateSizeHelper(QObject *parent = nullptr);
-
-    qreal parentWidth() const;
-    void setParentWidth(qreal parentWidth);
-
-    qreal startBreakpoint() const;
-    void setStartBreakpoint(qreal startBreakpoint);
-
-    qreal endBreakpoint() const;
-    void setEndBreakpoint(qreal endBreakpoint);
-
-    int startPercentWidth() const;
-    void setStartPercentWidth(int startPercentWidth);
-
-    int endPercentWidth() const;
-    void setEndPercentWidth(int endPercentWidth);
-
-    qreal maxWidth() const;
-    void setMaxWidth(qreal maxWidth);
-
-    int currentPercentageWidth() const;
-
-    qreal currentWidth() const;
-
-Q_SIGNALS:
-    void parentWidthChanged();
-    void startBreakpointChanged();
-    void endBreakpointChanged();
-    void startPercentWidthChanged();
-    void endPercentWidthChanged();
-    void maxWidthChanged();
-    void currentPercentageWidthChanged();
-    void currentWidthChanged();
-
-private:
-    qreal m_parentWidth = -1.0;
-    qreal m_startBreakpoint;
-    qreal m_endBreakpoint;
-    int m_startPercentWidth;
-    int m_endPercentWidth;
-    qreal m_maxWidth = -1.0;
-
-    int calculateCurrentPercentageWidth() const;
-};
--- a/src/emojitones.h
+++ b/src/emojitones.h
@@ -5,13 +5,6 @@

 #include <QVariant>

-/**
- * @class EmojiTones
- *
- * This class provides a _tones variable with the available emoji tones to EmojiModel.
- *
- * @sa EmojiModel
- */
 class EmojiTones
 {
 private:
--- a/src/emojitones_data.h
+++ b/src/emojitones_data.h
--- a/src/enums/delegatetype.h
+++ b/src/enums/delegatetype.h
@@ -1,43 +0,0 @@
-// 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
-
-#pragma once
-
-#include <QObject>
-
-/**
- * @class DelegateType
- *
- * This class is designed to define the DelegateType enumeration.
- */
-class DelegateType
-{
-    Q_GADGET
-
-public:
-    /**
-     * @brief The type of delegate that is needed for the event.
-     *
-     * @note While similar this is not the matrix event or message type. This is
-     *       to tell a QML ListView what delegate to show for each event. So while
-     *       similar to the spec it is not the same.
-     */
-    enum Type {
-        Emote, /**< A message that begins with /me. */
-        Notice, /**< A notice event. */
-        Image, /**< A message that is an image. */
-        Audio, /**< A message that is an audio recording. */
-        Video, /**< A message that is a video. */
-        File, /**< A message that is a file. */
-        Message, /**< A text message. */
-        Sticker, /**< A message that is a sticker. */
-        State, /**< A state event in the room. */
-        Encrypted, /**< An encrypted message that cannot be decrypted. */
-        ReadMarker, /**< The local user read marker. */
-        Poll, /**< The initial event for a poll. */
-        Location, /**< A location event. */
-        LiveLocation, /**< The initial event of a shared live location (i.e., the place where this is supposed to be shown in the timeline). */
-        Other, /**< Anything that cannot be classified as another type. */
-    };
-    Q_ENUM(Type);
-};
--- a/src/eventhandler.cpp
+++ b/src/eventhandler.cpp
@@ -1,988 +0,0 @@
-// 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 "eventhandler.h"
-
-#include <QMovie>
-
-#include <KLocalizedString>
-
-#include <Quotient/eventitem.h>
-#include <Quotient/events/encryptionevent.h>
-#include <Quotient/events/reactionevent.h>
-#include <Quotient/events/redactionevent.h>
-#include <Quotient/events/roomavatarevent.h>
-#include <Quotient/events/roomcanonicalaliasevent.h>
-#include <Quotient/events/roommemberevent.h>
-#include <Quotient/events/roompowerlevelsevent.h>
-#include <Quotient/events/simplestateevents.h>
-#include <Quotient/events/stickerevent.h>
-#include <Quotient/quotient_common.h>
-
-#include "eventhandler_logging.h"
-#include "events/pollevent.h"
-#include "linkpreviewer.h"
-#include "models/reactionmodel.h"
-#include "neochatconfig.h"
-#include "neochatroom.h"
-#include "texthandler.h"
-#include "utils.h"
-
-using namespace Quotient;
-
-const NeoChatRoom *EventHandler::getRoom() const
-{
-    return m_room;
-}
-
-void EventHandler::setRoom(const NeoChatRoom *room)
-{
-    if (room == m_room) {
-        return;
-    }
-    m_room = room;
-}
-
-const Quotient::Event *EventHandler::getEvent() const
-{
-    return m_event;
-}
-
-void EventHandler::setEvent(const Quotient::RoomEvent *event)
-{
-    if (event == m_event) {
-        return;
-    }
-    m_event = event;
-}
-
-QString EventHandler::getId() const
-{
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getId called with m_event set to nullptr.";
-        return {};
-    }
-
-    return !m_event->id().isEmpty() ? m_event->id() : m_event->transactionId();
-}
-
-DelegateType::Type EventHandler::getDelegateTypeForEvent(const Quotient::RoomEvent *event) const
-{
-    if (auto e = eventCast<const RoomMessageEvent>(event)) {
-        switch (e->msgtype()) {
-        case MessageEventType::Emote:
-            return DelegateType::Emote;
-        case MessageEventType::Notice:
-            return DelegateType::Notice;
-        case MessageEventType::Image:
-            return DelegateType::Image;
-        case MessageEventType::Audio:
-            return DelegateType::Audio;
-        case MessageEventType::Video:
-            return DelegateType::Video;
-        case MessageEventType::Location:
-            return DelegateType::Location;
-        default:
-            break;
-        }
-        if (e->hasFileContent()) {
-            return DelegateType::File;
-        }
-
-        return DelegateType::Message;
-    }
-    if (is<const StickerEvent>(*event)) {
-        return DelegateType::Sticker;
-    }
-    if (event->isStateEvent()) {
-        if (event->matrixType() == QStringLiteral("org.matrix.msc3672.beacon_info")) {
-            return DelegateType::LiveLocation;
-        }
-        return DelegateType::State;
-    }
-    if (is<const EncryptedEvent>(*event)) {
-        return DelegateType::Encrypted;
-    }
-    if (is<PollStartEvent>(*event)) {
-        const auto pollEvent = eventCast<const PollStartEvent>(event);
-        if (pollEvent->isRedacted()) {
-            return DelegateType::Message;
-        }
-        return DelegateType::Poll;
-    }
-
-    return DelegateType::Other;
-}
-
-DelegateType::Type EventHandler::getDelegateType() const
-{
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getDelegateType called with m_event set to nullptr.";
-        return DelegateType::Other;
-    }
-
-    return getDelegateTypeForEvent(m_event);
-}
-
-QVariantMap EventHandler::getAuthor(bool isPending) const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getAuthor called with m_room set to nullptr.";
-        return {};
-    }
-    // If we have a room we can return an empty user by handing nullptr to m_room->getUser.
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getAuthor called with m_event set to nullptr. Returning empty user.";
-        return m_room->getUser(nullptr);
-    }
-
-    const auto author = isPending ? m_room->localUser() : m_room->user(m_event->senderId());
-    return m_room->getUser(author);
-}
-
-QString EventHandler::getAuthorDisplayName(bool isPending) const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getAuthorDisplayName called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getAuthorDisplayName called with m_event set to nullptr.";
-        return {};
-    }
-
-    if (is<RoomMemberEvent>(*m_event) && !m_event->unsignedJson()[QStringLiteral("prev_content")][QStringLiteral("displayname")].isNull()
-        && m_event->stateKey() == m_event->senderId()) {
-        auto previousDisplayName = m_event->unsignedJson()[QStringLiteral("prev_content")][QStringLiteral("displayname")].toString().toHtmlEscaped();
-        if (previousDisplayName.isEmpty()) {
-            previousDisplayName = m_event->senderId();
-        }
-        return previousDisplayName;
-    } else {
-        const auto author = isPending ? m_room->localUser() : m_room->user(m_event->senderId());
-        return m_room->htmlSafeMemberName(author->id());
-    }
-}
-
-QDateTime EventHandler::getTime(bool isPending, QDateTime lastUpdated) const
-{
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getTime called with m_event set to nullptr.";
-        return {};
-    }
-    if (isPending && lastUpdated == QDateTime()) {
-        qCWarning(EventHandling) << "a value must be provided for lastUpdated for a pending event.";
-        return {};
-    }
-
-    return isPending ? lastUpdated : m_event->originTimestamp();
-}
-
-QString EventHandler::getTimeString(bool relative, QLocale::FormatType format, bool isPending, QDateTime lastUpdated) const
-{
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getTime called with m_event set to nullptr.";
-        return {};
-    }
-    if (isPending && lastUpdated == QDateTime()) {
-        qCWarning(EventHandling) << "a value must be provided for lastUpdated for a pending event.";
-        return {};
-    }
-
-    auto ts = getTime(isPending, lastUpdated);
-    if (ts.isValid()) {
-        if (relative) {
-            return m_format.formatRelativeDate(ts.toLocalTime().date(), format);
-        } else {
-            return QLocale().toString(ts.toLocalTime().time(), format);
-        }
-    }
-    return {};
-}
-
-bool EventHandler::isHighlighted()
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "isHighlighted called with m_room set to nullptr.";
-        return false;
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "isHighlighted called with m_event set to nullptr.";
-        return false;
-    }
-
-    return !m_room->isDirectChat() && m_room->isEventHighlighted(m_event);
-}
-
-bool EventHandler::isHidden()
-{
-    if (m_event->isStateEvent() && !NeoChatConfig::self()->showStateEvent()) {
-        return true;
-    }
-
-    if (auto roomMemberEvent = eventCast<const RoomMemberEvent>(m_event)) {
-        if ((roomMemberEvent->isJoin() || roomMemberEvent->isLeave()) && !NeoChatConfig::self()->showLeaveJoinEvent()) {
-            return true;
-        } else if (roomMemberEvent->isRename() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave() && !NeoChatConfig::self()->showRename()) {
-            return true;
-        } else if (roomMemberEvent->isAvatarUpdate() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave()
-                   && !NeoChatConfig::self()->showAvatarUpdate()) {
-            return true;
-        }
-    }
-
-    if (m_event->isStateEvent() && eventCast<const StateEvent>(m_event)->repeatsState()) {
-        return true;
-    }
-
-    // isReplacement?
-    if (auto e = eventCast<const RoomMessageEvent>(m_event)) {
-        if (!e->replacedEvent().isEmpty()) {
-            return true;
-        }
-    }
-
-    if (is<RedactionEvent>(*m_event) || is<ReactionEvent>(*m_event)) {
-        return true;
-    }
-
-    if (auto e = eventCast<const RoomMessageEvent>(m_event)) {
-        if (!e->replacedEvent().isEmpty() && e->replacedEvent() != e->id()) {
-            return true;
-        }
-    }
-
-    if (m_room->connection()->isIgnored(m_room->user(m_event->senderId()))) {
-        return true;
-    }
-
-    // hide ending live location beacons
-    if (m_event->isStateEvent() && m_event->matrixType() == "org.matrix.msc3672.beacon_info"_ls && !m_event->contentJson()["live"_ls].toBool()) {
-        return true;
-    }
-
-    return false;
-}
-
-QString EventHandler::getRichBody(bool stripNewlines) const
-{
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getRichBody called with m_event set to nullptr.";
-        return {};
-    }
-    return getBody(m_event, Qt::RichText, stripNewlines);
-}
-
-QString EventHandler::getPlainBody(bool stripNewlines) const
-{
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getPlainBody called with m_event set to nullptr.";
-        return {};
-    }
-    return getBody(m_event, Qt::PlainText, stripNewlines);
-}
-
-QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat format, bool stripNewlines) const
-{
-    if (event->isRedacted()) {
-        auto reason = event->redactedBecause()->reason();
-        return (reason.isEmpty()) ? i18n("<i>[This message was deleted]</i>") : i18n("<i>[This message was deleted: %1]</i>", reason);
-    }
-
-    const bool prettyPrint = (format == Qt::RichText);
-
-    return switchOnType(
-        *event,
-        [this, format, stripNewlines](const RoomMessageEvent &event) {
-            return getMessageBody(event, format, stripNewlines);
-        },
-        [](const StickerEvent &e) {
-            return e.body();
-        },
-        [this, prettyPrint](const RoomMemberEvent &e) {
-            // FIXME: Rewind to the name that was at the time of this event
-            auto subjectName = m_room->htmlSafeMemberName(e.userId());
-            if (e.membership() == Membership::Leave) {
-                if (e.prevContent() && e.prevContent()->displayName) {
-                    subjectName = sanitized(*e.prevContent()->displayName).toHtmlEscaped();
-                }
-            }
-
-            if (prettyPrint) {
-                subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a>")
-                                  .arg(e.userId(), Utils::getUserColor(m_room->user(e.userId())->hueF()).name(), subjectName);
-            }
-
-            // The below code assumes senderName output in AuthorRole
-            switch (e.membership()) {
-            case Membership::Invite:
-                if (e.repeatsState()) {
-                    auto text = i18n("reinvited %1 to the room", subjectName);
-                    if (!e.reason().isEmpty()) {
-                        text += i18nc("Optional reason for an invitation", ": %1") + e.reason().toHtmlEscaped();
-                    }
-                    return text;
-                }
-                Q_FALLTHROUGH();
-            case Membership::Join: {
-                QString text{};
-                // Part 1: invites and joins
-                if (e.repeatsState()) {
-                    text = i18n("joined the room (repeated)");
-                } else if (e.changesMembership()) {
-                    text = e.membership() == Membership::Invite ? i18n("invited %1 to the room", subjectName) : i18n("joined the room");
-                }
-                if (!text.isEmpty()) {
-                    if (!e.reason().isEmpty()) {
-                        text += i18n(": %1", e.reason().toHtmlEscaped());
-                    }
-                    return text;
-                }
-                // Part 2: profile changes of joined members
-                if (e.isRename()) {
-                    if (!e.newDisplayName()) {
-                        text = i18nc("their refers to a singular user", "cleared their display name");
-                    } else {
-                        text = i18nc("their refers to a singular user", "changed their display name to %1", e.newDisplayName()->toHtmlEscaped());
-                    }
-                }
-                if (e.isAvatarUpdate()) {
-                    if (!text.isEmpty()) {
-                        text += i18n(" and ");
-                    }
-                    if (!e.newAvatarUrl()) {
-                        text += i18nc("their refers to a singular user", "cleared their avatar");
-                    } else if (!e.prevContent()->avatarUrl) {
-                        text += i18n("set an avatar");
-                    } else {
-                        text += i18nc("their refers to a singular user", "updated their avatar");
-                    }
-                }
-                if (text.isEmpty()) {
-                    text = i18nc("<user> changed nothing", "changed nothing");
-                }
-                return text;
-            }
-            case Membership::Leave:
-                if (e.prevContent() && e.prevContent()->membership == Membership::Invite) {
-                    return (e.senderId() != e.userId()) ? i18n("withdrew %1's invitation", subjectName) : i18n("rejected the invitation");
-                }
-
-                if (e.prevContent() && e.prevContent()->membership == Membership::Ban) {
-                    return (e.senderId() != e.userId()) ? i18n("unbanned %1", subjectName) : i18n("self-unbanned");
-                }
-                return (e.senderId() != e.userId())
-                    ? i18n("has put %1 out of the room: %2", subjectName, e.contentJson()["reason"_ls].toString().toHtmlEscaped())
-                    : i18n("left the room");
-            case Membership::Ban:
-                if (e.senderId() != e.userId()) {
-                    if (e.reason().isEmpty()) {
-                        return i18n("banned %1 from the room", subjectName);
-                    } else {
-                        return i18n("banned %1 from the room: %2", subjectName, e.reason().toHtmlEscaped());
-                    }
-                } else {
-                    return i18n("self-banned from the room");
-                }
-            case Membership::Knock: {
-                QString reason(e.contentJson()["reason"_ls].toString().toHtmlEscaped());
-                return reason.isEmpty() ? i18n("requested an invite") : i18n("requested an invite with reason: %1", reason);
-            }
-            default:;
-            }
-            return i18n("made something unknown");
-        },
-        [](const RoomCanonicalAliasEvent &e) {
-            return (e.alias().isEmpty()) ? i18n("cleared the room main alias") : i18n("set the room main alias to: %1", e.alias());
-        },
-        [](const RoomNameEvent &e) {
-            return (e.name().isEmpty()) ? i18n("cleared the room name") : i18n("set the room name to: %1", e.name().toHtmlEscaped());
-        },
-        [prettyPrint, stripNewlines](const RoomTopicEvent &e) {
-            return (e.topic().isEmpty()) ? i18n("cleared the topic")
-                                         : i18n("set the topic to: %1",
-                                                prettyPrint         ? Quotient::prettyPrint(e.topic())
-                                                    : stripNewlines ? e.topic().replace(u'\n', u' ')
-                                                                    : e.topic());
-        },
-        [](const RoomAvatarEvent &) {
-            return i18n("changed the room avatar");
-        },
-        [](const EncryptionEvent &) {
-            return i18n("activated End-to-End Encryption");
-        },
-        [](const RoomCreateEvent &e) {
-            return e.isUpgrade() ? i18n("upgraded the room to version %1", e.version().isEmpty() ? "1"_ls : e.version().toHtmlEscaped())
-                                 : i18n("created the room, version %1", e.version().isEmpty() ? "1"_ls : e.version().toHtmlEscaped());
-        },
-        [](const RoomPowerLevelsEvent &) {
-            return i18nc("'power level' means permission level", "changed the power levels for this room");
-        },
-        [](const StateEvent &e) {
-            if (e.matrixType() == QLatin1String("m.room.server_acl")) {
-                return i18n("changed the server access control lists for this room");
-            }
-            if (e.matrixType() == QLatin1String("im.vector.modular.widgets")) {
-                if (e.fullJson()["unsigned"_ls]["prev_content"_ls].toObject().isEmpty()) {
-                    return i18nc("[User] added <name> widget", "added %1 widget", e.contentJson()["name"_ls].toString());
-                }
-                if (e.contentJson().isEmpty()) {
-                    return i18nc("[User] removed <name> widget", "removed %1 widget", e.fullJson()["unsigned"_ls]["prev_content"_ls]["name"_ls].toString());
-                }
-                return i18nc("[User] configured <name> widget", "configured %1 widget", e.contentJson()["name"_ls].toString());
-            }
-            if (e.matrixType() == "org.matrix.msc3672.beacon_info"_ls) {
-                return e.contentJson()["description"_ls].toString();
-            }
-            return e.stateKey().isEmpty() ? i18n("updated %1 state", e.matrixType())
-                                          : i18n("updated %1 state for %2", e.matrixType(), e.stateKey().toHtmlEscaped());
-        },
-        [](const PollStartEvent &e) {
-            return e.question();
-        },
-        i18n("Unknown event"));
-}
-
-QString EventHandler::getMessageBody(const RoomMessageEvent &event, Qt::TextFormat format, bool stripNewlines) const
-{
-    TextHandler textHandler;
-
-    if (event.hasFileContent()) {
-        auto fileCaption = event.content()->fileInfo()->originalName;
-        if (fileCaption.isEmpty()) {
-            fileCaption = event.plainBody();
-        } else if (event.content()->fileInfo()->originalName != event.plainBody()) {
-            fileCaption = event.plainBody() + " | "_ls + fileCaption;
-        }
-        textHandler.setData(fileCaption);
-        return !fileCaption.isEmpty() ? textHandler.handleRecievePlainText(Qt::PlainText, stripNewlines) : i18n("a file");
-    }
-
-    QString body;
-    if (event.hasTextContent() && event.content()) {
-        body = static_cast<const MessageEventContent::TextContent *>(event.content())->body;
-    } else {
-        body = event.plainBody();
-    }
-
-    textHandler.setData(body);
-
-    Qt::TextFormat inputFormat;
-    if (event.mimeType().name() == "text/plain"_ls) {
-        inputFormat = Qt::PlainText;
-    } else {
-        inputFormat = Qt::RichText;
-    }
-
-    if (format == Qt::RichText) {
-        return textHandler.handleRecieveRichText(inputFormat, m_room, &event, stripNewlines);
-    } else {
-        return textHandler.handleRecievePlainText(inputFormat, stripNewlines);
-    }
-}
-
-QString EventHandler::getGenericBody() const
-{
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getGenericBody called with m_event set to nullptr.";
-        return {};
-    }
-    if (m_event->isRedacted()) {
-        return i18n("<i>[This message was deleted]</i>");
-    }
-
-    return switchOnType(
-        *m_event,
-        [](const RoomMessageEvent &e) {
-            Q_UNUSED(e)
-            return i18n("sent a message");
-        },
-        [](const StickerEvent &e) {
-            Q_UNUSED(e)
-            return i18n("sent a sticker");
-        },
-        [](const RoomMemberEvent &e) {
-            switch (e.membership()) {
-            case Membership::Invite:
-                if (e.repeatsState()) {
-                    return i18n("reinvited someone to the room");
-                }
-                Q_FALLTHROUGH();
-            case Membership::Join: {
-                QString text{};
-                // Part 1: invites and joins
-                if (e.repeatsState()) {
-                    text = i18n("joined the room (repeated)");
-                } else if (e.changesMembership()) {
-                    text = e.membership() == Membership::Invite ? i18n("invited someone to the room") : i18n("joined the room");
-                }
-                if (!text.isEmpty()) {
-                    return text;
-                }
-                // Part 2: profile changes of joined members
-                if (e.isRename()) {
-                    if (!e.newDisplayName()) {
-                        text = i18nc("their refers to a singular user", "cleared their display name");
-                    } else {
-                        text = i18nc("their refers to a singular user", "changed their display name");
-                    }
-                }
-                if (e.isAvatarUpdate()) {
-                    if (!text.isEmpty()) {
-                        text += i18n(" and ");
-                    }
-                    if (!e.newAvatarUrl()) {
-                        text += i18nc("their refers to a singular user", "cleared their avatar");
-                    } else if (!e.prevContent()->avatarUrl) {
-                        text += i18n("set an avatar");
-                    } else {
-                        text += i18nc("their refers to a singular user", "updated their avatar");
-                    }
-                }
-                if (text.isEmpty()) {
-                    text = i18nc("<user> changed nothing", "changed nothing");
-                }
-                return text;
-            }
-            case Membership::Leave:
-                if (e.prevContent() && e.prevContent()->membership == Membership::Invite) {
-                    return (e.senderId() != e.userId()) ? i18n("withdrew a user's invitation") : i18n("rejected the invitation");
-                }
-
-                if (e.prevContent() && e.prevContent()->membership == Membership::Ban) {
-                    return (e.senderId() != e.userId()) ? i18n("unbanned a user") : i18n("self-unbanned");
-                }
-                return (e.senderId() != e.userId()) ? i18n("put a user out of the room") : i18n("left the room");
-            case Membership::Ban:
-                if (e.senderId() != e.userId()) {
-                    return i18n("banned a user from the room");
-                } else {
-                    return i18n("self-banned from the room");
-                }
-            case Membership::Knock: {
-                return i18n("requested an invite");
-            }
-            default:;
-            }
-            return i18n("made something unknown");
-        },
-        [](const RoomCanonicalAliasEvent &e) {
-            return (e.alias().isEmpty()) ? i18n("cleared the room main alias") : i18n("set the room main alias");
-        },
-        [](const RoomNameEvent &e) {
-            return (e.name().isEmpty()) ? i18n("cleared the room name") : i18n("set the room name");
-        },
-        [](const RoomTopicEvent &e) {
-            return (e.topic().isEmpty()) ? i18n("cleared the topic") : i18n("set the topic");
-        },
-        [](const RoomAvatarEvent &) {
-            return i18n("changed the room avatar");
-        },
-        [](const EncryptionEvent &) {
-            return i18n("activated End-to-End Encryption");
-        },
-        [](const RoomCreateEvent &e) {
-            return e.isUpgrade() ? i18n("upgraded the room version") : i18n("created the room");
-        },
-        [](const RoomPowerLevelsEvent &) {
-            return i18nc("'power level' means permission level", "changed the power levels for this room");
-        },
-        [](const StateEvent &e) {
-            if (e.matrixType() == QLatin1String("m.room.server_acl")) {
-                return i18n("changed the server access control lists for this room");
-            }
-            if (e.matrixType() == QLatin1String("im.vector.modular.widgets")) {
-                if (e.fullJson()["unsigned"_ls]["prev_content"_ls].toObject().isEmpty()) {
-                    return i18n("added a widget");
-                }
-                if (e.contentJson().isEmpty()) {
-                    return i18n("removed a widget");
-                }
-                return i18n("configured a widget");
-            }
-            return i18n("updated the state");
-        },
-        [](const PollStartEvent &e) {
-            Q_UNUSED(e);
-            return i18n("started a poll");
-        },
-        i18n("Unknown event"));
-}
-
-QVariantMap EventHandler::getMediaInfo() const
-{
-    return getMediaInfoForEvent(m_event);
-}
-
-QVariantMap EventHandler::getMediaInfoForEvent(const Quotient::RoomEvent *event) const
-{
-    QString eventId = event->id();
-
-    // Get the file info for the event.
-    const EventContent::FileInfo *fileInfo;
-    if (event->is<RoomMessageEvent>()) {
-        auto roomMessageEvent = eventCast<const RoomMessageEvent>(event);
-        if (!roomMessageEvent->hasFileContent()) {
-            return {};
-        }
-        fileInfo = roomMessageEvent->content()->fileInfo();
-    } else if (event->is<StickerEvent>()) {
-        auto stickerEvent = eventCast<const StickerEvent>(event);
-        fileInfo = &stickerEvent->image();
-    } else {
-        return {};
-    }
-
-    return getMediaInfoFromFileInfo(fileInfo, eventId);
-}
-
-QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo *fileInfo, const QString &eventId, bool isThumbnail) const
-{
-    QVariantMap mediaInfo;
-
-    // Get the mxc URL for the media.
-    if (!fileInfo->url().isValid() || eventId.isEmpty()) {
-        mediaInfo["source"_ls] = QUrl();
-    } else {
-        QUrl source = m_room->makeMediaUrl(eventId, fileInfo->url());
-
-        if (source.isValid() && source.scheme() == QStringLiteral("mxc")) {
-            mediaInfo["source"_ls] = source;
-        } else {
-            mediaInfo["source"_ls] = QUrl();
-        }
-    }
-
-    auto mimeType = fileInfo->mimeType;
-    // Add the MIME type for the media if available.
-    mediaInfo["mimeType"_ls] = mimeType.name();
-
-    // Add the MIME type icon if available.
-    mediaInfo["mimeIcon"_ls] = mimeType.iconName();
-
-    // Add media size if available.
-    mediaInfo["size"_ls] = fileInfo->payloadSize;
-
-    // Add parameter depending on media type.
-    if (mimeType.name().contains(QStringLiteral("image"))) {
-        if (auto castInfo = static_cast<const EventContent::ImageContent *>(fileInfo)) {
-            mediaInfo["width"_ls] = castInfo->imageSize.width();
-            mediaInfo["height"_ls] = castInfo->imageSize.height();
-
-            // TODO: Images in certain formats (e.g. WebP) will be erroneously marked as animated, even if they are static.
-            mediaInfo["animated"_ls] = QMovie::supportedFormats().contains(mimeType.preferredSuffix().toUtf8());
-
-            if (!isThumbnail) {
-                QVariantMap tempInfo;
-                auto thumbnailInfo = getMediaInfoFromFileInfo(castInfo->thumbnailInfo(), eventId, true);
-                if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
-                    tempInfo = thumbnailInfo;
-                } else {
-                    QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"_ls].toString();
-                    if (blurhash.isEmpty()) {
-                        tempInfo["source"_ls] = QUrl();
-                    } else {
-                        tempInfo["source"_ls] = QUrl("image://blurhash/"_ls + blurhash);
-                    }
-                }
-                mediaInfo["tempInfo"_ls] = tempInfo;
-            }
-        }
-    }
-    if (mimeType.name().contains(QStringLiteral("video"))) {
-        if (auto castInfo = static_cast<const EventContent::VideoContent *>(fileInfo)) {
-            mediaInfo["width"_ls] = castInfo->imageSize.width();
-            mediaInfo["height"_ls] = castInfo->imageSize.height();
-            mediaInfo["duration"_ls] = castInfo->duration;
-
-            if (!isThumbnail) {
-                QVariantMap tempInfo;
-                auto thumbnailInfo = getMediaInfoFromFileInfo(castInfo->thumbnailInfo(), eventId, true);
-                if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
-                    tempInfo = thumbnailInfo;
-                } else {
-                    QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"_ls].toString();
-                    if (blurhash.isEmpty()) {
-                        tempInfo["source"_ls] = QUrl();
-                    } else {
-                        tempInfo["source"_ls] = QUrl("image://blurhash/"_ls + blurhash);
-                    }
-                }
-                mediaInfo["tempInfo"_ls] = tempInfo;
-            }
-        }
-    }
-    if (mimeType.name().contains(QStringLiteral("audio"))) {
-        if (auto castInfo = static_cast<const EventContent::AudioContent *>(fileInfo)) {
-            mediaInfo["duration"_ls] = castInfo->duration;
-        }
-    }
-
-    return mediaInfo;
-}
-
-QSharedPointer<LinkPreviewer> EventHandler::getLinkPreviewer() const
-{
-    if (!m_event->is<RoomMessageEvent>()) {
-        return nullptr;
-    }
-
-    QString text;
-    auto event = eventCast<const RoomMessageEvent>(m_event);
-    if (event->hasTextContent()) {
-        auto textContent = static_cast<const EventContent::TextContent *>(event->content());
-        if (textContent) {
-            text = textContent->body;
-        } else {
-            text = event->plainBody();
-        }
-    } else {
-        text = event->plainBody();
-    }
-    TextHandler textHandler;
-    textHandler.setData(text);
-
-    QList<QUrl> links = textHandler.getLinkPreviews();
-    if (links.size() > 0) {
-        return QSharedPointer<LinkPreviewer>(new LinkPreviewer(nullptr, m_room, links.size() > 0 ? links[0] : QUrl()));
-    } else {
-        return nullptr;
-    }
-}
-
-QSharedPointer<ReactionModel> EventHandler::getReactions() const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReactions called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReactions called with m_event set to nullptr.";
-        return nullptr;
-    }
-    if (!m_event->is<RoomMessageEvent>()) {
-        qCWarning(EventHandling) << "getReactions called with on a non-message event.";
-        return nullptr;
-    }
-
-    auto eventId = m_event->id();
-    const auto &annotations = m_room->relatedEvents(eventId, EventRelation::AnnotationType);
-    if (annotations.isEmpty()) {
-        return nullptr;
-    };
-
-    QMap<QString, QList<User *>> reactions = {};
-    for (const auto &a : annotations) {
-        if (a->isRedacted()) { // Just in case?
-            continue;
-        }
-        if (const auto &e = eventCast<const ReactionEvent>(a)) {
-            reactions[e->key()].append(m_room->user(e->senderId()));
-        }
-    }
-
-    if (reactions.isEmpty()) {
-        return nullptr;
-    }
-
-    QList<ReactionModel::Reaction> res;
-    auto i = reactions.constBegin();
-    while (i != reactions.constEnd()) {
-        QVariantList authors;
-        for (const auto &author : i.value()) {
-            authors.append(m_room->getUser(author));
-        }
-
-        res.append(ReactionModel::Reaction{i.key(), authors});
-        ++i;
-    }
-
-    if (res.size() > 0) {
-        return QSharedPointer<ReactionModel>(new ReactionModel(nullptr, res, m_room->localUser()));
-    } else {
-        return nullptr;
-    }
-}
-
-bool EventHandler::hasReply() const
-{
-    return !m_event->contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString().isEmpty();
-}
-
-QString EventHandler::getReplyId() const
-{
-    return m_event->contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString();
-}
-
-DelegateType::Type EventHandler::getReplyDelegateType() const
-{
-    auto replyEvent = m_room->getReplyForEvent(*m_event);
-    if (replyEvent == nullptr) {
-        return DelegateType::Other;
-    }
-    return getDelegateTypeForEvent(replyEvent);
-}
-
-QVariantMap EventHandler::getReplyAuthor() const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReplyAuthor called with m_room set to nullptr.";
-        return {};
-    }
-    // If we have a room we can return an empty user by handing nullptr to m_room->getUser.
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReplyAuthor called with m_event set to nullptr. Returning empty user.";
-        return m_room->getUser(nullptr);
-    }
-
-    auto replyPtr = m_room->getReplyForEvent(*m_event);
-
-    if (replyPtr) {
-        auto replyUser = m_room->user(replyPtr->senderId());
-        return m_room->getUser(replyUser);
-    } else {
-        return m_room->getUser(nullptr);
-    }
-}
-
-QString EventHandler::getReplyRichBody(bool stripNewlines) const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReplyRichBody called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReplyRichBody called with m_event set to nullptr.";
-        return {};
-    }
-
-    auto replyEvent = m_room->getReplyForEvent(*m_event);
-    if (replyEvent == nullptr) {
-        return {};
-    }
-
-    return getBody(replyEvent, Qt::RichText, stripNewlines);
-}
-
-QString EventHandler::getReplyPlainBody(bool stripNewlines) const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReplyPlainBody called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReplyPlainBody called with m_event set to nullptr.";
-        return {};
-    }
-
-    auto replyEvent = m_room->getReplyForEvent(*m_event);
-    if (replyEvent == nullptr) {
-        return {};
-    }
-
-    return getBody(replyEvent, Qt::PlainText, stripNewlines);
-}
-
-QVariantMap EventHandler::getReplyMediaInfo() const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReplyMediaInfo called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReplyMediaInfo called with m_event set to nullptr.";
-        return {};
-    }
-
-    auto replyPtr = m_room->getReplyForEvent(*m_event);
-    if (!replyPtr) {
-        return {};
-    }
-    return getMediaInfoForEvent(replyPtr);
-}
-
-float EventHandler::getLatitude() const
-{
-    const auto geoUri = m_event->contentJson()["geo_uri"_ls].toString();
-    if (geoUri.isEmpty()) {
-        return -100.0; // latitude runs from -90deg to +90deg so -100 is out of range.
-    }
-    const auto latitude = geoUri.split(u';')[0].split(u':')[1].split(u',')[0];
-    return latitude.toFloat();
-}
-
-float EventHandler::getLongitude() const
-{
-    const auto geoUri = m_event->contentJson()["geo_uri"_ls].toString();
-    if (geoUri.isEmpty()) {
-        return -200.0; // longitude runs from -180deg to +180deg so -200 is out of range.
-    }
-    const auto latitude = geoUri.split(u';')[0].split(u':')[1].split(u',')[1];
-    return latitude.toFloat();
-}
-
-QString EventHandler::getLocationAssetType() const
-{
-    const auto assetType = m_event->contentJson()["org.matrix.msc3488.asset"_ls].toObject()["type"_ls].toString();
-    if (assetType.isEmpty()) {
-        return {};
-    }
-    return assetType;
-}
-
-bool EventHandler::hasReadMarkers() const
-{
-    auto userIds = m_room->userIdsAtEvent(m_event->id());
-    userIds.remove(m_room->localUser()->id());
-    return userIds.size() > 0;
-}
-
-QVariantList EventHandler::getReadMarkers(int maxMarkers) const
-{
-    auto userIds_temp = m_room->userIdsAtEvent(m_event->id());
-    userIds_temp.remove(m_room->localUser()->id());
-
-    auto userIds = userIds_temp.values();
-    if (userIds.count() > maxMarkers) {
-        userIds = userIds.mid(0, maxMarkers);
-    }
-
-    QVariantList users;
-    users.reserve(userIds.size());
-    for (const auto &userId : userIds) {
-        auto user = m_room->user(userId);
-        users += m_room->getUser(user);
-    }
-
-    return users;
-}
-
-QString EventHandler::getNumberExcessReadMarkers(int maxMarkers) const
-{
-    auto userIds = m_room->userIdsAtEvent(m_event->id());
-    userIds.remove(m_room->localUser()->id());
-
-    if (userIds.count() > maxMarkers) {
-        return QStringLiteral("+ ") + QString::number(userIds.count() - maxMarkers);
-    } else {
-        return QString();
-    }
-}
-
-QString EventHandler::getReadMarkersString() const
-{
-    auto userIds = m_room->userIdsAtEvent(m_event->id());
-    userIds.remove(m_room->localUser()->id());
-
-    /**
-     * The string ends up in the form
-     * "x users: user1DisplayName, user2DisplayName, etc."
-     */
-    QString readMarkersString = i18np("1 user: ", "%1 users: ", userIds.size());
-    for (const auto &userId : userIds) {
-        auto user = m_room->user(userId);
-        readMarkersString += user->displayname(m_room) + i18nc("list separator", ", ");
-    }
-    readMarkersString.chop(2);
-    return readMarkersString;
-}
--- a/src/eventhandler.h
+++ b/src/eventhandler.h
@@ -1,400 +0,0 @@
-// 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
-
-#pragma once
-
-#include <QObject>
-
-#include <KFormat>
-
-#include <Quotient/eventitem.h>
-#include <Quotient/events/roomevent.h>
-#include <Quotient/events/roommessageevent.h>
-
-#include "enums/delegatetype.h"
-
-class LinkPreviewer;
-class NeoChatRoom;
-class ReactionModel;
-
-/**
- * @class EventHandler
- *
- * This class is designed to handle a Quotient::RoomEvent allowing data to be extracted
- * in a form ready for the NeoChat UI.
- *
- * To use this properly both the room and the event should be set (and the event should
- * be from the given room).
- *
- * @note EventHandler will always try to return something even when not properly
- *       initialised, this is usually the best empty value it can create with available
- *       information. This is to minimize warnings from QML especially during startup
- *       and room changes.
- */
-class EventHandler : public QObject
-{
-    Q_OBJECT
-
-public:
-    /**
-     * @brief Return the current room the EventHandler is using.
-     */
-    const NeoChatRoom *getRoom() const;
-
-    /**
-     * @brief Set the current room the EventHandler to using.
-     */
-    void setRoom(const NeoChatRoom *room);
-
-    /**
-     * @brief Return the current event the EventHandler is using.
-     */
-    const Quotient::Event *getEvent() const;
-
-    /**
-     * @brief Set the current event the EventHandler to using.
-     */
-    void setEvent(const Quotient::RoomEvent *event);
-
-    /**
-     * @brief Return the Matrix ID of the event.
-     */
-    QString getId() const;
-
-    /**
-     * @brief Return the DelegateType of the event.
-     *
-     * @note While similar this is not the matrix event or message type. This is
-     *       to tell a QML ListView what delegate to show for each event. So while
-     *       similar to the spec it is not the same.
-     */
-    DelegateType::Type getDelegateType() const;
-
-    /**
-     * @brief Get the author of the event in context of the room.
-     *
-     * This is different to getting a Quotient::User object
-     * as neither of those can provide details like the displayName or avatarMediaId
-     * without the room context as these can vary from room to room. This function
-     * uses the room context and outputs the result as QVariantMap.
-     *
-     * An empty QVariantMap will be returned if the EventHandler hasn't had the room
-     * intialised. An empty user (i.e. a QVariantMap with all the correct keys
-     * but empty values) will be returned if the room has been set but not an event.
-     *
-     * @param isPending if the event is pending, i.e. has not been confirmed by
-     *                  the server.
-     *
-     * @return a QVariantMap for the user with the following properties:
-     *  - isLocalUser - Whether the user is the local user.
-     *  - id - The matrix ID of the user.
-     *  - displayName - Display name in the context of this room.
-     *  - avatarSource - The mxc URL for the user's avatar in the current room.
-     *  - avatarMediaId - Avatar id in the context of this room.
-     *  - color - Color for the user.
-     *  - object - The Quotient::User object for the user.
-     *
-     * @sa Quotient::User
-     */
-    QVariantMap getAuthor(bool isPending = false) const;
-
-    /**
-     * @brief Get the display name of the event author.
-     *
-     * This method is separate from getAuthor() and special in that it will return
-     * the old display name of the author if the current event is one that caused it
-     * to change. This allows for scenarios where the UI wishes to notify that a
-     * user's display name has changed and what it changed from.
-     *
-     * @param isPending whether the event is pending as this cannot be derived from
-     *                  just the event object.
-     */
-    QString getAuthorDisplayName(bool isPending = false) const;
-
-    /**
-     * @brief Return a QDateTime object for the event timestamp.
-     */
-    QDateTime getTime(bool isPending = false, QDateTime lastUpdated = {}) const;
-
-    /**
-     * @brief Return a QString for the event timestamp.
-     *
-     * This is intended to return a string that is read for display in the UI without
-     * any further manipulation required.
-     *
-     * @param relative whether the string is realtive to the current date, i.e.
-     *                 Yesterday or Wednesday, etc.
-     * @param format the QLocale::FormatType to use.
-     * @param isPending whether the event is pending as this cannot be derived from
-     *                  just the event object.
-     * @param lastUpdated the time the event was last updated locally as this cannot be
-     *                    obtained from the event.
-     */
-    QString getTimeString(bool relative, QLocale::FormatType format = QLocale::ShortFormat, bool isPending = false, QDateTime lastUpdated = {}) const;
-
-    /**
-     * @brief Whether the event should be highlighted in the timeline.
-     *
-     * @note Messages in direct chats are never highlighted.
-     */
-    bool isHighlighted();
-
-    /**
-     * @brief Whether the event should be hidden in the timeline.
-     *
-     * This could be for numerous reasons, e.g. if it's a replacement event, if the
-     * user has hidden all state events or if the sender has been ignored by the local
-     * user.
-     */
-    bool isHidden();
-
-    /**
-     * @brief Output a string for the message content ready for display in a rich text field.
-     *
-     * The output string is dependant upon the event type and the desired output format.
-     *
-     * For most messages this is the body content of the message. For media messages
-     * this will be the caption and for state events it will be a string specific
-     * to that event with some dynamic details about the event added.
-     *
-     * E.g. For a room topic state event the text will be:
-     *      "set the topic to: <new topic text>"
-     *
-     * @param stripNewlines whether the output should have new lines in it.
-     */
-    QString getRichBody(bool stripNewlines = false) const;
-
-    /**
-     * @brief Output a string for the message content ready for display in a plain text field.
-     *
-     * The output string is dependant upon the event type and the desired output format.
-     *
-     * For most messages this is the body content of the message. For media messages
-     * this will be the caption and for state events it will be a string specific
-     * to that event with some dynamic details about the event added.
-     *
-     * E.g. For a room topic state event the text will be:
-     *      "set the topic to: <new topic text>"
-     *
-     * @param stripNewlines whether the output should have new lines in it.
-     */
-    QString getPlainBody(bool stripNewlines = false) const;
-
-    /**
-     * @brief Output a generic string for the message content ready for display.
-     *
-     * The output string is dependant upon the event type.
-     *
-     * Unlike EventHandler::getRichBody or EventHandler::getPlainBody the string
-     * is the same for all events of the same type.
-     *
-     * E.g. For a message the text will be:
-     *      "sent a message"
-     *
-     * @sa getRichBody(), getPlainBody()
-     */
-    QString getGenericBody() const;
-
-    /**
-     * @brief Return the media info for the event.
-     *
-     * An empty QVariantMap will be returned for any event that doesn't have any
-     * media info.
-     *
-     * @return This should consist of the following:
-     *  - source - The mxc URL for the media.
-     *  - mimeType - The MIME type of the media (should be image/xxx for this delegate).
-     *  - mimeIcon - The MIME icon name (should be image-xxx).
-     *  - size - The file size in bytes.
-     *  - width - The width in pixels of the audio media.
-     *  - height - The height in pixels of the audio media.
-     *  - tempInfo - mediaInfo (with the same properties as this except no tempInfo) for a temporary image while the file downloads.
-     */
-    QVariantMap getMediaInfo() const;
-
-    /**
-     * @brief Return a LinkPreviewer object for the event.
-     *
-     * A nullptr will be returned for any event that doesn't have any links so the
-     * return should be null checked and an empty LinkPreviewer provided if null.
-     *
-     * @sa LinkPreviewer
-     */
-    QSharedPointer<LinkPreviewer> getLinkPreviewer() const;
-
-    /**
-     * @brief Return a ReactionModel object for the event.
-     *
-     * A nullptr will be returned for any event that doesn't have any links so the
-     * return should be null checked and an empty QVariantList (or other suitable
-     * empty mode) provided if null.
-     */
-    QSharedPointer<ReactionModel> getReactions() const;
-
-    /**
-     * @brief Whether the event is a reply to another in the timeline.
-     */
-    bool hasReply() const;
-
-    /**
-     * @brief Return the Matrix ID of the event replied to.
-     */
-    QString getReplyId() const;
-
-    /**
-     * @brief Return the DelegateType of the event replied to.
-     *
-     * @note While similar this is not the matrix event or message type. This is
-     *       to tell a QML ListView what delegate to show for each event. So while
-     *       similar to the spec it is not the same.
-     */
-    DelegateType::Type getReplyDelegateType() const;
-
-    /**
-     * @brief Get the author of the event replied to in context of the room.
-     *
-     * This is different to getting a Quotient::User object
-     * as neither of those can provide details like the displayName or avatarMediaId
-     * without the room context as these can vary from room to room. This function
-     * uses the room context and outputs the result as QVariantMap.
-     *
-     * An empty QVariantMap will be returned if the EventHandler hasn't had the room
-     * intialised. An empty user (i.e. a QVariantMap with all the correct keys
-     * but empty values) will be returned if the room has been set but not an event.
-     *
-     * @return a QVariantMap for the user with the following properties:
-     *  - isLocalUser - Whether the user is the local user.
-     *  - id - The matrix ID of the user.
-     *  - displayName - Display name in the context of this room.
-     *  - avatarSource - The mxc URL for the user's avatar in the current room.
-     *  - avatarMediaId - Avatar id in the context of this room.
-     *  - color - Color for the user.
-     *  - object - The Quotient::User object for the user.
-     *
-     * @sa Quotient::User
-     */
-    QVariantMap getReplyAuthor() const;
-
-    /**
-     * @brief Output a string for the message content of the event replied to ready
-     * for display in a rich text field.
-     *
-     * The output string is dependant upon the event type and the desired output format.
-     *
-     * For most messages this is the body content of the message. For media messages
-     * this will be the caption and for state events it will be a string specific
-     * to that event with some dynamic details about the event added.
-     *
-     * E.g. For a room topic state event the text will be:
-     *      "set the topic to: <new topic text>"
-     *
-     * @param stripNewlines whether the output should have new lines in it.
-     */
-    QString getReplyRichBody(bool stripNewlines = false) const;
-
-    /**
-     * @brief Output a string for the message content of the event replied to ready
-     * for display in a plain text field.
-     *
-     * The output string is dependant upon the event type and the desired output format.
-     *
-     * For most messages this is the body content of the message. For media messages
-     * this will be the caption and for state events it will be a string specific
-     * to that event with some dynamic details about the event added.
-     *
-     * E.g. For a room topic state event the text will be:
-     *      "set the topic to: <new topic text>"
-     *
-     * @param stripNewlines whether the output should have new lines in it.
-     */
-    QString getReplyPlainBody(bool stripNewlines = false) const;
-
-    /**
-     * @brief Return the media info for the event replied to.
-     *
-     * An empty QVariantMap will be returned for any event that doesn't have any
-     * media info.
-     *
-     * @return This should consist of the following:
-     *  - source - The mxc URL for the media.
-     *  - mimeType - The MIME type of the media (should be image/xxx for this delegate).
-     *  - mimeIcon - The MIME icon name (should be image-xxx).
-     *  - size - The file size in bytes.
-     *  - width - The width in pixels of the audio media.
-     *  - height - The height in pixels of the audio media.
-     *  - tempInfo - mediaInfo (with the same properties as this except no tempInfo) for a temporary image while the file downloads.
-     */
-    QVariantMap getReplyMediaInfo() const;
-
-    /**
-     * @brief Return the latitude for the event.
-     *
-     * Returns -100.0 if the event doesn't have a location (latitudes are in the
-     * range -90deg to +90deg so -100 is out of range).
-     */
-    float getLatitude() const;
-
-    /**
-     * @brief Return the longitude for the event.
-     *
-     * Returns -200.0 if the event doesn't have a location (latitudes are in the
-     * range -180deg to +180deg so -200 is out of range).
-     */
-    float getLongitude() const;
-
-    /**
-     * @brief Return the type of location marker for the event.
-     */
-    QString getLocationAssetType() const;
-
-    /**
-     * @brief Whether the event has any read marker for other users.
-     */
-    bool hasReadMarkers() const;
-
-    /**
-     * @brief Returns a list of user read marker for the event.
-     *
-     * @param maxMarkers the maximum number of users to return. Usually the number
-     *                   of user read makers shown is limited to not clutter the UI.
-     *                   This needs to be the same as used in getNumberExcessReadMarkers
-     *                   so that the markers line up with the number displayed, i.e.
-     *                   the number of users shown plus the excess number will be
-     *                   the total number of other user read markers at an event.
-     */
-    QVariantList getReadMarkers(int maxMarkers = 5) const;
-
-    /**
-     * @brief Returns the number of excess user read markers for the event.
-     *
-     * This returns a string in the form "+ x" ready for use in the UI.
-     *
-     * @param maxMarkers the maximum number of markers shown in the UI. This needs to
-     *                   be the same as used in getReadMarkers so that the value lines
-     *                   up with the number displayed, i.e. the number of users shown
-     *                   plus the excess number will be the total number of other user
-     *                   read markers at an event.
-     */
-    QString getNumberExcessReadMarkers(int maxMarkers = 5) const;
-
-    /**
-     * @brief Returns a string with the names of the read markers at the event.
-     *
-     * This is in the form "x users: name 1, name 2, ...".
-     */
-    QString getReadMarkersString() const;
-
-private:
-    const NeoChatRoom *m_room = nullptr;
-    const Quotient::RoomEvent *m_event = nullptr;
-
-    KFormat m_format;
-
-    DelegateType::Type getDelegateTypeForEvent(const Quotient::RoomEvent *event) const;
-
-    QString getBody(const Quotient::RoomEvent *event, Qt::TextFormat format, bool stripNewlines) const;
-    QString getMessageBody(const Quotient::RoomMessageEvent &event, Qt::TextFormat format, bool stripNewlines) const;
-
-    QVariantMap getMediaInfoForEvent(const Quotient::RoomEvent *event) const;
-    QVariantMap getMediaInfoFromFileInfo(const Quotient::EventContent::FileInfo *fileInfo, const QString &eventId, bool isThumbnail = false) const;
-};
--- a/src/events/imagepackevent.cpp
+++ b/src/events/imagepackevent.cpp
@@ -1,80 +0,0 @@
-// SPDX-FileCopyrightText: 2021-2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#include "imagepackevent.h"
-#include <QJsonObject>
-
-using namespace Quotient;
-
-ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
-{
-    if (json.contains(QStringLiteral("pack"))) {
-        pack = ImagePackEventContent::Pack{
-            fromJson<Omittable<QString>>(json["pack"_ls].toObject()["display_name"_ls]),
-            fromJson<Omittable<QUrl>>(json["pack"_ls].toObject()["avatar_url"_ls]),
-            fromJson<Omittable<QStringList>>(json["pack"_ls].toObject()["usage"_ls]),
-            fromJson<Omittable<QString>>(json["pack"_ls].toObject()["attribution"_ls]),
-        };
-    } else {
-        pack = none;
-    }
-
-    const auto &keys = json["images"_ls].toObject().keys();
-    for (const auto &k : keys) {
-        Omittable<EventContent::ImageInfo> info;
-        if (json["images"_ls][k].toObject().contains(QStringLiteral("info"))) {
-            info = EventContent::ImageInfo(QUrl(json["images"_ls][k]["url"_ls].toString()), json["images"_ls][k]["info"_ls].toObject(), k);
-        } else {
-            info = none;
-        }
-        images += ImagePackImage{
-            k,
-            fromJson<QUrl>(json["images"_ls][k]["url"_ls].toString()),
-            fromJson<Omittable<QString>>(json["images"_ls][k]["body"_ls]),
-            info,
-            fromJson<Omittable<QStringList>>(json["images"_ls][k]["usage"_ls]),
-        };
-    }
-}
-
-void ImagePackEventContent::fillJson(QJsonObject *o) const
-{
-    if (pack) {
-        QJsonObject packJson;
-        if (pack->displayName) {
-            packJson["display_name"_ls] = *pack->displayName;
-        }
-        if (pack->usage) {
-            QJsonArray usageJson;
-            for (const auto &usage : *pack->usage) {
-                usageJson += usage;
-            }
-            packJson["usage"_ls] = usageJson;
-        }
-        if (pack->avatarUrl) {
-            packJson["avatar_url"_ls] = pack->avatarUrl->toString();
-        }
-        if (pack->attribution) {
-            packJson["attribution"_ls] = *pack->attribution;
-        }
-        (*o)["pack"_ls] = packJson;
-    }
-
-    QJsonObject imagesJson;
-    for (const auto &image : images) {
-        QJsonObject imageJson;
-        imageJson["url"_ls] = image.url.toString();
-        if (image.body) {
-            imageJson["body"_ls] = *image.body;
-        }
-        if (image.usage) {
-            QJsonArray usageJson;
-            for (const auto &usage : *image.usage) {
-                usageJson += usage;
-            }
-            imageJson["usage"_ls] = usageJson;
-        }
-        imagesJson[image.shortcode] = imageJson;
-    }
-    (*o)["images"_ls] = imagesJson;
-}
--- a/src/events/imagepackevent.h
+++ b/src/events/imagepackevent.h
@@ -1,94 +0,0 @@
-// SPDX-FileCopyrightText: 2021-2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#pragma once
-
-#include <QVector>
-#include <Quotient/events/eventcontent.h>
-#include <Quotient/events/stateevent.h>
-
-namespace Quotient
-{
-/**
- * @class ImagePackEventContent
- *
- * A class to define the content of an image pack event.
- *
- * See Matrix MSC2545 for more details.
- * https://github.com/Sorunome/matrix-doc/blob/soru/emotes/proposals/2545-emotes.md
- *
- * @sa ImagePackEvent
- */
-class ImagePackEventContent
-{
-public:
-    /**
-     * @brief Defines the properties of an image pack.
-     */
-    struct Pack {
-        Quotient::Omittable<QString> displayName; /**< The display name of the pack. */
-        Quotient::Omittable<QUrl> avatarUrl; /**< The source mxc URL for the pack avatar. */
-        Quotient::Omittable<QStringList> usage; /**< An array of the usages for this pack. Possible usages are "emoticon" and "sticker". */
-        Quotient::Omittable<QString> attribution; /**< The attribution for the pack author(s). */
-    };
-
-    /**
-     * @brief Defines the properties of an image pack image.
-     */
-    struct ImagePackImage {
-        QString shortcode; /**< The shortcode for the image. */
-        QUrl url; /**< The mxc URL for this image. */
-        Quotient::Omittable<QString> body; /**< An optional text body for this image. */
-        Quotient::Omittable<Quotient::EventContent::ImageInfo> info; /**< The ImageInfo object used for the info block of m.sticker events. */
-        /**
-         * @brief An array of the usages for this image.
-         *
-         * The possible values match those of the usage key of a pack object.
-         */
-        Quotient::Omittable<QStringList> usage;
-    };
-
-    /**
-     * @brief Return the pack properties.
-     *
-     * @sa Pack
-     */
-    Quotient::Omittable<Pack> pack;
-
-    /**
-     * @brief Return a vector of images in the pack.
-     *
-     * @sa ImagePackImage
-     */
-    QVector<ImagePackEventContent::ImagePackImage> images;
-
-    explicit ImagePackEventContent(const QJsonObject &o);
-
-    /**
-     * @brief The definition of how to convert the content to Json.
-     *
-     * This is a specialization of the standard fillJson function from libQuotient.
-     *
-     * @sa Quotient::converters
-     */
-    void fillJson(QJsonObject *o) const;
-};
-
-/**
- * @class ImagePackEvent
- *
- * Class to define an image pack state event.
- *
- * The event content is ImagePackEventContent.
- *
- * @sa Quotient::StateEvent, ImagePackEventContent
- */
-class ImagePackEvent : public KeyedStateEventBase<ImagePackEvent, ImagePackEventContent>
-{
-public:
-    QUO_EVENT(ImagePackEvent, "im.ponies.room_emotes")
-    using KeyedStateEventBase::KeyedStateEventBase;
-};
-
-REGISTER_EVENT_TYPE(ImagePackEvent)
-}
--- a/src/events/joinrulesevent.h
+++ b/src/events/joinrulesevent.h
@@ -1,44 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-#pragma once
-
-#include <Quotient/events/stateevent.h>
-
-namespace Quotient
-{
-/**
- * @class JoinRulesEvent
- *
- * Class to define a join rule state event.
- *
- * @sa Quotient::StateEvent
- */
-class JoinRulesEvent : public StateEvent
-{
-public:
-    QUO_EVENT(JoinRulesEvent, "m.room.join_rules")
-
-    explicit JoinRulesEvent(const QJsonObject &obj)
-        : StateEvent(obj)
-    {
-    }
-
-    /**
-     * @brief The join rule for the room.
-     *
-     * see https://spec.matrix.org/latest/client-server-api/#mroomjoin_rules for
-     * the available join rules for a room.
-     */
-    QString joinRule() const;
-
-    /**
-     * @brief The allow rule for restricted rooms.
-     *
-     * see https://spec.matrix.org/latest/client-server-api/#mroomjoin_rules for
-     * full details on allow rules.
-     */
-    QJsonArray allow() const;
-};
-REGISTER_EVENT_TYPE(JoinRulesEvent)
-}
--- a/src/events/pollevent.h
+++ b/src/events/pollevent.h
@@ -1,71 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#pragma once
-
-#include <Quotient/events/roomevent.h>
-
-namespace Quotient
-{
-/**
- * @class PollStartEvent
- *
- * Class to define a poll start event.
- *
- * See MSC3381 for full details on polls in the matrix spec
- * https://github.com/matrix-org/matrix-spec-proposals/blob/travis/msc/polls/proposals/3381-polls.md.
- *
- * @sa Quotient::RoomEvent
- */
-class PollStartEvent : public RoomEvent
-{
-public:
-    QUO_EVENT(PollStartEvent, "org.matrix.msc3381.poll.start");
-    explicit PollStartEvent(const QJsonObject &obj);
-
-    /**
-     * @brief The maximum number of options a user can select in a poll.
-     */
-    int maxSelections() const;
-
-    /**
-     * @brief The question being asked in the poll.
-     */
-    QString question() const;
-};
-
-/**
- * @class PollResponseEvent
- *
- * Class to define a poll response event.
- *
- * See MSC3381 for full details on polls in the matrix spec
- * https://github.com/matrix-org/matrix-spec-proposals/blob/travis/msc/polls/proposals/3381-polls.md.
- *
- * @sa Quotient::RoomEvent
- */
-class PollResponseEvent : public RoomEvent
-{
-public:
-    QUO_EVENT(PollResponseEvent, "org.matrix.msc3381.poll.response");
-    explicit PollResponseEvent(const QJsonObject &obj);
-    explicit PollResponseEvent(const QString &pollStartEventId, QStringList responses);
-};
-
-/**
- * @class PollEndEvent
- *
- * Class to define a poll end event.
- *
- * See MSC3381 for full details on polls in the matrix spec
- * https://github.com/matrix-org/matrix-spec-proposals/blob/travis/msc/polls/proposals/3381-polls.md.
- *
- * @sa Quotient::RoomEvent
- */
-class PollEndEvent : public RoomEvent
-{
-public:
-    QUO_EVENT(PollEndEvent, "org.matrix.msc3381.poll.end");
-    explicit PollEndEvent(const QJsonObject &obj);
-};
-}
--- a/src/filetransferpseudojob.cpp
+++ b/src/filetransferpseudojob.cpp
@@ -14,7 +14,7 @@ FileTransferPseudoJob::FileTransferPseudoJob(Operation operation, const QString
 {
 }

-void FileTransferPseudoJob::fileTransferProgress(const QString &id, qint64 progress, qint64 total)
+void FileTransferPseudoJob::fileTransferProgress(QString id, qint64 progress, qint64 total)
 {
    if (id != m_eventId) {
        return;
@@ -23,16 +23,15 @@ void FileTransferPseudoJob::fileTransferProgress(const QString &id, qint64 progr
    setTotalAmount(Unit::Bytes, total);
 }

-void FileTransferPseudoJob::fileTransferCompleted(const QString &id, const QUrl &localFile)
+void FileTransferPseudoJob::fileTransferCompleted(QString id, QUrl localFile)
 {
-    Q_UNUSED(localFile);
    if (id != m_eventId) {
        return;
    }
    emitResult();
 }

-void FileTransferPseudoJob::fileTransferFailed(const QString &id, const QString &errorMessage)
+void FileTransferPseudoJob::fileTransferFailed(QString id, QString errorMessage)
 {
    if (id != m_eventId) {
        return;
--- a/src/filetransferpseudojob.h
+++ b/src/filetransferpseudojob.h
@@ -6,13 +6,6 @@
 #include <KJob>
 #include <QString>

-/**
- * @class FileTransferPseudoJob
- *
- * A class inherited from KJob to track a file download.
- *
- * @sa KJob
- */
 class FileTransferPseudoJob : public KJob
 {
 public:
@@ -20,27 +13,12 @@ public:
        Download,
        Upload,
    };
-    Q_ENUM(Operation)
+    Q_ENUM(Operation);
    FileTransferPseudoJob(Operation operation, const QString &srcDest, const QString &path);
+    void fileTransferProgress(QString id, qint64 progress, qint64 total);
+    void fileTransferCompleted(QString id, QUrl localFile);
+    void fileTransferFailed(QString id, QString errorMessage = {});

-    /**
-     * @brief Set the current number of bytes transferred.
-     */
-    void fileTransferProgress(const QString &id, qint64 progress, qint64 total);
-
-    /**
-     * @brief Set the file transfer as complete.
-     */
-    void fileTransferCompleted(const QString &id, const QUrl &localFile);
-
-    /**
-     * @brief Set the file transfer as failed.
-     */
-    void fileTransferFailed(const QString &id, const QString &errorMessage = {});
-
-    /**
-     * @brief Start the file transfer.
-     */
    void start() override;

 private:
--- a/src/filetypesingleton.cpp
+++ b/src/filetypesingleton.cpp
@@ -112,5 +112,3 @@ QStringList FileTypeSingleton::supportedAnimatedImageFormats() const
    Q_D(const FileTypeSingleton);
    return d->supportedAnimatedImageFormats;
 }
-
-#include "moc_filetypesingleton.cpp"
--- a/src/filetypesingleton.h
+++ b/src/filetypesingleton.h
@@ -5,38 +5,17 @@

 #pragma once

-#include <QFileInfo>
 #include <QMimeDatabase>
 #include <QObject>
 #include <qqml.h>

 class FileTypeSingletonPrivate;

-/**
- * @class FileTypeSingleton
- *
- * Provide a singleton to expose the functionality of QMimeDatabase.
- *
- * @sa QMimeDatabase
- */
 class FileTypeSingleton : public QObject
 {
    Q_OBJECT
-
-    /**
-     * @brief List of supported image formats.
-     *
-     * Returns a list of file extensions, not MIME types.
-     */
    Q_PROPERTY(QStringList supportedImageFormats READ supportedImageFormats CONSTANT FINAL)
-
-    /**
-     * @brief List of supported animated image formats.
-     *
-     * Returns a list of file extensions, not MIME types.
-     */
    Q_PROPERTY(QStringList supportedAnimatedImageFormats READ supportedAnimatedImageFormats CONSTANT FINAL)
-
    QML_NAMED_ELEMENT(FileType)
    QML_SINGLETON

@@ -44,79 +23,26 @@ public:
    explicit FileTypeSingleton(QObject *parent = nullptr);
    ~FileTypeSingleton();

-    /**
-     * @brief Returns a MIME type for nameOrAlias or an invalid one if none found.
-     *
-     * @sa QMimeDatabase
-     */
+    // Most of the code in this public section was copy/pasted from qmimedatabase.h
    Q_INVOKABLE QMimeType mimeTypeForName(const QString &nameOrAlias) const;

    enum MatchMode { MatchDefault, MatchExtension, MatchContent };
    Q_ENUM(MatchMode)

-    /**
-     * @brief Returns a MIME type for the file named fileName using mode.
-     *
-     * @sa QMimeDatabase
-     */
    Q_INVOKABLE QMimeType mimeTypeForFile(const QString &fileName, FileTypeSingleton::MatchMode mode = MatchDefault) const;
-
-    /**
-     * @brief Returns a MIME type for fileInfo.
-     *
-     * @sa QMimeDatabase
-     */
    Q_INVOKABLE QMimeType mimeTypeForFile(const QFileInfo &fileInfo, FileTypeSingleton::MatchMode mode = MatchDefault) const;
-
-    /**
-     * @brief Returns the MIME types for the file name fileName.
-     *
-     * @sa QMimeDatabase
-     */
    Q_INVOKABLE QList<QMimeType> mimeTypesForFileName(const QString &fileName) const;

-    /**
-     * @brief Returns a MIME type for data.
-     *
-     * @sa QMimeDatabase
-     */
    Q_INVOKABLE QMimeType mimeTypeForData(const QByteArray &data) const;
-
-    /**
-     * @brief Returns a MIME type for the data in device.
-     *
-     * @sa QMimeDatabase
-     */
    Q_INVOKABLE QMimeType mimeTypeForData(QIODevice *device) const;

-    /**
-     * @brief Returns a MIME type for url.
-     *
-     * @sa QMimeDatabase
-     */
    Q_INVOKABLE QMimeType mimeTypeForUrl(const QUrl &url) const;
-
-    /**
-     * @brief Returns a MIME type for the given fileName and device data.
-     *
-     * @sa QMimeDatabase
-     */
    Q_INVOKABLE QMimeType mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device) const;
-
-    /**
-     * @brief Returns a MIME type for the given fileName and device data.
-     *
-     * @sa QMimeDatabase
-     */
    Q_INVOKABLE QMimeType mimeTypeForFileNameAndData(const QString &fileName, const QByteArray &data) const;

-    /**
-     * @brief Returns the suffix for the file fileName, as known by the MIME database.
-     *
-     * @sa QMimeDatabase
-     */
    Q_INVOKABLE QString suffixForFileName(const QString &fileName) const;

+    // These return a list of file extensions, not mimetypes
    QStringList supportedImageFormats() const;
    QStringList supportedAnimatedImageFormats() const;

--- a/src/jobs/neochatchangepasswordjob.cpp
+++ b/src/jobs/neochatchangepasswordjob.cpp
@@ -1,16 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "neochatchangepasswordjob.h"
-
-using namespace Quotient;
-
-NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Omittable<QJsonObject> &auth)
-    : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), "/_matrix/client/r0/account/password")
-{
-    QJsonObject _data;
-    addParam<>(_data, QStringLiteral("new_password"), newPassword);
-    addParam<IfNotEmpty>(_data, QStringLiteral("logout_devices"), logoutDevices);
-    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
-    setRequestData(_data);
-}
--- a/src/jobs/neochatchangepasswordjob.h
+++ b/src/jobs/neochatchangepasswordjob.h
@@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <Quotient/jobs/basejob.h>
-#include <Quotient/omittable.h>
-
-class NeochatChangePasswordJob : public Quotient::BaseJob
-{
-public:
-    explicit NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
-};
--- a/src/jobs/neochatdeactivateaccountjob.cpp
+++ b/src/jobs/neochatdeactivateaccountjob.cpp
@@ -1,14 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "neochatdeactivateaccountjob.h"
-
-using namespace Quotient;
-
-NeoChatDeactivateAccountJob::NeoChatDeactivateAccountJob(const Omittable<QJsonObject> &auth)
-    : BaseJob(HttpVerb::Post, QStringLiteral("DisableDeviceJob"), "_matrix/client/v3/account/deactivate")
-{
-    QJsonObject data;
-    addParam<IfNotEmpty>(data, QStringLiteral("auth"), auth);
-    setRequestData(data);
-}
--- a/src/jobs/neochatdeactivateaccountjob.h
+++ b/src/jobs/neochatdeactivateaccountjob.h
@@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <Quotient/jobs/basejob.h>
-#include <Quotient/omittable.h>
-
-class NeoChatDeactivateAccountJob : public Quotient::BaseJob
-{
-public:
-    explicit NeoChatDeactivateAccountJob(const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
-};
--- a/src/jobs/neochatdeletedevicejob.cpp
+++ b/src/jobs/neochatdeletedevicejob.cpp
@@ -1,14 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "neochatdeletedevicejob.h"
-
-using namespace Quotient;
-
-NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth)
-    : BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId).toLatin1())
-{
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
-    setRequestData(std::move(_data));
-}
--- a/src/jobs/neochatdeletedevicejob.h
+++ b/src/jobs/neochatdeletedevicejob.h
@@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <Quotient/jobs/basejob.h>
-#include <Quotient/omittable.h>
-
-class NeochatDeleteDeviceJob : public Quotient::BaseJob
-{
-public:
-    explicit NeochatDeleteDeviceJob(const QString &deviceId, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
-};
--- a/src/events/joinrulesevent.cpp
+++ b/src/events/joinrulesevent.cpp
--- a/src/joinrulesevent.h
+++ b/src/joinrulesevent.h
@@ -0,0 +1,36 @@
+// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#pragma once
+
+#include <events/stateevent.h>
+
+namespace Quotient
+{
+#ifdef QUOTIENT_07
+class JoinRulesEvent : public StateEvent
+#else
+class JoinRulesEvent : public StateEventBase
+#endif
+{
+public:
+#ifdef QUOTIENT_07
+    QUO_EVENT(JoinRulesEvent, "m.room.join_rules")
+#else
+    DEFINE_EVENT_TYPEID("m.room.join_rules", JoinRulesEvent)
+#endif
+
+    explicit JoinRulesEvent(const QJsonObject &obj)
+#ifdef QUOTIENT_07
+        : StateEvent(obj)
+#else
+        : StateEventBase(typeId(), obj)
+#endif
+    {
+    }
+
+    QString joinRule() const;
+    QJsonArray allow() const;
+};
+REGISTER_EVENT_TYPE(JoinRulesEvent)
+}
--- a/src/linkpreviewer.cpp
+++ b/src/linkpreviewer.cpp
@@ -5,25 +5,15 @@

 #include "controller.h"

-#include <Quotient/connection.h>
-#include <Quotient/csapi/content-repo.h>
-
-#include "neochatconfig.h"
-#include "neochatroom.h"
+#include <connection.h>
+#include <csapi/content-repo.h>

 using namespace Quotient;

-LinkPreviewer::LinkPreviewer(QObject *parent, const NeoChatRoom *room, const QUrl &url)
+LinkPreviewer::LinkPreviewer(QObject *parent)
    : QObject(parent)
-    , m_currentRoom(room)
    , m_loaded(false)
-    , m_url(url)
 {
-    loadUrlPreview();
-    if (m_currentRoom) {
-        connect(m_currentRoom, &NeoChatRoom::urlPreviewEnabledChanged, this, &LinkPreviewer::loadUrlPreview);
-    }
-    connect(NeoChatConfig::self(), &NeoChatConfig::ShowLinkPreviewChanged, this, &LinkPreviewer::loadUrlPreview);
 }

 bool LinkPreviewer::loaded() const
@@ -41,7 +31,7 @@ QString LinkPreviewer::description() const
    return m_description;
 }

-QUrl LinkPreviewer::imageSource() const
+QString LinkPreviewer::imageSource() const
 {
    return m_imageSource;
 }
@@ -53,37 +43,22 @@ QUrl LinkPreviewer::url() const

 void LinkPreviewer::setUrl(QUrl url)
 {
-    if (url != m_url) {
-        m_url = url;
-        urlChanged();
-        loadUrlPreview();
-    }
-}
-
-void LinkPreviewer::loadUrlPreview()
-{
-    if (!m_currentRoom || !NeoChatConfig::showLinkPreview() || !m_currentRoom->urlPreviewEnabled()) {
-        return;
-    }
-    if (m_url.scheme() == QStringLiteral("https")) {
+    if (url.scheme() == QStringLiteral("https")) {
        m_loaded = false;
        Q_EMIT loadedChanged();

-        auto conn = m_currentRoom->connection();
-        GetUrlPreviewJob *job = conn->callApi<GetUrlPreviewJob>(m_url);
+        m_url = url;
+        Q_EMIT urlChanged();

-        connect(job, &BaseJob::success, this, [this, job, conn]() {
+        auto conn = Controller::instance().activeConnection();
+
+        GetUrlPreviewJob *job = conn->callApi<GetUrlPreviewJob>(m_url.toString());
+
+        connect(job, &BaseJob::success, this, [this, job]() {
            const auto json = job->jsonData();
-            m_title = json["og:title"_ls].toString().trimmed();
-            m_description = json["og:description"_ls].toString().trimmed().replace("\n"_ls, " "_ls);
-
-            auto imageUrl = QUrl(json["og:image"_ls].toString());
-            if (imageUrl.isValid() && imageUrl.scheme() == QStringLiteral("mxc")) {
-                m_imageSource = conn->makeMediaUrl(imageUrl);
-            } else {
-                m_imageSource = QUrl();
-            }
-
+            m_title = json["og:title"].toString().trimmed();
+            m_description = json["og:description"].toString().trimmed().replace("\n", " ");
+            m_imageSource = json["og:image"].toString();
            m_loaded = true;
            Q_EMIT titleChanged();
            Q_EMIT descriptionChanged();
@@ -92,10 +67,3 @@ void LinkPreviewer::loadUrlPreview()
        });
    }
 }
-
-bool LinkPreviewer::empty() const
-{
-    return m_url.isEmpty();
-}
-
-#include "moc_linkpreviewer.cpp"
--- a/src/linkpreviewer.h
+++ b/src/linkpreviewer.h
@@ -6,79 +6,37 @@
 #include <QObject>
 #include <QUrl>

-class NeoChatRoom;
-
-/**
- * @class LinkPreviewer
- *
- * A class to download the link preview info for a URL and provide a QML interface for it.
- *
- * To use set the URL property and then access the other parameters which will be
- * populated once loaded is true.
- */
 class LinkPreviewer : public QObject
 {
    Q_OBJECT
-    /**
-     * @brief The URL to get the preview for.
-     */
+    Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)
+    Q_PROPERTY(QString title READ title NOTIFY titleChanged)
+    Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
+    Q_PROPERTY(QString imageSource READ imageSource NOTIFY imageSourceChanged)
    Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)

-    /**
-     * @brief Whether the preview information has been loaded.
-     */
-    Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)
-
-    /**
-     * @brief The title of the preview.
-     */
-    Q_PROPERTY(QString title READ title NOTIFY titleChanged)
-
-    /**
-     * @brief The description of the preview.
-     */
-    Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
-
-    /**
-     * @brief The image source for the preview.
-     */
-    Q_PROPERTY(QUrl imageSource READ imageSource NOTIFY imageSourceChanged)
-
-    /**
-     * @brief Whether the there is a link to preview.
-     *
-     * A linkPreviwer is empty if the URL is empty.
-     */
-    Q_PROPERTY(bool empty READ empty NOTIFY emptyChanged)
-
 public:
-    explicit LinkPreviewer(QObject *parent = nullptr, const NeoChatRoom *room = nullptr, const QUrl &url = {});
+    explicit LinkPreviewer(QObject *parent = nullptr);

-    [[nodiscard]] QUrl url() const;
-    void setUrl(QUrl);
    [[nodiscard]] bool loaded() const;
    [[nodiscard]] QString title() const;
    [[nodiscard]] QString description() const;
-    [[nodiscard]] QUrl imageSource() const;
-    [[nodiscard]] bool empty() const;
+    [[nodiscard]] QString imageSource() const;
+    [[nodiscard]] QUrl url() const;
+
+    void setUrl(QUrl);

 private:
-    const NeoChatRoom *m_currentRoom = nullptr;
-
    bool m_loaded;
-    QString m_title = QString();
-    QString m_description = QString();
-    QUrl m_imageSource = QUrl();
+    QString m_title;
+    QString m_description;
+    QString m_imageSource;
    QUrl m_url;

-    void loadUrlPreview();
-
 Q_SIGNALS:
    void loadedChanged();
    void titleChanged();
    void descriptionChanged();
    void imageSourceChanged();
    void urlChanged();
-    void emptyChanged();
 };
-Q_DECLARE_METATYPE(LinkPreviewer *)
--- a/src/locationhelper.cpp
+++ b/src/locationhelper.cpp
@@ -1,46 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Volker Krause <vkrause@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#include "locationhelper.h"
-
-#include <cmath>
-
-QRectF LocationHelper::unite(const QRectF &r1, const QRectF &r2)
-{
-    // this looks weird but is actually intentional as we need to handle point-like "rects" as well
-    if ((!r1.isEmpty() || r1.isNull()) && (!r2.isEmpty() || r2.isNull())) {
-        return r1 | r2;
-    }
-    return (!r1.isEmpty() || r1.isNull()) ? r1 : r2;
-}
-
-QPointF LocationHelper::center(const QRectF &r)
-{
-    return r.center();
-}
-
-constexpr inline double degToRad(double deg)
-{
-    return deg / 180.0 * M_PI;
-}
-
-static QPointF mercatorProject(double lat, double lon, double zoom)
-{
-    const auto x = (256.0 / (2.0 * M_PI)) * std::pow(2.0, zoom) * (degToRad(lon) + M_PI);
-    const auto y = (256.0 / (2.0 * M_PI)) * std::pow(2.0, zoom) * (M_PI - std::log(std::tan(M_PI / 4.0 + degToRad(lat) / 2.0)));
-    return QPointF(x, y);
-}
-
-float LocationHelper::zoomToFit(const QRectF &r, float mapWidth, float mapHeight)
-{
-    const auto p1 = mercatorProject(r.bottomLeft().y(), r.bottomLeft().x(), 1.0);
-    const auto p2 = mercatorProject(r.topRight().y(), r.topRight().x(), 1.0);
-
-    const auto zx = std::log2((mapWidth / (p2.x() - p1.x())));
-    const auto zy = std::log2((mapHeight / (p2.y() - p1.y())));
-    const auto z = std::min(zx, zy);
-
-    return std::clamp(z, 5.0, 18.0);
-}
-
-#include "moc_locationhelper.cpp"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
l10n daemon script	da2b6504ae	GIT_SILENT Sync po/docbooks with svn	2023-07-14 03:32:18 +00:00
Volker Krause	49be98662d	Fix binary stripping of APKs with Qt 5.15.10 This fixes APKs on binary factory having exploded in size 3x-5x after the Qt 5.15.10 update. This also affects release packages and will need to be backported to those (in Craft).	2023-07-08 11:54:54 +02:00
l10n daemon script	a2c37a93d0	GIT_SILENT Sync po/docbooks with svn	2023-07-04 05:10:36 +00:00
l10n daemon script	d6b575f017	GIT_SILENT made messages (after extraction)	2023-07-04 04:03:13 +00:00
l10n daemon script	063d91c25b	GIT_SILENT Sync po/docbooks with svn	2023-07-03 03:58:27 +00:00
l10n daemon script	54cf9ad495	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2023-07-03 03:50:48 +00:00
l10n daemon script	aa569e127b	GIT_SILENT Sync po/docbooks with svn	2023-07-02 03:51:37 +00:00
l10n daemon script	7e7b9728af	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2023-07-02 03:46:09 +00:00
Heiko Becker	c72cf64369	GIT_SILENT Update Appstream for new release	2023-06-30 01:16:46 +02:00
Heiko Becker	7aa68ce896	GIT_SILENT Upgrade release service version to 23.04.3.	2023-06-30 00:03:56 +02:00
l10n daemon script	c204b36aa9	GIT_SILENT Sync po/docbooks with svn	2023-06-27 03:32:18 +00:00
l10n daemon script	38584bc735	GIT_SILENT made messages (after extraction)	2023-06-26 02:41:55 +00:00
l10n daemon script	2e873fc49b	GIT_SILENT Sync po/docbooks with svn	2023-06-25 03:58:19 +00:00
l10n daemon script	5e898d68c2	GIT_SILENT made messages (after extraction)	2023-06-20 03:43:54 +00:00
l10n daemon script	ed9d2e1d02	GIT_SILENT Sync po/docbooks with svn	2023-06-19 03:41:11 +00:00
l10n daemon script	07fb6bd90a	GIT_SILENT Sync po/docbooks with svn	2023-06-18 05:19:37 +00:00
l10n daemon script	11003775a1	GIT_SILENT Sync po/docbooks with svn	2023-06-14 03:21:02 +00:00
l10n daemon script	79d8f35dca	GIT_SILENT Sync po/docbooks with svn	2023-06-11 03:26:24 +00:00
l10n daemon script	a1d5727a10	GIT_SILENT made messages (after extraction)	2023-06-09 02:49:52 +00:00
l10n daemon script	4e9c4f9752	GIT_SILENT Sync po/docbooks with svn	2023-06-08 03:34:35 +00:00
l10n daemon script	d0e71114de	GIT_SILENT made messages (after extraction)	2023-06-08 02:46:10 +00:00
l10n daemon script	a6db2aac70	GIT_SILENT Sync po/docbooks with svn	2023-06-07 03:43:28 +00:00
l10n daemon script	a829b6c991	GIT_SILENT Sync po/docbooks with svn	2023-06-06 03:26:10 +00:00
l10n daemon script	05a6d055b4	GIT_SILENT made messages (after extraction)	2023-06-05 02:28:21 +00:00
l10n daemon script	64f8df4dd2	GIT_SILENT Sync po/docbooks with svn	2023-06-04 03:36:46 +00:00
Heiko Becker	8dcc231bdc	GIT_SILENT Update Appstream for new release	2023-06-02 21:52:47 +02:00
Heiko Becker	5efe5cbb88	GIT_SILENT Upgrade release service version to 23.04.2.	2023-06-02 20:35:47 +02:00
l10n daemon script	d2f8392ea2	GIT_SILENT made messages (after extraction)	2023-06-02 02:34:57 +00:00
l10n daemon script	57d79bf3fa	GIT_SILENT Sync po/docbooks with svn	2023-06-01 03:30:09 +00:00
l10n daemon script	13a573c7f6	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2023-06-01 03:23:16 +00:00
l10n daemon script	64a1de8729	GIT_SILENT Sync po/docbooks with svn	2023-05-30 04:30:43 +00:00
l10n daemon script	669ad9f6e2	GIT_SILENT made messages (after extraction)	2023-05-28 02:51:25 +00:00
l10n daemon script	269e29244a	GIT_SILENT Sync po/docbooks with svn	2023-05-27 03:16:12 +00:00
l10n daemon script	0b6da7b799	GIT_SILENT Sync po/docbooks with svn	2023-05-23 05:04:26 +00:00
l10n daemon script	6eee09a560	GIT_SILENT made messages (after extraction)	2023-05-23 03:58:52 +00:00
l10n daemon script	2ad5a593b4	GIT_SILENT Sync po/docbooks with svn	2023-05-22 03:22:50 +00:00
l10n daemon script	970ff95fd0	GIT_SILENT Sync po/docbooks with svn	2023-05-20 03:16:36 +00:00
Nate Graham	5a1a3fbd06	Focus message search window's search field by default BUG: 469879 (cherry picked from commit `69bfa1394c`)	2023-05-19 07:20:52 -06:00
l10n daemon script	9493530b9c	GIT_SILENT made messages (after extraction)	2023-05-17 02:35:18 +00:00
Tobias Fella	ec76df5e47	Fix asan runtime error in texthandler (cherry picked from commit `fabd3da5a7`)	2023-05-16 14:10:16 +00:00
l10n daemon script	095c1fa4c3	GIT_SILENT Sync po/docbooks with svn	2023-05-16 03:31:17 +00:00
l10n daemon script	41874701e6	GIT_SILENT made messages (after extraction)	2023-05-16 02:46:31 +00:00
l10n daemon script	58de466ad5	GIT_SILENT made messages (after extraction)	2023-05-15 02:32:15 +00:00
l10n daemon script	5800180836	GIT_SILENT made messages (after extraction)	2023-05-14 03:00:41 +00:00
l10n daemon script	2b2a864041	GIT_SILENT made messages (after extraction)	2023-05-13 02:32:31 +00:00
l10n daemon script	90399930ec	GIT_SILENT made messages (after extraction)	2023-05-12 02:37:01 +00:00
l10n daemon script	8c4ac46a69	GIT_SILENT Sync po/docbooks with svn	2023-05-11 03:16:09 +00:00
l10n daemon script	31951db498	GIT_SILENT made messages (after extraction)	2023-05-11 02:33:33 +00:00
l10n daemon script	fd593bb483	GIT_SILENT made messages (after extraction)	2023-05-10 02:39:16 +00:00
Carl Schwan	1243aef243	Update appstream description (cherry picked from commit `cc21f8cca9`)	2023-05-09 19:35:03 +00:00
Heiko Becker	41ce874f77	GIT_SILENT Update Appstream for new release	2023-05-06 11:17:05 +02:00
Heiko Becker	4d69b70e02	GIT_SILENT Upgrade release service version to 23.04.1.	2023-05-06 09:54:51 +02:00
l10n daemon script	b5a46b35f8	GIT_SILENT Sync po/docbooks with svn	2023-05-06 03:42:45 +00:00
l10n daemon script	33ab3fd921	GIT_SILENT Sync po/docbooks with svn	2023-05-04 03:44:32 +00:00
l10n daemon script	357d418cb4	GIT_SILENT Sync po/docbooks with svn	2023-05-01 04:03:32 +00:00
l10n daemon script	76d3484a1e	GIT_SILENT Sync po/docbooks with svn	2023-04-30 05:24:22 +00:00
Tobias Fella	aef86017b2	Don't enforce tests on windows Qt6	2023-04-29 13:41:43 +00:00
Tobias Fella	40358cba85	Fix handling line separators BUG: 468977 (cherry picked from commit `2b06679be6`)	2023-04-29 13:41:43 +00:00
Tobias Fella	3ee6877b15	Prevent crash in SyntaxHighlighter when leaving room BUG: 467722 (cherry picked from commit `014185c4c9`)	2023-04-28 17:01:23 +02:00
l10n daemon script	e7a0d90746	GIT_SILENT Sync po/docbooks with svn	2023-04-28 03:23:43 +00:00
l10n daemon script	484188c4e1	GIT_SILENT Sync po/docbooks with svn	2023-04-26 03:35:17 +00:00
l10n daemon script	3e967e53bf	GIT_SILENT Sync po/docbooks with svn	2023-04-25 03:47:02 +00:00
l10n daemon script	c2f1e0de53	GIT_SILENT Sync po/docbooks with svn	2023-04-24 04:10:12 +00:00
l10n daemon script	69a1d5477e	GIT_SILENT Sync po/docbooks with svn	2023-04-23 05:20:03 +00:00
l10n daemon script	a8f29de87a	GIT_SILENT Sync po/docbooks with svn	2023-04-22 03:57:04 +00:00
l10n daemon script	275a4f9222	GIT_SILENT Sync po/docbooks with svn	2023-04-21 03:37:24 +00:00
l10n daemon script	95f4c5b9e1	GIT_SILENT Sync po/docbooks with svn	2023-04-20 03:46:16 +00:00
Carl Schwan	d7412c965c	Add loading title to LoadingPage Otherwise the page is a bit empty (cherry picked from commit `760ed24b37`)	2023-04-19 07:40:35 +00:00
l10n daemon script	a94dfde7f7	GIT_SILENT Sync po/docbooks with svn	2023-04-19 03:39:38 +00:00
l10n daemon script	6c7e12c471	GIT_SILENT Sync po/docbooks with svn	2023-04-17 05:07:11 +00:00
l10n daemon script	9949ba8f6d	GIT_SILENT Sync po/docbooks with svn	2023-04-15 03:38:22 +00:00
Heiko Becker	2c3ce1e88b	GIT_SILENT Update Appstream for new release	2023-04-12 19:09:36 +02:00
Heiko Becker	33533a75bd	GIT_SILENT Upgrade release service version to 23.04.0.	2023-04-12 17:54:51 +02:00
l10n daemon script	8c6671265c	GIT_SILENT Sync po/docbooks with svn	2023-04-11 04:32:05 +00:00
l10n daemon script	bfa643557d	GIT_SILENT Sync po/docbooks with svn	2023-04-10 03:18:44 +00:00
l10n daemon script	2b0f6a1d4d	GIT_SILENT Sync po/docbooks with svn	2023-04-07 03:22:23 +00:00
l10n daemon script	0e8deee005	GIT_SILENT Sync po/docbooks with svn	2023-04-04 03:39:56 +00:00
Albert Astals Cid	fe60d11ba3	GIT_SILENT Upgrade release service version to 23.03.90.	2023-03-30 22:18:46 +02:00
l10n daemon script	e9d3862537	GIT_SILENT Sync po/docbooks with svn	2023-03-29 03:34:52 +00:00
l10n daemon script	e03b2e9adf	GIT_SILENT Sync po/docbooks with svn	2023-03-28 04:36:27 +00:00
James Graham	566743bc19	Cherrypick Handle stripnewlines for plain text list to 23.04 Handle stripping new lines when the plain text input is a markdown list. (cherry picked from commit `a0ae8b28b2`)	2023-03-27 13:30:27 +00:00
l10n daemon script	a3b4f05e2c	GIT_SILENT Sync po/docbooks with svn	2023-03-27 05:40:33 +00:00
l10n daemon script	977e9bbf99	GIT_SILENT Sync po/docbooks with svn	2023-03-26 03:30:14 +00:00
l10n daemon script	ad11a509aa	GIT_SILENT Sync po/docbooks with svn	2023-03-24 03:24:50 +00:00
Tobias Fella	abbe68f9ab	Ensure that the room list subtitle is a single line (cherry picked from commit `787dc5ab66`)	2023-03-23 20:24:47 +00:00
James Graham	b7b0749cd8	Cherrypick Handle quotes in plain strings to 23.04 Unescape quotes in plain strings (cherry picked from commit `925e20ebb8`)	2023-03-22 18:12:50 +00:00
l10n daemon script	f8ae06f8a7	GIT_SILENT Sync po/docbooks with svn	2023-03-22 04:14:06 +00:00
l10n daemon script	9946ba008b	GIT_SILENT Sync po/docbooks with svn	2023-03-21 03:51:57 +00:00
l10n daemon script	376916212d	GIT_SILENT Sync po/docbooks with svn	2023-03-20 03:42:39 +00:00
James Graham	1ea6ffe416	Handle single quotes for links Make sure that the text handler can handle links which use single or double quotes for the attributes. (cherry picked from commit `ee254a286d`)	2023-03-19 19:11:52 +00:00
l10n daemon script	2d99ae0404	GIT_SILENT Sync po/docbooks with svn	2023-03-19 03:27:02 +00:00
l10n daemon script	88eeed74da	GIT_SILENT Sync po/docbooks with svn	2023-03-18 03:57:25 +00:00
James Graham	0032d417ac	Cherrypick Hide local edit message to 23.04 When a local message is edited make sure that the initial message that will be merged remains hidden so it doesn't flash up then disappear. closes network/neochat#314 (cherry picked from commit `4e16b91f54`)	2023-03-17 10:40:23 +00:00
l10n daemon script	bd9fb097e3	GIT_SILENT Sync po/docbooks with svn	2023-03-17 04:03:03 +00:00
James Graham	ecd7a5edff	Cherrypick Text Handler Avoid accessing QString out of bounds to 23.04 Add end state to text handler and use to ensure that in nextTokenType to stop an out of bounds access to m_databuffer (cherry picked from commit `0d6a83b063`)	2023-03-16 17:32:58 +00:00
Carl Schwan	d3f0902835	Remove rogue console statement	2023-03-16 16:48:45 +00:00
l10n daemon script	6eb258f8a3	GIT_SILENT Sync po/docbooks with svn	2023-03-16 03:33:29 +00:00
l10n daemon script	dff908edd2	GIT_SILENT Sync po/docbooks with svn	2023-03-15 03:36:56 +00:00
Carl Schwan	7e06606cbd	Don't focus chatbar on mobile This popup the virtual keyboard and is quite distrubing on mobile. Signed-off-by: Carl Schwan <carl@carlschwan.eu> (cherry picked from commit `bc84ad8d56`)	2023-03-14 22:28:32 +00:00
James Graham	f78f92cd0f	Newline Mobile Make return/enter create a newline on mobile. This is the traditional behaviour in other messengers as the send icon and return have are the same time to access and solves the linked issue. Closes network/neochat#466 (cherry picked from commit `afe8a2a5e4`)	2023-03-14 22:27:08 +00:00
Carl Schwan	c4fdfa22d9	Show back button when pushing the settings on mobile To use with https://invent.kde.org/frameworks/kirigami/-/merge_requests/992 Signed-off-by: Carl Schwan <carl@carlschwan.eu> (cherry picked from commit `87213dc9dd`)	2023-03-14 22:24:55 +00:00
l10n daemon script	3e5d1429f7	GIT_SILENT Sync po/docbooks with svn	2023-03-14 03:39:03 +00:00
James Graham	76b5463dac	Cherrypick Fix state event visiblity in timeline 23.04 Rework the filtering of state events in the timeline and for lastevent. This is now consistent everywhere and includes the following: - The timeline settings are obeyed everywhere - A new setting is added to filter all state events - Last event obeys the timeline setting in all cases - The roomlist will show a state event as the latest event if it's visible in the timeline - Names are no longer hyperlinked in eventToString if plaintext is selected. BUG: 455048\ Closes network/neochat#148 (cherry picked from commit `741cb57105`)	2023-03-13 20:03:32 +00:00
James Graham	8b26a9f45f	Cherrypick Room URL preview settings to 23.04 - Add the ability to set the deafult url preview setting for the room if you have sufficient power level. - Add the ability for the user to set the desired url preview setting. network/neochat#560 (cherry picked from commit `81c73037ca`)	2023-03-13 18:45:18 +00:00
James Graham	da1c664f94	Cherrypick Improve Text Handling to 23.04 Improve the handling of text both when sending and receiving. The main feature is to fix the linked bug (and a host of others that are unreported but similar) which is caused by the fact that we don't properly clean html. This mr does that as per the matrix spec https://spec.matrix.org/v1.5/client-server-api/#mroommessage-msgtypes. So any disallowed tags or attributes are removed and it does the special handling for certain attributes. Additionally the functions are also designed to cover any other text formatting required, particularly fro received strings. The receive side is covered by 2 functions `handleRecieveRichText` and `handleRecievePlainText`. The rich/plain in the function name refers to the output type not the input type (both can take plain and rich input), so `handleRecieveRichText` is called to get a string suitable to go in a rich text control and `handleRecievePlainText` for a plain control. The functions also handle the following some of which was previously handled by `eventToString` in `NeoChatRoom`: - Strip and reply from the string - Format any user mentions - Linkify links in plain strings - Handle mxc urls in rich text (uses the new `room->makeMediaUrl` functionality from libQuotient) - `handleRecievePlainText` also deals with markup making `NeoChatRoom->subtitle` redundant There is also an extensive test suite which defines the behaviour and the best way to review this is probably to look at the tests and decide whether you agree with the expected output given the inputs and/or if there is any missing behaviour. The final aim especially with the test suite is to give us a framework to make further updates in the future easier and hopefully prevent a new feature breaking old behaviour with the tests. BUG: 463932 \ BUG: 466330 \ BUG: 466930 (cherry picked from commit `f6ba4f2ecd`)	2023-03-13 18:18:17 +00:00
James Graham	498cfedfea	Cherrypick Other user read markers 23.04 Add the ability to see other user's read markers. ![image](/uploads/a4bdc35a60ab10685c7d3ea4d9b13c87/image.png) Implements network/neochat#133 (cherry picked from commit `23303c0483`)	2023-03-13 16:01:20 +00:00
l10n daemon script	8983129520	GIT_SILENT Sync po/docbooks with svn	2023-03-13 03:53:42 +00:00
l10n daemon script	1c8acb2acd	GIT_SILENT Sync po/docbooks with svn	2023-03-12 15:28:42 +00:00
l10n daemon script	53fa4be4d8	GIT_SILENT Sync po/docbooks with svn	2023-03-12 06:18:02 +00:00
l10n daemon script	bf30152e33	GIT_SILENT Sync po/docbooks with svn	2023-03-11 05:16:10 +00:00
Albert Astals Cid	d86c61ac8a	GIT_SILENT Upgrade release service version to 23.03.80.	2023-03-10 21:01:32 +01:00