Ban anything that flickers or flashes on hover

I don't like that. UI shouldn't jump in user's face like all these hover
actions, bright backgrounds and random layout-shifting buttons out of
nowhere.

.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.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,21 @@ 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']
+- 'on': ['Linux/Qt6', 'Linux/Qt5']
   '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', 'Windows' ]

.reuse/dep5

@@ -34,7 +34,7 @@ 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
 

CMakeLists.txt

@@ -14,8 +14,11 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
 
 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)
 
@@ -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,25 @@ 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 WebView)
+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
-    TYPE REQUIRED
-    PURPOSE "Kirigami application UI framework"
-)
-find_package(KF6KirigamiAddons 0.7.2 REQUIRED)
+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)
+
+if(QT_MAJOR_VERSION STREQUAL "6")
+    find_package(KF6StatusNotifierItem ${KF_MIN_VERSION} REQUIRED)
+endif()
 
 if(ANDROID)
     find_package(OpenSSL)
@@ -75,26 +104,24 @@ 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/"
@@ -127,12 +154,12 @@ 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
 )
@@ -154,12 +181,12 @@ add_definitions(-DQT_NO_FOREACH)
 add_subdirectory(src)
 
 if (BUILD_TESTING)
-    find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
+    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()

appiumtests/logintest.py

@@ -4,26 +4,25 @@
 # SPDX-FileCopyrightText: 2021-2022 Harald Sitter <sitter@kde.org>
 # SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 
+import unittest
+from appium import webdriver
+from appium.webdriver.common.appiumby import AppiumBy
+from selenium.webdriver.support.ui import WebDriverWait
 import os
+import time
 import subprocess
 import sys
-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 setUpClass(self):
+        desired_caps = {}
+        desired_caps["app"] = "neochat --ignore-ssl-errors"
+        desired_caps["timeouts"] = {'implicit': 10000}
+        self.driver = webdriver.Remote(
+            command_executor='http://127.0.0.1:4723',
+            desired_capabilities=desired_caps)
+        self.mockServerProcess = subprocess.Popen([sys.executable, os.path.join(os.path.dirname(__file__), "login-server.py")])
 
     def setUp(self):
         pass
@@ -46,6 +45,5 @@ class LoginTest(unittest.TestCase):
         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()

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

@@ -53,16 +53,13 @@
   <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>
@@ -162,7 +159,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>
@@ -187,7 +183,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>
@@ -212,7 +207,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>
@@ -295,13 +289,11 @@ to provide a convergent experience across multiple platforms.</p>
       <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>
@@ -322,13 +314,11 @@ to provide a convergent experience across multiple platforms.</p>
       <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>

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

src/CMakeLists.txt

@@ -3,6 +3,15 @@
 # SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
 # SPDX-License-Identifier: BSD-2-Clause
 
+configure_file(qml/Page/RoomList/RoomDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Page/RoomList/RoomDelegate.qml)
+configure_file(qml/Component/QuickSwitcher.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/QuickSwitcher.qml)
+configure_file(qml/Dialog/PowerLevelDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/PowerLevelDialog.qml)
+configure_file(qml/Component/Timeline/AudioDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/AudioDelegate.qml)
+configure_file(qml/Component/Timeline/VideoDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/VideoDelegate.qml)
+configure_file(qml/Component/Timeline/OsmLocationPlugin.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/OsmLocationPlugin.qml)
+
+configure_file(res.qrc ${CMAKE_CURRENT_SOURCE_DIR}/res.generated.qrc)
+
 add_library(neochat STATIC
     controller.cpp
     controller.h
@@ -40,12 +49,6 @@ add_library(neochat STATIC
     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 +64,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
@@ -133,157 +136,6 @@ add_library(neochat STATIC
     mediasizehelper.h
     eventhandler.cpp
     enums/delegatetype.h
-    roomlastmessageprovider.cpp
-    roomlastmessageprovider.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/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
-    RESOURCES
-        qml/confetti.png
-        qml/glowdot.png
 )
 
 ecm_qt_declare_logging_category(neochat
@@ -304,6 +156,7 @@ ecm_qt_declare_logging_category(neochat
 
 add_executable(neochat-app
     main.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/res.generated.qrc
 )
 
 if(TARGET Qt::WebView)
@@ -325,24 +178,28 @@ 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)
+        if(QT_MAJOR_VERSION STREQUAL "6")
+            target_link_libraries(neochat PRIVATE KF6::StatusNotifierItem)
+        endif()
     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 QCoro::Core)
 
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
 
@@ -430,7 +287,7 @@ if(ANDROID)
         "gps"
     )
 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()
 
@@ -438,12 +295,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.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 
 #include <Quotient/events/roommessageevent.h>
 
@@ -33,7 +32,6 @@ class NeoChatRoom;
 class ActionsHandler : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The room that messages will be sent to.

src/chatdocumenthandler.cpp

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

src/chatdocumenthandler.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 #include <QQuickTextDocument>
 #include <QTextCursor>
 
@@ -59,7 +58,6 @@ class SyntaxHighlighter;
 class ChatDocumentHandler : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief Is the instance being used to handle an edit message.

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>
@@ -367,6 +371,36 @@ void Controller::saveWindowGeometry()
     WindowController::instance().saveGeometry();
 }
 
