Build KNotifications master

Don't merge until KF 6.19 is released because KNotifications depends on ECM 6.18.
2025-09-12 14:17:59 -04:00
158 changed files with 27156 additions and 46619 deletions
--- a/.craft.ini
+++ b/.craft.ini
@@ -4,3 +4,5 @@
 [BlueprintSettings]
 kde/applications/neochat.packageAppx=True
 libs/qt.qtMajorVersion=6
+; Remove once KNotifications v6.19 releases, to make Android notifications work again
+kde/frameworks/tier3/knotifications.version=master
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -14,6 +14,7 @@ Dependencies:
      'frameworks/kquickcharts': '@latest-kf6'
      'frameworks/knotifications': '@latest-kf6'
      'frameworks/kcolorscheme': '@latest-kf6'
+      'frameworks/kiconthemes': '@latest-kf6'
      'libraries/kquickimageeditor': '@latest-kf6'
      'frameworks/sonnet': '@latest-kf6'
      'frameworks/prison': '@latest-kf6'
@@ -28,6 +29,7 @@ Dependencies:
      'frameworks/kio': '@latest-kf6'
      'frameworks/kwindowsystem': '@latest-kf6'
      'frameworks/kstatusnotifieritem': '@latest-kf6'
+      'frameworks/kcrash': '@latest-kf6'
  - 'on': ['Linux', 'FreeBSD']
    'require':
      'frameworks/kdbusaddons': '@latest-kf6'
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.16)
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "25")
 set(RELEASE_SERVICE_VERSION_MINOR "11")
-set(RELEASE_SERVICE_VERSION_MICRO "90")
+set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")

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

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

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

 set(QUOTIENT_FORCE_NAMESPACED_INCLUDES TRUE)

-ecm_set_disabled_deprecation_versions(Qt 6.9.0 KF 6.17.0)
-
 ecm_setup_version(${PROJECT_VERSION}
    VARIABLE_PREFIX NEOCHAT
    VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
@@ -69,7 +66,7 @@ if (QT_KNOWN_POLICY_QTP0004)
 qt_policy(SET QTP0004 NEW)
 endif ()

-find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels ColorScheme)
+find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels IconThemes ColorScheme)
 set_package_properties(KF6 PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
@@ -78,7 +75,7 @@ set_package_properties(KF6Kirigami PROPERTIES
    TYPE REQUIRED
    PURPOSE "Kirigami application UI framework"
 )
-find_package(KF6KirigamiAddons 1.10.0 REQUIRED)
+find_package(KF6KirigamiAddons 1.6.0 REQUIRED)

 if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT NEOCHAT_FLATPAK AND NOT NEOCHAT_APPIMAGE)
    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Purpose)
@@ -92,7 +89,7 @@ if(ANDROID)
    )
 else()
    find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem)
