GIT_SILENT Upgrade release service version to 23.07.90.

We already check with a regex if the message only contains emoji so it is safe
to hardcode the font family as emoji for these messages.


(cherry picked from commit 58213ee3e6)

.flatpak-manifest.json

@@ -19,7 +19,6 @@
         "--talk-name=org.freedesktop.Notifications",
         "--talk-name=org.kde.kwalletd5",
         "--talk-name=org.kde.StatusNotifierWatcher",
-        "--talk-name=org.freedesktop.secrets",
         "--own-name=org.kde.StatusNotifierItem-2-2"
     ],
     "modules": [

.gitlab-ci.yml

@@ -3,8 +3,12 @@
 
 include:
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml
+#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml
+#  - 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-qt6.yml
-#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.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

.kde-ci.yml

@@ -2,7 +2,35 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 Dependencies:
-- 'on': ['Linux', 'Android', 'FreeBSD', 'Windows']
+- 'on': ['Linux/Qt5', 'Android/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5']
+  'require':
+    'frameworks/extra-cmake-modules': '@stable'
+    'frameworks/kcoreaddons': '@stable'
+    'frameworks/kirigami': '@stable'
+    'frameworks/ki18n': '@stable'
+    'frameworks/kconfig': '@stable'
+    'frameworks/syntax-highlighting': '@stable'
+    'frameworks/kitemmodels': '@stable'
+    'frameworks/kquickcharts': '@stable'
+    'frameworks/knotifications': '@stable'
+    'libraries/kquickimageeditor': '@stable'
+    'frameworks/sonnet': '@stable'
+    'libraries/kirigami-addons': '@latest'
+    'third-party/libquotient': '@latest'
+    'third-party/qtkeychain': '@latest'
+    'third-party/cmark': '@latest'
+    'third-party/qcoro': '@latest'
+- 'on': ['Windows/Qt5', 'Linux/Qt5', 'FreeBSD/Qt5']
+  'require':
+    'frameworks/qqc2-desktop-style': '@stable'
+    'frameworks/kio': '@stable'
+    'frameworks/kwindowsystem': '@stable'
+    'frameworks/kconfigwidgets': '@stable'
+- 'on': ['Linux/Qt5', 'FreeBSD/Qt5']
+  'require':
+    'frameworks/kdbusaddons': '@stable'
+
+- 'on': ['Linux/Qt6', 'Android/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6']
   'require':
     'frameworks/extra-cmake-modules': '@latest-kf6'
     'frameworks/kcoreaddons': '@latest-kf6'
@@ -20,21 +48,15 @@ Dependencies:
     'third-party/qtkeychain': '@latest'
     'third-party/cmark': '@latest'
     'third-party/qcoro': '@latest'
-- 'on': ['Windows', 'Linux', 'FreeBSD']
+- 'on': ['Windows/Qt6', 'Linux/Qt6', 'FreeBSD/Qt6']
   'require':
     'frameworks/qqc2-desktop-style': '@latest-kf6'
     'frameworks/kio': '@latest-kf6'
     'frameworks/kwindowsystem': '@latest-kf6'
     'frameworks/kconfigwidgets': '@latest-kf6'
-- 'on': ['Linux', 'FreeBSD']
+- 'on': ['Linux/Qt6', 'FreeBSD/Qt6']
   'require':
     'frameworks/kdbusaddons': '@latest-kf6'
-    'frameworks/kstatusnotifieritem': '@latest-kf6'
-
-- 'on': ['Linux']
-  'require':
-    'sdk/selenium-webdriver-at-spi': '@latest-kf6'
 
 Options:
-  per-test-timeout: 90
-  require-passing-tests-on: [ '@all' ]
+  require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD' ]

.reuse/dep5

@@ -34,14 +34,10 @@ Files: src/neochat.notifyrc
 Copyright: 2020 Tobias Fella <tobias.fella@kde.org>
 License: BSD-2-Clause
 
-Files: src/qml/confetti.png src/qml/glowdot.png
+Files: src/qml/Component/confetti.png src/qml/Component/glowdot.png
 Copyright: 2021 Alexey Andreyev <aa13q@ya.ru>
 License: CC0-1.0
 
 Files: .flatpak-manifest.json
 Copyright: 2020-2022 Tobias Fella <tobias.fella@kde.org>
 License: BSD-2-Clause
-
-Files: autotests/data/*
-Copyright: none
-License: CC0-1.0

CMakeLists.txt

@@ -8,14 +8,17 @@ 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 "07")
+set(RELEASE_SERVICE_VERSION_MICRO "90")
 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.240.0")
-set(QT_MIN_VERSION "6.5")
+set(KF_MIN_VERSION "5.105.0")
+set(QT_MIN_VERSION "5.15.2")
+if (ANDROID)
+    set(QT_MIN_VERSION "5.15.10")
+endif()
 
 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
 
@@ -24,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)
@@ -45,6 +48,28 @@ 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}
@@ -52,21 +77,27 @@ ecm_setup_version(${PROJECT_VERSION}
     VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
 )
 
-find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg WebView)
-set_package_properties(Qt6 PROPERTIES
+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(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels)
-set_package_properties(KF6 PROPERTIES
+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"
 )
-set_package_properties(KF6Kirigami2 PROPERTIES
+set_package_properties(KF${QT_MAJOR_VERSION}Kirigami2 PROPERTIES
+        TYPE REQUIRED
+        PURPOSE "Kirigami application UI framework"
+        )
+find_package(KF${QT_MAJOR_VERSION}KirigamiAddons 0.7.2 REQUIRED)
+
+find_package(Qt${QT_MAJOR_VERSION}Keychain)
+set_package_properties(Qt${QT_MAJOR_VERSION}Keychain PROPERTIES
     TYPE REQUIRED
-    PURPOSE "Kirigami application UI framework"
+    PURPOSE "Secure storage of account secrets"
 )
-find_package(KF6KirigamiAddons 0.7.2 REQUIRED)
 
 if(ANDROID)
     find_package(OpenSSL)
@@ -75,38 +106,30 @@ if(ANDROID)
         PURPOSE "Encrypted communications"
     )
 else()
-    find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem StatusNotifierItem)
-    set_package_properties(KF6QQC2DesktopStyle PROPERTIES
+    find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} COMPONENTS Widgets)
+    find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem)
+    set_package_properties(KF${QT_MAJOR_VERSION}QQC2DesktopStyle PROPERTIES
         TYPE RUNTIME
     )
     ecm_find_qmlmodule(org.kde.syntaxhighlighting 1.0)
-
-    find_package(ICU 61.0 COMPONENTS uc)
-    set_package_properties(ICU PROPERTIES
-        TYPE REQUIRED
-        PURPOSE "Unicode library"
-    )
 endif()
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
-    find_package(KF6DBusAddons ${KF_MIN_VERSION} REQUIRED)
+    find_package(KF${QT_MAJOR_VERSION}DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()
 
-find_package(QuotientQt6 0.7)
-set_package_properties(QuotientQt6 PROPERTIES
+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
     TYPE REQUIRED
     DESCRIPTION "Qt wrapper around Matrix API"
     URL "https://github.com/quotient-im/libQuotient/"
     PURPOSE "Talk with matrix server"
 )
 
-# The android part is just for CI. We do NOT support any builds without E2EE
-if (NOT TARGET Olm::Olm AND NOT ANDROID)
-    message(FATAL_ERROR "NeoChat requires Quotient with the E2EE feature enabled")
-endif()
-
-
 find_package(cmark)
 set_package_properties(cmark PROPERTIES
     TYPE REQUIRED
@@ -118,7 +141,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)
 
 find_package(KQuickImageEditor COMPONENTS)
 set_package_properties(KQuickImageEditor PROPERTIES
@@ -128,16 +150,20 @@ set_package_properties(KQuickImageEditor PROPERTIES
     PURPOSE "Add image editing capability to image attachments"
 )
 
-find_package(QCoro6 0.4 COMPONENTS Core REQUIRED)
+find_package(QCoro${QT_MAJOR_VERSION} 0.4 COMPONENTS Core REQUIRED)
 
 qcoro_enable_coroutines()
 
-find_package(KF6DocTools ${KF_MIN_VERSION})
-set_package_properties(KF6DocTools PROPERTIES DESCRIPTION
+find_package(KF${QT_MAJOR_VERSION}DocTools ${KF_MIN_VERSION})
+set_package_properties(KF${QT_MAJOR_VERSION}DocTools PROPERTIES DESCRIPTION
     "Tools to generate documentation"
     TYPE OPTIONAL
 )
 
+if(NOT Quotient${QUOTIENT_SUFFIX}_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)
@@ -153,14 +179,12 @@ install(FILES org.kde.neochat.tray.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/h
 add_definitions(-DQT_NO_FOREACH)
 
 add_subdirectory(src)
-
-if (BUILD_TESTING)
-    find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
+if (BUILD_TESTING AND Quotient${QUOTIENT_SUFFIX}_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(KF6DocTools_FOUND)
+if(KF${QT_MAJOR_VERSION}DocTools_FOUND)
     kdoctools_install(po)
     add_subdirectory(doc)
 endif()

README.md

@@ -9,7 +9,7 @@
 
 A Qt/QML based Matrix client.
 
-<a href='https://matrix.org'><img src='https://matrix.org/docs/legacy/made-for-matrix.png' alt='Made for Matrix' height=64 target=_blank /></a>
+<a href='https://matrix.org'><img src='https://matrix.org/docs/projects/images/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

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"

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

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)

appiumtests/logintest.py

@@ -1,51 +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 os
-import subprocess
-import sys
-import unittest
-
-from appium import webdriver
-from appium.options.common.base import AppiumOptions
-from appium.webdriver.common.appiumby import AppiumBy
-
-
-class LoginTest(unittest.TestCase):
-
-    mockServerProcess: subprocess.Popen
-
-    @classmethod
-    def setUpClass(cls):
-        options = AppiumOptions()
-        options.set_capability("app", "neochat --ignore-ssl-errors")
-        cls.driver = webdriver.Remote(command_executor='http://127.0.0.1:4723', options=options)
-        cls.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()

autotests/CMakeLists.txt

@@ -3,8 +3,6 @@
 
 enable_testing()
 
-add_definitions(-DDATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" )
-
 ecm_add_test(
     neochatroomtest.cpp
     LINK_LIBRARIES neochat Qt::Test
@@ -22,21 +20,3 @@ ecm_add_test(
     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
-)
-
-ecm_add_test(
-    chatbarcachetest.cpp
-    LINK_LIBRARIES neochat Qt::Test
-    TEST_NAME chatbarcachetest
-)

autotests/chatbarcachetest.cpp

@@ -1,157 +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 <QJsonDocument>
-#include <QJsonObject>
-#include <QObject>
-#include <QTest>
-
-#include <Quotient/syncdata.h>
-#include <qtestcase.h>
-
-#include "chatbarcache.h"
-#include "neochatroom.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 ChatBarCacheTest : public QObject
-{
-    Q_OBJECT
-
-private:
-    Connection *connection = nullptr;
-    TestRoom *room = nullptr;
-
-private Q_SLOTS:
-    void initTestCase();
-
-    void empty();
-    void noRoom();
-    void badParent();
-    void reply();
-    void edit();
-    void attachment();
-};
-
-void ChatBarCacheTest::initTestCase()
-{
-    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
-
-    QFile testMinSyncFile;
-    testMinSyncFile.setFileName(QLatin1String(DATA_DIR) + u'/' + QLatin1String("test-min-sync.json"));
-    testMinSyncFile.open(QIODevice::ReadOnly);
-    const auto testMinSyncJson = QJsonDocument::fromJson(testMinSyncFile.readAll());
-    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, testMinSyncJson.object());
-    room->update(std::move(roomData));
-}
-
-void ChatBarCacheTest::empty()
-{
-    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-
-    QCOMPARE(chatBarCache->text(), QString());
-    QCOMPARE(chatBarCache->isReplying(), false);
-    QCOMPARE(chatBarCache->replyId(), QString());
-    QCOMPARE(chatBarCache->isEditing(), false);
-    QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(nullptr));
-    QCOMPARE(chatBarCache->relationMessage(), QString());
-    QCOMPARE(chatBarCache->attachmentPath(), QString());
-}
-
-void ChatBarCacheTest::noRoom()
-{
-    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache());
-    chatBarCache->setReplyId(QLatin1String("$153456789:example.org"));
-
-    // These should return empty even though a reply ID has been set because the
-    // ChatBarCache has no parent.
-
-    QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.");
-    QCOMPARE(chatBarCache->relationUser(), QVariantMap());
-
-    QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.");
-    QCOMPARE(chatBarCache->relationMessage(), QString());
-}
-
-void ChatBarCacheTest::badParent()
-{
-    QScopedPointer<QObject> badParent(new QObject());
-    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(badParent.get()));
-    chatBarCache->setReplyId(QLatin1String("$153456789:example.org"));
-
-    // These should return empty even though a reply ID has been set because the
-    // ChatBarCache has no parent.
-
-    QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.");
-    QCOMPARE(chatBarCache->relationUser(), QVariantMap());
-
-    QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.");
-    QCOMPARE(chatBarCache->relationMessage(), QString());
-}
-
-void ChatBarCacheTest::reply()
-{
-    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-    chatBarCache->setText(QLatin1String("some text"));
-    chatBarCache->setAttachmentPath(QLatin1String("some/path"));
-    chatBarCache->setReplyId(QLatin1String("$153456789:example.org"));
-
-    QCOMPARE(chatBarCache->text(), QLatin1String("some text"));
-    QCOMPARE(chatBarCache->isReplying(), true);
-    QCOMPARE(chatBarCache->replyId(), QLatin1String("$153456789:example.org"));
-    QCOMPARE(chatBarCache->isEditing(), false);
-    QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(room->user(QLatin1String("@example:example.org"))));
-    QCOMPARE(chatBarCache->relationMessage(), QLatin1String("This is an example\ntext message"));
-    QCOMPARE(chatBarCache->attachmentPath(), QString());
-}
-
-void ChatBarCacheTest::edit()
-{
-    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-    chatBarCache->setText(QLatin1String("some text"));
-    chatBarCache->setAttachmentPath(QLatin1String("some/path"));
-    chatBarCache->setEditId(QLatin1String("$153456789:example.org"));
-
-    QCOMPARE(chatBarCache->text(), QLatin1String("some text"));
-    QCOMPARE(chatBarCache->isReplying(), false);
-    QCOMPARE(chatBarCache->replyId(), QString());
-    QCOMPARE(chatBarCache->isEditing(), true);
-    QCOMPARE(chatBarCache->editId(), QLatin1String("$153456789:example.org"));
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(room->user(QLatin1String("@example:example.org"))));
-    QCOMPARE(chatBarCache->relationMessage(), QLatin1String("This is an example\ntext message"));
-    QCOMPARE(chatBarCache->attachmentPath(), QString());
-}
-
-void ChatBarCacheTest::attachment()
-{
-    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-    chatBarCache->setText(QLatin1String("some text"));
-    chatBarCache->setEditId(QLatin1String("$153456789:example.org"));
-    chatBarCache->setAttachmentPath(QLatin1String("some/path"));
-
-    QCOMPARE(chatBarCache->text(), QLatin1String("some text"));
-    QCOMPARE(chatBarCache->isReplying(), false);
-    QCOMPARE(chatBarCache->replyId(), QString());
-    QCOMPARE(chatBarCache->isEditing(), false);
-    QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(nullptr));
-    QCOMPARE(chatBarCache->relationMessage(), QString());
-    QCOMPARE(chatBarCache->attachmentPath(), QLatin1String("some/path"));
-}
-
-QTEST_MAIN(ChatBarCacheTest)
-#include "chatbarcachetest.moc"

autotests/data/test-eventhandler-sync.json

@@ -1,381 +0,0 @@
-{
-  "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
-        }
-      },
-      {
-        "content": {
-          "body": "Thread root",
-          "format": "org.matrix.custom.html",
-          "msgtype": "m.text"
-        },
-        "event_id": "$threadroot:example.org",
-        "origin_server_ts": 1690821582879,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "body": "Thread message 1",
-          "msgtype": "m.text",
-          "m.relates_to": {
-                "rel_type": "m.thread",
-                "event_id": "$threadroot:example.org",
-                "m.in_reply_to": {
-                    "event_id": "$threadroot:example.org"
-                },
-                "is_falling_back": true
-            }
-        },
-        "event_id": "$threadmessage1:example.org",
-        "origin_server_ts": 1690821582890,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1238
-        }
-      },
-      {
-        "content": {
-          "body": "Thread message 2",
-          "msgtype": "m.text",
-          "m.relates_to": {
-                "rel_type": "m.thread",
-                "event_id": "$threadroot:example.org",
-                "m.in_reply_to": {
-                    "event_id": "$threadmessage1:example.org"
-                },
-                "is_falling_back": true
-            }
-        },
-        "event_id": "$threadmessage2:example.org",
-        "origin_server_ts": 1690821582890,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1238
-        }
-      }
-    ],
-    "limited": true,
-    "prev_batch": "t34-23535_0_0"
-  }
-}

autotests/data/test-min-sync.json

@@ -1,87 +0,0 @@
-{
-  "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"
-      }
-    ]
-  },
-  "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
-        }
-      }
-    ],
-    "limited": true,
-    "prev_batch": "t34-23535_0_0"
-  }
-}

autotests/eventhandlertest.cpp

@@ -1,435 +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 thread();
-    void location();
-    void readMarkers();
-};
-
-void EventHandlerTest::initTestCase()
-{
-    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
-
-    QFile testEventHandlerSyncFile;
-    testEventHandlerSyncFile.setFileName(QLatin1String(DATA_DIR) + u'/' + QLatin1String("test-eventhandler-sync.json"));
-    testEventHandlerSyncFile.open(QIODevice::ReadOnly);
-    const auto testEventHandlerSyncJson = QJsonDocument::fromJson(testEventHandlerSyncFile.readAll());
-    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, testEventHandlerSyncJson.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::thread()
-{
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isThreaded(), false);
-    QCOMPARE(eventHandler.threadRoot(), QString());
-
-    event = room->messageEvents().at(9).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isThreaded(), true);
-    QCOMPARE(eventHandler.threadRoot(), QStringLiteral("$threadroot:example.org"));
-    QCOMPARE(eventHandler.getReplyId(), QStringLiteral("$threadroot:example.org"));
-
-    event = room->messageEvents().at(10).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isThreaded(), true);
-    QCOMPARE(eventHandler.threadRoot(), QStringLiteral("$threadroot:example.org"));
-    QCOMPARE(eventHandler.getReplyId(), QStringLiteral("$threadmessage1:example.org"));
-}
-
-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"

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"

autotests/texthandlertest.cpp

@@ -10,8 +10,6 @@
 #include <Quotient/syncdata.h>
 #include <qnamespace.h>
 
-#include "utils.h"
-
 using namespace Quotient;
 
 class TestRoom : public NeoChatRoom
@@ -363,7 +361,6 @@ void TextHandlerTest::receiveRichInPlainOut_data()
 
     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()
@@ -558,10 +555,10 @@ void TextHandlerTest::receiveRichPlainUrl()
 void TextHandlerTest::receiveRichEmote()
 {
     auto event = room->messageEvents().at(1).get();
-    auto author = room->user(event->senderId());
+    auto author = static_cast<NeoChatUser *>(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.");
+    const QString testOutputString = QStringLiteral("* <a href=\"https://matrix.to/#/@example:example.org\" style=\"color:") + author->color().name()
+        + QStringLiteral("\">@example:example.org</a> This is an emote.");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -605,13 +602,13 @@ 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("plainHttps") << QStringLiteral("https://kde.org") << QList<QUrl>({QUrl("https://kde.org")});
+    QTest::newRow("richHttps") << QStringLiteral("<a href=\"https://kde.org\">Rich Link</a>") << QList<QUrl>({QUrl("https://kde.org")});
+    QTest::newRow("plainWww") << QStringLiteral("www.example.org") << QList<QUrl>({QUrl("www.example.org")});
     QTest::newRow("multipleHttps") << QStringLiteral("https://kde.org www.example.org")
                                    << QList<QUrl>({
-                                          QUrl("https://kde.org"_ls),
-                                          QUrl("www.example.org"_ls),
+                                          QUrl("https://kde.org"),
+                                          QUrl("www.example.org"),
                                       });
 }
 
@@ -647,5 +644,5 @@ void TextHandlerTest::linkPreviewsReject()
     QCOMPARE(testTextHandler.getLinkPreviews(), testOutputLinks);
 }
 
-QTEST_MAIN(TextHandlerTest)
+QTEST_GUILESS_MAIN(TextHandlerTest)
 #include "texthandlertest.moc"

doc/CMakeLists.txt

@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-kdoctools_create_manpage(man-neochat.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-neochat.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})

org.kde.neochat.appdata.xml

@@ -46,29 +46,43 @@
   <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="fi">Keskustelu ystäviesi kanssa Matrixissa</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="ia">Starta Conversation conntu amicos sur 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="pl">Rozmawiaj ze swoimi znajomymi w Matriksie</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="eo">Kliento por matrix, la malcentra komunikprotokolo</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>
@@ -100,7 +114,6 @@ 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>
@@ -124,7 +137,6 @@ 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>
@@ -150,7 +162,6 @@ to provide a convergent experience across multiple platforms.</p>
       <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>
@@ -162,7 +173,6 @@ to provide a convergent experience across multiple platforms.</p>
       <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>
@@ -175,7 +185,6 @@ to provide a convergent experience across multiple platforms.</p>
       <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>
@@ -187,7 +196,6 @@ to provide a convergent experience across multiple platforms.</p>
       <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>
@@ -200,7 +208,6 @@ to provide a convergent experience across multiple platforms.</p>
       <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>
@@ -212,7 +219,6 @@ to provide a convergent experience across multiple platforms.</p>
       <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>
@@ -274,6 +280,48 @@ to provide a convergent experience across multiple platforms.</p>
     <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>
+    <value key="KDE::windows_store::screenshots::1::image">https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Timeline.png</value>
+    <value key="KDE::windows_store::screenshots::1::caption">Main view with room list, chat, and room information</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ia">Vista principal con lista de sala, chat e information de sala</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ka">მთავარი ხედი სურათების სიით, ჩატით და ოთახის ინფორმაციით</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ko">대화방 목록, 채팅, 대화방 정보가 표시된 주 보기</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="nl">Hoofdweergave met lijst met rooms, chat en roominformatie</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="tr">Oda listesini, sohbet penceresini ve oda bilgisini gösteren ana görünüm</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="uk">Головна панель із списком кімнат, спілкуванням та даними щодо кімнати</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="x-test">xxMain view with room list, chat, and room informationxx</value>
+    <value key="KDE::windows_store::screenshots::2::image">https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Login.png</value>
+    <value key="KDE::windows_store::screenshots::2::caption">Login screen</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ca">Pantalla d'inici de sessió</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ca-valencia">Pantalla d'inici de sessió</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="es">Pantalla de inicio de sesión</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="eu">Saio-hasteko pantaila</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="fr">Écran de connexion</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="gl">Pantalla de identificación.</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ia">Schermo de accesso</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="it">Schermata di accesso</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ka">შესვლის ეკრანი</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ko">로그인 화면</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="nl">Aanmeldscherm</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="nn">Innloggingsbilete</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="pt">Ecrã de autenticação</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="sl">Prijavni zaslon</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="sv">Inloggningsfönster</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ta">நுழைவுத் திரை</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="tr">Oturum açma ekranı</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="uk">Вікно входу</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="x-test">xxLogin screenxx</value>
   </custom>
   <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
   <screenshots>
@@ -283,82 +331,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 environment="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="ia">Vista principal con lista de sala, chat e information de 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 environment="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="ia">Schermo de accesso</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.2" date="2023-10-12"/>
-    <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>

org.kde.neochat.tray.svg

@@ -1,8 +1 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<style type="text/css" id="current-color-scheme">.ColorScheme-Text{color:#232629}</style>
-<path class="ColorScheme-Text" fill-rule="evenodd" clip-rule="evenodd" d="M3 3H19V14H8.68787L4 18.1019V14H3V3ZM4 13H5V15.8981L8.31213 13H18V4H4V13Z" fill="currentColor"/>
-<path class="ColorScheme-Text" fill-rule="evenodd" clip-rule="evenodd" d="M17 15.2929L14.8536 13.1465L14.1465 13.8536L18 17.7071V13.5H17V15.2929Z" fill="currentColor"/>
-<path class="ColorScheme-Text" d="M5 6H15V7H5V6Z" fill="currentColor"/>
-<path class="ColorScheme-Text" d="M5 8H13V9H5V8Z" fill="currentColor"/>
-<path class="ColorScheme-Text" d="M5 10H11V11H5V10Z" fill="currentColor"/>
-</svg>
+<svg width="22" height="22" fill="none" version="1.1" id="svg13" xmlns="http://www.w3.org/2000/svg"><style type="text/css" id="current-color-scheme">.ColorScheme-Text{color:#232629}</style><path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" fill-rule="evenodd" clip-rule="evenodd" d="M2 4h18v11H6.681L3 18.067V15H2zm1 10h1v1.933L6.319 14H19V5H3z" id="path3"/><path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" id="rect5" d="M4 7h9v1H4z"/><path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" id="rect7" d="M4 9h7v1H4z"/><path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" id="rect9" d="M4 11h5v1H4z"/><path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" fill-rule="evenodd" clip-rule="evenodd" d="m16 15.293-1.147-1.146-.707.707 2.853 2.853V14.5h-1z" id="path11"/></svg>

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

@@ -97,7 +97,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0
 >Vegeu també</title>
   <simplelist>
     <member
->Una llista de les preguntes més freqüents quant a Matrix <ulink url="https://matrix.org/faq/"
+>Una llista de les preguntes més freqüents quan a Matrix <ulink url="https://matrix.org/faq/"
 >https://matrix.org/faq/</ulink
 > </member>
     <member

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>

src/CMakeLists.txt

@@ -3,6 +3,16 @@
 # 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/UserDetailDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/UserDetailDialog.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
@@ -34,18 +44,14 @@ add_library(neochat STATIC
     roommanager.h
     neochatroom.cpp
     neochatroom.h
+    neochatuser.cpp
+    neochatuser.h
     models/userlistmodel.cpp
     models/userlistmodel.h
     models/userfiltermodel.cpp
     models/userfiltermodel.h
     models/publicroomlistmodel.cpp
     models/publicroomlistmodel.h
-    models/spacechildrenmodel.cpp
-    models/spacechildrenmodel.h
-    models/spacechildsortfiltermodel.cpp
-    models/spacechildsortfiltermodel.h
-    models/spacetreeitem.cpp
-    models/spacetreeitem.h
     models/userdirectorylistmodel.cpp
     models/userdirectorylistmodel.h
     models/pushrulemodel.cpp
@@ -61,8 +67,8 @@ add_library(neochat STATIC
     models/devicesmodel.cpp
     models/devicesmodel.h
     models/devicesproxymodel.cpp
-    filetype.cpp
-    filetype.h
+    filetypesingleton.cpp
+    filetypesingleton.h
     login.cpp
     login.h
     models/webshortcutmodel.cpp
@@ -71,6 +77,8 @@ add_library(neochat STATIC
     blurhash.h
     blurhashimageprovider.cpp
     blurhashimageprovider.h
+    models/collapsestateproxymodel.cpp
+    models/collapsestateproxymodel.h
     models/mediamessagefiltermodel.cpp
     models/mediamessagefiltermodel.h
     urlhelper.cpp
@@ -119,175 +127,6 @@ add_library(neochat STATIC
     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
-    roomlastmessageprovider.cpp
-    roomlastmessageprovider.h
-    chatbarcache.cpp
-    chatbarcache.h
-)
-
-qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
-    QML_FILES
-        qml/main.qml
-        qml/AccountMenu.qml
-        qml/ExploreComponent.qml
-        qml/ContextMenu.qml
-        qml/CollapsedRoomDelegate.qml
-        qml/RoomDelegate.qml
-        qml/RoomListPage.qml
-        qml/SpaceListContextMenu.qml
-        qml/UserInfo.qml
-        qml/LoadingPage.qml
-        qml/RoomPage.qml
-        qml/RoomWindow.qml
-        qml/JoinRoomPage.qml
-        qml/ManualRoomDialog.qml
-        qml/ExplorerDelegate.qml
-        qml/InviteUserPage.qml
-        qml/StartChatPage.qml
-        qml/ImageEditorPage.qml
-        qml/WelcomePage.qml
-        qml/General.qml
-        qml/Security.qml
-        qml/PushNotification.qml
-        qml/Categories.qml
-        qml/Permissions.qml
-        qml/NeochatMaximizeComponent.qml
-        qml/FancyEffectsContainer.qml
-        qml/TypingPane.qml
-        qml/ShimmerGradient.qml
-        qml/QuickSwitcher.qml
-        qml/HoverActions.qml
-        qml/ChatBox.qml
-        qml/ChatBar.qml
-        qml/AttachmentPane.qml
-        qml/ReplyPane.qml
-        qml/CompletionMenu.qml
-        qml/PieProgressBar.qml
-        qml/QuickFormatBar.qml
-        qml/RoomData.qml
-        qml/ServerData.qml
-        qml/EmojiPicker.qml
-        qml/TimelineDelegate.qml
-        qml/ReplyComponent.qml
-        qml/StateDelegate.qml
-        qml/RichLabel.qml
-        qml/MessageDelegate.qml
-        qml/Bubble.qml
-        qml/SectionDelegate.qml
-        qml/VideoDelegate.qml
-        qml/ReactionDelegate.qml
-        qml/LinkPreviewDelegate.qml
-        qml/AudioDelegate.qml
-        qml/FileDelegate.qml
-        qml/ImageDelegate.qml
-        qml/EncryptedDelegate.qml
-        qml/EventDelegate.qml
-        qml/TextDelegate.qml
-        qml/ReadMarkerDelegate.qml
-        qml/PollDelegate.qml
-        qml/MimeComponent.qml
-        qml/StateComponent.qml
-        qml/MessageEditComponent.qml
-        qml/AvatarFlow.qml
-        qml/LoginStep.qml
-        qml/Login.qml
-        qml/Homeserver.qml
-        qml/Username.qml
-        qml/RegisterPassword.qml
-        qml/Captcha.qml
-        qml/Terms.qml
-        qml/Email.qml
-        qml/Password.qml
-        qml/LoginRegister.qml
-        qml/Loading.qml
-        qml/LoginMethod.qml
-        qml/Sso.qml
-        qml/UserDetailDialog.qml
-        qml/CreateRoomDialog.qml
-        qml/EmojiDialog.qml
-        qml/OpenFileDialog.qml
-        qml/KeyVerificationDialog.qml
-        qml/ConfirmLogoutDialog.qml
-        qml/PowerLevelDialog.qml
-        qml/Message.qml
-        qml/EmojiItem.qml
-        qml/EmojiRow.qml
-        qml/EmojiSas.qml
-        qml/ConfirmDeactivateAccountDialog.qml
-        qml/VerificationCanceled.qml
-        qml/GlobalMenu.qml
-        qml/EditMenu.qml
-        qml/MessageDelegateContextMenu.qml
-        qml/FileDelegateContextMenu.qml
-        qml/MessageSourceSheet.qml
-        qml/ReportSheet.qml
-        qml/SettingsPage.qml
-        qml/ThemeRadioButton.qml
-        qml/ColorScheme.qml
-        qml/GeneralSettingsPage.qml
-        qml/EmoticonsPage.qml
-        qml/EmoticonEditorPage.qml
-        qml/EmoticonFormCard.qml
-        qml/GlobalNotificationsPage.qml
-        qml/NotificationRuleItem.qml
-        qml/AppearanceSettingsPage.qml
-        qml/AccountsPage.qml
-        qml/AccountEditorPage.qml
-        qml/DevicesPage.qml
-        qml/DeviceDelegate.qml
-        qml/DevicesCard.qml
-        qml/About.qml
-        qml/AboutKDE.qml
-        qml/SonnetConfigPage.qml
-        qml/NetworkProxyPage.qml
-        qml/DevtoolsPage.qml
-        qml/ConfirmEncryptionDialog.qml
-        qml/RemoveSheet.qml
-        qml/BanSheet.qml
-        qml/EmojiTonesPicker.qml
-        qml/EmojiDelegate.qml
-        qml/EmojiGrid.qml
-        qml/SearchPage.qml
-        qml/LocationDelegate.qml
-        qml/LocationChooser.qml
-        qml/TimelineView.qml
-        qml/InvitationView.qml
-        qml/AvatarTabButton.qml
-        qml/SpaceDrawer.qml
-        qml/OsmLocationPlugin.qml
-        qml/LiveLocationDelegate.qml
-        qml/FullScreenMap.qml
-        qml/LocationsPage.qml
-        qml/LocationMapItem.qml
-        qml/RoomDrawer.qml
-        qml/RoomDrawerPage.qml
-        qml/DirectChatDrawerHeader.qml
-        qml/GroupChatDrawerHeader.qml
-        qml/RoomInformation.qml
-        qml/RoomMedia.qml
-        qml/ChooseRoomDialog.qml
-        qml/ShareAction.qml
-        qml/SpaceHomePage.qml
-        qml/SpaceHierarchyDelegate.qml
-        qml/RemoveChildDialog.qml
-        qml/SelectParentDialog.qml
-    RESOURCES
-        qml/confetti.png
-        qml/glowdot.png
 )
 
 ecm_qt_declare_logging_category(neochat
@@ -299,22 +138,11 @@ ecm_qt_declare_logging_category(neochat
     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
 )
 
-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
@@ -329,25 +157,25 @@ if(NOT ANDROID)
     target_sources(neochat PRIVATE colorschemer.cpp colorschemer.h)
     if (NOT WIN32 AND NOT APPLE)
         target_sources(neochat PRIVATE trayicon_sni.cpp trayicon_sni.h)
-        target_link_libraries(neochat PRIVATE KF6::StatusNotifierItem)
     else()
         target_sources(neochat PRIVATE trayicon.cpp trayicon.h)
     endif()
-    target_link_libraries(neochat PUBLIC KF6::ConfigWidgets KF6::WindowSystem ICU::uc)
+    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::ConfigWidgets KF${QT_MAJOR_VERSION}::WindowSystem)
     target_compile_definitions(neochat PUBLIC -DHAVE_COLORSCHEME)
     target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM)
-    target_compile_definitions(neochat PUBLIC -DHAVE_ICU)
 endif()
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
+    target_sources(neochat-app PRIVATE res_desktop.qrc)
     target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
     target_compile_definitions(neochat PUBLIC -DHAVE_X11)
     target_sources(neochat PRIVATE runner.cpp)
+else()
+    target_sources(neochat-app PRIVATE res_android.qrc)
 endif()
 
-target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums)
-target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF6::I18n KF6::Kirigami2 KF6::Notifications KF6::ConfigCore KF6::ConfigGui KF6::CoreAddons KF6::SonnetCore  KF6::ItemModels QuotientQt6 cmark::cmark QCoro::Core)
-
+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 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${QUOTIENT_SUFFIX} cmark::cmark ${QTKEYCHAIN_LIBRARIES} QCoro::Core)
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
 
 if(NEOCHAT_FLATPAK)
@@ -432,10 +260,9 @@ if(ANDROID)
         "preferences-desktop-notification"
         "computer-symbolic"
         "gps"
-        "system-users-symbolic"
     )
 else()
-    target_link_libraries(neochat PUBLIC Qt::Widgets KF6::KIOWidgets)
+    target_link_libraries(neochat PUBLIC Qt::Widgets KF${QT_MAJOR_VERSION}::KIOWidgets)
     install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
 endif()
 
@@ -443,12 +270,12 @@ if(NOT ANDROID)
     set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
 endif()
 
-if(TARGET KF6::DBusAddons)
-    target_link_libraries(neochat PUBLIC KF6::DBusAddons)
+if(TARGET KF${QT_MAJOR_VERSION}::DBusAddons)
+    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::DBusAddons)
     target_compile_definitions(neochat PUBLIC -DHAVE_KDBUSADDONS)
 endif()
 
-if (TARGET KF6::KIOWidgets)
+if (TARGET KF${QT_MAJOR_VERSION}::KIOWidgets)
     target_compile_definitions(neochat PUBLIC -DHAVE_KIO)
 endif()
 

src/actionshandler.cpp

@@ -35,35 +35,48 @@ void ActionsHandler::setRoom(NeoChatRoom *room)
     }
 
     m_room = room;
+    Q_EMIT roomChanged();
 }
 
-void ActionsHandler::handleMessageEvent(ChatBarCache *chatBarCache)
+void ActionsHandler::handleNewMessage()
 {
-    if (!chatBarCache) {
-        return;
-    }
-
-    checkEffects(chatBarCache->text());
-    if (!chatBarCache->attachmentPath().isEmpty()) {
-        QUrl url(chatBarCache->attachmentPath());
+    checkEffects(m_room->chatBoxText());
+    if (!m_room->chatBoxAttachmentPath().isEmpty()) {
+        QUrl url(m_room->chatBoxAttachmentPath());
         auto path = url.isLocalFile() ? url.toLocalFile() : url.toString();
-        m_room->uploadFile(QUrl(path), chatBarCache->text().isEmpty() ? path.mid(path.lastIndexOf(u'/') + 1) : chatBarCache->text());
-        chatBarCache->setAttachmentPath({});
-        chatBarCache->setText({});
+        m_room->uploadFile(path, m_room->chatBoxText().isEmpty() ? path.mid(path.lastIndexOf('/') + 1) : m_room->chatBoxText());
+        m_room->setChatBoxAttachmentPath({});
+        m_room->setChatBoxText({});
         return;
     }
 
-    QString handledText = chatBarCache->text();
-    handledText = handleMentions(handledText, chatBarCache->mentions());
-    handleMessage(m_room->mainCache()->text(), handledText, chatBarCache);
+    QString handledText = m_room->chatBoxText();
+    handledText = handleMentions(handledText);
+    handleMessage(m_room->chatBoxText(), handledText);
 }
 
-QString ActionsHandler::handleMentions(QString handledText, QList<Mention> *mentions)
+void ActionsHandler::handleEdit()
+{
+    checkEffects(m_room->editText());
+
+    QString handledText = m_room->editText();
+    handledText = handleMentions(handledText, true);
+    handleMessage(m_room->editText(), handledText, true);
+}
+
+QString ActionsHandler::handleMentions(QString handledText, const bool &isEdit)
 {
     if (!m_room) {
         return QString();
     }
 
+    QVector<Mention> *mentions;
+    if (isEdit) {
+        mentions = m_room->editMentions();
+    } else {
+        mentions = m_room->mentions();
+    }
+
     std::sort(mentions->begin(), mentions->end(), [](const auto &a, const auto &b) -> bool {
         return a.cursor.anchor() > b.cursor.anchor();
     });
@@ -81,10 +94,10 @@ QString ActionsHandler::handleMentions(QString handledText, QList<Mention> *ment
     return handledText;
 }
 
-void ActionsHandler::handleMessage(const QString &text, QString handledText, ChatBarCache *chatBarCache)
+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);
@@ -100,13 +113,13 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, Cha
                         } 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;
@@ -120,8 +133,8 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, Cha
     if (handledText.startsWith(QLatin1Char('/'))) {
         for (const auto &action : ActionsModel::instance().allActions()) {
             if (handledText.indexOf(action.prefix) == 1
-                && (handledText.indexOf(" "_ls) == action.prefix.length() + 1 || handledText.length() == action.prefix.length() + 1)) {
-                handledText = action.handle(handledText.mid(action.prefix.length() + 1).trimmed(), m_room, chatBarCache);
+                && (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;
                 }
@@ -139,30 +152,30 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, Cha
     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, chatBarCache->replyId(), chatBarCache->editId(), chatBarCache->threadId());
+    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()) {

src/actionshandler.h

@@ -4,13 +4,12 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 
 #include <Quotient/events/roommessageevent.h>
 
-#include "chatbarcache.h"
 #include "neochatroom.h"
 
+class CustomEmojiModel;
 class NeoChatRoom;
 
 /**
@@ -34,31 +33,38 @@ class NeoChatRoom;
 class ActionsHandler : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-public:
-    explicit ActionsHandler(QObject *parent = nullptr);
 
     /**
      * @brief The room that messages will be sent to.
      */
+    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
+
+public:
+    explicit ActionsHandler(QObject *parent = nullptr);
+
     [[nodiscard]] NeoChatRoom *room() const;
     void setRoom(NeoChatRoom *room);
 
 Q_SIGNALS:
+    void roomChanged();
     void showEffect(const QString &effect);
 
 public Q_SLOTS:
+
     /**
-     * @brief Pre-process text and send message event.
+     * @brief Pre-process text and send message.
      */
-    void handleMessageEvent(ChatBarCache *chatBarCache);
+    void handleNewMessage();
+
+    /**
+     * @brief Pre-process text and send edit.
+     */
+    void handleEdit();
 
 private:
     NeoChatRoom *m_room = nullptr;
     void checkEffects(const QString &text);
 
-    QString handleMentions(QString handledText, QList<Mention> *mentions);
-    void handleMessage(const QString &text, QString handledText, ChatBarCache *chatBarCache);
+    QString handleMentions(QString handledText, const bool &isEdit = false);
+    void handleMessage(const QString &text, QString handledText, const bool &isEdit = false);
 };