+void Controller::createRoom(const QString &name, const QString &topic)
+{
+    auto createRoomJob = m_connection->createRoom(Connection::PublishRoom, QString(), 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;

src/controller.h

@@ -5,7 +5,6 @@
 
 #include "models/pushrulemodel.h"
 #include <QObject>
-#include <QQmlEngine>
 #include <QQuickItem>
 
 #include <KFormat>
@@ -41,8 +40,6 @@ class ReadPasswordJob;
 class Controller : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
 
     /**
      * @brief The current connection for the rest of NeoChat to use.
@@ -93,11 +90,6 @@ 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;
@@ -121,6 +113,16 @@ public:
      */
     bool saveAccessTokenToKeyChain(const Quotient::AccountSettings &account, const QByteArray &accessToken);
 
+    /**
+     * @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.
      */
@@ -214,6 +216,7 @@ Q_SIGNALS:
     void userConsentRequired(QUrl url);
     void isOnlineChanged(bool isOnline);
     void activeConnectionIndexChanged();
+    void roomAdded(NeoChatRoom *room);
 
 public Q_SLOTS:
     void saveWindowGeometry();

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

@@ -4,18 +4,15 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 
 /**
  * @class DelegateType
  *
  * This class is designed to define the DelegateType enumeration.
  */
-class DelegateType : public QObject
+class DelegateType
 {
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
+    Q_GADGET
 
 public:
     /**

src/eventhandler.cpp

@@ -231,11 +231,8 @@ bool EventHandler::isHidden()
         }
     }
 
-    if (m_event->isStateEvent()) {
-        auto *stateEvent = eventCast<const StateEvent>(m_event);
-        if (stateEvent && stateEvent->repeatsState()) {
-            return true;
-        }
+    if (m_event->isStateEvent() && eventCast<const StateEvent>(m_event)->repeatsState()) {
+        return true;
     }
 
     // isReplacement?
@@ -989,5 +986,3 @@ QString EventHandler::getReadMarkersString() const
     readMarkersString.chop(2);
     return readMarkersString;
 }
-
-#include "moc_eventhandler.cpp"

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/linkpreviewer.cpp

@@ -93,9 +93,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,13 +44,6 @@ 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 = {});
 
@@ -63,7 +53,6 @@ public:
     [[nodiscard]] QString title() const;
     [[nodiscard]] QString description() const;
     [[nodiscard]] QUrl imageSource() const;
-    [[nodiscard]] bool empty() const;
 
 private:
     const NeoChatRoom *m_currentRoom = nullptr;
@@ -82,6 +71,5 @@ Q_SIGNALS:
     void descriptionChanged();
     void imageSourceChanged();
     void urlChanged();
-    void emptyChanged();
 };
 Q_DECLARE_METATYPE(LinkPreviewer *)

src/locationhelper.h

@@ -2,17 +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_UNCREATABLE("")
+    Q_GADGET
 public:
     /** Unite two rectanlges. */
     Q_INVOKABLE static QRectF unite(const QRectF &r1, const QRectF &r2);

src/login.cpp

@@ -13,13 +13,13 @@
 
 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();
@@ -31,7 +31,7 @@ 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]+)?$"));
         if (!validator.match(m_matrixId).hasMatch()) {
@@ -105,23 +105,23 @@ 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('@'))) {
@@ -130,30 +130,30 @@ void LoginHelper::setMatrixId(const QString &matrixId)
     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();
@@ -164,22 +164,22 @@ void LoginHelper::login()
     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,28 +189,28 @@ 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)
+void Login::setInvalidPassword(bool invalid)
 {
     m_invalidPassword = invalid;
     Q_EMIT isInvalidPasswordChanged();
 }
 
-bool LoginHelper::isInvalidPassword() const
+bool Login::isInvalidPassword() const
 {
     return m_invalidPassword;
 }

src/login.h

@@ -4,21 +4,18 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 #include <QUrl>
 
 class NeoChatConnection;
 
 /**
- * @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.
@@ -79,7 +76,7 @@ class LoginHelper : public QObject
     Q_PROPERTY(bool isInvalidPassword READ isInvalidPassword NOTIFY isInvalidPasswordChanged)
 
 public:
-    explicit LoginHelper(QObject *parent = nullptr);
+    explicit Login(QObject *parent = nullptr);
 
     Q_INVOKABLE void init();
 

src/main.cpp

@@ -34,25 +34,74 @@
 
 #include "neochat-version.h"
 
+#include <Quotient/accountregistry.h>
+#include <Quotient/keyverificationsession.h>
 #include <Quotient/networkaccessmanager.h>
+#include <Quotient/room.h>
+#include <Quotient/user.h>
 #include <Quotient/util.h>
 
+#include "actionshandler.h"
 #include "blurhashimageprovider.h"
+#include "chatdocumenthandler.h"
+#include "clipboard.h"
 #include "controller.h"
+#include "delegatesizehelper.h"
+#include "enums/delegatetype.h"
+#include "filetypesingleton.h"
+#include "linkpreviewer.h"
+#include "locationhelper.h"
 #include "logger.h"
+#include "login.h"
 #include "matriximageprovider.h"
+#include "mediasizehelper.h"
+#include "models/accountemoticonmodel.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 "neochatconnection.h"
+#include "neochatroom.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"
 
 #ifdef HAVE_RUNNER
 #include "runner.h"
 #include <QDBusConnection>
 #endif
+#include "registration.h"
 
 #ifdef Q_OS_WINDOWS
 #include <Windows.h>
@@ -60,8 +109,6 @@
 
 using namespace Quotient;
 
-void qml_register_types_org_kde_neochat();
-
 class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
 {
     QNetworkAccessManager *create(QObject *) override
@@ -93,13 +140,19 @@ Q_DECL_EXPORT
 #endif
 int main(int argc, char *argv[])
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+#endif
+
     QNetworkProxyFactory::setUseSystemConfiguration(true);
 
 #ifdef HAVE_WEBVIEW
     QtWebView::initialize();
     QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
+#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
     QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi);
 #endif
+#endif
 
 #ifdef Q_OS_ANDROID
     QGuiApplication app(argc, argv);
@@ -168,18 +221,99 @@ int main(int argc, char *argv[])
                 QStringLiteral("/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());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Registration", &Registration::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<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");
+    qmlRegisterType<MediaSizeHelper>("org.kde.neochat", 1, 0, "MediaSizeHelper");
+    qmlRegisterUncreatableType<DelegateType>("org.kde.neochat", 1, 0, "DelegateType", "ENUM"_ls);
+    qmlRegisterUncreatableType<PushNotificationKind>("org.kde.neochat", 1, 0, "PushNotificationKind", "ENUM"_ls);
+    qmlRegisterUncreatableType<PushNotificationSection>("org.kde.neochat", 1, 0, "PushNotificationSection", "ENUM"_ls);
+    qmlRegisterUncreatableType<PushNotificationState>("org.kde.neochat", 1, 0, "PushNotificationState", "ENUM"_ls);
+    qmlRegisterUncreatableType<PushNotificationAction>("org.kde.neochat", 1, 0, "PushNotificationAction", "ENUM"_ls);
+    qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM"_ls);
+    qmlRegisterUncreatableType<User>("org.kde.neochat", 1, 0, "User", {});
+    qmlRegisterUncreatableType<NeoChatRoom>("org.kde.neochat", 1, 0, "NeoChatRoom", {});
+    qmlRegisterUncreatableType<NeoChatConnection>("org.kde.neochat", 1, 0, "NeoChatConnection", {});
 
-    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<MessageEventType>("MessageEventType");
+    qRegisterMetaType<NeoChatRoom *>("NeoChatRoom*");
+    qRegisterMetaType<User *>("User*");
+    qRegisterMetaType<GetRoomEventsJob *>("GetRoomEventsJob*");
+    qRegisterMetaType<QMimeType>("QMimeType");
+    qRegisterMetaType<KeyVerificationSession *>("KeyVerificationSession*");
+    qmlRegisterUncreatableType<KeyVerificationSession>("org.kde.neochat", 1, 0, "KeyVerificationSession", {});
+    qRegisterMetaType<QVector<EmojiEntry>>("QVector<EmojiEntry>");
+    qmlRegisterSingletonType("org.kde.neochat", 1, 0, "About", [](QQmlEngine *engine, QJSEngine *) -> QJSValue {
+        return engine->toScriptValue(KAboutData::applicationData());
+    });
+    qmlRegisterSingletonType(QUrl("qrc:/OsmLocationPlugin.qml"_ls), "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;
 
@@ -230,7 +364,7 @@ int main(int argc, char *argv[])
     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;
     }

src/mediasizehelper.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 #include <QSize>
 
 /**
@@ -29,7 +28,6 @@
 class MediaSizeHelper : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The maximum width (in px) the media can be.

src/models/accountemoticonmodel.h

@@ -9,7 +9,6 @@
 #include <QCoroTask>
 #include <QObject>
 #include <QPointer>
-#include <QQmlEngine>
 #include <QVector>
 
 #include <Quotient/connection.h>
@@ -24,8 +23,6 @@
 class AccountEmoticonModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
-
     /**
      * @brief The connection to get emoticons from.
      */

