GIT_SILENT Sync po/docbooks with svn

This is just more ergonomic (in my opinion) as you usually want to
select some text from a code block, instead of maximizing it. There's
already an easy-to-access button for maximizing if you want to.

BUG: 499048
FIXED-IN: 25.12.2
(cherry picked from commit 332a822996)

.flatpak-manifest.json

@@ -206,14 +206,6 @@
                 {
                     "type": "dir",
                     "path": "."
-                },
-                {
-                    "type": "patch",
-                    "path": "patches/0001-Revert-Bump-KF6-dependency-version.patch"
-                },
-                {
-                    "type": "patch",
-                    "path": "patches/0001-Revert-Use-new-Kirigami-builtin-column-resize-handle.patch"
                 }
             ]
         }

.kde-ci.yml

@@ -10,11 +10,11 @@ Dependencies:
       'frameworks/ki18n': '@latest-kf6'
       'frameworks/kconfig': '@latest-kf6'
       'frameworks/syntax-highlighting': '@latest-kf6'
+      'frameworks/kiconthemes': '@latest-kf6'
       'frameworks/kitemmodels': '@latest-kf6'
       'frameworks/kquickcharts': '@latest-kf6'
       'frameworks/knotifications': '@latest-kf6'
       'frameworks/kcolorscheme': '@latest-kf6'
-      'frameworks/kiconthemes': '@latest-kf6'
       'libraries/kquickimageeditor': '@latest-kf6'
       'frameworks/sonnet': '@latest-kf6'
       'frameworks/prison': '@latest-kf6'
@@ -29,7 +29,6 @@ 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'

CMakeLists.txt

@@ -8,14 +8,14 @@ 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 "70")
+set(RELEASE_SERVICE_VERSION_MINOR "12")
+set(RELEASE_SERVICE_VERSION_MICRO "2")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
 
 set(KF_MIN_VERSION "6.17")
-set(QT_MIN_VERSION "6.8")
+set(QT_MIN_VERSION "6.9")
 
 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
 
@@ -24,7 +24,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(KDE_COMPILERSETTINGS_LEVEL 6.0)
+set(KDE_COMPILERSETTINGS_LEVEL 6.17)
 
 include(FeatureSummary)
 include(ECMSetupVersion)
@@ -39,6 +39,7 @@ include(ECMCheckOutboundLicense)
 include(ECMQtDeclareLoggingCategory)
 include(ECMAddAndroidApk)
 include(ECMQmlModule)
+include(ECMDeprecationSettings)
 include(GenerateExportHeader)
 include(ECMGenerateHeaders)
 if (NOT ANDROID)
@@ -51,6 +52,8 @@ 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
@@ -66,7 +69,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 IconThemes ColorScheme)
+find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels ColorScheme IconThemes)
 set_package_properties(KF6 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
@@ -75,7 +78,7 @@ set_package_properties(KF6Kirigami PROPERTIES
     TYPE REQUIRED
     PURPOSE "Kirigami application UI framework"
 )
-find_package(KF6KirigamiAddons 1.6.0 REQUIRED)
+find_package(KF6KirigamiAddons 1.10.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)
@@ -89,7 +92,7 @@ if(ANDROID)
     )
 else()
     find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem Crash)