src/chatbarcache.cpp

@@ -1,175 +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 "chatbarcache.h"
-
-#include "eventhandler.h"
-#include "neochatroom.h"
-
-ChatBarCache::ChatBarCache(QObject *parent)
-    : QObject(parent)
-{
-}
-
-QString ChatBarCache::text() const
-{
-    return m_text;
-}
-
-void ChatBarCache::setText(const QString &text)
-{
-    if (text == m_text) {
-        return;
-    }
-    m_text = text;
-    Q_EMIT textChanged();
-}
-
-bool ChatBarCache::isReplying() const
-{
-    return m_relationType == Reply && !m_relationId.isEmpty();
-}
-
-QString ChatBarCache::replyId() const
-{
-    if (m_relationType != Reply) {
-        return {};
-    }
-    return m_relationId;
-}
-
-void ChatBarCache::setReplyId(const QString &replyId)
-{
-    if (m_relationType == Reply && m_relationId == replyId) {
-        return;
-    }
-    m_relationId = replyId;
-    if (m_relationId.isEmpty()) {
-        m_relationType = None;
-    } else {
-        m_relationType = Reply;
-    }
-    m_attachmentPath = QString();
-    Q_EMIT relationIdChanged();
-    Q_EMIT attachmentPathChanged();
-}
-
-bool ChatBarCache::isEditing() const
-{
-    return m_relationType == Edit && !m_relationId.isEmpty();
-}
-
-QString ChatBarCache::editId() const
-{
-    if (m_relationType != Edit) {
-        return {};
-    }
-    return m_relationId;
-}
-
-void ChatBarCache::setEditId(const QString &editId)
-{
-    if (m_relationType == Edit && m_relationId == editId) {
-        return;
-    }
-    m_relationId = editId;
-    if (m_relationId.isEmpty()) {
-        m_relationType = None;
-    } else {
-        m_relationType = Edit;
-    }
-    m_attachmentPath = QString();
-    Q_EMIT relationIdChanged();
-    Q_EMIT attachmentPathChanged();
-}
-
-QVariantMap ChatBarCache::relationUser() const
-{
-    if (parent() == nullptr) {
-        qWarning() << "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.";
-        return {};
-    }
-    auto room = dynamic_cast<NeoChatRoom *>(parent());
-    if (room == nullptr) {
-        qWarning() << "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.";
-        return {};
-    }
-    if (m_relationId.isEmpty()) {
-        return room->getUser(nullptr);
-    }
-    return room->getUser(room->user((*room->findInTimeline(m_relationId))->senderId()));
-}
-
-QString ChatBarCache::relationMessage() const
-{
-    if (parent() == nullptr) {
-        qWarning() << "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.";
-        return {};
-    }
-    if (m_relationId.isEmpty()) {
-        return {};
-    }
-    auto room = dynamic_cast<NeoChatRoom *>(parent());
-    if (room == nullptr) {
-        qWarning() << "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.";
-        return {};
-    }
-    EventHandler eventhandler;
-    eventhandler.setRoom(room);
-    if (auto event = room->findInTimeline(m_relationId); event != room->historyEdge()) {
-        eventhandler.setEvent(&**event);
-        return eventhandler.getPlainBody();
-    }
-    return {};
-}
-
-bool ChatBarCache::isThreaded() const
-{
-    return !m_threadId.isEmpty();
-}
-
-QString ChatBarCache::threadId() const
-{
-    return m_threadId;
-}
-
-void ChatBarCache::setThreadId(const QString &threadId)
-{
-    if (m_threadId == threadId) {
-        return;
-    }
-    m_threadId = threadId;
-    Q_EMIT threadIdChanged();
-}
-
-QString ChatBarCache::attachmentPath() const
-{
-    return m_attachmentPath;
-}
-
-void ChatBarCache::setAttachmentPath(const QString &attachmentPath)
-{
-    if (attachmentPath == m_attachmentPath) {
-        return;
-    }
-    m_attachmentPath = attachmentPath;
-    m_relationType = None;
-    m_relationId = QString();
-    Q_EMIT attachmentPathChanged();
-    Q_EMIT relationIdChanged();
-}
-
-QList<Mention> *ChatBarCache::mentions()
-{
-    return &m_mentions;
-}
-
-QString ChatBarCache::savedText() const
-{
-    return m_savedText;
-}
-
-void ChatBarCache::setSavedText(const QString &savedText)
-{
-    m_savedText = savedText;
-}