src/models/completionmodel.cpp

@@ -87,11 +87,8 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
             return m_filterModel->data(filterIndex, RoomListModel::CanonicalAliasRole);
         }
         if (role == IconNameRole) {
-            auto mediaId = m_filterModel->data(filterIndex, RoomListModel::AvatarRole).toString();
-            if (mediaId.isEmpty()) {
-                return QVariant();
-            }
-            return m_room->connection()->makeMediaUrl(QUrl(QStringLiteral("mxc://%1").arg(mediaId)));
+            return QStringLiteral("mxc://%1")
+                .arg(m_roomListModel->connection()->makeMediaUrl(m_filterModel->data(filterIndex, RoomListModel::AvatarRole).toUrl()).toString());
         }
     }
     if (m_autoCompletionType == Emoji) {
@@ -148,7 +145,7 @@ void CompletionModel::updateCompletion()
         m_filterModel->setFullText(m_fullText);
         m_filterModel->setFilterText(m_text);
         m_filterModel->invalidate();
-    } else if (text().startsWith(QLatin1Char(':')) && text().size() > 1 && !text()[1].isUpper()
+    } else if (text().startsWith(QLatin1Char(':')) && !text()[1].isUpper()
                && (m_fullText.indexOf(QLatin1Char(':'), 1) == -1
                    || (m_fullText.indexOf(QLatin1Char(' ')) != -1 && m_fullText.indexOf(QLatin1Char(':'), 1) > m_fullText.indexOf(QLatin1Char(' '), 1)))) {
         m_filterModel->setSourceModel(m_emojiModel);

src/models/completionmodel.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QConcatenateTablesProxyModel>
-#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 #include "roomlistmodel.h"
@@ -25,7 +24,6 @@ class RoomListModel;
 class CompletionModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The current text to search for completions.

src/models/completionproxymodel.cpp

@@ -22,7 +22,11 @@ bool CompletionProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &so
             && sourceModel()
                    ->data(sourceModel()->index(sourceRow, 0), secondaryFilterRole())
                    .toString()
+#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
                    .startsWith(QStringView(m_filterText).sliced(1), Qt::CaseInsensitive));
+#else
+                   .startsWith(m_filterText.midRef(1), Qt::CaseInsensitive));
+#endif
 }
 
 bool CompletionProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const

src/models/customemojimodel.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QAbstractListModel>
-#include <QQmlEngine>
 #include <QRegularExpression>
 #include <memory>
 
