Add "16:9 Super hero art" for Microsoft Store

For details, where this image is used, see
https://learn.microsoft.com/en-us/windows/apps/publish/publish-your-app/screenshots-and-images?pivots=store-installer-msix#windows-10-and-xbox-image-169-super-hero-art

.flatpak-manifest.json

@@ -103,7 +103,6 @@
         {
             "name": "libQuotient",
             "buildsystem": "cmake-ninja",
-            "config-opts": [ "-DBUILD_TESTING=OFF" ],
             "sources": [
                 {
                     "type": "git",
@@ -113,7 +112,8 @@
                 }
             ],
             "config-opts": [
-                "-DQuotient_ENABLE_E2EE=ON"
+                "-DQuotient_ENABLE_E2EE=ON",
+                "-DBUILD_TESTING=OFF"
             ]
         },
         {

.gitlab-ci.yml

@@ -8,7 +8,7 @@ include:
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml
+#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
 #  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml

autotests/CMakeLists.txt

@@ -14,3 +14,9 @@ ecm_add_test(
     LINK_LIBRARIES neochat Qt::Test
     TEST_NAME texthandlertest
 )
+
+ecm_add_test(
+    delegatesizehelpertest.cpp
+    LINK_LIBRARIES neochat Qt::Test
+    TEST_NAME delegatesizehelpertest
+)

autotests/delegatesizehelpertest.cpp

@@ -0,0 +1,156 @@
+// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include <QObject>
+#include <QTest>
+
+#include "delegatesizehelper.h"
+
+class DelegateSizeHelperTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void risingPercentage_data();
+    void risingPercentage();
+
+    void fallingPercentage_data();
+    void fallingPercentage();
+
+    void equalPercentage_data();
+    void equalPercentage();
+
+    void equalBreakpoint_data();
+    void equalBreakpoint();
+};
+
+void DelegateSizeHelperTest::risingPercentage_data()
+{
+    QTest::addColumn<qreal>("parentWidth");
+    QTest::addColumn<int>("currentPercentageWidth");
+    QTest::addColumn<qreal>("currentWidth");
+
+    QTest::newRow("zero") << qreal(0) << int(0) << qreal(0);
+    QTest::newRow("one hundred") << qreal(100) << int(0) << qreal(0);
+    QTest::newRow("one fifty") << qreal(150) << int(50) << qreal(75);
+    QTest::newRow("two hundred") << qreal(200) << int(100) << qreal(200);
+    QTest::newRow("three hundred") << qreal(300) << int(100) << qreal(300);
+}
+
+void DelegateSizeHelperTest::risingPercentage()
+{
+    QFETCH(qreal, parentWidth);
+    QFETCH(int, currentPercentageWidth);
+    QFETCH(qreal, currentWidth);
+
+    DelegateSizeHelper delegateSizeHelper;
+    delegateSizeHelper.setStartBreakpoint(100);
+    delegateSizeHelper.setEndBreakpoint(200);
+    delegateSizeHelper.setStartPercentWidth(0);
+    delegateSizeHelper.setEndPercentWidth(100);
+
+    delegateSizeHelper.setParentWidth(parentWidth);
+
+    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
+    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
+}
+
+void DelegateSizeHelperTest::fallingPercentage_data()
+{
+    QTest::addColumn<qreal>("parentWidth");
+    QTest::addColumn<int>("currentPercentageWidth");
+    QTest::addColumn<qreal>("currentWidth");
+
+    QTest::newRow("zero") << qreal(0) << int(100) << qreal(0);
+    QTest::newRow("one hundred") << qreal(100) << int(100) << qreal(100);
+    QTest::newRow("one fifty") << qreal(150) << int(50) << qreal(75);
+    QTest::newRow("two hundred") << qreal(200) << int(0) << qreal(0);
+    QTest::newRow("three hundred") << qreal(300) << int(0) << qreal(0);
+}
+
+void DelegateSizeHelperTest::fallingPercentage()
+{
+    QFETCH(qreal, parentWidth);
+    QFETCH(int, currentPercentageWidth);
+    QFETCH(qreal, currentWidth);
+
+    DelegateSizeHelper delegateSizeHelper;
+    delegateSizeHelper.setStartBreakpoint(100);
+    delegateSizeHelper.setEndBreakpoint(200);
+    delegateSizeHelper.setStartPercentWidth(100);
+    delegateSizeHelper.setEndPercentWidth(0);
+
+    delegateSizeHelper.setParentWidth(parentWidth);
+
+    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
+    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
+}
+
+void DelegateSizeHelperTest::equalPercentage_data()
+{
+    QTest::addColumn<qreal>("parentWidth");
+    QTest::addColumn<int>("currentPercentageWidth");
+    QTest::addColumn<qreal>("currentWidth");
+
+    QTest::newRow("zero") << qreal(0) << int(50) << qreal(0);
+    QTest::newRow("one hundred") << qreal(100) << int(50) << qreal(50);
+    QTest::newRow("one fifty") << qreal(150) << int(50) << qreal(75);
+    QTest::newRow("two hundred") << qreal(200) << int(50) << qreal(100);
+    QTest::newRow("three hundred") << qreal(300) << int(50) << qreal(150);
+}
+
+void DelegateSizeHelperTest::equalPercentage()
+{
+    QFETCH(qreal, parentWidth);
+    QFETCH(int, currentPercentageWidth);
+    QFETCH(qreal, currentWidth);
+
+    DelegateSizeHelper delegateSizeHelper;
+    delegateSizeHelper.setStartBreakpoint(100);
+    delegateSizeHelper.setEndBreakpoint(200);
+    delegateSizeHelper.setStartPercentWidth(50);
+    delegateSizeHelper.setEndPercentWidth(50);
+
+    delegateSizeHelper.setParentWidth(parentWidth);
+
+    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
+    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
+}
+
+void DelegateSizeHelperTest::equalBreakpoint_data()
+{
+    QTest::addColumn<int>("startPercentageWidth");
+    QTest::addColumn<int>("endPercentageWidth");
+    QTest::addColumn<int>("currentPercentageWidth");
+    QTest::addColumn<qreal>("currentWidth");
+
+    QTest::newRow("start higher") << int(100) << int(0) << int(-1) << qreal(0);
+    QTest::newRow("equal") << int(50) << int(50) << int(50) << qreal(500);
+    QTest::newRow("end higher") << int(0) << int(100) << int(-1) << qreal(0);
+}
+
+/**
+ * We expect a default return except in the case where the the two percentages are
+ * equal as that case can be calculated without dividing by zero.
+ */
+void DelegateSizeHelperTest::equalBreakpoint()
+{
+    QFETCH(int, startPercentageWidth);
+    QFETCH(int, endPercentageWidth);
+    QFETCH(int, currentPercentageWidth);
+    QFETCH(qreal, currentWidth);
+
+    DelegateSizeHelper delegateSizeHelper;
+    delegateSizeHelper.setStartBreakpoint(100);
+    delegateSizeHelper.setEndBreakpoint(100);
+    delegateSizeHelper.setStartPercentWidth(startPercentageWidth);
+    delegateSizeHelper.setEndPercentWidth(endPercentageWidth);
+
+    delegateSizeHelper.setParentWidth(1000);
+
+    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
+    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
+}
+
+QTEST_GUILESS_MAIN(DelegateSizeHelperTest)
+#include "delegatesizehelpertest.moc"

org.kde.neochat.appdata.xml

@@ -22,6 +22,7 @@
   <name xml:lang="eu">NeoChat</name>
   <name xml:lang="fi">NeoChat</name>
   <name xml:lang="fr">NeoChat</name>
+  <name xml:lang="gl">NeoChat</name>
   <name xml:lang="hu">NeoChat</name>
   <name xml:lang="ia">Neochat</name>
   <name xml:lang="id">NeoChat</name>
@@ -57,6 +58,7 @@
   <summary xml:lang="eu">Matrix, deszentralizatutako komunikazio protokolorako bezero bat</summary>
   <summary xml:lang="fi">Asiakas Matrixille, hajautetulle viestintäyhteyskäytännölle</summary>
   <summary xml:lang="fr">Un client pour « Matrix », le protocole décentralisé de communications.</summary>
+  <summary xml:lang="gl">Un cliente para Matrix, o protocolo de comunicación descentralizada</summary>
   <summary xml:lang="hu">Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz</summary>
   <summary xml:lang="ia">Un cliente per Matrix, le protocollo de communication decentralisate</summary>
   <summary xml:lang="id">Klien untuk matrix, protokol komunikasi terdesentralisasi</summary>
@@ -87,7 +89,10 @@ to provide a convergent experience across multiple platforms.</p>
     <p xml:lang="ca-valencia">NeoChat és un client de Matrix, el protocol descentralitzat de comunicacions de missatgeria instantània. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics. Utilitza els Frameworks de KDE i, sobretot, Kirigami per a proporcionar una experiència convergent a través de diverses plataformes.</p>
     <p xml:lang="en-GB">NeoChat is a client for Matrix, the decentralised communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami to provide a convergent experience across multiple platforms.</p>
     <p xml:lang="es">NeoChat es un cliente para Matrix, el protocolo de comunicaciones descentralizado para mensajería instantánea. Le permite enviar mensajes de texto, vídeos y archivos de sonido a su familia, compañeros de trabajo y amigos. Usa la infraestructura de KDE y, en particular, Kirigami para proporcionar una experiencia convergente en muchas plataformas.</p>
+    <p xml:lang="fi">NeoChat on asiakassovellus Matrixille, hajautetulle pikaviestinyhteyskäytännölle. Sillä voi lähettää teksti-, video- ja ääniviestejä perheelle, tutuille ja ystäville. Se käyttää KDE-kehystä ja erityisesti Kirigamia tuottaakseen mukautuvan monialustaisen käyttökokemuksen.</p>
     <p xml:lang="fr">NeoChat est un client pour le protocole Matrix, un protocole décentralisé de communications pour messagerie instantané. Il vous permet d'envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos amis. Il utilise les environnements de développement et plus précisément Kirigami pour fournir une expérience convergente sur plusieurs plate-formes. </p>
+    <p xml:lang="gl">NeoChat é un cliente para Matrix, o protocolo de comunicación descentralizada para mensaxería instantánea. Podes enviar mensaxes de texto, vídeos e ficheiros de son á túa familia, colegas e amizades. Usas infraestruturas de KDE e principalmente Kirigami para proporcionar unha experiencia de uso converxente para varias plataformas.</p>
+    <p xml:lang="ia">NeoChat es un cliente per Matrix, le protocollo de communication decentralisate per messager instantanee. Illo te permitte inviar messager de texto, files de video e audio a tu familia, collegas e amicos usante. Illo usa KDE frameworks e super toto Kirigamii forni un experientia convergente trans platteforme multiple.</p>
     <p xml:lang="it">NeoChat è un client per Matrix, il protocollo di comunicazione decentralizzato per la messaggistica istantanea. Ti consente di inviare messaggi di testo, video e file audio a familiari, colleghi e amici. Utilizza i framework KDE e in particolare Kirigami per fornire un'esperienza convergente su più piattaforme.</p>
     <p xml:lang="ka">NeoChat არის Matrix კლიენტი. ის საშუალებას გაძლევთ გაგზავნოთ ტექსტური შეტყობინებები, ვიდეოები და აუდიო ფაილები თქვენს ოჯახს, კოლეგებსა და მეგობრებს მატრიქსის პროტოკოლის გამოყენებით.</p>
     <p xml:lang="nl">NeoChat is een client voor Matrix, het gedecentraliseerde communicatieprotocol voor instant messages. Het biedt u het verzenden van tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden. Het gebruik KDE frameworks en het meest opmerkelijk Kirigami om een convergente ervaring te leveren op meerdere platforms.</p>
@@ -103,7 +108,10 @@ to provide a convergent experience across multiple platforms.</p>
     <p xml:lang="ca-valencia">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de VoIP, fils i alguns aspectes de l'encriptació d'extrem a extrem. Hi ha algunes altres omissions més xicotetes a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu seguix sent proporcionar suport eventual per a tota l'especificació.</p>
     <p xml:lang="en-GB">NeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.</p>
     <p xml:lang="es">NeoChat pretende ser una aplicación con todas las funciones para la especificación de Matrix. Como tal, admite todo en la especificación estable actual, con las notables excepciones de VoIP, subprocesos y algunas funciones de cifrado de extremo a extremo. Existen algunas omisiones menos importantes debido al hecho de que la especificación de Matrix está en constante evolución, pero el objetivo sigue siendo brindar compatibilidad final con toda la especificación.</p>
-    <p xml:lang="fr">L'objectif de NeoChat est d'être une application complète pour le protocole Matrix. En tant que tel, tout dans la spécification stable actuelle avec les exceptions notables de VoIP, les processus et certains aspects du chiffrement de bout en bout sont pris en charge. Il y a quelques autres petites omissions en raison du fait que la spécification du protocole Matrix est en constante évolution. Cependant, l’objectif reste de fournir un soutien éventuel pour l’ensemble de la spécification.</p>
+    <p xml:lang="fi">NeoChat pyrkii olemaan Matrix-määritelmän täysominaisuuksinen sovellus, joten se tukee kaikkea nykyisessä vakaassa määritelmässä muutamaa huomattavaa poikkeusta lukuun ottamatta (VoIP, säikeet ja jotkin piirteet päästä päähän -salauksessa). Joitakin pienempiäkin puutteita on Matrix-määritelmän jatkuvan kehityksen vuoksi, mutta lopputavoitteena on tarjota määritelmän täysi tuki.</p>
+    <p xml:lang="fr">L'objectif de NeoChat est d'être une application complète pour le protocole Matrix. En tant que tel, tout dans la spécification stable actuelle avec les exceptions notables de VoIP, les processus et certains aspects du chiffrement de bout en bout sont pris en charge. Il y a quelques autres petites omissions en raison du fait que la spécification du protocole Matrix est en constante évolution. Cependant, l'objectif reste de fournir un soutien éventuel pour l'ensemble de la spécification.</p>
+    <p xml:lang="gl">NeoChat pretende ser unha aplicación completa para a especificación de Matrix. Coas excepcións de VoIP, conversas fiadas e algúns aspectos da cifraxe de extremo a extremo, a versión estábel segue as especificacións. Existen algunhas outras pequenas omisións debido ao feito de que Matrix está en continua evolución pero a intención é implementar a especificación completa.</p>
+    <p xml:lang="ia">NeoChat aspira a esser un application plenemente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
     <p xml:lang="it">NeoChat mira ad essere un'applicazione completa per le specifiche Matrix. Pertanto, sono supportati tutti gli elementi dell'attuale specifica stabile con le notevoli eccezioni di VoIP, conversazioni e alcuni aspetti della cifratura end-to-end. Ci sono alcune altre piccole omissioni dovute al fatto che le specifiche Matrix sono in continua evoluzione, ma l'obiettivo rimane quello di fornire un eventuale supporto per l'intera specifica.</p>
     <p xml:lang="ka">NeoChat-ი მიზნად ისახავს Matrix სპეციფიკაციის სრული განხორციელება ჰქონდეს. როგორც ასეთი, ყველაფერი მიმდინარე სპეციფიკაციიდან, VoIP-ის, ძაფებისა და გამჭოლი დაშიფვრის ზოგიერთი ასპექტის გარდა, მხარდაჭერილია. შეძლება ასევე იყოს მცირე ლაფსუსებიც იმის გამო, რომ Matrix-ის სპეციფიკაცია მუდმივად ვითარგდება, მაგრამ ჩვენი მიზანი მისი სრული მხარდაჭერაა.</p>
     <p xml:lang="nl">NeoChat richt zich op het volledig bieden van alle mogelijkheden van de Matrix-specificatie. Alles in de huidige stabiele specificatie met merkbare uitzondering van VoIP, gekoppelde discussies en sommige aspecten van eind-tot-eind versleuteling worden ondersteund. Er zijn een paar andere kleinere omissies vanwege het feit dat de Matrix specificatie constant evolueert maar het doel blijft het eventueel bieden van ondersteuning van de gehele specificatie.</p>
@@ -119,7 +127,10 @@ to provide a convergent experience across multiple platforms.</p>
     <p xml:lang="ca-valencia">A causa de la naturalea del desenvolupament de l'especificació de Matrix, NeoChat també implementa nombroses característiques inestables. Actualment són:</p>
     <p xml:lang="en-GB">Due to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:</p>
     <p xml:lang="es">Debido a la naturaleza del desarrollo de la especificación de Matrix, NeoChat también permite numerosas funciones no estables, como:</p>
+    <p xml:lang="fi">Matrix-määritelmän kehittyessä NeoChat tukee myös monia epävakaita ominaisuuksia. Tällä hetkellä näitä ovat:</p>
     <p xml:lang="fr">En raison de la nature du développement des spécifications du protocole Matrix, NeoChat prend également en charge de nombreuses fonctionnalités instables. Actuellement, ce sont :</p>
+    <p xml:lang="gl">Debido á natureza do desenvolvemento da especificación de Matrix, NeoChat tamén inclúe varias funcionalidades non estábeis:</p>
+    <p xml:lang="ia">Debite al natura del disveloppamento de specification de Matrix NeoChat tamben supporta numerose characteristicas instabile. Currentemente istes es:</p>
     <p xml:lang="it">A causa della natura dello sviluppo delle specifiche Matrix, NeoChat supporta anche numerose funzionalità instabili. Attualmente queste sono:</p>
     <p xml:lang="ka">Matrix-ის სპეციფიკაციის განვითარების ბუნების გამო NeoChat-ს ასევე აქვს უამრავი არასტაბილური ფუნქციაც. ახლა ისინია:</p>
     <p xml:lang="nl">Vanwege de aard van de ontwikkeling van de Matrix specificatie ondersteunt NeoChat ook talloze onstabiele mogelijkheden. Dit zijn nu:</p>