src/chatbarcache.h

@@ -1,201 +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 <QQmlEngine>
-#include <QTextCursor>
-
-/**
- * @brief Defines a user mention in the current chat or edit text.
- */
-struct Mention {
-    QTextCursor cursor; /**< Contains the mention's text and position in the text.  */
-    QString text; /**< The inserted text of the mention. */
-    int start = 0; /**< Start position of the mention. */
-    int position = 0; /**< End position of the mention. */
-    QString id; /**< The id the mention (used to create link when sending the message). */
-};
-
-/**
- * @class ChatBarCache
- *
- * A class to cache data from a chat bar.
- *
- * A chat bar can be anything that allows users to compose or edit message, it doesn't
- * necessarily have to use the ChatBar component, e.g. MessageEditComponent.
- *
- * This object is intended to allow the current contents of a chat bar to be cached
- * between different rooms, i.e. there is an expectation that each NeoChatRoom could
- * have a separate cache for each chat bar.
- *
- * @note The NeoChatRoom which this component is created in is expected to be set
- *       as it's parent. This is necessary for certain functions which need to get
- *       relevant room information.
- *
- * @sa ChatBar, MessageEditComponent, NeoChatRoom
- */
-class ChatBarCache : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-    /**
-     * @brief The text in the chat bar.
-     *
-     * Due to problems with QTextDocument, unlike the other properties here,
-     * text is *not* used to store the text when switching rooms.
-     */
-    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
-
-    /**
-     * @brief Whether the chat bar is currently replying to a message.
-     */
-    Q_PROPERTY(bool isReplying READ isReplying NOTIFY relationIdChanged)
-
-    /**
-     * @brief The Matrix message ID of an event being replied to, if any.
-     *
-     * Will return empty if the RelationType is currently set to None or Edit.
-     *
-     * @note Replying, editing and attachments are exclusive so setting this will
-     *       clear an edit or attachment.
-     *
-     * @sa RelationType
-     */
-    Q_PROPERTY(QString replyId READ replyId WRITE setReplyId NOTIFY relationIdChanged)
-
-    /**
-     * @brief Whether the chat bar is currently editing a message.
-     */
-    Q_PROPERTY(bool isEditing READ isEditing NOTIFY relationIdChanged)
-
-    /**
-     * @brief The Matrix message ID of an event being edited, if any.
-     *
-     * Will return empty if the RelationType is currently set to None or Reply.
-     *
-     * @note Replying, editing and attachments are exclusive so setting this will
-     *       clear an reply or attachment.
-     *
-     * @sa RelationType
-     */
-    Q_PROPERTY(QString editId READ editId WRITE setEditId NOTIFY relationIdChanged)
-
-    /**
-     * @brief Get the user for the message being replied to.
-     *
-     * 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.
-     *
-     * Returns an empty user if not replying to a message.
-     *
-     * The user QVariantMap has 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 getUser, Quotient::User
-     */
-    Q_PROPERTY(QVariantMap relationUser READ relationUser NOTIFY relationIdChanged)
-
-    /**
-     * @brief The content of the related message.
-     *
-     * Will be QString() if no related message.
-     */
-    Q_PROPERTY(QString relationMessage READ relationMessage NOTIFY relationIdChanged)
-
-    /**
-     * @brief Whether the chat bar is replying in a thread.
-     */
-    Q_PROPERTY(bool isThreaded READ isThreaded NOTIFY threadIdChanged)
-
-    /**
-     * @brief The Matrix message ID of thread root event, if any.
-     */
-    Q_PROPERTY(QString threadId READ threadId WRITE setThreadId NOTIFY threadIdChanged)
-
-    /**
-     * @brief The local path for a file to send, if any.
-     *
-     * @note Replying, editing and attachments are exclusive so setting this will
-     *       clear an edit or reply.
-     */
-    Q_PROPERTY(QString attachmentPath READ attachmentPath WRITE setAttachmentPath NOTIFY attachmentPathChanged)
-
-public:
-    /**
-     * @brief Describes the type of relation which relationId can refer to.
-     *
-     * A chat bar can only be relating to a single message at a time making these
-     * exclusive.
-     */
-    enum RelationType {
-        Reply, /**< The current relation is a message being replied to. */
-        Edit, /**< The current relation is a message being edited. */
-        None, /**< There is currently no relation event */
-    };
-    Q_ENUM(RelationType)
-
-    explicit ChatBarCache(QObject *parent = nullptr);
-
-    QString text() const;
-    void setText(const QString &text);
-
-    bool isReplying() const;
-    QString replyId() const;
-    void setReplyId(const QString &replyId);
-
-    bool isEditing() const;
-    QString editId() const;
-    void setEditId(const QString &editId);
-
-    QVariantMap relationUser() const;
-
-    QString relationMessage() const;
-
-    bool isThreaded() const;
-    QString threadId() const;
-    void setThreadId(const QString &threadId);
-
-    QString attachmentPath() const;
-    void setAttachmentPath(const QString &attachmentPath);
-
-    /**
-     * @brief Retrieve the mentions for the current chat bar text.
-     */
-    QList<Mention> *mentions();
-
-    /**
-     * @brief Get the saved chat bar text.
-     */
-    QString savedText() const;
-
-    /**
-     * @brief Save the chat bar text.
-     */
-    void setSavedText(const QString &savedText);
-
-Q_SIGNALS:
-    void textChanged();
-    void relationIdChanged();
-    void threadIdChanged();
-    void attachmentPathChanged();
-
-private:
-    QString m_text = QString();
-    QString m_relationId = QString();
-    RelationType m_relationType = RelationType::None;
-    QString m_threadId = QString();
-    QString m_attachmentPath = QString();
-    QList<Mention> m_mentions;
-    QString m_savedText;
-};