@@ -28,8 +27,6 @@ struct CustomEmoji {
 class CustomEmojiModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
 
 public:
     /**
@@ -51,11 +48,6 @@ public:
         static CustomEmojiModel _instance;
         return _instance;
     }
-    static CustomEmojiModel *create(QQmlEngine *engine, QJSEngine *)
-    {
-        engine->setObjectOwnership(&instance(), QQmlEngine::CppOwnership);
-        return &instance();
-    }
 
     /**
      * @brief Get the given role value at the given index.

src/models/devicesmodel.h

@@ -5,7 +5,6 @@
 
 #include <QAbstractListModel>
 #include <QPointer>
-#include <QQmlEngine>
 
 #include <Quotient/csapi/definitions/client_device.h>
 
@@ -26,7 +25,6 @@ class Connection;
 class DevicesModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The current connection that the model is getting its devices from.

src/models/devicesproxymodel.h

@@ -3,14 +3,11 @@
 
 #pragma once
 
-#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 class DevicesProxyModel : public QSortFilterProxyModel
 {
     Q_OBJECT
-    QML_ELEMENT
-
     Q_PROPERTY(int type READ type WRITE setType NOTIFY typeChanged)
 
 public:

src/models/emojimodel.h

@@ -5,7 +5,6 @@
 
 #include <QAbstractListModel>
 #include <QObject>
-#include <QQmlEngine>
 #include <QSettings>
 
 struct Emoji {
@@ -60,8 +59,6 @@ Q_DECLARE_METATYPE(Emoji)
 class EmojiModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
 
     /**
      * @brief Return a list of recently used emojis.
@@ -86,11 +83,6 @@ public:
         static EmojiModel _instance;
         return _instance;
     }
-    static EmojiModel *create(QQmlEngine *engine, QJSEngine *)
-    {
-        engine->setObjectOwnership(&instance(), QQmlEngine::CppOwnership);
-        return &instance();
-    }
 
     /**
      * @brief Defines the model roles.

src/models/emoticonfiltermodel.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 /**
@@ -15,7 +14,6 @@
 class EmoticonFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief Whether stickers should be shown

src/models/imagepacksmodel.h

@@ -6,7 +6,6 @@
 #include "events/imagepackevent.h"
 #include <QAbstractListModel>
 #include <QPointer>
-#include <QQmlEngine>
 #include <QVector>
 
 class NeoChatRoom;
@@ -22,7 +21,6 @@ class NeoChatRoom;
 class ImagePacksModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The current room that the model is being used in.

src/models/livelocationsmodel.h

@@ -8,7 +8,6 @@
 
 #include <QAbstractListModel>
 #include <QPointer>
-#include <QQmlEngine>
 #include <QRectF>
 
 struct LiveLocationData {
@@ -25,8 +24,6 @@ bool operator<(const LiveLocationData &lhs, const LiveLocationData &rhs);
 class LiveLocationsModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
-
     Q_PROPERTY(NeoChatRoom *room MEMBER m_room NOTIFY roomChanged)
     /** The event id of the beacon start event, ie. the one all suspequent
      *  events use to relate to the same beacon.

src/models/locationsmodel.h

@@ -5,7 +5,6 @@
 
 #include <QAbstractListModel>
 #include <QPointer>
-#include <QQmlEngine>
 #include <QRectF>
 
 #include "neochatroom.h"
@@ -16,7 +15,6 @@
 class LocationsModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
 public:
     enum Roles {

src/models/mediamessagefiltermodel.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QQmlEngine>
 #include <QSortFilterProxyModel>
+#include <qobjectdefs.h>
 
 #include "models/messagefiltermodel.h"
 
@@ -20,8 +20,6 @@ class MessageFilterModel;
 class MediaMessageFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
-    QML_ELEMENT
-
 public:
     enum MediaType {
         Image = 0,

src/models/messageeventmodel.cpp

@@ -55,6 +55,8 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[ShowReadMarkersRole] = "showReadMarkers";
     roles[ReactionRole] = "reaction";
     roles[ShowReactionsRole] = "showReactions";
+    roles[SourceRole] = "jsonSource";
+    roles[AuthorIdRole] = "authorId";
     roles[VerifiedRole] = "verified";
     roles[AuthorDisplayNameRole] = "authorDisplayName";
     roles[IsRedactedRole] = "isRedacted";
@@ -465,6 +467,10 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return eventHandler.getPlainBody();
     }
 
+    if (role == SourceRole) {
+        return QJsonDocument(evt.fullJson()).toJson();
+    }
+
     if (role == DelegateTypeRole) {
         return eventHandler.getDelegateType();
     }
@@ -658,6 +664,10 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return m_reactionModels.contains(evt.id());
     }
 
+    if (role == AuthorIdRole) {
+        return evt.senderId();
+    }
+
     if (role == VerifiedRole) {
         if (evt.originalEvent()) {
             auto encrypted = dynamic_cast<const EncryptedEvent *>(evt.originalEvent());

src/models/messageeventmodel.h

@@ -5,7 +5,6 @@
 
 #include <KFormat>
 #include <QAbstractListModel>
-#include <QQmlEngine>
 
 #include "linkpreviewer.h"
 #include "neochatroom.h"
@@ -26,7 +25,6 @@ class ReactionModel;
 class MessageEventModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The current room that the model is getting its messages from.
@@ -72,6 +70,9 @@ public:
         ShowReadMarkersRole, /**< Whether there are any other user read markers to be shown. */
         ReactionRole, /**< List model for this event. */
         ShowReactionsRole, /**< Whether there are any reactions to be shown. */
+        SourceRole, /**< The full message source JSON. */
+
+        AuthorIdRole, /**< Matrix ID of the message author. */
 
         VerifiedRole, /**< Whether an encrypted message is sent in a verified session. */
         AuthorDisplayNameRole, /**< The displayname for the event's sender; for name change events, the old displayname. */

src/models/messagefiltermodel.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 #include "messageeventmodel.h"
@@ -22,8 +21,6 @@
 class MessageFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
-    QML_ELEMENT
-
 public:
     /**
      * @brief Defines the model roles.

src/models/publicroomlistmodel.h

@@ -5,7 +5,6 @@
 
 #include <QAbstractListModel>
 #include <QObject>
-#include <QQmlEngine>
 
 #include <Quotient/csapi/list_public_rooms.h>
 
@@ -28,7 +27,6 @@ class Connection;
 class PublicRoomListModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The current connection that the model is getting its rooms from.

src/models/pushrulemodel.cpp

@@ -171,7 +171,7 @@ PushNotificationSection::Section PushRuleModel::getSection(Quotient::PushRule ru
         if (!testUserId.startsWith(u'@')) {
             testUserId.prepend(u'@');
         }
-        if (testUserId.startsWith(u'@') && !Quotient::serverPart(testUserId).isEmpty() && connection->user(testUserId) != nullptr) {
+        if (connection->user(testUserId) != nullptr) {
             return PushNotificationSection::Undefined;
         }
         // If the rule has push conditions and one is a room ID it is a room only keyword.

src/models/pushrulemodel.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QAbstractListModel>
-#include <QQmlEngine>
 
 #include <Quotient/csapi/definitions/push_rule.h>
 
@@ -21,8 +20,6 @@
 class PushNotificationKind : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
 
 public:
     /**
@@ -74,8 +71,6 @@ public:
 class PushNotificationSection : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
 
 public:
     /**
@@ -135,7 +130,6 @@ public:
 class PushRuleModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The default state for any newly created keyword rule.

src/models/reactionmodel.cpp

@@ -4,12 +4,6 @@
 #include "reactionmodel.h"
 
 #include <QDebug>
-#ifdef HAVE_ICU
-#include <QTextBoundaryFinder>
-#include <QTextCharFormat>
-#include <unicode/uchar.h>
-#include <unicode/urename.h>
-#endif
 
 #include <KLocalizedString>
 
@@ -35,38 +29,11 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const
 
     const auto &reaction = m_reactions.at(index.row());
 
-    const auto isEmoji = [](const QString &text) {
-#ifdef HAVE_ICU
-        QTextBoundaryFinder finder(QTextBoundaryFinder::Grapheme, text);
-        int from = 0;
-        while (finder.toNextBoundary() != -1) {
-            auto to = finder.position();
-            if (text[from].isSpace()) {
-                from = to;
-                continue;
-            }
-
-            auto first = text.mid(from, to - from).toUcs4()[0];
-            if (!u_hasBinaryProperty(first, UCHAR_EMOJI_PRESENTATION)) {
-                return false;
-            }
-            from = to;
-        }
-        return true;
-#else
-        return false;
-#endif
-    };
-
-    const auto reactionText = isEmoji(reaction.reaction)
-        ? QStringLiteral("<span style=\"font-family: 'emoji';\">") + reaction.reaction + QStringLiteral("</span>")
-        : reaction.reaction;
-
-    if (role == TextContentRole) {
+    if (role == TextRole) {
         if (reaction.authors.count() > 1) {
-            return QStringLiteral("%1  %2").arg(reactionText, QString::number(reaction.authors.count()));
+            return QStringLiteral("%1  %2").arg(reaction.reaction, QString::number(reaction.authors.count()));
         } else {
-            return reactionText;
+            return reaction.reaction;
         }
     }
 
@@ -97,7 +64,7 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const
                       "%2 reacted with %3",
                       reaction.authors.count(),
                       text,
-                      reactionText);
+                      reaction.reaction);
         return text;
     }
 
@@ -134,7 +101,7 @@ void ReactionModel::setReactions(QList<Reaction> reactions)
 QHash<int, QByteArray> ReactionModel::roleNames() const
 {
     return {
-        {TextContentRole, "textContent"},
+        {TextRole, "text"},
         {ReactionRole, "reaction"},
         {ToolTipRole, "toolTip"},
         {AuthorsRole, "authors"},

src/models/reactionmodel.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QAbstractListModel>
-#include <QQmlEngine>
 
 namespace Quotient
 {
@@ -19,7 +18,6 @@ class User;
 class ReactionModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
 public:
     /**
@@ -34,7 +32,7 @@ public:
      * @brief Defines the model roles.
      */
     enum Roles {
-        TextContentRole = Qt::DisplayRole, /**< The text to show in the reaction. */
+        TextRole = Qt::DisplayRole, /**< The text to show in the reaction. */
         ReactionRole, /**< The reaction emoji. */
         ToolTipRole, /**< The tool tip to show for the reaction. */
         AuthorsRole, /**< The list of authors who sent the given reaction. */

src/models/roomlistmodel.cpp

@@ -36,13 +36,13 @@ RoomListModel::RoomListModel(QObject *parent)
         m_categoryVisibility[collapsedSection] = false;
     }
 
-    connect(this, &RoomListModel::highlightCountChanged, this, [this]() {
+    connect(this, &RoomListModel::notificationCountChanged, this, [this]() {
 #if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
 #ifndef Q_OS_ANDROID
         // copied from Telegram desktop
         const auto launcherUrl = "application://org.kde.neochat.desktop"_ls;
         // Gnome requires that count is a 64bit integer
-        const qint64 counterSlice = std::min(m_highlightCount, 9999);
+        const qint64 counterSlice = std::min(m_notificationCount, 9999);
         QVariantMap dbusUnityProperties;
 
         if (counterSlice > 0) {
@@ -59,7 +59,7 @@ RoomListModel::RoomListModel(QObject *parent)
         QDBusConnection::sessionBus().send(signal);
 #endif // Q_OS_ANDROID
 #else
-        qGuiApp->setBadgeNumber(m_highlightCount);
+        qGuiApp->setBadgeNumber(m_notificationCount);
 #endif // QT_VERSION_CHECK(6, 6, 0)
     });
     connect(&SpaceHierarchyCache::instance(), &SpaceHierarchyCache::spaceHierarchyChanged, this, [this]() {
@@ -144,6 +144,7 @@ void RoomListModel::doAddRoom(Room *r)
         m_rooms.append(room);
         connectRoomSignals(room);
         Q_EMIT roomAdded(room);
+        Q_EMIT Controller::instance().roomAdded(room);
     } else {
         qCritical() << "Attempt to add nullptr to the room list";
         Q_ASSERT(false);
@@ -161,9 +162,6 @@ void RoomListModel::connectRoomSignals(NeoChatRoom *room)
     connect(room, &Room::notificationCountChanged, this, [this, room] {
         refresh(room);
     });
-    connect(room, &Room::highlightCountChanged, this, [this, room] {
-        refresh(room);
-    });
     connect(room, &Room::avatarChanged, this, [this, room] {
         refresh(room, {AvatarRole});
     });
@@ -180,7 +178,6 @@ void RoomListModel::connectRoomSignals(NeoChatRoom *room)
         refresh(room, {LastEventRole, SubtitleTextRole});
     });
     connect(room, &Room::unreadStatsChanged, this, &RoomListModel::refreshNotificationCount);
-    connect(room, &Room::highlightCountChanged, this, &RoomListModel::refreshHighlightCount);
 }
 
 int RoomListModel::notificationCount() const
@@ -188,11 +185,6 @@ int RoomListModel::notificationCount() const
     return m_notificationCount;
 }
 
-int RoomListModel::highlightCount() const
-{
-    return m_highlightCount;
-}
-
 void RoomListModel::refreshNotificationCount()
 {
     int count = 0;
@@ -206,19 +198,6 @@ void RoomListModel::refreshNotificationCount()
     Q_EMIT notificationCountChanged();
 }
 
-void RoomListModel::refreshHighlightCount()
-{
-    int count = 0;
-    for (auto room : std::as_const(m_rooms)) {
-        count += room->highlightCount();
-    }
-    if (m_highlightCount == count) {
-        return;
-    }
-    m_highlightCount = count;
-    Q_EMIT highlightCountChanged();
-}
-
 void RoomListModel::updateRoom(Room *room, Room *prev)
 {
     // There are two cases when this method is called:

src/models/roomlistmodel.h

@@ -6,7 +6,6 @@
 #include <Quotient/events/roomevent.h>
 
 #include <QAbstractListModel>
-#include <QQmlEngine>
 
 class NeoChatRoom;
 
@@ -19,8 +18,6 @@ class Room;
 class NeoChatRoomType : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
 
 public:
     /**
@@ -45,7 +42,6 @@ public:
 class RoomListModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The current connection that the model is getting its rooms from.
@@ -89,7 +85,6 @@ public:
     void setConnection(Quotient::Connection *connection);
 
     [[nodiscard]] int notificationCount() const;
-    [[nodiscard]] int highlightCount() const;
 
     /**
      * @brief Get the given role value at the given index.
@@ -160,7 +155,6 @@ private Q_SLOTS:
     void deleteRoom(Quotient::Room *room);
     void refresh(NeoChatRoom *room, const QVector<int> &roles = {});
     void refreshNotificationCount();
-    void refreshHighlightCount();
 
 private:
     Quotient::Connection *m_connection = nullptr;
@@ -169,7 +163,6 @@ private:
     QMap<int, bool> m_categoryVisibility;
 
     int m_notificationCount = 0;
-    int m_highlightCount = 0;
     QString m_activeSpaceId;
 
     void connectRoomSignals(NeoChatRoom *room);
@@ -177,7 +170,6 @@ private:
 Q_SIGNALS:
     void connectionChanged();
     void notificationCountChanged();
-    void highlightCountChanged();
 
     void roomAdded(NeoChatRoom *_t1);
 };

src/models/searchmodel.cpp

@@ -184,6 +184,7 @@ QHash<int, QByteArray> SearchModel::roleNames() const
         {MimeTypeRole, "mimeType"},
         {ShowLinkPreviewRole, "showLinkPreview"},
         {LinkPreviewRole, "linkPreview"},
+        {SourceRole, "jsonSource"},
     };
 }
 

src/models/searchmodel.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QAbstractListModel>
-#include <QQmlEngine>
 #include <QString>
 
 #include <Quotient/csapi/search.h>
@@ -24,7 +23,6 @@ class NeoChatRoom;
 class SearchModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The text to search messages for.
@@ -85,6 +83,7 @@ public:
         MimeTypeRole,
         ShowLinkPreviewRole,
         LinkPreviewRole,
+        SourceRole,
     };
     Q_ENUM(Roles)
     explicit SearchModel(QObject *parent = nullptr);

src/models/serverlistmodel.h

@@ -7,7 +7,6 @@
 
 #include <QAbstractListModel>
 #include <QPointer>
-#include <QQmlEngine>
 #include <QUrl>
 
 /**
@@ -25,7 +24,6 @@
 class ServerListModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
 public:
     /**

src/models/sortfilterroomlistmodel.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 /**
@@ -28,7 +27,6 @@
 class SortFilterRoomListModel : public QSortFilterProxyModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The order by which the rooms will be sorted.

src/models/sortfilterspacelistmodel.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 /**
@@ -17,8 +16,6 @@
 class SortFilterSpaceListModel : public QSortFilterProxyModel
 {
     Q_OBJECT
-    QML_ELEMENT
-
     /**
      * @brief The number of spaces in the model.
      */

src/models/spacechildrenmodel.cpp

@@ -1,334 +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 "spacechildrenmodel.h"
-
-#include <Quotient/connection.h>
-#include <Quotient/jobs/basejob.h>
-#include <Quotient/room.h>
-
-#include "controller.h"
-
-SpaceChildrenModel::SpaceChildrenModel(QObject *parent)
-    : QAbstractItemModel(parent)
-{
-    m_rootItem = new SpaceTreeItem();
-}
-
-SpaceChildrenModel::~SpaceChildrenModel()
-{
-    delete m_rootItem;
-}
-
-NeoChatRoom *SpaceChildrenModel::space() const
-{
-    return m_space;
-}
-
-void SpaceChildrenModel::setSpace(NeoChatRoom *space)
-{
-    if (space == m_space) {
-        return;
-    }
-    // disconnect the new room signal from the old connection in case it is different.
-    if (m_space != nullptr) {
-        disconnect(m_space->connection(), &Quotient::Connection::loadedRoomState, this, nullptr);
-    }
-
-    m_space = space;
-    Q_EMIT spaceChanged();
-
-    for (auto job : m_currentJobs) {
-        if (job) {
-            job->abandon();
-        }
-    }
-    m_currentJobs.clear();
-
-    auto connection = m_space->connection();
-    connect(connection, &Quotient::Connection::loadedRoomState, this, [this](Quotient::Room *room) {
-        if (m_pendingChildren.contains(room->name())) {
-            m_pendingChildren.removeAll(room->name());
-            refreshModel();
-        }
-    });
-    connect(m_space, &Quotient::Room::changed, this, [this]() {
-        refreshModel();
-    });
-
-    refreshModel();
-}
-
-bool SpaceChildrenModel::loading() const
-{
-    return m_loading;
-}
-
-void SpaceChildrenModel::refreshModel()
-{
-    beginResetModel();
-    m_replacedRooms.clear();
-    delete m_rootItem;
-    m_loading = true;
-    Q_EMIT loadingChanged();
-    m_rootItem = new SpaceTreeItem(nullptr, m_space->id(), m_space->displayName(), m_space->canonicalAlias());
-    endResetModel();
-    auto job = m_space->connection()->callApi<Quotient::GetSpaceHierarchyJob>(m_space->id(), Quotient::none, Quotient::none, 1);
-    m_currentJobs.append(job);
-    connect(job, &Quotient::BaseJob::success, this, [this, job]() {
-        insertChildren(job->rooms());
-    });
-}
-
-void SpaceChildrenModel::insertChildren(std::vector<Quotient::GetSpaceHierarchyJob::ChildRoomsChunk> children, const QModelIndex &parent)
-{
-    SpaceTreeItem *parentItem = getItem(parent);
-
-    if (children[0].roomId == m_space->id() || children[0].roomId == parentItem->id()) {
-        children.erase(children.begin());
-    }
-
-    // If this is the first set of children added to the root item then we need to
-    // set it so that we are no longer loading.
-    if (rowCount(QModelIndex()) == 0 && !children.empty()) {
-        m_loading = false;
-        Q_EMIT loadingChanged();
-    }
-
-    beginInsertRows(parent, parentItem->childCount(), parentItem->childCount() + children.size() - 1);
-    for (unsigned long i = 0; i < children.size(); ++i) {
-        if (children[i].roomId == m_space->id() || children[i].roomId == parentItem->id()) {
-            continue;
-        } else {
-            int insertRow = parentItem->childCount();
-            if (const auto room = m_space->connection()->room(children[i].roomId)) {
-                const auto predecessorId = room->predecessorId();
-                if (!predecessorId.isEmpty()) {
-                    m_replacedRooms += predecessorId;
-                }
-                const auto successorId = room->successorId();
-                if (!successorId.isEmpty()) {
-                    m_replacedRooms += successorId;
-                }
-            }
-            parentItem->insertChild(insertRow,
-                                    new SpaceTreeItem(parentItem,
-                                                      children[i].roomId,
-                                                      children[i].name,
-                                                      children[i].canonicalAlias,
-                                                      children[i].topic,
-                                                      children[i].numJoinedMembers,
-                                                      children[i].avatarUrl,
-                                                      children[i].guestCanJoin,
-                                                      children[i].worldReadable,
-                                                      children[i].roomType == QLatin1String("m.space")));
-            if (children[i].childrenState.size() > 0) {
-                auto job = m_space->connection()->callApi<Quotient::GetSpaceHierarchyJob>(children[i].roomId, Quotient::none, Quotient::none, 1);
-                m_currentJobs.append(job);
-                connect(job, &Quotient::BaseJob::success, this, [this, parent, insertRow, job]() {
-                    insertChildren(job->rooms(), index(insertRow, 0, parent));
-                });
-            }
-        }
-    }
-    endInsertRows();
-}
-
-SpaceTreeItem *SpaceChildrenModel::getItem(const QModelIndex &index) const
-{
-    if (index.isValid()) {
-        SpaceTreeItem *item = static_cast<SpaceTreeItem *>(index.internalPointer());
-        if (item) {
-            return item;
-        }
-    }
-    return m_rootItem;
-}
-
-QVariant SpaceChildrenModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid()) {
-        return QVariant();
-    }
-
-    SpaceTreeItem *child = getItem(index);
-    if (role == DisplayNameRole) {
-        auto displayName = child->name();
-        if (!displayName.isEmpty()) {
-            return displayName;
-        }
-
-        displayName = child->canonicalAlias();
-        if (!displayName.isEmpty()) {
-            return displayName;
-        }
-
-        return child->id();
-    }
-    if (role == AvatarUrlRole) {
-        return child->avatarUrl();
-    }
-    if (role == TopicRole) {
-        return child->topic();
-    }
-    if (role == RoomIDRole) {
-        return child->id();
-    }
-    if (role == AliasRole) {
-        return child->canonicalAlias();
-    }
-    if (role == MemberCountRole) {
-        return child->memberCount();
-    }
-    if (role == AllowGuestsRole) {
-        return child->allowGuests();
-    }
-    if (role == WorldReadableRole) {
-        return child->worldReadable();
-    }
-    if (role == IsJoinedRole) {
-        return child->isJoined();
-    }
-    if (role == IsSpaceRole) {
-        return child->isSpace();
-    }
-    if (role == CanAddChildrenRole) {
-        if (const auto room = static_cast<NeoChatRoom *>(m_space->connection()->room(child->id()))) {
-            return room->canSendState(QLatin1String("m.space.child"));
-        }
-        return false;
-    }
-    if (role == ParentDisplayNameRole) {
-        const auto parent = child->parentItem();
-        auto displayName = parent->name();
-        if (!displayName.isEmpty()) {
-            return displayName;
-        }
-
-        displayName = parent->canonicalAlias();
-        if (!displayName.isEmpty()) {
-            return displayName;
-        }
-
-        return parent->id();
-    }
-    if (role == CanSetParentRole) {
-        if (const auto room = static_cast<NeoChatRoom *>(m_space->connection()->room(child->id()))) {
-            return room->canSendState(QLatin1String("m.space.parent"));
-        }
-        return false;
-    }
-    if (role == IsDeclaredParentRole) {
-        if (const auto room = static_cast<NeoChatRoom *>(m_space->connection()->room(child->id()))) {
-            return room->currentState().contains(QLatin1String("m.space.parent"), child->parentItem()->id());
-        }
-        return false;
-    }
-    if (role == CanRemove) {
-        const auto parent = child->parentItem();
-        if (const auto room = static_cast<NeoChatRoom *>(m_space->connection()->room(parent->id()))) {
-            return room->canSendState(QLatin1String("m.space.child"));
-        }
-        return false;
-    }
-    if (role == ParentRoomRole) {
-        if (const auto parentRoom = static_cast<NeoChatRoom *>(m_space->connection()->room(child->parentItem()->id()))) {
-            return QVariant::fromValue(parentRoom);
-        }
-        return QVariant::fromValue(nullptr);
-    }
-
-    return {};
-}
-
-QModelIndex SpaceChildrenModel::index(int row, int column, const QModelIndex &parent) const
-{
-    if (!hasIndex(row, column, parent)) {
-        return QModelIndex();
-    }
-
-    SpaceTreeItem *parentItem = getItem(parent);
-    if (!parentItem) {
-        return QModelIndex();
-    }
-
-    SpaceTreeItem *childItem = parentItem->child(row);
-    if (childItem) {
-        return createIndex(row, column, childItem);
-    }
-    return QModelIndex();
-}
-
-QModelIndex SpaceChildrenModel::parent(const QModelIndex &index) const
-{
-    if (!index.isValid()) {
-        return QModelIndex();
-    }
-
-    SpaceTreeItem *childItem = static_cast<SpaceTreeItem *>(index.internalPointer());
-    SpaceTreeItem *parentItem = childItem->parentItem();
-
-    if (parentItem == m_rootItem) {
-        return QModelIndex();
-    }
-
-    return createIndex(parentItem->row(), 0, parentItem);
-}
-
-int SpaceChildrenModel::rowCount(const QModelIndex &parent) const
-{
-    SpaceTreeItem *parentItem;
-    if (parent.column() > 0) {
-        return 0;
-    }
-
-    if (!parent.isValid()) {
-        parentItem = m_rootItem;
-    } else {
-        parentItem = static_cast<SpaceTreeItem *>(parent.internalPointer());
-    }
-
-    return parentItem->childCount();
-}
-
-int SpaceChildrenModel::columnCount(const QModelIndex &parent) const
-{
-    Q_UNUSED(parent);
-    return 1;
-}
-
-QHash<int, QByteArray> SpaceChildrenModel::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-
-    roles[DisplayNameRole] = "displayName";
-    roles[AvatarUrlRole] = "avatarUrl";
-    roles[TopicRole] = "topic";
-    roles[RoomIDRole] = "roomId";
-    roles[MemberCountRole] = "memberCount";
-    roles[AllowGuestsRole] = "allowGuests";
-    roles[WorldReadableRole] = "worldReadable";
-    roles[IsJoinedRole] = "isJoined";
-    roles[AliasRole] = "alias";
-    roles[IsSpaceRole] = "isSpace";
-    roles[CanAddChildrenRole] = "canAddChildren";
-    roles[ParentDisplayNameRole] = "parentDisplayName";
-    roles[CanSetParentRole] = "canSetParent";
-    roles[IsDeclaredParentRole] = "isDeclaredParent";
-    roles[CanRemove] = "canRemove";
-    roles[ParentRoomRole] = "parentRoom";
-
-    return roles;
-}
-
-bool SpaceChildrenModel::isRoomReplaced(const QString &roomId) const
-{
-    return m_replacedRooms.contains(roomId);
-}
-
-void SpaceChildrenModel::addPendingChild(const QString &childName)
-{
-    m_pendingChildren += childName;
-}
-
-#include "moc_spacechildrenmodel.cpp"