@@ -136,7 +147,10 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="ca-valencia">Enquestes - MSC3381</li>
       <li xml:lang="en-GB">Polls - MSC3381</li>
       <li xml:lang="es">Encuestas - MSC3381</li>
+      <li xml:lang="fi">Kyselyt – MSC3381</li>
       <li xml:lang="fr">Sondages - MSC3381</li>
+      <li xml:lang="gl">Enquisas - MSC3381</li>
+      <li xml:lang="ia">Inquestas - MSC3381</li>
       <li xml:lang="it">Sondaggi - MSC3381</li>
       <li xml:lang="ka">Polls - MSC3381</li>
       <li xml:lang="nl">Polls - MSC3381</li>
@@ -152,7 +166,10 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="ca-valencia">Paquets d'adhesius - MSC2545</li>
       <li xml:lang="en-GB">Sticker Packs - MSC2545</li>
       <li xml:lang="es">Paquetes de pegatinas - MSC2545</li>
+      <li xml:lang="fi">Tarrapakkaukset – MSC2545</li>
       <li xml:lang="fr">Paquets d'auto-collants - MSC2545</li>
+      <li xml:lang="gl">Paquetes de adhesivos - MSC2545</li>
+      <li xml:lang="ia">Etiquetta gummate (sticker) -MSC2545</li>
       <li xml:lang="it">Pacchetti di adesivi - MSC2545</li>
       <li xml:lang="ka">სტიკერების პაკეტები - MSC2545</li>
       <li xml:lang="nl">Sticker Packs - MSC2545</li>
@@ -168,7 +185,10 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="ca-valencia">Esdeveniments d'ubicació - MSC3488</li>
       <li xml:lang="en-GB">Location Events - MSC3488</li>
       <li xml:lang="es">Eventos de ubicación - MSC3488</li>
+      <li xml:lang="fi">Sijaintitapahtumat – MSC3488</li>
       <li xml:lang="fr">Événements de lieu - MSC3488</li>
+      <li xml:lang="gl">Localización de eventos - MSC3488</li>
+      <li xml:lang="ia">Eventos de Location - MSC3488</li>
       <li xml:lang="it">Località eventi - MSC3488</li>
       <li xml:lang="ka">მდებარეობის მოვლენები - MSC3488</li>
       <li xml:lang="nl">Locatie gebeurtenissen - MSC3488</li>
@@ -180,6 +200,11 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="x-test">xxLocation Events - MSC3488xx</li>
     </ul>
   </description>
+  <keywords>
+    <keyword>instant messaging</keyword>
+    <keyword>chat</keyword>
+    <keyword>matrix</keyword>
+  </keywords>
   <url type="homepage">https://apps.kde.org/neochat/</url>
   <url type="bugtracker">https://bugs.kde.org/buglist.cgi?component=General&amp;product=NeoChat</url>
   <categories>
@@ -198,6 +223,7 @@ to provide a convergent experience across multiple platforms.</p>
   <developer_name xml:lang="eu">KDE komunitatea</developer_name>
   <developer_name xml:lang="fi">KDE-yhteisö</developer_name>
   <developer_name xml:lang="fr">La communauté de KDE</developer_name>
+  <developer_name xml:lang="gl">A comunidade KDE</developer_name>
   <developer_name xml:lang="hu">A KDE Közösség</developer_name>
   <developer_name xml:lang="ia">Le communitate de KDE</developer_name>
   <developer_name xml:lang="id">Komunitas KDE</developer_name>
@@ -226,6 +252,19 @@ to provide a convergent experience across multiple platforms.</p>
     <value key="KDE::matrix">#neochat:kde.org</value>
     <value key="KDE::windows_store">https://www.microsoft.com/store/apps/9PNXWVNRC29H</value>
     <value key="KDE::mastodon">https://kde.social/@neochat</value>
+    <value key="KDE::windows_store::StoreLogo9x16">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/storelogo-720x1080.png</value>
+    <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::feature1">Supports the Matrix protocol for instant messaging.</value>
+    <value key="KDE::feature2">End-to-End Encryption</value>
+    <value key="KDE::feature3">Polls (experimental)</value>
+    <value key="KDE::feature4">Sticker Packs (experimental)</value>
+    <value key="KDE::feature5">Location Events (experimental)</value>
+    <value key="KDE::windows_store::DesktopScreenshot1">https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Timeline.png</value>
+    <value key="KDE::windows_store::DesktopScreenshotCaption1">Main view of NeoChat with room list, chat, and room information pane</value>
+    <value key="KDE::windows_store::DesktopScreenshot2">https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Login.png</value>
+    <value key="KDE::windows_store::DesktopScreenshotCaption2">Login screen of NeoChat</value>
   </custom>
   <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
   <screenshots>
@@ -240,6 +279,7 @@ to provide a convergent experience across multiple platforms.</p>
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="23.04.2" date="2023-06-08"/>
     <release version="23.04.1" date="2023-05-11"/>
     <release version="23.04.0" date="2023-04-20">
       <artifacts>

org.kde.neochat.desktop

@@ -15,6 +15,7 @@ Name[es]=NeoChat
 Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
+Name[gl]=NeoChat
 Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
@@ -52,6 +53,7 @@ GenericName[es]=Cliente para Matrix
 GenericName[eu]=Matrix bezeroa
 GenericName[fi]=Matrix-asiakas
 GenericName[fr]=Client « Matrix »
+GenericName[gl]=Cliente de Matrix
 GenericName[hu]=Matrix kliens
 GenericName[ia]=Cliente de Matrice
 GenericName[id]=Klien Matrix
@@ -88,6 +90,7 @@ Comment[es]=Cliente para el protocolo Matrix
 Comment[eu]=Matrix protokolorako bezeroa
 Comment[fi]=Asiakas Matrix-yhteyskäytännölle
 Comment[fr]=Client pour le protocole « Matrix »
+Comment[gl]=Cliente para o protocolo Matrix
 Comment[hu]=Kliens a Matrix protokollhoz
 Comment[ia]=Cliente per le protocollo de Matrix
 Comment[id]=Klien untuk protokol Matrix

src/CMakeLists.txt