src/chatdocumenthandler.cpp

@@ -57,12 +57,11 @@ public:
                 setFormat(error.first, error.second.size(), errorFormat);
             }
         }
-        auto handler = dynamic_cast<ChatDocumentHandler *>(parent());
-        auto room = handler->room();
+        auto room = dynamic_cast<ChatDocumentHandler *>(parent())->room();
         if (!room) {
             return;
         }
-        auto mentions = handler->chatBarCache()->mentions();
+        auto mentions = room->mentions();
         mentions->erase(std::remove_if(mentions->begin(),
                                        mentions->end(),
                                        [this](auto &mention) {
@@ -104,10 +103,15 @@ ChatDocumentHandler::ChatDocumentHandler(QObject *parent)
         m_completionModel->setRoom(m_room);
         static QPointer<NeoChatRoom> previousRoom = nullptr;
         if (previousRoom) {
-            disconnect(m_chatBarCache, &ChatBarCache::textChanged, this, nullptr);
+            disconnect(previousRoom, &NeoChatRoom::chatBoxTextChanged, this, nullptr);
+            disconnect(previousRoom, &NeoChatRoom::editTextChanged, this, nullptr);
         }
         previousRoom = m_room;
-        connect(m_chatBarCache, &ChatBarCache::textChanged, this, [this]() {
+        connect(m_room, &NeoChatRoom::chatBoxTextChanged, this, [this]() {
+            int start = completionStartIndex();
+            m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
+        });
+        connect(m_room, &NeoChatRoom::editTextChanged, this, [this]() {
             int start = completionStartIndex();
             m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
         });
@@ -130,7 +134,7 @@ int ChatDocumentHandler::completionStartIndex() const
         return 0;
     }
 
-#if !defined(Q_OS_ANDROID)
+#if !defined(Q_OS_ANDROID) && QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
     const long long cursor = cursorPosition();
 #else
     const auto cursor = cursorPosition();
@@ -211,20 +215,6 @@ void ChatDocumentHandler::setRoom(NeoChatRoom *room)
     Q_EMIT roomChanged();
 }
 
-ChatBarCache *ChatDocumentHandler::chatBarCache() const
-{
-    return m_chatBarCache;
-}
-
-void ChatDocumentHandler::setChatBarCache(ChatBarCache *chatBarCache)
-{
-    if (m_chatBarCache == chatBarCache) {
-        return;
-    }
-    m_chatBarCache = chatBarCache;
-    Q_EMIT chatBarCacheChanged();
-}
-
 void ChatDocumentHandler::complete(int index)
 {
     if (m_completionModel->autoCompletionType() == CompletionModel::User) {
@@ -235,7 +225,7 @@ void ChatDocumentHandler::complete(int index)
         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);
@@ -256,7 +246,7 @@ void ChatDocumentHandler::complete(int index)
         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);
@@ -313,7 +303,11 @@ QString ChatDocumentHandler::getText() const
     if (!m_room) {
         return QString();
     }
-    return m_chatBarCache->text();
+    if (m_isEdit) {
+        return m_room->editText();
+    } else {
+        return m_room->chatBoxText();
+    }
 }
 
 void ChatDocumentHandler::pushMention(const Mention mention) const
@@ -321,7 +315,11 @@ void ChatDocumentHandler::pushMention(const Mention mention) const
     if (!m_room) {
         return;
     }
-    m_chatBarCache->mentions()->push_back(mention);
+    if (m_isEdit) {
+        m_room->editMentions()->push_back(mention);
+    } else {
+        m_room->mentions()->push_back(mention);
+    }
 }
 
 QColor ChatDocumentHandler::mentionColor() const

src/chatdocumenthandler.h

@@ -4,14 +4,13 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 #include <QQuickTextDocument>
 #include <QTextCursor>
 
-#include "chatbarcache.h"
 #include "models/completionmodel.h"
 #include "neochatroom.h"
 
+class QTextDocument;
 class NeoChatRoom;
 class SyntaxHighlighter;
 
@@ -60,7 +59,6 @@ class SyntaxHighlighter;
 class ChatDocumentHandler : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief Is the instance being used to handle an edit message.
@@ -103,20 +101,15 @@ class ChatDocumentHandler : public QObject
      */
     Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
 
-    /**
-     * @brief The cache for the chat bar the text document is being handled for.
-     */
-    Q_PROPERTY(ChatBarCache *chatBarCache READ chatBarCache WRITE setChatBarCache NOTIFY chatBarCacheChanged)
-
     /**
      * @brief The color to highlight user mentions.
      */
-    Q_PROPERTY(QColor mentionColor READ mentionColor WRITE setMentionColor NOTIFY mentionColorChanged)
+    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)
+    Q_PROPERTY(QColor errorColor READ errorColor WRITE setErrorColor NOTIFY errorColorChanged);
 
 public:
     explicit ChatDocumentHandler(QObject *parent = nullptr);
@@ -139,9 +132,6 @@ public:
     [[nodiscard]] NeoChatRoom *room() const;
     void setRoom(NeoChatRoom *room);
 
-    [[nodiscard]] ChatBarCache *chatBarCache() const;
-    void setChatBarCache(ChatBarCache *chatBarCache);
-
     Q_INVOKABLE void complete(int index);
 
     void updateCompletions();
@@ -158,7 +148,6 @@ Q_SIGNALS:
     void documentChanged();
     void cursorPositionChanged();
     void roomChanged();
-    void chatBarCacheChanged();
     void completionModelChanged();
     void selectionStartChanged();
     void selectionEndChanged();
@@ -173,7 +162,6 @@ private:
     QPointer<QQuickTextDocument> m_document;
 
     QPointer<NeoChatRoom> m_room;
-    QPointer<ChatBarCache> m_chatBarCache;
     bool completionVisible = false;
 
     QColor m_mentionColor;

src/clipboard.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 
 class QClipboard;
 class QImage;
@@ -19,8 +18,6 @@ class QImage;
 class Clipboard : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
 
     /**
      * @brief Whether the current clipboard content is an image.

src/colorschemer.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 
 class QAbstractItemModel;
 class KColorSchemeManager;
@@ -20,8 +19,6 @@ class KColorSchemeManager;
 class ColorSchemer : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
 
     /**
      * @brief A QAbstractItemModel of all available color schemes.

src/controller.cpp

@@ -4,7 +4,11 @@
 
 #include "controller.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#include <qt5keychain/keychain.h>
+#else
 #include <qt6keychain/keychain.h>
+#endif
 
 #include <KConfig>
 #include <KConfigGroup>
@@ -17,6 +21,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QGuiApplication>
+#include <QImageReader>
 #include <QNetworkProxy>
 #include <QQuickTextDocument>
 #include <QQuickWindow>
@@ -28,15 +33,17 @@
 
 #include <Quotient/accountregistry.h>
 #include <Quotient/connection.h>
+#include <Quotient/csapi/content-repo.h>
 #include <Quotient/csapi/logout.h>
-#include <Quotient/csapi/notifications.h>
-#include <Quotient/eventstats.h>
+#include <Quotient/csapi/profile.h>
 #include <Quotient/jobs/downloadfilejob.h>
 #include <Quotient/qt_connection_util.h>
-#include <Quotient/user.h>
+#include <Quotient/csapi/notifications.h>
+#include <Quotient/eventstats.h>
 
 #include "neochatconfig.h"
 #include "neochatroom.h"
+#include "neochatuser.h"
 #include "notificationsmanager.h"
 #include "roommanager.h"
 #include "windowcontroller.h"
@@ -53,6 +60,7 @@ Controller::Controller(QObject *parent)
     : QObject(parent)
 {
     Connection::setRoomType<NeoChatRoom>();
+    Connection::setUserType<NeoChatUser>();
 
     setApplicationProxy();
 
@@ -93,11 +101,13 @@ Controller::Controller(QObject *parent)
     }
 #endif
 
+    connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
+
     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]() {
+            auto connection = m_accountRegistry.accounts()[m_accountRegistry.size() - 1];
+            connect(connection, &Connection::syncDone, this, [connection]() {
                 NotificationsManager::instance().handleNotifications(connection);
             });
         }
@@ -115,24 +125,43 @@ 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::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 (m_accountRegistry.count() > 1) {
+        // Only set the connection if the the account being logged out is currently active
+        if (conn == activeConnection()) {
+            setActiveConnection(m_accountRegistry.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");
 
@@ -140,17 +169,17 @@ void Controller::addConnection(NeoChatConnection *c)
 
     c->setLazyLoading(true);
 
-    connect(c, &NeoChatConnection::syncDone, this, [this, c] {
+    connect(c, &Connection::syncDone, this, [this, c] {
         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) {
+    connect(c, &Connection::requestFailed, this, [this](BaseJob *job) {
         if (job->error() == BaseJob::UserConsentRequired) {
             Q_EMIT userConsentRequired(job->errorUrl());
         }
@@ -159,19 +188,20 @@ void Controller::addConnection(NeoChatConnection *c)
     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);
     Q_EMIT connectionDropped(c);
+    Q_EMIT accountCountChanged();
 }
 
 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};
@@ -185,36 +215,36 @@ 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);
@@ -280,26 +310,100 @@ bool Controller::saveAccessTokenToKeyChain(const AccountSettings &account, const
     return true;
 }
 
+void Controller::changeAvatar(Connection *conn, const QUrl &localFile)
+{
+    auto job = conn->uploadFile(localFile.toLocalFile());
+    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::changePassword(Connection *connection, const QString &currentPassword, const QString &newPassword)
+{
+    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);
+                }
+            });
+        }
+    });
+}
+
+bool Controller::setAvatar(Connection *connection, const QUrl &avatarSource)
+{
+    User *localUser = connection->user();
+    QString decoded = avatarSource.path();
+    if (decoded.isEmpty()) {
+        connection->callApi<SetAvatarUrlJob>(localUser->id(), avatarSource);
+        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)
+    : 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);
+}
+
+int Controller::accountCount() const
+{
+    return m_accountRegistry.count();
+}
+
 void Controller::setQuitOnLastWindowClosed()
 {
 #ifndef Q_OS_ANDROID
     if (NeoChatConfig::self()->systemTray()) {
         m_trayIcon = new TrayIcon(this);
         m_trayIcon->show();
-        connect(m_trayIcon, &TrayIcon::toggleWindow, this, &Controller::toggleWindow);
+        connect(m_trayIcon, &TrayIcon::showWindow, this, &Controller::showWindow);
     } else {
         if (m_trayIcon) {
-            disconnect(m_trayIcon, &TrayIcon::toggleWindow, this, &Controller::toggleWindow);
+            disconnect(m_trayIcon, &TrayIcon::showWindow, this, &Controller::showWindow);
             delete m_trayIcon;
             m_trayIcon = nullptr;
         }
@@ -310,7 +414,7 @@ void Controller::setQuitOnLastWindowClosed()
 #endif
 }
 
-NeoChatConnection *Controller::activeConnection() const
+Connection *Controller::activeConnection() const
 {
     if (m_connection.isNull()) {
         return nullptr;
@@ -318,43 +422,49 @@ 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);
+        disconnect(m_connection, &Connection::accountDataChanged, 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."));
             }
         });
+        connect(connection, &Connection::accountDataChanged, this, [this](const QString &type) {
+            if (type == QLatin1String("org.kde.neochat.account_label")) {
+                Q_EMIT activeAccountLabelChanged();
+            }
+        });
     } else {
         NeoChatConfig::self()->setActiveConnection(QString());
     }
     NeoChatConfig::self()->save();
     Q_EMIT activeConnectionChanged();
     Q_EMIT activeConnectionIndexChanged();
+    Q_EMIT activeAccountLabelChanged();
 }
 
 PushRuleModel *Controller::pushRuleModel() const
@@ -367,6 +477,44 @@ void Controller::saveWindowGeometry()
     WindowController::instance().saveGeometry();
 }
 
+NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth)
+    : Quotient::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));
+}
+
+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, &RoomManager::instance(), &RoomManager::enterRoom, Qt::QueuedConnection);
+}
+
+void Controller::createSpace(const QString &name, const QString &topic)
+{
+    auto createRoomJob = m_connection->createRoom(Connection::UnpublishRoom,
+                                                  {},
+                                                  name,
+                                                  topic,
+                                                  QStringList(),
+                                                  {},
+                                                  {},
+                                                  false,
+                                                  {},
+                                                  {},
+                                                  QJsonObject{
+                                                      {"type"_ls, "m.space"_ls},
+                                                  });
+    connect(createRoomJob, &CreateRoomJob::failure, this, [this, createRoomJob] {
+        Q_EMIT errorOccured(i18n("Space creation failed: %1", createRoomJob->errorString()));
+    });
+    connectSingleShot(this, &Controller::roomAdded, &RoomManager::instance(), &RoomManager::enterRoom, Qt::QueuedConnection);
+}
+
 bool Controller::isOnline() const
 {
     return m_isOnline;
@@ -375,16 +523,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();
 
@@ -434,6 +582,11 @@ bool Controller::hasWindowSystem() const
 #endif
 }
 
+bool Controller::encryptionSupported() const
+{
+    return Quotient::encryptionSupported();
+}
+
 void Controller::forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item)
 {
     // HACK: Workaround bug QTBUG 93281
@@ -478,6 +631,12 @@ int Controller::activeConnectionIndex() const
     return result - m_accountRegistry.accounts().begin();
 }
 
+int Controller::quotientMinorVersion() const
+{
+    // TODO libQuotient 0.7: Replace with version function from libQuotient
+    return 7;
+}
+
 bool Controller::isFlatpak() const
 {
 #ifdef NEOCHAT_FLATPAK
@@ -487,6 +646,41 @@ bool Controller::isFlatpak() const
 #endif
 }
 
+void Controller::setActiveAccountLabel(const QString &label)
+{
+    if (!m_connection) {
+        return;
+    }
+    QJsonObject json{
+        {"account_label", label},
+    };
+    m_connection->setAccountData("org.kde.neochat.account_label", json);
+}
+
+QString Controller::activeAccountLabel() const
+{
+    if (!m_connection) {
+        return {};
+    }
+    return m_connection->accountDataJson("org.kde.neochat.account_label")["account_label"].toString();
+}
+
+QVariantList Controller::getSupportedRoomVersions(Quotient::Connection *connection)
+{
+    auto roomVersions = connection->availableRoomVersions();
+
+    QVariantList supportedRoomVersions;
+    for (const Quotient::Connection::SupportedRoomVersion &v : roomVersions) {
+        QVariantMap roomVersionMap;
+        roomVersionMap.insert("id", v.id);
+        roomVersionMap.insert("status", v.status);
+        roomVersionMap.insert("isStable", v.isStable());
+        supportedRoomVersions.append(roomVersionMap);
+    }
+
+    return supportedRoomVersions;
+}
+
 AccountRegistry &Controller::accounts()
 {
     return m_accountRegistry;

src/controller.h

@@ -5,24 +5,24 @@
 
 #include "models/pushrulemodel.h"
 #include <QObject>
-#include <QQmlEngine>
 #include <QQuickItem>
 
 #include <KFormat>
 
-#include "neochatconnection.h"
 #include <Quotient/accountregistry.h>
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/settings.h>
 
 class NeoChatRoom;
+class NeoChatUser;
 class TrayIcon;
+class QWindow;
 class QQuickTextDocument;
 
 namespace Quotient
 {
+class Connection;
 class Room;
-class User;
 }
 
 namespace QKeychain
@@ -41,13 +41,16 @@ class ReadPasswordJob;
 class Controller : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
+
+    /**
+     * @brief The number of logged in accounts.
+     */
+    Q_PROPERTY(int accountCount READ accountCount NOTIFY accountCountChanged)
 
     /**
      * @brief The current connection for the rest of NeoChat to use.
      */