src/models/spacechildrenmodel.h

@@ -1,144 +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 <QAbstractItemModel>
-#include <QQmlEngine>
-
-#include <Quotient/csapi/space_hierarchy.h>
-#include <qtmetamacros.h>
-
-#include "neochatroom.h"
-#include "spacetreeitem.h"
-
-/**
- * @class SpaceChildrenModel
- *
- * Create a model that contains a list of the child rooms for any given space id.
- */
-class SpaceChildrenModel : public QAbstractItemModel
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    /**
-     * @brief The current space that the hierarchy is being generated for.
-     */
-    Q_PROPERTY(NeoChatRoom *space READ space WRITE setSpace NOTIFY spaceChanged)
-
-    /**
-     * @brief Whether the model is loading the initial set of children.
-     */
-    Q_PROPERTY(bool loading READ loading NOTIFY loadingChanged)
-
-public:
-    enum Roles {
-        DisplayNameRole = Qt::DisplayRole,
-        AvatarUrlRole,
-        TopicRole,
-        RoomIDRole,
-        AliasRole,
-        MemberCountRole,
-        AllowGuestsRole,
-        WorldReadableRole,
-        IsJoinedRole,
-        IsSpaceRole,
-        CanAddChildrenRole,
-        ParentDisplayNameRole,
-        CanSetParentRole,
-        IsDeclaredParentRole,
-        CanRemove,
-        ParentRoomRole,
-    };
-
-    explicit SpaceChildrenModel(QObject *parent = nullptr);
-    ~SpaceChildrenModel();
-
-    NeoChatRoom *space() const;
-    void setSpace(NeoChatRoom *space);
-
-    bool loading() const;
-
-    /**
-     * @brief Get the given role value at the given index.
-     *
-     * @sa QAbstractItemModel::data
-     */
-    QVariant data(const QModelIndex &index, int role = DisplayNameRole) const override;
-
-    /**
-     * @brief Returns the index of the item in the model specified by the given row, column and parent index.
-     *
-     * @sa QAbstractItemModel::index
-     */
-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
-
-    /**
-     * @brief Returns the parent of the model item with the given index.
-     *
-     * If the item has no parent, an invalid QModelIndex is returned.
-     *
-     * @sa QAbstractItemModel::parent
-     */
-    QModelIndex parent(const QModelIndex &index) const override;
-
-    /**
-     * @brief Number of rows in the model.
-     *
-     * @sa QAbstractItemModel::rowCount
-     */
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-
-    /**
-     * @brief Number of columns in the model.
-     *
-     * @sa QAbstractItemModel::columnCount
-     */
-    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
-
-    /**
-     * @brief Returns a mapping from Role enum values to role names.
-     *
-     * @sa Roles, QAbstractItemModel::roleNames()
-     */
-    QHash<int, QByteArray> roleNames() const override;
-
-    /**
-     * @brief Whether the room has been replaced.
-     *
-     * @note This information is only available if the local user is either a member
-     *       of the replaced room or is a member of the successor room as currently
-     *       there is no other way to obtain the required information.
-     */
-    bool isRoomReplaced(const QString &roomId) const;
-
-    /**
-     * @brief Add the name of new child room that is expected to be added soon.
-     *
-     * A pending child is one where Quotient::Connection::createRoom has been called
-     * but the room hasn't synced with the server yet. This list is used to check
-     * whether a new room loading should trigger a refresh of the model, as we only
-     * want to trigger a refresh if the loading room is part of this space.
-     */
-    Q_INVOKABLE void addPendingChild(const QString &childName);
-
-Q_SIGNALS:
-    void spaceChanged();
-    void loadingChanged();
-
-private:
-    NeoChatRoom *m_space = nullptr;
-    SpaceTreeItem *m_rootItem;
-
-    bool m_loading = false;
-    QList<QPointer<Quotient::GetSpaceHierarchyJob>> m_currentJobs;
-    QList<QString> m_pendingChildren;
-
-    QList<QString> m_replacedRooms;
-
-    SpaceTreeItem *getItem(const QModelIndex &index) const;
-
-    void refreshModel();
-    void insertChildren(std::vector<Quotient::GetSpaceHierarchyJob::ChildRoomsChunk> children, const QModelIndex &parent = QModelIndex());
-};