+    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem)
     find_package(KF6SyntaxHighlighting ${KF_MIN_VERSION} REQUIRED)
     set_package_properties(KF6QQC2DesktopStyle PROPERTIES
         TYPE RUNTIME
@@ -107,7 +110,7 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU)
     find_package(KF6DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()
 
-find_package(QuotientQt6 0.9.1)
+find_package(QuotientQt6 0.9.3)
 set_package_properties(QuotientQt6 PROPERTIES
     TYPE REQUIRED
     DESCRIPTION "Qt wrapper around Matrix API"

autotests/actionstest.cpp

@@ -63,7 +63,7 @@ void ActionsTest::testActions_data()
     QTest::addColumn<std::optional<QString>>("resultText");
     QTest::addColumn<std::optional<Quotient::RoomMessageEvent::MsgType>>("type");
 
-    QTest::newRow("shrug") << u"/shrug Hello"_s << std::make_optional(u"¯\\\\_(ツ)_/¯ Hello"_s)
+    QTest::newRow("shrug") << u"/shrug Hello"_s << std::make_optional(u"¯\\\\\\_(ツ)\\_/¯ Hello"_s)
                            << std::make_optional(Quotient::RoomMessageEvent::MsgType::Text);
     QTest::newRow("lenny") << u"/lenny Hello"_s << std::make_optional(u"( ͡° ͜ʖ ͡°) Hello"_s) << std::make_optional(Quotient::RoomMessageEvent::MsgType::Text);
     QTest::newRow("tableflip") << u"/tableflip Hello"_s << std::make_optional(u"(╯°□°）╯︵ ┻━┻ Hello"_s)

autotests/server.cpp

@@ -4,15 +4,12 @@
 #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>

org.kde.neochat.appdata.xml

@@ -41,6 +41,7 @@
   <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>
@@ -75,6 +76,7 @@
   <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>
@@ -109,6 +111,7 @@
     <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>
@@ -142,6 +145,7 @@
     <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>
@@ -175,6 +179,7 @@
     <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>
@@ -188,6 +193,7 @@
       <li xml:lang="ar">التصويت - MSC3381</li>
       <li xml:lang="ca">Votacions - MSC3381</li>
       <li xml:lang="ca-valencia">Votacions - MSC3381</li>
+      <li xml:lang="de">Umfragen – MSC3381</li>
       <li xml:lang="el">Δημοσκοπήσεις - MSC3381</li>
       <li xml:lang="en-GB">Polls - MSC3381</li>
       <li xml:lang="eo">Enketoj - MSC3381</li>
@@ -209,6 +215,7 @@
       <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>
@@ -221,6 +228,7 @@
       <li xml:lang="ar">حزم الملصقات - MSC2545</li>
       <li xml:lang="ca">Paquets d'adhesius - MSC2545</li>
       <li xml:lang="ca-valencia">Paquets d'adhesius - MSC2545</li>
+      <li xml:lang="de">Sticker-Pakete – MSC2545</li>
       <li xml:lang="el">Πακέτα αυτοκόλλητων - MSC2545</li>
       <li xml:lang="en-GB">Sticker Packs - MSC2545</li>
       <li xml:lang="eo">Glumark-Pakoj - MSC2545</li>
@@ -242,6 +250,7 @@
       <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>
@@ -275,6 +284,7 @@
       <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>
@@ -312,7 +322,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">Tanguy Fardet;[dabe](https://freeradical.zone/@dabe);[lengau](https://mastodon.world/@lengau);Joshua Strobl;Stuart Turton</value>
+    <value key="KDE::supporters">Anonymous donor, Akseli</value>
   </custom>
   <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
   <screenshots>
@@ -344,6 +354,7 @@
       <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>
@@ -380,6 +391,7 @@
       <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>
@@ -424,6 +436,7 @@
       <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>
@@ -462,6 +475,7 @@
       <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>
@@ -476,6 +490,11 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="25.12.2" date="2026-02-05"/>
+    <release version="25.12.1" date="2026-01-08"/>
+    <release version="25.12.0" date="2025-12-11"/>
+    <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"/>

org.kde.neochat.desktop

@@ -112,6 +112,7 @@ 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

patches/0001-Revert-Bump-KF6-dependency-version.patch

@@ -1,28 +0,0 @@
-SPDX-FileCopyrightText: 2025 Tobias Fella <tobias.fella@kde.org>
-SPDX-License-Identifier: BSD-2-Clause
-From dbd1cefd0f07a6942aef450f8f3e082aa3b1cc25 Mon Sep 17 00:00:00 2001
-From: Tobias Fella <tobias.fella@kde.org>
-Date: Sun, 17 Aug 2025 20:04:04 +0200
-Subject: [PATCH] Revert "Bump KF6 dependency version"
-
-This reverts commit 18a6ea98232b3a734905fb18eebba9cf39bf5325.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 10fe66daa..cd063113d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,7 +14,7 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
- 
- project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
- 
--set(KF_MIN_VERSION "6.17")
-+set(KF_MIN_VERSION "6.12")
- set(QT_MIN_VERSION "6.8")
- 
- find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
--- 
-2.50.1
-

patches/0001-Revert-Use-new-Kirigami-builtin-column-resize-handle.patch

@@ -1,123 +0,0 @@
-SPDX-FileCopyrightText: 2025 Tobias Fella <tobias.fella@kde.org>
-SPDX-License-Identifier: BSD-2-Clause
-From ca72345b8ee550be2172d8ac5e5dc9e4c2b508c9 Mon Sep 17 00:00:00 2001
-From: Tobias Fella <tobias.fella@kde.org>
-Date: Sun, 17 Aug 2025 20:00:08 +0200
-Subject: [PATCH] Revert "Use new Kirigami builtin column resize handle"
-
-This reverts commit de97275a387abcbca6fcb185bcbd1b69c30f5c66.
----
- src/app/qml/Main.qml       |  1 -
- src/rooms/RoomListPage.qml | 70 +++++++++++++++++++++++++++++---------
- 2 files changed, 54 insertions(+), 17 deletions(-)
-
-diff --git a/src/app/qml/Main.qml b/src/app/qml/Main.qml
-index ea8955674..6eed271c1 100644
---- a/src/app/qml/Main.qml
-+++ b/src/app/qml/Main.qml
-@@ -45,7 +45,6 @@ Kirigami.ApplicationWindow {
-             showExisting: true
-             onConnectionChosen: root.load()
-         }
--        columnView.columnResizeMode: pageStack.wideMode ? Kirigami.ColumnView.DynamicColumns : Kirigami.ColumnView.SingleColumn
-         globalToolBar.canContainHandles: true
-         globalToolBar {
-             style: Kirigami.ApplicationHeaderStyle.ToolBar
-diff --git a/src/rooms/RoomListPage.qml b/src/rooms/RoomListPage.qml
-index 2ac211fd5..f5586d789 100644
---- a/src/rooms/RoomListPage.qml
-+++ b/src/rooms/RoomListPage.qml
-@@ -17,22 +17,13 @@ import org.kde.neochat
- Kirigami.Page {
-     id: root
- 
--    Kirigami.ColumnView.interactiveResizeEnabled: true
--    Kirigami.ColumnView.minimumWidth: _private.collapsedSize + spaceDrawer.width + 1
--    Kirigami.ColumnView.maximumWidth: _private.defaultWidth + spaceDrawer.width + 1
--    Kirigami.ColumnView.onInteractiveResizingChanged: {
--        if (!Kirigami.ColumnView.interactiveResizing && collapsed) {
--            Kirigami.ColumnView.preferredWidth = root.Kirigami.ColumnView.minimumWidth;
--        }
--    }
--    Kirigami.ColumnView.preferredWidth: _private.currentWidth + spaceDrawer.width + 1
--    Kirigami.ColumnView.onPreferredWidthChanged: {
--        if (width > _private.collapseWidth) {
--            NeoChatConfig.collapsed = false;
--        } else if (Kirigami.ColumnView.interactiveResizing) {
--            NeoChatConfig.collapsed = true;
--        }
--    }
-+    /**
-+     * @brief The current width of the room list.
-+     *
-+     * @note Other objects can access the value but the private function makes sure
-+     *       that only the internal members can modify it.
-+     */
-+    readonly property int currentWidth: _private.currentWidth + spaceDrawer.width + 1
- 
-     required property NeoChatConnection connection
- 
-@@ -40,6 +31,10 @@ Kirigami.Page {
- 
-     signal search
- 
-+    onCurrentWidthChanged: pageStack.defaultColumnWidth = root.currentWidth
-+    Component.onCompleted: pageStack.defaultColumnWidth = root.currentWidth
-+
-+
-     onCollapsedChanged: {
-         if (collapsed) {
-             RoomManager.sortFilterRoomTreeModel.filterText = "";
-@@ -252,6 +247,49 @@ Kirigami.Page {
-         sourceComponent: Kirigami.Settings.isMobile ? exploreComponentMobile : userInfoDesktop
-     }
- 
-+    MouseArea {
-+        anchors.top: parent.top
-+        anchors.bottom: parent.bottom
-+        parent: applicationWindow().overlay.parent
-+
-+        x: root.currentWidth - width / 2
-+        width: Kirigami.Units.smallSpacing * 2
-+        z: root.z + 1
-+        enabled: RoomManager.hasOpenRoom && applicationWindow().width >= Kirigami.Units.gridUnit * 35
-+        visible: enabled
-+        cursorShape: Qt.SplitHCursor
-+
-+        property int _lastX
-+
-+        onPressed: mouse => {
-+            _lastX = mouse.x;
-+        }
-+        onPositionChanged: mouse => {
-+            if (_lastX == -1) {
-+                return;
-+            }
-+            if (mouse.x > _lastX) {
-+                // we moved to the right
-+                if (_private.currentWidth < _private.collapseWidth && _private.currentWidth + (mouse.x - _lastX) >= _private.collapseWidth) {
-+                    // Here we get back directly to a more wide mode.
-+                    _private.currentWidth = _private.defaultWidth;
-+                    NeoChatConfig.collapsed = false;
-+                } else if (_private.currentWidth >= _private.collapseWidth) {
-+                    // Increase page width
-+                    _private.currentWidth = Math.min(_private.defaultWidth, _private.currentWidth + (mouse.x - _lastX));
-+                }
-+            } else if (mouse.x < _lastX) {
-+                const tmpWidth = _private.currentWidth - (_lastX - mouse.x);
-+                if (tmpWidth < _private.collapseWidth) {
-+                    _private.currentWidth = Qt.binding(() => _private.collapsedSize);
-+                    NeoChatConfig.collapsed = true;
-+                } else {
-+                    _private.currentWidth = tmpWidth;
-+                }
-+            }
-+        }
-+    }
-+
-     Component {
-         id: userInfo
-         UserInfo {
--- 
-2.50.1
-

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

@@ -0,0 +1,122 @@
+<?xml version="1.0" ?>
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
+<!ENTITY % Brazilian-Portuguese "INCLUDE">
+]>
+<!--
+SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
+SPDX-License-Identifier: CC-BY-SA-4.0
+-->
+
+<refentry lang="&language;">
+<refentryinfo>
+<title
+>Manual do Usuário do NeoChat</title>
+<author
+><firstname
+>Carl</firstname
+><surname
+>Schwan</surname
+> <contrib
+>NeoChat man page.</contrib
+> <email
+>carl@carlschwan.eu</email
+></author>
+<date
+>01/11/2022</date>
+<releaseinfo
+>22.09</releaseinfo>
+<productname
+>NeoChat</productname>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>
+    <command
+>neochat</command>
+  </refentrytitle>
+  <manvolnum
+>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+  <refname
+>neochat</refname>
+  <refpurpose
+>Cliente para interação com o protocolo de mensagens Matrix.</refpurpose>
+  </refnamediv>
+  <!-- body begins here -->
+  <refsynopsisdiv id='synopsis'>
+  <cmdsynopsis
+><command
+>neochat</command
+> <arg choice="opt"
+><replaceable
+>URI</replaceable
+></arg
+> </cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsect1 id="description">
+  <title
+>Descrição</title>
+  <para
+>O <command
+>neochat</command
+> é um aplicativo de bate-papo para o protocolo Matrix. Ele funciona tanto em computadores quanto em dispositivos móveis. </para>
+</refsect1>
+
+<refsect1 id="options"
+><title
+>Opções</title>
+<variablelist>
+  <varlistentry>
+  <term
+><option
+>URI</option
+></term>
+  <listitem>
+    <para
+>O URI da matriz para um usuário ou uma sala. Por exemplo, matrix:u/usuário:exemplo.org e matrix:r/root:exemplo.org. Isso fará com que o NeoChat tente abrir a sala ou conversa especificada. </para>
+  </listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1 id="bug">
+  <title
+>Relatar bugs</title>
+  <para
+>Você pode reportar erros e solicitar novas funcionalidades em <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General"
+>https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General</ulink
+></para>
+</refsect1>
+
+<refsect1>
+  <title
+>Veja também</title>
+  <simplelist>
+    <member
+>Lista de perguntas frequentes sobre o Matrix <ulink url="https://matrix.org/faq/"
+>https://matrix.org/faq/</ulink
+> </member>
+    <member
+>kf5options(7)</member>
+    <member
+>qt5options(7)</member>
+  </simplelist>
+</refsect1>
+
+<refsect1 id="copyright"
+><title
+>Direitos autorais</title>
+<para
+>Direitos autorais &copy; 2020-2022 Tobias Fella </para>
+<para
+>Direitos autorais &copy; 2020-2022 Carl Schwan </para>
+<para
+>Licença: GNU General Public Versão 3 ou posterior <ulink url="https://www.gnu.org/licenses/gpl-3.0.html"
+>https://www.gnu.org/licenses/gpl-3.0.html</ulink
+>&gt;</para>
+</refsect1>
+</refentry>

src/app/CMakeLists.txt

@@ -103,6 +103,7 @@ 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
@@ -152,6 +153,7 @@ target_include_directories(neochat-app PRIVATE ${CMAKE_BINARY_DIR})
 
 target_link_libraries(neochat-app PRIVATE
     neochat
+    KF6::IconThemes
 )
 
 ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)
@@ -202,8 +204,9 @@ target_link_libraries(neochat PUBLIC
     KF6::ConfigGui
     KF6::CoreAddons
     KF6::SonnetCore
-    KF6::IconThemes
     KF6::ItemModels
+    KF6::I18nQml
+    KirigamiApp
     QuotientQt6
     Login
     Rooms
@@ -211,10 +214,6 @@ 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)
@@ -325,6 +324,7 @@ if(ANDROID)
         "kt-restore-defaults-symbolic"
         "user-symbolic"
         "mark-location-symbolic"
+        "amarok_playcount"
 
         ${KIRIGAMI_ADDONS_ICONS}
     )
@@ -353,7 +353,8 @@ endif()
 install(TARGETS neochat-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
-    install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins)
+    # krunner plugin must be the same as the app id for flatpak to export it
+    install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins RENAME org.kde.neochat.desktop)
 endif()
 
 if (APPLE)

src/app/controller.cpp

@@ -17,7 +17,6 @@
 #include <Quotient/qt_connection_util.h>
 #include <Quotient/settings.h>
 
-#include "accountmanager.h"
 #include "enums/roomsortparameter.h"
 #include "general_logging.h"
 #include "mediasizehelper.h"
@@ -26,9 +25,7 @@
 #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"
 
@@ -309,8 +306,7 @@ void Controller::listenForNotifications()
     connect(timer, &QTimer::timeout, qGuiApp, &QGuiApplication::quit);
 
     connect(connector, &KUnifiedPush::Connector::messageReceived, [timer](const QByteArray &data) {
-        instance().m_notificationsManager.postPushNotification(data);
-        timer->stop();
+        NotificationsManager::postPushNotification(data);
     });
 
     // Wait five seconds to see if we received any messages or this happened to be an erroneous activation.

src/app/main.cpp

@@ -33,13 +33,10 @@
 #include <KWindowSystem>
 #endif
 
-#if __has_include("KCrash")
-#include <KCrash>
-#endif
-
 #include <KIconTheme>
-#include <KLocalizedContext>
+#include <KLocalizedQmlContext>
 #include <KLocalizedString>
+#include <KirigamiApp>
 
 #include "neochat-version.h"
 
@@ -104,33 +101,22 @@ Q_DECL_EXPORT
 #endif
 int main(int argc, char *argv[])
 {
-    KIconTheme::initTheme();
     QNetworkProxyFactory::setUseSystemConfiguration(true);
 
+    // We currently need to do this ourselves,
+    // KirigamiApp currently called this after constructing the app which breaks icons on Windows.
+    KIconTheme::initTheme();
+
 #ifdef HAVE_WEBVIEW
     QtWebView::initialize();
     QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
     QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi);
 #endif
 
-#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
+    KirigamiApp::App app(argc, argv);
+    KirigamiApp kirigamiApp;
 
 #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);
@@ -177,10 +163,6 @@ 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);
 
@@ -205,7 +187,7 @@ int main(int argc, char *argv[])
     parser.addOption(testOption);
 
 #ifdef HAVE_KUNIFIEDPUSH
-    QCommandLineOption dbusActivatedOption(u"dbus-activated"_s, i18n("Internal usage only."));
+    QCommandLineOption dbusActivatedOption(u"dbus-activated"_s);
     dbusActivatedOption.setFlags(QCommandLineOption::Flag::HiddenFromHelp);
     parser.addOption(dbusActivatedOption);
 #endif
@@ -219,8 +201,14 @@ int main(int argc, char *argv[])
 
 #ifdef HAVE_KUNIFIEDPUSH
     if (parser.isSet(dbusActivatedOption)) {
-        // We want to be replaceable by the main client
-        KDBusService service(KDBusService::Replace);
+#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
 
 #ifdef HAVE_RUNNER
         // If we are built with KRunner and KUnifiedPush support, we need to do something special.
@@ -279,7 +267,7 @@ int main(int argc, char *argv[])
                     });
 #endif
 
-    engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
+    KLocalization::setupLocalizedContext(&engine);
     engine.setNetworkAccessManagerFactory(new NetworkAccessManagerFactory());
 
     if (parser.isSet("ignore-ssl-errors"_L1)) {
@@ -294,7 +282,9 @@ int main(int argc, char *argv[])
 
     engine.addImageProvider(u"blurhash"_s, new BlurhashImageProvider);
 
-    engine.loadFromModule("org.kde.neochat", "Main");
+    if (!kirigamiApp.start("org.kde.neochat", "Main", &engine)) {
+        return -1;
+    }
 
     if (!parser.positionalArguments().isEmpty() && !parser.isSet("share"_L1)) {
         RoomManager::instance().setUrlArgument(parser.positionalArguments()[0]);

src/app/neochat.notifyrc

@@ -211,6 +211,7 @@ 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
@@ -252,12 +253,13 @@ 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 davetiye var
+Comment[tr]=Bir odaya yeni bir davet var
 Comment[uk]=У кімнаті нове запрошення
 Comment[zh_CN]=有新的聊天室邀请
 Comment[zh_TW]=有新的加入聊天室邀請
@@ -290,6 +292,7 @@ Name[nl]=Gedeelde
 Name[nn]=Del
 Name[pl]=Udostępnij
 Name[pt_BR]=Compartilhar
+Name[ro]=Partajare
 Name[ru]=Публикация
 Name[sa]=संविभागः
 Name[sl]=Deli
@@ -324,6 +327,7 @@ 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

src/app/neochatconfig.kcfg

@@ -66,6 +66,10 @@
     </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>

src/app/notificationsmanager.cpp

@@ -216,12 +216,12 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
         }
     });
 
+    notification->setTitle(room->displayName());
+
     QString entry;
-    if (sender == room->displayName()) {
-        notification->setTitle(sender);
+    if (room->isDirectChat()) {
         entry = text.toHtmlEscaped();
     } else {
-        notification->setTitle(room->displayName());
         entry = i18n("%1: %2", sender, text.toHtmlEscaped());
     }
 
@@ -253,7 +253,9 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
         notification->setReplyAction(std::move(replyAction));
     }
 
-    notification->setHint(u"x-kde-origin-name"_s, room->localMember().id());
+    if (Controller::instance().accounts()->rowCount() > 1) {
+        notification->setHint(u"x-kde-origin-name"_s, room->localMember().id());
+    }
     notification->sendEvent();
 }
 
@@ -347,7 +349,9 @@ void NotificationsManager::doPostInviteNotification(QPointer<NeoChatRoom> room)
         m_invitations.remove(room->id());
     });
 