-    Q_PROPERTY(NeoChatConnection *activeConnection READ activeConnection WRITE setActiveConnection NOTIFY activeConnectionChanged)
+    Q_PROPERTY(Quotient::Connection *activeConnection READ activeConnection WRITE setActiveConnection NOTIFY activeConnectionChanged)
 
     /**
      * @brief The PushRuleModel that has the active connection's push rules.
@@ -59,6 +62,16 @@ class Controller : public QObject
      */
     Q_PROPERTY(int activeConnectionIndex READ activeConnectionIndex NOTIFY activeConnectionIndexChanged)
 
+    /**
+     * @brief The account label for the active account.
+     *
+     * Account labels are a concept specific to NeoChat, allowing accounts to be
+     * labelled, e.g. for "Work", "Private", etc.
+     *
+     * Set to an empty string to remove the label.
+     */
+    Q_PROPERTY(QString activeAccountLabel READ activeAccountLabel WRITE setActiveAccountLabel NOTIFY activeAccountLabelChanged)
+
     /**
      * @brief Whether the OS NeoChat is running on supports sytem tray icons.
      */
@@ -74,6 +87,20 @@ class Controller : public QObject
      */
     Q_PROPERTY(bool isOnline READ isOnline NOTIFY isOnlineChanged)
 
+    /**
+     * @brief Whether the ecryption support has been enabled.
+     */
+    Q_PROPERTY(bool encryptionSupported READ encryptionSupported CONSTANT)
+
+    /**
+     * @brief The current minor version number of libQuotient being used.
+     *
+     * This is the only way to gate NeoChat features by libQuotient version in QML.
+     *
+     * @note No major version because libQuotient doesn't have any; All are 0.x.
+     */
+    Q_PROPERTY(int quotientMinorVersion READ quotientMinorVersion CONSTANT)
+
     /**
      * @brief Whether NeoChat is running as a flatpak.
      *
@@ -93,34 +120,59 @@ public:
     Q_ENUM(PasswordStatus)
 
     static Controller &instance();
-    static Controller *create(QQmlEngine *engine, QJSEngine *)
-    {
-        engine->setObjectOwnership(&instance(), QQmlEngine::CppOwnership);
-        return &instance();
-    }
 
-    void setActiveConnection(NeoChatConnection *connection);
-    [[nodiscard]] NeoChatConnection *activeConnection() const;
+    [[nodiscard]] int accountCount() const;
+
+    void setActiveConnection(Quotient::Connection *connection);
+    [[nodiscard]] Quotient::Connection *activeConnection() const;
 
     [[nodiscard]] PushRuleModel *pushRuleModel() const;
 
     /**
      * @brief Add a new connection to the account registry.
      */
-    void addConnection(NeoChatConnection *c);
+    void addConnection(Quotient::Connection *c);
 
     /**
      * @brief Drop a connection from the account registry.
      */
-    void dropConnection(NeoChatConnection *c);
+    void dropConnection(Quotient::Connection *c);
 
     int activeConnectionIndex() const;
 
+    [[nodiscard]] QString activeAccountLabel() const;
+    void setActiveAccountLabel(const QString &label);
+
     /**
      * @brief Save an access token to the keychain for the given account.
      */
     bool saveAccessTokenToKeyChain(const Quotient::AccountSettings &account, const QByteArray &accessToken);
 
+    /**
+     * @brief Change the password for an account.
+     *
+     * The function emits a passwordStatus signal with a PasswordStatus value when
+     * complete.
+     *
+     * @sa PasswordStatus, passwordStatus
+     */
+    Q_INVOKABLE void changePassword(Quotient::Connection *connection, const QString &currentPassword, const QString &newPassword);
+
+    /**
+     * @brief Change the avatar for an account.
+     */
+    Q_INVOKABLE bool setAvatar(Quotient::Connection *connection, const QUrl &avatarSource);
+
+    /**
+     * @brief Create new room for a group chat.
+     */
+    Q_INVOKABLE void createRoom(const QString &name, const QString &topic);
+
+    /**
+     * @brief Create new space.
+     */
+    Q_INVOKABLE void createSpace(const QString &name, const QString &topic);
+
     /**
      * @brief Join a room.
      */
@@ -131,7 +183,7 @@ public:
      *
      * If a direct chat with the user doesn't exist one is created and then joined.
      */
-    Q_INVOKABLE void openOrCreateDirectChat(Quotient::User *user);
+    Q_INVOKABLE void openOrCreateDirectChat(NeoChatUser *user);
 
     [[nodiscard]] bool supportSystemTray() const;
 
@@ -142,6 +194,8 @@ public:
 
     bool isOnline() const;
 
+    bool encryptionSupported() const;
+
     /**
      * @brief Sets the QNetworkProxy for the application.
      *
@@ -149,6 +203,8 @@ public:
      */
     Q_INVOKABLE void setApplicationProxy();
 
+    int quotientMinorVersion() const;
+
     bool isFlatpak() const;
 
     /**
@@ -172,12 +228,14 @@ public:
      */
     Q_INVOKABLE void forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item);
 
+    Q_INVOKABLE QVariantList getSupportedRoomVersions(Quotient::Connection *connection);
+
     Quotient::AccountRegistry &accounts();
 
 private:
     explicit Controller(QObject *parent = nullptr);
 
-    QPointer<NeoChatConnection> m_connection;
+    QPointer<Quotient::Connection> m_connection;
     TrayIcon *m_trayIcon = nullptr;
 
     QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const Quotient::AccountSettings &account);
@@ -194,7 +252,7 @@ private:
 
 private Q_SLOTS:
     void invokeLogin();
-    void toggleWindow();
+    void showWindow();
     void setQuitOnLastWindowClosed();
 
 Q_SIGNALS:
@@ -204,17 +262,42 @@ Q_SIGNALS:
     /// 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);
+    void activeAccountLabelChanged();
 
 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);
+};

src/delegatesizehelper.cpp

@@ -124,7 +124,7 @@ int DelegateSizeHelper::calculateCurrentPercentageWidth() const
     int maxPercentWidth = endPercentBigger ? m_endPercentWidth : m_startPercentWidth;
     int minPercentWidth = endPercentBigger ? m_startPercentWidth : m_endPercentWidth;
 
-    int calcPercentWidth = std::round(m * m_parentWidth + c);
+    int calcPercentWidth = std::ceil(m * m_parentWidth + c);
     return std::clamp(calcPercentWidth, minPercentWidth, maxPercentWidth);
 }
 
@@ -146,9 +146,9 @@ qreal DelegateSizeHelper::currentWidth() const
 
     qreal absoluteWidth = m_parentWidth * percentWidth * 0.01;
     if (m_maxWidth < 0.0) {
-        return std::round(absoluteWidth);
+        return std::ceil(absoluteWidth);
     } else {
-        return std::round(std::min(absoluteWidth, m_maxWidth));
+        return std::ceil(std::min(absoluteWidth, m_maxWidth));
     }
 }
 

src/delegatesizehelper.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 
 /**
  * @class DelegateSizeHelper
@@ -24,7 +23,6 @@
 class DelegateSizeHelper : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The width of the component's parent.

src/enums/delegatetype.h

@@ -1,46 +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 <QQmlEngine>
-
-/**
- * @class DelegateType
- *
- * This class is designed to define the DelegateType enumeration.
- */
-class DelegateType : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-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);
-};

src/eventhandler.h

@@ -1,414 +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 Whether the message is part of a thread.
-     *
-     * i.e. There is a rel_type of m.thread.
-     */
-    bool isThreaded() const;
-
-    /**
-     * @brief Return the Matrix ID of the thread's root message.
-     *
-     * Empty if this not part of a thread.
-     */
-    QString threadRoot() 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;
-};

src/events/imagepackevent.cpp

@@ -10,29 +10,29 @@ 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]),
+            fromJson<Omittable<QString>>(json["pack"].toObject()["display_name"]),
+            fromJson<Omittable<QUrl>>(json["pack"].toObject()["avatar_url"]),
+            fromJson<Omittable<QStringList>>(json["pack"].toObject()["usage"]),
+            fromJson<Omittable<QString>>(json["pack"].toObject()["attribution"]),
         };
     } else {
         pack = none;
     }
 
-    const auto &keys = json["images"_ls].toObject().keys();
+    const auto &keys = json["images"].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);
+        if (json["images"][k].toObject().contains(QStringLiteral("info"))) {
+            info = EventContent::ImageInfo(QUrl(json["images"][k]["url"].toString()), json["images"][k]["info"].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]),
+            fromJson<QUrl>(json["images"][k]["url"].toString()),
+            fromJson<Omittable<QString>>(json["images"][k]["body"]),
             info,
-            fromJson<Omittable<QStringList>>(json["images"_ls][k]["usage"_ls]),
+            fromJson<Omittable<QStringList>>(json["images"][k]["usage"]),
         };
     }
 }
@@ -42,20 +42,20 @@ void ImagePackEventContent::fillJson(QJsonObject *o) const
     if (pack) {
         QJsonObject packJson;
         if (pack->displayName) {
-            packJson["display_name"_ls] = *pack->displayName;
+            packJson["display_name"] = *pack->displayName;
         }
         if (pack->usage) {
             QJsonArray usageJson;
             for (const auto &usage : *pack->usage) {
                 usageJson += usage;
             }
-            packJson["usage"_ls] = usageJson;
+            packJson["usage"] = usageJson;
         }
         if (pack->avatarUrl) {
-            packJson["avatar_url"_ls] = pack->avatarUrl->toString();
+            packJson["avatar_url"] = pack->avatarUrl->toString();
         }
         if (pack->attribution) {
-            packJson["attribution"_ls] = *pack->attribution;
+            packJson["attribution"] = *pack->attribution;
         }
         (*o)["pack"_ls] = packJson;
     }
@@ -63,16 +63,16 @@ void ImagePackEventContent::fillJson(QJsonObject *o) const
     QJsonObject imagesJson;
     for (const auto &image : images) {
         QJsonObject imageJson;
-        imageJson["url"_ls] = image.url.toString();
+        imageJson["url"] = image.url.toString();
         if (image.body) {
-            imageJson["body"_ls] = *image.body;
+            imageJson["body"] = *image.body;
         }
         if (image.usage) {
             QJsonArray usageJson;
             for (const auto &usage : *image.usage) {
                 usageJson += usage;
             }
-            imageJson["usage"_ls] = usageJson;
+            imageJson["usage"] = usageJson;
         }
         imagesJson[image.shortcode] = imageJson;
     }

src/events/imagepackevent.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QList>
+#include <QVector>
 #include <Quotient/events/eventcontent.h>
 #include <Quotient/events/stateevent.h>
 
@@ -60,7 +60,7 @@ public:
      *
      * @sa ImagePackImage
      */
-    QList<ImagePackEventContent::ImagePackImage> images;
+    QVector<ImagePackEventContent::ImagePackImage> images;
 
     explicit ImagePackEventContent(const QJsonObject &o);
 

src/events/pollevent.cpp

@@ -12,12 +12,12 @@ PollStartEvent::PollStartEvent(const QJsonObject &obj)
 
 int PollStartEvent::maxSelections() const
 {
-    return contentJson()["org.matrix.msc3381.poll.start"_ls]["max_selections"_ls].toInt();
+    return contentJson()["org.matrix.msc3381.poll.start"]["max_selections"].toInt();
 }
 
 QString PollStartEvent::question() const
 {
-    return contentJson()["org.matrix.msc3381.poll.start"_ls]["question"_ls]["body"_ls].toString();
+    return contentJson()["org.matrix.msc3381.poll.start"]["question"]["body"].toString();
 }
 
 PollResponseEvent::PollResponseEvent(const QJsonObject &obj)