+    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem Crash)
    find_package(KF6SyntaxHighlighting ${KF_MIN_VERSION} REQUIRED)
    set_package_properties(KF6QQC2DesktopStyle PROPERTIES
        TYPE RUNTIME
--- a/autotests/server.cpp
+++ b/autotests/server.cpp
@@ -4,12 +4,15 @@
 #include "server.h"

 #include <QFile>
+#include <QHttpServer>
 #include <QHttpServerResponder>
 #include <QJsonArray>
 #include <QJsonDocument>
+#include <QJsonObject>
 #include <QNetworkReply>
 #include <QSslCertificate>
 #include <QSslKey>
+#include <QSslServer>
 #include <QUuid>

 #include <Quotient/networkaccessmanager.h>
--- a/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
@@ -41,7 +41,6 @@
  <name xml:lang="pl">NeoChat</name>
  <name xml:lang="pt">NeoChat</name>
  <name xml:lang="pt-BR">NeoChat</name>
-  <name xml:lang="ro">NeoChat</name>
  <name xml:lang="ru">NeoChat</name>
  <name xml:lang="sa">नवचैट्</name>
  <name xml:lang="sk">NeoChat</name>
@@ -76,7 +75,6 @@
  <summary xml:lang="nn">Prat med via Matrix</summary>
  <summary xml:lang="pl">Rozmawiaj na Matriksie</summary>
  <summary xml:lang="pt-BR">Bate-papo na Matrix</summary>
-  <summary xml:lang="ro">Discutați pe Matrix</summary>
  <summary xml:lang="ru">Общение в Matrix</summary>
  <summary xml:lang="sa">Matrix इत्यत्र गपशपं कुर्वन्तु</summary>
  <summary xml:lang="sl">Klepet na Matrixu</summary>
@@ -111,7 +109,6 @@
    <p xml:lang="nn">NeoChat er ein prateapp som lèt deg bruka all funksjonalitet i Matrix-nettverket. Du kan utveksla tekst, lyd og videoar med vennar, familie og kollegaar på ein trygg måte.</p>
    <p xml:lang="pl">NoeChat to aplikacja do rozmów, która umożliwia wykorzystanie wszystkich możliwości Matriksa. Umożliwia wysyłanie wiadomości tekstowych, filmów i dźwięków w bezpieczny sposób do twojej rodziny, kolegów i przyjaciół.</p>
    <p xml:lang="pt-BR">O NeoChat é um aplicativo de bate-papo que permite que você aproveite ao máximo a rede Matrix. Ele oferece uma maneira segura de enviar mensagens de texto, vídeos e arquivos de áudio para sua família, colegas e amigos.</p>
-    <p xml:lang="ro">NeoChat e o aplicație de discuții ce vă ajută să profitați din plin de rețeaua Matrix. Aceasta oferă o modalitate sigură de a trimite mesaje textuale, videoclipuri și fișiere audio familiei, colegilor și prietenilor.</p>
    <p xml:lang="ru">NeoChat — приложение для общения, предоставляющее все преимущества сети Matrix. С его помощью можно безопасно отправлять текстовые сообщения, видеозаписи и звуковые файлы родственникам, коллегам и друзьям.</p>
    <p xml:lang="sa">NeoChat इति एकं गपशप-अनुप्रयोगं यत् भवान् Matrix-जालस्य पूर्णं लाभं ग्रहीतुं शक्नोति । एतत् भवन्तं भवतः परिवाराय, सहकारिभ्यः, मित्रेभ्यः च पाठसन्देशान्, भिडियो, श्रव्यसञ्चिकाः च प्रेषयितुं सुरक्षितं मार्गं प्रदाति ।</p>
    <p xml:lang="sl">NeoChat je aplikacija za klepet, ki vam omogoča, da v celoti izkoristite omrežje Matrix. Zagotavlja vam varen način za pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, sodelavcem in prijateljem.</p>
@@ -145,7 +142,6 @@
    <p xml:lang="pl">NeoChat w zamyśle ma być pełnowartościową aplikacją wg wytycznych Matriksa. Z tego powodu, wszystko, co jest obecnie w stabilnych wytycznych z pominięciem VoIP, wątków i niektórych części szyfrowania Użytkownik-do-Użytkownika są obecnie obsługiwane. Pominięto też kilka mniejszych rzeczy ze względu na ciągły rozwój wytycznych Matriksa, lecz celem nadal jest zapewnienie obsługi wszystkich wytycznych.</p>
    <p xml:lang="pt">O NeoChat pretende ser uma aplicação completa para a especificação do Matrix. Como tal, tudo o que existe na especificação estável actual, com as notáveis excepções do VoIP, tópicos e alguns aspectos da Encriptação Ponto-a-Ponto, são suportados. Existem mais algumas omissões, devido ao facto que a norma do Matrix está em constante evolução, mas o objectivo continua a ser oferecer o suporte eventual para a norma por inteiro.</p>
    <p xml:lang="pt-BR">O NeoChat pretende ser um aplicativo completo para a especificação Matrix. Dessa forma, tudo na especificação estável atual, com as notáveis exceções de VoIP, tópicos e alguns aspectos da criptografia de ponta a ponta, é suportado. Há algumas outras pequenas omissões devido ao fato de a especificação Matrix estar em constante evolução, mas o objetivo continua sendo fornecer suporte eventual para toda a especificação.</p>
-    <p xml:lang="ro">NeoChat vrea să fie o aplicație completă pentru specificațiile Matrix. Astfel, susține tot ce se găsește acum în specificațiile stabile cu excepția VoIP, a firelor de discuții, și a unor părți din criptarea punct-la-punct. Sunt și câteva omisiuni minore din cauza faptului că specificația Matrix evoluează continuu, dar scopul rămâne acela de a implementa întreaga specificație.</p>
    <p xml:lang="ru">Целью создания NeoChat является полноценная реализация программы для спецификации Matrix. Как следствие, реализовано всё в текущей стабильной спецификации (за исключением голосовой интернет-связи, потоков и некоторых аспектов сквозного шифрования). Есть также несколько других незначительных пробелов, обусловленных постоянными изменениями спецификации Matrix. Тем не менее, стоит задача в итоге предоставить полную поддержку спецификации.</p>
    <p xml:lang="sa">NeoChat इत्यस्य उद्देश्यं Matrix विनिर्देशस्य कृते पूर्णतया विशेषतायुक्तः अनुप्रयोगः भवितुम् अस्ति । यथा तथा वर्तमानस्थिरविनिर्देशे सर्वं VoIP इत्यस्य उल्लेखनीयअपवादैः सह, थ्रेड्स तथा च End-to-End Encryption इत्यस्य केचन पक्षाः समर्थिताः सन्ति । अन्ये कतिचन लघु लोपाः सन्ति यतोहि Matrix spec निरन्तरं विकसितः अस्ति परन्तु उद्देश्यं सम्पूर्ण spec कृते अन्ततः समर्थनं प्रदातुं अवशिष्टम् अस्ति</p>
    <p xml:lang="sl">Neochat cilja, da bi bila popolna aplikacija po specifikaciji Matrixa. Kot takšna vsebuje vse v trenutni stabilni specifikaciji z pomembnimi izjemami pri VoIP, nitih in nekaterih vidikov šifriranja od konca do konca. Obstaja nekaj drugih manjših opustitev zaradi dejstva, da se specifikacija Matrix nenehno razvija, vendar cilj ostaja zagotoviti morebitno podporo celotni specifikaciji.</p>
@@ -179,7 +175,6 @@
    <p xml:lang="pl">Ze względu na sposób rozwoju Matriksa, NeoChat obsługuje także kilka niestabilnych możliwości. Obecnie są to:</p>
    <p xml:lang="pt">Devido à natureza do desenvolvimento da especificação do Matrix, o NeoChat também suporta diversas funcionalidades instáveis. De momento são:</p>
    <p xml:lang="pt-BR">Devido à natureza do desenvolvimento da especificação Matrix, o NeoChat também suporta diversos recursos instáveis. Atualmente, são eles:</p>
-    <p xml:lang="ro">Datorită modului de dezvoltare a specificațiilor Matrix, NeoChat susține și numeroase caracteristici nestabile. Acum, acestea sunt:</p>
    <p xml:lang="ru">В силу природы разработки спецификации Matrix в NeoChat тоже предусмотрена поддержка многочисленных нестабильных возможностей. В текущей версии это следующие возможности:</p>
    <p xml:lang="sa">Matrix विनिर्देशविकासस्य प्रकृतेः कारणात् NeoChat अपि अनेकानाम् अस्थिरविशेषतानां समर्थनं करोति । सम्प्रति एते सन्ति :</p>
    <p xml:lang="sl">Zaradi narave razvoja specifikacije Matrixa NeoChat podpira tudi številne nestabilne zmožnosti. Trenutno so to:</p>
@@ -214,7 +209,6 @@
      <li xml:lang="pl">Ankiety - MSC3381</li>
      <li xml:lang="pt">Inquéritos - MSC3381</li>
      <li xml:lang="pt-BR">Enquetes - MSC3381</li>
-      <li xml:lang="ro">Sondaje - MSC3381</li>
      <li xml:lang="ru">Голосования — MSC3381</li>
      <li xml:lang="sa">मतदान - MSC3381</li>
      <li xml:lang="sl">Polls - MSC3381</li>
@@ -248,7 +242,6 @@
      <li xml:lang="pl">Paczki naklejek - MSC2545</li>
      <li xml:lang="pt">Pacotes de Autocolantes - MSC2545</li>
      <li xml:lang="pt-BR">Pacotes de Stickers - MSC2545</li>
-      <li xml:lang="ro">Colecții de abțibilduri - MSC2545</li>
      <li xml:lang="ru">Наборы стикеров — MSC2545</li>
      <li xml:lang="sa">स्टिकर पैक - MSC2545</li>
      <li xml:lang="sl">Sticker Packs - MSC2545</li>
@@ -282,7 +275,6 @@
      <li xml:lang="pl">Wydarzenia w miejscach - MSC3488</li>
      <li xml:lang="pt">Eventos com Localizações - MSC3488</li>
      <li xml:lang="pt-BR">Localização de eventos - MSC3488</li>
-      <li xml:lang="ro">Evenimente de amplasare - MSC3488</li>
      <li xml:lang="ru">События местоположения — MSC3488</li>
      <li xml:lang="sa">स्थान घटनाएँ - MSC3488</li>
      <li xml:lang="sl">Location Events - MSC3488</li>
@@ -320,7 +312,7 @@
    <value key="KDE::windows_store::StoreLogoSquare">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/storelogo-1080x1080.png</value>
    <value key="KDE::windows_store::Icon">https://invent.kde.org/network/neochat/-/raw/master/icons/300-apps-neochat.png</value>
    <value key="KDE::windows_store::PromotionalArt16x9">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/promoimage-1920x1080.png</value>
-    <value key="KDE::supporters">Anonymous donor, Akseli</value>
+    <value key="KDE::supporters">Tanguy Fardet;[dabe](https://freeradical.zone/@dabe);[lengau](https://mastodon.world/@lengau);Joshua Strobl;Stuart Turton</value>
  </custom>
  <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
  <screenshots>
@@ -352,7 +344,6 @@
      <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
      <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
      <caption xml:lang="pt-BR">Visão principal com lista de salas, bate-papo e informações sobre as salas</caption>
-      <caption xml:lang="ro">Vederea principală cu lista de camere, discuție, și informații despre cameră</caption>
      <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
      <caption xml:lang="sa">कक्षसूची, गपशपः, कक्षसूचना च सह मुख्यदृश्यम्</caption>
      <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
@@ -389,7 +380,6 @@
      <caption xml:lang="nn">Oppdag nye fellesskap med Matrix Spaces</caption>
      <caption xml:lang="pl">Odkrywaj nowe społeczności w Przestrzeniach Matriksa</caption>
      <caption xml:lang="pt-BR">Descubra novas comunidades com os Espaços Matrix</caption>
-      <caption xml:lang="ro">Descoperiți comunități noi cu Spații Matrix</caption>
      <caption xml:lang="ru">Поиск новых сообществ с помощью Matrix Spaces</caption>
      <caption xml:lang="sa">Matrix Spaces इत्यनेन सह नूतनानां समुदायानाम् अन्वेषणं कुर्वन्तु</caption>
      <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
@@ -434,7 +424,6 @@
      <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
      <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
      <caption xml:lang="pt-BR">Visão principal com lista de salas, bate-papo e informações sobre as salas</caption>
-      <caption xml:lang="ro">Vederea principală cu lista de camere, discuție, și informații despre cameră</caption>
      <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
      <caption xml:lang="sa">कक्षसूची, गपशपः, कक्षसूचना च सह मुख्यदृश्यम्</caption>
      <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
@@ -473,7 +462,6 @@
      <caption xml:lang="pl">Ekran logowania</caption>
      <caption xml:lang="pt">Ecrã de autenticação</caption>
      <caption xml:lang="pt-BR">Tela de login</caption>
-      <caption xml:lang="ro">Ecran de autentificare</caption>
      <caption xml:lang="ru">Окно входа</caption>
      <caption xml:lang="sa">लॉगिन् स्क्रीन</caption>
      <caption xml:lang="sl">Prijavni zaslon</caption>
@@ -488,8 +476,6 @@
    <content_attribute id="social-chat">intense</content_attribute>
  </content_rating>
  <releases>
-    <release version="25.08.3" date="2025-11-06"/>
-    <release version="25.08.2" date="2025-10-09"/>
    <release version="25.08.1" date="2025-09-11"/>
    <release version="25.08.0" date="2025-08-14"/>
    <release version="25.04.3" date="2025-07-03"/>
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -112,7 +112,6 @@ Comment[lv]=Tērzējiet „Matrix“ tīklā
 Comment[nl]=Chat op Matrix
 Comment[pl]=Rozmawiaj na Matriksie
 Comment[pt_BR]=Bate papo na Matrix
-Comment[ro]=Discutați pe Matrix
 Comment[ru]=Общение в Matrix
 Comment[sa]=Matrix इत्यत्र गपशपं कुर्वन्तु
 Comment[sl]=Klepet na Matrixu
--- a/po/ar/neochat.po
+++ b/po/ar/neochat.po
--- a/po/ast/neochat.po
+++ b/po/ast/neochat.po
--- a/po/az/neochat.po
+++ b/po/az/neochat.po
--- a/po/ca/neochat.po
+++ b/po/ca/neochat.po
--- a/po/ca@valencia/neochat.po
+++ b/po/ca@valencia/neochat.po
--- a/po/cs/neochat.po
+++ b/po/cs/neochat.po
--- a/po/da/neochat.po
+++ b/po/da/neochat.po
--- a/po/de/neochat.po
+++ b/po/de/neochat.po
--- a/po/el/neochat.po
+++ b/po/el/neochat.po
--- a/po/en_GB/neochat.po
+++ b/po/en_GB/neochat.po
--- a/po/eo/neochat.po
+++ b/po/eo/neochat.po
--- a/po/es/neochat.po
+++ b/po/es/neochat.po
--- a/po/eu/neochat.po
+++ b/po/eu/neochat.po
--- a/po/fi/neochat.po
+++ b/po/fi/neochat.po
--- a/po/fr/neochat.po
+++ b/po/fr/neochat.po
--- a/po/gl/neochat.po
+++ b/po/gl/neochat.po
--- a/po/he/neochat.po
+++ b/po/he/neochat.po
--- a/po/hi/neochat.po
+++ b/po/hi/neochat.po
--- a/po/hu/neochat.po
+++ b/po/hu/neochat.po
--- a/po/ia/neochat.po
+++ b/po/ia/neochat.po
--- a/po/id/neochat.po
+++ b/po/id/neochat.po
--- a/po/ie/neochat.po
+++ b/po/ie/neochat.po
--- a/po/it/neochat.po
+++ b/po/it/neochat.po
--- a/po/ja/neochat.po
+++ b/po/ja/neochat.po
--- a/po/ka/neochat.po
+++ b/po/ka/neochat.po
--- a/po/ko/neochat.po
+++ b/po/ko/neochat.po
--- a/po/lt/neochat.po
+++ b/po/lt/neochat.po
--- a/po/lv/neochat.po
+++ b/po/lv/neochat.po
--- a/po/nl/neochat.po
+++ b/po/nl/neochat.po
--- a/po/nn/neochat.po
+++ b/po/nn/neochat.po
--- a/po/pa/neochat.po
+++ b/po/pa/neochat.po
--- a/po/pl/neochat.po
+++ b/po/pl/neochat.po
--- a/po/pt/neochat.po
+++ b/po/pt/neochat.po
--- a/po/pt_BR/neochat.po
+++ b/po/pt_BR/neochat.po
--- a/po/ro/neochat.po
+++ b/po/ro/neochat.po
--- a/po/ru/neochat.po
+++ b/po/ru/neochat.po
--- a/po/sa/neochat.po
+++ b/po/sa/neochat.po
--- a/po/sk/neochat.po
+++ b/po/sk/neochat.po
--- a/po/sl/neochat.po
+++ b/po/sl/neochat.po
--- a/po/sv/neochat.po
+++ b/po/sv/neochat.po
--- a/po/ta/neochat.po
+++ b/po/ta/neochat.po
--- a/po/tok/neochat.po
+++ b/po/tok/neochat.po
--- a/po/tr/neochat.po
+++ b/po/tr/neochat.po
--- a/po/uk/neochat.po
+++ b/po/uk/neochat.po
--- a/po/zh_CN/neochat.po
+++ b/po/zh_CN/neochat.po
--- a/po/zh_TW/neochat.po
+++ b/po/zh_TW/neochat.po
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -103,7 +103,6 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
        qml/ReasonDialog.qml
        qml/NewPollDialog.qml
        qml/UserMenu.qml
-        qml/MeetingDialog.qml
    DEPENDENCIES
        QtCore
        QtQuick
@@ -203,9 +202,8 @@ target_link_libraries(neochat PUBLIC
    KF6::ConfigGui
    KF6::CoreAddons
    KF6::SonnetCore
+    KF6::IconThemes
    KF6::ItemModels
-    KF6::I18nQml
-    KirigamiApp
    QuotientQt6
    Login
    Rooms
@@ -213,6 +211,10 @@ target_link_libraries(neochat PUBLIC
    Spaces
 )

+if (TARGET KF6::Crash)
+    target_link_libraries(neochat PUBLIC KF6::Crash)
+endif()
+
 kconfig_target_kcfg_file(neochat FILE neochatconfig.kcfg CLASS_NAME NeoChatConfig MUTATORS GENERATE_PROPERTIES DEFAULT_VALUE_GETTERS PARENT_IN_CONSTRUCTOR SINGLETON GENERATE_MOC QML_REGISTRATION)

 if(NEOCHAT_FLATPAK)
@@ -323,7 +325,6 @@ if(ANDROID)
        "kt-restore-defaults-symbolic"
        "user-symbolic"
        "mark-location-symbolic"
-        "amarok_playcount"

        ${KIRIGAMI_ADDONS_ICONS}
    )
--- a/src/app/controller.cpp
+++ b/src/app/controller.cpp
@@ -17,6 +17,7 @@
 #include <Quotient/qt_connection_util.h>
 #include <Quotient/settings.h>

+#include "accountmanager.h"
 #include "enums/roomsortparameter.h"
 #include "general_logging.h"
 #include "mediasizehelper.h"
@@ -25,7 +26,9 @@
 #include "models/roomlistmodel.h"
 #include "models/roomtreemodel.h"
 #include "neochatconfig.h"
+#include "neochatconnection.h"
 #include "neochatroom.h"
+#include "notificationsmanager.h"
 #include "proxycontroller.h"
 #include "roommanager.h"

@@ -306,7 +309,8 @@ void Controller::listenForNotifications()
    connect(timer, &QTimer::timeout, qGuiApp, &QGuiApplication::quit);

    connect(connector, &KUnifiedPush::Connector::messageReceived, [timer](const QByteArray &data) {
-        NotificationsManager::postPushNotification(data);
+        instance().m_notificationsManager.postPushNotification(data);
+        timer->stop();
    });

    // Wait five seconds to see if we received any messages or this happened to be an erroneous activation.
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -33,9 +33,13 @@
 #include <KWindowSystem>
 #endif

-#include <KLocalizedQmlContext>
+#if __has_include("KCrash")
+#include <KCrash>
+#endif
+
+#include <KIconTheme>
+#include <KLocalizedContext>
 #include <KLocalizedString>
-#include <KirigamiApp>

 #include "neochat-version.h"

@@ -100,6 +104,7 @@ Q_DECL_EXPORT
 #endif
 int main(int argc, char *argv[])
 {
+    KIconTheme::initTheme();
    QNetworkProxyFactory::setUseSystemConfiguration(true);

 #ifdef HAVE_WEBVIEW
@@ -108,10 +113,24 @@ int main(int argc, char *argv[])
    QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi);
 #endif

-    KirigamiApp::App app(argc, argv);
-    KirigamiApp kirigamiApp;
+#ifdef Q_OS_ANDROID
+    QGuiApplication app(argc, argv);
+    QQuickStyle::setStyle(u"org.kde.breeze"_s);
+#else
+    QIcon::setFallbackThemeName("breeze"_L1);
+    QApplication app(argc, argv);
+    // Default to org.kde.desktop style unless the user forces another style
+    if (qEnvironmentVariableIsEmpty("QT_QUICK_CONTROLS_STYLE")) {
+        QQuickStyle::setStyle(u"org.kde.desktop"_s);
+    }
+#endif

 #ifdef Q_OS_WINDOWS
+    if (AttachConsole(ATTACH_PARENT_PROCESS)) {
+        freopen("CONOUT$", "w", stdout);
+        freopen("CONOUT$", "w", stderr);
+    }
+
    QApplication::setStyle(u"breeze"_s);
    QFont font(u"Segoe UI Emoji"_s);
    font.setPointSize(10);
@@ -158,6 +177,10 @@ int main(int argc, char *argv[])
    KAboutData::setApplicationData(about);
    QGuiApplication::setWindowIcon(QIcon::fromTheme(u"org.kde.neochat"_s));

+#if __has_include("KCrash")
+    KCrash::initialize();
+#endif
+
    Connection::setEncryptionDefault(true);
    Connection::setDirectChatEncryptionDefault(true);

@@ -182,7 +205,7 @@ int main(int argc, char *argv[])
    parser.addOption(testOption);

 #ifdef HAVE_KUNIFIEDPUSH
-    QCommandLineOption dbusActivatedOption(u"dbus-activated"_s);
+    QCommandLineOption dbusActivatedOption(u"dbus-activated"_s, i18n("Internal usage only."));
    dbusActivatedOption.setFlags(QCommandLineOption::Flag::HiddenFromHelp);
    parser.addOption(dbusActivatedOption);
 #endif
@@ -196,14 +219,8 @@ int main(int argc, char *argv[])

 #ifdef HAVE_KUNIFIEDPUSH
    if (parser.isSet(dbusActivatedOption)) {
-#ifdef HAVE_KDBUSADDONS
-        // We *don't* want to use KDBusService here. I don't know why, but it makes activation super unreliable. We don't really need it anyway.
-        if (!QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.neochat"))) {
-            // Gracefully fail if NeoChat is already running
-            qWarning() << "NeoChat already running, not sending push notifications.";
-            return 0;
-        }
-#endif
+        // We want to be replaceable by the main client
+        KDBusService service(KDBusService::Replace);

 #ifdef HAVE_RUNNER
        // If we are built with KRunner and KUnifiedPush support, we need to do something special.
@@ -262,7 +279,7 @@ int main(int argc, char *argv[])
                    });
 #endif

-    KLocalization::setupLocalizedContext(&engine);
+    engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
    engine.setNetworkAccessManagerFactory(new NetworkAccessManagerFactory());

    if (parser.isSet("ignore-ssl-errors"_L1)) {
@@ -277,9 +294,7 @@ int main(int argc, char *argv[])

    engine.addImageProvider(u"blurhash"_s, new BlurhashImageProvider);

-    if (!kirigamiApp.start("org.kde.neochat", "Main", &engine)) {
-        return -1;
-    }
+    engine.loadFromModule("org.kde.neochat", "Main");

    if (!parser.positionalArguments().isEmpty() && !parser.isSet("share"_L1)) {
        RoomManager::instance().setUrlArgument(parser.positionalArguments()[0]);
--- a/src/app/neochat.notifyrc
+++ b/src/app/neochat.notifyrc
@@ -211,7 +211,6 @@ Name[pa]=ਨਵਾਂ ਸੱਦਾ
 Name[pl]=Nowe zaproszenie
 Name[pt]=Novo Convite
 Name[pt_BR]=Novo convite
-Name[ro]=Invitație nouă
 Name[ru]=Новое приглашение
 Name[sa]=नवीन आमन्त्रणम्
 Name[sl]=Novo povabilo
@@ -253,13 +252,12 @@ Comment[pa]=ਰੂਮ ਲਈ ਨਵਾਂ ਸੱਦਾ ਹੈ
 Comment[pl]=Dostępna jest nowe zaproszenie do pokoju
 Comment[pt]=Existe um novo convite para uma sala
 Comment[pt_BR]=Existe um novo convite para uma sala
-Comment[ro]=E o nouă invitație la o cameră
 Comment[ru]=Доступно новое приглашение в комнату
 Comment[sa]=कक्षस्य नूतनं निमन्त्रणम् अस्ति
 Comment[sl]=Tam je novo povabilo v sobo
 Comment[sv]=Det finns en ny inbjudan till ett rum
 Comment[ta]=ஓர் அரங்கிற்கான புதிய அழைப்பிதழ் உள்ளது
-Comment[tr]=Bir odaya yeni bir davet var
+Comment[tr]=Bir odaya yeni bir davetiye var
 Comment[uk]=У кімнаті нове запрошення
 Comment[zh_CN]=有新的聊天室邀请
 Comment[zh_TW]=有新的加入聊天室邀請
@@ -292,7 +290,6 @@ Name[nl]=Gedeelde
 Name[nn]=Del
 Name[pl]=Udostępnij
 Name[pt_BR]=Compartilhar
-Name[ro]=Partajare
 Name[ru]=Публикация
 Name[sa]=संविभागः
 Name[sl]=Deli
@@ -327,7 +324,6 @@ Comment[nl]=Het resultaat van het delen van een stukje inhoud
 Comment[nn]=Resultatet av deling av innhald
 Comment[pl]=Wynik udostępniania kawałka treści
 Comment[pt_BR]=O resultado de compartilhar um conteúdo
-Comment[ro]=Rezultatul partajării unei bucăți de conținut
 Comment[ru]=Результат публикации данных
 Comment[sa]=सामग्रीखण्डस्य साझाकरणस्य परिणामः
 Comment[sl]=Rezultat deljenega kosa vsebine
--- a/src/app/neochatconfig.kcfg
+++ b/src/app/neochatconfig.kcfg
@@ -66,10 +66,6 @@
    </entry>
  </group>
  <group name="Timeline">
-    <entry name="FontScale" type="double">
-      <label>Scaling factor for font sizes</label>
-      <default>1.0</default>
-    </entry>
    <entry name="ShowAvatarInTimeline" type="bool">
      <label>Show avatar in the timeline</label>
      <default>true</default>
--- a/src/app/notificationsmanager.cpp
+++ b/src/app/notificationsmanager.cpp
@@ -388,7 +388,7 @@ void NotificationsManager::postPushNotification(const QByteArray &message)

 #ifdef HAVE_KIO
        auto openAction = notification->addAction(i18n("Open NeoChat"));
-        connect(openAction, &KNotificationAction::activated, notification, [=]() {
+        connect(openAction, &KNotificationAction::activated, this, [=]() {
            QString properId = roomId;
            properId = properId.replace(u"#"_s, QString());
            properId = properId.replace(u"!"_s, QString());
@@ -402,6 +402,8 @@ void NotificationsManager::postPushNotification(const QByteArray &message)
        connect(notification, &KNotification::closed, qGuiApp, &QGuiApplication::quit);

        notification->sendEvent();
+
+        m_notifications.insert(roomId, {json["ts"_L1].toVariant().toLongLong(), notification});
    } else {
        qWarning() << "Skipping unsupported push notification" << type;
    }
--- a/src/app/notificationsmanager.h
+++ b/src/app/notificationsmanager.h
@@ -53,7 +53,7 @@ public:
    /**
     * @brief Display a native notification for the given push notification.
     */
-    static void postPushNotification(const QByteArray &message);
+    void postPushNotification(const QByteArray &message);

    /**
     * @brief Handle the notifications for the given connection.
--- a/src/app/plasma-runner-neochat.desktop
+++ b/src/app/plasma-runner-neochat.desktop
@@ -75,7 +75,6 @@ Comment[nn]=Finn rom i NeoChat
 Comment[pl]=Znajdź pokoje w NeoChat
 Comment[pt]=Procurar salas no NeoChat
 Comment[pt_BR]=Encontrar salas no NeoChat
-Comment[ro]=Găsește camere în NeoChat
 Comment[ru]=Поиск комнат NeoChat
 Comment[sa]=NeoChat इत्यत्र कक्ष्याः अन्वेषणं कुर्वन्तु
 Comment[sl]=Najdi sobe v NeoChatu
--- a/src/app/qml/AccountSwitchDialog.qml
+++ b/src/app/qml/AccountSwitchDialog.qml
@@ -61,7 +61,7 @@ Kirigami.Dialog {
            }

            onClicked: {
-                ((root.QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat.login', 'WelcomePage'), {}, {
+                pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.login', 'WelcomePage'), {}, {
                    title: i18nc("@title:window", "Login")
                });
                root.close();
@@ -95,8 +95,8 @@ Kirigami.Dialog {
                accountView.decrementCurrentIndex();
            }
        }
-        Keys.onEnterPressed: ((accountView.currentItem ?? accountView.footerItem) as Delegates.RoundedItemDelegate).clicked()
-        Keys.onReturnPressed: ((accountView.currentItem ?? accountView.footerItem) as Delegates.RoundedItemDelegate).clicked()
+        Keys.onEnterPressed: (accountView.currentItem as Delegates.RoundedItemDelegate ?? accountView.footerItem).clicked()
+        Keys.onReturnPressed: (accountView.currentItem as Delegates.RoundedItemDelegate ?? accountView.footerItem).clicked()

        onVisibleChanged: {
            for (let i = 0; i < accountView.count; i++) {
--- a/src/app/qml/CodeMaximizeComponent.qml
+++ b/src/app/qml/CodeMaximizeComponent.qml
@@ -91,7 +91,6 @@ Components.AbstractMaximizeComponent {
            color: Kirigami.Theme.textColor

            font.family: "monospace"
-            font.pointSize: Kirigami.Theme.defaultFont.pointSize * NeoChatConfig.fontScale

            Kirigami.SpellCheck.enabled: false

--- a/src/app/qml/FullScreenMap.qml
+++ b/src/app/qml/FullScreenMap.qml
@@ -17,7 +17,7 @@ ApplicationWindow {
    property real longitude: NaN
    property string asset
    property var author
-    property LiveLocationsModel liveLocationModel: null
+    property QtObject liveLocationModel: null

    flags: Qt.FramelessWindowHint | Qt.WA_TranslucentBackground
    visibility: Qt.WindowFullScreen
@@ -59,7 +59,7 @@ ApplicationWindow {

        Connections {
            target: mapView.map
-            function onCopyrightLinkActivated(link: string) {
+            function onCopyrightLinkActivated() {
                Qt.openUrlExternally(link);
            }
        }
--- a/src/app/qml/GlobalMenu.qml
+++ b/src/app/qml/GlobalMenu.qml
@@ -22,12 +22,12 @@ Labs.MenuBar {

        Labs.MenuItem {
            icon.name: "list-add-user"
-            text: i18nc("@action:inmenu", "Find User")
+            text: i18nc("@action:inmenu", "Find your Friends")
            enabled: root.connection
            onTriggered: root.appWindow.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage'), {
                connection: root.connection
            }, {
-                title: i18nc("@title", "Find User")
+                title: i18nc("@title", "Find your friends")
            })
        }
        Labs.MenuItem {
--- a/src/app/qml/Main.qml
+++ b/src/app/qml/Main.qml
@@ -100,8 +100,7 @@ Kirigami.ApplicationWindow {

        function onCurrentRoomChanged() {
            if (RoomManager.currentRoom && root.pageStack.depth <= 1 && root.initialized && Kirigami.Settings.isMobile) {
-                let roomPage = pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomPage'));
-                roomPage.forceActiveFocus();
+                let roomPage = root.pageStack.layers.push(Qt.createComponent('org.kde.neochat', 'RoomPage'));
                roomPage.backRequested.connect(event => {
                    RoomManager.clearCurrentRoom();
                });
--- a/src/app/qml/MeetingDialog.qml
+++ b/src/app/qml/MeetingDialog.qml
@@ -1,22 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Joshua Goins <josh@redstrate.com>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick
-
-import org.kde.kirigami as Kirigami
-
-Kirigami.PromptDialog {
-    id: root
-
-    required property bool hasExistingMeeting
-
-    title: hasExistingMeeting ? i18nc("@title", "Join Meeting") : i18nc("@title", "Start Meeting")
-    subtitle: hasExistingMeeting ? i18nc("@info:label", "You are about to join a Jitsi meeting in your web browser.") : i18nc("@info:label", "You are about to start a new Jitsi meeting in your web browser.")
-    standardButtons: Kirigami.Dialog.Cancel
-
-    customFooterActions: Kirigami.Action {
-        icon.name: "camera-video-symbolic"
-        text: hasExistingMeeting ? i18nc("@action:button Join the Jitsi meeting", "Join") : i18nc("@action:button Start a new Jitsi meeting", "Start")
-        onTriggered: root.accept()
-    }
-}
--- a/src/app/qml/NeochatMaximizeComponent.qml
+++ b/src/app/qml/NeochatMaximizeComponent.qml
@@ -1,8 +1,6 @@
 // SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL

-pragma ComponentBehavior: Bound
-
 import QtCore as Core
 import QtQuick
 import QtQuick.Controls as QQC2
@@ -23,13 +21,13 @@ Components.AlbumMaximizeComponent {
     */
    required property NeoChatRoom currentRoom

-    readonly property string currentEventId: model.data(model.index((content as ListView).currentIndex, 0), TimelineMessageModel.EventIdRole)
+    readonly property string currentEventId: model.data(model.index(content.currentIndex, 0), TimelineMessageModel.EventIdRole)

-    readonly property var currentAuthor: model.data(model.index((content as ListView).currentIndex, 0), TimelineMessageModel.AuthorRole)
+    readonly property var currentAuthor: model.data(model.index(content.currentIndex, 0), TimelineMessageModel.AuthorRole)

-    readonly property var currentTime: model.data(model.index((content as ListView).currentIndex, 0), TimelineMessageModel.TimeRole)
+    readonly property var currentTime: model.data(model.index(content.currentIndex, 0), TimelineMessageModel.TimeRole)

-    readonly property var currentProgressInfo: model.data(model.index((content as ListView).currentIndex, 0), TimelineMessageModel.ProgressInfoRole)
+    readonly property var currentProgressInfo: model.data(model.index(content.currentIndex, 0), TimelineMessageModel.ProgressInfoRole)

    actions: [
        ShareAction {
@@ -61,28 +59,28 @@ Components.AlbumMaximizeComponent {

    downloadAction: Components.DownloadAction {
        onTriggered: {
-            root.currentRoom.downloadFile(root.currentEventId, Core.StandardPaths.writableLocation(Core.StandardPaths.CacheLocation) + "/" + root.currentEventId.replace(":", "_").replace("/", "_").replace("+", "_") + root.currentRoom.fileNameToDownload(root.currentEventId));
+            currentRoom.downloadFile(root.currentEventId, Core.StandardPaths.writableLocation(Core.StandardPaths.CacheLocation) + "/" + root.currentEventId.replace(":", "_").replace("/", "_").replace("+", "_") + currentRoom.fileNameToDownload(root.currentEventId));
        }
    }

    playAction: Kirigami.Action {
        onTriggered: {
            MediaManager.startPlayback();
-            (root.currentItem as Components.VideoMaximizeDelegate).play();
+            currentItem.play();
        }
    }

    Connections {
        target: MediaManager
        function onPlaybackStarted() {
-            if ((root.currentItem as Components.VideoMaximizeDelegate).playbackState === MediaPlayer.PlayingState) {
-                (root.currentItem as Components.VideoMaximizeDelegate).pause();
+            if (currentItem.playbackState === MediaPlayer.PlayingState) {
+                currentItem.pause();
            }
        }
    }

    Connections {
-        target: root.currentRoom
+        target: currentRoom

        function onFileTransferProgress(id, progress, total) {
            if (id == root.currentEventId) {
@@ -125,7 +123,7 @@ Components.AlbumMaximizeComponent {
    onItemRightClicked: RoomManager.viewEventMenu(root.currentEventId, root.currentRoom)

    onSaveItem: {
-        var dialog = saveAsDialog.createObject(QQC2.Overlay.overlay) as Dialogs.FileDialog;
+        var dialog = saveAsDialog.createObject(QQC2.Overlay.overlay);
        dialog.selectedFile = currentRoom.fileNameToDownload(root.currentEventId);
        dialog.open();
    }
@@ -148,7 +146,7 @@ Components.AlbumMaximizeComponent {
                if (!selectedFile) {
                    return;
                }
-                root.currentRoom.downloadFile(root.currentEventId, selectedFile);
+                currentRoom.downloadFile(root.currentEventId, selectedFile);
            }
        }
    }
--- a/src/app/qml/RoomPage.qml
+++ b/src/app/qml/RoomPage.qml
@@ -59,59 +59,11 @@ Kirigami.Page {
     */
    property MediaMessageFilterModel mediaMessageFilterModel: RoomManager.mediaMessageFilterModel

-    /**
-     * @brief The WidgetModel to use.
-     *
-     * This model has the list of widgets available in the current room.
-     *
-     * @note For loading a room in a different window, override this with a new
-     *       WidgetModel.
-     *
-     * @sa WidgetModel
-     */
-    property WidgetModel widgetModel: RoomManager.widgetModel
-
    title: root.currentRoom ? root.currentRoom.displayName : ""
    focus: true
    padding: 0

    actions: [
-        Kirigami.Action {
-            id: jitsiMeetingAction
-
-            readonly property bool hasExistingMeeting: root.widgetModel.jitsiIndex >= 0
-            readonly property bool canStartNewMeeting: root.currentRoom.canSendState("im.vector.modular.widgets")
-
-            tooltip: {
-                if (hasExistingMeeting) {
-                    return i18nc("@action:button", "Join Jitsi meeting…");
-                }
-
-                return canStartNewMeeting ? i18nc("@action:button", "Start Jitsi meeting…") : i18nc("@action:button", "You do not have permissions to start Jitsi meetings")
-            }
-            icon {
-                name: "camera-video-symbolic"
-                color: hasExistingMeeting ? Kirigami.Theme.highlightColor : "transparent"
-            }
-            enabled: hasExistingMeeting || canStartNewMeeting
-            visible: root.currentRoom && !root.currentRoom.isSpace
-            onTriggered: {
-                const dialog = Qt.createComponent("org.kde.neochat", "MeetingDialog").createObject(QQC2.Overlay.overlay, { hasExistingMeeting });
-                dialog.onAccepted.connect(doAction);
-                dialog.open();
-            }
-
-            function doAction(): void {
-                let url;
-                if (!hasExistingMeeting) {
-                    url = root.widgetModel.addJitsiConference();
-                } else {
-                    let idx = root.widgetModel.index(root.widgetModel.jitsiIndex, 0);
-                    url = root.widgetModel.data(idx, WidgetModel.UrlRole);
-                }
-                Qt.openUrlExternally(url);
-            }
-        },
        Kirigami.Action {
            visible: Kirigami.Settings.isMobile || !(root.Kirigami.PageStack.pageStack as Kirigami.PageRow).wideMode
            icon.name: "view-right-new"
@@ -119,18 +71,6 @@ Kirigami.Page {
        }
    ]

-    Kirigami.Action {
-        enabled: root.currentRoom && !root.currentRoom.isSpace
-        shortcut: "Ctrl+F"
-        onTriggered: {
-            ((root.QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RoomSearchPage'), {
-                room: root.currentRoom
-            }, {
-                title: i18nc("@action:title", "Search")
-            });
-        }
-    }
-
    KeyNavigation.left: (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).get(0)

    onCurrentRoomChanged: {
@@ -286,6 +226,12 @@ Kirigami.Page {
        }
    }

+    background: Rectangle {
+        Kirigami.Theme.colorSet: Kirigami.Theme.View
+        Kirigami.Theme.inherit: false
+        color: NeoChatConfig.compactLayout ? Kirigami.Theme.backgroundColor : "transparent"
+    }
+
    footer: Loader {
        id: chatBarLoader
        height: active ? (item as ChatBar).implicitHeight : 0
--- a/src/app/qml/UserSearchPage.qml
+++ b/src/app/qml/UserSearchPage.qml
@@ -30,7 +30,7 @@ SearchPage {
     */
    required property NeoChatConnection connection

-    title: i18nc("@action:title", "Find User")
+    title: i18nc("@action:title", "Find Your Friends")

    Component.onCompleted: focusSearch()

@@ -81,7 +81,7 @@ SearchPage {
            }
            QQC2.Label {
                visible: userDelegate.directChatExists
-                text: i18nc("@info", "Direct Messages")
+                text: i18nc("@info", "Friends")
                textFormat: Text.PlainText
                color: Kirigami.Theme.positiveTextColor
            }
--- a/src/app/qml/VerificationCanceled.qml
+++ b/src/app/qml/VerificationCanceled.qml
@@ -11,19 +11,7 @@ VerificationMessage {

    required property int reason

-    icon: {
-        switch (root.reason) {
-            case KeyVerificationSession.TIMEOUT:
-            case KeyVerificationSession.REMOTE_TIMEOUT:
-            case KeyVerificationSession.USER:
-            case KeyVerificationSession.REMOTE_USER:
-            case KeyVerificationSession.SESSION_ACCEPTED:
-            case KeyVerificationSession.REMOTE_SESSION_ACCEPTED:
-                return "dialog-information";
-            default:
-                return "security-low";
-        }
-    }
+    icon: "security-low"
    text: {
        switch (root.reason) {
        case KeyVerificationSession.NONE:
--- a/src/app/roommanager.cpp
+++ b/src/app/roommanager.cpp
@@ -9,6 +9,8 @@
 #include "controller.h"
 #include "eventhandler.h"
 #include "models/actionsmodel.h"
+#include "models/messagefiltermodel.h"
+#include "models/sortfilterroomtreemodel.h"
 #include "neochatconfig.h"
 #include "neochatconnection.h"
 #include "neochatroom.h"
@@ -41,7 +43,6 @@ RoomManager::RoomManager(QObject *parent)
    , m_messageFilterModel(new MessageFilterModel(this, m_timelineModel))
    , m_mediaMessageFilterModel(new MediaMessageFilterModel(this, m_messageFilterModel))
    , m_userListModel(new UserListModel(this))
-    , m_widgetModel(new WidgetModel(this))
 {
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(UBUNTU_TOUCH)
    m_isMobile = true;
@@ -54,7 +55,6 @@ RoomManager::RoomManager(QObject *parent)
 #endif

    connect(this, &RoomManager::currentRoomChanged, this, [this]() {
-        m_widgetModel->setRoom(m_currentRoom);
        m_userListModel->setRoom(m_currentRoom);
        m_timelineModel->setRoom(m_currentRoom);
        m_sortFilterRoomTreeModel->setCurrentRoom(m_currentRoom);
@@ -197,11 +197,6 @@ void RoomManager::activateUserModel()
    m_userListModel->activate();
 }

-WidgetModel *RoomManager::widgetModel() const
-{
-    return m_widgetModel;
-}
-
 void RoomManager::resolveResource(const QString &idOrUri, const QString &action)
 {
    resolveResource(Uri{idOrUri}, action);
@@ -519,14 +514,7 @@ void RoomManager::setCurrentSpace(const QString &spaceId, bool setRoom)

    // This need to happen before the signal so TreeView.expandRecursively() can work nicely.
    m_sortFilterRoomTreeModel->setActiveSpaceId(m_currentSpaceId);
-
-    if (m_currentSpaceId == u"DM") {
-        m_sortFilterRoomTreeModel->setMode(SortFilterRoomTreeModel::DirectChats);
-    } else if (m_currentSpaceId.isEmpty()) {
-        m_sortFilterRoomTreeModel->setMode(SortFilterRoomTreeModel::Rooms);
-    } else {
-        m_sortFilterRoomTreeModel->setMode(SortFilterRoomTreeModel::All);
-    }
+    m_sortFilterRoomTreeModel->setMode(m_currentSpaceId == u"DM"_s ? SortFilterRoomTreeModel::DirectChats : SortFilterRoomTreeModel::Rooms);

    Q_EMIT currentSpaceChanged();
    if (m_connection) {
@@ -590,8 +578,7 @@ void RoomManager::setCurrentRoom(const QString &roomId)
        return;
    }
    if (m_currentRoom->isDirectChat()) {
-        const auto roomsInSpace = SpaceHierarchyCache::instance().getRoomListForSpace(m_currentSpaceId, false);
-        if (!roomsInSpace.contains(m_currentRoom->id()) && m_currentSpaceId != "DM"_L1) {
+        if (m_currentSpaceId != "DM"_L1) {
            setCurrentSpace("DM"_L1, false);
        }
        return;
--- a/src/app/roommanager.h
+++ b/src/app/roommanager.h
@@ -22,7 +22,6 @@
 #include "models/sortfilterspacelistmodel.h"
 #include "models/timelinemodel.h"
 #include "models/userlistmodel.h"
-#include "models/widgetmodel.h"
 #include "neochatroommember.h"

 class NeoChatRoom;
@@ -130,14 +129,6 @@ class RoomManager : public QObject, public UriResolverBase
     */
    Q_PROPERTY(UserListModel *userListModel READ userListModel CONSTANT)

-    /**
-     * @brief The WidgetModel that should be used for room widget visualisation.
-     *
-     * @note Available here so that the room page and drawer both have access to the
-     *       same model.
-     */
-    Q_PROPERTY(WidgetModel *widgetModel READ widgetModel CONSTANT)
-
    /**
     * @brief Whether a room is currently open in NeoChat.
     *
@@ -169,8 +160,6 @@ public:
    UserListModel *userListModel() const;
    Q_INVOKABLE void activateUserModel();

-    WidgetModel *widgetModel() const;
-
    /**
     * @brief Resolve the given resource.
     *
@@ -367,7 +356,6 @@ private:
    MediaMessageFilterModel *m_mediaMessageFilterModel;

    UserListModel *m_userListModel;
-    WidgetModel *m_widgetModel;

    QPointer<NeoChatConnection> m_connection;

--- a/src/app/runner.cpp
+++ b/src/app/runner.cpp
@@ -8,6 +8,8 @@
 #include <KWindowSystem>

 #include "controller.h"
+#include "models/roomlistmodel.h"
+#include "models/sortfilterroomlistmodel.h"
 #include "roommanager.h"
 #include "windowcontroller.h"

--- a/src/chatbar/ChatBar.qml
+++ b/src/chatbar/ChatBar.qml
@@ -2,8 +2,6 @@
 // SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
 // SPDX-License-Identifier: GPL-2.0-or-later

-pragma ComponentBehavior: Bound
-
 import QtCore
 import QtQuick
 import QtQuick.Controls as QQC2
@@ -89,15 +87,9 @@ QQC2.Control {
            displayHint: Kirigami.DisplayHint.IconOnly

            onTriggered: {
-                if (Clipboard.hasImage) {
-                    let dialog = attachDialog.createObject(root.QQC2.Overlay.overlay) as AttachDialog;
-                    dialog.chosen.connect(path => _private.chatBarCache.attachmentPath = path);
-                    dialog.open();
-                } else {
-                    let dialog = openFileDialog.createObject(root.QQC2.Overlay.overlay) as OpenFileDialog;
-                    dialog.chosen.connect(path => _private.chatBarCache.attachmentPath = path);
-                    dialog.open();
-                }
+                let dialog = (Clipboard.hasImage ? attachDialog : openFileDialog).createObject(root.QQC2.Overlay.overlay);
+                dialog.chosen.connect(path => _private.chatBarCache.attachmentPath = path);
+                dialog.open();
            }

            tooltip: text
@@ -130,9 +122,9 @@ QQC2.Control {
            displayHint: QQC2.AbstractButton.IconOnly

            onTriggered: {
-                (locationChooser.createObject(QQC2.Overlay.overlay, {
+                locationChooser.createObject(QQC2.Overlay.overlay, {
                    room: root.currentRoom
-                }) as LocationChooser).open();
+                }).open();
            }
            tooltip: text
        },
@@ -144,9 +136,9 @@ QQC2.Control {
            displayHint: QQC2.AbstractButton.IconOnly

            onTriggered: {
-                (newPollDialog.createObject(QQC2.Overlay.overlay, {
+                newPollDialog.createObject(QQC2.Overlay.overlay, {
                    room: root.currentRoom
-                }) as NewPollDialog).open();
+                }).open();
            }
            tooltip: text
        },
@@ -263,7 +255,6 @@ QQC2.Control {
                    wrapMode: TextEdit.Wrap
                    // This has to stay PlainText or else formatting starts breaking in strange ways
                    textFormat: TextEdit.PlainText
-                    font.pointSize: Kirigami.Theme.defaultFont.pointSize * NeoChatConfig.fontScale

                    Accessible.description: placeholderText

@@ -376,9 +367,7 @@ QQC2.Control {
                        id: actionDelegate
                        required property BusyAction modelData
                        icon.name: modelData.isBusy ? "" : (modelData.icon.name.length > 0 ? modelData.icon.name : modelData.icon.source)
-                        onClicked: if (!pieProgress.visible) {
-                            modelData.trigger()
-                        }
+                        onClicked: modelData.trigger()

                        padding: Kirigami.Units.smallSpacing

@@ -386,9 +375,7 @@ QQC2.Control {
                        QQC2.ToolTip.text: modelData.tooltip
                        QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay

-                        PieProgressBar {
-                            id: pieProgress
-                            anchors.fill: parent
+                        contentItem: PieProgressBar {
                            visible: actionDelegate.modelData.isBusy
                            progress: root.currentRoom.fileUploadingProgress
                        }
@@ -415,7 +402,7 @@ QQC2.Control {
            ReplyComponent {
                id: replyComponent
                replyContentModel: ContentProvider.contentModelForEvent(root.currentRoom, _private.chatBarCache.replyId, true)
-                Message.maxContentWidth: (replyLoader.item as Item).width
+                Message.maxContentWidth: replyLoader.item.width

                // When the user replies to a message and the preview is loaded, make sure the text field is focused again
                Component.onCompleted: textField.forceActiveFocus(Qt.OtherFocusReason)
--- a/src/chatbar/EmojiDelegate.qml
+++ b/src/chatbar/EmojiDelegate.qml
@@ -4,7 +4,6 @@
 import QtQuick
 import QtQuick.Controls as QQC2
 import org.kde.kirigami as Kirigami
-import org.kde.neochat

 QQC2.ItemDelegate {
    id: root
@@ -30,7 +29,6 @@ QQC2.ItemDelegate {
            horizontalAlignment: Text.AlignHCenter
            verticalAlignment: Text.AlignVCenter
            font.family: "emoji"
-            font.pointSize: Kirigami.Theme.defaultFont.pointSize * NeoChatConfig.fontScale

            Kirigami.Icon {
                width: Kirigami.Units.gridUnit * 0.5
--- a/src/chatbar/ImageEditorPage.qml
+++ b/src/chatbar/ImageEditorPage.qml
@@ -3,13 +3,14 @@

 import QtQuick
 import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 import QtCore as Core

 import org.kde.kirigami as Kirigami
 import org.kde.kquickimageeditor as KQuickImageEditor

 Kirigami.Page {
-    id: root
+    id: rootEditorView

    property bool resizing: false
    required property string imagePath
@@ -25,7 +26,7 @@ Kirigami.Page {
    function crop() {
        const ratioX = editImage.paintedWidth / editImage.nativeWidth;
        const ratioY = editImage.paintedHeight / editImage.nativeHeight;
-        root.resizing = false;
+        rootEditorView.resizing = false;
        imageDoc.crop(selectionTool.selectionX / ratioX, selectionTool.selectionY / ratioY, selectionTool.selectionWidth / ratioX, selectionTool.selectionHeight / ratioY);
    }

@@ -42,9 +43,9 @@ Kirigami.Page {
            text: i18nc("@action:button Accept image modification", "Accept")
            icon.name: "dialog-ok"
            onTriggered: {
-                let newPath = Core.StandardPaths.writableLocation(Core.StandardPaths.CacheLocation) + "/" + (new Date()).getTime() + "." + root.imagePath.split('.').pop();
+                let newPath = Core.StandardPaths.writableLocation(Core.StandardPaths.CacheLocation) + "/" + (new Date()).getTime() + "." + imagePath.split('.').pop();
                if (imageDoc.saveAs(newPath)) {
-                    root.newPathChanged(newPath);
+                    newPathChanged(newPath);
                } else {
                    msg.type = Kirigami.MessageType.Error;
                    msg.text = i18n("Unable to save file. Check if you have the correct permission to edit the cache directory.");
@@ -79,12 +80,12 @@ Kirigami.Page {

        KQuickImageEditor.ImageDocument {
            id: imageDoc
-            path: root.imagePath
+            path: rootEditorView.imagePath
        }

        KQuickImageEditor.SelectionTool {
            id: selectionTool
-            visible: root.resizing
+            visible: rootEditorView.resizing
            width: editImage.paintedWidth
            height: editImage.paintedHeight
            x: editImage.horizontalPadding
@@ -100,7 +101,7 @@ Kirigami.Page {
            Connections {
                target: selectionTool.selectionArea
                function onDoubleClicked() {
-                    root.crop();
+                    rootEditorView.crop();
                }
            }
        }
@@ -118,8 +119,8 @@ Kirigami.Page {
            display: QQC2.Button.TextBesideIcon
            actions: [
                Kirigami.Action {
-                    icon.name: root.resizing ? "dialog-cancel" : "transform-crop"
-                    text: root.resizing ? i18n("Cancel") : i18nc("@action:button Crop an image", "Crop")
+                    icon.name: rootEditorView.resizing ? "dialog-cancel" : "transform-crop"
+                    text: rootEditorView.resizing ? i18n("Cancel") : i18nc("@action:button Crop an image", "Crop")
                    onTriggered: {
                        resizeRectangle.width = editImage.paintedWidth;
                        resizeRectangle.height = editImage.paintedHeight;
@@ -129,38 +130,38 @@ Kirigami.Page {
                        resizeRectangle.insideY = 100;
                        resizeRectangle.insideWidth = 100;
                        resizeRectangle.insideHeight = 100;
-                        root.resizing = !root.resizing;
+                        rootEditorView.resizing = !rootEditorView.resizing;
                    }
                },
                Kirigami.Action {
                    icon.name: "dialog-ok"
-                    visible: root.resizing
+                    visible: rootEditorView.resizing
                    text: i18nc("@action:button Crop an image", "Crop")
-                    onTriggered: root.crop()
+                    onTriggered: rootEditorView.crop()
                },
                Kirigami.Action {
                    icon.name: "object-rotate-left"
                    text: i18nc("@action:button Rotate an image to the left", "Rotate left")
                    onTriggered: imageDoc.rotate(-90)
-                    visible: !root.resizing
+                    visible: !rootEditorView.resizing
                },
                Kirigami.Action {
                    icon.name: "object-rotate-right"
                    text: i18nc("@action:button Rotate an image to the right", "Rotate right")
                    onTriggered: imageDoc.rotate(90)
-                    visible: !root.resizing
+                    visible: !rootEditorView.resizing
                },
                Kirigami.Action {
                    icon.name: "object-flip-vertical"
                    text: i18nc("@action:button Mirror an image vertically", "Flip")
                    onTriggered: imageDoc.mirror(false, true)
-                    visible: !root.resizing
+                    visible: !rootEditorView.resizing
                },
                Kirigami.Action {
                    icon.name: "object-flip-horizontal"
                    text: i18nc("@action:button Mirror an image horizontally", "Mirror")
                    onTriggered: imageDoc.mirror(true, false)
-                    visible: !root.resizing
+                    visible: !rootEditorView.resizing
                }
            ]
        }
--- a/src/devtools/AccountData.qml
+++ b/src/devtools/AccountData.qml
@@ -1,8 +1,6 @@
 // SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: LGPL-2.0-or-later

-pragma ComponentBehavior: Bound
-
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
@@ -25,9 +23,8 @@ ColumnLayout {
        Repeater {
            model: root.connection.accountDataEventTypes
            delegate: FormCard.FormButtonDelegate {
-                required property string modelData
                text: modelData
-                onClicked: (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+                onClicked: root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
                    sourceText: root.connection.accountDataJsonString(modelData)
                }, {
                    title: i18nc("@title:window", "Event Source"),
--- a/src/devtools/CMakeLists.txt
+++ b/src/devtools/CMakeLists.txt
@@ -17,8 +17,6 @@ ecm_add_qml_module(Devtools GENERATE_PLUGIN_SOURCE
        models/statefiltermodel.cpp
        models/statekeysmodel.cpp
        models/statemodel.cpp
-    DEPENDENCIES
-        QtCore
 )

 target_include_directories(Devtools PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models)
--- a/src/devtools/DevtoolsPage.qml
+++ b/src/devtools/DevtoolsPage.qml
@@ -17,7 +17,6 @@ Kirigami.ScrollablePage {

    property NeoChatRoom room
    required property NeoChatConnection connection
-    property alias currentTabIndex: tabBar.currentIndex

    title: i18nc("@title", "Developer Tools")

--- a/src/devtools/RoomData.qml
+++ b/src/devtools/RoomData.qml
@@ -1,8 +1,6 @@
 // SPDX-FileCopyrightText: 2022 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 ComponentBehavior: Bound
-
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Window
@@ -27,7 +25,7 @@ ColumnLayout {
            description: i18nc("@info", "Click to choose a room");

            onClicked: {
-                let dialog = (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ChooseRoomDialog'), {
+                let dialog = root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ChooseRoomDialog'), {
                    connection: root.connection,
                }, {
                    title: i18nc("@title:dialog", "Choose Room"),
@@ -51,9 +49,8 @@ ColumnLayout {
            id: roomAccountData
            model: root.room.accountDataEventTypes
            delegate: FormCard.FormButtonDelegate {
-                required property string modelData
                text: modelData
-                onClicked: (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+                onClicked: root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
                    sourceText: root.room.roomAcountDataJson(text)
                }, {
                    title: i18n("Event Source"),
@@ -77,18 +74,15 @@ ColumnLayout {
            }

            delegate: FormCard.FormButtonDelegate {
-                required property string type
-                required property int eventCount
-                required property string stateKey
-                text: type
-                description: i18ncp("'Event' being some JSON data, not something physically happening.", "%1 event of this type", "%1 events of this type", eventCount)
+                text: model.type
+                description: i18ncp("'Event' being some JSON data, not something physically happening.", "%1 event of this type", "%1 events of this type", model.eventCount)
                onClicked: {
-                    if (eventCount === 1) {
-                        root.openEventSource(type, stateKey);
+                    if (model.eventCount === 1) {
+                        openEventSource(model.type, model.stateKey);
                    } else {
-                        (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'StateKeys'), {
+                        root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'StateKeys'), {
                            room: root.room,
-                            eventType: type
+                            eventType: model.type
                        }, {
                            title: i18nc("'Event' being some JSON data, not something physically happening.", "Event Information")
                        });
@@ -98,7 +92,7 @@ ColumnLayout {
        }
    }
    function openEventSource(type: string, stateKey: string): void {
-        onClicked: (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+        onClicked: root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
            model: stateModel,
            allowEdit: true,
            room: root.room,
--- a/src/devtools/StateKeys.qml
+++ b/src/devtools/StateKeys.qml
@@ -1,9 +1,8 @@
 // SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL

-pragma ComponentBehavior: Bound
-
 import QtQuick
+import QtQuick.Layouts
 import QtQuick.Window

 import org.kde.kirigami as Kirigami
@@ -31,15 +30,14 @@ FormCard.FormCardPage {
            }

            delegate: FormCard.FormButtonDelegate {
-                required property string stateKey
-                text: stateKey
-                onClicked: root.openEventSource(stateKey)
+                text: model.stateKey
+                onClicked: openEventSource(model.stateKey)
            }
        }
    }

    function openEventSource(stateKey: string): void {
-        (Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+        root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
            model: stateKeysModel,
            allowEdit: true,
            room: root.room,
--- a/src/libneochat/CMakeLists.txt
+++ b/src/libneochat/CMakeLists.txt
@@ -45,8 +45,6 @@ target_sources(LibNeoChat PRIVATE
    models/stickermodel.cpp
    models/userfiltermodel.cpp
    models/userlistmodel.cpp
-    models/widgetmodel.cpp
-    models/widgetmodel.h
 )

 if (TARGET KF6::KIOWidgets)
--- a/src/libneochat/enums/neochatroomtype.h
+++ b/src/libneochat/enums/neochatroomtype.h
@@ -30,7 +30,7 @@ public:
        ServerNotice, /**< Official messages from the server. */
        Deprioritized, /**< The room is set as low priority. */
        Space, /**< The room is a space. */
-        AddDirect, /**< So we can show the add direct message delegate. */
+        AddDirect, /**< So we can show the add friend delegate. */
        TypesCount, /**< Number of different types (this should always be last). */
    };
    Q_ENUM(Types);
@@ -66,7 +66,7 @@ public:
        case NeoChatRoomType::Favorite:
            return i18n("Favorite");
        case NeoChatRoomType::Direct:
-            return i18n("Direct Messages");
+            return i18n("Friends");
        case NeoChatRoomType::Normal:
            return i18n("Normal");
        case NeoChatRoomType::Deprioritized:
--- a/src/libneochat/enums/roomsortparameter.h
+++ b/src/libneochat/enums/roomsortparameter.h
@@ -89,7 +89,7 @@ public:
        case Parameter::MostHighlights:
            return i18nc("@info", "Rooms with the most highlighted messages are higher");
        case Parameter::LastActive:
-            return i18nc("@info", "Rooms with newer events are higher");
+            return i18nc("@info", "Rooms with the newer messages are higher");
        default:
            return {};
        }
--- a/src/libneochat/eventhandler.cpp
+++ b/src/libneochat/eventhandler.cpp
@@ -10,6 +10,7 @@

 #include <Quotient/events/encryptionevent.h>
 #include <Quotient/events/event.h>
+#include <Quotient/events/eventcontent.h>
 #include <Quotient/events/reactionevent.h>
 #include <Quotient/events/redactionevent.h>
 #include <Quotient/events/roomavatarevent.h>
@@ -195,25 +196,20 @@ bool EventHandler::isHidden(const NeoChatRoom *room, const Quotient::RoomEvent *
    return false;
 }

-Qt::TextFormat EventHandler::messageBodyInputFormat(const Quotient::RoomEvent &event)
+Qt::TextFormat EventHandler::messageBodyInputFormat(const Quotient::RoomMessageEvent &event)
 {
    if (event.isRedacted() && !event.isStateEvent()) {
        return Qt::RichText;
    }

-    auto msgEvent = eventCast<const Quotient::RoomMessageEvent>(&event);
-    if (!msgEvent) {
-        return Qt::PlainText;
-    }
-
-    if (msgEvent->mimeType().name() == "text/plain"_L1) {
+    if (event.mimeType().name() == "text/plain"_L1) {
        return Qt::PlainText;
    } else {
        return Qt::RichText;
    }
 }

-QString EventHandler::rawMessageBody(const RoomEvent &event)
+QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
 {
    if (event.isRedacted() && !event.isStateEvent()) {
        auto reason = event.redactedBecause()->reason();
@@ -222,26 +218,21 @@ QString EventHandler::rawMessageBody(const RoomEvent &event)

    QString body;

-    auto msgEvent = eventCast<const Quotient::RoomMessageEvent>(&event);
-    if (!msgEvent) {
-        return body;
-    }
-
-    if (msgEvent->has<EventContent::FileContent>()) {
+    if (event.has<EventContent::FileContent>()) {
        // if filename is given or body is equal to filename,
        // then body is a caption
-        QString filename = msgEvent->get<EventContent::FileContent>()->originalName;
-        QString body = msgEvent->plainBody();
+        QString filename = event.get<EventContent::FileContent>()->originalName;
+        QString body = event.plainBody();
        if (filename.isEmpty() || filename == body) {
            return QString();
        }
        return body;
    }

-    if (msgEvent->has<EventContent::TextContent>() && msgEvent->content()) {
-        body = msgEvent->get<EventContent::TextContent>()->body;
+    if (event.has<EventContent::TextContent>() && event.content()) {
+        body = event.get<EventContent::TextContent>()->body;
    } else {
-        body = msgEvent->plainBody();
+        body = event.plainBody();
    }
    return body;
 }
@@ -460,9 +451,6 @@ QString EventHandler::getBody(const NeoChatRoom *room, const Quotient::RoomEvent
                    return i18nc("[User] joined a [voice/video] call", "joined a call");
                }
            }
-            if (e.matrixType() == "io.element.integrations.installations"_L1) {
-                return i18nc("[User] configured an extension", "configured an extension");
-            }
            return e.stateKey().isEmpty() ? i18n("updated %1 state", e.matrixType())
                                          : i18n("updated %1 state for %2", e.matrixType(), prettyPrint ? e.stateKey().toHtmlEscaped() : e.stateKey());
        },
@@ -676,9 +664,6 @@ QString EventHandler::genericBody(const NeoChatRoom *room, const Quotient::RoomE
                    return i18nc("[User] joined a [voice/video] call", "%1 joined a call", senderString);
                }
            }
-            if (e.matrixType() == "io.element.integrations.installations"_L1) {
-                return i18nc("[User] configured an extension", "%1 configured an extension", senderString);
-            }
            return i18n("%1 updated the state", senderString);
        },
        [senderString](const PollStartEvent &) {
--- a/src/libneochat/eventhandler.h
+++ b/src/libneochat/eventhandler.h
@@ -122,15 +122,15 @@ public:
     * I.e. if the message has only a body the format will be Qt::PlainText, if it
     * has a formatted body it will be Qt::RichText.
     */
-    static Qt::TextFormat messageBodyInputFormat(const Quotient::RoomEvent &event);
+    static Qt::TextFormat messageBodyInputFormat(const Quotient::RoomMessageEvent &event);

    /**
-     * @brief Output a string for the message content without any formatting.
+     * @brief Output a string for the room message content without any formatting.
     *
     * This is the content of the formatted_body key if present or the body key if
     * not.
     */
-    static QString rawMessageBody(const Quotient::RoomEvent &event);
+    static QString rawMessageBody(const Quotient::RoomMessageEvent &event);

    /**
     * @brief Output a string for the message content ready for display in a rich text field.
--- a/src/libneochat/events/pollevent.cpp
+++ b/src/libneochat/events/pollevent.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #include "pollevent.h"
+#include <Quotient/converters.h>

 using namespace Quotient;

--- a/src/libneochat/models/userlistmodel.cpp
+++ b/src/libneochat/models/userlistmodel.cpp
@@ -146,13 +146,9 @@ bool UserListModel::event(QEvent *event)

 void UserListModel::memberJoined(const Quotient::RoomMember &member)
 {
-    if (m_members.contains(member.id())) {
-        return;
-    }
-
-    const int row = m_members.size();
-    beginInsertRows(QModelIndex(), row, row);
-    m_members.append(member.id());
+    auto pos = findUserPos(member);
+    beginInsertRows(QModelIndex(), pos, pos);
+    m_members.insert(pos, member.id());
    endInsertRows();
 }

@@ -172,6 +168,8 @@ void UserListModel::refreshMember(const Quotient::RoomMember &member, const QLis
 {
    auto pos = findUserPos(member);
    if (pos != m_members.size()) {
+        // The update will have changed the state event so we need to insert the updated member object.
+        m_members.insert(pos, member.id());
        Q_EMIT dataChanged(index(pos), index(pos), roles);
    } else {
        qWarning() << "Trying to access a room member not in the user list";
--- a/src/libneochat/models/widgetmodel.cpp
+++ b/src/libneochat/models/widgetmodel.cpp
@@ -1,356 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Arno Rehn <arno@arnorehn.de>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include "widgetmodel.h"
-
-#include <Quotient/jobs/downloadfilejob.h>
-#include <Quotient/user.h>
-#include <widgetevent.h>
-
-using namespace Quotient;
-
-namespace
-{
-
-// This URL will take us to a jitsi room that is configured on a best effort basis.
-// Critically, it appears that we cannot pass avatars via the "fragment API".
-// The important stuff is working though: conference id, user name, subject.
-//
-// The alternative would be to rely on a Jitsi wrapper like https://app.element.io/jitsi.html.
-// This one parses the fragment and then uses the the actual Jitsi IFrame API to set
-// up the Jitsi meeting. Nice, but ties us to that external wrapper.
-//
-// Or we ship our own wrapper as a local HTML file and open that one?
-constexpr char JitsiMeetUrlTemplate[] =
-    "https://$domain/$conferenceId"
-    "#jitsi_meet_external_api_id=0"
-    "&config.subject=\"$roomName\""
-    "&config.startAudioOnly=$isAudioOnly"
-    "&config.startWithAudioMuted=$startWithAudioMuted"
-    "&config.startWithVideoMuted=$startWithVideoMuted"
-    "&isVideoChannel=$isVideoChannel"
-    "&userInfo.displayName=\"$matrix_display_name\"";
-
-// Same thing with etherpad, as long as it's on scalar.vector.im
-constexpr char EtherpadScalarVectorImUrl[] = "https://scalar.vector.im/api/widgets/etherpad.html";
-constexpr char EtherpadUrlTemplate[] =
-    "https://etherpad.integrations.element.io/p/"
-    "$padName"
-    "?showControls=true"
-    "&showChat=false"
-    "&chatAndUsers=false"
-    "&alwaysShowChat=false"
-    "&showLineNumbers=true"
-    "&useMonospaceFont=false"
-    "&userName=$matrix_user_id";
-
-QUrl avatarUrl(NeoChatRoom *room)
-{
-    const auto avatarUrl = room->member(room->connection()->userId()).avatarUrl();
-    return room->connection()->getUrlForApi<DownloadFileJob>(avatarUrl);
-}
-
-// Many widgets require proper interfacing with integration managers, but this needs authentication
-// with an integration manager: https://github.com/matrix-org/matrix-spec-proposals/blob/main/proposals/1961-integrations-auth.md
-// Also requires accepting the terms: https://github.com/matrix-org/matrix-spec-proposals/blob/main/proposals/2140-terms-of-service-2.md
-// Example:
-// curl -X POST "https://scalar.vector.im/_matrix/integrations/v1/register" \
-//    -H "Content-Type: application/json" \
-//    --data '<OpenIdCredentials>'
-// Then append the resulting json key-value pairs as query items to the widget url.
-QUrl buildWidgetUrl(QByteArray templateString, NeoChatRoom *room, const QJsonObject &data)
-{
-    constexpr auto enc = [](const auto &s) {
-        return QUrl::toPercentEncoding(s);
-    };
-
-    templateString.replace("$matrix_user_id"_L1, enc(room->connection()->userId()))
-        .replace("$matrix_room_id"_L1, enc(room->id()))
-        .replace("$matrix_display_name"_L1, enc(room->member(room->connection()->userId()).displayName()))
-        .replace("$matrix_avatar_url"_L1, avatarUrl(room).toEncoded());
-
-    for (auto it = data.begin(); it != data.end(); ++it) {
-        const QByteArray key = '$' + it.key().toUtf8();
-        templateString.replace(key, enc(it.value().toString()));
-    }
-
-    return QUrl::fromEncoded(templateString);
-}
-
-}
-
-class WidgetModelPrivate
-{
-    Q_DISABLE_COPY(WidgetModelPrivate);
-
-public:
-    WidgetModelPrivate(WidgetModel *q)
-        : q_ptr(q)
-    {
-    }
-
-    Q_DECLARE_PUBLIC(WidgetModel)
-    WidgetModel *const q_ptr;
-
-    // clang-format off
-    struct NoModelResetTag_t {};
-    static constexpr NoModelResetTag_t NoModelReset {};
-    // clang-format on
-
-    void reload();
-    void reload(NoModelResetTag_t);
-    void updateWidgets(Quotient::RoomEventsRange events);
-    void handleEvent(const Quotient::RoomEvent *event);
-    void handlePendingEvent(const Quotient::RoomEvent *event);
-    void buildJitsiIndex();
-
-    NeoChatRoom *room = nullptr;
-    QMap<QString, const WidgetEvent *> state;
-    int jitsiIndex = -1;
-};
-
-WidgetModel::WidgetModel(QObject *parent)
-    : QAbstractListModel{parent}
-    , d_ptr(std::make_unique<WidgetModelPrivate>(this))
-{
-}
-
-WidgetModel::~WidgetModel()
-{
-}
-
-QHash<int, QByteArray> WidgetModel::roleNames() const
-{
-    return {
-        {TextRole, "text"},
-        {UrlRole, "url"},
-        {TypeRole, "type"},
-    };
-}
-
-QVariant WidgetModel::data(const QModelIndex &index, int role) const
-{
-    Q_D(const WidgetModel);
-
-    const int row = index.row();
-    if (row < 0 || row >= d->state.count()) {
-        return {};
-    }
-
-    const auto *ev = std::next(d->state.begin(), row).value();
-    const auto type = ev->contentPart<QString>("type"_L1);
-    const auto url = ev->contentPart<QString>("url"_L1).toUtf8();
-
-    switch (role) {
-    case TextRole:
-        return ev->contentPart<QString>("name"_L1);
-    case TypeRole:
-        return type;
-    case UrlRole: {
-        QByteArray urlTemplate = url;
-        if (type == "jitsi"_L1) {
-            // Jitsi is special-cased even in Element. The URL that we get from the
-            // widget is just "https://scalar.vector.im/api/widgets/jitsi.html" which
-            // is not sufficient.
-            urlTemplate = JitsiMeetUrlTemplate;
-        } else if (type == "m.etherpad"_L1 && url.startsWith(EtherpadScalarVectorImUrl)) {
-            // Etherpad is not special-cased, but the scalar.vector.im wrapper requires authentication
-            // with the integration manager. We can just resolve this to the actual etherpad instance
-            // to skip integration manager auth.
-            urlTemplate = EtherpadUrlTemplate;
-        }
-        return buildWidgetUrl(urlTemplate, room(), ev->contentPart<QJsonObject>("data"_L1));
-    }
-    }
-
-    return {};
-}
-
-int WidgetModel::rowCount(const QModelIndex &parent) const
-{
-    Q_D(const WidgetModel);
-    Q_UNUSED(parent);
-    return d->state.count();
-}
-
-void WidgetModelPrivate::reload(NoModelResetTag_t)
-{
-    state.clear();
-
-    if (room) {
-        const auto events = room->currentState().eventsOfType(Quotient::WidgetEvent::MetaType.matrixId);
-        for (auto ev : events) {
-            handleEvent(ev);
-        }
-    }
-}
-
-void WidgetModelPrivate::reload()
-{
-    Q_Q(WidgetModel);
-
-    q->beginResetModel();
-
-    reload(NoModelReset);
-    buildJitsiIndex();
-
-    q->endResetModel();
-}
-
-void WidgetModelPrivate::updateWidgets(Quotient::RoomEventsRange events)
-{
-    using namespace std::ranges;
-
-    constexpr auto isWidgetEvent = [](auto &&ev) {
-        return ev->template is<WidgetEvent>();
-    };
-
-    if (any_of(events, isWidgetEvent)) {
-        reload();
-    }
-}
-
-void WidgetModelPrivate::handleEvent(const Quotient::RoomEvent *event)
-{
-    const WidgetEvent *widgetEvent = eventCast<const WidgetEvent>(event);
-    if (!widgetEvent) {
-        return;
-    }
-
-    auto it = state.find(widgetEvent->stateKey());
-    if (it != state.end() && widgetEvent->replacedState() == it.value()->id()) {
-        // we alrady have this and it should be...
-        if (widgetEvent->contentJson().isEmpty()) {
-            // ... removed because replacement is empty
-            state.erase(it);
-        } else {
-            // replaced
-            it.value() = widgetEvent;
-        }
-    } else if (!widgetEvent->contentJson().isEmpty()) {
-        // insert if not empty
-        it = state.insert(widgetEvent->stateKey(), widgetEvent);
-    }
-}
-
-void WidgetModelPrivate::handlePendingEvent(const RoomEvent *event)
-{
-    Q_Q(WidgetModel);
-
-    if (!event->is<WidgetEvent>()) {
-        return;
-    }
-
-    q->beginResetModel();
-
-    reload(NoModelReset);
-    handleEvent(event);
-    buildJitsiIndex();
-
-    q->endResetModel();
-}
-
-void WidgetModelPrivate::buildJitsiIndex()
-{
-    Q_Q(WidgetModel);
-
-    const auto newIndex = [&] -> int {
-        auto it = std::find_if(state.cbegin(), state.cend(), [](const WidgetEvent *e) {
-            return e->contentPart<QString>("type"_L1) == "jitsi"_L1;
-        });
-
-        if (it == state.cend()) {
-            return -1;
-        }
-
-        return std::distance(state.cbegin(), it);
-    }();
-
-    if (newIndex != jitsiIndex) {
-        jitsiIndex = newIndex;
-        Q_EMIT q->jitsiIndexChanged();
-    }
-}
-
-NeoChatRoom *WidgetModel::room() const
-{
-    Q_D(const WidgetModel);
-    return d->room;
-}
-
-void WidgetModel::setRoom(NeoChatRoom *newRoom)
-{
-    Q_D(WidgetModel);
-
-    if (d->room == newRoom) {
-        return;
-    }
-
-    if (d->room) {
-        disconnect(d->room, &NeoChatRoom::baseStateLoaded, this, nullptr);
-        disconnect(d->room, &NeoChatRoom::aboutToAddNewMessages, this, nullptr);
-        disconnect(d->room, &NeoChatRoom::pendingEventAboutToAdd, this, nullptr);
-    }
-
-    d->room = newRoom;
-
-    if (d->room) {
-        connect(d->room, &NeoChatRoom::baseStateLoaded, this, [d] {
-            d->reload();
-        });
-        connect(d->room, &NeoChatRoom::aboutToAddNewMessages, this, [d](Quotient::RoomEventsRange events) {
-            d->updateWidgets(events);
-        });
-        connect(d->room, &NeoChatRoom::pendingEventAboutToAdd, this, [d](Quotient::RoomEvent *event) {
-            d->handlePendingEvent(event);
-        });
-    }
-    d->reload();
-
-    Q_EMIT roomChanged();
-}
-
-int WidgetModel::jitsiIndex() const
-{
-    Q_D(const WidgetModel);
-
-    return d->jitsiIndex;
-}
-
-QUrl WidgetModel::addJitsiConference()
-{
-    // URL is not spec-compliant, but this is what Element does as well.
-    const auto conferenceId = QUuid::createUuid().toString(QUuid::WithoutBraces);
-    // clang-format off
-    const QJsonObject content{
-        {"name"_L1, "Jitsi Meet"_L1},
-        {"type"_L1, "jitsi"_L1},
-        {"url"_L1, "https://scalar.vector.im/api/widgets/jitsi.html"_L1},
-        {"data"_L1, QJsonObject{
-            {"conferenceId"_L1, conferenceId},
-            {"domain"_L1, "meet.element.io"_L1},  // TODO: make domain configurable
-            {"isAudioOnly"_L1, false},
-            {"roomName"_L1, room()->displayName()},
-        }},
-    };
-    // clang-format on
-
-    // Re-use conferenceId as state_key
-    room()->setState(WidgetEvent::MetaType.matrixId, conferenceId, content);
-
-    return buildWidgetUrl(JitsiMeetUrlTemplate, room(), content["data"_L1].toObject());
-}
-
-bool WidgetModel::removeWidget(int index)
-{
-    Q_D(const WidgetModel);
-
-    if (index < 0 || index >= rowCount()) {
-        return false;
-    }
-
-    const auto stateKey = std::next(d->state.begin(), index).value()->stateKey();
-    room()->setState(WidgetEvent::MetaType.matrixId, stateKey, QJsonObject{});
-
-    return true;
-}
--- a/src/libneochat/models/widgetmodel.h
+++ b/src/libneochat/models/widgetmodel.h
@@ -1,74 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Arno Rehn <arno@arnorehn.de>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#ifndef WIDGETMODEL_H
-#define WIDGETMODEL_H
-
-#include <QAbstractListModel>
-#include <QQmlEngine>
-
-#include "neochatroom.h"
-
-class WidgetModelPrivate;
-
-/**
- * @class WidgetModel
- *
- * `WidgetModel` provides a list model of widgets for a given room.
- *
- * It also supports adding and removing widgets.
- */
-class WidgetModel : public QAbstractListModel
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    /**
-     * @brief The room for which this model lists the widgets
-     */
-    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
-    /**
-     * @brief The row index of the first Jitsi widget
-     */
-    Q_PROPERTY(int jitsiIndex READ jitsiIndex NOTIFY jitsiIndexChanged)
-public:
-    enum Roles {
-        TextRole = Qt::DisplayRole,
-        UrlRole = Qt::UserRole,
-        TypeRole,
-    };
-    Q_ENUM(Roles)
-
-    explicit WidgetModel(QObject *parent = nullptr);
-    ~WidgetModel() override;
-
-    NeoChatRoom *room() const;
-    void setRoom(NeoChatRoom *newRoom);
-
-    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
-    [[nodiscard]] QVariant data(const QModelIndex &index, int roleName) const override;
-    [[nodiscard]] int rowCount(const QModelIndex &parent = {}) const override;
-
-    int jitsiIndex() const;
-
-    /**
-     * @brief Adds a new Jitsi widget
-     * @return The URL of the newly added Jitsi conference
-     */
-    Q_INVOKABLE QUrl addJitsiConference();
-    /**
-     * @brief Removes the widget at @p index
-     * @return `true` on success, `false` otherwise
-     */
-    Q_INVOKABLE bool removeWidget(int index);
-
-Q_SIGNALS:
-    void roomChanged();
-    void jitsiIndexChanged();
-
-private:
-    Q_DECLARE_PRIVATE(WidgetModel)
-    const std::unique_ptr<WidgetModelPrivate> d_ptr;
-};
-
-#endif // WIDGETMODEL_H
--- a/src/libneochat/neochatconnection.cpp
+++ b/src/libneochat/neochatconnection.cpp
@@ -9,6 +9,7 @@
 #include "neochatroom.h"
 #include "spacehierarchycache.h"

+#include <Quotient/connection.h>
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/quotient_common.h>
 #include <qt6keychain/keychain.h>
@@ -95,7 +96,6 @@ void NeoChatConnection::connectSignals()
                Q_EMIT directChatsHaveHighlightNotificationsChanged();
            });
        }
-        Q_EMIT roomInvitesChanged();
        connect(room, &Room::unreadStatsChanged, this, [this]() {
            refreshBadgeNotificationCount();
            Q_EMIT homeNotificationsChanged();
@@ -453,20 +453,15 @@ bool NeoChatConnection::homeHaveHighlightNotifications() const
    return false;
 }

-qsizetype NeoChatConnection::directChatInvites() const
+bool NeoChatConnection::directChatInvites() const
 {
-    const auto inviteRooms = rooms(JoinState::Invite);
-    return std::ranges::count_if(inviteRooms, [](const auto room) {
-        return room->isDirectChat();
-    });
-}
-
-qsizetype NeoChatConnection::roomInvites() const
-{
-    const auto inviteRooms = rooms(JoinState::Invite);
-    return std::ranges::count_if(inviteRooms, [](const auto room) {
-        return !room->isDirectChat();
-    });
+    auto inviteRooms = rooms(JoinState::Invite);
+    for (const auto inviteRoom : inviteRooms) {
+        if (inviteRoom->isDirectChat()) {
+            return true;
+        }
+    }
+    return false;
 }

 QCoro::Task<void> NeoChatConnection::setupPushNotifications(QString endpoint)
--- a/src/libneochat/neochatconnection.h
+++ b/src/libneochat/neochatconnection.h
@@ -66,14 +66,9 @@ class NeoChatConnection : public Quotient::Connection
    Q_PROPERTY(bool homeHaveHighlightNotifications READ homeHaveHighlightNotifications NOTIFY homeHaveHighlightNotificationsChanged)

    /**
-     * @brief The number of invites to 1-on-1 direct chats.
+     * @brief Whether there is at least one invite to a direct chat.
     */
-    Q_PROPERTY(qsizetype directChatInvites READ directChatInvites NOTIFY directChatInvitesChanged)
-
-    /**
-     * @brief The number of pending, normal room invites.
-     */
-    Q_PROPERTY(qsizetype roomInvites READ roomInvites NOTIFY roomInvitesChanged)
+    Q_PROPERTY(bool directChatInvites READ directChatInvites NOTIFY directChatInvitesChanged)

    /**
     * @brief Whether the server supports querying a user's mutual rooms.
@@ -205,8 +200,7 @@ public:
     */
    static void setKeywordPushRuleDefault(PushRuleAction::Action defaultAction);

-    qsizetype directChatInvites() const;
-    qsizetype roomInvites() const;
+    bool directChatInvites() const;

    // note: this is intentionally a copied QString because
    // the reference could be destroyed before the task is finished
@@ -231,7 +225,6 @@ Q_SIGNALS:
    void homeNotificationsChanged();
    void homeHaveHighlightNotificationsChanged();
    void directChatInvitesChanged();
-    void roomInvitesChanged();
    void passwordStatus(NeoChatConnection::PasswordStatus status);
    void userConsentRequired(QUrl url);
    void badgeNotificationCountChanged(int count);
--- a/src/libneochat/neochatroom.cpp
+++ b/src/libneochat/neochatroom.cpp
@@ -45,6 +45,7 @@
 #include "chatbarcache.h"
 #include "clipboard.h"
 #include "eventhandler.h"
+#include "events/pollevent.h"
 #include "filetransferpseudojob.h"
 #include "neochatconnection.h"
 #include "roomlastmessageprovider.h"
@@ -1180,9 +1181,6 @@ void NeoChatRoom::loadPinnedMessage()
        const QString &mostRecentEventId = events.last();
        connection()->callApi<GetOneRoomEventJob>(id(), mostRecentEventId).then([this](const auto &job) {
            auto event = fromJson<event_ptr_tt<RoomEvent>>(job->jsonData());
-            if (auto encEv = eventCast<EncryptedEvent>(event.get())) {
-                event = decryptMessage(*encEv);
-            }
            m_pinnedMessage = EventHandler::richBody(this, event.get());
            Q_EMIT pinnedMessageChanged();
        });
--- a/src/libneochat/qml/ExploreRoomsPage.qml
+++ b/src/libneochat/qml/ExploreRoomsPage.qml
@@ -2,11 +2,10 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
 // SPDX-License-Identifier: GPL-3.0-only

-pragma ComponentBehavior: Bound
-
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
+import Qt.labs.qmlmodels

 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.delegates as Delegates
@@ -130,8 +129,8 @@ SearchPage {
        function openManualRoomDialog() {
            let dialog = manualRoomDialog.createObject(root.QQC2.Overlay.overlay, {
                connection: root.connection
-            }) as ManualRoomDialog;
-            dialog.parent = root.QQC2.Overlay.overlay;
+            });
+            dialog.parent = root.Window.window.overlay;
            dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
                root.roomSelected(roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined);
                root.closeDialog();
--- a/src/login/Email.qml
+++ b/src/login/Email.qml
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later

 import QtQuick
+import QtQuick.Layouts

 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
--- a/src/login/Homeserver.qml
+++ b/src/login/Homeserver.qml
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later

 import QtQuick
+import QtQuick.Layouts

 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
--- a/src/login/Loading.qml
+++ b/src/login/Loading.qml
@@ -3,6 +3,7 @@

 import QtQuick
 import QtQuick.Controls as QQC2
+import QtQuick.Layouts

 import org.kde.kirigamiaddons.formcard as FormCard

--- a/src/login/Login.qml
+++ b/src/login/Login.qml
@@ -39,11 +39,11 @@ LoginStep {
        text: LoginHelper.isLoggedIn ? i18n("Already logged in") : (LoginHelper.testing && matrixIdField.acceptableInput) ? i18n("Loading…") : i18nc("@action:button", "Continue")
        onTriggered: {
            if (LoginHelper.supportsSso && LoginHelper.supportsPassword) {
-                root.processed("LoginMethod");
+                processed("LoginMethod");
            } else if (LoginHelper.supportsSso) {
-                root.processed("Sso");
+                processed("Sso");
            } else {
-                root.processed("Password");
+                processed("Password");
            }
        }
        enabled: LoginHelper.homeserverReachable
--- a/src/login/LoginMethod.qml
+++ b/src/login/LoginMethod.qml
@@ -18,12 +18,12 @@ LoginStep {
    FormCard.FormButtonDelegate {
        id: loginPasswordButton
        text: i18nc("@action:button", "Login with password")
-        onClicked: root.processed("Password")
+        onClicked: processed("Password")
    }

    FormCard.FormButtonDelegate {
        id: loginSsoButton
        text: i18nc("@action:button", "Login with single sign-on")
-        onClicked: root.processed("Sso")
+        onClicked: processed("Sso")
    }
 }
--- a/src/login/Password.qml
+++ b/src/login/Password.qml
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later

 import QtQuick
+import QtQuick.Layouts

 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
@@ -14,7 +15,7 @@ LoginStep {
    Connections {
        target: LoginHelper
        function onConnected() {
-            root.processed("Loading");
+            processed("Loading");
        }
    }

@@ -45,6 +46,6 @@ LoginStep {
        }
    }
    previousAction: Kirigami.Action {
-        onTriggered: root.processed("Login")
+        onTriggered: processed("Login")
    }
 }
--- a/Show More
+++ b/Show More