Annotate functions in connections and port away from implicit onFoo

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

.flatpak-manifest.json

@@ -20,8 +20,16 @@
         "--talk-name=org.kde.kwalletd5",
         "--talk-name=org.kde.StatusNotifierWatcher",
         "--talk-name=org.freedesktop.secrets",
+        "--talk-name=org.kde.kuiserver",
         "--own-name=org.kde.StatusNotifierItem-2-2"
     ],
+    "cleanup": [
+        "/include",
+        "/lib/*.a",
+        "/lib/cmake",
+        "/lib/pkgconfig",
+        "/share/ndk-modules"
+    ],
     "modules": [
         {
             "name": "kirigamiaddons",
@@ -82,8 +90,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.gnome.org/sources/libsecret/0.21/libsecret-0.21.6.tar.xz",
-                    "sha256": "747b8c175be108c880d3adfb9c3537ea66e520e4ad2dccf5dce58003aeeca090",
+                    "url": "https://download.gnome.org/sources/libsecret/0.21/libsecret-0.21.7.tar.xz",
+                    "sha256": "6b452e4750590a2b5617adc40026f28d2f4903de15f1250e1d1c40bfd68ed55e",
                     "x-checker-data": {
                         "type": "gnome",
                         "name": "libsecret",
@@ -156,13 +164,13 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.kde.org/stable/kunifiedpush/kunifiedpush-1.0.0.tar.xz",
-                    "sha256": "2ddeba21306d0307114ec50a2c38159ec62359f9fc6cdd58da30a369fbd550cf",
+                    "url": "https://download.kde.org/stable/release-service/25.04.3/src/kunifiedpush-25.04.3.tar.xz",
+                    "sha256": "a16ffe4117b14baa02f3b8ae7de9e509a17359c1b67dcd851aef4f3c3661a1df",
                     "x-checker-data": {
                         "type": "anitya",
-                        "project-id": 375055,
+                        "project-id": 8763,
                         "stable-only": true,
-                        "url-template": "https://download.kde.org/stable/kunifiedpush/kunifiedpush-$version.tar.xz"
+                        "url-template": "https://download.kde.org/stable/release-service/$version/src/kunifiedpush-$version.tar.xz"
                     }
                 }
             ]

CMakeLists.txt

@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.16)
 
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "25")
-set(RELEASE_SERVICE_VERSION_MINOR "07")
+set(RELEASE_SERVICE_VERSION_MINOR "11")
 set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 

autotests/chatbarcachetest.cpp

@@ -6,6 +6,7 @@
 #include <QObject>
 #include <QTest>
 
+#include <QSignalSpy>
 #include <Quotient/roommember.h>
 #include <Quotient/syncdata.h>
 #include <qtestcase.h>
@@ -32,6 +33,7 @@ private Q_SLOTS:
     void noRoom();
     void badParent();
     void reply();
+    void replyMissingUser();
     void edit();
     void attachment();
 };
@@ -102,6 +104,33 @@ void ChatBarCacheTest::reply()
     QCOMPARE(chatBarCache->relationAuthor(), room->member(u"@example:example.org"_s));
     QCOMPARE(chatBarCache->relationMessage(), u"This is an example\ntext message"_s);
     QCOMPARE(chatBarCache->attachmentPath(), QString());
+    QCOMPARE(chatBarCache->relationAuthorIsPresent(), true);
+}
+
+void ChatBarCacheTest::replyMissingUser()
+{
+    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
+    chatBarCache->setText(u"some text"_s);
+    chatBarCache->setAttachmentPath(u"some/path"_s);
+    chatBarCache->setReplyId(u"$153456789:example.org"_s);
+
+    QCOMPARE(chatBarCache->text(), u"some text"_s);
+    QCOMPARE(chatBarCache->isReplying(), true);
+    QCOMPARE(chatBarCache->replyId(), u"$153456789:example.org"_s);
+    QCOMPARE(chatBarCache->isEditing(), false);
+    QCOMPARE(chatBarCache->editId(), QString());
+    QCOMPARE(chatBarCache->relationAuthor(), room->member(u"@example:example.org"_s));
+    QCOMPARE(chatBarCache->relationMessage(), u"This is an example\ntext message"_s);
+    QCOMPARE(chatBarCache->attachmentPath(), QString());
+    QCOMPARE(chatBarCache->relationAuthorIsPresent(), true);
+
+    QSignalSpy relationAuthorIsPresentSpy(chatBarCache.get(), &ChatBarCache::relationAuthorIsPresentChanged);
+
+    // sync again, which will simulate the reply user leaving the room
+    room->syncNewEvents(u"test-min-sync-extra-sync.json"_s);
+
+    QTRY_COMPARE(relationAuthorIsPresentSpy.count(), 1);
+    QCOMPARE(chatBarCache->relationAuthorIsPresent(), false);
 }
 
 void ChatBarCacheTest::edit()

autotests/data/test-min-sync-extra-sync.json

@@ -0,0 +1,20 @@
+{
+  "state": {
+    "events": [
+      {
+        "content": {
+          "membership": "leave"
+        },
+        "event_id": "$1432735824666PhrSA:example.org",
+        "origin_server_ts": 1432735824666,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "state_key": "@example:example.org",
+        "type": "m.room.member",
+        "unsigned": {
+          "replaces_state": "$143273582443PhrSn:example.org"
+        }
+      }
+    ]
+  }
+}

autotests/eventhandlertest.cpp

@@ -130,7 +130,8 @@ void EventHandlerTest::timeString()
              QLocale().toString(QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toLocalTime().time(), QLocale::ShortFormat));
     QCOMPARE(EventHandler::timeString(room, event, true),
              format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(room, event, u"hh:mm"_s), QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toString(u"hh:mm"_s));
+    QCOMPARE(EventHandler::timeString(room, event, u"hh:mm"_s),
+             QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::LocalTime)).toString(u"hh:mm"_s));
 
     const auto txID = room->postJson("m.room.message"_L1, event->fullJson());
     QCOMPARE(room->pendingEvents().size(), 1);

autotests/messagecontentmodeltest.cpp

@@ -10,7 +10,7 @@
 #include <Quotient/roommember.h>
 #include <Quotient/syncdata.h>
 
-#include "models/messagecontentmodel.h"
+#include "models/eventmessagecontentmodel.h"
 
 #include "neochatconnection.h"
 #include "testutils.h"
@@ -39,13 +39,13 @@ void MessageContentModelTest::initTestCase()
 void MessageContentModelTest::missingEvent()
 {
     auto room = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s);