@@ -55,6 +55,10 @@ add_library(neochat STATIC
     events/joinrulesevent.cpp
     events/stickerevent.cpp
     models/reactionmodel.cpp
+    delegatesizehelper.cpp
+    models/livelocationsmodel.cpp
+    models/locationsmodel.cpp
+    locationhelper.cpp
 )
 
 ecm_qt_declare_logging_category(neochat

src/controller.cpp

@@ -45,7 +45,6 @@
 #include <qt_connection_util.h>
 
 #ifdef QUOTIENT_07
-#include <csapi/notifications.h>
 #include <eventstats.h>
 #endif
 
@@ -120,8 +119,8 @@ Controller::Controller(QObject *parent)
     connect(&Accounts, &AccountRegistry::accountCountChanged, this, [this]() {
         if (Accounts.size() > oldAccountCount) {
             auto connection = Accounts.accounts()[Accounts.size() - 1];
-            connect(connection, &Connection::syncDone, this, [this, connection]() {
-                handleNotifications(connection);
+            connect(connection, &Connection::syncDone, this, [connection]() {
+                NotificationsManager::instance().handleNotifications(connection);
             });
         }
         oldAccountCount = Accounts.size();
@@ -129,81 +128,6 @@ Controller::Controller(QObject *parent)
 #endif
 }
 
-#ifdef QUOTIENT_07
-void Controller::handleNotifications(QPointer<Quotient::Connection> connection)
-{
-    static QStringList initial;
-    static QStringList oldNotifications;
-    auto job = connection->callApi<GetNotificationsJob>();
-
-    connect(job, &BaseJob::success, this, [job, connection]() {
-        const auto notifications = job->jsonData()["notifications"].toArray();
-        if (!initial.contains(connection->user()->id())) {
-            initial.append(connection->user()->id());
-            for (const auto &n : notifications) {
-                oldNotifications += n.toObject()["event"].toObject()["event_id"].toString();
-            }
-            return;
-        }
-        for (const auto &n : notifications) {
-            const auto notification = n.toObject();
-            if (notification["read"].toBool()) {
-                continue;
-            }
-            if (oldNotifications.contains(notification["event"].toObject()["event_id"].toString())) {
-                continue;
-            }
-            oldNotifications += notification["event"].toObject()["event_id"].toString();
-            auto room = connection->room(notification["room_id"].toString());
-
-            // If room exists, room is NOT active OR the application is NOT active, show notification
-            if (room
-                && !(RoomManager::instance().currentRoom() && room->id() == RoomManager::instance().currentRoom()->id()
-                     && QGuiApplication::applicationState() == Qt::ApplicationActive)) {
-                // The room might have been deleted (for example rejected invitation).
-                auto sender = room->user(notification["event"].toObject()["sender"].toString());
-
-                QString body;
-
-                if (notification["event"].toObject()["type"].toString() == "org.matrix.msc3381.poll.start") {
-                    body = notification["event"]
-                               .toObject()["content"]
-                               .toObject()["org.matrix.msc3381.poll.start"]
-                               .toObject()["question"]
-                               .toObject()["body"]
-                               .toString();
-                } else {
-                    body = notification["event"].toObject()["content"].toObject()["body"].toString();
-                }
-
-                if (notification["event"]["type"] == "m.room.encrypted") {
-#ifdef Quotient_E2EE_ENABLED
-                    auto decrypted = connection->decryptNotification(notification);
-                    body = decrypted["content"].toObject()["body"].toString();
-#endif
-                    if (body.isEmpty()) {
-                        body = i18n("Encrypted Message");
-                    }
-                }
-
-                QImage avatar_image;
-                if (!sender->avatarUrl(room).isEmpty()) {
-                    avatar_image = sender->avatar(128, room);
-                } else {
-                    avatar_image = room->avatar(128);
-                }
-                NotificationsManager::instance().postNotification(dynamic_cast<NeoChatRoom *>(room),
-                                                                  sender->displayname(room),
-                                                                  body,
-                                                                  avatar_image,
-                                                                  notification["event"].toObject()["event_id"].toString(),
-                                                                  true);
-            }
-        }
-    });
-}
-#endif
-
 Controller &Controller::instance()
 {
     static Controller _instance;
@@ -417,15 +341,9 @@ bool Controller::saveAccessTokenToKeyChain(const AccountSettings &account, const
 void Controller::changeAvatar(Connection *conn, const QUrl &localFile)
 {
     auto job = conn->uploadFile(localFile.toLocalFile());
-#ifdef QUOTIENT_07
-    if (isJobPending(job)) {
-#else
-    if (isJobRunning(job)) {
-#endif
-        connect(job, &BaseJob::success, this, [conn, job] {
-            conn->callApi<SetAvatarUrlJob>(conn->userId(), job->contentUri());
-        });
-    }
+    connect(job, &BaseJob::success, this, [conn, job] {
+        conn->callApi<SetAvatarUrlJob>(conn->userId(), job->contentUri());
+    });
 }
 
 void Controller::markAllMessagesAsRead(Connection *conn)
@@ -610,16 +528,30 @@ void Controller::createRoom(const QString &name, const QString &topic)
 {
     auto createRoomJob = m_connection->createRoom(Connection::PublishRoom, "", name, topic, QStringList());
     connect(createRoomJob, &CreateRoomJob::failure, this, [this, createRoomJob] {
-        Q_EMIT errorOccured(i18n("Room creation failed: \"%1\"", createRoomJob->errorString()));
+        Q_EMIT errorOccured(i18n("Room creation failed: %1", createRoomJob->errorString()));
     });
-    connectSingleShot(
-        this,
-        &Controller::roomAdded,
-        this,
-        [this](NeoChatRoom *room) {
-            RoomManager::instance().enterRoom(room);
-        },
-        Qt::QueuedConnection);
+    connectSingleShot(this, &Controller::roomAdded, &RoomManager::instance(), &RoomManager::enterRoom, Qt::QueuedConnection);
+}
+
+void Controller::createSpace(const QString &name, const QString &topic)
+{
+    auto createRoomJob = m_connection->createRoom(Connection::UnpublishRoom,
+                                                  {},
+                                                  name,
+                                                  topic,
+                                                  QStringList(),
+                                                  {},
+                                                  {},
+                                                  false,
+                                                  {},
+                                                  {},
+                                                  QJsonObject{
+                                                      {"type"_ls, "m.space"_ls},
+                                                  });
+    connect(createRoomJob, &CreateRoomJob::failure, this, [this, createRoomJob] {
+        Q_EMIT errorOccured(i18n("Space creation failed: %1", createRoomJob->errorString()));
+    });
+    connectSingleShot(this, &Controller::roomAdded, &RoomManager::instance(), &RoomManager::enterRoom, Qt::QueuedConnection);
 }
 
 bool Controller::isOnline() const

src/controller.h

@@ -159,6 +159,11 @@ public:
      */
     Q_INVOKABLE void createRoom(const QString &name, const QString &topic);
 
+    /**
+     * @brief Create new space.
+     */
+    Q_INVOKABLE void createSpace(const QString &name, const QString &topic);
+
     /**
      * @brief Join a room.
      */
@@ -230,9 +235,6 @@ private:
     QMap<Quotient::Room *, int> m_notificationCounts;
 
     bool hasWindowSystem() const;
-#ifdef QUOTIENT_07
-    void handleNotifications(QPointer<Quotient::Connection> connection);
-#endif
 
 private Q_SLOTS:
     void invokeLogin();

src/delegatesizehelper.cpp

@@ -0,0 +1,153 @@
+// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include "delegatesizehelper.h"
+
+#include <cmath>
+
+#include <QDebug>
+
+DelegateSizeHelper::DelegateSizeHelper(QObject *parent)
+    : QObject(parent)
+{
+}
+
+qreal DelegateSizeHelper::parentWidth() const
+{
+    return m_parentWidth;
+}
+
+void DelegateSizeHelper::setParentWidth(qreal parentWidth)
+{
+    if (parentWidth == m_parentWidth) {
+        return;
+    }
+    m_parentWidth = parentWidth;
+    Q_EMIT parentWidthChanged();
+    Q_EMIT currentPercentageWidthChanged();
+    Q_EMIT currentWidthChanged();
+}
+
+qreal DelegateSizeHelper::startBreakpoint() const
+{
+    return m_startBreakpoint;
+}
+
+void DelegateSizeHelper::setStartBreakpoint(qreal startBreakpoint)
+{
+    if (startBreakpoint == m_startBreakpoint) {
+        return;
+    }
+    m_startBreakpoint = startBreakpoint;
+    Q_EMIT startBreakpointChanged();
+}
+
+qreal DelegateSizeHelper::endBreakpoint() const
+{
+    return m_endBreakpoint;
+}
+
+void DelegateSizeHelper::setEndBreakpoint(qreal endBreakpoint)
+{
+    if (endBreakpoint == m_endBreakpoint) {
+        return;
+    }
+    m_endBreakpoint = endBreakpoint;
+    Q_EMIT endBreakpointChanged();
+}
+
+int DelegateSizeHelper::startPercentWidth() const
+{
+    return m_startPercentWidth;
+}
+
+void DelegateSizeHelper::setStartPercentWidth(int startPercentWidth)
+{
+    if (startPercentWidth == m_startPercentWidth) {
+        return;
+    }
+    m_startPercentWidth = startPercentWidth;
+    Q_EMIT startPercentWidthChanged();
+}
+
+int DelegateSizeHelper::endPercentWidth() const
+{
+    return m_endPercentWidth;
+}
+
+void DelegateSizeHelper::setEndPercentWidth(int endPercentWidth)
+{
+    if (endPercentWidth == m_endPercentWidth) {
+        return;
+    }
+    m_endPercentWidth = endPercentWidth;
+    Q_EMIT endPercentWidthChanged();
+}
+
+qreal DelegateSizeHelper::maxWidth() const
+{
+    return m_maxWidth;
+}
+
+void DelegateSizeHelper::setMaxWidth(qreal maxWidth)
+{
+    if (maxWidth == m_maxWidth) {
+        return;
+    }
+    m_maxWidth = maxWidth;
+    Q_EMIT maxWidthChanged();
+}
+
+int DelegateSizeHelper::calculateCurrentPercentageWidth() const
+{
+    // Don't do anything if m_parentWidth hasn't been set yet.
+    if (m_parentWidth < 0) {
+        return -1;
+    }
+    // Don't bother with calculations for a horizontal line.
+    if (m_startPercentWidth == m_endPercentWidth) {
+        return m_startPercentWidth;
+    }
+    // Dividing by zero is a bad idea.
+    if (m_startBreakpoint == m_endBreakpoint) {
+        qWarning() << "DelegateSizeHelper::calculateCurrentPercentageWidth() - m_startBreakpoint is equal to m_endBreakpoint this would lead to divide by "
+                      "zero, aborting";
+        return -1;
+    }
+
+    // Fit to y = mx + c
+    qreal m = (m_endPercentWidth - m_startPercentWidth) / (m_endBreakpoint - m_startBreakpoint);
+    qreal c = m_startPercentWidth - m * m_startBreakpoint;
+
+    // This allows us to clamp correctly if the start or end width is bigger.
+    bool endPercentBigger = m_endPercentWidth > m_startPercentWidth;
+    int maxPercentWidth = endPercentBigger ? m_endPercentWidth : m_startPercentWidth;
+    int minPercentWidth = endPercentBigger ? m_startPercentWidth : m_endPercentWidth;
+
+    int calcPercentWidth = std::ceil(m * m_parentWidth + c);
+    return std::clamp(calcPercentWidth, minPercentWidth, maxPercentWidth);
+}
+
+int DelegateSizeHelper::currentPercentageWidth() const
+{
+    return calculateCurrentPercentageWidth();
+}
+
+qreal DelegateSizeHelper::currentWidth() const
+{
+    if (m_parentWidth < 0) {
+        return 0.0;
+    }
+    int percentWidth = calculateCurrentPercentageWidth();
+    // - 1 means bad input values so don't try to calculate.
+    if (percentWidth == -1) {
+        return 0.0;
+    }
+
+    qreal absoluteWidth = m_parentWidth * percentWidth * 0.01;
+    if (m_maxWidth < 0.0) {
+        return std::ceil(absoluteWidth);
+    } else {
+        return std::ceil(std::min(absoluteWidth, m_maxWidth));
+    }
+}

src/delegatesizehelper.h

@@ -0,0 +1,123 @@
+// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#pragma once
+
+#include <QObject>
+
+/**
+ * @class DelegateSizeHelper
+ *
+ * A class to help calculate the current width of a chat delegate/bar.
+ *
+ * The aim is to support a dynamic sizing based upon the width of the page. There is
+ * a built in curve that allows the width to transition between two percentages based
+ * upon a start and finish break point. This is to provide better convergence where
+ * generally the delegate will need to fill all or most the screen when thin but
+ * should max out in size and only fill a lower percentage of the screen when wide.
+ *
+ * @note While the main intended usage is to start with a high percentage when the parentWidth
+ *       is small and transition to a lower one when large, the math is setup for the
+ *       general case so any combination of parameters works.
+ */
+class DelegateSizeHelper : public QObject
+{
+    Q_OBJECT
+
+    /**
+     * @brief The width of the component's parent.
+     */
+    Q_PROPERTY(qreal parentWidth READ parentWidth WRITE setParentWidth NOTIFY parentWidthChanged)
+
+    /**
+     * @brief The width (in px) when the width percentage should start to transition.
+     */
+    Q_PROPERTY(qreal startBreakpoint READ startBreakpoint WRITE setStartBreakpoint NOTIFY startBreakpointChanged)
+
+    /**
+     * @brief The width (in px) when the width percentage should finish transitioning.
+     */
+    Q_PROPERTY(qreal endBreakpoint READ endBreakpoint WRITE setEndBreakpoint NOTIFY endBreakpointChanged)
+
+    /**
+     * @brief The width (in %) of the component at or before the startBreakpoint.
+     *
+     * @sa startBreakpoint
+     */
+    Q_PROPERTY(int startPercentWidth READ startPercentWidth WRITE setStartPercentWidth NOTIFY startPercentWidthChanged)
+
+    /**
+     * @brief The width (in %) of the component at or after the endBreakpoint.
+     *
+     * @sa endBreakpoint
+     */
+    Q_PROPERTY(int endPercentWidth READ endPercentWidth WRITE setEndPercentWidth NOTIFY endPercentWidthChanged)
+
+    /**
+     * @brief The absolute maximum width (in px) the component can be.
+     */
+    Q_PROPERTY(qreal maxWidth READ maxWidth WRITE setMaxWidth NOTIFY maxWidthChanged)
+
+    /**
+     * @brief The width (in %) of the component at the current parentWidth.
+     *
+     * Will return -1 if no parentWidth is set or startBreakpoint == endBreakpoint.
+     *
+     * @sa parentWidth, startBreakpoint, endBreakpoint
+     */
+    Q_PROPERTY(int currentPercentageWidth READ currentPercentageWidth NOTIFY currentPercentageWidthChanged)
+
+    /**
+     * @brief The width (in px) of the component at the current parentWidth.
+     *
+     * Will return 0.0 if no parentWidth is set.
+     *
+     * @sa parentWidth
+     */
+    Q_PROPERTY(qreal currentWidth READ currentWidth NOTIFY currentWidthChanged)
+
+public:
+    DelegateSizeHelper(QObject *parent = nullptr);
+
+    qreal parentWidth() const;
+    void setParentWidth(qreal parentWidth);
+
+    qreal startBreakpoint() const;
+    void setStartBreakpoint(qreal startBreakpoint);
+
+    qreal endBreakpoint() const;
+    void setEndBreakpoint(qreal endBreakpoint);
+
+    int startPercentWidth() const;
+    void setStartPercentWidth(int startPercentWidth);
+
+    int endPercentWidth() const;
+    void setEndPercentWidth(int endPercentWidth);
+
+    qreal maxWidth() const;
+    void setMaxWidth(qreal maxWidth);
+
+    int currentPercentageWidth() const;
+
+    qreal currentWidth() const;
+
+Q_SIGNALS:
+    void parentWidthChanged();
+    void startBreakpointChanged();
+    void endBreakpointChanged();
+    void startPercentWidthChanged();
+    void endPercentWidthChanged();
+    void maxWidthChanged();
+    void currentPercentageWidthChanged();
+    void currentWidthChanged();
+
+private:
+    qreal m_parentWidth = -1.0;
+    qreal m_startBreakpoint;
+    qreal m_endBreakpoint;
+    int m_startPercentWidth;
+    int m_endPercentWidth;
+    qreal m_maxWidth = -1.0;
+
+    int calculateCurrentPercentageWidth() const;
+};

src/locationhelper.cpp

@@ -0,0 +1,44 @@
+// SPDX-FileCopyrightText: 2023 Volker Krause <vkrause@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "locationhelper.h"
+
+#include <cmath>
+
+QRectF LocationHelper::unite(const QRectF &r1, const QRectF &r2)
+{
+    // this looks weird but is actually intentional as we need to handle point-like "rects" as well
+    if ((!r1.isEmpty() || r1.isNull()) && (!r2.isEmpty() || r2.isNull())) {
+        return r1 | r2;
+    }
+    return (!r1.isEmpty() || r1.isNull()) ? r1 : r2;
+}
+
+QPointF LocationHelper::center(const QRectF &r)
+{
+    return r.center();
+}
+
+constexpr inline double degToRad(double deg)
+{
+    return deg / 180.0 * M_PI;
+}
+
+static QPointF mercatorProject(double lat, double lon, double zoom)
+{
+    const auto x = (256.0 / (2.0 * M_PI)) * std::pow(2.0, zoom) * (degToRad(lon) + M_PI);
+    const auto y = (256.0 / (2.0 * M_PI)) * std::pow(2.0, zoom) * (M_PI - std::log(std::tan(M_PI / 4.0 + degToRad(lat) / 2.0)));
+    return QPointF(x, y);
+}
+
+float LocationHelper::zoomToFit(const QRectF &r, float mapWidth, float mapHeight)
+{
+    const auto p1 = mercatorProject(r.bottomLeft().y(), r.bottomLeft().x(), 1.0);
+    const auto p2 = mercatorProject(r.topRight().y(), r.topRight().x(), 1.0);
+
+    const auto zx = std::log2((mapWidth / (p2.x() - p1.x())));
+    const auto zy = std::log2((mapHeight / (p2.y() - p1.y())));
+    const auto z = std::min(zx, zy);
+
+    return std::clamp(z, 5.0, 18.0);
+}

src/locationhelper.h

@@ -0,0 +1,22 @@
+// SPDX-FileCopyrightText: 2023 Volker Krause <vkrause@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "linkpreviewer.h"
+#include <QMetaType>
+#include <QRectF>
+
+/** Location related helper functions for QML. */
+class LocationHelper
+{
+    Q_GADGET
+public:
+    /** Unite two rectanlges. */
+    Q_INVOKABLE static QRectF unite(const QRectF &r1, const QRectF &r2);
+    /** Returns the center of @p r. */
+    Q_INVOKABLE static QPointF center(const QRectF &r);
+
+    /** Returns the highest zoom level to fit @r into a map of size @p mapWidth x @p mapHeight. */
+    Q_INVOKABLE static float zoomToFit(const QRectF &r, float mapWidth, float mapHeight);
+};
+
+Q_DECLARE_METATYPE(LocationHelper)

src/logger.cpp

@@ -131,22 +131,36 @@ public:
         }
         auto filePath = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QDir::separator() + appName;
 
-        QFileInfo infoOld(filePath + QLatin1String(".old"));
-        if (infoOld.exists()) {
-            QFile fileOld(infoOld.absoluteFilePath());
-            const bool success = fileOld.remove();
-            if (!success) {
-                qFatal("Cannot remove old log file '%s': %s", qUtf8Printable(fileOld.fileName()), qUtf8Printable(fileOld.errorString()));
+        QDir dir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QDir::separator());
+        auto entryList = dir.entryList({appName + QStringLiteral(".*")});
+        std::sort(entryList.begin(), entryList.end(), [](const auto &left, const auto &right) {
+            auto leftIndex = left.split(".").last().toInt();
+            auto rightIndex = right.split(".").last().toInt();
+            return leftIndex > rightIndex;
+        });
+        for (const auto &entry : entryList) {
+            bool ok = false;
+            const auto index = entry.split(".").last().toInt(&ok);
+            if (!ok) {
+                continue;
             }
-        }
-
-        QFileInfo info(filePath);
-        if (info.exists()) {
-            QFile file(info.absoluteFilePath());
-            const QString oldName = filePath + QLatin1String(".old");
-            const bool success = file.copy(oldName);
-            if (!success) {
-                qFatal("Cannot rename log file '%s' to '%s': %s", qUtf8Printable(file.fileName()), qUtf8Printable(oldName), qUtf8Printable(file.errorString()));
+            QFileInfo info(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QDir::separator() + entry);
+            if (info.exists()) {
+                QFile file(info.absoluteFilePath());
+                if (index > 50) {
+                    file.remove();
+                    continue;
+                }
+                const QString newName = filePath + QStringLiteral(".%1").arg(index + 1);
+                const bool success = file.copy(newName);
+                if (success) {
+                    file.remove();
+                } else {
+                    qFatal("Cannot rename log file '%s' to '%s': %s",
+                           qUtf8Printable(file.fileName()),
+                           qUtf8Printable(newName),
+                           qUtf8Printable(file.errorString()));
+                }
             }
         }
 
@@ -154,7 +168,7 @@ public:
         if (!finfo.absoluteDir().exists()) {
             QDir().mkpath(finfo.absolutePath());
         }
-        file.setFileName(filePath);
+        file.setFileName(filePath + QStringLiteral(".0"));
         file.open(QIODevice::WriteOnly | QIODevice::Unbuffered);
     }
 

src/login.cpp

@@ -38,6 +38,10 @@ void Login::init()
 
     connect(this, &Login::matrixIdChanged, this, [this]() {
         setHomeserverReachable(false);
+        QRegularExpression validator("^\\@?[a-zA-Z0-9\\._=\\-/]+\\:[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)*(\\:[0-9]+)?$");
+        if (!validator.match(m_matrixId).hasMatch()) {
+            return;
+        }
 
         if (m_matrixId == "@") {
             return;

src/main.cpp

@@ -43,8 +43,10 @@
 #include "chatdocumenthandler.h"
 #include "clipboard.h"
 #include "controller.h"
+#include "delegatesizehelper.h"
 #include "filetypesingleton.h"
 #include "linkpreviewer.h"
+#include "locationhelper.h"
 #include "logger.h"
 #include "login.h"
 #include "matriximageprovider.h"
@@ -56,6 +58,8 @@
 #include "models/emoticonfiltermodel.h"
 #include "models/imagepacksmodel.h"
 #include "models/keywordnotificationrulemodel.h"
+#include "models/livelocationsmodel.h"
+#include "models/locationsmodel.h"
 #include "models/messageeventmodel.h"
 #include "models/messagefiltermodel.h"
 #include "models/publicroomlistmodel.h"
@@ -246,6 +250,8 @@ int main(int argc, char *argv[])
     qmlRegisterType<StateModel>("org.kde.neochat", 1, 0, "StateModel");
     qmlRegisterType<StateFilterModel>("org.kde.neochat", 1, 0, "StateFilterModel");
     qmlRegisterType<SearchModel>("org.kde.neochat", 1, 0, "SearchModel");
+    qmlRegisterType<LiveLocationsModel>("org.kde.neochat", 1, 0, "LiveLocationsModel");
+    qmlRegisterType<LocationsModel>("org.kde.neochat", 1, 0, "LocationsModel");
 #ifdef QUOTIENT_07
     qmlRegisterType<PollHandler>("org.kde.neochat", 1, 0, "PollHandler");
 #endif
@@ -254,11 +260,13 @@ int main(int argc, char *argv[])
     qmlRegisterType<ImagePacksModel>("org.kde.neochat", 1, 0, "ImagePacksModel");
     qmlRegisterType<AccountEmoticonModel>("org.kde.neochat", 1, 0, "AccountEmoticonModel");
     qmlRegisterType<EmoticonFilterModel>("org.kde.neochat", 1, 0, "EmoticonFilterModel");
+    qmlRegisterType<DelegateSizeHelper>("org.kde.neochat", 1, 0, "DelegateSizeHelper");
     qmlRegisterUncreatableType<RoomMessageEvent>("org.kde.neochat", 1, 0, "RoomMessageEvent", "ENUM");
     qmlRegisterUncreatableType<PushNotificationState>("org.kde.neochat", 1, 0, "PushNotificationState", "ENUM");
     qmlRegisterUncreatableType<PushNotificationAction>("org.kde.neochat", 1, 0, "PushNotificationAction", "ENUM");
     qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM");
     qmlRegisterUncreatableType<NeoChatUser>("org.kde.neochat", 1, 0, "NeoChatUser", {});
+    qmlRegisterUncreatableType<NeoChatRoom>("org.kde.neochat", 1, 0, "NeoChatRoom", {});
 
     qRegisterMetaType<User *>("User*");
     qRegisterMetaType<User *>("const User*");
@@ -280,6 +288,10 @@ int main(int argc, char *argv[])
     qmlRegisterSingletonType("org.kde.neochat", 1, 0, "About", [](QQmlEngine *engine, QJSEngine *) -> QJSValue {
         return engine->toScriptValue(KAboutData::applicationData());
     });
+    qmlRegisterSingletonType(QUrl("qrc:/OsmLocationPlugin.qml"), "org.kde.neochat", 1, 0, "OsmLocationPlugin");
+    qmlRegisterSingletonType("org.kde.neochat", 1, 0, "LocationHelper", [](QQmlEngine *engine, QJSEngine *) -> QJSValue {
+        return engine->toScriptValue(LocationHelper());
+    });
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     qRegisterMetaTypeStreamOperators<Emoji>();

src/models/accountemoticonmodel.cpp

@@ -96,10 +96,10 @@ void AccountEmoticonModel::setConnection(Connection *connection)
 
 void AccountEmoticonModel::reloadEmoticons()
 {
-    if (!m_connection->hasAccountData("im.ponies.user_emotes"_ls)) {
-        return;
+    QJsonObject json;
+    if (m_connection->hasAccountData("im.ponies.user_emotes"_ls)) {
+        json = m_connection->accountData("im.ponies.user_emotes"_ls)->contentJson();
     }
-    auto json = m_connection->accountData("im.ponies.user_emotes"_ls)->contentJson();
     const auto &content = ImagePackEventContent(json);
     beginResetModel();
     m_images = content;

src/models/collapsestateproxymodel.cpp

@@ -11,8 +11,9 @@ bool CollapseStateProxyModel::filterAcceptsRow(int source_row, const QModelIndex
     Q_UNUSED(source_parent);
     return sourceModel()->data(sourceModel()->index(source_row, 0), MessageEventModel::DelegateTypeRole)
         != MessageEventModel::DelegateType::State // If this is not a state, show it
-        || sourceModel()->data(sourceModel()->index(source_row + 1, 0), MessageEventModel::DelegateTypeRole)
-        != MessageEventModel::DelegateType::State // If this is the first state in a block, show it. TODO hidden events?
+        || (source_row < sourceModel()->rowCount() - 1
+            && sourceModel()->data(sourceModel()->index(source_row + 1, 0), MessageEventModel::DelegateTypeRole)
+                != MessageEventModel::DelegateType::State) // If this is the first state in a block, show it. TODO hidden events?
         || sourceModel()->data(sourceModel()->index(source_row, 0), MessageEventModel::ShowSectionRole).toBool(); // If it's a new day, show it
 }
 
@@ -50,10 +51,11 @@ QString CollapseStateProxyModel::aggregateEventToString(int sourceRow) const
         if (!uniqueAuthors.contains(nextAuthor)) {
             uniqueAuthors.append(nextAuthor);
         }
-        if (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
-                != MessageEventModel::DelegateType::State // If it's not a state event
-            || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
-        ) {
+        if (i > 0
+            && (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
+                    != MessageEventModel::DelegateType::State // If it's not a state event
+                || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
+                )) {
             break;
         }
     }
@@ -108,10 +110,11 @@ QVariantList CollapseStateProxyModel::stateEventsList(int sourceRow) const
             {"text", sourceModel()->data(sourceModel()->index(i, 0), Qt::DisplayRole).toString()},
         };
         stateEvents.append(nextState);
-        if (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
-                != MessageEventModel::DelegateType::State // If it's not a state event
-            || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
-        ) {
+        if (i > 0
+            && (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
+                    != MessageEventModel::DelegateType::State // If it's not a state event
+                || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
+                )) {
             break;
         }
     }
@@ -126,10 +129,11 @@ QVariantList CollapseStateProxyModel::authorList(int sourceRow) const
         if (!uniqueAuthors.contains(nextAvatar)) {
             uniqueAuthors.append(nextAvatar);
         }
-        if (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
-                != MessageEventModel::DelegateType::State // If it's not a state event
-            || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
-        ) {
+        if (i > 0
+            && (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
+                    != MessageEventModel::DelegateType::State // If it's not a state event
+                || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
+                )) {
             break;
         }
     }
@@ -148,10 +152,11 @@ QString CollapseStateProxyModel::excessAuthors(int row) const
         if (!uniqueAuthors.contains(nextAvatar)) {
             uniqueAuthors.append(nextAvatar);
         }
-        if (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
-                != MessageEventModel::DelegateType::State // If it's not a state event
-            || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
-        ) {
+        if (i > 0
+            && (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
+                    != MessageEventModel::DelegateType::State // If it's not a state event
+                || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
+                )) {
             break;
         }
     }

src/models/customemojimodel.cpp

@@ -16,12 +16,6 @@
 
 using namespace Quotient;
 
-#ifdef QUOTIENT_07
-#define running isJobPending
-#else
-#define running isJobRunning
-#endif
-
 void CustomEmojiModel::fetchEmojis()
 {
     if (!Controller::instance().activeConnection()) {
@@ -62,37 +56,35 @@ void CustomEmojiModel::addEmoji(const QString &name, const QUrl &location)
 
     auto job = Controller::instance().activeConnection()->uploadFile(location.toLocalFile());
 
-    if (running(job)) {
-        connect(job, &BaseJob::success, this, [name, location, job] {
-            const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes");
-            auto json = data != nullptr ? data->contentJson() : QJsonObject();
-            auto emojiData = json["images"].toObject();
+    connect(job, &BaseJob::success, this, [name, location, job] {
+        const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes");
+        auto json = data != nullptr ? data->contentJson() : QJsonObject();
+        auto emojiData = json["images"].toObject();
 
-            QString url;
+        QString url;
 #ifdef QUOTIENT_07
-            url = job->contentUri().toString();
+        url = job->contentUri().toString();
 #else
-            url = job->contentUri();
+        url = job->contentUri();
 #endif
 
-            QImage image(location.toLocalFile());
-            QJsonObject imageInfo;
-            imageInfo["w"] = image.width();
-            imageInfo["h"] = image.height();
-            imageInfo["mimetype"] = QMimeDatabase().mimeTypeForFile(location.toLocalFile()).name();
-            imageInfo["size"] = image.sizeInBytes();
+        QImage image(location.toLocalFile());
+        QJsonObject imageInfo;
+        imageInfo["w"] = image.width();
+        imageInfo["h"] = image.height();
+        imageInfo["mimetype"] = QMimeDatabase().mimeTypeForFile(location.toLocalFile()).name();
+        imageInfo["size"] = image.sizeInBytes();
 
-            emojiData[QStringLiteral("%1").arg(name)] = QJsonObject({
-                {QStringLiteral("url"), url},
-                {QStringLiteral("info"), imageInfo},
-                {QStringLiteral("body"), location.fileName()},
-                {"usage"_ls, "emoticon"_ls},
-            });
-
-            json["images"] = emojiData;
-            Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes", json);
+        emojiData[QStringLiteral("%1").arg(name)] = QJsonObject({
+            {QStringLiteral("url"), url},
+            {QStringLiteral("info"), imageInfo},
+            {QStringLiteral("body"), location.fileName()},
+            {"usage"_ls, "emoticon"_ls},
         });
-    }
+
+        json["images"] = emojiData;
+        Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes", json);
+    });
 }
 
 void CustomEmojiModel::removeEmoji(const QString &name)

src/models/emoticonfiltermodel.cpp

@@ -4,16 +4,27 @@
 #include "emoticonfiltermodel.h"
 
 #include "accountemoticonmodel.h"
+#include "stickermodel.h"
 
 EmoticonFilterModel::EmoticonFilterModel(QObject *parent)
     : QSortFilterProxyModel(parent)
 {
+    connect(this, &EmoticonFilterModel::sourceModelChanged, this, [this]() {
+        if (dynamic_cast<StickerModel *>(sourceModel())) {
+            m_stickerRole = StickerModel::IsStickerRole;
+            m_emojiRole = StickerModel::IsEmojiRole;
+        } else {
+            m_stickerRole = AccountEmoticonModel::IsStickerRole;
+            m_emojiRole = AccountEmoticonModel::IsEmojiRole;
+        }
+    });
 }
 
 bool EmoticonFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
 {
-    auto stickerUsage = sourceModel()->data(sourceModel()->index(sourceRow, 0), AccountEmoticonModel::IsStickerRole).toBool();
-    auto emojiUsage = sourceModel()->data(sourceModel()->index(sourceRow, 0), AccountEmoticonModel::IsEmojiRole).toBool();
+    Q_UNUSED(sourceParent);
+    auto stickerUsage = sourceModel()->data(sourceModel()->index(sourceRow, 0), m_stickerRole).toBool();
+    auto emojiUsage = sourceModel()->data(sourceModel()->index(sourceRow, 0), m_emojiRole).toBool();
     return (stickerUsage && m_showStickers) || (emojiUsage && m_showEmojis);
 }
 

src/models/emoticonfiltermodel.h

@@ -46,4 +46,6 @@ Q_SIGNALS:
 private:
     bool m_showStickers = false;
     bool m_showEmojis = false;
+    int m_stickerRole = 0;
+    int m_emojiRole = 0;
 };

src/models/imagepacksmodel.cpp

@@ -15,6 +15,7 @@ ImagePacksModel::ImagePacksModel(QObject *parent)
 
 int ImagePacksModel::rowCount(const QModelIndex &index) const
 {
+    Q_UNUSED(index);
     return m_events.count();
 }
 
@@ -81,16 +82,20 @@ void ImagePacksModel::reloadImages()
 {
     beginResetModel();
     m_events.clear();
+
+    // Load emoticons from the account data
     if (m_room->connection()->hasAccountData("im.ponies.user_emotes"_ls)) {
         auto json = m_room->connection()->accountData("im.ponies.user_emotes"_ls)->contentJson();
         json["pack"] = QJsonObject{
-            {"display_name", i18n("Own Stickers")},
+            {"display_name", m_showStickers ? i18nc("As in 'The user's own Stickers'", "Own Stickers") : i18nc("As in 'The user's own emojis", "Own Emojis")},
         };
         const auto &content = ImagePackEventContent(json);
         if (!content.images.isEmpty()) {
             m_events += ImagePackEventContent(json);
         }
     }
+
+    // Load emoticons from the saved rooms
     const auto &accountData = m_room->connection()->accountData("im.ponies.emote_rooms"_ls);
     if (accountData) {
         const auto &rooms = accountData->contentJson()["rooms"_ls].toObject();
@@ -104,11 +109,10 @@ void ImagePacksModel::reloadImages()
 #ifdef QUOTIENT_07
                 if (const auto &pack = stickerRoom->currentState().get<ImagePackEvent>(packKey)) {
                     const auto packContent = pack->content();
-                    if (packContent.pack.has_value()) {
-                        if (!packContent.pack->usage || (packContent.pack->usage->contains("emoticon") && showEmoticons())
-                            || (packContent.pack->usage->contains("sticker") && showStickers())) {
-                            m_events += packContent;
-                        }
+                    if ((!packContent.pack || !packContent.pack->usage || (packContent.pack->usage->contains("emoticon") && showEmoticons())
+                         || (packContent.pack->usage->contains("sticker") && showStickers()))
+                        && !packContent.images.isEmpty()) {
+                        m_events += packContent;
                     }
                 }
 #endif
@@ -116,6 +120,8 @@ void ImagePacksModel::reloadImages()
         }
     }
 #ifdef QUOTIENT_07
+
+    // Load emoticons from the current room
     auto events = m_room->currentState().eventsOfType("im.ponies.room_emotes");
     for (const auto &event : events) {
         auto packContent = eventCast<const ImagePackEvent>(event)->content();

src/models/livelocationsmodel.cpp

@@ -0,0 +1,171 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2023 Volker Krause <vkrause@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "livelocationsmodel.h"
+
+#include <Quotient/events/roommessageevent.h>
+
+#include <QDebug>
+
+using namespace Quotient;
+
+bool operator<(const LiveLocationData &lhs, const LiveLocationData &rhs)
+{
+    return lhs.eventId < rhs.eventId;
+}
+
+LiveLocationsModel::LiveLocationsModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+    connect(
+        this,
+        &LiveLocationsModel::roomChanged,
+        this,
+        [this]() {
+            for (const auto &event : m_room->messageEvents()) {
+                addEvent(event.get());
+            }
+            connect(m_room, &NeoChatRoom::aboutToAddHistoricalMessages, this, [this](const auto &events) {
+                for (const auto &event : events) {
+                    addEvent(event.get());
+                }
+            });
+            connect(m_room, &NeoChatRoom::aboutToAddNewMessages, this, [this](const auto &events) {
+                for (const auto &event : events) {
+                    addEvent(event.get());
+                }
+            });
+        },
+        Qt::QueuedConnection); // deferred so we are sure the eventId filter is set
+
+    connect(this, &LiveLocationsModel::dataChanged, this, &LiveLocationsModel::boundingBoxChanged);
+    connect(this, &LiveLocationsModel::rowsInserted, this, &LiveLocationsModel::boundingBoxChanged);
+}
+
+int LiveLocationsModel::rowCount(const QModelIndex &parent) const
+{
+    if (parent.isValid()) {
+        return 0;
+    }
+    return m_locations.size();
+}
+
+QVariant LiveLocationsModel::data(const QModelIndex &index, int roleName) const
+{
+    if (!checkIndex(index)) {
+        return {};
+    }
+
+    const auto &data = m_locations.at(index.row());
+    switch (roleName) {
+    case LatitudeRole: {
+        const auto geoUri = data.beacon["org.matrix.msc3488.location"_ls].toObject()["uri"_ls].toString();
+        if (geoUri.isEmpty()) {
+            return {};
+        }
+        const auto latitude = geoUri.split(u';')[0].split(u':')[1].split(u',')[0];
+        return latitude.toFloat();
+    }
+    case LongitudeRole: {
+        const auto geoUri = data.beacon["org.matrix.msc3488.location"_ls].toObject()["uri"_ls].toString();
+        if (geoUri.isEmpty()) {
+            return {};
+        }
+        const auto longitude = geoUri.split(u';')[0].split(u':')[1].split(u',')[1];
+        return longitude.toFloat();
+    }
+    case AssetRole:
+        return data.beaconInfo["org.matrix.msc3488.asset"_ls].toObject()["type"].toString();
+    case AuthorRole:
+        return m_room->getUser(data.senderId);
+    case IsLiveRole: {
+        if (!data.beaconInfo["live"_ls].toBool()) {
+            return false;
+        }
+        // TODO Qt6: port to toInteger(), timestamps are in ms since epoch, ie. 64 bit values
+        const auto lastTs = std::max(data.beaconInfo.value("org.matrix.msc3488.ts"_ls).toDouble(), data.beacon.value("org.matrix.msc3488.ts"_ls).toDouble());
+        const auto timeout = data.beaconInfo.value("timeout"_ls).toDouble(600000);
+        return lastTs + timeout >= QDateTime::currentDateTime().toMSecsSinceEpoch();
+    }
+    }
+
+    return {};
+}
+
+QHash<int, QByteArray> LiveLocationsModel::roleNames() const
+{
+    auto r = QAbstractListModel::roleNames();
+    r.insert(LatitudeRole, "latitude");
+    r.insert(LongitudeRole, "longitude");
+    r.insert(AssetRole, "asset");
+    r.insert(AuthorRole, "author");
+    r.insert(IsLiveRole, "isLive");
+    return r;
+}
+
+QRectF LiveLocationsModel::boundingBox() const
+{
+    QRectF bbox(QPointF(180.0, 90.0), QPointF(-180.0, -90.0));
+    for (auto i = 0; i < rowCount(); ++i) {
+        const auto lat = data(index(i, 0), LatitudeRole).toDouble();
+        const auto lon = data(index(i, 0), LongitudeRole).toDouble();
+
+        bbox.setLeft(std::min(bbox.left(), lon));
+        bbox.setRight(std::max(bbox.right(), lon));
+        bbox.setTop(std::min(bbox.top(), lat));
+        bbox.setBottom(std::max(bbox.bottom(), lat));
+    }
+    return bbox;
+}
+
+void LiveLocationsModel::addEvent(const Quotient::RoomEvent *event)
+{
+    if (event->isStateEvent() && event->matrixType() == "org.matrix.msc3672.beacon_info") {
+        LiveLocationData data;
+        data.senderId = event->senderId();
+        data.beaconInfo = event->contentJson();
+        if (event->contentJson()["live"_ls].toBool()) {
+            data.eventId = event->id();
+        } else {
+            data.eventId = event->fullJson()["replaces_state"_ls].toString();
+        }
+        updateLocationData(std::move(data));
+    }
+    if (event->matrixType() == "org.matrix.msc3672.beacon"_ls) {
+        LiveLocationData data;
+        data.eventId = event->contentJson()["m.relates_to"_ls].toObject()["event_id"_ls].toString();
+        data.senderId = event->senderId();
+        data.beacon = event->contentJson();
+        updateLocationData(std::move(data));
+    }
+}
+
+void LiveLocationsModel::updateLocationData(LiveLocationData &&data)
+{
+    if (!m_eventId.isEmpty() && data.eventId != m_eventId) {
+        return;
+    }
+
+    auto it = std::lower_bound(m_locations.begin(), m_locations.end(), data);
+    if (it == m_locations.end() || it->eventId != data.eventId) {
+        const auto row = std::distance(m_locations.begin(), it);
+        beginInsertRows({}, row, row);
+        m_locations.insert(it, std::move(data));
+        endInsertRows();
+        return;
+    }
+
+    const auto idx = index(std::distance(m_locations.begin(), it), 0);
+
+    // TODO Qt6: port to toInteger(), timestamps are in ms since epoch, ie. 64 bit values
+    if (it->beacon.isEmpty() || it->beacon.value("org.matrix.msc3488.ts"_ls).toDouble() < data.beacon.value("org.matrix.msc3488.ts"_ls).toDouble()) {
+        it->beacon = std::move(data.beacon);
+    }
+    if (it->beaconInfo.isEmpty()
+        || it->beaconInfo.value("org.matrix.msc3488.ts"_ls).toDouble() < data.beaconInfo.value("org.matrix.msc3488.ts"_ls).toDouble()) {
+        it->beaconInfo = std::move(data.beaconInfo);
+    }
+
+    Q_EMIT dataChanged(idx, idx);
+}

src/models/livelocationsmodel.h

@@ -0,0 +1,74 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2023 Volker Krause <vkrause@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "neochatroom.h"
+
+#include <QAbstractListModel>
+#include <QPointer>
+#include <QRectF>
+
+namespace Quotient
+{
+class RoomMessageEvent;
+}
+
+struct LiveLocationData {
+    QString eventId;
+    QString senderId;
+    QJsonObject beaconInfo;
+    QJsonObject beacon;
+};
+bool operator<(const LiveLocationData &lhs, const LiveLocationData &rhs);
+
+/** Accumulates live location beacon events in a given room
+ *  and provides the last known state for one or more live location beacons.
+ */
+class LiveLocationsModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_PROPERTY(NeoChatRoom *room MEMBER m_room NOTIFY roomChanged)
+    /** The event id of the beacon start event, ie. the one all suspequent
+     *  events use to relate to the same beacon.
+     *  If this is set only this specific beacon will be coverd by this model,
+     *  if it is empty, all beacons in the room will be covered.
+     */
+    Q_PROPERTY(QString eventId MEMBER m_eventId NOTIFY eventIdChanged)
+
+    /** Bounding box of all live location beacons covered by this model. */
+    Q_PROPERTY(QRectF boundingBox READ boundingBox NOTIFY boundingBoxChanged)
+
+public:
+    explicit LiveLocationsModel(QObject *parent = nullptr);
+
+    enum Roles {
+        LatitudeRole, /**< Latest latitude of a live locaction beacon. */
+        LongitudeRole, /**< Latest longitude of a live locaction beacon. */
+        AssetRole, /**< Type of location event, e.g. self pin of the user location. */
+        AuthorRole, /**< The author of the event. */
+        IsLiveRole, /**< Boolean that indicates whether a live location beacon is still live. */
+    };
+    Q_ENUM(Roles)
+
+    int rowCount(const QModelIndex &parent = {}) const override;
+    QVariant data(const QModelIndex &index, int roleName) const override;
+    QHash<int, QByteArray> roleNames() const override;
+
+    QRectF boundingBox() const;
+
+Q_SIGNALS:
+    void roomChanged();
+    void eventIdChanged();
+    void boundingBoxChanged();
+
+private:
+    void addEvent(const Quotient::RoomEvent *event);
+    void updateLocationData(LiveLocationData &&data);
+
+    QPointer<NeoChatRoom> m_room;
+    QString m_eventId;
+
+    QList<LiveLocationData> m_locations;
+};

src/models/locationsmodel.cpp

@@ -0,0 +1,129 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "locationsmodel.h"
+
+using namespace Quotient;
+
+LocationsModel::LocationsModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+    connect(this, &LocationsModel::roomChanged, this, [=]() {
+        for (const auto &event : m_room->messageEvents()) {
+            if (!is<RoomMessageEvent>(*event)) {
+                continue;
+            }
+            if (event->contentJson()["msgtype"] == "m.location") {
+                const auto &e = *event;
+                addLocation(eventCast<const RoomMessageEvent>(&e));
+            }
+        }
+        connect(m_room, &NeoChatRoom::aboutToAddHistoricalMessages, this, [=](const auto &events) {
+            for (const auto &event : events) {
+                if (!is<RoomMessageEvent>(*event)) {
+                    continue;
+                }
+                if (event->contentJson()["msgtype"] == "m.location") {
+                    const auto &e = *event;
+                    addLocation(eventCast<const RoomMessageEvent>(&e));
+                }
+            }
+        });
+        connect(m_room, &NeoChatRoom::aboutToAddNewMessages, this, [=](const auto &events) {
+            for (const auto &event : events) {
+                if (!is<RoomMessageEvent>(*event)) {
+                    continue;
+                }
+                if (event->contentJson()["msgtype"] == "m.location") {
+                    const auto &e = *event;
+                    addLocation(eventCast<const RoomMessageEvent>(&e));
+                }
+            }
+        });
+    });
+
+    connect(this, &LocationsModel::rowsInserted, this, &LocationsModel::boundingBoxChanged);
+}
+
+void LocationsModel::addLocation(const RoomMessageEvent *event)
+{
+    const auto uri = event->contentJson()["org.matrix.msc3488.location"]["uri"].toString();
+    const auto parts = uri.mid(4).split(QLatin1Char(','));
+    if (parts.size() < 2) {
+        qWarning() << "invalid geo: URI" << uri;
+        return;
+    }
+    const auto latitude = parts[0].toFloat();
+    const auto longitude = parts[1].toFloat();
+    beginInsertRows(QModelIndex(), m_locations.size(), m_locations.size() + 1);
+    m_locations += LocationData{
+        .eventId = event->id(),
+        .latitude = latitude,
+        .longitude = longitude,
+        .content = event->contentJson(),
+        .author = dynamic_cast<NeoChatUser *>(m_room->user(event->senderId())),
+    };
+    endInsertRows();
+}
+
+NeoChatRoom *LocationsModel::room() const
+{
+    return m_room;
+}
+
+void LocationsModel::setRoom(NeoChatRoom *room)
+{
+    if (m_room) {
+        disconnect(this, nullptr, m_room, nullptr);
+    }
+    m_room = room;
+    Q_EMIT roomChanged();
+}
+
+QHash<int, QByteArray> LocationsModel::roleNames() const
+{
+    return {
+        {LongitudeRole, "longitude"},
+        {LatitudeRole, "latitude"},
+        {TextRole, "text"},
+        {AssetRole, "asset"},
+        {AuthorRole, "author"},
+    };
+}
+
+QVariant LocationsModel::data(const QModelIndex &index, int roleName) const
+{
+    auto row = index.row();
+    if (roleName == LongitudeRole) {
+        return m_locations[row].longitude;
+    } else if (roleName == LatitudeRole) {
+        return m_locations[row].latitude;
+    } else if (roleName == TextRole) {
+        return m_locations[row].content["body"_ls].toString();
+    } else if (roleName == AssetRole) {
+        return m_locations[row].content["org.matrix.msc3488.asset"_ls].toObject()["type"_ls].toString();
+    } else if (roleName == AuthorRole) {
+        return m_room->getUser(m_locations[row].author);
+    }
+    return {};
+}
+
+int LocationsModel::rowCount(const QModelIndex &parent) const
+{
+    return m_locations.size();
+}
+
+QRectF LocationsModel::boundingBox() const
+{
+    QRectF bbox(QPointF(180.0, 90.0), QPointF(-180.0, -90.0));
+    for (auto i = 0; i < rowCount(); ++i) {
+        const auto lat = data(index(i, 0), LatitudeRole).toDouble();
+        const auto lon = data(index(i, 0), LongitudeRole).toDouble();
+
+        bbox.setLeft(std::min(bbox.left(), lon));
+        bbox.setRight(std::max(bbox.right(), lon));
+        bbox.setTop(std::min(bbox.top(), lat));
+        bbox.setBottom(std::max(bbox.bottom(), lat));
+    }
+    return bbox;
+}

src/models/locationsmodel.h

@@ -0,0 +1,58 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <QAbstractListModel>
+#include <QPointer>
+#include <QRectF>
+
+#include "neochatroom.h"
+
+#include <events/roommessageevent.h>
+
+class LocationsModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    enum Roles {
+        TextRole = Qt::DisplayRole,
+        LongitudeRole,
+        LatitudeRole,
+        AssetRole,
+        AuthorRole,
+    };
+    Q_ENUM(Roles)
+    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
+    /** Bounding box of all locations covered by this model. */
+    Q_PROPERTY(QRectF boundingBox READ boundingBox NOTIFY boundingBoxChanged)
+
+    explicit LocationsModel(QObject *parent = nullptr);
+
+    [[nodiscard]] NeoChatRoom *room() const;
+    void setRoom(NeoChatRoom *room);
+
+    QRectF boundingBox() const;
+
+    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
+    [[nodiscard]] QVariant data(const QModelIndex &index, int roleName) const override;
+    [[nodiscard]] int rowCount(const QModelIndex &parent = {}) const override;
+
+Q_SIGNALS:
+    void roomChanged();
+    void boundingBoxChanged();
+
+private:
+    QPointer<NeoChatRoom> m_room;
+
+    struct LocationData {
+        QString eventId;
+        float latitude;
+        float longitude;
+        QJsonObject content;
+        NeoChatUser *author;
+    };
+    QList<LocationData> m_locations;
+    void addLocation(const Quotient::RoomMessageEvent *event);
+};

src/models/messageeventmodel.cpp

@@ -6,12 +6,12 @@
 
 #include "neochatconfig.h"
 #include <connection.h>
-#include <csapi/rooms.h>
 #include <events/reactionevent.h>
 #include <events/redactionevent.h>
 #include <events/roomavatarevent.h>
 #include <events/roommemberevent.h>
 #include <events/simplestateevents.h>
+#include <qt_connection_util.h>
 #include <user.h>
 
 #ifdef QUOTIENT_07
@@ -123,6 +123,14 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
 #else
         lastReadEventId = room->readMarkerEventId();
 #endif
+        connect(m_currentRoom, &NeoChatRoom::replyLoaded, this, [this](const auto &eventId, const auto &replyId) {
+            Q_UNUSED(replyId);
+            auto row = eventIdToRow(eventId);
+            if (row == -1) {
+                return;
+            }
+            Q_EMIT dataChanged(index(row, 0), index(row, 0), {ReplyRole, ReplyMediaInfoRole, ReplyAuthor});
+        });
 
         connect(m_currentRoom, &Room::aboutToAddNewMessages, this, [this](RoomEventsRange events) {
             for (auto &&event : events) {
@@ -434,7 +442,9 @@ static LinkPreviewer *emptyLinkPreview = new LinkPreviewer;
 
 QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
 {
-    Q_ASSERT(checkIndex(idx, QAbstractItemModel::CheckIndexOption::IndexIsValid));
+    if (!checkIndex(idx, QAbstractItemModel::CheckIndexOption::IndexIsValid)) {
+        return {};
+    }
     const auto row = idx.row();
 
     if (!m_currentRoom || row < 0 || row >= int(m_currentRoom->pendingEvents().size()) + m_currentRoom->timelineSize()) {
@@ -515,6 +525,9 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
             return DelegateType::Sticker;
         }
         if (evt.isStateEvent()) {
+            if (evt.matrixType() == "org.matrix.msc3672.beacon_info"_ls) {
+                return DelegateType::LiveLocation;
+            }
             return DelegateType::State;
         }
         if (is<const EncryptedEvent>(evt)) {
@@ -625,6 +638,11 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
             return EventStatus::Hidden;
         }
 
+        // hide ending live location beacons
+        if (evt.isStateEvent() && evt.matrixType() == "org.matrix.msc3672.beacon_info"_ls && !evt.contentJson()["live"_ls].toBool()) {
+            return EventStatus::Hidden;
+        }
+
         return EventStatus::Normal;
     }
 
@@ -673,7 +691,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == ReplyAuthor) {
-        auto replyPtr = getReplyForEvent(evt);
+        auto replyPtr = m_currentRoom->getReplyForEvent(evt);
 
         if (replyPtr) {
             auto replyUser = static_cast<NeoChatUser *>(m_currentRoom->user(replyPtr->senderId()));
@@ -684,7 +702,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == ReplyMediaInfoRole) {
-        auto replyPtr = getReplyForEvent(evt);
+        auto replyPtr = m_currentRoom->getReplyForEvent(evt);
         if (!replyPtr) {
             return {};
         }
@@ -692,7 +710,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == ReplyRole) {
-        auto replyPtr = getReplyForEvent(evt);
+        auto replyPtr = m_currentRoom->getReplyForEvent(evt);
         if (!replyPtr) {
             return {};
         }
@@ -941,36 +959,6 @@ int MessageEventModel::eventIdToRow(const QString &eventID) const
     return it - m_currentRoom->messageEvents().rbegin() + timelineBaseIndex();
 }
 
-void MessageEventModel::loadReply(const QModelIndex &index)
-{
-    auto job = m_currentRoom->connection()->callApi<GetOneRoomEventJob>(m_currentRoom->id(), data(index, ReplyIdRole).toString());
-    QPersistentModelIndex persistentIndex(index);
-    connect(job, &BaseJob::success, this, [this, job, persistentIndex] {
-        m_extraEvents.push_back(fromJson<event_ptr_tt<RoomEvent>>(job->jsonData()));
-        Q_EMIT dataChanged(persistentIndex, persistentIndex, {ReplyRole, ReplyMediaInfoRole, ReplyAuthor});
-    });
-}
-
-const RoomEvent *MessageEventModel::getReplyForEvent(const RoomEvent &event) const
-{
-    const QString &replyEventId = event.contentJson()["m.relates_to"].toObject()["m.in_reply_to"].toObject()["event_id"].toString();
-    if (replyEventId.isEmpty()) {
-        return {};
-    };
-
-    const auto replyIt = m_currentRoom->findInTimeline(replyEventId);
-    const RoomEvent *replyPtr = replyIt != m_currentRoom->historyEdge() ? &**replyIt : nullptr;
-    if (!replyPtr) {
-        for (const auto &e : m_extraEvents) {
-            if (e->id() == replyEventId) {
-                replyPtr = e.get();
-                break;
-            }
-        }
-    }
-    return replyPtr;
-}
-
 QVariantMap MessageEventModel::getMediaInfoForEvent(const RoomEvent &event) const
 {
     QVariantMap mediaInfo;

src/models/messageeventmodel.h

@@ -53,6 +53,7 @@ public:
         ReadMarker, /**< The local user read marker. */
         Poll, /**< The initial event for a poll. */
         Location, /**< A location event. */
+        LiveLocation, /**< The initial event of a shared live location (i.e., the place where this is supposed to be shown in the timeline). */
         Other, /**< Anything that cannot be classified as another type. */
     };
     Q_ENUM(DelegateType);
@@ -141,14 +142,6 @@ public:
      */
     Q_INVOKABLE [[nodiscard]] int eventIdToRow(const QString &eventID) const;
 
-    /**
-     * @brief Load the event that the item at the given index replied to.
-     *
-     * This is used to ensure that the reply data is available when the message that
-     * was replied to is outside the currently loaded timeline.
-     */
-    Q_INVOKABLE void loadReply(const QModelIndex &index);
-
 private Q_SLOTS:
     int refreshEvent(const QString &eventId);
     void refreshRow(int row);
@@ -175,13 +168,10 @@ private:
     int refreshEventRoles(const QString &eventId, const QVector<int> &roles = {});
     void moveReadMarker(const QString &toEventId);
 
-    const Quotient::RoomEvent *getReplyForEvent(const Quotient::RoomEvent &event) const;
     QVariantMap getMediaInfoForEvent(const Quotient::RoomEvent &event) const;
     QVariantMap getMediaInfoFromFileInfo(const Quotient::EventContent::FileInfo *fileInfo, const QString &eventId, bool isThumbnail = false) const;
     void createLinkPreviewerForEvent(const Quotient::RoomMessageEvent *event);
     void createReactionModelForEvent(const Quotient::RoomMessageEvent *event);
-
-    std::vector<Quotient::event_ptr_tt<Quotient::RoomEvent>> m_extraEvents;
     // Hack to ensure that we don't call endInsertRows when we haven't called beginInsertRows
     bool m_initialized = false;
 

src/models/searchmodel.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "searchmodel.h"
+#include "events/stickerevent.h"
 #include "messageeventmodel.h"
 #include "neochatroom.h"
 #include "neochatuser.h"
@@ -42,18 +43,18 @@ void SearchModel::search()
         m_job = nullptr;
     }
 
+    RoomEventFilter filter;
+    filter.unreadThreadNotifications = none;
+    filter.lazyLoadMembers = true;
+    filter.includeRedundantMembers = false;
+    filter.notRooms = QStringList();
+    filter.rooms = QStringList{m_room->id()};
+    filter.containsUrl = false;
+
     SearchJob::RoomEventsCriteria criteria{
         .searchTerm = m_searchText,
         .keys = {},
-        .filter =
-            RoomEventFilter{
-                .unreadThreadNotifications = none,
-                .lazyLoadMembers = true,
-                .includeRedundantMembers = false,
-                .notRooms = {},
-                .rooms = {m_room->id()},
-                .containsUrl = false,
-            },
+        .filter = filter,
         .orderBy = "recent",
         .eventContext = SearchJob::IncludeEventContext{3, 3, true},
         .includeState = false,
@@ -96,16 +97,7 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
     case ShowAuthorRole:
         return true;
     case AuthorRole:
-        return QVariantMap{
-            {"isLocalUser", event.senderId() == m_room->localUser()->id()},
-            {"id", event.senderId()},
-            {"avatarMediaId", m_connection->user(event.senderId())->avatarMediaId(m_room)},
-            {"avatarUrl", m_connection->user(event.senderId())->avatarUrl(m_room)},
-            {"displayName", m_connection->user(event.senderId())->displayname(m_room)},
-            {"display", m_connection->user(event.senderId())->name()},
-            {"color", dynamic_cast<NeoChatUser *>(m_connection->user(event.senderId()))->color()},
-            {"object", QVariant::fromValue(m_connection->user(event.senderId()))},
-        };
+        return m_room->getUser(event.senderId());
     case ShowSectionRole:
         if (row == 0) {
             return true;
@@ -115,6 +107,72 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
         return renderDate(event.originTimestamp());
     case TimeRole:
         return event.originTimestamp();
+    case ShowReactionsRole:
+        return false;
+    case ShowReadMarkersRole:
+        return false;
+    case ReplyAuthorRole:
+        if (const auto &replyPtr = m_room->getReplyForEvent(event)) {
+            return m_room->getUser(static_cast<NeoChatUser *>(m_room->user(replyPtr->senderId())));
+        } else {
+            return m_room->getUser(nullptr);
+        }
+    case ReplyRole:
+        if (role == ReplyRole) {
+            auto replyPtr = m_room->getReplyForEvent(event);
+            if (!replyPtr) {
+                return {};
+            }
+
+            MessageEventModel::DelegateType type;
+            if (auto e = eventCast<const RoomMessageEvent>(replyPtr)) {
+                switch (e->msgtype()) {
+                case MessageEventType::Emote:
+                    type = MessageEventModel::DelegateType::Emote;
+                    break;
+                case MessageEventType::Notice:
+                    type = MessageEventModel::DelegateType::Notice;
+                    break;
+                case MessageEventType::Image:
+                    type = MessageEventModel::DelegateType::Image;
+                    break;
+                case MessageEventType::Audio:
+                    type = MessageEventModel::DelegateType::Audio;
+                    break;
+                case MessageEventType::Video:
+                    type = MessageEventModel::DelegateType::Video;
+                    break;
+                default:
+                    if (e->hasFileContent()) {
+                        type = MessageEventModel::DelegateType::File;
+                        break;
+                    }
+                    type = MessageEventModel::DelegateType::Message;
+                }
+
+            } else if (is<const StickerEvent>(*replyPtr)) {
+                type = MessageEventModel::DelegateType::Sticker;
+            } else {
+                type = MessageEventModel::DelegateType::Other;
+            }
+
+            return QVariantMap{
+                {"display", m_room->eventToString(*replyPtr, Qt::RichText)},
+                {"type", type},
+            };
+        }
+    case IsPendingRole:
+        return false;
+    case ShowLinkPreviewRole:
+        return false;
+    case IsReplyRole:
+        return !event.contentJson()["m.relates_to"].toObject()["m.in_reply_to"].toObject()["event_id"].toString().isEmpty();
+    case HighlightRole:
+        return !m_room->isDirectChat() && m_room->isEventHighlighted(&event);
+    case EventIdRole:
+        return event.id();
+    case ReplyIdRole:
+        return event.contentJson()["m.relates_to"].toObject()["m.in_reply_to"].toObject()["event_id"].toString();
     }
     return MessageEventModel::DelegateType::Message;
 #endif
@@ -142,6 +200,27 @@ QHash<int, QByteArray> SearchModel::roleNames() const
         {SectionRole, "section"},
         {TimeRole, "time"},
         {ShowAuthorRole, "showAuthor"},
+        {EventIdRole, "eventId"},
+        {ExcessReadMarkersRole, "excessReadMarkers"},
+        {HighlightRole, "isHighlighted"},
+        {ReadMarkersString, "readMarkersString"},
+        {PlainTextRole, "plainText"},
+        {VerifiedRole, "verified"},
+        {ReplyAuthorRole, "replyAuthor"},
+        {ProgressInfoRole, "progressInfo"},
+        {IsReplyRole, "isReply"},
+        {ShowReactionsRole, "showReactions"},
+        {ReplyRole, "reply"},
+        {ReactionRole, "reaction"},
+        {ReplyMediaInfoRole, "replyMediaInfo"},
+        {ReadMarkersRole, "readMarkers"},
+        {IsPendingRole, "isPending"},
+        {ShowReadMarkersRole, "showReadMarkers"},
+        {ReplyIdRole, "replyId"},
+        {MimeTypeRole, "mimeType"},
+        {ShowLinkPreviewRole, "showLinkPreview"},
+        {LinkPreviewRole, "linkPreview"},
+        {SourceRole, "source"},
     };
 }
 
@@ -152,8 +231,26 @@ NeoChatRoom *SearchModel::room() const
 
 void SearchModel::setRoom(NeoChatRoom *room)
 {
+    if (m_room) {
+        disconnect(m_room, nullptr, this, nullptr);
+    }
     m_room = room;
     Q_EMIT roomChanged();
+
+#ifdef QUOTIENT_07
+    connect(m_room, &NeoChatRoom::replyLoaded, this, [this](const auto &eventId, const auto &replyId) {
+        Q_UNUSED(replyId);
+        const auto &results = m_result->results;
+        auto it = std::find_if(results.begin(), results.end(), [eventId](const auto &event) {
+            return event.result->id() == eventId;
+        });
+        if (it == results.end()) {
+            return;
+        }
+        auto row = it - results.begin();
+        Q_EMIT dataChanged(index(row, 0), index(row, 0), {ReplyRole, ReplyMediaInfoRole, ReplyAuthorRole});
+    });
+#endif
 }
 
 // TODO deduplicate with messageeventmodel

src/models/searchmodel.h

@@ -50,17 +50,40 @@ public:
     /**
      * @brief Defines the model roles.
      *
+     * For documentation of the roles, see MessageEventModel.
+     *
      * Some of the roles exist only for compatibility with the MessageEventModel,
      * since the same delegates are used.
      */
     enum Roles {
-        DisplayRole = Qt::DisplayRole, /**< The message string. */
-        DelegateTypeRole, /**< The type of the event. */
-        ShowAuthorRole, /**< Whether the author should be shown (always true). */
-        AuthorRole, /**< The author of the event. */
-        ShowSectionRole, /**< Whether the section header should be shown. */
-        SectionRole, /**< The date of the event as a string. */
-        TimeRole, /**< The timestamp for when the event was sent. */
+        DisplayRole = Qt::DisplayRole,
+        DelegateTypeRole,
+        ShowAuthorRole,
+        AuthorRole,
+        ShowSectionRole,
+        SectionRole,
+        TimeRole,
+        EventIdRole,
+        ExcessReadMarkersRole,
+        HighlightRole,
+        ReadMarkersString,
+        PlainTextRole,
+        VerifiedRole,
+        ReplyAuthorRole,
+        ProgressInfoRole,
+        IsReplyRole,
+        ShowReactionsRole,
+        ReplyRole,
+        ReactionRole,
+        ReplyMediaInfoRole,
+        ReadMarkersRole,
+        IsPendingRole,
+        ShowReadMarkersRole,
+        ReplyIdRole,
+        MimeTypeRole,
+        ShowLinkPreviewRole,
+        LinkPreviewRole,
+        SourceRole,
     };
     Q_ENUM(Roles);
     SearchModel(QObject *parent = nullptr);

src/models/stickermodel.cpp

@@ -14,30 +14,45 @@ StickerModel::StickerModel(QObject *parent)
 
 int StickerModel::rowCount(const QModelIndex &index) const
 {
+    Q_UNUSED(index);
     return m_images.size();
 }
 QVariant StickerModel::data(const QModelIndex &index, int role) const
 {
     const auto &row = index.row();
     const auto &image = m_images[row];
-    if (role == Url) {
+    if (role == UrlRole) {
 #ifdef QUOTIENT_07
         return m_room->connection()->makeMediaUrl(image.url);
 #endif
     }
-    if (role == Body) {
+    if (role == BodyRole) {
         if (image.body) {
             return *image.body;
         }
     }
+    if (role == IsStickerRole) {
+        if (image.usage) {
+            return image.usage->isEmpty() || image.usage->contains("sticker"_ls);
+        }
+        return true;
+    }
+    if (role == IsEmojiRole) {
+        if (image.usage) {
+            return image.usage->isEmpty() || image.usage->contains("emoticon"_ls);
+        }
+        return true;
+    }
     return {};
 }
 
 QHash<int, QByteArray> StickerModel::roleNames() const
 {
     return {
-        {StickerModel::Url, "url"},
-        {StickerModel::Body, "body"},
+        {UrlRole, "url"},
+        {BodyRole, "body"},
+        {IsStickerRole, "isSticker"},
+        {IsEmojiRole, "isEmoji"},
     };
 }
 ImagePacksModel *StickerModel::model() const

src/models/stickermodel.h

@@ -47,8 +47,10 @@ public:
      * @brief Defines the model roles.
      */
     enum Roles {
-        Url = Qt::UserRole + 1, /**< The source mxc URL for the image. */
-        Body, /**< The image caption, if any. */
+        UrlRole = Qt::UserRole + 1, /**< The source mxc URL for the image. */
+        BodyRole, /**< The image caption, if any. */
+        IsStickerRole, /**< Whether this emoticon is a sticker. */
+        IsEmojiRole, /**< Whether this emoticon is an emoji. */
     };
 
     explicit StickerModel(QObject *parent = nullptr);

src/models/userlistmodel.h

@@ -45,6 +45,7 @@ public:
         PowerLevelRole, /**< The user's power level in the current room. */
         PowerLevelStringRole, /**< The name of the user's power level in the current room. */
     };
+    Q_ENUM(EventRoles)
 
     UserListModel(QObject *parent = nullptr);
 

src/neochat.notifyrc

@@ -13,6 +13,7 @@ Name[es]=NeoChat
 Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
+Name[gl]=NeoChat
 Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
@@ -51,6 +52,7 @@ Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentraliza
 Comment[eu]=Matrix, deszentralizatutako komunikazio protokolorako, bezero bat
 Comment[fi]=Hajautetun Matrix-viestintäyhteyskäytännön asiakasohjelma
 Comment[fr]=Un client pour « Matrix », le protocole décentralisé de communications.
+Comment[gl]=Un cliente para Matrix, o protocolo de comunicación descentralizada
 Comment[hu]=Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz
 Comment[ia]=Un cliente per Matrix, le protocollo de communication decentralisate
 Comment[id]=Sebuah klien untuk matrix, protokol komunikasi terdecentralisasi
@@ -90,6 +92,7 @@ Name[es]=Nuevo mensaje
 Name[eu]=Mezu berria
 Name[fi]=Uusi viesti
 Name[fr]=Nouveau message
+Name[gl]=Nova mensaxe
 Name[hu]=Új üzenet
 Name[ia]=Nove message
 Name[id]=Pesan baru
@@ -126,6 +129,7 @@ Comment[es]=Hay un mensaje nuevo
 Comment[eu]=Mezu berri bat dago
 Comment[fi]=Saapui uusi viesti
 Comment[fr]=Il y a un nouveau message
+Comment[gl]=Hai unha nova mensaxe
 Comment[hu]=Új üzenet érkezett
 Comment[ia]=Il ha un nove message
 Comment[id]=Ada pesan baru
@@ -166,6 +170,7 @@ Name[es]=Nueva invitación
 Name[eu]=Gonbidapen berria
 Name[fi]=Uusi kutsu
 Name[fr]=Nouvelle invitation
+Name[gl]=Novo convite
 Name[ia]=Nove invitation
 Name[id]=Undangan Baru
 Name[ie]=Nov invitation
@@ -197,6 +202,7 @@ Comment[es]=Hay una nueva invitación a una sala
 Comment[eu]=Gela baterako gonbidapen berri bat dago
 Comment[fi]=Uusi kutsu huoneeseen
 Comment[fr]=Il y a une nouvelle invitation dans un salon.
+Comment[gl]=Tes un novo convite para unha sala
 Comment[ia]=Il ha un nove invitation a un sala
 Comment[id]=Ada undangan baru ke sebuah ruangan
 Comment[ie]=Vu have un nov invitation a un chambre

src/neochatroom.cpp

@@ -18,10 +18,12 @@
 #include <connection.h>
 #include <csapi/account-data.h>
 #include <csapi/directory.h>
+#include <csapi/event_context.h>
 #include <csapi/pushrules.h>
 #include <csapi/redaction.h>
 #include <csapi/report_content.h>
 #include <csapi/room_state.h>
+#include <csapi/rooms.h>
 #include <csapi/typing.h>
 #include <events/encryptionevent.h>
 #include <events/reactionevent.h>
@@ -32,6 +34,7 @@
 #include <events/roompowerlevelsevent.h>
 #include <events/simplestateevents.h>
 #include <jobs/downloadfilejob.h>
+
 #ifndef QUOTIENT_07
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <joinstate.h>
@@ -2069,3 +2072,32 @@ QUrl NeoChatRoom::avatarForMember(NeoChatUser *user) const
     return url;
 #endif
 }
+
+const RoomEvent *NeoChatRoom::getReplyForEvent(const RoomEvent &event) const
+{
+    const QString &replyEventId = event.contentJson()["m.relates_to"].toObject()["m.in_reply_to"].toObject()["event_id"].toString();
+    if (replyEventId.isEmpty()) {
+        return {};
+    };
+
+    const auto replyIt = findInTimeline(replyEventId);
+    const RoomEvent *replyPtr = replyIt != historyEdge() ? &**replyIt : nullptr;
+    if (!replyPtr) {
+        for (const auto &e : m_extraEvents) {
+            if (e->id() == replyEventId) {
+                replyPtr = e.get();
+                break;
+            }
+        }
+    }
+    return replyPtr;
+}
+
+void NeoChatRoom::loadReply(const QString &eventId, const QString &replyId)
+{
+    auto job = connection()->callApi<GetOneRoomEventJob>(id(), replyId);
+    connect(job, &BaseJob::success, this, [this, job, eventId, replyId] {
+        m_extraEvents.push_back(fromJson<event_ptr_tt<RoomEvent>>(job->jsonData()));
+        Q_EMIT replyLoaded(eventId, replyId);
+    });
+}

src/neochatroom.h

@@ -833,6 +833,18 @@ public:
 
     Q_INVOKABLE [[nodiscard]] QUrl avatarForMember(NeoChatUser *user) const;
 
+    /**
+     * @brief Returns the event that is being replied to. This includes events that were manually loaded using NeoChatRoom::loadReply.
+     */
+    const Quotient::RoomEvent *getReplyForEvent(const Quotient::RoomEvent &event) const;
+
+    /**
+     * Loads the event replyId with the given id from the server and saves it locally.
+     * For models to update correctly, eventId must be the event that is replying to replyId.
+     * Intended to load the replied-to event when it isn't available locally.
+     */
+    Q_INVOKABLE void loadReply(const QString &eventId, const QString &replyId);
+
 private:
     QSet<const Quotient::RoomEvent *> highlights;
 
@@ -864,6 +876,7 @@ private:
 #ifdef QUOTIENT_07
     QCache<QString, PollHandler> m_polls;
 #endif
+    std::vector<Quotient::event_ptr_tt<Quotient::RoomEvent>> m_extraEvents;
 
 private Q_SLOTS:
     void updatePushNotificationState(QString type);
@@ -912,6 +925,7 @@ Q_SIGNALS:
     void serverAclPowerLevelChanged();
     void spaceChildPowerLevelChanged();
     void spaceParentPowerLevelChanged();
+    void replyLoaded(const QString &eventId, const QString &replyId);
 
 public Q_SLOTS:
     /**

src/notificationsmanager.cpp

@@ -5,7 +5,7 @@
 
 #include <memory>
 
-#include <QJsonArray>
+#include <QGuiApplication>
 
 #include <KLocalizedString>
 #include <KNotification>
@@ -18,6 +18,7 @@
 #endif
 
 #include <connection.h>
+#include <csapi/notifications.h>
 #include <csapi/pushrules.h>
 #include <jobs/basejob.h>
 #include <user.h>
@@ -48,6 +49,148 @@ NotificationsManager::NotificationsManager(QObject *parent)
     });
 }
 
+#ifdef QUOTIENT_07
+void NotificationsManager::handleNotifications(QPointer<Connection> connection)
+{
+    if (!m_connActiveJob.contains(connection->user()->id())) {
+        auto job = connection->callApi<GetNotificationsJob>();
+        m_connActiveJob.append(connection->user()->id());
+        connect(job, &BaseJob::success, this, [this, job, connection]() {
+            m_connActiveJob.removeAll(connection->user()->id());
+            processNotificationJob(connection, job, !m_oldNotifications.contains(connection->user()->id()));
+        });
+    }
+}
+#endif
+
+void NotificationsManager::processNotificationJob(QPointer<Quotient::Connection> connection, Quotient::GetNotificationsJob *job, bool initialization)
+{
+    if (job == nullptr) {
+        return;
+    }
+    if (connection == nullptr) {
+        qWarning() << QStringLiteral("No connection for GetNotificationsJob %1").arg(job->objectName());
+        return;
+    }
+
+    const auto connectionId = connection->user()->id();
+
+    // If pagination has occurred set off the next job
+    auto nextToken = job->jsonData()["next_token"].toString();
+    if (!nextToken.isEmpty()) {
+        auto nextJob = connection->callApi<GetNotificationsJob>(nextToken);
+        m_connActiveJob.append(connectionId);
+        connect(nextJob, &BaseJob::success, this, [this, nextJob, connection, initialization]() {
+            m_connActiveJob.removeAll(connection->user()->id());
+            processNotificationJob(connection, nextJob, initialization);
+        });
+    }
+
+    const auto notifications = job->jsonData()["notifications"].toArray();
+    if (initialization) {
+        m_oldNotifications[connectionId] = QStringList();
+        for (const auto &n : notifications) {
+            if (!m_initialTimestamp.contains(connectionId)) {
+                m_initialTimestamp[connectionId] = n.toObject()["ts"].toDouble();
+            } else {
+                qint64 timestamp = n.toObject()["ts"].toDouble();
+                if (timestamp > m_initialTimestamp[connectionId]) {
+                    m_initialTimestamp[connectionId] = timestamp;
+                }
+            }
+
+            auto connectionNotifications = m_oldNotifications.value(connectionId);
+            connectionNotifications += n.toObject()["event"].toObject()["event_id"].toString();
+            m_oldNotifications[connectionId] = connectionNotifications;
+        }
+        return;
+    }
+    for (const auto &n : notifications) {
+        const auto notification = n.toObject();
+        if (notification["read"].toBool()) {
+            continue;
+        }
+        auto connectionNotifications = m_oldNotifications.value(connectionId);
+        if (connectionNotifications.contains(notification["event"].toObject()["event_id"].toString())) {
+            continue;
+        }
+        connectionNotifications += notification["event"].toObject()["event_id"].toString();
+        m_oldNotifications[connectionId] = connectionNotifications;
+
+        auto room = connection->room(notification["room_id"].toString());
+        if (shouldPostNotification(connection, n)) {
+            // The room might have been deleted (for example rejected invitation).
+            auto sender = room->user(notification["event"].toObject()["sender"].toString());
+
+            QString body;
+
+            if (notification["event"].toObject()["type"].toString() == "org.matrix.msc3381.poll.start") {
+                body = notification["event"]
+                           .toObject()["content"]
+                           .toObject()["org.matrix.msc3381.poll.start"]
+                           .toObject()["question"]
+                           .toObject()["body"]
+                           .toString();
+            } else {
+                body = notification["event"].toObject()["content"].toObject()["body"].toString();
+            }
+
+            if (notification["event"]["type"] == "m.room.encrypted") {
+#ifdef Quotient_E2EE_ENABLED
+                auto decrypted = connection->decryptNotification(notification);
+                body = decrypted["content"].toObject()["body"].toString();
+#endif
+                if (body.isEmpty()) {
+                    body = i18n("Encrypted Message");
+                }
+            }
+
+            QImage avatar_image;
+            if (!sender->avatarUrl(room).isEmpty()) {
+                avatar_image = sender->avatar(128, room);
+            } else {
+                avatar_image = room->avatar(128);
+            }
+            postNotification(dynamic_cast<NeoChatRoom *>(room),
+                             sender->displayname(room),
+                             body,
+                             avatar_image,
+                             notification["event"].toObject()["event_id"].toString(),
+                             true);
+        }
+    }
+}
+
+bool NotificationsManager::shouldPostNotification(QPointer<Quotient::Connection> connection, const QJsonValue &notification)
+{
+    if (connection == nullptr) {
+        return false;
+    }
+
+    auto room = connection->room(notification["room_id"].toString());
+    if (room == nullptr) {
+        return false;
+    }
+
+    // If the room is the current room and the application is active the notification
+    // should not be shown.
+    // This is setup so that if the application is inactive the notification will
+    // always be posted, even if the room is the current room.
+    bool isCurrentRoom = RoomManager::instance().currentRoom() && room->id() == RoomManager::instance().currentRoom()->id();
+    if (isCurrentRoom && QGuiApplication::applicationState() == Qt::ApplicationActive) {
+        return false;
+    }
+
+    // If the notification timestamp is earlier than the initial timestamp assume
+    // the notification is old and shouldn't be posted.
+    qint64 timestamp = notification["ts"].toDouble();
+    if (timestamp < m_initialTimestamp[connection->user()->id()]) {
+        return false;
+    }
+
+    return true;
+}
+
 void NotificationsManager::postNotification(NeoChatRoom *room,
                                             const QString &sender,
                                             const QString &text,

src/notificationsmanager.h

@@ -4,11 +4,18 @@
 #pragma once
 
 #include <QImage>
+#include <QJsonObject>
 #include <QMap>
 #include <QObject>
 #include <QPointer>
 #include <QString>
-#include <QJsonObject>
+#include <csapi/notifications.h>
+#include <jobs/basejob.h>
+
+namespace Quotient
+{
+class Connection;
+}
 
 class KNotification;
 class NeoChatRoom;
@@ -181,9 +188,23 @@ public:
      */
     QVector<QVariant> getKeywordNotificationActions();
 
+#ifdef QUOTIENT_07
+    /**
+     * @brief Handle the notifications for the given connection.
+     */
+    void handleNotifications(QPointer<Quotient::Connection> connection);
+#endif
+
 private:
     NotificationsManager(QObject *parent = nullptr);
 
+    QHash<QString, qint64> m_initialTimestamp;
+    QHash<QString, QStringList> m_oldNotifications;
+
+    QStringList m_connActiveJob;
+
+    bool shouldPostNotification(QPointer<Quotient::Connection> connection, const QJsonValue &notification);
+
     QHash<QString, KNotification *> m_notifications;
     QHash<QString, QPointer<KNotification>> m_invitations;
 
@@ -218,6 +239,8 @@ private:
     QVector<QVariant> toActions(PushNotificationAction::Action action, const QString &sound = "default");
 
 private Q_SLOTS:
+    void processNotificationJob(QPointer<Quotient::Connection> connection, Quotient::GetNotificationsJob *job, bool initialization);
+
     void updateNotificationRules(const QString &type);
 
 Q_SIGNALS:

src/plasma-runner-neochat.desktop

@@ -14,6 +14,7 @@ Name[es]=NeoChat
 Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
+Name[gl]=NeoChat
 Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
@@ -50,6 +51,7 @@ Comment[es]=Buscar salas en NeoChat
 Comment[eu]=Bilatu gelak NeoChat-en
 Comment[fi]=Etsi huoneita NeoChatissä
 Comment[fr]=Trouver des salons dans NeoChat
+Comment[gl]=Atopa salas en NeoChat
 Comment[ia]=Trova salas in NeoChat
 Comment[id]=Cari ruangan di NeoChat
 Comment[ie]=Trovar chambres in NeoChat

src/qml/Component/ChatBox/ChatBar.qml

@@ -10,15 +10,47 @@ import QtQuick.Window 2.15
 import org.kde.kirigami 2.18 as Kirigami
 import org.kde.neochat 1.0
 
+/**
+ * @brief The component which handles the message sending.
+ *
+ * The ChatBox deals with laying out the visual elements with the ChatBar handling
+ * the core functionality of displaying the current message composition before sending.
+ *
+ * This includes support for the following message types:
+ *  - text
+ *  - media (video, image, file)
+ *  - emojis/stickers
+ *  - location
+ *
+ * In addition, when replying, this component supports showing the message that is being
+ * replied to.
+ *
+ * @note There is no edit functionality here this, is handled inline by the timeline
+ *       text delegate.
+ *
+ * @sa ChatBox
+ */
 QQC2.Control {
     id: root
 
+    /**
+     * @brief The current room that user is viewing.
+     */
+    property NeoChatRoom currentRoom
+
+    /**
+     * @brief The QQC2.TextArea object.
+     *
+     * @sa QQC2.TextArea
+     */
     property alias textField: textField
-    property bool isReplying: currentRoom.chatBoxReplyId.length > 0
-    property bool attachmentPaneVisible: currentRoom.chatBoxAttachmentPath.length > 0
-
-    signal messageSent()
 
+    /**
+     * @brief The list of actions in the ChatBar.
+     *
+     * Each of these will be visualised in the ChatBar so new actions can be added
+     * by appending to this list.
+     */
     property list<Kirigami.Action> actions : [
         Kirigami.Action {
             id: attachmentAction
@@ -95,6 +127,11 @@ QQC2.Control {
         }
     ]
 
+    /**
+     * @brief A message has been sent from the chat bar.
+     */
+    signal messageSent()
+
     leftPadding: 0
     rightPadding: 0
     topPadding: 0
@@ -119,7 +156,7 @@ QQC2.Control {
         QQC2.TextArea {
             id: textField
 
-            x: Math.round((root.width - chatBoxMaxWidth) / 2) - (root.width > chatBoxMaxWidth ? Kirigami.Units.largeSpacing * 1.5 : 0)
+            x: Math.round((root.width - chatBarSizeHelper.currentWidth) / 2) - (root.width > chatBarSizeHelper.currentWidth + Kirigami.Units.largeSpacing * 2.5 ? Kirigami.Units.largeSpacing * 1.5 : 0)
             topPadding: Kirigami.Units.largeSpacing + (paneLoader.visible ? paneLoader.height : 0)
             bottomPadding: Kirigami.Units.largeSpacing
             leftPadding: LayoutMirroring.enabled ? actionsRow.width : Kirigami.Units.largeSpacing
@@ -158,7 +195,7 @@ QQC2.Control {
                 x: textField.cursorRectangle.x
                 y: textField.cursorRectangle.y - height
 
-                onFormattingSelected: chatBar.formatText(format, selectionStart, selectionEnd)
+                onFormattingSelected: root.formatText(format, selectionStart, selectionEnd)
             }
 
             Keys.onDeletePressed: {
@@ -181,7 +218,7 @@ QQC2.Control {
                 } else if (event.modifiers & Qt.ShiftModifier || Kirigami.Settings.isMobile) {
                     textField.insert(cursorPosition, "\n")
                 } else {
-                    chatBar.postMessage();
+                    root.postMessage();
                 }
             }
             Keys.onReturnPressed: {
@@ -190,7 +227,7 @@ QQC2.Control {
                 } else if (event.modifiers & Qt.ShiftModifier || Kirigami.Settings.isMobile) {
                     textField.insert(cursorPosition, "\n")
                 } else {
-                    chatBar.postMessage();
+                    root.postMessage();
                 }
             }
             Keys.onTabPressed: {
@@ -200,7 +237,7 @@ QQC2.Control {
             }
             Keys.onPressed: {
                 if (event.key === Qt.Key_V && event.modifiers & Qt.ControlModifier) {
-                    chatBar.pasteImage();
+                    root.pasteImage();
                 } else if (event.key === Qt.Key_Up && event.modifiers & Qt.ControlModifier) {
                     currentRoom.replyLastMessage();
                 } else if (event.key === Qt.Key_Up && textField.text.length === 0) {
@@ -232,13 +269,13 @@ QQC2.Control {
 
                 anchors.top: parent.top
                 anchors.left: parent.left
-                anchors.leftMargin: root.width > chatBoxMaxWidth ? 0 : Kirigami.Units.largeSpacing
+                anchors.leftMargin: Kirigami.Units.largeSpacing
                 anchors.right: parent.right
-                anchors.rightMargin: root.width > chatBoxMaxWidth ? 0 : (chatBarScrollView.QQC2.ScrollBar.vertical.visible ? Kirigami.Units.largeSpacing * 3.5 : Kirigami.Units.largeSpacing)
+                anchors.rightMargin: root.width > chatBarSizeHelper.currentWidth ? 0 : (chatBarScrollView.QQC2.ScrollBar.vertical.visible ? Kirigami.Units.largeSpacing * 3.5 : Kirigami.Units.largeSpacing)
 
                 active: visible
-                visible: root.isReplying || root.attachmentPaneVisible
-                sourceComponent: root.isReplying ? replyPane : attachmentPane
+                visible: root.currentRoom.chatBoxReplyId.length > 0 || root.currentRoom.chatBoxAttachmentPath.length > 0
+                sourceComponent: root.currentRoom.chatBoxReplyId.length > 0 ? replyPane : attachmentPane
             }
             Component {
                 id: replyPane
@@ -299,9 +336,9 @@ QQC2.Control {
         id: cancelButton
         anchors.top: parent.top
         anchors.right: parent.right
-        anchors.rightMargin: (root.width - chatBoxMaxWidth) / 2 + Kirigami.Units.largeSpacing + (chatBarScrollView.QQC2.ScrollBar.vertical.visible && !(root.width > chatBoxMaxWidth) ? Kirigami.Units.largeSpacing * 2.5 : 0)
+        anchors.rightMargin: (root.width - chatBarSizeHelper.currentWidth) / 2 + Kirigami.Units.largeSpacing + (chatBarScrollView.QQC2.ScrollBar.vertical.visible && !(root.width > chatBarSizeHelper.currentWidth) ? Kirigami.Units.largeSpacing * 2.5 : 0)
 
-        visible: root.isReplying
+        visible: root.currentRoom.chatBoxReplyId.length > 0
         display: QQC2.AbstractButton.IconOnly
         action: Kirigami.Action {
             text: i18nc("@action:button", "Cancel reply")
@@ -320,7 +357,7 @@ QQC2.Control {
         padding: Kirigami.Units.smallSpacing
         spacing: Kirigami.Units.smallSpacing
         anchors.right: parent.right
-        property var requiredMargin: (root.width - chatBoxMaxWidth) / 2 + Kirigami.Units.largeSpacing + (chatBarScrollView.QQC2.ScrollBar.vertical.visible && !(root.width > chatBoxMaxWidth) ? Kirigami.Units.largeSpacing * 2.5 : 0)
+        property var requiredMargin: (root.width - chatBarSizeHelper.currentWidth) / 2 + Kirigami.Units.largeSpacing + (chatBarScrollView.QQC2.ScrollBar.vertical.visible && !(root.width > chatBarSizeHelper.currentWidth) ? Kirigami.Units.largeSpacing * 2.5 : 0)
         anchors.leftMargin: layoutDirection === Qt.RightToLeft ? requiredMargin : 0
         anchors.rightMargin: layoutDirection === Qt.RightToLeft ? 0 : requiredMargin
         anchors.bottom: parent.bottom
@@ -400,6 +437,17 @@ QQC2.Control {
         }
     }
 
+    DelegateSizeHelper {
+        id: chatBarSizeHelper
+        startBreakpoint: Kirigami.Units.gridUnit * 46
+        endBreakpoint: Kirigami.Units.gridUnit * 66
+        startPercentWidth: 100
+        endPercentWidth: Config.compactLayout ? 100 : 85
+        maxWidth: Config.compactLayout ? -1 : Kirigami.Units.gridUnit * 60
+
+        parentWidth: root.width
+    }
+
     function forceActiveFocus() {
         textField.forceActiveFocus();
         // set the cursor to the end of the text

src/qml/Component/ChatBox/ChatBox.qml

@@ -9,15 +9,47 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 import org.kde.neochat 1.0
 
+/**
+ * @brief A component for typing and sending chat messages.
+ *
+ * This is designed to go to the bottom of the timeline and provides all the functionality
+ * required for the user to send messages to the room.
+ *
+ * This includes support for the following message types:
+ *  - text
+ *  - media (video, image, file)
+ *  - emojis/stickers
+ *  - location
+ *
+ * In addition when replying this component supports showing the message that is being
+ * replied to.
+ *
+ * @note The main role of this component is to layout the elements. The main functionality
+ *       is handled by ChatBar
+ *
+ * @sa ChatBar
+ */
 ColumnLayout {
     id: chatBox
 
+    /**
+     * @brief The current room that user is viewing.
+     */
+    property NeoChatRoom currentRoom
+
+    /**
+     * @brief A message has been sent from the chat bar.
+     */
     signal messageSent()
 
-    property alias chatBar: chatBar
-
-    readonly property int extraWidth: width >= Kirigami.Units.gridUnit * 47 ? Math.min((width - Kirigami.Units.gridUnit * 47), Kirigami.Units.gridUnit * 20) : 0
-    readonly property int chatBoxMaxWidth: Config.compactLayout ? width : Math.min(width, Kirigami.Units.gridUnit * 39 + extraWidth)
+    /**
+     * @brief Insert the given text into the ChatBar.
+     *
+     * The text is inserted at the current cursor location.
+     */
+    function insertText(text) {
+        chatBar.insertText(text)
+    }
 
     spacing: 0
 
@@ -47,6 +79,8 @@ ColumnLayout {
         // lineSpacing is height+leading, so subtract leading once since leading only exists between lines.
         Layout.maximumHeight: chatBarFontMetrics.lineSpacing * 8 - chatBarFontMetrics.leading + textField.topPadding + textField.bottomPadding
 
+        currentRoom: root.currentRoom
+
         FontMetrics {
             id: chatBarFontMetrics
             font: chatBar.textField.font
@@ -56,4 +90,6 @@ ColumnLayout {
             chatBox.messageSent();
         }
     }
+
+    onActiveFocusChanged: chatBar.forceActiveFocus()
 }

src/qml/Component/ChatBox/LocationChooser.qml

@@ -11,10 +11,12 @@ import org.kde.kirigamiaddons.labs.components 1.0 as Components
 
 import org.kde.kirigami 2.15 as Kirigami
 
+import org.kde.neochat 1.0
+
 Components.AbstractMaximizeComponent {
     id: root
 
-    required property var room
+    required property NeoChatRoom room
     property var location
 
     title: i18n("Choose a Location")

src/qml/Component/Emoji/EmojiGrid.qml

@@ -80,7 +80,7 @@ QQC2.ScrollView {
 
         Kirigami.PlaceholderMessage {
             anchors.centerIn: parent
-            text: i18n("No emojis")
+            text: emojiGrid.stickers ? i18n("No stickers") : i18n("No emojis")
             visible: emojis.count === 0
         }
     }

src/qml/Component/Emoji/EmojiPicker.qml

@@ -107,7 +107,7 @@ ColumnLayout {
     EmojiGrid {
         id: emojiGrid
         targetIconSize: root.currentCategory === EmojiModel.Custom ? Kirigami.Units.gridUnit * 3 : root.categoryIconSize  // Custom emojis are bigger
-        model: root.selectedType === 1 ? stickerModel : searchField.text.length === 0 ? EmojiModel.emojis(root.currentCategory) : (root.includeCustom ? EmojiModel.filterModel(searchField.text, false) : EmojiModel.filterModelNoCustom(searchField.text, false))
+        model: root.selectedType === 1 ? emoticonFilterModel : searchField.text.length === 0 ? EmojiModel.emojis(root.currentCategory) : (root.includeCustom ? EmojiModel.filterModel(searchField.text, false) : EmojiModel.filterModelNoCustom(searchField.text, false))
         Layout.fillWidth: true
         Layout.fillHeight: true
         withCustom: root.includeCustom
@@ -115,7 +115,7 @@ ColumnLayout {
         header: categories
         Keys.forwardTo: searchField
         stickers: root.selectedType === 1
-        onStickerChosen: stickerModel.postSticker(index)
+        onStickerChosen: stickerModel.postSticker(emoticonFilterModel.mapToSource(emoticonFilterModel.index(index, 0)).row)
     }
 
     Kirigami.Separator {
@@ -163,6 +163,12 @@ ColumnLayout {
         room: currentRoom
     }
 
+    EmoticonFilterModel {
+        id: emoticonFilterModel
+        sourceModel: stickerModel
+        showStickers: true
+    }
+
     Component {
         id: emojiDelegate
         Kirigami.NavigationTabButton {

src/qml/Component/FullScreenMap.qml

@@ -0,0 +1,73 @@
+// SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtLocation 5.15
+import QtPositioning 5.15
+
+import org.kde.kirigami 2.15 as Kirigami
+
+ApplicationWindow {
+    id: root
+
+    property real latitude: NaN
+    property real longitude: NaN
+    property string asset
+    property var author
+    property QtObject liveLocationModel: null
+
+    flags: Qt.FramelessWindowHint | Qt.WA_TranslucentBackground
+    visibility: Qt.WindowFullScreen
+
+    title: i18n("View Location")
+
+    Shortcut {
+        sequence: "Escape"
+        onActivated: root.destroy()
+    }
+
+    color: Kirigami.Theme.backgroundColor
+
+    background: AbstractButton {
+        onClicked: root.destroy()
+    }
+
+    Map {
+        id: map
+        anchors.fill: parent
+        center: root.liveLocationModel ?  QtPositioning.coordinate(root.liveLocationModel.boundingBox.y, root.liveLocationModel.boundingBox.x)
+            : QtPositioning.coordinate(root.latitude, root.longitude)
+        zoomLevel: 15
+        plugin: OsmLocationPlugin.plugin
+        LocationMapItem {
+            latitude: root.latitude
+            longitude: root.longitude
+            asset: root.asset
+            author: root.author
+            isLive: true
+            visible: !isNaN(root.latitude) && !isNaN(root.longitude)
+        }
+        MapItemView {
+            model: root.liveLocationModel
+            delegate: LocationMapItem {}
+        }
+        onCopyrightLinkActivated: {
+            Qt.openUrlExternally(link)
+        }
+    }
+
+    Button {
+        anchors.top: parent.top
+        anchors.right: parent.right
+
+        text: i18n("Close")
+        icon.name: "dialog-close"
+        display: AbstractButton.IconOnly
+
+        width: Kirigami.Units.gridUnit * 2
+        height: Kirigami.Units.gridUnit * 2
+
+        onClicked: root.destroy()
+    }
+}

src/qml/Component/InvitationView.qml

@@ -12,7 +12,7 @@ import org.kde.neochat 1.0
 Kirigami.PlaceholderMessage {
     id: root
 
-    required property var currentRoom
+    required property NeoChatRoom currentRoom
 
     text: i18n("Accept this invitation?")
     RowLayout {
@@ -32,4 +32,4 @@ Kirigami.PlaceholderMessage {
             }
         }
     }
-}
+}

src/qml/Component/LocationMapItem.qml

@@ -0,0 +1,58 @@
+// SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2023 Volker Krause <vkrause@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import QtLocation 5.15
+import QtPositioning 5.15
+
+import org.kde.kirigami 2.15 as Kirigami
+
+import org.kde.neochat 1.0
+
+/** Location marker for any of the shared location maps. */
+MapQuickItem {
+    id: root
+    required property real latitude
+    required property real longitude
+
+    required property string asset
+    required property var author
+
+    required property bool isLive
+
+    anchorPoint.x: sourceItem.width / 2
+    anchorPoint.y: sourceItem.height
+    coordinate: QtPositioning.coordinate(root.latitude, root.longitude)
+    autoFadeIn: false
+    sourceItem: Kirigami.Icon {
+        width: height
+        height: Kirigami.Units.iconSizes.huge
+        source: "gps"
+        isMask: true
+        color: root.isLive ? Kirigami.Theme.highlightColor : Kirigami.Theme.disabledTextColor
+
+        Kirigami.Icon {
+            anchors.centerIn: parent
+            anchors.verticalCenterOffset: -parent.height / 8
+            visible: root.asset === "m.pin"
+            width: height
+            height: parent.height / 3 + 1
+            source: "pin"
+            isMask: true
+            color: parent.color
+        }
+        Kirigami.Avatar {
+            anchors.centerIn: parent
+            anchors.verticalCenterOffset: -parent.height / 8
+            visible: root.asset === "m.self"
+            width: height
+            height: parent.height / 3 + 1
+            name: root.author.displayName
+            source: root.author.avatarSource
+            color: root.author.color
+        }
+    }
+}

src/qml/Component/LocationPage.qml

@@ -0,0 +1,56 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15 as QQC2
+import QtLocation 5.15
+import QtPositioning 5.15
+
+import org.kde.kirigami 2.20 as Kirigami
+import org.kde.neochat 1.0
+
+Kirigami.Page {
+    id: locationsPage
+
+    required property var room
+
+    title: i18nc("Locations on a map", "Locations")
+
+    padding: 0
+
+    Map {
+        id: map
+        anchors.fill: parent
+        plugin: OsmLocationPlugin.plugin
+
+        center: {
+            let c = LocationHelper.center(LocationHelper.unite(locationsModel.boundingBox, liveLocationsModel.boundingBox));
+            return QtPositioning.coordinate(c.y, c.x);
+        }
+        zoomLevel: LocationHelper.zoomToFit(LocationHelper.unite(locationsModel.boundingBox, liveLocationsModel.boundingBox), map.width, map.height)
+
+        MapItemView {
+            model: LocationsModel {
+                id: locationsModel
+                room: locationsPage.room
+            }
+            delegate: LocationMapItem {
+                isLive: true
+            }
+        }
+
+        MapItemView {
+            model: LiveLocationsModel {
+                id: liveLocationsModel
+                room: locationsPage.room
+            }
+            delegate: LocationMapItem {}
+        }
+
+        Kirigami.PlaceholderMessage {
+            text: i18n("There are no locations shared in this room.")
+            visible: map.mapItems.length === 0
+            anchors.centerIn: parent
+        }
+    }
+}

src/qml/Component/Login/Login.qml

@@ -29,9 +29,7 @@ LoginStep {
             Kirigami.FormData.label: i18n("Matrix ID:")
             placeholderText: "@user:matrix.org"
             onTextChanged: {
-                if (acceptableInput) {
-                    LoginHelper.matrixId = text
-                }
+                LoginHelper.matrixId = text
             }
 
             Component.onCompleted: {
@@ -41,15 +39,11 @@ LoginStep {
             Keys.onReturnPressed: {
                 login.action.trigger()
             }
-
-            validator: RegularExpressionValidator {
-                regularExpression: /^\@?[a-zA-Z0-9\._=\-/]+\:[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*(\:[0-9]+)?$/
-            }
         }
     }
 
     action: Kirigami.Action {
-        text: LoginHelper.testing && matrixIdField.acceptableInput ? (LoginHelper.isLoggedIn ? i18n("Already logged in") : i18n("Loading…")) : i18nc("@action:button", "Continue")
+        text: LoginHelper.isLoggedIn ? i18n("Already logged in") : (LoginHelper.testing && matrixIdField.acceptableInput) ?  i18n("Loading…") : i18nc("@action:button", "Continue")
         onTriggered: {
             if (LoginHelper.supportsSso && LoginHelper.supportsPassword) {
                 processed("qrc:/LoginMethod.qml");

src/qml/Component/QuickSwitcher.qml

@@ -89,7 +89,7 @@ QQC2.Dialog {
             delegate: Kirigami.BasicListItem {
                 id: roomListItem
 
-                required property var currentRoom
+                required property NeoChatRoom currentRoom
                 required property string displayName
                 required property int index
                 required property int notificationCount

src/qml/Component/Timeline/EventDelegate.qml

@@ -11,7 +11,9 @@ import org.kde.kirigami 2.15 as Kirigami
 import org.kde.neochat 1.0
 
 DelegateChooser {
+    id: root
     role: "delegateType"
+    property var room
 
     DelegateChoice {
         roleValue: MessageEventModel.State
@@ -77,6 +79,12 @@ DelegateChooser {
         roleValue: MessageEventModel.Location
         delegate: LocationDelegate {}
     }
+    DelegateChoice {
+        roleValue: MessageEventModel.LiveLocation
+        delegate: LiveLocationDelegate {
+            room: root.room
+        }
+    }
 
     DelegateChoice {
         roleValue: MessageEventModel.Other

src/qml/Component/Timeline/LiveLocationDelegate.qml

@@ -0,0 +1,66 @@
+// SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2023 Volker Krause <vkrause@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import QtLocation 5.15
+import QtPositioning 5.15
+
+import org.kde.kirigami 2.15 as Kirigami
+
+import org.kde.neochat 1.0
+
+/**
+ * @brief A timeline delegate for a location message.
+ *
+ * @inherit TimelineContainer
+ */
+TimelineContainer {
+    id: root
+
+    property alias room: liveLocationModel.room
+
+    ColumnLayout {
+        Layout.maximumWidth: root.contentMaxWidth
+        Layout.preferredWidth: root.contentMaxWidth
+        LiveLocationsModel {
+            id: liveLocationModel
+            eventId: root.eventId
+        }
+        Map {
+            id: map
+            Layout.fillWidth: true
+            Layout.preferredHeight: root.contentMaxWidth / 16 * 9
+
+            center: QtPositioning.coordinate(liveLocationModel.boundingBox.y, liveLocationModel.boundingBox.x)
+            zoomLevel: 15
+
+            plugin: OsmLocationPlugin.plugin
+            onCopyrightLinkActivated: Qt.openUrlExternally(link)
+
+            MapItemView {
+                model: liveLocationModel
+                delegate: LocationMapItem {}
+            }
+
+            TapHandler {
+                acceptedButtons: Qt.LeftButton
+                onTapped: {
+                    let map = fullScreenMap.createObject(parent, {liveLocationModel: liveLocationModel});
+                    map.open()
+                }
+                onLongPressed: openMessageContext("")
+            }
+            TapHandler {
+                acceptedButtons: Qt.RightButton
+                onTapped: openMessageContext("")
+            }
+        }
+        Component {
+            id: fullScreenMap
+            FullScreenMap {}
+        }
+    }
+}

src/qml/Component/Timeline/LocationDelegate.qml

@@ -47,61 +47,24 @@ TimelineContainer {
 
             center: QtPositioning.coordinate(root.latitude, root.longitude)
             zoomLevel: 15
-            plugin: Plugin {
-                name: "osm"
-                PluginParameter {
-                    name: "osm.useragent"
-                    value: Application.name + "/" + Application.version + " (kde-devel@kde.org)"
-                }
-                PluginParameter {
-                    name: "osm.mapping.providersrepository.address"
-                    value: "https://autoconfig.kde.org/qtlocation/"
-                }
-            }
 
+            plugin: OsmLocationPlugin.plugin
             onCopyrightLinkActivated: Qt.openUrlExternally(link)
 
-
-            MapQuickItem {
-                id: point
-
-                anchorPoint.x: sourceItem.width / 2
-                anchorPoint.y: sourceItem.height
-                coordinate: QtPositioning.coordinate(rot.latitude, root.longitude)
-                autoFadeIn: false
-
-                sourceItem: Kirigami.Icon {
-                    width: height
-                    height: Kirigami.Units.iconSizes.huge
-                    source: "gps"
-                    isMask: true
-                    color: Kirigami.Theme.highlightColor
-
-                    Kirigami.Icon {
-                        anchors.centerIn: parent
-                        anchors.verticalCenterOffset: -parent.height / 8
-                        visible: model.asset === "m.pin"
-                        width: height
-                        height: parent.height / 3 + 1
-                        source: "pin"
-                        isMask: true
-                        color: Kirigami.Theme.highlightColor
-                    }
-                    Kirigami.Avatar {
-                        anchors.centerIn: parent
-                        anchors.verticalCenterOffset: -parent.height / 8
-                        visible: root.asset === "m.self"
-                        width: height
-                        height: parent.height / 3 + 1
-                        name: root.author.displayName
-                        source: root.author.avatarSource
-                        color: root.author.color
-                    }
-                }
+            LocationMapItem {
+                latitude: root.latitude
+                longitude: root.longitude
+                asset: root.asset
+                author: root.author
+                isLive: true
             }
 
             TapHandler {
                 acceptedButtons: Qt.LeftButton
+                onTapped: {
+                    let map = fullScreenMap.createObject(parent, {latitude: root.latitude, longitude: root.longitude, asset: root.asset, author: root.author});
+                    map.open()
+                }
                 onLongPressed: openMessageContext("")
             }
             TapHandler {
@@ -109,5 +72,9 @@ TimelineContainer {
                 onTapped: openMessageContext("")
             }
         }
+        Component {
+            id: fullScreenMap
+            FullScreenMap { }
+        }
     }
 }

src/qml/Component/Timeline/MessageEditComponent.qml

@@ -11,7 +11,7 @@ import org.kde.neochat 1.0
 QQC2.TextArea {
     id: root
 
-    property var room
+    property NeoChatRoom room
     onRoomChanged: room.chatBoxEditIdChanged.connect(updateEditText)
 
     property string messageId

src/qml/Component/Timeline/OsmLocationPlugin.qml

@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+pragma Singleton
+
+import QtQuick 2.15
+import QtLocation 5.15
+
+QtObject {
+    property var plugin: Plugin {
+        name: "osm"
+        PluginParameter {
+            name: "osm.useragent"
+            value: Application.name + "/" + Application.version + " (kde-devel@kde.org)"
+        }
+        PluginParameter {
+            name: "osm.mapping.providersrepository.address"
+            value: "https://autoconfig.kde.org/qtlocation/"
+        }
+    }
+}

src/qml/Component/Timeline/StateDelegate.qml

@@ -14,11 +14,7 @@ QQC2.Control {
 
     readonly property bool sectionVisible: model.showSection
 
-    // extraWidth defines how the delegate can grow after the listView gets very wide
-    readonly property int extraWidth: parent ? (parent.width >= Kirigami.Units.gridUnit * 46 ? Math.min((parent.width - Kirigami.Units.gridUnit * 46), Kirigami.Units.gridUnit * 20) : 0) : 0
-    readonly property int delegateMaxWidth: parent ? (Config.compactLayout ? parent.width: Math.min(parent.width, Kirigami.Units.gridUnit * 40 + extraWidth)) : 0
-
-    width: delegateMaxWidth
+    width: stateDelegateSizeHelper.currentWidth
 
     state: Config.compactLayout ? "alignLeft" : "alignCenter"
     // Align left when in compact mode and center when using bubbles
@@ -170,4 +166,15 @@ QQC2.Control {
             excessAvatars: excessReadMarkers
         }
     }
+
+    DelegateSizeHelper {
+        id: stateDelegateSizeHelper
+        startBreakpoint: Kirigami.Units.gridUnit * 46
+        endBreakpoint: Kirigami.Units.gridUnit * 66
+        startPercentWidth: 100
+        endPercentWidth: Config.compactLayout ? 100 : 85
+        maxWidth: Config.compactLayout ? -1 : Kirigami.Units.gridUnit * 60
+
+        parentWidth: stateDelegate.parent ? stateDelegate.parent.width : 0
+    }
 }

src/qml/Component/Timeline/TimelineContainer.qml

@@ -290,15 +290,9 @@ ColumnLayout {
         onTriggered: isTemporaryHighlighted = false
     }
 
-    // TODO: make these private
-    // The bubble and delegate widths are allowed to grow once the ListView gets beyond a certain size
-    // extraWidth defines this as the excess after a certain ListView width, capped to a max value
-    readonly property int extraWidth: parent ? (parent.width >= Kirigami.Units.gridUnit * 46 ? Math.min((parent.width - Kirigami.Units.gridUnit * 46), Kirigami.Units.gridUnit * 20) : 0) : 0
-    readonly property int bubbleMaxWidth: Kirigami.Units.gridUnit * 20 + extraWidth * 0.5
-    readonly property int delegateWidth: parent ? (Config.compactLayout ? parent.width - Kirigami.Units.smallSpacing - (ListView.view.width >= Kirigami.Units.gridUnit * 20 ? Kirigami.Units.gridUnit * 2 + Kirigami.Units.largeSpacing : 0) : Math.min(parent.width, Kirigami.Units.gridUnit * 40 + extraWidth)) : 0
-    readonly property int contentMaxWidth: Config.compactLayout ? width - (Config.showAvatarInTimeline ? Kirigami.Units.gridUnit * 2 : 0) - Kirigami.Units.largeSpacing * 4 : Math.min(width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 6, bubbleMaxWidth)
+    readonly property int contentMaxWidth: bubbleSizeHelper.currentWidth
 
-    width: delegateWidth
+    width: parent ? timelineDelegateSizeHelper.currentWidth : 0
     spacing: Kirigami.Units.smallSpacing
 
     state: Config.compactLayout ? "alignLeft" : "alignCenter"
@@ -348,7 +342,7 @@ ColumnLayout {
 
         Component.onCompleted: {
             if (root.isReply && root.reply === undefined) {
-                messageEventModel.loadReply(sortedMessageEventModel.mapToSource(collapseStateProxyModel.mapToSource(collapseStateProxyModel.index(root.index, 0))))
+                currentRoom.loadReply(root.eventId, root.replyId)
             }
         }
 
@@ -567,7 +561,7 @@ ColumnLayout {
     }
 
     ReactionDelegate {
-        Layout.maximumWidth: delegateWidth - Kirigami.Units.largeSpacing * 2
+        Layout.maximumWidth: root.width - Kirigami.Units.largeSpacing * 2
         Layout.alignment: showUserMessageOnRight ? Qt.AlignRight : Qt.AlignLeft
         Layout.leftMargin: showUserMessageOnRight ? 0 : bubble.x + bubble.anchors.leftMargin
         Layout.rightMargin: showUserMessageOnRight ? Kirigami.Units.largeSpacing : 0
@@ -619,6 +613,28 @@ ColumnLayout {
     }
 
     function setHoverActionsToDelegate() {
-        ListView.view.setHoverActionsToDelegate(root)
+        if (ListView.view.setHoverActionsToDelegate) {
+            ListView.view.setHoverActionsToDelegate(root)
+        }
+    }
+
+    DelegateSizeHelper {
+        id: timelineDelegateSizeHelper
+        startBreakpoint: Kirigami.Units.gridUnit * 46
+        endBreakpoint: Kirigami.Units.gridUnit * 66
+        startPercentWidth: 100
+        endPercentWidth: Config.compactLayout ? 100 : 85
+        maxWidth: Config.compactLayout ? -1 : Kirigami.Units.gridUnit * 60
+
+        parentWidth: root.parent ? root.parent.width - (Config.compactLayout && root.ListView.view.width >= Kirigami.Units.gridUnit * 20 ? Kirigami.Units.gridUnit * 2 + Kirigami.Units.largeSpacing : 0) : 0
+    }
+    DelegateSizeHelper {
+        id: bubbleSizeHelper
+        startBreakpoint: Kirigami.Units.gridUnit * 25
+        endBreakpoint: Kirigami.Units.gridUnit * 40
+        startPercentWidth: Config.compactLayout ? 100 : 90
+        endPercentWidth: Config.compactLayout ? 100 : 60
+
+        parentWidth: mainContainer.availableWidth - (Config.showAvatarInTimeline ? avatar.width + bubble.anchors.leftMargin : 0)
     }
 }

src/qml/Component/TimelineView.qml

@@ -15,7 +15,7 @@ import org.kde.neochat 1.0
 
 QQC2.ScrollView {
     id: root
-    required property var currentRoom
+    required property NeoChatRoom currentRoom
     readonly property bool isLoaded: root.width * root.height > 10
     readonly property bool atYEnd: messageListView.atYEnd
 
@@ -173,6 +173,7 @@ QQC2.ScrollView {
         }
 
         delegate: EventDelegate {
+            room: root.currentRoom
         }
 
         QQC2.RoundButton {