-    notification->setHint(u"x-kde-origin-name"_s, room->localMember().id());
+    if (Controller::instance().accounts()->rowCount() > 1) {
+        notification->setHint(u"x-kde-origin-name"_s, room->localMember().id());
+    }
 
     notification->sendEvent();
 }
@@ -388,7 +392,7 @@ void NotificationsManager::postPushNotification(const QByteArray &message)
 
 #ifdef HAVE_KIO
         auto openAction = notification->addAction(i18n("Open NeoChat"));
-        connect(openAction, &KNotificationAction::activated, this, [=]() {
+        connect(openAction, &KNotificationAction::activated, notification, [=]() {
             QString properId = roomId;
             properId = properId.replace(u"#"_s, QString());
             properId = properId.replace(u"!"_s, QString());
@@ -402,8 +406,6 @@ 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;
     }

src/app/notificationsmanager.h

@@ -53,7 +53,7 @@ public:
     /**
      * @brief Display a native notification for the given push notification.
      */
-    void postPushNotification(const QByteArray &message);
+    static void postPushNotification(const QByteArray &message);
 
     /**
      * @brief Handle the notifications for the given connection.

src/app/plasma-runner-neochat.desktop

@@ -75,6 +75,7 @@ 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

src/app/qml/AccountSwitchDialog.qml

@@ -61,7 +61,7 @@ Kirigami.Dialog {
             }
 
             onClicked: {
-                pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.login', 'WelcomePage'), {}, {
+                ((root.QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).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 as Delegates.RoundedItemDelegate).clicked()
-        Keys.onReturnPressed: (accountView.currentItem as Delegates.RoundedItemDelegate).clicked()
+        Keys.onEnterPressed: ((accountView.currentItem ?? accountView.footerItem) as Delegates.RoundedItemDelegate).clicked()
+        Keys.onReturnPressed: ((accountView.currentItem ?? accountView.footerItem) as Delegates.RoundedItemDelegate).clicked()
 
         onVisibleChanged: {
             for (let i = 0; i < accountView.count; i++) {

src/app/qml/CodeMaximizeComponent.qml

@@ -91,6 +91,7 @@ Components.AbstractMaximizeComponent {
             color: Kirigami.Theme.textColor
 
             font.family: "monospace"
+            font.pointSize: Kirigami.Theme.defaultFont.pointSize * NeoChatConfig.fontScale
 
             Kirigami.SpellCheck.enabled: false
 

src/app/qml/FullScreenMap.qml

@@ -17,7 +17,7 @@ ApplicationWindow {
     property real longitude: NaN
     property string asset
     property var author
-    property QtObject liveLocationModel: null
+    property LiveLocationsModel liveLocationModel: null
 
     flags: Qt.FramelessWindowHint | Qt.WA_TranslucentBackground
     visibility: Qt.WindowFullScreen
@@ -59,7 +59,7 @@ ApplicationWindow {
 
         Connections {
             target: mapView.map
-            function onCopyrightLinkActivated() {
+            function onCopyrightLinkActivated(link: string) {
                 Qt.openUrlExternally(link);
             }
         }

src/app/qml/GlobalMenu.qml

@@ -22,12 +22,12 @@ Labs.MenuBar {
 
         Labs.MenuItem {
             icon.name: "list-add-user"
-            text: i18nc("@action:inmenu", "Find your Friends")
+            text: i18nc("@action:inmenu", "Find User")
             enabled: root.connection
             onTriggered: root.appWindow.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage'), {
                 connection: root.connection
             }, {
-                title: i18nc("@title", "Find your friends")
+                title: i18nc("@title", "Find User")
             })
         }
         Labs.MenuItem {

src/app/qml/Main.qml

@@ -100,7 +100,8 @@ Kirigami.ApplicationWindow {
 
         function onCurrentRoomChanged() {
             if (RoomManager.currentRoom && root.pageStack.depth <= 1 && root.initialized && Kirigami.Settings.isMobile) {
-                let roomPage = root.pageStack.layers.push(Qt.createComponent('org.kde.neochat', 'RoomPage'));
+                let roomPage = pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomPage'));
+                roomPage.forceActiveFocus();
                 roomPage.backRequested.connect(event => {
                     RoomManager.clearCurrentRoom();
                 });
@@ -358,7 +359,11 @@ Kirigami.ApplicationWindow {
             user: user,
             connection: root.connection,
         }) as UserDetailDialog;
-        dialog.parent = QmlUtils.focusedWindowItem(); // Kirigami Dialogs overwrite the parent, so we need to set it again
+        // FIXME: The reason why we don't want the focusedWindowItem for the room null case (aka QR codes) is because it will parent it to the soon-to-be-destroyed window item.
+        // But this won't be a problem if we turn it into a Kirigami.Dialog or some other in-scene item, which it really should be.
+        if (room != null) {
+            dialog.parent = QmlUtils.focusedWindowItem(); // Kirigami Dialogs overwrite the parent, so we need to set it again
+        }
         dialog.open();
     }
 

src/app/qml/MeetingDialog.qml

@@ -0,0 +1,22 @@
+// 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()
+    }
+}

src/app/qml/NeochatMaximizeComponent.qml

@@ -1,6 +1,8 @@
 // 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
@@ -21,13 +23,13 @@ Components.AlbumMaximizeComponent {
      */
     required property NeoChatRoom currentRoom
 
-    readonly property string currentEventId: model.data(model.index(content.currentIndex, 0), TimelineMessageModel.EventIdRole)
+    readonly property string currentEventId: model.data(model.index((content as ListView).currentIndex, 0), TimelineMessageModel.EventIdRole)
 
-    readonly property var currentAuthor: model.data(model.index(content.currentIndex, 0), TimelineMessageModel.AuthorRole)
+    readonly property var currentAuthor: model.data(model.index((content as ListView).currentIndex, 0), TimelineMessageModel.AuthorRole)
 
-    readonly property var currentTime: model.data(model.index(content.currentIndex, 0), TimelineMessageModel.TimeRole)
+    readonly property var currentTime: model.data(model.index((content as ListView).currentIndex, 0), TimelineMessageModel.TimeRole)
 
-    readonly property var currentProgressInfo: model.data(model.index(content.currentIndex, 0), TimelineMessageModel.ProgressInfoRole)
+    readonly property var currentProgressInfo: model.data(model.index((content as ListView).currentIndex, 0), TimelineMessageModel.ProgressInfoRole)
 
     actions: [
         ShareAction {
@@ -59,28 +61,28 @@ Components.AlbumMaximizeComponent {
 
     downloadAction: Components.DownloadAction {
         onTriggered: {
-            currentRoom.downloadFile(root.currentEventId, Core.StandardPaths.writableLocation(Core.StandardPaths.CacheLocation) + "/" + root.currentEventId.replace(":", "_").replace("/", "_").replace("+", "_") + currentRoom.fileNameToDownload(root.currentEventId));
+            root.currentRoom.downloadFile(root.currentEventId, Core.StandardPaths.writableLocation(Core.StandardPaths.CacheLocation) + "/" + root.currentEventId.replace(":", "_").replace("/", "_").replace("+", "_") + root.currentRoom.fileNameToDownload(root.currentEventId));
         }
     }
 
     playAction: Kirigami.Action {
         onTriggered: {
             MediaManager.startPlayback();
-            currentItem.play();
+            (root.currentItem as Components.VideoMaximizeDelegate).play();
         }
     }
 
     Connections {
         target: MediaManager
         function onPlaybackStarted() {
-            if (currentItem.playbackState === MediaPlayer.PlayingState) {
-                currentItem.pause();
+            if ((root.currentItem as Components.VideoMaximizeDelegate).playbackState === MediaPlayer.PlayingState) {
+                (root.currentItem as Components.VideoMaximizeDelegate).pause();
             }
         }
     }
 
     Connections {
-        target: currentRoom
+        target: root.currentRoom
 
         function onFileTransferProgress(id, progress, total) {
             if (id == root.currentEventId) {
@@ -123,7 +125,7 @@ Components.AlbumMaximizeComponent {
     onItemRightClicked: RoomManager.viewEventMenu(root.currentEventId, root.currentRoom)
 
     onSaveItem: {
-        var dialog = saveAsDialog.createObject(QQC2.Overlay.overlay);
+        var dialog = saveAsDialog.createObject(QQC2.Overlay.overlay) as Dialogs.FileDialog;
         dialog.selectedFile = currentRoom.fileNameToDownload(root.currentEventId);
         dialog.open();
     }
@@ -146,7 +148,7 @@ Components.AlbumMaximizeComponent {
                 if (!selectedFile) {
                     return;
                 }
-                currentRoom.downloadFile(root.currentEventId, selectedFile);
+                root.currentRoom.downloadFile(root.currentEventId, selectedFile);
             }
         }
     }

src/app/qml/QrScannerPage.qml

@@ -27,9 +27,26 @@ Kirigami.Page {
         }
     }
 
+    MediaDevices {
+        id: devices
+    }
+
+    Rectangle {
+        anchors.fill: parent
+
+        color: Kirigami.Theme.backgroundColor
+        visible: devices.videoInputs.length === 0
+
+        Kirigami.PlaceholderMessage {
+            text: i18nc("@info", "No Camera Connected")
+            anchors.centerIn: parent
+        }
+    }
+
     VideoOutput {
         id: viewFinder
         anchors.centerIn: parent
+        visible: devices.videoInputs.length > 0
     }
 
     Prison.VideoScanner {
@@ -47,6 +64,8 @@ Kirigami.Page {
     }
 
     CaptureSession {
+        id: session
+
         camera: Camera {
             id: camera
         }

src/app/qml/QuickSwitcher.qml

@@ -22,7 +22,7 @@ Kirigami.SearchDialog {
     }
 
     onAccepted: if (currentItem) {
-        (currentItem as QQC2.ItemDelegate).clicked();
+        (root.currentItem as RoomDelegate).clicked();
     }
 
     onTextChanged: RoomManager.sortFilterRoomListModel.filterText = text

src/app/qml/ReasonDialog.qml

@@ -31,7 +31,7 @@ Kirigami.Page {
         Keys.onReturnPressed: event => {
             if (event.modifiers & Qt.ControlModifier) {
                 root.accepted(reason.text);
-                root.closeDialog();
+                root.Kirigami.PageStack.closeDialog();
             }
         }
 
@@ -52,14 +52,14 @@ Kirigami.Page {
                 QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
                 onClicked: {
                     root.accepted(reason.text);
-                    root.closeDialog();
+                    root.Kirigami.PageStack.closeDialog();
                 }
             }
             QQC2.Button {
                 icon.name: "dialog-cancel-symbolic"
                 text: i18nc("@action", "Cancel")
                 QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.RejectRole
-                onClicked: root.closeDialog()
+                onClicked: root.Kirigami.PageStack.closeDialog()
             }
         }
     }

src/app/qml/RoomPage.qml

@@ -7,6 +7,7 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Window
+import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 
@@ -58,18 +59,86 @@ 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
 
+    background: null // This needs to stay null, because of transparency blur
+
+    onHeightChanged: {
+        // HACK: See TimelineView for the hack details.
+        // We get the height change here *first* so we are informed this is because of a window resize and not due to the pinned message.
+        (timelineViewLoader.item as TimelineView).resetViewSettling();
+    }
+
     actions: [
         Kirigami.Action {
-            visible: Kirigami.Settings.isMobile || !(root.Kirigami.PageStack.pageStack as Kirigami.PageRow).wideMode
+            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"
             onTriggered: (root.QQC2.ApplicationWindow.window as Main).openRoomDrawer()
         }
     ]
 
+    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: {
@@ -98,24 +167,89 @@ Kirigami.Page {
         }
     }
 
-    header: Kirigami.InlineMessage {
-        id: banner
+    header: ColumnLayout {
+        id: headerLayout
 
-        // Used to keep track of messages so we can hide the right one at the right time
-        property string messageId
+        spacing: 0
 
-        showCloseButton: true
-        visible: false
-        position: Kirigami.InlineMessage.Position.Header
+        readonly property bool shouldShowPins: root.currentRoom.pinnedMessage.length > 0 && !Kirigami.Settings.isMobile
 
-        function show(msgid: string): void {
-            messageId = msgid;
-            visible = true;
+        QQC2.Control {
+            id: pinControl
+
+            visible: headerLayout.shouldShowPins
+
+            Layout.fillWidth: true
+
+            background: Rectangle {
+                color: Kirigami.Theme.backgroundColor
+
+                Kirigami.Theme.colorSet: Kirigami.Theme.View
+                Kirigami.Theme.inherit: false
+            }
+
+            contentItem: RowLayout {
+                spacing: Kirigami.Units.smallSpacing
+
+                Kirigami.Icon {
+                    source: "pin-symbolic"
+
+                    Layout.preferredWidth: Kirigami.Units.iconSizes.smallMedium
+                    Layout.preferredHeight: Kirigami.Units.iconSizes.smallMedium
+                }
+
+                QQC2.Label {
+                    text: root.currentRoom.pinnedMessage
+                    maximumLineCount: 1
+                    elide: Text.ElideRight
+
+                    onLinkActivated: link => UrlHelper.openUrl(link)
+                    onHoveredLinkChanged: if (hoveredLink.length > 0 && hoveredLink !== "1") {
+                        (QQC2.ApplicationWindow.window as Main).hoverLinkIndicator.text = hoveredLink;
+                    } else {
+                        (QQC2.ApplicationWindow.window as Main).hoverLinkIndicator.text = "";
+                    }
+
+                    Layout.fillWidth: true
+                }
+            }
+
+            TapHandler {
+                onTapped: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RoomPinnedMessagesPage'), {
+                    room: root.currentRoom
+                }, {
+                    title: i18nc("@title", "Pinned Messages")
+                });
+            }
         }
 
-        function hideIf(msgid: string): void {
-            if (messageId == msgid) {
-                visible = false;
+        Kirigami.Separator {
+            visible: headerLayout.shouldShowPins
+
+            Layout.fillWidth: true
+        }
+
+        Kirigami.InlineMessage {
+            id: banner
+
+            // Used to keep track of messages so we can hide the right one at the right time
+            property string messageId
+
+            Layout.fillWidth: true
+
+            showCloseButton: true
+            visible: false
+            position: Kirigami.InlineMessage.Position.Header
+
+            function show(msgid: string): void {
+                messageId = msgid;
+                visible = true;
+            }
+
+            function hideIf(msgid: string): void {
+                if (messageId == msgid) {
+                    visible = false;
+                }
             }
         }
     }
@@ -162,15 +296,9 @@ 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
+        height: active ? (item as ChatBar)?.implicitHeight : 0
         active: timelineViewLoader.active && !root.currentRoom.readOnly
         sourceComponent: ChatBar {
             id: chatBar
@@ -230,7 +358,7 @@ Kirigami.Page {
             });
         }
 
-        function onShowDelegateMenu(eventId: string, author, messageComponentType, plainText: string, richText: string, mimeType: string, progressInfo, isThread: bool, selectedText: string, hoveredLink: string) {
+        function onShowDelegateMenu(eventId: string, author, messageComponentType, plainText: string, richText: string, mimeType: string, progressInfo, selectedText: string, hoveredLink: string) {
             (delegateContextMenu.createObject(root, {
                 author: author,
                 eventId: eventId,
@@ -238,6 +366,8 @@ Kirigami.Page {
                 mimeType: mimeType,
                 progressInfo: progressInfo,
                 messageComponentType: messageComponentType,
+                selectedText,
+                hoveredLink,
             }) as DelegateContextMenu).popup();
         }
 

src/app/qml/UserSearchPage.qml

@@ -30,7 +30,7 @@ SearchPage {
      */
     required property NeoChatConnection connection
 
-    title: i18nc("@action:title", "Find Your Friends")
+    title: i18nc("@action:title", "Find User")
 
     Component.onCompleted: focusSearch()
 
@@ -53,6 +53,16 @@ SearchPage {
             root.closeDialog();
         }
 
+        QQC2.ContextMenu.menu: QQC2.Menu {
+            QQC2.MenuItem {
+                text: i18nc("@action:inmenu", "Copy User ID")
+                icon.name: "username-copy"
+                onTriggered: {
+                    Clipboard.saveText(userDelegate.userId)
+                }
+            }
+        }
+
         contentItem: RowLayout {
             spacing: Kirigami.Units.smallSpacing
 
@@ -71,7 +81,7 @@ SearchPage {
             }
             QQC2.Label {
                 visible: userDelegate.directChatExists
-                text: i18nc("@info", "Friends")
+                text: i18nc("@info", "Direct Messages")
                 textFormat: Text.PlainText
                 color: Kirigami.Theme.positiveTextColor
             }

src/app/qml/VerificationCanceled.qml

@@ -11,7 +11,19 @@ VerificationMessage {
 
     required property int reason
 
-    icon: "security-low"
+    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";
+        }
+    }
     text: {
         switch (root.reason) {
         case KeyVerificationSession.NONE:

src/app/roommanager.cpp

@@ -9,8 +9,6 @@
 #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"
@@ -31,6 +29,28 @@
 #include <KIO/OpenUrlJob>
 #endif
 
+/**
+ * @brief Stops RoomManager from updating the last room and space config.
+ */
+class LastRoomBlocker
+{
+public:
+    explicit LastRoomBlocker(RoomManager *manager)
+        : m_manager(manager)
+    {
+        Q_ASSERT(manager);
+
+        m_manager->m_dontUpdateLastRoom = true;
+    }
+    ~LastRoomBlocker()
+    {
+        m_manager->m_dontUpdateLastRoom = false;
+    }
+
+private:
+    RoomManager *m_manager;
+};
+
 RoomManager::RoomManager(QObject *parent)
     : QObject(parent)
     , m_config(KSharedConfig::openStateConfig())
@@ -43,6 +63,7 @@ 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;
@@ -55,6 +76,7 @@ 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,6 +219,11 @@ 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);
@@ -209,9 +236,16 @@ void RoomManager::resolveResource(Uri uri, const QString &action)
         return;
     }
 
-    if (uri.type() == Uri::NonMatrix && action == "qr"_L1) {
-        Q_EMIT externalUrl(uri.toUrl());
-        return;
+    if (action == "qr"_L1) {
+        if (uri.type() == Uri::NonMatrix) {
+            Q_EMIT externalUrl(uri.toUrl());
+            return;
+        }
+        if (uri.type() != Uri::UserId) {
+            uri.setAction(QStringLiteral("join"));
+        } else {
+            uri.setAction(action);
+        }
     }
 
     // For matrix URIs:
@@ -312,17 +346,6 @@ void RoomManager::loadInitialRoom()
         resolveResource(m_arg);
     }
 
-    if (m_isMobile) {
-        QString lastSpace = m_lastRoomConfig.readEntry(u"lastSpace"_s, QString());
-        // We can't have empty keys in KConfig, so we stored it as "Home"
-        if (lastSpace == u"Home"_s) {
-            lastSpace.clear();
-        }
-        setCurrentSpace(lastSpace, false);
-        // We don't want to open a room on startup on mobile
-        return;
-    }
-
     if (m_currentRoom) {
         // we opened a room with the arg parsing already
         return;
@@ -335,16 +358,14 @@ void RoomManager::loadInitialRoom()
 
 void RoomManager::openRoomForActiveConnection()
 {
-    if (!m_connection) {
-        setCurrentRoom({});
-        setCurrentSpace({}, false);
-        return;
-    }
+    Q_ASSERT(m_connection);
+
     auto lastSpace = m_lastRoomConfig.readEntry(u"lastSpace"_s, QString());
     if (lastSpace == u"Home"_s) {
         lastSpace.clear();
     }
-    setCurrentSpace(lastSpace, true);
+    // We don't want to open a room on startup on mobile
+    setCurrentSpace(lastSpace, !m_isMobile);
 }
 
 UriResolveResult RoomManager::visitUser(User *user, const QString &action)
@@ -501,38 +522,85 @@ void RoomManager::setConnection(NeoChatConnection *connection)
     Q_EMIT connectionChanged();
 }
 
-void RoomManager::setCurrentSpace(const QString &spaceId, bool setRoom)
+void RoomManager::setCurrentSpace(const QString &spaceId, bool goToLastUsedRoom)
 {
     m_currentSpaceId = spaceId;
 
     // This need to happen before the signal so TreeView.expandRecursively() can work nicely.
     m_sortFilterRoomTreeModel->setActiveSpaceId(m_currentSpaceId);
-    m_sortFilterRoomTreeModel->setMode(m_currentSpaceId == u"DM"_s ? SortFilterRoomTreeModel::DirectChats : SortFilterRoomTreeModel::Rooms);
+
+    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);
+    }
 
     Q_EMIT currentSpaceChanged();
     if (m_connection) {
         m_lastRoomConfig.writeEntry(u"lastSpace"_s, spaceId.isEmpty() ? u"Home"_s : spaceId);
     }
 
-    if (!setRoom) {
-        return;
-    }
+    // If we requested to change to the last opened room, do so:
+    if (goToLastUsedRoom) {
+        // We don't want to needlessly update the last room config here, that should only be done during explicit user action.
+        LastRoomBlocker blocker(this);
 
-    // We intentionally don't want to open the last room on mobile
-    if (m_isMobile) {
-        return;
-    }
+        // We can't have empty keys in KConfig, so it's stored as "Home":
+        if (const auto &lastRoom = m_lastRoomConfig.readEntry(spaceId.isEmpty() ? u"Home"_s : spaceId, QString()); !lastRoom.isEmpty()) {
+            resolveResource(lastRoom, "no_join"_L1);
+            return;
+        }
 
-    // We can't have empty keys in KConfig, so it's stored as "Home"
-    if (const auto &lastRoom = m_lastRoomConfig.readEntry(spaceId.isEmpty() ? u"Home"_s : spaceId, QString()); !lastRoom.isEmpty()) {
-        resolveResource(lastRoom, "no_join"_L1);
-        return;
+        // If no last room was opened, go to the space home:
+        if (!spaceId.isEmpty() && spaceId != u"DM"_s) {
+            resolveResource(spaceId, "no_join"_L1);
+            return;
+        }
+
+        // Fallback to no room opened:
+        setCurrentRoom({});
     }
-    if (!spaceId.isEmpty() && spaceId != u"DM"_s) {
-        resolveResource(spaceId, "no_join"_L1);
-        return;
+}
+
+QString RoomManager::findSpaceIdForCurrentRoom() const
+{
+    if (!m_currentRoom) {
+        return m_currentSpaceId;
     }
-    setCurrentRoom({});
+    if (m_currentRoom->isDirectChat()) {
+        const auto roomsInSpace = SpaceHierarchyCache::instance().getRoomListForSpace(m_currentSpaceId, false);
+        if (roomsInSpace.contains(m_currentRoom->id())) {
+            return m_currentSpaceId;
+        }
+        return "DM"_L1;
+    }
+    const auto &parentSpaces = SpaceHierarchyCache::instance().parentSpaces(m_currentRoom->id());
+    if (parentSpaces.contains(m_currentSpaceId)) {
+        return m_currentSpaceId;
+    }
+    static auto config = NeoChatConfig::self();
+    if (config->allRoomsInHome()) {
+        return {};
+    }
+    if (const auto &parent = m_connection->room(m_currentRoom->canonicalParent())) {
+        for (const auto &parentParent : SpaceHierarchyCache::instance().parentSpaces(parent->id())) {
+            if (SpaceHierarchyCache::instance().parentSpaces(parentParent).isEmpty()) {
+                return parentParent;
+            }
+        }
+        return parent->id();
+    }
+    for (const auto &space : parentSpaces) {
+        if (SpaceHierarchyCache::instance().parentSpaces(space).isEmpty()) {
+            return space;
+        }
+    }
+    if (m_currentRoom->isSpace()) {
+        return m_currentSpaceId;
+    }
+    return {};
 }
 
 void RoomManager::setCurrentRoom(const QString &roomId)
@@ -552,56 +620,25 @@ void RoomManager::setCurrentRoom(const QString &roomId)
     }
 
     Q_EMIT currentRoomChanged();
-    if (m_connection) {
+
+    if (!m_dontUpdateLastRoom) {
         if (roomId.isEmpty()) {
             m_lastRoomConfig.deleteEntry(m_currentSpaceId);
-        } else {
-            // We can't have empty keys in KConfig, so name it "Home"
-            if (m_currentSpaceId.isEmpty()) {
-                m_lastRoomConfig.writeEntry(u"Home"_s, roomId);
-            } else {
-                m_lastRoomConfig.writeEntry(m_currentSpaceId, roomId);
-            }
-        }
-    }
-    if (roomId.isEmpty()) {
-        return;
-    }
-    if (m_currentRoom->isSpace()) {
-        return;
-    }
-    if (m_currentRoom->isDirectChat()) {
-        if (m_currentSpaceId != "DM"_L1) {
-            setCurrentSpace("DM"_L1, false);
-        }
-        return;
-    }
-    const auto &parentSpaces = SpaceHierarchyCache::instance().parentSpaces(roomId);
-    if (parentSpaces.contains(m_currentSpaceId)) {
-        return;
-    }
-    static auto config = NeoChatConfig::self();
-    if (config->allRoomsInHome()) {
-        setCurrentSpace({}, false);
-        return;
-    }
-    if (const auto &parent = m_connection->room(m_currentRoom->canonicalParent())) {
-        for (const auto &parentParent : SpaceHierarchyCache::instance().parentSpaces(parent->id())) {
-            if (SpaceHierarchyCache::instance().parentSpaces(parentParent).isEmpty()) {
-                setCurrentSpace(parentParent, false);
-                return;
-            }
-        }
-        setCurrentSpace(parent->id(), false);
-        return;
-    }
-    for (const auto &space : parentSpaces) {
-        if (SpaceHierarchyCache::instance().parentSpaces(space).isEmpty()) {
-            setCurrentSpace(space, false);
             return;
         }
+
+        const auto spaceIdForRoom = findSpaceIdForCurrentRoom();
+        // We can't have empty keys in KConfig, so name it "Home"
+        if (spaceIdForRoom.isEmpty()) {
+            m_lastRoomConfig.writeEntry(u"Home"_s, roomId);
+        } else {
+            m_lastRoomConfig.writeEntry(spaceIdForRoom, roomId);
+        }
+
+        if (m_currentSpaceId != spaceIdForRoom) {
+            setCurrentSpace(spaceIdForRoom, false);
+        }
     }
-    setCurrentSpace({}, false);
 }
 
 void RoomManager::clearCurrentRoom()

src/app/roommanager.h

@@ -22,6 +22,7 @@
 #include "models/sortfilterspacelistmodel.h"
 #include "models/timelinemodel.h"
 #include "models/userlistmodel.h"
+#include "models/widgetmodel.h"
 #include "neochatroommember.h"
 
 class NeoChatRoom;
@@ -129,6 +130,14 @@ 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.
      *
@@ -160,6 +169,8 @@ public:
     UserListModel *userListModel() const;
     Q_INVOKABLE void activateUserModel();
 
+    WidgetModel *widgetModel() const;
+
     /**
      * @brief Resolve the given resource.
      *
@@ -326,6 +337,11 @@ Q_SIGNALS:
 
     void currentSpaceChanged();
 
+protected:
+    bool m_dontUpdateLastRoom = false; // Don't set directly, use LastRoomBlocker.
+
+    friend class LastRoomBlocker;
+
 private:
     bool m_isMobile = false;
 
@@ -356,13 +372,28 @@ private:
     MediaMessageFilterModel *m_mediaMessageFilterModel;
 
     UserListModel *m_userListModel;
+    WidgetModel *m_widgetModel;
 
     QPointer<NeoChatConnection> m_connection;
 
     void setCurrentRoom(const QString &roomId);
 
-    // Space ID, "DM", or empty string
-    void setCurrentSpace(const QString &spaceId, bool setRoom = true);
+    /**
+     * @brief Find the most appropriate space for the currently selected room
+     *
+     * Should be used to figure out what space to switch to after a room change.
+     *
+     * @return The Space ID that the currently set room should be displayed as part of. (or "DM" for DM and "" for Home)
+     */
+    QString findSpaceIdForCurrentRoom() const;
+
+    /**
+     * @brief Sets the current space.
+     *
+     * @param spaceId The ID of the space, "DM" for direct messages or an empty string for Home.
+     * @param goToLastUsedRoom If true, we will navigate to the last opened room in this space.
+     */
+    void setCurrentSpace(const QString &spaceId, bool goToLastUsedRoom = true);
 
     /**
      * @brief Resolve a user URI.

src/app/runner.cpp

@@ -8,8 +8,6 @@
 #include <KWindowSystem>
 
 #include "controller.h"
-#include "models/roomlistmodel.h"
-#include "models/sortfilterroomlistmodel.h"
 #include "roommanager.h"
 #include "windowcontroller.h"
 

src/chatbar/ChatBar.qml

@@ -2,6 +2,8 @@
 // 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
@@ -87,9 +89,15 @@ QQC2.Control {
             displayHint: Kirigami.DisplayHint.IconOnly
 
             onTriggered: {
-                let dialog = (Clipboard.hasImage ? attachDialog : openFileDialog).createObject(root.QQC2.Overlay.overlay);
-                dialog.chosen.connect(path => _private.chatBarCache.attachmentPath = path);
-                dialog.open();
+                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();
+                }
             }
 
             tooltip: text
@@ -122,9 +130,9 @@ QQC2.Control {
             displayHint: QQC2.AbstractButton.IconOnly
 
             onTriggered: {
-                locationChooser.createObject(QQC2.Overlay.overlay, {
+                (locationChooser.createObject(QQC2.Overlay.overlay, {
                     room: root.currentRoom
-                }).open();
+                }) as LocationChooser).open();
             }
             tooltip: text
         },
@@ -136,9 +144,9 @@ QQC2.Control {
             displayHint: QQC2.AbstractButton.IconOnly
 
             onTriggered: {
-                newPollDialog.createObject(QQC2.Overlay.overlay, {
+                (newPollDialog.createObject(QQC2.Overlay.overlay, {
                     room: root.currentRoom
-                }).open();
+                }) as NewPollDialog).open();
             }
             tooltip: text
         },
@@ -255,6 +263,7 @@ 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
 
@@ -367,7 +376,9 @@ QQC2.Control {
                         id: actionDelegate
                         required property BusyAction modelData
                         icon.name: modelData.isBusy ? "" : (modelData.icon.name.length > 0 ? modelData.icon.name : modelData.icon.source)
-                        onClicked: modelData.trigger()
+                        onClicked: if (!pieProgress.visible) {
+                            modelData.trigger()
+                        }
 
                         padding: Kirigami.Units.smallSpacing
 
@@ -375,7 +386,9 @@ QQC2.Control {
                         QQC2.ToolTip.text: modelData.tooltip
                         QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
 
-                        contentItem: PieProgressBar {
+                        PieProgressBar {
+                            id: pieProgress
+                            anchors.fill: parent
                             visible: actionDelegate.modelData.isBusy
                             progress: root.currentRoom.fileUploadingProgress
                         }
@@ -402,7 +415,7 @@ QQC2.Control {
             ReplyComponent {
                 id: replyComponent
                 replyContentModel: ContentProvider.contentModelForEvent(root.currentRoom, _private.chatBarCache.replyId, true)
-                Message.maxContentWidth: replyLoader.item.width
+                Message.maxContentWidth: (replyLoader.item as 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)

src/chatbar/EmojiDelegate.qml

@@ -4,6 +4,7 @@
 import QtQuick
 import QtQuick.Controls as QQC2
 import org.kde.kirigami as Kirigami
+import org.kde.neochat
 
 QQC2.ItemDelegate {
     id: root
@@ -29,6 +30,7 @@ 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

src/chatbar/EmojiDialog.qml

@@ -65,7 +65,7 @@ QQC2.Popup {
     padding: 2
 
     implicitHeight: Kirigami.Units.gridUnit * 20 + 2 * padding
-    width: Math.min(contentItem.categoryIconSize * 11 + 2 * padding, QQC2.ApplicationWindow.window.width)
+    width: Math.min(contentItem.categoryIconSize * 11 + 2 * padding, QQC2.ApplicationWindow.window?.width)
     contentItem: EmojiPicker {
         id: emojiPicker
         height: 400

src/chatbar/EmojiPicker.qml

@@ -148,7 +148,7 @@ ColumnLayout {
             id: quickReactions
             Layout.fillWidth: true
 
-            model: ["👍", "👎", "😄", "🎉", "😕", "❤", "🚀", "👀"]
+            model: ["👍", "👎", "😄", "🎉", "😕", "❤️", "🚀", "👀"]
 
             delegate: EmojiDelegate {
                 required property string modelData

src/chatbar/ImageEditorPage.qml

@@ -3,14 +3,13 @@
 
 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: rootEditorView
+    id: root
 
     property bool resizing: false
     required property string imagePath
@@ -26,7 +25,7 @@ Kirigami.Page {
     function crop() {
         const ratioX = editImage.paintedWidth / editImage.nativeWidth;
         const ratioY = editImage.paintedHeight / editImage.nativeHeight;
-        rootEditorView.resizing = false;
+        root.resizing = false;
         imageDoc.crop(selectionTool.selectionX / ratioX, selectionTool.selectionY / ratioY, selectionTool.selectionWidth / ratioX, selectionTool.selectionHeight / ratioY);
     }
 
@@ -43,9 +42,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() + "." + imagePath.split('.').pop();
+                let newPath = Core.StandardPaths.writableLocation(Core.StandardPaths.CacheLocation) + "/" + (new Date()).getTime() + "." + root.imagePath.split('.').pop();
                 if (imageDoc.saveAs(newPath)) {
-                    newPathChanged(newPath);
+                    root.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.");
@@ -80,12 +79,12 @@ Kirigami.Page {
 
         KQuickImageEditor.ImageDocument {
             id: imageDoc
-            path: rootEditorView.imagePath
+            path: root.imagePath
         }
 
         KQuickImageEditor.SelectionTool {
             id: selectionTool
-            visible: rootEditorView.resizing
+            visible: root.resizing
             width: editImage.paintedWidth
             height: editImage.paintedHeight
             x: editImage.horizontalPadding
@@ -101,7 +100,7 @@ Kirigami.Page {
             Connections {
                 target: selectionTool.selectionArea
                 function onDoubleClicked() {
-                    rootEditorView.crop();
+                    root.crop();
                 }
             }
         }
@@ -119,8 +118,8 @@ Kirigami.Page {
             display: QQC2.Button.TextBesideIcon
             actions: [
                 Kirigami.Action {
-                    icon.name: rootEditorView.resizing ? "dialog-cancel" : "transform-crop"
-                    text: rootEditorView.resizing ? i18n("Cancel") : i18nc("@action:button Crop an image", "Crop")
+                    icon.name: root.resizing ? "dialog-cancel" : "transform-crop"
+                    text: root.resizing ? i18n("Cancel") : i18nc("@action:button Crop an image", "Crop")
                     onTriggered: {
                         resizeRectangle.width = editImage.paintedWidth;
                         resizeRectangle.height = editImage.paintedHeight;
@@ -130,38 +129,38 @@ Kirigami.Page {
                         resizeRectangle.insideY = 100;
                         resizeRectangle.insideWidth = 100;
                         resizeRectangle.insideHeight = 100;
-                        rootEditorView.resizing = !rootEditorView.resizing;
+                        root.resizing = !root.resizing;
                     }
                 },
                 Kirigami.Action {
                     icon.name: "dialog-ok"
-                    visible: rootEditorView.resizing
+                    visible: root.resizing
                     text: i18nc("@action:button Crop an image", "Crop")
-                    onTriggered: rootEditorView.crop()
+                    onTriggered: root.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: !rootEditorView.resizing
+                    visible: !root.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: !rootEditorView.resizing
+                    visible: !root.resizing
                 },
                 Kirigami.Action {
                     icon.name: "object-flip-vertical"
                     text: i18nc("@action:button Mirror an image vertically", "Flip")
                     onTriggered: imageDoc.mirror(false, true)
-                    visible: !rootEditorView.resizing
+                    visible: !root.resizing
                 },
                 Kirigami.Action {
                     icon.name: "object-flip-horizontal"
                     text: i18nc("@action:button Mirror an image horizontally", "Mirror")
                     onTriggered: imageDoc.mirror(true, false)
-                    visible: !rootEditorView.resizing
+                    visible: !root.resizing
                 }
             ]
         }

src/devtools/AccountData.qml

@@ -1,6 +1,8 @@
 // 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
@@ -23,8 +25,9 @@ ColumnLayout {
         Repeater {
             model: root.connection.accountDataEventTypes
             delegate: FormCard.FormButtonDelegate {
+                required property string modelData
                 text: modelData
-                onClicked: root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+                onClicked: (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
                     sourceText: root.connection.accountDataJsonString(modelData)
                 }, {
                     title: i18nc("@title:window", "Event Source"),

src/devtools/CMakeLists.txt

@@ -17,6 +17,8 @@ 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)

src/devtools/DevtoolsPage.qml

@@ -17,6 +17,7 @@ Kirigami.ScrollablePage {
 
     property NeoChatRoom room
     required property NeoChatConnection connection
+    property alias currentTabIndex: tabBar.currentIndex
 
     title: i18nc("@title", "Developer Tools")
 

src/devtools/RoomData.qml

@@ -1,6 +1,8 @@
 // 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
@@ -25,7 +27,7 @@ ColumnLayout {
             description: i18nc("@info", "Click to choose a room");
 
             onClicked: {
-                let dialog = root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ChooseRoomDialog'), {
+                let dialog = (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ChooseRoomDialog'), {
                     connection: root.connection,
                 }, {
                     title: i18nc("@title:dialog", "Choose Room"),
@@ -49,8 +51,9 @@ ColumnLayout {
             id: roomAccountData
             model: root.room.accountDataEventTypes
             delegate: FormCard.FormButtonDelegate {
+                required property string modelData
                 text: modelData
-                onClicked: root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+                onClicked: (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
                     sourceText: root.room.roomAcountDataJson(text)
                 }, {
                     title: i18n("Event Source"),
@@ -74,15 +77,18 @@ ColumnLayout {
             }
 
             delegate: FormCard.FormButtonDelegate {
-                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)
+                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)
                 onClicked: {
-                    if (model.eventCount === 1) {
-                        openEventSource(model.type, model.stateKey);
+                    if (eventCount === 1) {
+                        root.openEventSource(type, stateKey);
                     } else {
-                        root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'StateKeys'), {
+                        (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'StateKeys'), {
                             room: root.room,
-                            eventType: model.type
+                            eventType: type
                         }, {
                             title: i18nc("'Event' being some JSON data, not something physically happening.", "Event Information")
                         });
@@ -92,7 +98,7 @@ ColumnLayout {
         }
     }
     function openEventSource(type: string, stateKey: string): void {
-        onClicked: root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+        onClicked: (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
             model: stateModel,
             allowEdit: true,
             room: root.room,

src/devtools/StateKeys.qml

@@ -1,8 +1,9 @@
 // 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
@@ -30,14 +31,15 @@ FormCard.FormCardPage {
             }
 
             delegate: FormCard.FormButtonDelegate {
-                text: model.stateKey
-                onClicked: openEventSource(model.stateKey)
+                required property string stateKey
+                text: stateKey
+                onClicked: root.openEventSource(stateKey)
             }
         }
     }
 
     function openEventSource(stateKey: string): void {
-        root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+        (Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
             model: stateKeysModel,
             allowEdit: true,
             room: root.room,

src/libneochat/CMakeLists.txt

@@ -45,6 +45,8 @@ target_sources(LibNeoChat PRIVATE
     models/stickermodel.cpp
     models/userfiltermodel.cpp
     models/userlistmodel.cpp
+    models/widgetmodel.cpp
+    models/widgetmodel.h
 )
 
 if (TARGET KF6::KIOWidgets)

src/libneochat/chatbarcache.cpp

@@ -207,16 +207,10 @@ void ChatBarCache::setAttachmentPath(const QString &attachmentPath)
     m_attachmentPath = attachmentPath;
     Q_EMIT attachmentPathChanged();
 
-#if (Quotient_VERSION_MINOR < 10 && Quotient_VERSION_PATCH < 3) || Quotient_VERSION_MINOR < 9
-    m_relationType = None;
-    const auto oldEventId = std::exchange(m_relationId, QString());
-    Q_EMIT relationIdChanged(oldEventId, m_relationId);
-#else
     if (m_relationType == Edit) {
         const auto oldEventId = std::exchange(m_relationId, QString());
         Q_EMIT relationIdChanged(oldEventId, m_relationId);
     }
-#endif
 }
 
 void ChatBarCache::clearRelations()

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 friend delegate. */
+        AddDirect, /**< So we can show the add direct message 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("Friends");
+            return i18n("Direct Messages");
         case NeoChatRoomType::Normal:
             return i18n("Normal");
         case NeoChatRoomType::Deprioritized:

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 the newer messages are higher");
+            return i18nc("@info", "Rooms with newer events are higher");
         default:
             return {};
         }

src/libneochat/eventhandler.cpp

@@ -10,7 +10,6 @@
 
 #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>
@@ -196,20 +195,25 @@ bool EventHandler::isHidden(const NeoChatRoom *room, const Quotient::RoomEvent *
     return false;
 }
 
-Qt::TextFormat EventHandler::messageBodyInputFormat(const Quotient::RoomMessageEvent &event)
+Qt::TextFormat EventHandler::messageBodyInputFormat(const Quotient::RoomEvent &event)
 {
     if (event.isRedacted() && !event.isStateEvent()) {
         return Qt::RichText;
     }
 
-    if (event.mimeType().name() == "text/plain"_L1) {
+    auto msgEvent = eventCast<const Quotient::RoomMessageEvent>(&event);
+    if (!msgEvent) {
+        return Qt::PlainText;
+    }
+
+    if (msgEvent->mimeType().name() == "text/plain"_L1) {
         return Qt::PlainText;
     } else {
         return Qt::RichText;
     }
 }
 
-QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
+QString EventHandler::rawMessageBody(const RoomEvent &event)
 {
     if (event.isRedacted() && !event.isStateEvent()) {
         auto reason = event.redactedBecause()->reason();
@@ -218,21 +222,26 @@ QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
 
     QString body;
 
-    if (event.has<EventContent::FileContent>()) {
+    auto msgEvent = eventCast<const Quotient::RoomMessageEvent>(&event);
+    if (!msgEvent) {
+        return body;
+    }
+
+    if (msgEvent->has<EventContent::FileContent>()) {
         // if filename is given or body is equal to filename,
         // then body is a caption
-        QString filename = event.get<EventContent::FileContent>()->originalName;
-        QString body = event.plainBody();
+        QString filename = msgEvent->get<EventContent::FileContent>()->originalName;
+        QString body = msgEvent->plainBody();
         if (filename.isEmpty() || filename == body) {
             return QString();
         }
         return body;
     }
 
-    if (event.has<EventContent::TextContent>() && event.content()) {
-        body = event.get<EventContent::TextContent>()->body;
+    if (msgEvent->has<EventContent::TextContent>() && msgEvent->content()) {
+        body = msgEvent->get<EventContent::TextContent>()->body;
     } else {
-        body = event.plainBody();
+        body = msgEvent->plainBody();
     }
     return body;
 }
@@ -451,6 +460,9 @@ 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());
         },
@@ -664,6 +676,9 @@ 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 &) {

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::RoomMessageEvent &event);
+    static Qt::TextFormat messageBodyInputFormat(const Quotient::RoomEvent &event);
 
     /**
-     * @brief Output a string for the room message content without any formatting.
+     * @brief Output a string for the 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::RoomMessageEvent &event);
+    static QString rawMessageBody(const Quotient::RoomEvent &event);
 
     /**
      * @brief Output a string for the message content ready for display in a rich text field.

src/libneochat/events/pollevent.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "pollevent.h"
-#include <Quotient/converters.h>
 
 using namespace Quotient;
 

src/libneochat/linkpreviewer.cpp

@@ -81,7 +81,7 @@ void LinkPreviewer::loadUrlPreview()
         };
 
         if (conn->supportedMatrixSpecVersions().contains("v1.11"_L1)) {
-            conn->callApi<GetUrlPreviewAuthedJob>(m_url);
+            conn->callApi<GetUrlPreviewAuthedJob>(m_url).onResult(onSuccess);
         } else {
             QT_IGNORE_DEPRECATIONS(conn->callApi<GetUrlPreviewJob>(m_url).onResult(onSuccess);)
         }

src/libneochat/models/actionsmodel.cpp

@@ -59,7 +59,7 @@ QList<ActionsModel::Action> actions{
     Action{
         u"shrug"_s,
         [](const QString &message, NeoChatRoom *, ChatBarCache *) {
-            return u"¯\\\\_(ツ)_/¯ %1"_s.arg(message);
+            return u"¯\\\\\\_(ツ)\\_/¯ %1"_s.arg(message);
         },
         Quotient::RoomMessageEvent::MsgType::Text,
         kli18n("<message>"),