-    auto model1 = MessageContentModel(room, u"$153456789:example.org"_s);
+    auto model1 = EventMessageContentModel(room, u"$153456789:example.org"_s);
 
     QCOMPARE(model1.rowCount(), 1);
     QCOMPARE(model1.data(model1.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);
     QCOMPARE(model1.data(model1.index(0), MessageContentModel::DisplayRole), u"Loading"_s);
 
-    auto model2 = MessageContentModel(room, u"$153456789:example.org"_s, true);
+    auto model2 = EventMessageContentModel(room, u"$153456789:example.org"_s, true);
 
     QCOMPARE(model2.rowCount(), 1);
     QCOMPARE(model2.data(model2.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);

autotests/reactionmodeltest.cpp

@@ -9,7 +9,7 @@
 
 #include <Quotient/events/roommessageevent.h>
 
-#include "models/messagecontentmodel.h"
+#include "models/eventmessagecontentmodel.h"
 #include "testutils.h"
 
 using namespace Quotient;
@@ -21,7 +21,7 @@ class ReactionModelTest : public QObject
 private:
     Connection *connection = nullptr;
     TestUtils::TestRoom *room = nullptr;
-    MessageContentModel *parentModel;
+    EventMessageContentModel *parentModel;
 
 private Q_SLOTS:
     void initTestCase();
@@ -34,7 +34,7 @@ void ReactionModelTest::initTestCase()
 {
     connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
     room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-reactionmodel-sync.json"_s);
-    parentModel = new MessageContentModel(room, "123456"_L1);
+    parentModel = new EventMessageContentModel(room, "123456"_L1);
 }
 
 void ReactionModelTest::basicReaction()

org.kde.neochat.appdata.xml

@@ -75,6 +75,7 @@
   <summary xml:lang="nl">Chat op Matrix</summary>
   <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="ru">Общение в Matrix</summary>
   <summary xml:lang="sa">Matrix इत्यत्र गपशपं कुर्वन्तु</summary>
   <summary xml:lang="sl">Klepet na Matrixu</summary>
@@ -109,6 +110,7 @@
     <p xml:lang="nl">NeoChat is een chat-toepassing die u het volledige voordeel van het Matrix-netwerk laat genieten. Het levert u op een veilige manier tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden te verzenden.</p>
     <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="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 +144,7 @@
     <p xml:lang="nn">NeoChat har som mål å støtta all funksjonalitet i Matrix-spesifikasjonen. Førebels er alt i den gjeldande stabile spesifikasjonen støtta, med unntak av VoIP, trådar og nokre delar av ende-til-kryptering. Det finst òg andre småting som ikkje er støtta, sidan Matrix-spesifikasjon er i stadig endring, men målet er altså støtte for alt.</p>
     <p xml:lang="pl">NeoChat w zamyśle ma być pełnowartościową aplikacją wg wytycznych Matriksa. Z tego powodu, wszystko, co jest obecnie w stabilnych wytycznych z pominięciem VoIP, wątków i niektórych części szyfrowania Użytkownik-do-Użytkownika są obecnie obsługiwane. Pominięto też kilka mniejszych rzeczy ze względu na ciągły rozwój wytycznych Matriksa, lecz celem nadal jest zapewnienie obsługi wszystkich wytycznych.</p>
     <p xml:lang="pt">O NeoChat pretende ser uma aplicação completa para a especificação do Matrix. Como tal, tudo o que existe na especificação estável actual, com as notáveis excepções do VoIP, tópicos e alguns aspectos da Encriptação Ponto-a-Ponto, são suportados. Existem mais algumas omissões, devido ao facto que a norma do Matrix está em constante evolução, mas o objectivo continua a ser oferecer o suporte eventual para a norma por inteiro.</p>
+    <p xml:lang="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="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 +178,7 @@
     <p xml:lang="nn">På grunn av måten Matrix-spesifikasjonen vert utvikla på, støttar NeoChat òg nokre uferdige funksjonar:</p>
     <p xml:lang="pl">Ze względu na sposób rozwoju Matriksa, NeoChat obsługuje także kilka niestabilnych możliwości. Obecnie są to:</p>
     <p xml:lang="pt">Devido à natureza do desenvolvimento da especificação do Matrix, o NeoChat também suporta diversas funcionalidades instáveis. De momento são:</p>
+    <p xml:lang="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="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>
@@ -187,8 +191,8 @@
     <ul>
       <li>Polls - MSC3381</li>
       <li xml:lang="ar">التصويت - MSC3381</li>
-      <li xml:lang="ca">Enquestes - MSC3381</li>
-      <li xml:lang="ca-valencia">Enquestes - MSC3381</li>
+      <li xml:lang="ca">Votacions - MSC3381</li>
+      <li xml:lang="ca-valencia">Votacions - 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 +213,7 @@
       <li xml:lang="nn">Avstemmingar – MSC3381</li>
       <li xml:lang="pl">Ankiety - MSC3381</li>
       <li xml:lang="pt">Inquéritos - MSC3381</li>
+      <li xml:lang="pt-BR">Enquetes - MSC3381</li>
       <li xml:lang="ru">Голосования — MSC3381</li>
       <li xml:lang="sa">मतदान - MSC3381</li>
       <li xml:lang="sl">Polls - MSC3381</li>
@@ -242,6 +247,7 @@
       <li xml:lang="nn">Klistremerke-pakkar – MSC2545</li>
       <li xml:lang="pl">Paczki naklejek - MSC2545</li>
       <li xml:lang="pt">Pacotes de Autocolantes - MSC2545</li>
+      <li xml:lang="pt-BR">Pacotes de Stickers - MSC2545</li>
       <li xml:lang="ru">Наборы стикеров — MSC2545</li>
       <li xml:lang="sa">स्टिकर पैक - MSC2545</li>
       <li xml:lang="sl">Sticker Packs - MSC2545</li>
@@ -275,6 +281,7 @@
       <li xml:lang="nn">Posisjonshendingar – MSC3488</li>
       <li xml:lang="pl">Wydarzenia w miejscach - MSC3488</li>
       <li xml:lang="pt">Eventos com Localizações - MSC3488</li>
+      <li xml:lang="pt-BR">Localização de eventos - MSC3488</li>
       <li xml:lang="ru">События местоположения — MSC3488</li>
       <li xml:lang="sa">स्थान घटनाएँ - MSC3488</li>
       <li xml:lang="sl">Location Events - MSC3488</li>
@@ -344,6 +351,7 @@
       <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
       <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
       <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="pt-BR">Visão principal com lista de salas, bate-papo e informações sobre as salas</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 +388,7 @@
       <caption xml:lang="nl">Ontdek nieuwe gemeenschappen met Matrix-ruimten</caption>
       <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="ru">Поиск новых сообществ с помощью Matrix Spaces</caption>
       <caption xml:lang="sa">Matrix Spaces इत्यनेन सह नूतनानां समुदायानाम् अन्वेषणं कुर्वन्तु</caption>
       <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
@@ -424,6 +433,7 @@
       <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
       <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
       <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="pt-BR">Visão principal com lista de salas, bate-papo e informações sobre as salas</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 +472,7 @@
       <caption xml:lang="nn">Innloggingsbilete</caption>
       <caption xml:lang="pl">Ekran logowania</caption>
       <caption xml:lang="pt">Ecrã de autenticação</caption>
+      <caption xml:lang="pt-BR">Tela de login</caption>
       <caption xml:lang="ru">Окно входа</caption>
       <caption xml:lang="sa">लॉगिन् स्क्रीन</caption>
       <caption xml:lang="sl">Prijavni zaslon</caption>
@@ -477,6 +488,7 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="25.08.0" date="2025-08-14"/>
     <release version="25.04.3" date="2025-07-03"/>
     <release version="25.04.2" date="2025-06-05"/>
     <release version="25.04.1" date="2025-05-08"/>

po/ru/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 % Russian "INCLUDE">
+]>
+<!--
+SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
+SPDX-License-Identifier: CC-BY-SA-4.0
+-->
+
+<refentry lang="&language;">
+<refentryinfo>
+<title
+>Руководство пользователя NeoChat</title>
+<author
+><firstname
+>Carl</firstname
+><surname
+>Schwan</surname
+> <contrib
+>man-страница NeoChat.</contrib
+> <email
+>carl@carlschwan.eu</email
+></author>
+<date
+>2022-11-01</date>
+<releaseinfo
+>22.09</releaseinfo>
+<productname
+>NeoChat</productname>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>
+    <command
+>neochat</command>
+  </refentrytitle>
+  <manvolnum
+>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+  <refname
+>neochat</refname>
+  <refpurpose
+>Клиент для взаимодействия с протоколом обмена сообщениями 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
+>Описание</title>
+  <para
+><command
+>neochat</command
+> — приложение для настольных и мобильных устройств, позволяющее общаться в чатах с помощью протокола Matrix. </para>
+</refsect1>
+
+<refsect1 id="options"
+><title
+>Параметры</title>
+<variablelist>
+  <varlistentry>
+  <term
+><option
+>URI</option
+></term>
+  <listitem>
+    <para
+>URI-адрес пользователя или комнаты в Matrix, например: matrix:u/user:example.org и matrix:r/root:example.org. NeoChat попытается открыть указанную комнату или беседу. </para>
+  </listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1 id="bug">
+  <title
+>Отчёты об ошибках</title>
+  <para
+>Сообщать об ошибках и отправлять предложения по улучшению можно по адресу <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
+>Смотрите также</title>
+  <simplelist>
+    <member
+>Список наиболее часто задаваемых вопросов о 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
+>Авторские права</title>
+<para
+>Авторские права &copy; Tobias Fella, 2020–2022 </para>
+<para
+>Авторские права &copy; Carl Schwan, 2020–2022 </para>
+<para
+>Лицензия: стандартная общественная лицензия GNU версии 3 или любой более поздней версии &lt;<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/controller.cpp

@@ -5,7 +5,6 @@
 #include "controller.h"
 
 #include <Quotient/connection.h>
-#include <qt6keychain/keychain.h>
 
 #include <KLocalizedString>
 
@@ -14,7 +13,6 @@
 
 #include <signal.h>
 
-#include <Quotient/csapi/notifications.h>
 #include <Quotient/events/roommemberevent.h>
 #include <Quotient/qt_connection_util.h>
 #include <Quotient/settings.h>
@@ -24,7 +22,6 @@
 #include "mediasizehelper.h"
 #include "models/actionsmodel.h"
 #include "models/messagemodel.h"
-#include "models/pushrulemodel.h"
 #include "models/roomlistmodel.h"
 #include "models/roomtreemodel.h"
 #include "neochatconfig.h"

src/app/models/commonroomsmodel.h

@@ -7,7 +7,6 @@
 #include <QQmlEngine>
 
 #include "neochatconnection.h"
-#include "neochatroom.h"
 
 #include <Quotient/events/roommessageevent.h>
 #include <Quotient/roommember.h>
@@ -25,11 +24,7 @@ class CommonRoomsModel : public QAbstractListModel
 
 public:
     enum Roles {
-        TextRole = Qt::DisplayRole,
-        LongitudeRole,
-        LatitudeRole,
-        AssetRole,
-        AuthorRole,
+        RoomIdRole = Qt::DisplayRole,
     };
     Q_ENUM(Roles)
 

src/app/models/serverlistmodel.cpp

@@ -176,7 +176,7 @@ void ServerListModel::initialize()
         true,
         false,
     });