@@ -32,7 +32,7 @@ PollEndEvent::PollEndEvent(const QJsonObject &obj)
 
 PollResponseEvent::PollResponseEvent(const QString &pollStartEventId, QStringList responses)
     : RoomEvent(basicJson(TypeId,
-                          {{"org.matrix.msc3381.poll.response"_ls, QJsonObject{{"answers"_ls, QJsonArray::fromStringList(responses)}}},
-                           {"m.relates_to"_ls, QJsonObject{{"rel_type"_ls, "m.reference"_ls}, {"event_id"_ls, pollStartEventId}}}}))
+                          {{"org.matrix.msc3381.poll.response", QJsonObject{{"answers", QJsonArray::fromStringList(responses)}}},
+                           {"m.relates_to", QJsonObject{{"rel_type", "m.reference"}, {"event_id", pollStartEventId}}}}))
 {
 }

src/filetype.cpp

@@ -1,116 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Noah Davis <noahadvs@gmail.com>
-// SPDX-License-Identifier: LicenseRef-KDE-Accepted-LGPL
-
-#include "filetype.h"
-#include <QImageReader>
-#include <QMovie>
-
-static QStringList byteArrayListToStringList(const QByteArrayList &byteArrayList)
-{
-    QStringList stringList;
-    for (const QByteArray &byteArray : byteArrayList) {
-        stringList.append(QString::fromLocal8Bit(byteArray));
-    }
-    return stringList;
-}
-
-class FileTypePrivate
-{
-    Q_DECLARE_PUBLIC(FileType)
-    Q_DISABLE_COPY(FileTypePrivate)
-public:
-    FileTypePrivate(FileType *qq);
-    FileType *const q_ptr;
-    QMimeDatabase mimetypeDatabase;
-    QStringList supportedImageFormats = byteArrayListToStringList(QImageReader::supportedImageFormats());
-    QStringList supportedAnimatedImageFormats = byteArrayListToStringList(QMovie::supportedFormats());
-};
-
-FileTypePrivate::FileTypePrivate(FileType *qq)
-    : q_ptr(qq)
-{
-}
-
-FileType::FileType(QObject *parent)
-    : QObject(parent)
-    , d_ptr(new FileTypePrivate(this))
-{
-}
-
-FileType::~FileType() noexcept
-{
-}
-
-QMimeType FileType::mimeTypeForName(const QString &nameOrAlias) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypeForName(nameOrAlias);
-}
-
-QMimeType FileType::mimeTypeForFile(const QString &fileName, MatchMode mode) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypeForFile(fileName, static_cast<QMimeDatabase::MatchMode>(mode));
-}
-
-QMimeType FileType::mimeTypeForFile(const QFileInfo &fileInfo, MatchMode mode) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypeForFile(fileInfo, static_cast<QMimeDatabase::MatchMode>(mode));
-}
-
-QList<QMimeType> FileType::mimeTypesForFileName(const QString &fileName) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypesForFileName(fileName);
-}
-
-QMimeType FileType::mimeTypeForData(const QByteArray &data) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypeForData(data);
-}
-
-QMimeType FileType::mimeTypeForData(QIODevice *device) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypeForData(device);
-}
-
-QMimeType FileType::mimeTypeForUrl(const QUrl &url) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypeForUrl(url);
-}
-
-QMimeType FileType::mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypeForFileNameAndData(fileName, device);
-}
-
-QMimeType FileType::mimeTypeForFileNameAndData(const QString &fileName, const QByteArray &data) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypeForFileNameAndData(fileName, data);
-}
-
-QString FileType::suffixForFileName(const QString &fileName) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.suffixForFileName(fileName);
-}
-
-QStringList FileType::supportedImageFormats() const
-{
-    Q_D(const FileType);
-    return d->supportedImageFormats;
-}
-
-QStringList FileType::supportedAnimatedImageFormats() const
-{
-    Q_D(const FileType);
-    return d->supportedAnimatedImageFormats;
-}
-
-#include "moc_filetype.cpp"

src/filetypesingleton.cpp

@@ -0,0 +1,116 @@
+// SPDX-FileCopyrightText: 2021 Noah Davis <noahadvs@gmail.com>
+// SPDX-License-Identifier: LicenseRef-KDE-Accepted-LGPL
+
+#include "filetypesingleton.h"
+#include <QImageReader>
+#include <QMovie>
+
+static QStringList byteArrayListToStringList(const QByteArrayList &byteArrayList)
+{
+    QStringList stringList;
+    for (const QByteArray &byteArray : byteArrayList) {
+        stringList.append(QString::fromLocal8Bit(byteArray));
+    }
+    return stringList;
+}
+
+class FileTypeSingletonPrivate
+{
+    Q_DECLARE_PUBLIC(FileTypeSingleton)
+    Q_DISABLE_COPY(FileTypeSingletonPrivate)
+public:
+    FileTypeSingletonPrivate(FileTypeSingleton *qq);
+    FileTypeSingleton *const q_ptr;
+    QMimeDatabase mimetypeDatabase;
+    QStringList supportedImageFormats = byteArrayListToStringList(QImageReader::supportedImageFormats());
+    QStringList supportedAnimatedImageFormats = byteArrayListToStringList(QMovie::supportedFormats());
+};
+
+FileTypeSingletonPrivate::FileTypeSingletonPrivate(FileTypeSingleton *qq)
+    : q_ptr(qq)
+{
+}
+
+FileTypeSingleton::FileTypeSingleton(QObject *parent)
+    : QObject(parent)
+    , d_ptr(new FileTypeSingletonPrivate(this))
+{
+}
+
+FileTypeSingleton::~FileTypeSingleton() noexcept
+{
+}
+
+QMimeType FileTypeSingleton::mimeTypeForName(const QString &nameOrAlias) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypeForName(nameOrAlias);
+}
+
+QMimeType FileTypeSingleton::mimeTypeForFile(const QString &fileName, MatchMode mode) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypeForFile(fileName, static_cast<QMimeDatabase::MatchMode>(mode));
+}
+
+QMimeType FileTypeSingleton::mimeTypeForFile(const QFileInfo &fileInfo, MatchMode mode) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypeForFile(fileInfo, static_cast<QMimeDatabase::MatchMode>(mode));
+}
+
+QList<QMimeType> FileTypeSingleton::mimeTypesForFileName(const QString &fileName) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypesForFileName(fileName);
+}
+
+QMimeType FileTypeSingleton::mimeTypeForData(const QByteArray &data) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypeForData(data);
+}
+
+QMimeType FileTypeSingleton::mimeTypeForData(QIODevice *device) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypeForData(device);
+}
+
+QMimeType FileTypeSingleton::mimeTypeForUrl(const QUrl &url) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypeForUrl(url);
+}
+
+QMimeType FileTypeSingleton::mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypeForFileNameAndData(fileName, device);
+}
+
+QMimeType FileTypeSingleton::mimeTypeForFileNameAndData(const QString &fileName, const QByteArray &data) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypeForFileNameAndData(fileName, data);
+}
+
+QString FileTypeSingleton::suffixForFileName(const QString &fileName) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.suffixForFileName(fileName);
+}
+
+QStringList FileTypeSingleton::supportedImageFormats() const
+{
+    Q_D(const FileTypeSingleton);
+    return d->supportedImageFormats;
+}
+
+QStringList FileTypeSingleton::supportedAnimatedImageFormats() const
+{
+    Q_D(const FileTypeSingleton);
+    return d->supportedAnimatedImageFormats;
+}
+
+#include "moc_filetypesingleton.cpp"

src/filetypesingleton.h

@@ -8,10 +8,9 @@
 #include <QFileInfo>
 #include <QMimeDatabase>
 #include <QObject>
-#include <QQmlEngine>
 #include <qqml.h>
 
-class FileTypePrivate;
+class FileTypeSingletonPrivate;
 
 /**
  * @class FileTypeSingleton
@@ -20,11 +19,9 @@ class FileTypePrivate;
  *
  * @sa QMimeDatabase
  */
-class FileType : public QObject
+class FileTypeSingleton : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
 
     /**
      * @brief List of supported image formats.
@@ -40,9 +37,12 @@ class FileType : public QObject
      */
     Q_PROPERTY(QStringList supportedAnimatedImageFormats READ supportedAnimatedImageFormats CONSTANT FINAL)
 
+    QML_NAMED_ELEMENT(FileType)
+    QML_SINGLETON
+
 public:
-    explicit FileType(QObject *parent = nullptr);
-    ~FileType();
+    explicit FileTypeSingleton(QObject *parent = nullptr);
+    ~FileTypeSingleton();
 
     /**
      * @brief Returns a MIME type for nameOrAlias or an invalid one if none found.
@@ -59,14 +59,14 @@ public:
      *
      * @sa QMimeDatabase
      */
-    Q_INVOKABLE QMimeType mimeTypeForFile(const QString &fileName, FileType::MatchMode mode = MatchDefault) const;
+    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, FileType::MatchMode mode = MatchDefault) const;
+    Q_INVOKABLE QMimeType mimeTypeForFile(const QFileInfo &fileInfo, FileTypeSingleton::MatchMode mode = MatchDefault) const;
 
     /**
      * @brief Returns the MIME types for the file name fileName.
@@ -121,7 +121,9 @@ public:
     QStringList supportedAnimatedImageFormats() const;
 
 private:
-    const QScopedPointer<FileTypePrivate> d_ptr;
-    Q_DECLARE_PRIVATE(FileType)
-    Q_DISABLE_COPY(FileType)
+    const QScopedPointer<FileTypeSingletonPrivate> d_ptr;
+    Q_DECLARE_PRIVATE(FileTypeSingleton)
+    Q_DISABLE_COPY(FileTypeSingleton)
 };
+
+QML_DECLARE_TYPE(FileTypeSingleton)

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

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

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

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

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

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

src/linkpreviewer.cpp

@@ -8,22 +8,17 @@
 #include <Quotient/connection.h>
 #include <Quotient/csapi/content-repo.h>
 
-#include "neochatconfig.h"
 #include "neochatroom.h"
 
 using namespace Quotient;
 
-LinkPreviewer::LinkPreviewer(QObject *parent, const NeoChatRoom *room, const QUrl &url)
+LinkPreviewer::LinkPreviewer(QObject *parent, NeoChatRoom *room, const QUrl &url)
     : 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
@@ -62,22 +57,19 @@ void LinkPreviewer::setUrl(QUrl url)
 
 void LinkPreviewer::loadUrlPreview()
 {
-    if (!m_currentRoom || !NeoChatConfig::showLinkPreview() || !m_currentRoom->urlPreviewEnabled()) {
-        return;
-    }
     if (m_url.scheme() == QStringLiteral("https")) {
         m_loaded = false;
         Q_EMIT loadedChanged();
 
         auto conn = m_currentRoom->connection();
-        GetUrlPreviewJob *job = conn->callApi<GetUrlPreviewJob>(m_url);
+        GetUrlPreviewJob *job = conn->callApi<GetUrlPreviewJob>(m_url.toString());
 
         connect(job, &BaseJob::success, this, [this, job, conn]() {
             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);
+            m_title = json["og:title"].toString().trimmed();
+            m_description = json["og:description"].toString().trimmed().replace("\n", " ");
 
-            auto imageUrl = QUrl(json["og:image"_ls].toString());
+            auto imageUrl = QUrl(json["og:image"].toString());
             if (imageUrl.isValid() && imageUrl.scheme() == QStringLiteral("mxc")) {
                 m_imageSource = conn->makeMediaUrl(imageUrl);
             } else {
@@ -93,9 +85,4 @@ void LinkPreviewer::loadUrlPreview()
     }
 }
 
-bool LinkPreviewer::empty() const
-{
-    return m_url.isEmpty();
-}
-
 #include "moc_linkpreviewer.cpp"

src/linkpreviewer.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 #include <QUrl>
 
 class NeoChatRoom;
@@ -20,8 +19,6 @@ class NeoChatRoom;
 class LinkPreviewer : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-
     /**
      * @brief The URL to get the preview for.
      */
@@ -47,15 +44,8 @@ class LinkPreviewer : public QObject
      */
     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, NeoChatRoom *room = nullptr, const QUrl &url = {});
 
     [[nodiscard]] QUrl url() const;
     void setUrl(QUrl);
@@ -63,10 +53,9 @@ public:
     [[nodiscard]] QString title() const;
     [[nodiscard]] QString description() const;
     [[nodiscard]] QUrl imageSource() const;
-    [[nodiscard]] bool empty() const;
 
 private:
-    const NeoChatRoom *m_currentRoom = nullptr;
+    NeoChatRoom *m_currentRoom = nullptr;
 
     bool m_loaded;
     QString m_title = QString();
@@ -82,6 +71,5 @@ Q_SIGNALS:
     void descriptionChanged();
     void imageSourceChanged();
     void urlChanged();
-    void emptyChanged();
 };
 Q_DECLARE_METATYPE(LinkPreviewer *)

src/locationhelper.h

@@ -2,18 +2,14 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 #pragma once
 
+#include "linkpreviewer.h"
 #include <QMetaType>
-#include <QObject>
-#include <QQmlEngine>
 #include <QRectF>
 
 /** Location related helper functions for QML. */
-class LocationHelper : public QObject
+class LocationHelper
 {
-    Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
-
+    Q_GADGET
 public:
     /** Unite two rectanlges. */
     Q_INVOKABLE static QRectF unite(const QRectF &r1, const QRectF &r2);

src/logger.cpp

@@ -87,32 +87,32 @@ public:
         QMutexLocker locker(&mutex);
         QByteArray buf;
         QTextStream str(&buf);
-        str << QDateTime::currentDateTime().toString(Qt::ISODate) << QStringLiteral(" [");
+        str << QDateTime::currentDateTime().toString(Qt::ISODate) << " [";
         switch (type) {
         case QtDebugMsg:
-            str << QStringLiteral("DEBUG");
+            str << "DEBUG";
             break;
         case QtInfoMsg:
-            str << QStringLiteral("INFO ");
+            str << "INFO ";
             break;
         case QtWarningMsg:
-            str << QStringLiteral("WARN ");
+            str << "WARN ";
             break;
         case QtFatalMsg:
-            str << QStringLiteral("FATAL");
+            str << "FATAL";
             break;
         case QtCriticalMsg:
-            str << QStringLiteral("CRITICAL");
+            str << "CRITICAL";
             break;
         }
-        str << QStringLiteral("] ") << context.category << QStringLiteral(": ");
+        str << "] " << context.category << ": ";
         if (context.file && *context.file && context.line) {
-            str << context.file << QStringLiteral(":") << context.line << QStringLiteral(": ");
+            str << context.file << ":" << context.line << ": ";
         }
         if (context.function && *context.function) {
-            str << context.function << QStringLiteral(": ");
+            str << context.function << ": ";
         }
-        str << message << QStringLiteral("\n");
+        str << message << "\n";
         str.flush();
         file.write(buf.constData(), buf.size());
         file.flush();
@@ -129,18 +129,18 @@ public:
         if (file.isOpen()) {
             file.close();
         }
-        const auto &filePath = QStringLiteral("%1%2%3").arg(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation), QDir::separator(), appName);
+        auto filePath = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QDir::separator() + appName;
 
         QDir dir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QDir::separator());
         auto entryList = dir.entryList({appName + QStringLiteral(".*")});
         std::sort(entryList.begin(), entryList.end(), [](const auto &left, const auto &right) {
-            auto leftIndex = left.split(QStringLiteral(".")).last().toInt();
-            auto rightIndex = right.split(QStringLiteral(".")).last().toInt();
+            auto leftIndex = left.split(".").last().toInt();
+            auto rightIndex = right.split(".").last().toInt();
             return leftIndex > rightIndex;
         });
         for (const auto &entry : entryList) {
             bool ok = false;
-            const auto index = entry.split(QStringLiteral(".")).last().toInt(&ok);
+            const auto index = entry.split(".").last().toInt(&ok);
             if (!ok) {
                 continue;
             }
@@ -151,8 +151,8 @@ public:
                     file.remove();
                     continue;
                 }