src/models/spacechildsortfiltermodel.cpp

@@ -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
-
-#include "spacechildsortfiltermodel.h"
-
-#include "spacechildrenmodel.h"
-
-SpaceChildSortFilterModel::SpaceChildSortFilterModel(QObject *parent)
-    : QSortFilterProxyModel(parent)
-{
-    setRecursiveFilteringEnabled(true);
-    sort(0);
-}
-
-void SpaceChildSortFilterModel::setFilterText(const QString &filterText)
-{
-    m_filterText = filterText;
-    Q_EMIT filterTextChanged();
-    invalidateFilter();
-}
-
-QString SpaceChildSortFilterModel::filterText() const
-{
-    return m_filterText;
-}
-
-bool SpaceChildSortFilterModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
-{
-    if (!source_left.data(SpaceChildrenModel::IsSpaceRole).toBool() && source_right.data(SpaceChildrenModel::IsSpaceRole).toBool()) {
-        return false;
-    }
-    return true;
-}
-
-bool SpaceChildSortFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
-{
-    QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
-    if (auto sourceModel = static_cast<SpaceChildrenModel *>(this->sourceModel())) {
-        bool isReplaced = sourceModel->isRoomReplaced(index.data(SpaceChildrenModel::RoomIDRole).toString());
-        bool acceptRoom = index.data(SpaceChildrenModel::DisplayNameRole).toString().contains(m_filterText, Qt::CaseInsensitive);
-        return !isReplaced && acceptRoom;
-    }
-    return true;
-}
-
-#include "moc_spacechildsortfiltermodel.cpp"