-    beginResetModel();
+    endResetModel();
 }
 
 #include "moc_serverlistmodel.cpp"

src/app/neochatconfig.kcfg

@@ -189,6 +189,10 @@
       <label>Don't hide any events in the timeline</label>
       <default>false</default>
     </entry>
+    <entry name="RelateAnyEvent" type="bool">
+      <label>Send relations to any event, including state events and events normally hidden.</label>
+      <default>false</default>
+    </entry>
     <entry name="AlwaysVerifyDevice" type="bool">
       <label>Always allow device verification</label>
       <default>false</default>

src/app/plasma-runner-neochat.desktop

@@ -93,4 +93,3 @@ X-Plasma-API=DBus
 X-Plasma-DBusRunner-Service=org.kde.neochat
 X-Plasma-DBusRunner-Path=/RoomRunner
 X-Plasma-Request-Actions-Once=true
-X-Plasma-Runner-Min-Letter-Count=3

src/app/qml/AccountMenu.qml

@@ -1,9 +1,10 @@
 // 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.Controls as QQC2
-import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.components as KirigamiComponents
@@ -18,21 +19,17 @@ KirigamiComponents.ConvergentContextMenu {
     required property NeoChatConnection connection
     required property Kirigami.ApplicationWindow window
 
-    QQC2.Action {
+    Kirigami.Action {
         text: i18nc("@action:button", "Show QR Code")
         icon.name: "view-barcode-qr-symbolic"
         onTriggered: {
-            let qrMax = Qt.createComponent('org.kde.neochat', 'QrCodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
+            (Qt.createComponent('org.kde.neochat', 'QrCodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
                 text: "https://matrix.to/#/" + root.connection.localUser.id,
                 title: root.connection.localUser.displayName,
                 subtitle: root.connection.localUser.id,
                 // Note: User::avatarUrl does not set user_id, and thus cannot be used directly here. Hence the makeMediaUrl.
                 avatarSource: root.connection.localUser.avatarUrl.toString().length > 0 ? root.connection.makeMediaUrl(root.connection.localUser.avatarUrl) : ""
-            });
-            if (typeof root.closeDialog === "function") {
-                root.closeDialog();
-            }
-            qrMax.open();
+            }) as QrCodeMaximizeComponent).open();
         }
     }
 
@@ -40,26 +37,27 @@ KirigamiComponents.ConvergentContextMenu {
         text: i18nc("@action:inmenu", "Switch Account")
         icon.name: "system-switch-user"
         shortcut: "Ctrl+U"
-        onTriggered: accountSwitchDialog.createObject(QQC2.Overlay.overlay, {
+        onTriggered: (Qt.createComponent("org.kde.neochat", "AccountSwitchDialog").createObject(QQC2.Overlay.overlay, {
             connection: root.connection
-        }).open();
+        }) as Kirigami.Dialog).open();
     }