-                const auto &newName = QStringLiteral("%1.%2").arg(filePath, QString::number(index + 1));
-                const auto success = file.copy(newName);
+                const QString newName = filePath + QStringLiteral(".%1").arg(index + 1);
+                const bool success = file.copy(newName);
                 if (success) {
                     file.remove();
                 } else {
@@ -212,11 +212,11 @@ void filter(QLoggingCategory *category)
 
 void initLogging()
 {
-    e2eeDebugEnabled = QLoggingCategory("quotient.e2ee", QtInfoMsg).isEnabled(QtDebugMsg);
+    e2eeDebugEnabled = QLoggingCategory("quotient.e2ee", QtDebugMsg).isEnabled(QtDebugMsg);
     oldCategoryFilter = QLoggingCategory::installFilter(filter);
     oldHandler = qInstallMessageHandler(messageHandler);
     sInstance->setOrigHandler(oldHandler);
-    sInstance->setName(QStringLiteral("neochat.log"));
+    sInstance->setName("neochat.log");
 }
 
 #include "logger.moc"

src/login.cpp

@@ -13,16 +13,16 @@
 
 using namespace Quotient;
 
-LoginHelper::LoginHelper(QObject *parent)
+Login::Login(QObject *parent)
     : QObject(parent)
 {
     init();
 }
 
-void LoginHelper::init()
+void Login::init()
 {
     m_homeserverReachable = false;
-    m_connection = new NeoChatConnection();
+    m_connection = new Connection();
     m_matrixId = QString();
     m_password = QString();
     m_deviceName = QStringLiteral("NeoChat %1 %2 %3 %4")
@@ -31,14 +31,14 @@ void LoginHelper::init()
     m_supportsPassword = false;
     m_ssoUrl = QUrl();
 
-    connect(this, &LoginHelper::matrixIdChanged, this, [this]() {
+    connect(this, &Login::matrixIdChanged, this, [this]() {
         setHomeserverReachable(false);
-        QRegularExpression validator(QStringLiteral("^\\@?[a-zA-Z0-9\\._=\\-/]+\\:[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)*(\\:[0-9]+)?$"));
+        QRegularExpression validator("^\\@?[a-zA-Z0-9\\._=\\-/]+\\:[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)*(\\:[0-9]+)?$");
         if (!validator.match(m_matrixId).hasMatch()) {
             return;
         }
 
-        if (m_matrixId == QLatin1Char('@')) {
+        if (m_matrixId == "@") {
             return;
         }
 
@@ -51,7 +51,7 @@ void LoginHelper::init()
         m_testing = true;
         Q_EMIT testingChanged();
         if (!m_connection) {
-            m_connection = new NeoChatConnection();
+            m_connection = new Connection();
         }
         m_connection->resolveServer(m_matrixId);
         connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [this]() {
@@ -87,11 +87,7 @@ void LoginHelper::init()
         Q_EMIT isLoggingInChanged();
     });
     connect(m_connection, &Connection::loginError, this, [this](QString error, const QString &) {
-        if (error == QStringLiteral("Invalid username or password")) {
-            setInvalidPassword(true);
-        } else {
-            Q_EMIT errorOccured(i18n("Login Failed: %1", error));
-        }
+        Q_EMIT errorOccured(i18n("Login Failed: %1", error));
         m_isLoggingIn = false;
         Q_EMIT isLoggingInChanged();
     });
@@ -105,81 +101,80 @@ void LoginHelper::init()
     });
 }
 
-void LoginHelper::setHomeserverReachable(bool reachable)
+void Login::setHomeserverReachable(bool reachable)
 {
     m_homeserverReachable = reachable;
     Q_EMIT homeserverReachableChanged();
 }
 
-bool LoginHelper::homeserverReachable() const
+bool Login::homeserverReachable() const
 {
     return m_homeserverReachable;
 }
 
-QString LoginHelper::matrixId() const
+QString Login::matrixId() const
 {
     return m_matrixId;
 }
 
-void LoginHelper::setMatrixId(const QString &matrixId)
+void Login::setMatrixId(const QString &matrixId)
 {
     m_matrixId = matrixId;
-    if (!m_matrixId.startsWith(QLatin1Char('@'))) {
-        m_matrixId.prepend(QLatin1Char('@'));
+    if (!m_matrixId.startsWith('@')) {
+        m_matrixId.prepend('@');
     }
     Q_EMIT matrixIdChanged();
 }
 
-QString LoginHelper::password() const
+QString Login::password() const
 {
     return m_password;
 }
 
-void LoginHelper::setPassword(const QString &password)
+void Login::setPassword(const QString &password)
 {
-    setInvalidPassword(false);
     m_password = password;
     Q_EMIT passwordChanged();
 }
 
-QString LoginHelper::deviceName() const
+QString Login::deviceName() const
 {
     return m_deviceName;
 }
 
-void LoginHelper::setDeviceName(const QString &deviceName)
+void Login::setDeviceName(const QString &deviceName)
 {
     m_deviceName = deviceName;
     Q_EMIT deviceNameChanged();
 }
 
-void LoginHelper::login()
+void Login::login()
 {
     m_isLoggingIn = true;
     Q_EMIT isLoggingInChanged();
 
     // Some servers do not have a .well_known file. So we login via the username part from the mxid,
     // rather than with the full mxid, as that would lead to an invalid user.
-    auto username = m_matrixId.mid(1, m_matrixId.indexOf(QLatin1Char(':')) - 1);
+    auto username = m_matrixId.mid(1, m_matrixId.indexOf(":") - 1);
     m_connection->loginWithPassword(username, m_password, m_deviceName, QString());
 }
 
-bool LoginHelper::supportsPassword() const
+bool Login::supportsPassword() const
 {
     return m_supportsPassword;
 }
 
-bool LoginHelper::supportsSso() const
+bool Login::supportsSso() const
 {
     return m_supportsSso;
 }
 
-QUrl LoginHelper::ssoUrl() const
+QUrl Login::ssoUrl() const
 {
     return m_ssoUrl;
 }
 
-void LoginHelper::loginWithSso()
+void Login::loginWithSso()
 {
     m_connection->resolveServer(m_matrixId);
     connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [this]() {
@@ -189,30 +184,19 @@ void LoginHelper::loginWithSso()
     });
 }
 
-bool LoginHelper::testing() const
+bool Login::testing() const
 {
     return m_testing;
 }
 
-bool LoginHelper::isLoggingIn() const
+bool Login::isLoggingIn() const
 {
     return m_isLoggingIn;
 }
 
-bool LoginHelper::isLoggedIn() const
+bool Login::isLoggedIn() const
 {
     return m_isLoggedIn;
 }
 
-void LoginHelper::setInvalidPassword(bool invalid)
-{
-    m_invalidPassword = invalid;
-    Q_EMIT isInvalidPasswordChanged();
-}
-
-bool LoginHelper::isInvalidPassword() const
-{
-    return m_invalidPassword;
-}
-
 #include "moc_login.cpp"

src/login.h

@@ -4,21 +4,21 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 #include <QUrl>
 
-class NeoChatConnection;
+namespace Quotient
+{
+class Connection;
+}
 
 /**
- * @class LoginHelper
+ * @class Login
  *
  * A helper class for logging into a Matrix account.
  */
-class LoginHelper : public QObject
+class Login : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
 
     /**
      * @brief Whether the home server for the account is reachable.
@@ -73,13 +73,8 @@ class LoginHelper : public QObject
      */
     Q_PROPERTY(bool isLoggedIn READ isLoggedIn NOTIFY isLoggedInChanged)
 
-    /**
-     * @brief Whether the password (or the username) is invalid.
-     */
-    Q_PROPERTY(bool isInvalidPassword READ isInvalidPassword NOTIFY isInvalidPasswordChanged)
-
 public:
-    explicit LoginHelper(QObject *parent = nullptr);
+    explicit Login(QObject *parent = nullptr);
 
     Q_INVOKABLE void init();
 
@@ -105,9 +100,6 @@ public:
 
     bool isLoggedIn() const;
 
-    bool isInvalidPassword() const;
-    void setInvalidPassword(bool invalid);
-
     Q_INVOKABLE void login();
     Q_INVOKABLE void loginWithSso();
 
@@ -124,7 +116,6 @@ Q_SIGNALS:
     void testingChanged();
     void isLoggingInChanged();
     void isLoggedInChanged();
-    void isInvalidPasswordChanged();
 
 private:
     void setHomeserverReachable(bool reachable);
@@ -135,10 +126,9 @@ private:
     QString m_deviceName;
     bool m_supportsSso = false;
     bool m_supportsPassword = false;
-    NeoChatConnection *m_connection = nullptr;
+    Quotient::Connection *m_connection = nullptr;
     QUrl m_ssoUrl;
     bool m_testing = false;
     bool m_isLoggingIn = false;
     bool m_isLoggedIn = false;
-    bool m_invalidPassword = false;
 };

src/main.cpp

@@ -3,9 +3,7 @@
 
 #include <QCommandLineParser>
 #include <QIcon>
-#include <QNetworkDiskCache>
 #include <QNetworkProxyFactory>
-#include <QObject>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <QQmlNetworkAccessManagerFactory>
@@ -18,10 +16,6 @@
 #include <QApplication>
 #endif
 
-#ifdef HAVE_WEBVIEW
-#include <QtWebView>
-#endif
-
 #include <KAboutData>
 #ifdef HAVE_KDBUSADDONS
 #include <KDBusService>
@@ -34,20 +28,67 @@
 
 #include "neochat-version.h"
 
+#include <Quotient/keyverificationsession.h>
+#include <Quotient/accountregistry.h>
 #include <Quotient/networkaccessmanager.h>
+#include <Quotient/room.h>
 #include <Quotient/util.h>
 
+#include "actionshandler.h"
 #include "blurhashimageprovider.h"
+#include "chatdocumenthandler.h"
+#include "clipboard.h"
 #include "controller.h"
+#include "delegatesizehelper.h"
+#include "filetypesingleton.h"
+#include "linkpreviewer.h"
+#include "locationhelper.h"
 #include "logger.h"
+#include "login.h"
 #include "matriximageprovider.h"
+#include "models/accountemoticonmodel.h"
+#include "models/collapsestateproxymodel.h"
+#include "models/customemojimodel.h"
+#include "models/devicesmodel.h"
+#include "models/devicesproxymodel.h"
+#include "models/emojimodel.h"
+#include "models/emoticonfiltermodel.h"
+#include "models/imagepacksmodel.h"
+#include "models/livelocationsmodel.h"
+#include "models/locationsmodel.h"
+#include "models/mediamessagefiltermodel.h"
+#include "models/messageeventmodel.h"
+#include "models/messagefiltermodel.h"
+#include "models/publicroomlistmodel.h"
+#include "models/pushrulemodel.h"
+#include "models/reactionmodel.h"
+#include "models/roomlistmodel.h"
+#include "models/searchmodel.h"
+#include "models/serverlistmodel.h"
+#include "models/sortfilterroomlistmodel.h"
+#include "models/sortfilterspacelistmodel.h"
+#include "models/statefiltermodel.h"
+#include "models/stickermodel.h"
+#include "models/userdirectorylistmodel.h"
+#include "models/userfiltermodel.h"
+#include "models/userlistmodel.h"
+#include "models/webshortcutmodel.h"
 #include "neochatconfig.h"
+#include "neochatroom.h"
+#include "neochatuser.h"
+#include "notificationsmanager.h"
+#include "pollhandler.h"
 #include "roommanager.h"
+#include "spacehierarchycache.h"
+#include "urlhelper.h"
 #include "windowcontroller.h"
 
 #ifdef HAVE_COLORSCHEME
 #include "colorschemer.h"
 #endif
+#include "models/completionmodel.h"
+#include "models/statemodel.h"
+#include "neochatuser.h"
 
 #ifdef HAVE_RUNNER
 #include "runner.h"
@@ -60,23 +101,11 @@
 
 using namespace Quotient;
 
-void qml_register_types_org_kde_neochat();
-
 class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
 {
     QNetworkAccessManager *create(QObject *) override
     {
-        auto nam = NetworkAccessManager::instance();
-        nam->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
-
-        nam->enableStrictTransportSecurityStore(true, QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1String("/hsts/"));
-        nam->setStrictTransportSecurityEnabled(true);
-
-        auto namDiskCache = new QNetworkDiskCache(nam);
-        namDiskCache->setCacheDirectory(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1String("/nam/"));
-        nam->setCache(namDiskCache);
-
-        return nam;
+        return NetworkAccessManager::instance();
     }
 };
 
@@ -93,19 +122,17 @@ Q_DECL_EXPORT
 #endif
 int main(int argc, char *argv[])
 {
-    QNetworkProxyFactory::setUseSystemConfiguration(true);
-
-#ifdef HAVE_WEBVIEW
-    QtWebView::initialize();
-    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
-    QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 #endif
 
+    QNetworkProxyFactory::setUseSystemConfiguration(true);
+
 #ifdef Q_OS_ANDROID
     QGuiApplication app(argc, argv);
     QQuickStyle::setStyle(QStringLiteral("org.kde.breeze"));
 #else
-    QIcon::setFallbackThemeName("breeze"_ls);
+    QIcon::setFallbackThemeName("breeze");
     QApplication app(argc, argv);
     // Default to org.kde.desktop style unless the user forces another style
     if (qEnvironmentVariableIsEmpty("QT_QUICK_CONTROLS_STYLE")) {
@@ -127,7 +154,7 @@ int main(int argc, char *argv[])
 #endif
     KLocalizedString::setApplicationDomain("neochat");
 
-    QGuiApplication::setOrganizationName("KDE"_ls);
+    QGuiApplication::setOrganizationName("KDE");
 
     KAboutData about(QStringLiteral("neochat"),
                      i18n("NeoChat"),
@@ -158,28 +185,111 @@ int main(int argc, char *argv[])
     initLogging();
 
 #if Quotient_VERSION_MINOR == 8
+#ifdef Quotient_E2EE_ENABLED
     Connection::setEncryptionDefault(true);
 #endif
+#endif
 
 #ifdef NEOCHAT_FLATPAK
     // Copy over the included FontConfig configuration to the
     // app's config dir:
-    QFile::copy(QStringLiteral("/app/etc/fonts/conf.d/99-noto-mono-color-emoji.conf"),
-                QStringLiteral("/var/config/fontconfig/conf.d/99-noto-mono-color-emoji.conf"));
+    QFile::copy("/app/etc/fonts/conf.d/99-noto-mono-color-emoji.conf", "/var/config/fontconfig/conf.d/99-noto-mono-color-emoji.conf");
 #endif
 
+    Clipboard clipboard;
+    auto config = NeoChatConfig::self();
+    FileTypeSingleton fileTypeSingleton;
+
+    Login *login = new Login();
+    UrlHelper urlHelper;
+
 #ifdef HAVE_COLORSCHEME
     ColorSchemer colorScheme;
-    if (!NeoChatConfig::self()->colorScheme().isEmpty()) {
-        colorScheme.apply(NeoChatConfig::self()->colorScheme());
+    qmlRegisterSingletonInstance<ColorSchemer>("org.kde.neochat", 1, 0, "ColorSchemer", &colorScheme);
+    if (!config->colorScheme().isEmpty()) {
+        colorScheme.apply(config->colorScheme());
     }
 #endif
 
-    qml_register_types_org_kde_neochat();
-    qmlRegisterSingletonInstance("org.kde.neochat.config", 1, 0, "Config", NeoChatConfig::self());
-    qmlRegisterSingletonInstance("org.kde.neochat.accounts", 1, 0, "AccountRegistry", &Controller::instance().accounts());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Controller", &Controller::instance());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "NotificationsManager", &NotificationsManager::instance());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Clipboard", &clipboard);
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Config", config);
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "RoomManager", &RoomManager::instance());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "FileType", &fileTypeSingleton);
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "LoginHelper", login);
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "UrlHelper", &urlHelper);
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "EmojiModel", &EmojiModel::instance());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "AccountRegistry", &Controller::instance().accounts());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "SpaceHierarchyCache", &SpaceHierarchyCache::instance());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "CustomEmojiModel", &CustomEmojiModel::instance());
+    qmlRegisterType<ActionsHandler>("org.kde.neochat", 1, 0, "ActionsHandler");
+    qmlRegisterType<ChatDocumentHandler>("org.kde.neochat", 1, 0, "ChatDocumentHandler");
+    qmlRegisterType<RoomListModel>("org.kde.neochat", 1, 0, "RoomListModel");
+    qmlRegisterType<KWebShortcutModel>("org.kde.neochat", 1, 0, "WebShortcutModel");
+    qmlRegisterType<UserListModel>("org.kde.neochat", 1, 0, "UserListModel");
+    qmlRegisterType<MessageEventModel>("org.kde.neochat", 1, 0, "MessageEventModel");
+    qmlRegisterType<ReactionModel>("org.kde.neochat", 1, 0, "ReactionModel");
+    qmlRegisterType<CollapseStateProxyModel>("org.kde.neochat", 1, 0, "CollapseStateProxyModel");
+    qmlRegisterType<MediaMessageFilterModel>("org.kde.neochat", 1, 0, "MediaMessageFilterModel");
+    qmlRegisterType<MessageFilterModel>("org.kde.neochat", 1, 0, "MessageFilterModel");
+    qmlRegisterType<UserFilterModel>("org.kde.neochat", 1, 0, "UserFilterModel");
+    qmlRegisterType<PublicRoomListModel>("org.kde.neochat", 1, 0, "PublicRoomListModel");
+    qmlRegisterType<UserDirectoryListModel>("org.kde.neochat", 1, 0, "UserDirectoryListModel");
+    qmlRegisterType<ServerListModel>("org.kde.neochat", 1, 0, "ServerListModel");
+    qmlRegisterType<SortFilterRoomListModel>("org.kde.neochat", 1, 0, "SortFilterRoomListModel");
+    qmlRegisterType<SortFilterSpaceListModel>("org.kde.neochat", 1, 0, "SortFilterSpaceListModel");
+    qmlRegisterType<DevicesModel>("org.kde.neochat", 1, 0, "DevicesModel");
+    qmlRegisterType<DevicesProxyModel>("org.kde.neochat", 1, 0, "DevicesProxyModel");
+    qmlRegisterType<LinkPreviewer>("org.kde.neochat", 1, 0, "LinkPreviewer");
+    qmlRegisterType<CompletionModel>("org.kde.neochat", 1, 0, "CompletionModel");
+    qmlRegisterType<StateModel>("org.kde.neochat", 1, 0, "StateModel");
+    qmlRegisterType<StateFilterModel>("org.kde.neochat", 1, 0, "StateFilterModel");
+    qmlRegisterType<SearchModel>("org.kde.neochat", 1, 0, "SearchModel");
+    qmlRegisterType<LiveLocationsModel>("org.kde.neochat", 1, 0, "LiveLocationsModel");
+    qmlRegisterType<LocationsModel>("org.kde.neochat", 1, 0, "LocationsModel");
+    qmlRegisterType<PollHandler>("org.kde.neochat", 1, 0, "PollHandler");
+    qmlRegisterType<PushRuleModel>("org.kde.neochat", 1, 0, "PushRuleModel");
+    qmlRegisterType<StickerModel>("org.kde.neochat", 1, 0, "StickerModel");
+    qmlRegisterType<ImagePacksModel>("org.kde.neochat", 1, 0, "ImagePacksModel");
+    qmlRegisterType<AccountEmoticonModel>("org.kde.neochat", 1, 0, "AccountEmoticonModel");
+    qmlRegisterType<EmoticonFilterModel>("org.kde.neochat", 1, 0, "EmoticonFilterModel");
+    qmlRegisterType<DelegateSizeHelper>("org.kde.neochat", 1, 0, "DelegateSizeHelper");
+    qmlRegisterUncreatableType<RoomMessageEvent>("org.kde.neochat", 1, 0, "RoomMessageEvent", "ENUM");
+    qmlRegisterUncreatableType<PushNotificationKind>("org.kde.neochat", 1, 0, "PushNotificationKind", "ENUM");
+    qmlRegisterUncreatableType<PushNotificationSection>("org.kde.neochat", 1, 0, "PushNotificationSection", "ENUM");
+    qmlRegisterUncreatableType<PushNotificationState>("org.kde.neochat", 1, 0, "PushNotificationState", "ENUM");
+    qmlRegisterUncreatableType<PushNotificationAction>("org.kde.neochat", 1, 0, "PushNotificationAction", "ENUM");
+    qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM");
+    qmlRegisterUncreatableType<NeoChatUser>("org.kde.neochat", 1, 0, "NeoChatUser", {});
+    qmlRegisterUncreatableType<NeoChatRoom>("org.kde.neochat", 1, 0, "NeoChatRoom", {});
 