-    QQC2.Action {
-        text: i18n("Edit This Account")
+
+    Kirigami.Action {
+        text: i18nc("@action:inmenu", "Edit This Account")
         icon.name: "document-edit"
         onTriggered: NeoChatSettingsView.openWithInitialProperties("accounts", {initialAccount: root.connection});
     }
 
-    QQC2.Action {
-        text: i18n("Notification Settings")
+    Kirigami.Action {
+        text: i18nc("@action:inmenu", "Notification Settings")
         icon.name: "notifications"
         onTriggered: {
             NeoChatSettingsView.open('notifications');
         }
     }
 
-    QQC2.Action {
-        text: i18n("Devices")
+    Kirigami.Action {
+        text: i18nc("@action:inmenu", "Devices")
         icon.name: "computer-symbolic"
         onTriggered: {
             NeoChatSettingsView.open('devices');
@@ -67,10 +65,10 @@ KirigamiComponents.ConvergentContextMenu {
     }
 
     Kirigami.Action {
-        text: i18n("Open Developer Tools")
+        text: i18nc("@action:inmenu", "Open Developer Tools")
         icon.name: "tools"
         visible: NeoChatConfig.developerTools
-        onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), {
+        onTriggered: root.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), {
             connection: root.connection
         }, {
             title: i18nc("@title:window", "Developer Tools"),
@@ -88,9 +86,10 @@ KirigamiComponents.ConvergentContextMenu {
         })
     }
 
-    QQC2.Action {
+    Kirigami.Action {
         text: i18nc("@action:inmenu", "Verify This Device")
         icon.name: "security-low"
+        visible: !root.connection.isVerifiedSession()
         onTriggered: {
             root.connection.startSelfVerification();
             const dialog = Qt.createComponent("org.kde.kirigami", "PromptDialog").createObject(QQC2.Overlay.overlay, {
@@ -99,19 +98,17 @@ KirigamiComponents.ConvergentContextMenu {
                 standardButtons: Kirigami.Dialog.Ok
             })
             dialog.open();
-            root.connection.onNewKeyVerificationSession.connect(() => {
+            root.connection.newKeyVerificationSession.connect(() => {
                 dialog.close();
             });
         }
     }
 
-    QQC2.Action {
-        text: i18n("Logout")
+    Kirigami.Action {
+        text: i18nc("@action:inmenu", "Logout…")
         icon.name: "im-kick-user"
-        onTriggered: confirmLogoutDialogComponent.createObject(root).open()
-    }
-
-    readonly property Component confirmLogoutDialogComponent: ConfirmLogoutDialog {
-        connection: root.connection
+        onTriggered: (Qt.createComponent("org.kde.neochat", "ConfirmLogoutDialog").createObject(QQC2.Overlay.overlay, {
+            connection: root.connection
+        }) as Kirigami.Dialog).open()
     }
 }

src/app/qml/AccountSwitchDialog.qml

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 import QtQuick
+import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
@@ -16,8 +17,6 @@ Kirigami.Dialog {
 
     required property NeoChatConnection connection
 
-    parent: applicationWindow().overlay
-
     leftPadding: 0
     rightPadding: 0
     topPadding: 0
@@ -25,7 +24,7 @@ Kirigami.Dialog {
 
     standardButtons: Kirigami.Dialog.NoButton
 
-    width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
+    width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
     title: i18nc("@title: dialog to switch between logged in accounts", "Switch Account")
 
     onVisibleChanged: if (visible) {
@@ -53,7 +52,7 @@ Kirigami.Dialog {
             }
             text: i18nc("@button: login to or register a new account.", "Add Account")
             contentItem: Delegates.SubtitleContentItem {
-                itemDelegate: parent
+                itemDelegate: addDelegate
                 subtitle: i18n("Log in or create a new account")
                 labelItem.textFormat: Text.PlainText
                 subtitleItem.textFormat: Text.PlainText

src/app/qml/AttachmentPane.qml

@@ -33,7 +33,7 @@ ColumnLayout {
         }
         QQC2.ToolButton {
             id: editImageButton
-            visible: hasImage
+            visible: root.hasImage
             icon.name: "document-edit"
             text: i18n("Edit")
             display: QQC2.AbstractButton.IconOnly
@@ -46,9 +46,9 @@ ColumnLayout {
             }
 
             onClicked: {
-                let imageEditor = applicationWindow().pageStack.pushDialogLayer(imageEditorPage);
+                let imageEditor = (Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(imageEditorPage);
                 imageEditor.newPathChanged.connect(function (newPath) {
-                    applicationWindow().pageStack.layers.pop();
+                    imageEditor.closeDialog();
                     root.attachmentPath = newPath;
                 });
             }
@@ -61,7 +61,7 @@ ColumnLayout {
             action: Kirigami.Action {
                 text: i18n("Cancel sending attachment")
                 icon.name: "dialog-close"
-                onTriggered: attachmentCancelled()
+                onTriggered: root.attachmentCancelled()
                 shortcut: "Escape"
             }
             QQC2.ToolTip.text: text
@@ -75,8 +75,8 @@ ColumnLayout {
 
         asynchronous: true
         cache: false // Cache is not needed. Images will rarely be shown repeatedly.
-        source: hasImage ? root.attachmentPath : ""
-        visible: hasImage
+        source: root.hasImage ? root.attachmentPath : ""
+        visible: root.hasImage
         fillMode: Image.PreserveAspectFit
 
         onSourceChanged: {
@@ -114,11 +114,11 @@ ColumnLayout {
             id: mimetypeIcon
             implicitWidth: Kirigami.Units.iconSizes.smallMedium
             implicitHeight: Kirigami.Units.iconSizes.smallMedium
-            source: attachmentMimetype.iconName
+            source: root.attachmentMimetype.iconName
         }
         QQC2.Label {
             id: fileLabel
-            text: baseFileName
+            text: root.baseFileName
         }
     }
 }

src/app/qml/AvatarTabButton.qml

@@ -3,12 +3,9 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 import QtQuick
-import QtQuick.Layouts
 import QtQuick.Controls as QQC2
-import QtQuick.Templates as T
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.delegates as Delegates
-import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
 Delegates.RoundedItemDelegate {
     id: root

src/app/qml/CollapsedRoomDelegate.qml

@@ -8,7 +8,6 @@ import QtQml.Models
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.labs.components as KirigamiComponents
-import org.kde.kitemmodels
 
 import org.kde.neochat
 

src/app/qml/FullScreenMap.qml

@@ -59,7 +59,7 @@ ApplicationWindow {
 
         Connections {
             target: mapView.map
-            function onCopyrightLinkActivated() {
+            function onCopyrightLinkActivated(link: string): void {
                 Qt.openUrlExternally(link);
             }
         }

src/app/qml/GlobalMenu.qml

@@ -17,23 +17,6 @@ Labs.MenuBar {
 
     required property NeoChatConnection connection
 
-    Labs.Menu {
-        title: i18nc("menu", "NeoChat")
-
-        Labs.MenuItem {
-            enabled: pageStack.layers.currentItem.title !== i18n("Configure NeoChat…")
-            text: i18nc("menu", "Configure NeoChat…")
-
-            shortcut: StandardKey.Preferences
-            onTriggered: NeoChatSettingsView.open()
-        }
-        Labs.MenuItem {
-            text: i18nc("menu", "Quit NeoChat")
-
-            shortcut: StandardKey.Quit
-            onTriggered: Qt.quit()
-        }
-    }
     Labs.Menu {
         title: i18nc("menu", "File")
 
@@ -74,6 +57,19 @@ Labs.MenuBar {
                 });
             }
         }
+        Labs.MenuItem {
+            enabled: pageStack.layers.currentItem.title !== i18n("Configure NeoChat…")
+            text: i18nc("menu", "Configure NeoChat…")
+
+            shortcut: StandardKey.Preferences
+            onTriggered: NeoChatSettingsView.open()
+        }
+        Labs.MenuItem {
+            text: i18nc("menu", "Quit NeoChat")
+
+            shortcut: StandardKey.Quit
+            onTriggered: Qt.quit()
+        }
     }
     EditMenu {
         title: i18nc("menu", "Edit")

src/app/qml/InvitationView.qml

@@ -52,6 +52,15 @@ ColumnLayout {
                 Layout.alignment: Qt.AlignHCenter
             }
 
+            Kirigami.SelectableLabel {
+                Layout.fillWidth: true
+                font: Kirigami.Theme.smallFont
+                textFormat: TextEdit.PlainText
+                visible: root.currentRoom && root.currentRoom.canonicalAlias
+                text: root.currentRoom && root.currentRoom.canonicalAlias ? root.currentRoom.canonicalAlias : ""
+                color: Kirigami.Theme.disabledTextColor
+            }
+
             Kirigami.Heading {
                 text: root.currentRoom.displayName
 
@@ -70,7 +79,14 @@ ColumnLayout {
             spacing: Kirigami.Units.smallSpacing
 
             Kirigami.Heading {
-                text: root.currentRoom.displayName
+                text: root.invitingMember.displayName
+
+                Layout.alignment: Qt.AlignHCenter
+            }
+
+            QQC2.Label {
+                text: root.invitingMember.id
+                color: Kirigami.Theme.disabledTextColor
 
                 Layout.alignment: Qt.AlignHCenter
             }
@@ -159,7 +175,7 @@ ColumnLayout {
 
             QQC2.Label {
                 color: Kirigami.Theme.disabledTextColor
-                text: i18nc("@info:label", "You can reject invitations from unknown users under Security settings.")
+                text: xi18nc("@info:label Ensure you are referring to the same translation used for that settings page", "You can reject invitations from unknown users under the <interface>Security & Safety</interface> settings.")
                 wrapMode: Text.WordWrap
 
                 // + 5 to prevent it from wrapping unnecessarily

src/app/qml/JoinRoomDialog.qml

@@ -8,7 +8,6 @@ import QtQuick.Layouts
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.components as KirigamiComponents
 import org.kde.kirigamiaddons.formcard as FormCard
-import org.kde.prison
 
 import org.kde.neochat
 
@@ -25,7 +24,7 @@ Kirigami.Dialog {
 
     standardButtons: Kirigami.Dialog.NoButton
 
-    width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
+    width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
     title: i18nc("@title:dialog", "Join Room")
 
     contentItem: ColumnLayout {

src/app/qml/Main.qml

@@ -60,21 +60,21 @@ Kirigami.ApplicationWindow {
 
     Connections {
         target: LoginHelper
-        function onLoaded() {
+        function onLoaded(): void {
             root.load();
         }
     }
 
     Connections {
         target: Registration
-        function onLoaded() {
+        function onLoaded(): void {
             root.load();
         }
     }
 
     Connections {
         target: root.quitAction
-        function onTriggered() {
+        function onTriggered(): void {
             Qt.quit();
         }
     }
@@ -98,42 +98,40 @@ Kirigami.ApplicationWindow {
     Connections {
         target: RoomManager
 
-        function onCurrentRoomChanged() {
+        function onCurrentRoomChanged(): void {
             if (RoomManager.currentRoom && pageStack.depth <= 1 && root.initialized && Kirigami.Settings.isMobile) {
-                let roomPage = pageStack.layers.push(Qt.createComponent('org.kde.neochat', 'RoomPage'), {
-                    connection: root.connection
-                });
+                let roomPage = pageStack.layers.push(Qt.createComponent('org.kde.neochat', 'RoomPage'));
                 roomPage.backRequested.connect(event => {
                     RoomManager.clearCurrentRoom();
                 });
             }
         }
 
-        function onAskJoinRoom(room) {
+        function onAskJoinRoom(room: NeoChatRoom): void {
             Qt.createComponent("org.kde.neochat", "JoinRoomDialog").createObject(root, {
                 room: room,
                 connection: root.connection
             }).open();
         }
 
-        function onShowUserDetail(user, room) {
+        function onShowUserDetail(user, room: NeoChatRoom): void {
             root.showUserDetail(user, room);
         }
 
-        function goToEvent(event) {
+        function goToEvent(event: string): void {
             if (event.length > 0) {
                 roomItem.goToEvent(event);
             }
             roomItem.forceActiveFocus();
         }
 
-        function onAskDirectChatConfirmation(user) {
+        function onAskDirectChatConfirmation(user): void {
             Qt.createComponent("org.kde.neochat", "AskDirectChatConfirmation").createObject(this, {
                 user: user
             }).open();
         }
 
-        function onExternalUrl(url) {
+        function onExternalUrl(url): void {
             let dialog = Qt.createComponent("org.kde.neochat", "ConfirmUrlDialog").createObject(this);
             dialog.link = url;
             dialog.open();
@@ -338,7 +336,7 @@ Kirigami.ApplicationWindow {
         }
     }
     function handleShare(): void {
-        const dialog = applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ChooseRoomDialog'), {
+        const dialog = root.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ChooseRoomDialog'), {
             connection: root.connection
         }, {
             title: i18nc("@title", "Share"),
@@ -365,9 +363,7 @@ Kirigami.ApplicationWindow {
         RoomManager.loadInitialRoom();
 
         if (!Kirigami.Settings.isMobile) {
-            let roomPage = pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomPage'), {
-                connection: root.connection
-            });
+            let roomPage = pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomPage'));
             roomPage.forceActiveFocus();
         }
 

src/app/qml/MessageSourceSheet.qml

@@ -47,7 +47,7 @@ Kirigami.Page {
             icon.name: "document-edit"
             visible: root.allowEdit
             enabled: room.canSendState(root.type) && (!root.stateKey.startsWith("@") || root.stateKey === root.room.connection.localUserId) && root.type !== "m.room.create"
-            onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat", "EditStateDialog.qml"), {
+            onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat", "EditStateDialog"), {
                 room: root.room,
                 type: root.type,
                 stateKey: root.stateKey,

src/app/qml/NeochatMaximizeComponent.qml

@@ -72,7 +72,7 @@ Components.AlbumMaximizeComponent {
 
     Connections {
         target: MediaManager
-        function onPlaybackStarted() {
+        function onPlaybackStarted(): void {
             if (currentItem.playbackState === MediaPlayer.PlayingState) {
                 currentItem.pause();
             }
@@ -82,7 +82,7 @@ Components.AlbumMaximizeComponent {
     Connections {
         target: currentRoom
 
-        function onFileTransferProgress(id, progress, total) {
+        function onFileTransferProgress(id: string, progress: int, total: int): void {
             if (id == root.currentEventId) {
                 root.downloadAction.progress = progress / total * 100.0;
             }
@@ -130,7 +130,7 @@ Components.AlbumMaximizeComponent {
 
     Connections {
         target: RoomManager
-        function onCloseFullScreen() {
+        function onCloseFullScreen(): void {
             root.close();
         }
     }

src/app/qml/NewPollDialog.qml

@@ -34,7 +34,7 @@ Kirigami.Dialog {
         }
     ]
 
-    width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
+    width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
     title: i18nc("@title: create new poll in the room", "Create Poll")
 
     contentItem: ColumnLayout {

src/app/qml/QrScannerPage.qml

@@ -22,7 +22,7 @@ Kirigami.Page {
 
     Connections {
         target: root.QQC2.ApplicationWindow.window
-        function onClosing() {
+        function onClosing(): void {
             root.destroy();
         }
     }

src/app/qml/QuickSwitcher.qml

@@ -6,7 +6,6 @@ import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
-import org.kde.kitemmodels
 
 import org.kde.neochat
 

src/app/qml/RecommendedSpaceDialog.qml

@@ -15,8 +15,6 @@ Kirigami.Dialog {
 
     property var connection
 
-    parent: applicationWindow().overlay
-
     leftPadding: 0
     rightPadding: 0
     topPadding: 0
@@ -24,7 +22,7 @@ Kirigami.Dialog {
 
     title: i18nc("@title Join <name of a space>", "Join %1", SpaceHierarchyCache.recommendedSpaceDisplayName)
 
-    width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
+    width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
 
     contentItem: ColumnLayout {
         FormCard.AbstractFormDelegate {

src/app/qml/RoomPage.qml

@@ -8,7 +8,6 @@ import QtQuick.Layouts
 import QtQuick.Window
 
 import org.kde.kirigami as Kirigami
-import org.kde.kitemmodels
 
 import org.kde.neochat
 
@@ -64,9 +63,9 @@ Kirigami.Page {
 
     actions: [
         Kirigami.Action {
-            visible: Kirigami.Settings.isMobile || !applicationWindow().pageStack.wideMode
+            visible: Kirigami.Settings.isMobile || !root.Kirigami.PageStack.pageStack.wideMode
             icon.name: "view-right-new"
-            onTriggered: applicationWindow().openRoomDrawer()
+            onTriggered: (root.QQC2.ApplicationWindow.window as Main).openRoomDrawer()
         }
     ]
 
@@ -81,9 +80,9 @@ Kirigami.Page {
 
     Connections {
         target: root.currentRoom.connection
-        function onIsOnlineChanged() {
+        function onIsOnlineChanged(): void {
             if (!root.currentRoom.connection.isOnline) {
-                banner.text = i18n("NeoChat is offline. Please check your network connection.");
+                banner.text = i18nc("@info:status", "NeoChat is offline. Please check your network connection.");
                 banner.visible = true;
                 banner.type = Kirigami.MessageType.Error;
             } else {
@@ -138,8 +137,8 @@ Kirigami.Page {
         anchors.centerIn: parent
         sourceComponent: Kirigami.PlaceholderMessage {
             icon.name: "org.kde.neochat"
-            text: i18n("Welcome to NeoChat")
-            explanation: i18n("Select or join a room to get started")
+            text: i18nc("@title", "Welcome to NeoChat")
+            explanation: i18nc("@info:usagetip", "Select or join a room to get started")
         }
     }
 
@@ -163,20 +162,20 @@ Kirigami.Page {
 
     Connections {
         target: RoomManager
-        function onCurrentRoomChanged() {
+        function onCurrentRoomChanged(): void {
             if (root.currentRoom && root.currentRoom.isInvite) {
                 Controller.clearInvitationNotification(root.currentRoom.id);
             }
         }
 
-        function onGoToEvent(eventId) {
+        function onGoToEvent(eventId: string): void {
             (timelineViewLoader.item as TimelineView).goToEvent(eventId);
         }
     }
 
     Connections {
         target: root.currentRoom.connection
-        function onJoinedRoom(room, invited) {
+        function onJoinedRoom(room: NeoChatRoom, invited: NeoChatRoom): void {
             if (root.currentRoom.id === invited.id) {
                 RoomManager.resolveResource(room.id);
             }
@@ -196,22 +195,22 @@ Kirigami.Page {
     Connections {
         target: RoomManager
 
-        function onShowMessage(messageType, message) {
+        function onShowMessage(messageType: Kirigami.MessageType, message: string): void {
             banner.text = message;
             banner.type = messageType;
             banner.visible = true;
         }
 
-        function onShowEventSource(eventId) {
-            applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+        function onShowEventSource(eventId: string): void {
+            (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
                 sourceText: root.currentRoom.getEventJsonSource(eventId)
             }, {
-                title: i18n("Message Source"),
+                title: i18nc("@title:dialog", "Message Source"),
                 width: Kirigami.Units.gridUnit * 25
             });
         }
 
-        function onShowMessageMenu(eventId, author, messageComponentType, plainText, htmlText, selectedText, hoveredLink, isThread) {
+        function onShowMessageMenu(eventId: string, author, messageComponentType, plainText: string, htmlText: string, selectedText: string, hoveredLink: string, isThread: bool): void {
             const contextMenu = messageDelegateContextMenu.createObject(root, {
                 selectedText: selectedText,
                 hoveredLink: hoveredLink,

src/app/qml/ServerComboBox.qml

@@ -67,10 +67,14 @@ QQC2.ComboBox {
             QQC2.ToolButton {
                 visible: serverItem.isAddServerDelegate || serverItem.isDeletable
                 icon.name: serverItem.isAddServerDelegate ? "list-add" : "dialog-close"
-                text: i18nc("@action:button", "Add new server")
+                text: serverItem.isAddServerDelegate ? i18nc("@action:button", "Add new server") : i18nc("@action:button", "Remove server")
                 Accessible.name: text
                 display: QQC2.AbstractButton.IconOnly
 
+                QQC2.ToolTip.text: text
+                QQC2.ToolTip.visible: hovered
+                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+
                 onClicked: {
                     if (root.currentIndex === serverItem.index && serverItem.isDeletable) {
                         root.currentIndex = 0;
@@ -173,7 +177,7 @@ QQC2.ComboBox {
 
                 Connections {
                     target: serverListModel
-                    function onServerCheckComplete(url, valid) {
+                    function onServerCheckComplete(url: string, valid: bool): void {
                         if (url == serverUrlField.text && valid) {
                             serverUrlField.isValidServer = true;
                         }

src/app/qml/ShareAction.qml

@@ -23,8 +23,6 @@ Kirigami.Action {
     text: i18n("Share")
     tooltip: i18n("Share the selected media")
 
-    visible: false
-
     /**
      * This property holds the input data for purpose.
      *
@@ -60,7 +58,7 @@ Kirigami.Action {
                 if (id != root.eventId) {
                     return;
                 }
-                applicationWindow().pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat", "ShareDialog"), {
+                pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat", "ShareDialog"), {
                     title: root.text,
                     index: index,
                     model: root._instantiator.model

src/app/qml/UserDetailDialog.qml

@@ -261,7 +261,7 @@ Kirigami.Dialog {
                 icon.name: "delete"
                 icon.color: Kirigami.Theme.negativeTextColor
                 onTriggered: {
-                    let dialog = applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReasonDialog'), {
+                    let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReasonDialog'), {
                         title: i18nc("@title:dialog", "Remove Messages"),
                         placeholder: i18nc("@info:placeholder", "Reason for removing this user's recent messages"),
                         actionText: i18nc("@action:button 'Remove' as in 'Remove these messages'", "Remove"),

src/app/roommanager.cpp

@@ -236,11 +236,18 @@ void RoomManager::resolveResource(Uri uri, const QString &action)
     }
 }
 
-void RoomManager::maximizeMedia(int index)
+void RoomManager::maximizeMedia(const QString &eventId)
 {
-    if (index < -1 || index > m_mediaMessageFilterModel->rowCount()) {
+    if (eventId.isEmpty()) {
+        qWarning() << "Tried to open media for empty event id";
         return;
     }
+
+    const auto index = m_mediaMessageFilterModel->getRowForEventId(eventId);
+    if (index == -1) {
+        return;
+    }
+
     Q_EMIT showMaximizedMedia(index);
 }
 
@@ -264,8 +271,17 @@ void RoomManager::viewEventSource(const QString &eventId)
 
 void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, NeochatRoomMember *sender, const QString &selectedText, const QString &hoveredLink)
 {
-    const auto &event = **room->findInTimeline(eventId);
+    if (eventId.isEmpty()) {
+        qWarning() << "Tried to open event menu with empty event id";
+        return;
+    }
 
+    const auto it = room->findInTimeline(eventId);
+    if (it == room->historyEdge()) {
+        // This is probably a pending event
+        return;
+    }
+    const auto &event = **it;
     if (EventHandler::mediaInfo(room, &event).contains("mimeType"_L1)) {
         Q_EMIT showFileMenu(eventId,
                             sender,
@@ -358,19 +374,6 @@ void RoomManager::visitRoom(Room *r, const QString &eventId)
     if (m_currentRoom && !m_currentRoom->editCache()->editId().isEmpty()) {
         m_currentRoom->editCache()->setEditId({});
     }
-    if (m_currentRoom && !m_currentRoom->isSpace() && m_chatDocumentHandler) {
-        // We're doing these things here because it is critical that they are switched at the same time
-        if (m_chatDocumentHandler->document()) {
-            m_currentRoom->mainCache()->setSavedText(m_chatDocumentHandler->document()->textDocument()->toPlainText());
-            m_chatDocumentHandler->setRoom(room);
-            if (room) {
-                m_chatDocumentHandler->document()->textDocument()->setPlainText(room->mainCache()->savedText());
-                room->mainCache()->setText(room->mainCache()->savedText());
-            }
-        } else {
-            m_chatDocumentHandler->setRoom(room);
-        }
-    }
 
     if (!room) {
         setCurrentRoom({});
@@ -393,7 +396,9 @@ void RoomManager::joinRoom(Quotient::Connection *account, const QString &roomAli
 
     // If no one gives us a homeserver suggestion, try the server specified in the alias/id.
     // Otherwise joining a remote room not on our homeserver will fail.
-    if (vias.empty()) {
+    // This is a hack and we're not supposed to do it. With room ids not containing the server going forward, it won't work anymore for new room versions.
+    // FIXME: Let's keep it around anyway for now, remove it at some point, though
+    if (vias.empty() && roomAliasOrId.contains(':'_L1)) {
         vias.append(roomAliasOrId.mid(roomAliasOrId.lastIndexOf(':'_L1) + 1));
     }
 
@@ -468,18 +473,6 @@ bool RoomManager::visitNonMatrix(const QUrl &url)
     return true;
 }
 
-ChatDocumentHandler *RoomManager::chatDocumentHandler() const
-{
-    return m_chatDocumentHandler;
-}
-
-void RoomManager::setChatDocumentHandler(ChatDocumentHandler *handler)
-{
-    m_chatDocumentHandler = handler;
-    m_chatDocumentHandler->setRoom(m_currentRoom);
-    Q_EMIT chatDocumentHandlerChanged();
-}
-
 void RoomManager::setConnection(NeoChatConnection *connection)
 {
     if (m_connection == connection) {

src/app/roommanager.h

@@ -11,7 +11,6 @@
 #include <Quotient/roommember.h>
 #include <Quotient/uriresolver.h>
 
-#include "chatdocumenthandler.h"
 #include "enums/messagecomponenttype.h"
 #include "enums/messagetype.h"
 #include "models/mediamessagefiltermodel.h"
@@ -137,13 +136,6 @@ class RoomManager : public QObject, public UriResolverBase
      */
     Q_PROPERTY(bool hasOpenRoom READ hasOpenRoom NOTIFY currentRoomChanged)
 
-    /**
-     * @brief The ChatDocumentHandler for the open room.
-     *
-     * @sa ChatDocumentHandler
-     */
-    Q_PROPERTY(ChatDocumentHandler *chatDocumentHandler READ chatDocumentHandler WRITE setChatDocumentHandler NOTIFY chatDocumentHandlerChanged)
-
 public:
     virtual ~RoomManager();
     static RoomManager &instance();
@@ -212,12 +204,8 @@ public:
 
     /**
      * @brief Show a media item maximized.
-     *
-     * @param index the index to open the maximize delegate model at. This is the
-     *        index in the MediaMessageFilterModel owned by this RoomManager. A value
-     *        of -1 opens a the default item.
      */
-    Q_INVOKABLE void maximizeMedia(int index);
+    Q_INVOKABLE void maximizeMedia(const QString &eventId);
 
     Q_INVOKABLE void maximizeCode(NeochatRoomMember *author, const QDateTime &time, const QString &codeText, const QString &language);
 
@@ -237,9 +225,6 @@ public:
     Q_INVOKABLE void
     viewEventMenu(const QString &eventId, NeoChatRoom *room, NeochatRoomMember *sender, const QString &selectedText = {}, const QString &hoveredLink = {});
 
-    ChatDocumentHandler *chatDocumentHandler() const;
-    void setChatDocumentHandler(ChatDocumentHandler *handler);
-
     /**
      * @brief Set a URL to be loaded as the initial room.
      */
@@ -342,8 +327,6 @@ Q_SIGNALS:
      */
     void showMessage(MessageType::Type messageType, const QString &message);
 
-    void chatDocumentHandlerChanged();
-
     void connectionChanged();
 
     void directChatsActiveChanged();
@@ -372,7 +355,6 @@ private:
     KConfigGroup m_lastRoomConfig;
     KConfigGroup m_lastSpaceConfig;
     KConfigGroup m_directChatsConfig;
-    QPointer<ChatDocumentHandler> m_chatDocumentHandler;
 
     RoomListModel *m_roomListModel;
     SortFilterRoomListModel *m_sortFilterRoomListModel;

src/app/runner.cpp

@@ -5,6 +5,8 @@
 
 #include <QDBusMetaType>
 
+#include <KWindowSystem>
+
 #include "controller.h"
 #include "models/roomlistmodel.h"
 #include "models/sortfilterroomlistmodel.h"
@@ -86,4 +88,9 @@ void Runner::Run(const QString &id, const QString &actionId)
     WindowController::instance().showAndRaiseWindow(QString());
 }
 
+void Runner::SetActivationToken(const QString &token)
+{
+    KWindowSystem::setCurrentXdgActivationToken(token);
+}
+
 #include "moc_runner.cpp"

src/app/runner.h

@@ -190,6 +190,8 @@ public:
      */
     Q_SCRIPTABLE void Run(const QString &id, const QString &actionId);
 
+    Q_SCRIPTABLE void SetActivationToken(const QString &token);
+
 Q_SIGNALS:
     void roomListModelChanged();
 

src/chatbar/ChatBar.qml

@@ -87,7 +87,7 @@ QQC2.Control {
             displayHint: Kirigami.DisplayHint.IconOnly
 
             onTriggered: {
-                let dialog = (Clipboard.hasImage ? attachDialog : openFileDialog).createObject(applicationWindow().overlay);
+                let dialog = (Clipboard.hasImage ? attachDialog : openFileDialog).createObject(root.QQC2.Overlay.overlay);
                 dialog.chosen.connect(path => _private.chatBarCache.attachmentPath = path);
                 dialog.open();
             }
@@ -197,6 +197,22 @@ QQC2.Control {
             visible: root.currentRoom.mainCache.replyId.length > 0
             sourceComponent: replyPane
         }
+        RowLayout {
+            visible: replyLoader.visible && !root.currentRoom.mainCache.relationAuthorIsPresent
+            spacing: Kirigami.Units.smallSpacing
+
+            Kirigami.Icon {
+                source: "help-hint-symbolic"
+                color: Kirigami.Theme.disabledTextColor
+
+                Layout.preferredWidth: Kirigami.Units.iconSizes.small
+                Layout.preferredHeight: Kirigami.Units.iconSizes.small
+            }
+            QQC2.Label {
+                text: i18nc("@info", "The user you're replying to has left the room, and can't be notified.")
+                color: Kirigami.Theme.disabledTextColor
+            }
+        }
         Loader {
             id: attachLoader
 
@@ -382,8 +398,6 @@ QQC2.Control {
             implicitHeight: replyComponent.implicitHeight
             ReplyComponent {
                 id: replyComponent
-                replyEventId: _private.chatBarCache.replyId
-                replyAuthor: _private.chatBarCache.relationAuthor
                 replyContentModel: ContentProvider.contentModelForEvent(root.currentRoom, _private.chatBarCache.replyId, true)
                 Message.maxContentWidth: replyLoader.item.width
 
@@ -424,7 +438,6 @@ QQC2.Control {
     QtObject {
         id: _private
         property ChatBarCache chatBarCache
-        onChatBarCacheChanged: documentHandler.chatBarCache = chatBarCache
 
         function postMessage() {
             _private.chatBarCache.postMessage();
@@ -486,15 +499,14 @@ QQC2.Control {
 
     ChatDocumentHandler {
         id: documentHandler
+        type: ChatBarType.Room
+        room: root.currentRoom
         document: textField.textDocument
         cursorPosition: textField.cursorPosition
         selectionStart: textField.selectionStart
         selectionEnd: textField.selectionEnd
         mentionColor: Kirigami.Theme.linkColor
         errorColor: Kirigami.Theme.negativeTextColor
-        Component.onCompleted: {
-            RoomManager.chatDocumentHandler = documentHandler;
-        }
     }
 
     Component {

src/chatbar/EmojiDialog.qml

@@ -25,7 +25,7 @@ QQC2.Popup {
 
     Connections {
         target: RoomManager
-        function onCurrentRoomChanged() {
+        function onCurrentRoomChanged(): void {
             root.close();
         }
     }
@@ -65,7 +65,7 @@ QQC2.Popup {
     padding: 2
 
     implicitHeight: Kirigami.Units.gridUnit * 20 + 2 * padding
-    width: Math.min(contentItem.categoryIconSize * 11 + 2 * padding, applicationWindow().width)
+    width: Math.min(contentItem.categoryIconSize * 11 + 2 * padding, QQC2.ApplicationWindow.window.width)
     contentItem: EmojiPicker {
         id: emojiPicker
         height: 400

src/chatbar/ImageEditorPage.qml

@@ -100,7 +100,7 @@ Kirigami.Page {
             }
             Connections {
                 target: selectionTool.selectionArea
-                function onDoubleClicked() {
+                function onDoubleClicked(): void {
                     rootEditorView.crop();
                 }
             }

src/devtools/DebugOptions.qml

@@ -20,6 +20,13 @@ FormCard.FormCard {
 
         onToggled: NeoChatConfig.showAllEvents = checked
     }
+    FormCard.FormCheckDelegate {
+        text: i18nc("@option:check", "Allow sending relations to any event in the timeline")
+        description: i18nc("@info", "This includes state events")
+        checked: NeoChatConfig.relateAnyEvent
+
+        onToggled: NeoChatConfig.relateAnyEvent = checked
+    }
     FormCard.FormCheckDelegate {
         id: roomAccountDataVisibleCheck
         text: i18nc("@option:check Enable the matrix 'threads' feature", "Always allow device verification")

src/devtools/RoomData.qml

@@ -7,7 +7,6 @@ import QtQuick.Window
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
-import org.kde.kitemmodels
 
 import org.kde.neochat
 

src/devtools/ServerData.qml

@@ -7,7 +7,6 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
-import org.kde.kitemmodels
 
 import org.kde.neochat
 

src/devtools/StateKeys.qml

@@ -7,7 +7,6 @@ import QtQuick.Window
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
-import org.kde.kitemmodels
 
 import org.kde.neochat
 

src/libneochat/CMakeLists.txt

@@ -22,6 +22,7 @@ target_sources(LibNeoChat PRIVATE
     texthandler.cpp
     urlhelper.cpp
     utils.cpp
+    enums/chatbartype.h
     enums/messagecomponenttype.h
     enums/messagetype.h
     enums/powerlevel.cpp

src/libneochat/accountmanager.cpp

@@ -173,7 +173,7 @@ void AccountManager::addConnection(NeoChatConnection *connection)
     });
     connect(connection, &NeoChatConnection::loggedOut, this, [this, connection] {
         // Only set the connection if the account being logged out is currently active
-        if (m_accountRegistry->accounts().count() > 1 && connection == activeConnection()) {
+        if (m_accountRegistry->accounts().count() == 1 && connection == activeConnection()) {
             setActiveConnection(dynamic_cast<NeoChatConnection *>(m_accountRegistry->accounts()[0]));
         } else {
             setActiveConnection(nullptr);

src/libneochat/chatbarcache.cpp

@@ -15,6 +15,18 @@ using namespace Qt::StringLiterals;
 ChatBarCache::ChatBarCache(QObject *parent)
     : QObject(parent)
 {
+    if (parent == nullptr) {
+        qWarning() << "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.";
+        return;
+    }
+    auto room = dynamic_cast<NeoChatRoom *>(parent);
+    if (room == nullptr) {
+        qWarning() << "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.";
+        return;
+    }
+    connect(room, &NeoChatRoom::memberLeft, this, &ChatBarCache::relationAuthorIsPresentChanged);
+    connect(room, &NeoChatRoom::memberJoined, this, &ChatBarCache::relationAuthorIsPresentChanged);
+    connect(this, &ChatBarCache::relationIdChanged, this, &ChatBarCache::relationAuthorIsPresentChanged);
 }
 
 QString ChatBarCache::text() const
@@ -137,6 +149,11 @@ Quotient::RoomMember ChatBarCache::relationAuthor() const
     return room->member((*room->findInTimeline(m_relationId))->senderId());
 }
 
+bool ChatBarCache::relationAuthorIsPresent() const
+{
+    return relationAuthor().membershipState() == Quotient::Membership::Join;
+}
+
 QString ChatBarCache::relationMessage() const
 {
     if (parent() == nullptr) {

src/libneochat/chatbarcache.h

@@ -99,6 +99,13 @@ class ChatBarCache : public QObject
      */
     Q_PROPERTY(Quotient::RoomMember relationAuthor READ relationAuthor NOTIFY relationIdChanged)
 
+    /**
+     * @brief If the author for the message being replied to is still present in the room.
+     *
+     * @sa Quotient::RoomMember
+     */
+    Q_PROPERTY(bool relationAuthorIsPresent READ relationAuthorIsPresent NOTIFY relationAuthorIsPresentChanged)
+
     /**
      * @brief The content of the related message.
      *
@@ -153,6 +160,7 @@ public:
     void setEditId(const QString &editId);
 
     Quotient::RoomMember relationAuthor() const;
+    bool relationAuthorIsPresent() const;
 
     QString relationMessage() const;
 
@@ -196,6 +204,7 @@ Q_SIGNALS:
     void threadIdChanged(const QString &oldThreadId, const QString &newThreadId);
     void attachmentPathChanged();
     void mentionAdded(const QString &mention);
+    void relationAuthorIsPresentChanged();
 
 private:
     QString m_text = QString();

src/libneochat/chatdocumenthandler.cpp

@@ -14,6 +14,7 @@
 #include <Sonnet/BackgroundChecker>
 #include <Sonnet/Settings>
 
+#include "chatbartype.h"
 #include "chatdocumenthandler_logging.h"
 #include "eventhandler.h"
 
@@ -67,7 +68,11 @@ public:
         if (!room) {
             return;
         }
-        auto mentions = handler->chatBarCache()->mentions();
+        const auto chatchache = handler->chatBarCache();
+        if (!chatchache) {
+            return;
+        }
+        auto mentions = chatchache->mentions();
         mentions->erase(std::remove_if(mentions->begin(),
                                        mentions->end(),
                                        [this](auto &mention) {
@@ -105,18 +110,6 @@ ChatDocumentHandler::ChatDocumentHandler(QObject *parent)
     , m_highlighter(new SyntaxHighlighter(this))
     , m_completionModel(new CompletionModel(this))
 {
-    connect(this, &ChatDocumentHandler::roomChanged, this, [this]() {
-        m_completionModel->setRoom(m_room);
-        static QPointer<NeoChatRoom> previousRoom = nullptr;
-        if (previousRoom) {
-            disconnect(m_chatBarCache, &ChatBarCache::textChanged, this, nullptr);
-        }
-        previousRoom = m_room;
-        connect(m_chatBarCache, &ChatBarCache::textChanged, this, [this]() {
-            int start = completionStartIndex();
-            m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
-        });
-    });
     connect(this, &ChatDocumentHandler::documentChanged, this, [this]() {
         if (!m_document) {
             m_highlighter->setDocument(nullptr);
@@ -153,6 +146,20 @@ int ChatDocumentHandler::completionStartIndex() const
     return start;
 }
 
+ChatBarType::Type ChatDocumentHandler::type() const
+{
+    return m_type;
+}
+
+void ChatDocumentHandler::setType(ChatBarType::Type type)
+{
+    if (type == m_type) {
+        return;
+    }
+    m_type = type;
+    Q_EMIT typeChanged();
+}
+
 QQuickTextDocument *ChatDocumentHandler::document() const
 {
     return m_document;
@@ -198,22 +205,36 @@ void ChatDocumentHandler::setRoom(NeoChatRoom *room)
         return;
     }
 
+    if (m_room && m_type != ChatBarType::None) {
+        m_room->cacheForType(m_type)->disconnect(this);
+        if (!m_room->isSpace() && m_document && m_type == ChatBarType::Room) {
+            m_room->mainCache()->setSavedText(document()->textDocument()->toPlainText());
+        }
+    }
+
     m_room = room;
+
+    m_completionModel->setRoom(m_room);
+    if (m_room && m_type != ChatBarType::None) {
+        connect(m_room->cacheForType(m_type), &ChatBarCache::textChanged, this, [this]() {
+            int start = completionStartIndex();
+            m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
+        });
+        if (!m_room->isSpace() && m_document && m_type == ChatBarType::Room) {
+            document()->textDocument()->setPlainText(room->mainCache()->savedText());
+            m_room->mainCache()->setText(room->mainCache()->savedText());
+        }
+    }
+
     Q_EMIT roomChanged();
 }
 
 ChatBarCache *ChatDocumentHandler::chatBarCache() const
 {
-    return m_chatBarCache;
-}
-
-void ChatDocumentHandler::setChatBarCache(ChatBarCache *chatBarCache)
-{
-    if (m_chatBarCache == chatBarCache) {
-        return;
+    if (!m_room || m_type == ChatBarType::None) {
+        return nullptr;
     }
-    m_chatBarCache = chatBarCache;
-    Q_EMIT chatBarCacheChanged();
+    return m_room->cacheForType(m_type);
 }
 
 void ChatDocumentHandler::complete(int index)
@@ -313,20 +334,20 @@ void ChatDocumentHandler::setSelectionEnd(int position)
 
 QString ChatDocumentHandler::getText() const
 {
-    if (!m_chatBarCache) {
-        qCWarning(ChatDocumentHandling) << "getText called with m_chatBarCache set to nullptr.";
+    if (!m_room || m_type == ChatBarType::None) {
+        qCWarning(ChatDocumentHandling) << "getText called with no ChatBarCache available. ChatBarType: " << m_type << " Room: " << m_room;
         return {};
     }
-    return m_chatBarCache->text();
+    return m_room->cacheForType(m_type)->text();
 }
 
 void ChatDocumentHandler::pushMention(const Mention mention) const
 {
-    if (!m_chatBarCache) {
-        qCWarning(ChatDocumentHandling) << "pushMention called with m_chatBarCache set to nullptr.";
+    if (!m_room || m_type == ChatBarType::None) {
+        qCWarning(ChatDocumentHandling) << "pushMention called with no ChatBarCache available. ChatBarType: " << m_type << " Room: " << m_room;
         return;
     }
-    m_chatBarCache->mentions()->push_back(mention);
+    m_room->cacheForType(m_type)->mentions()->push_back(mention);
 }
 
 QColor ChatDocumentHandler::mentionColor() const
@@ -365,7 +386,7 @@ void ChatDocumentHandler::updateMentions(QQuickTextDocument *document, const QSt
 {
     setDocument(document);
 
-    if (editId.isEmpty() || !m_chatBarCache || !m_room) {
+    if (editId.isEmpty() || m_type == ChatBarType::None || !m_room) {
         return;
     }
 
@@ -374,7 +395,7 @@ void ChatDocumentHandler::updateMentions(QQuickTextDocument *document, const QSt
             // Replaces the mentions that are baked into the HTML but plaintext in the original markdown
             const QRegularExpression re(uR"lit(<a\shref="https:\/\/matrix.to\/#\/([\S]*)"\s?>([\S]*)<\/a>)lit"_s);
 
-            m_chatBarCache->mentions()->clear();
+            m_room->cacheForType(m_type)->mentions()->clear();
 
             int linkSize = 0;
             auto matches = re.globalMatch(EventHandler::rawMessageBody(*roomMessageEvent));

src/libneochat/chatdocumenthandler.h

@@ -9,6 +9,7 @@
 #include <QTextCursor>
 
 #include "chatbarcache.h"
+#include "enums/chatbartype.h"
 #include "models/completionmodel.h"
 #include "neochatroom.h"
 
@@ -62,6 +63,11 @@ class ChatDocumentHandler : public QObject
     Q_OBJECT
     QML_ELEMENT
 
+    /**
+     * @brief The QQuickTextDocument that is being handled.
+     */
+    Q_PROPERTY(ChatBarType::Type type READ type WRITE setType NOTIFY typeChanged)
+
     /**
      * @brief The QQuickTextDocument that is being handled.
      */
@@ -95,11 +101,6 @@ class ChatDocumentHandler : public QObject
      */
     Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
 
-    /**
-     * @brief The cache for the chat bar the text document is being handled for.
-     */
-    Q_PROPERTY(ChatBarCache *chatBarCache READ chatBarCache WRITE setChatBarCache NOTIFY chatBarCacheChanged)
-
     /**
      * @brief The color to highlight user mentions.
      */
@@ -113,6 +114,9 @@ class ChatDocumentHandler : public QObject
 public:
     explicit ChatDocumentHandler(QObject *parent = nullptr);
 
+    ChatBarType::Type type() const;
+    void setType(ChatBarType::Type type);
+
     [[nodiscard]] QQuickTextDocument *document() const;
     void setDocument(QQuickTextDocument *document);
 
@@ -128,8 +132,7 @@ public:
     [[nodiscard]] NeoChatRoom *room() const;
     void setRoom(NeoChatRoom *room);
 
-    [[nodiscard]] ChatBarCache *chatBarCache() const;
-    void setChatBarCache(ChatBarCache *chatBarCache);
+    ChatBarCache *chatBarCache() const;
 
     Q_INVOKABLE void complete(int index);
 
@@ -147,10 +150,10 @@ public:
     Q_INVOKABLE void updateMentions(QQuickTextDocument *document, const QString &editId);
 
 Q_SIGNALS:
+    void typeChanged();
     void documentChanged();
     void cursorPositionChanged();
     void roomChanged();
-    void chatBarCacheChanged();
     void selectionStartChanged();
     void selectionEndChanged();
     void errorColorChanged();
@@ -159,10 +162,10 @@ Q_SIGNALS:
 private:
     int completionStartIndex() const;
 
+    ChatBarType::Type m_type = ChatBarType::None;
     QPointer<QQuickTextDocument> m_document;
 
     QPointer<NeoChatRoom> m_room;
-    QPointer<ChatBarCache> m_chatBarCache;
 
     QColor m_mentionColor;
     QColor m_errorColor;

src/libneochat/enums/chatbartype.h

@@ -0,0 +1,31 @@
+// SPDX-FileCopyrightText: 2025 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#pragma once
+
+#include <QObject>
+#include <QQmlEngine>
+
+/**
+ * @class ChatBarType
+ *
+ * This class is designed to define the ChatBarType enumeration.
+ */
+class ChatBarType : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
+public:
+    /**
+     * @brief The type of chatbar.
+     */
+    enum Type {
+        Room = 0, /**< A standard room chatbar for creating new messages. */
+        Edit, /**< A chatbar for editing an existing message. */
+        Thread, /**< A chatbar for creating a new threaded message. */
+        None, /**< Undefined. */
+    };
+    Q_ENUM(Type);
+};

src/libneochat/enums/messagecomponenttype.h

@@ -70,13 +70,23 @@ public:
      *
      * @param event the event to return a type for.
      *
+     * @param isInReply whether this event is to be treated like a replied-to event (i.e., a basic text fallback should be shown if no other type is used)
+     *
      * @sa Type
      */
-    static Type typeForEvent(const Quotient::RoomEvent &event)
+    static Type typeForEvent(const Quotient::RoomEvent &event, bool isInReply = false)
     {
         using namespace Quotient;
 
+        if (event.isRedacted()) {
+            return MessageComponentType::Text;
+        }
+
         if (const auto e = eventCast<const RoomMessageEvent>(&event)) {
+            if (e->rawMsgtype() == u"m.key.verification.request"_s) {
+                return MessageComponentType::Verification;
+            }
+
             switch (e->msgtype()) {
             case MessageEventType::Emote:
                 return MessageComponentType::Text;
@@ -103,7 +113,8 @@ public:
             if (event.matrixType() == u"org.matrix.msc3672.beacon_info"_s) {
                 return MessageComponentType::LiveLocation;
             }
-            return MessageComponentType::Other;
+            // In the (unlikely) case that this is a reply to a state event, we do want to show something
+            return isInReply ? MessageComponentType::Text : MessageComponentType::Other;
         }
         if (is<const EncryptedEvent>(event)) {
             return MessageComponentType::Encrypted;
@@ -116,7 +127,8 @@ public:
             return MessageComponentType::Poll;
         }
 
-        return MessageComponentType::Other;
+        // In the (unlikely) case that this is a reply to an unusual event, we do want to show something
+        return isInReply ? MessageComponentType::Text : MessageComponentType::Other;
     }
 
     /**

src/libneochat/eventhandler.cpp

@@ -198,6 +198,10 @@ bool EventHandler::isHidden(const NeoChatRoom *room, const Quotient::RoomEvent *
 
 Qt::TextFormat EventHandler::messageBodyInputFormat(const Quotient::RoomMessageEvent &event)
 {
+    if (event.isRedacted() && !event.isStateEvent()) {
+        return Qt::RichText;
+    }
+
     if (event.mimeType().name() == "text/plain"_L1) {
         return Qt::PlainText;
     } else {
@@ -207,6 +211,11 @@ Qt::TextFormat EventHandler::messageBodyInputFormat(const Quotient::RoomMessageE
 
 QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
 {
+    if (event.isRedacted() && !event.isStateEvent()) {
+        auto reason = event.redactedBecause()->reason();
+        return (reason.isEmpty()) ? i18n("<i>[This message was deleted]</i>") : i18n("<i>[This message was deleted: %1]</i>", reason.toHtmlEscaped());
+    }
+
     QString body;
 
     if (event.has<EventContent::FileContent>()) {
@@ -448,6 +457,12 @@ QString EventHandler::getBody(const NeoChatRoom *room, const Quotient::RoomEvent
         [](const PollStartEvent &e) {
             return e.question();
         },
+        [](const EncryptedEvent &) {
+            return i18nc("@info In room list", "Encrypted event");
+        },
+        [](const ReactionEvent &e) {
+            return i18nc("[user] reacted with <emoji>", "reacted with %1", e.key());
+        },
         i18n("Unknown event"));
 }
 

src/libneochat/messagecomponent.h

@@ -7,12 +7,12 @@
 
 struct MessageComponent {
     MessageComponentType::Type type = MessageComponentType::Other;
-    QString content;
+    QString display;
     QVariantMap attributes;
 
     bool operator==(const MessageComponent &right) const
     {
-        return type == right.type && content == right.content && attributes == right.attributes;
+        return type == right.type && display == right.display && attributes == right.attributes;
     }
 
     bool isEmpty() const