-    qmlRegisterUncreatableType<KeyVerificationSession>("com.github.quotient_im.libquotient", 1, 0, "KeyVerificationSession", {});
+    qRegisterMetaType<User *>("User*");
+    qRegisterMetaType<User *>("const User*");
+    qRegisterMetaType<User *>("const Quotient::User*");
+    qRegisterMetaType<Room *>("Room*");
+    qRegisterMetaType<Connection *>("Connection*");
+    qRegisterMetaType<MessageEventType>("MessageEventType");
+    qRegisterMetaType<NeoChatRoom *>("NeoChatRoom*");
+    qRegisterMetaType<NeoChatUser *>("NeoChatUser*");
+    qRegisterMetaType<GetRoomEventsJob *>("GetRoomEventsJob*");
+    qRegisterMetaType<QMimeType>("QMimeType");
+#ifdef Quotient_E2EE_ENABLED
+    qRegisterMetaType<KeyVerificationSession *>("KeyVerificationSession*");
+    qmlRegisterUncreatableType<KeyVerificationSession>("org.kde.neochat", 1, 0, "KeyVerificationSession", {});
+    qRegisterMetaType<QVector<EmojiEntry>>("QVector<EmojiEntry>");
+#endif
+    qmlRegisterSingletonType("org.kde.neochat", 1, 0, "About", [](QQmlEngine *engine, QJSEngine *) -> QJSValue {
+        return engine->toScriptValue(KAboutData::applicationData());
+    });
+    qmlRegisterSingletonType(QUrl("qrc:/OsmLocationPlugin.qml"), "org.kde.neochat", 1, 0, "OsmLocationPlugin");
+    qmlRegisterSingletonType("org.kde.neochat", 1, 0, "LocationHelper", [](QQmlEngine *engine, QJSEngine *) -> QJSValue {
+        return engine->toScriptValue(LocationHelper());
+    });
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    qRegisterMetaTypeStreamOperators<Emoji>();
+#endif
 
     QQmlApplicationEngine engine;
 
@@ -215,33 +325,26 @@ int main(int argc, char *argv[])
     QCommandLineParser parser;
     parser.setApplicationDescription(i18n("Client for the matrix communication protocol"));
     parser.addPositionalArgument(QStringLiteral("urls"), i18n("Supports matrix: url scheme"));
-    parser.addOption(QCommandLineOption("ignore-ssl-errors"_ls, i18n("Ignore all SSL Errors, e.g., unsigned certificates.")));
 
     about.setupCommandLine(&parser);
     parser.process(app);
     about.processCommandLine(&parser);
 
-    if (parser.isSet("ignore-ssl-errors"_ls)) {
-        QObject::connect(NetworkAccessManager::instance(), &QNetworkAccessManager::sslErrors, NetworkAccessManager::instance(), [](QNetworkReply *reply) {
-            reply->ignoreSslErrors();
-        });
-    }
-
     engine.addImageProvider(QLatin1String("mxc"), new MatrixImageProvider);
     engine.addImageProvider(QLatin1String("blurhash"), new BlurhashImageProvider);
 
-    engine.load(QUrl(QStringLiteral("qrc:/org/kde/neochat/qml/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
     if (engine.rootObjects().isEmpty()) {
         return -1;
     }
 
-    if (!parser.positionalArguments().isEmpty()) {
+    if (parser.positionalArguments().length() > 0) {
         RoomManager::instance().setUrlArgument(parser.positionalArguments()[0]);
     }
 
 #ifdef HAVE_RUNNER
     Runner runner;
-    QDBusConnection::sessionBus().registerObject("/RoomRunner"_ls, &runner, QDBusConnection::ExportScriptableContents);
+    QDBusConnection::sessionBus().registerObject("/RoomRunner", &runner, QDBusConnection::ExportScriptableContents);
 #endif
 
     QWindow *window = windowFromEngine(&engine);

src/matriximageprovider.cpp

@@ -25,13 +25,13 @@ ThumbnailResponse::ThumbnailResponse(QString id, QSize size)
                          mediaId,
                          QString::number(requestedSize.width()),
                          QString::number(requestedSize.height())))
-    , errorStr("Image request hasn't started"_ls)
+    , errorStr("Image request hasn't started")
 {
     if (requestedSize.isEmpty()) {
         requestedSize.setHeight(100);
         requestedSize.setWidth(100);
     }
-    if (mediaId.count(QLatin1Char('/')) != 1) {
+    if (mediaId.count('/') != 1) {
         if (mediaId.startsWith(QLatin1Char('/'))) {
             mediaId = mediaId.mid(1);
         } else {

src/matriximageprovider.h

@@ -10,6 +10,11 @@
 
 #include <QReadWriteLock>
 
+namespace Quotient
+{
+class Connection;
+}
+
 /**
  * @class ThumbnailResponse
  *

src/mediasizehelper.cpp

@@ -1,163 +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 "mediasizehelper.h"
-
-#include "neochatconfig.h"
-
-MediaSizeHelper::MediaSizeHelper(QObject *parent)
-    : QObject(parent)
-{
-}
-
-qreal MediaSizeHelper::contentMaxWidth() const
-{
-    return m_contentMaxWidth;
-}
-
-void MediaSizeHelper::setContentMaxWidth(qreal contentMaxWidth)
-{
-    if (contentMaxWidth < 0.0 || qFuzzyCompare(contentMaxWidth, 0.0)) {
-        m_contentMaxWidth = -1.0;
-        Q_EMIT contentMaxWidthChanged();
-        Q_EMIT currentSizeChanged();
-        return;
-    }
-    if (qFuzzyCompare(contentMaxWidth, m_contentMaxWidth)) {
-        return;
-    }
-    m_contentMaxWidth = contentMaxWidth;
-    Q_EMIT contentMaxWidthChanged();
-    Q_EMIT currentSizeChanged();
-}
-
-qreal MediaSizeHelper::contentMaxHeight() const
-{
-    return m_contentMaxHeight;
-}
-
-void MediaSizeHelper::setContentMaxHeight(qreal contentMaxHeight)
-{
-    if (contentMaxHeight < 0.0 || qFuzzyCompare(contentMaxHeight, 0.0)) {
-        m_contentMaxHeight = -1.0;
-        Q_EMIT contentMaxHeightChanged();
-        Q_EMIT currentSizeChanged();
-        return;
-    }
-    if (qFuzzyCompare(contentMaxHeight, m_contentMaxHeight)) {
-        return;
-    }
-    m_contentMaxHeight = contentMaxHeight;
-    Q_EMIT contentMaxHeightChanged();
-    Q_EMIT currentSizeChanged();
-}
-
-qreal MediaSizeHelper::mediaWidth() const
-{
-    return m_mediaWidth;
-}
-
-void MediaSizeHelper::setMediaWidth(qreal mediaWidth)
-{
-    if (mediaWidth < 0.0 || qFuzzyCompare(mediaWidth, 0.0)) {
-        m_mediaWidth = -1.0;
-        Q_EMIT mediaWidthChanged();
-        Q_EMIT currentSizeChanged();
-        return;
-    }
-    if (qFuzzyCompare(mediaWidth, m_mediaWidth)) {
-        return;
-    }
-    m_mediaWidth = mediaWidth;
-    Q_EMIT mediaWidthChanged();
-    Q_EMIT currentSizeChanged();
-}
-
-qreal MediaSizeHelper::mediaHeight() const
-{
-    return m_mediaHeight;
-}
-
-void MediaSizeHelper::setMediaHeight(qreal mediaHeight)
-{
-    if (mediaHeight < 0.0 || qFuzzyCompare(mediaHeight, 0.0)) {
-        m_mediaHeight = -1.0;
-        Q_EMIT mediaHeightChanged();
-        Q_EMIT currentSizeChanged();
-        return;
-    }
-    if (qFuzzyCompare(mediaHeight, m_mediaHeight)) {
-        return;
-    }
-    m_mediaHeight = mediaHeight;
-    Q_EMIT mediaHeightChanged();
-    Q_EMIT currentSizeChanged();
-}
-
-qreal MediaSizeHelper::resolvedMediaWidth() const
-{
-    if (m_mediaWidth > 0.0) {
-        return m_mediaWidth;
-    }
-    return widthLimit();
-}
-
-qreal MediaSizeHelper::resolvedMediaHeight() const
-{
-    if (m_mediaHeight > 0.0) {
-        return m_mediaHeight;
-    }
-    return widthLimit() / 16.0 * 9.0;
-}
-
-qreal MediaSizeHelper::aspectRatio() const
-{
-    return resolvedMediaWidth() / resolvedMediaHeight();
-}
-
-bool MediaSizeHelper::limitWidth() const
-{
-    // If actual data isn't available we'll be using a placeholder that is width
-    // limited so return true.
-    if (m_mediaWidth < 0.0 || m_mediaHeight < 0.0) {
-        return true;
-    }
-    return m_mediaWidth >= m_mediaHeight;
-}
-
-qreal MediaSizeHelper::widthLimit() const
-{
-    if (m_contentMaxWidth < 0.0) {
-        return NeoChatConfig::self()->mediaMaxWidth();
-    }
-    return std::min(m_contentMaxWidth, qreal(NeoChatConfig::self()->mediaMaxWidth()));
-}
-
-qreal MediaSizeHelper::heightLimit() const
-{
-    if (m_contentMaxHeight < 0.0) {
-        return NeoChatConfig::self()->mediaMaxHeight();
-    }
-    return std::min(m_contentMaxHeight, qreal(NeoChatConfig::self()->mediaMaxHeight()));
-}
-
-QSize MediaSizeHelper::currentSize() const
-{
-    if (limitWidth()) {
-        qreal width = std::min(widthLimit(), resolvedMediaWidth());
-        qreal height = width / aspectRatio();
-        if (height > heightLimit()) {
-            return QSize(qRound(heightLimit() * aspectRatio()), qRound(heightLimit()));
-        }
-        return QSize(qRound(width), qRound(height));
-    } else {
-        qreal height = std::min(heightLimit(), resolvedMediaHeight());
-        qreal width = height * aspectRatio();
-        if (width > widthLimit()) {
-            return QSize(qRound(widthLimit()), qRound(widthLimit() / aspectRatio()));
-        }
-        return QSize(qRound(width), qRound(height));
-    }
-}
-
-#include "moc_mediasizehelper.cpp"