Web Shortcuts: kcmshell5 does not exist anymore on Plasma 6

This is hardcoded, but it's probably a safe assumption to think most
people running modern NeoChat are using Plasma 6 anyway.

(cherry picked from commit aa116a35f5)

CMakeLists.txt

@@ -8,8 +8,8 @@ cmake_minimum_required(VERSION 3.16)
 
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "24")
-set(RELEASE_SERVICE_VERSION_MINOR "07")
-set(RELEASE_SERVICE_VERSION_MICRO "70")
+set(RELEASE_SERVICE_VERSION_MINOR "08")
+set(RELEASE_SERVICE_VERSION_MICRO "1")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
@@ -38,6 +38,7 @@ include(KDEGitCommitHooks)
 include(ECMCheckOutboundLicense)
 include(ECMQtDeclareLoggingCategory)
 include(ECMAddAndroidApk)
+include(ECMQmlModule)
 if (NOT ANDROID)
     include(KDEClangFormat)
 endif()
@@ -59,7 +60,6 @@ set_package_properties(Qt6 PROPERTIES
     PURPOSE "Basic application components"
 )
 
-qt_policy(SET QTP0001 NEW)
 if (QT_KNOWN_POLICY_QTP0004)
 qt_policy(SET QTP0004 NEW)
 endif ()

autotests/eventhandlertest.cpp

@@ -36,8 +36,6 @@ private Q_SLOTS:
 
     void eventId();
     void nullEventId();
-    void author();
-    void nullAuthor();
     void authorDisplayName();
     void nullAuthorDisplayName();
     void singleLineSidplayName();
@@ -75,8 +73,6 @@ private Q_SLOTS:
     void nullThread();
     void location();
     void nullLocation();
-    void readMarkers();
-    void nullReadMarkers();
 };
 
 void EventHandlerTest::initTestCase()
@@ -98,32 +94,6 @@ void EventHandlerTest::nullEventId()
     QCOMPARE(noEventHandler.getId(), QString());
 }
 
-void EventHandlerTest::author()
-{
-    auto event = room->messageEvents().at(0).get();
-    auto author = room->member(event->senderId());
-    EventHandler eventHandler(room, event);
-
-    auto eventHandlerAuthor = eventHandler.getAuthor();
-
-    QCOMPARE(eventHandlerAuthor.isLocalMember(), author.id() == room->localMember().id());
-    QCOMPARE(eventHandlerAuthor.id(), author.id());
-    QCOMPARE(eventHandlerAuthor.displayName(), author.displayName());
-    QCOMPARE(eventHandlerAuthor.avatarUrl(), author.avatarUrl());
-    QCOMPARE(eventHandlerAuthor.avatarMediaId(), author.avatarMediaId());
-    QCOMPARE(eventHandlerAuthor.color(), author.color());
-}
-
-void EventHandlerTest::nullAuthor()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getAuthor called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getAuthor(), RoomMember());
-
-    EventHandler noEventHandler(room, nullptr);
-    QTest::ignoreMessage(QtWarningMsg, "getAuthor called with m_event set to nullptr. Returning empty user.");
-    QCOMPARE(noEventHandler.getAuthor(), RoomMember());
-}
-
 void EventHandlerTest::authorDisplayName()
 {
     EventHandler eventHandler(room, room->messageEvents().at(1).get());
@@ -193,6 +163,7 @@ void EventHandlerTest::timeString()
              QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().time(), QLocale::LongFormat));
     QCOMPARE(eventHandler.getTimeString(true, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().date(), QLocale::LongFormat));
+    QCOMPARE(eventHandler.getTimeString(QStringLiteral("hh:mm")), QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toString(QStringLiteral("hh:mm")));
 }
 
 void EventHandlerTest::nullTimeString()
@@ -521,59 +492,5 @@ void EventHandlerTest::nullLocation()
     QCOMPARE(emptyHandler.getLocationAssetType(), QString());
 }
 
-void EventHandlerTest::readMarkers()
-{
-    EventHandler eventHandler(room, room->messageEvents().at(0).get());
-    QCOMPARE(eventHandler.hasReadMarkers(), true);
-
-    auto readMarkers = eventHandler.getReadMarkers();
-
-    QCOMPARE(readMarkers.size(), 1);
-    QCOMPARE(readMarkers[0].id(), QStringLiteral("@alice:example.org"));
-
-    QCOMPARE(eventHandler.getNumberExcessReadMarkers(), QString());
-    QCOMPARE(eventHandler.getReadMarkersString(), QStringLiteral("1 user: Alice Margatroid"));
-
-    EventHandler eventHandler2(room, room->messageEvents().at(2).get());
-    QCOMPARE(eventHandler2.hasReadMarkers(), true);
-
-    readMarkers = eventHandler2.getReadMarkers();
-
-    QCOMPARE(readMarkers.size(), 5);
-
-    QCOMPARE(eventHandler2.getNumberExcessReadMarkers(), QStringLiteral("+ 1"));
-    // There are no guarantees on the order of the users it will be different every time so don't match the whole string.
-    QCOMPARE(eventHandler2.getReadMarkersString().startsWith(QStringLiteral("6 users:")), true);
-}
-
-void EventHandlerTest::nullReadMarkers()
-{
-    QTest::ignoreMessage(QtWarningMsg, "hasReadMarkers called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.hasReadMarkers(), false);
-
-    QTest::ignoreMessage(QtWarningMsg, "getReadMarkers called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReadMarkers(), QList<Quotient::RoomMember>());
-
-    QTest::ignoreMessage(QtWarningMsg, "getNumberExcessReadMarkers called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getNumberExcessReadMarkers(), QString());
-
-    QTest::ignoreMessage(QtWarningMsg, "getReadMarkersString called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReadMarkersString(), QString());
-
-    EventHandler noEventHandler(room, nullptr);
-
-    QTest::ignoreMessage(QtWarningMsg, "hasReadMarkers called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.hasReadMarkers(), false);
-
-    QTest::ignoreMessage(QtWarningMsg, "getReadMarkers called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReadMarkers(), QList<Quotient::RoomMember>());
-
-    QTest::ignoreMessage(QtWarningMsg, "getNumberExcessReadMarkers called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getNumberExcessReadMarkers(), QString());
-
-    QTest::ignoreMessage(QtWarningMsg, "getReadMarkersString called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReadMarkersString(), QString());
-}
-
 QTEST_MAIN(EventHandlerTest)
 #include "eventhandlertest.moc"

org.kde.neochat.appdata.xml

@@ -25,6 +25,7 @@
   <name xml:lang="fi">NeoChat</name>
   <name xml:lang="fr">NeoChat</name>
   <name xml:lang="gl">NeoChat</name>
+  <name xml:lang="he">NeoChat</name>
   <name xml:lang="hu">NeoChat</name>
   <name xml:lang="ia">Neochat</name>
   <name xml:lang="id">NeoChat</name>
@@ -61,6 +62,7 @@
   <summary xml:lang="fi">Keskustelu ystäviesi kanssa Matrixissa</summary>
   <summary xml:lang="fr">Discuter avec vos ami(e)s sur le réseau Matrix</summary>
   <summary xml:lang="gl">Charle coas súas amizades en Matrix.</summary>
+  <summary xml:lang="he">התכתבות עם החברים שלך ב־matrix</summary>
   <summary xml:lang="hu">Csevegjen barátaival a matrixon</summary>
   <summary xml:lang="ia">Starta Conversation con tu amicos sur matrix</summary>
   <summary xml:lang="it">Conversa con i tuoi contatti su matrix</summary>
@@ -89,12 +91,15 @@
     <p xml:lang="eu">NeoChat, Matrix sarearen abantaila guztiei probetsua ateratzeko aukera ematen dizun berriketa aplikaizo bat da. Zure familiari, kideei eta lagunei testu mezuak, bideoak eta audio fitxategiak era seguruan bidaltzeko aukera ematen dizu.</p>
     <p xml:lang="fi">NeoChat on keskustelusovellus, jolla Matrix-verkosta saa täyden hyödyn. Se tarjoaa salatun kanavan lähettää perheelle, työkavereille ja ystäville tekstiviestejä sekä video- ja äänitiedostoja.</p>
     <p xml:lang="fr">NeoChat est une application de discussions vous permettant de profiter pleinement du réseau Matrix. Elle vous offre un moyen sécurisé d'envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos ami(e)s.</p>
+    <p xml:lang="gl">NeoChat é unha aplicación de conversa que lle permite usar todas as funcionalidades da rede Matrix. Fornece unha forma segura de enviar mensaxes de texto e ficheiros de vídeo e son a familiares, amizades ou no traballo.</p>
+    <p xml:lang="he">NeoChat הוא יישום התכתבות שמאפשר לך לנצל את רשת Matrix במלואה. הוא מספק דרך מאובטחת לשליחת הודעות כתובות, סרטונים וקובצי שמע למשפחה, לעמיתים לעבודה ולחברים.</p>
     <p xml:lang="hu">A NeoChat egy olyan csevegőalkalmazás, amellyel teljes mértékben kihasználhatja a Matrix hálózatot. Biztonságos módot biztosít szöveges üzenetek, videók és hangfájlok küldéséhez családtagjainak, kollégáinak és barátainak.</p>
     <p xml:lang="ia">NeoChat es un app de conversation que te permitte prender avantage plen del rete Matrix. Il te forni un modo secur de inviar messages de texto, videos e files audio a tui familia, collegas e amicos.</p>
     <p xml:lang="it">NeoChat è un'applicazione di chat che ti consente di sfruttare appieno la rete Matrix. Ti fornisce un modo sicuro per inviare messaggi di testo, video e file audio a familiari, colleghi e amici.</p>
     <p xml:lang="ka">NeoChat ჩატის აპია, რომელიც საშუალება გაძლევთ, Matrix-ის ქსელის საშუალებები ბოლომდე გამოიყენოთ. ის გაძლევთ უსაფრთხო გზას, გააგზავნოთ ტექსტური შეტყობინებები, ვიდეოებ და აუდიოფაილები თქვენს ოჯახთან, კოლეგებთან და მეგობრებთან.</p>
     <p xml:lang="lv">„NeoChat“ ir tērzēšanas programma, kas ļauj pilnvērtīgi izmantot „Matrix“ tīklu. Tā sniedz drošu veidu teksta ziņu, video un audio sūtīšanai ģimenes locekļiem, kolēģiem un draugiem.</p>
     <p xml:lang="nl">NeoChat is een chat-toepassing die u het volledige voordeel van het Matrix-netwerk laat genieten. Het levert u op een veilige manier tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden te verzenden.</p>
+    <p xml:lang="nn">NeoChat er ein prateapp som lèt deg bruka all funksjonalitet i Matrix-nettverket. Du kan utveksla tekst, lyd og videoar med vennar, familie og kollegaar på ein trygg måte.</p>
     <p xml:lang="pl">NoeChat to aplikacja do rozmów, która umożliwia wykorzystanie wszystkich możliwości Matriksa. Umożliwia wysyłanie wiadomości tekstowych, filmów i dźwięków w bezpieczny sposób do twojej rodziny, kolegów i przyjaciół.</p>
     <p xml:lang="sl">NeoChat je aplikacija za klepet, ki vam omogoča, da v celoti izkoristite omrežje Matrix. Zagotavlja vam varen način za pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, sodelavcem in prijateljem.</p>
     <p xml:lang="sv">NeoChat är ett chattprogram som låter dig dra full nytta av Matrix-nätverket. Det ger dig ett säkert sätt att skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner.</p>
@@ -113,6 +118,7 @@
     <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="he">NeoChat מתיימר להיות יישום עתיר יכולות לפי מפרט Matrix. כיוון שזה ייעודו, כל מה שבמפרט היציב עם חריגות משמעותיות כגון VoIP, שרשורים ועוד מגוון היבטים של הצפנה מקצה לקצה נתמכים גם הם. יש מספר השמטות קטן עקב העובדה שהמפרט של Matrix ממשיך להתפתח אך המטרה היא להמשיך לספק תמיכה בסופו של דבר לכל המפרט.</p>
     <p xml:lang="hu">A NeoChat célja, hogy a Matrix specifikációnak megfelelő teljes funkcionalitású alkalmazás legyen. Mint ilyen, a jelenlegi stabil specifikáció támogatott a VoIP, a szálak és a végpontok közötti titkosítás egyes elemeinek kivételével. Van még néhány kisebb hiányosság annak köszönhetően, hogy a Matrix specifikáció folyamatosan fejlődik, de végső cél a teljes specifikáció megvalósítása.</p>
     <p xml:lang="ia">NeoChat aspira a esser un application plenmente 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>
@@ -141,6 +147,7 @@
     <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="he">מטבע הדברים, הפיתוח של NeoChat תומך במגוון יכולות מפוקפקות כתלות בהתפתחות המפרט הטכני של Matrix. היכולות האלה הן:</p>
     <p xml:lang="hu">A Matrix specifikáció fejlesztésének jellegéből adódóan a NeoChat számos instabil funkciót is támogat. Jelenleg a következőket:</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>
@@ -171,6 +178,7 @@
       <li xml:lang="fi">Kyselyt – MSC3381</li>
       <li xml:lang="fr">Sondages - MSC3381</li>
       <li xml:lang="gl">Enquisas — MSC3381</li>
+      <li xml:lang="he">סקרים - MSC3381</li>
       <li xml:lang="hu">Szavazások - MSC3381</li>
       <li xml:lang="ia">Inquestas - MSC3381</li>
       <li xml:lang="it">Sondaggi - MSC3381</li>
@@ -199,6 +207,7 @@
       <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="he">חבילות מדבקות - MSC2545</li>
       <li xml:lang="hu">Matricacsomagok - MSC2545</li>
       <li xml:lang="ia">Etiquetta gummate (sticker) -MSC2545</li>
       <li xml:lang="it">Pacchetti di adesivi - MSC2545</li>
@@ -228,6 +237,7 @@
       <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="he">אירועי מקום - MSC3488</li>
       <li xml:lang="hu">Események helyadatai - MSC3488</li>
       <li xml:lang="ia">Eventos de Location - MSC3488</li>
       <li xml:lang="it">Località eventi - MSC3488</li>
@@ -291,6 +301,7 @@
       <caption xml:lang="fi">Päänäkymä, jossa huoneluettelo, keskustelu ja huoneen tiedot</caption>
       <caption xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</caption>
       <caption xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</caption>
+      <caption xml:lang="he">תצוגה ראשית עם רשימת חדרים, צ׳אט ופרטי חדר</caption>
       <caption xml:lang="hu">A fő nézet a szobalistával, csevegéssel és szobainformációkkal</caption>
       <caption xml:lang="ia">Vista principal con lista de sala, chat e information de sala</caption>
       <caption xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</caption>
@@ -322,12 +333,15 @@
       <caption xml:lang="eu">Ezagutu komunitate berriak Matrixeko Tokiak erabiliz</caption>
       <caption xml:lang="fi">Löydä uusia yhteisöjä Matrix Spacesillä</caption>
       <caption xml:lang="fr">Découvrez de nouvelles communautés avec les espaces sous Matrix</caption>
+      <caption xml:lang="gl">Descubra novas comunidades dos espazos de Matrix.</caption>
+      <caption xml:lang="he">אפשר להיחשף לקהילות חדשות דרך Matrix Spaces</caption>
       <caption xml:lang="hu">Fedezzen fel új közösségeket a Matrix Terek segítségével</caption>
       <caption xml:lang="ia">Discoperi nove communitate con Matrix Spaces (Spatios de Matrix)</caption>
       <caption xml:lang="it">Scopri nuove comunità con Matrix Spaces</caption>
       <caption xml:lang="ka">აღმოაჩინეთ ახალი საზოგადოებები Matrix Spaces-თან ერთად</caption>
       <caption xml:lang="lv">Atklājiet jaunas kopienas ar „Matrix“ telpām</caption>
       <caption xml:lang="nl">Ontdek nieuwe gemeenschappen met Matrix-ruimten</caption>
+      <caption xml:lang="nn">Oppdag nye fellesskap med Matrix Spaces</caption>
       <caption xml:lang="pl">Odkrywaj nowe społeczności w Przestrzeniach Matriksa</caption>
       <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
       <caption xml:lang="sv">Upptäck nya gemenskaper med Matrix Spaces</caption>
@@ -356,6 +370,7 @@
       <caption xml:lang="fi">Päänäkymä, jossa huoneluettelo, keskustelu ja huoneen tiedot</caption>
       <caption xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</caption>
       <caption xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</caption>
+      <caption xml:lang="he">תצוגה ראשית עם רשימת חדרים, צ׳אט ופרטי חדר</caption>
       <caption xml:lang="hu">A fő nézet a szobalistával, csevegéssel és szobainformációkkal</caption>
       <caption xml:lang="ia">Vista principal con lista de sala, chat e information de sala</caption>
       <caption xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</caption>
@@ -389,6 +404,7 @@
       <caption xml:lang="fi">Kirjautumisnäkymä</caption>
       <caption xml:lang="fr">Écran de connexion</caption>
       <caption xml:lang="gl">Pantalla de identificación.</caption>
+      <caption xml:lang="he">מסך כניסה</caption>
       <caption xml:lang="hu">Bejelentkező képernyő</caption>
       <caption xml:lang="ia">Schermo de accesso</caption>
       <caption xml:lang="it">Schermata di accesso</caption>
@@ -413,6 +429,8 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="24.08.1" date="2024-09-12"/>
+    <release version="24.08.0" date="2024-08-22"/>
     <release version="24.05.2" date="2024-07-04"/>
     <release version="24.05.1" date="2024-06-13"/>
     <release version="24.05.0" date="2024-05-23"/>

org.kde.neochat.desktop

@@ -18,6 +18,7 @@ Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[gl]=NeoChat
+Name[he]=NeoChat
 Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
@@ -59,6 +60,7 @@ GenericName[eu]=Matrix bezeroa
 GenericName[fi]=Matrix-asiakas
 GenericName[fr]=Client « Matrix »
 GenericName[gl]=Cliente de Matrix
+GenericName[he]=לקוח Matrix
 GenericName[hu]=Matrix kliens
 GenericName[ia]=Cliente de Matrice
 GenericName[id]=Klien Matrix
@@ -99,6 +101,7 @@ 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[he]=לקוח לפרוטוקול Matrix
 Comment[hu]=Kliens a Matrix protokollhoz
 Comment[ia]=Cliente per le protocollo de Matrix
 Comment[id]=Klien untuk protokol Matrix

src/CMakeLists.txt

@@ -134,6 +134,8 @@ add_library(neochat STATIC
     jobs/neochatdeletedevicejob.h
     jobs/neochatchangepasswordjob.cpp
     jobs/neochatchangepasswordjob.h
+    jobs/neochatgetcommonroomsjob.cpp
+    jobs/neochatgetcommonroomsjob.h
     mediasizehelper.cpp
     mediasizehelper.h
     eventhandler.cpp
@@ -186,6 +188,10 @@ add_library(neochat STATIC
     models/permissionsmodel.h
     threepidbindhelper.cpp
     threepidbindhelper.h
+    models/readmarkermodel.cpp
+    models/readmarkermodel.h
+    neochatroommember.cpp
+    neochatroommember.h
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
@@ -282,7 +288,6 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/ConsentDialog.qml
         qml/AskDirectChatConfirmation.qml
         qml/HoverLinkIndicator.qml
-        qml/AccountDialog.qml
     DEPENDENCIES
         QtCore
         QtQuick

src/controller.cpp

@@ -64,7 +64,11 @@ Controller::Controller(QObject *parent)
         });
     } else {
         auto c = new NeoChatConnection(this);
+#if Quotient_VERSION_MINOR > 8
+        c->assumeIdentity(QStringLiteral("@user:localhost:1234"), QStringLiteral("device_1234"), QStringLiteral("token_1234"));
+#else
         c->assumeIdentity(QStringLiteral("@user:localhost:1234"), QStringLiteral("token_1234"));
+#endif
         connect(c, &Connection::connected, this, [c, this]() {
             m_accountRegistry.add(c);
             c->syncLoop();
@@ -202,15 +206,33 @@ void Controller::invokeLogin()
                 m_connectionsLoading[accountId] = connection;
                 connect(connection, &NeoChatConnection::connected, this, [this, connection, accountId] {
                     connection->loadState();
-                    addConnection(connection);
-                    m_accountsLoading.removeAll(connection->userId());
-                    m_connectionsLoading.remove(accountId);
-                    Q_EMIT accountsLoadingChanged();
+                    if (connection->allRooms().size() == 0 || connection->allRooms()[0]->currentState().get<RoomCreateEvent>()) {
+                        addConnection(connection);
+                        m_accountsLoading.removeAll(connection->userId());
+                        m_connectionsLoading.remove(accountId);
+                        Q_EMIT accountsLoadingChanged();
+                    } else {
+                        connect(
+                            connection->allRooms()[0],
+                            &Room::baseStateLoaded,
+                            this,
+                            [this, connection, accountId]() {
+                                addConnection(connection);
+                                m_accountsLoading.removeAll(connection->userId());
+                                m_connectionsLoading.remove(accountId);
+                                Q_EMIT accountsLoadingChanged();
+                            },
+                            Qt::SingleShotConnection);
+                    }
                 });
                 connect(connection, &NeoChatConnection::networkError, this, [this](const QString &error, const QString &, int, int) {
                     Q_EMIT errorOccured(i18n("Network Error: %1", error), {});
                 });
+#if Quotient_VERSION_MINOR > 8
+                connection->assumeIdentity(account.userId(), account.deviceId(), accessToken);
+#else
                 connection->assumeIdentity(account.userId(), accessToken);
+#endif
             });
         }
     }
@@ -251,23 +273,19 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const QStrin
     return job;
 }
 
-bool Controller::saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken)
+void Controller::saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken)
 {
     qDebug() << "Save the access token to the keychain for " << userId;
-    QKeychain::WritePasswordJob job(qAppName());
-    job.setAutoDelete(false);
-    job.setKey(userId);
-    job.setBinaryData(accessToken);
-    QEventLoop loop;
-    QKeychain::WritePasswordJob::connect(&job, &QKeychain::Job::finished, &loop, &QEventLoop::quit);
-    job.start();
-    loop.exec();
-
-    if (job.error()) {
-        qWarning() << "Could not save access token to the keychain: " << qPrintable(job.errorString());
-        return false;
-    }
-    return true;
+    auto job = new QKeychain::WritePasswordJob(qAppName());
+    job->setAutoDelete(true);
+    job->setKey(userId);
+    job->setBinaryData(accessToken);
+    connect(job, &QKeychain::WritePasswordJob::finished, this, [job]() {
+        if (job->error()) {
+            qWarning() << "Could not save access token to the keychain: " << qPrintable(job->errorString());
+        }
+    });
+    job->start();
 }
 
 bool Controller::supportSystemTray() const

src/controller.h

@@ -86,7 +86,7 @@ public:
     /**
      * @brief Save an access token to the keychain for the given account.
      */
-    bool saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken);
+    void saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken);
 
     [[nodiscard]] bool supportSystemTray() const;
 

src/eventhandler.cpp

@@ -61,20 +61,6 @@ MessageComponentType::Type EventHandler::messageComponentType() const
     return MessageComponentType::typeForEvent(*m_event);
 }
 
-Quotient::RoomMember EventHandler::getAuthor(bool isPending) const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getAuthor called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getAuthor called with m_event set to nullptr. Returning empty user.";
-        return {};
-    }
-
-    return isPending ? m_room->localMember() : m_room->member(m_event->senderId());
-}
-
 QString EventHandler::getAuthorDisplayName(bool isPending) const
 {
     if (m_room == nullptr) {
@@ -157,6 +143,11 @@ QString EventHandler::getTimeString(bool relative, QLocale::FormatType format, b
     return {};
 }
 
+QString EventHandler::getTimeString(const QString &format, bool isPending, const QDateTime &lastUpdated)
+{
+    return getTime(isPending, lastUpdated).toLocalTime().toString(format);
+}
+
 bool EventHandler::isHighlighted()
 {
     if (m_room == nullptr) {
@@ -241,17 +232,19 @@ Qt::TextFormat EventHandler::messageBodyInputFormat(const Quotient::RoomMessageE
 
 QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
 {
+    QString body;
+
     if (event.hasFileContent()) {
-        auto fileCaption = event.content()->fileInfo()->originalName;
-        if (fileCaption.isEmpty()) {
-            fileCaption = event.plainBody();
-        } else if (event.content()->fileInfo()->originalName != event.plainBody()) {
-            fileCaption = event.plainBody() + " | "_ls + fileCaption;
+        // if filename is given or body is equal to filename,
+        // then body is a caption
+        QString filename = event.content()->fileInfo()->originalName;
+        QString body = event.plainBody();
+        if (filename.isEmpty() || filename == body) {
+            return QString();
         }
-        return fileCaption;
+        return body;
     }
 
-    QString body;
     if (event.hasTextContent() && event.content()) {
         body = static_cast<const EventContent::TextContent *>(event.content())->body;
     } else {
@@ -660,23 +653,30 @@ QVariantMap EventHandler::getMediaInfoForEvent(const Quotient::RoomEvent *event)
     QString eventId = event->id();
 
     // Get the file info for the event.
-    const EventContent::FileInfo *fileInfo;
-    bool isSticker = false;
     if (event->is<RoomMessageEvent>()) {
         auto roomMessageEvent = eventCast<const RoomMessageEvent>(event);
         if (!roomMessageEvent->hasFileContent()) {
             return {};
         }
+
+        const EventContent::FileInfo *fileInfo;
         fileInfo = roomMessageEvent->content()->fileInfo();
+        QVariantMap mediaInfo = getMediaInfoFromFileInfo(fileInfo, eventId, false, false);
+        // if filename isn't specifically given, it is in body
+        // https://spec.matrix.org/latest/client-server-api/#mfile
+        mediaInfo["filename"_ls] = (fileInfo->originalName.isEmpty()) ? roomMessageEvent->plainBody() : fileInfo->originalName;
+
+        return mediaInfo;
     } else if (event->is<StickerEvent>()) {
+        const EventContent::FileInfo *fileInfo;
+
         auto stickerEvent = eventCast<const StickerEvent>(event);
         fileInfo = &stickerEvent->image();
-        isSticker = true;
+
+        return getMediaInfoFromFileInfo(fileInfo, eventId, false, true);
     } else {
         return {};
     }
-
-    return getMediaInfoFromFileInfo(fileInfo, eventId, false, isSticker);
 }
 
 QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo *fileInfo, const QString &eventId, bool isThumbnail, bool isSticker) const
@@ -952,102 +952,4 @@ QString EventHandler::getLocationAssetType() const
     return assetType;
 }
 
-bool EventHandler::hasReadMarkers() const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "hasReadMarkers called with m_room set to nullptr.";
-        return false;
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "hasReadMarkers called with m_event set to nullptr.";
-        return false;
-    }
-
-    auto userIds = m_room->userIdsAtEvent(m_event->id());
-    userIds.remove(m_room->localMember().id());
-    return userIds.size() > 0;
-}
-
-QList<Quotient::RoomMember> EventHandler::getReadMarkers(int maxMarkers) const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReadMarkers called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReadMarkers called with m_event set to nullptr.";
-        return {};
-    }
-
-    auto userIds_temp = m_room->userIdsAtEvent(m_event->id());
-    userIds_temp.remove(m_room->localMember().id());
-
-    auto userIds = userIds_temp.values();
-    if (userIds.count() > maxMarkers) {
-        userIds = userIds.mid(0, maxMarkers);
-    }
-
-    QList<Quotient::RoomMember> users;
-    users.reserve(userIds.size());
-    for (const auto &userId : userIds) {
-        users += m_room->member(userId);
-    }
-
-    return users;
-}
-
-QString EventHandler::getNumberExcessReadMarkers(int maxMarkers) const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getNumberExcessReadMarkers called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getNumberExcessReadMarkers called with m_event set to nullptr.";
-        return {};
-    }
-
-    auto userIds = m_room->userIdsAtEvent(m_event->id());
-    userIds.remove(m_room->localMember().id());
-
-    if (userIds.count() > maxMarkers) {
-        return QStringLiteral("+ ") + QString::number(userIds.count() - maxMarkers);
-    } else {
-        return QString();
-    }
-}
-
-QString EventHandler::getReadMarkersString() const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReadMarkersString called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReadMarkersString called with m_event set to nullptr.";
-        return {};
-    }
-
-    auto userIds = m_room->userIdsAtEvent(m_event->id());
-    userIds.remove(m_room->localMember().id());
-
-    /**
-     * The string ends up in the form
-     * "x users: user1DisplayName, user2DisplayName, etc."
-     */
-    QString readMarkersString = i18np("1 user: ", "%1 users: ", userIds.size());
-    for (const auto &userId : userIds) {
-        auto member = m_room->member(userId);
-        QString displayName;
-        if (!m_room->memberIds().contains(userId)) {
-            displayName = i18nc("A member who is not in the room has been requested.", "unknown member");
-        } else {
-            displayName = member.displayName();
-        }
-        readMarkersString += displayName + i18nc("list separator", ", ");
-    }
-    readMarkersString.chop(2);
-    return readMarkersString;
-}
-
 #include "moc_eventhandler.cpp"

src/eventhandler.h

@@ -53,25 +53,10 @@ public:
      */
     MessageComponentType::Type messageComponentType() const;
 
-    /**
-     * @brief Get the author of the event in context of the room.
-     *
-     * An empty Quotient::RoomMember will be returned if the EventHandler hasn't had
-     * the room or event initialised.
-     *
-     * @param isPending if the event is pending, i.e. has not been confirmed by
-     *                  the server.
-     *
-     * @return a Quotient::RoomMember object for the user.
-     *
-     * @sa Quotient::RoomMember
-     */
-    Quotient::RoomMember getAuthor(bool isPending = false) const;
-
     /**
      * @brief Get the display name of the event author.
      *
-     * This method is separate from getAuthor() and special in that it will return
+     * This method is special in that it will return
      * the old display name of the author if the current event is one that caused it
      * to change. This allows for scenarios where the UI wishes to notify that a
      * user's display name has changed and what it changed from.
@@ -113,6 +98,8 @@ public:
      */
     QString getTimeString(bool relative, QLocale::FormatType format = QLocale::ShortFormat, bool isPending = false, QDateTime lastUpdated = {}) const;
 
+    QString getTimeString(const QString &format, bool isPending = false, const QDateTime &lastUpdated = {});
+
     /**
      * @brief Whether the event should be highlighted in the timeline.
      *
@@ -342,43 +329,6 @@ public:
      */
     QString getLocationAssetType() const;
 
-    /**
-     * @brief Whether the event has any read marker for other users.
-     */
-    bool hasReadMarkers() const;
-
-    /**
-     * @brief Returns a list of user read marker for the event.
-     *
-     * @param maxMarkers the maximum number of users to return. Usually the number
-     *                   of user read makers shown is limited to not clutter the UI.
-     *                   This needs to be the same as used in getNumberExcessReadMarkers
-     *                   so that the markers line up with the number displayed, i.e.
-     *                   the number of users shown plus the excess number will be
-     *                   the total number of other user read markers at an event.
-     */
-    QList<Quotient::RoomMember> getReadMarkers(int maxMarkers = 5) const;
-
-    /**
-     * @brief Returns the number of excess user read markers for the event.
-     *
-     * This returns a string in the form "+ x" ready for use in the UI.
-     *
-     * @param maxMarkers the maximum number of markers shown in the UI. This needs to
-     *                   be the same as used in getReadMarkers so that the value lines
-     *                   up with the number displayed, i.e. the number of users shown
-     *                   plus the excess number will be the total number of other user
-     *                   read markers at an event.
-     */
-    QString getNumberExcessReadMarkers(int maxMarkers = 5) const;
-
-    /**
-     * @brief Returns a string with the names of the read markers at the event.
-     *
-     * This is in the form "x users: name 1, name 2, ...".
-     */
-    QString getReadMarkersString() const;
-
 private:
     const NeoChatRoom *m_room = nullptr;
     const Quotient::RoomEvent *m_event = nullptr;

src/foreigntypes.h

@@ -51,9 +51,3 @@ struct ForeignSSSSHandler {
     QML_FOREIGN(Quotient::SSSSHandler)
     QML_NAMED_ELEMENT(SSSSHandler)
 };
-
-struct RoomMemberForeign {
-    Q_GADGET
-    QML_FOREIGN(Quotient::RoomMember)
-    QML_NAMED_ELEMENT(RoomMember)
-};

src/jobs/neochatgetcommonroomsjob.cpp

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2024 Joshua Goins <josh@redstrate.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "neochatgetcommonroomsjob.h"
+
+using namespace Quotient;
+
+NeochatGetCommonRoomsJob::NeochatGetCommonRoomsJob(const QString &userId)
+    : BaseJob(HttpVerb::Get,
+              QStringLiteral("GetCommonRoomsJob"),
+              QStringLiteral("/_matrix/client/unstable/uk.half-shot.msc2666/user/mutual_rooms").toLatin1(),
+              QUrlQuery({{QStringLiteral("user_id"), userId}}))
+{
+}

src/jobs/neochatgetcommonroomsjob.h

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2024 Joshua Goins <josh@redstrate.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <Quotient/jobs/basejob.h>
+#include <Quotient/omittable.h>
+
+// TODO: Upstream to libQuotient
+class NeochatGetCommonRoomsJob : public Quotient::BaseJob
+{
+public:
+    explicit NeochatGetCommonRoomsJob(const QString &userId);
+};

src/locationhelper.cpp

@@ -40,7 +40,7 @@ float LocationHelper::zoomToFit(const QRectF &r, float mapWidth, float mapHeight
     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);
+    return z;
 }
 
 #include "moc_locationhelper.cpp"

src/login.cpp

@@ -78,9 +78,7 @@ void LoginHelper::init()
         account.setHomeserver(m_connection->homeserver());
         account.setDeviceId(m_connection->deviceId());
         account.setDeviceName(m_deviceName);
-        if (!Controller::instance().saveAccessTokenToKeyChain(account.userId(), m_connection->accessToken())) {
-            qWarning() << "Couldn't save access token";
-        }
+        Controller::instance().saveAccessTokenToKeyChain(account.userId(), m_connection->accessToken());
         account.sync();
         Controller::instance().addConnection(m_connection);
         Controller::instance().setActiveConnection(m_connection);

src/models/completionmodel.cpp

@@ -9,18 +9,16 @@
 #include "customemojimodel.h"
 #include "emojimodel.h"
 #include "neochatroom.h"
+#include "roommanager.h"
 #include "userlistmodel.h"
 
 CompletionModel::CompletionModel(QObject *parent)
     : QAbstractListModel(parent)
     , m_filterModel(new CompletionProxyModel())
-    , m_userListModel(new UserListModel(this))
+    , m_userListModel(RoomManager::instance().userListModel())
     , m_emojiModel(new QConcatenateTablesProxyModel(this))
 {
     connect(this, &CompletionModel::textChanged, this, &CompletionModel::updateCompletion);
-    connect(this, &CompletionModel::roomChanged, this, [this]() {
-        m_userListModel->setRoom(m_room);
-    });
     m_emojiModel->addSourceModel(&CustomEmojiModel::instance());
     m_emojiModel->addSourceModel(&EmojiModel::instance());
 }

src/models/customemojimodel_p.h

@@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "customemojimodel.h"
-#include <QRegularExpression>
-
-class NeoChatConnection;
-
-struct CustomEmoji {
-    QString name; // with :semicolons:
-    QString url; // mxc://
-    QRegularExpression regexp;
-};
-
-struct CustomEmojiModel::Private {
-    QPointer<NeoChatConnection> connection;
-    QList<CustomEmoji> emojies;
-};

src/models/emojimodel.cpp

@@ -26,7 +26,7 @@ int EmojiModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
     int total = 0;
-    for (const auto &category : _emojis) {
+    for (const auto &category : std::as_const(_emojis)) {
         total += category.count();
     }
     return total;
@@ -35,7 +35,7 @@ int EmojiModel::rowCount(const QModelIndex &parent) const
 QVariant EmojiModel::data(const QModelIndex &index, int role) const
 {
     auto row = index.row();
-    for (const auto &category : _emojis) {
+    for (const auto &category : std::as_const(_emojis)) {
         if (row >= category.count()) {
             row -= category.count();
             continue;
@@ -79,7 +79,8 @@ QVariantList EmojiModel::filterModelNoCustom(const QString &filter, bool limit)
 {
     QVariantList result;
 
-    for (const auto &e : _emojis.values()) {
+    const auto &values = _emojis.values();
+    for (const auto &e : values) {
         for (const auto &variant : e) {
             const auto &emoji = qvariant_cast<Emoji>(variant);
             if (emoji.shortName.contains(filter, Qt::CaseInsensitive)) {
@@ -121,7 +122,8 @@ QVariantList EmojiModel::emojis(Category category) const
     }
     if (category == HistoryNoCustom) {
         QVariantList list;
-        for (const auto &e : emojiHistory()) {
+        const auto &history = emojiHistory();
+        for (const auto &e : history) {
             auto emoji = qvariant_cast<Emoji>(e);
             if (!emoji.isCustom) {
                 list.append(e);
@@ -224,8 +226,9 @@ QVariantList EmojiModel::categoriesWithCustom() const
 QVariantList EmojiModel::emojiHistory() const
 {
     QVariantList list;
-    for (const auto &historicEmoji : lastUsedEmojis()) {
-        for (const auto &emojiCategory : _emojis) {
+    const auto &lastUsed = lastUsedEmojis();
+    for (const auto &historicEmoji : lastUsed) {
+        for (const auto &emojiCategory : std::as_const(_emojis)) {
             for (const auto &emoji : emojiCategory) {
                 if (qvariant_cast<Emoji>(emoji).shortName == historicEmoji) {
                     list.append(emoji);

src/models/mediamessagefiltermodel.cpp

@@ -30,40 +30,6 @@ bool MediaMessageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex
 
 QVariant MediaMessageFilterModel::data(const QModelIndex &index, int role) const
 {
-    if (role == SourceRole) {
-        if (mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QLatin1String("mimeType")].toString().contains(QLatin1String("image"))) {
-            return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QStringLiteral("source")].toUrl();
-        } else if (mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QLatin1String("mimeType")].toString().contains(QLatin1String("video"))) {
-            auto progressInfo = mapToSource(index).data(MessageEventModel::ProgressInfoRole).value<Quotient::FileTransferInfo>();
-
-            if (progressInfo.completed()) {
-                return mapToSource(index).data(MessageEventModel::ProgressInfoRole).value<Quotient::FileTransferInfo>().localPath;
-            } else {
-                return QUrl();
-            }
-        } else {
-            return QUrl();
-        }
-    }
-    if (role == TempSourceRole) {
-        return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QStringLiteral("tempInfo")].toMap()[QStringLiteral("source")].toUrl();
-    }
-    if (role == TypeRole) {
-        if (mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QLatin1String("mimeType")].toString().contains(QLatin1String("image"))) {
-            return MediaType::Image;
-        } else {
-            return MediaType::Video;
-        }
-    }
-    if (role == CaptionRole) {
-        return mapToSource(index).data(Qt::DisplayRole);
-    }
-    if (role == SourceWidthRole) {
-        return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QStringLiteral("width")].toFloat();
-    }
-    if (role == SourceHeightRole) {
-        return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QStringLiteral("height")].toFloat();
-    }
     // We need to catch this one and return true if the next media object was
     // on a different day.
     if (role == MessageEventModel::ShowSectionRole) {
@@ -80,6 +46,37 @@ QVariant MediaMessageFilterModel::data(const QModelIndex &index, int role) const
         return QVariant::fromValue<MessageContentModel *>(model);
     }
 
+    QVariantMap mediaInfo = mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap();
+
+    if (role == TempSourceRole) {
+        return mediaInfo[QStringLiteral("tempInfo")].toMap()[QStringLiteral("source")].toUrl();
+    }
+    if (role == CaptionRole) {
+        return mapToSource(index).data(Qt::DisplayRole);
+    }
+    if (role == SourceWidthRole) {
+        return mediaInfo[QStringLiteral("width")].toFloat();
+    }
+    if (role == SourceHeightRole) {
+        return mediaInfo[QStringLiteral("height")].toFloat();
+    }
+
+    bool isVideo = mediaInfo[QStringLiteral("mimeType")].toString().contains(QStringLiteral("video"));
+
+    if (role == TypeRole) {
+        return (isVideo) ? MediaType::Video : MediaType::Image;
+    }
+    if (role == SourceRole) {
+        if (isVideo) {
+            auto progressInfo = mapToSource(index).data(MessageEventModel::ProgressInfoRole).value<Quotient::FileTransferInfo>();
+            if (progressInfo.completed()) {
+                return mapToSource(index).data(MessageEventModel::ProgressInfoRole).value<Quotient::FileTransferInfo>().localPath;
+            }
+        } else {
+            return mediaInfo[QStringLiteral("source")].toUrl();
+        }
+    }
+
     return sourceModel()->data(mapToSource(index), role);
 }
 

src/models/messagecontentmodel.cpp

@@ -3,6 +3,7 @@
 
 #include "messagecontentmodel.h"
 #include "neochatconfig.h"
+#include "neochatroommember.h"
 
 #include <QImageReader>
 
@@ -35,10 +36,10 @@ MessageContentModel::MessageContentModel(NeoChatRoom *room, const Quotient::Room
     , m_room(room)
     , m_eventId(event != nullptr ? event->id() : QString())
     , m_eventSenderId(event != nullptr ? event->senderId() : QString())
-    , m_event(loadEvent<RoomEvent>(event->fullJson()))
     , m_isPending(isPending)
     , m_isReply(isReply)
 {
+    intiializeEvent(event);
     initializeModel();
 }
 
@@ -81,8 +82,7 @@ void MessageContentModel::initializeModel()
             if (m_eventId == serverEvent->id()) {
                 beginResetModel();
                 m_isPending = false;
-                m_event = loadEvent<RoomEvent>(serverEvent->fullJson());
-                Q_EMIT eventUpdated();
+                intiializeEvent(serverEvent);
                 endResetModel();
             }
         }
@@ -91,8 +91,7 @@ void MessageContentModel::initializeModel()
         if (m_room != nullptr && m_event != nullptr) {
             if (m_eventId == newEvent->id()) {
                 beginResetModel();
-                m_event = loadEvent<RoomEvent>(newEvent->fullJson());
-                Q_EMIT eventUpdated();
+                intiializeEvent(newEvent);
                 endResetModel();
             }
         }
@@ -108,24 +107,9 @@ void MessageContentModel::initializeModel()
         }
     });
     connect(m_room, &NeoChatRoom::fileTransferCompleted, this, [this](const QString &eventId) {
-        if (m_event != nullptr && eventId == m_eventId) {
+        if (m_room != nullptr && m_event != nullptr && eventId == m_eventId) {
             resetContent();
             Q_EMIT dataChanged(index(0), index(rowCount() - 1), {FileTransferInfoRole});
-
-            QString mxcUrl;
-            if (auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
-                if (event->hasFileContent()) {
-                    mxcUrl = event->content()->fileInfo()->url().toString();
-                }
-            } else if (auto event = eventCast<const Quotient::StickerEvent>(m_event)) {
-                mxcUrl = event->image().fileInfo()->url().toString();
-            }
-            if (mxcUrl.isEmpty()) {
-                return;
-            }
-            auto localPath = m_room->fileTransferInfo(m_eventId).localPath.toLocalFile();
-            auto config = KSharedConfig::openStateConfig(QStringLiteral("neochatdownloads"))->group(QStringLiteral("downloads"));
-            config.writePathEntry(mxcUrl.mid(6), localPath);
         }
     });
     connect(m_room, &NeoChatRoom::fileTransferFailed, this, [this](const QString &eventId) {
@@ -169,6 +153,29 @@ void MessageContentModel::initializeModel()
     resetModel();
 }
 
+void MessageContentModel::intiializeEvent(const QString &eventId)
+{
+    const auto newEvent = m_room->getEvent(eventId);
+    if (newEvent != nullptr) {
+        intiializeEvent(newEvent);
+    }
+}
+
+void MessageContentModel::intiializeEvent(const Quotient::RoomEvent *event)
+{
+    m_event = loadEvent<RoomEvent>(event->fullJson());
+    auto senderId = event->senderId();
+    // A pending event might not have a sender ID set yet but in that case it must
+    // be the local member.
+    if (senderId.isEmpty()) {
+        senderId = m_room->localMember().id();
+    }
+    if (m_eventSenderObject == nullptr) {
+        m_eventSenderObject = std::unique_ptr<NeochatRoomMember>(new NeochatRoomMember(m_room, senderId));
+    }
+    Q_EMIT eventUpdated();
+}
+
 bool MessageContentModel::showAuthor() const
 {
     return m_showAuthor;
@@ -251,16 +258,16 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const
         });
 
         auto lastUpdated = pendingIt == m_room->pendingEvents().cend() ? QDateTime() : pendingIt->lastUpdated();
-        return eventHandler.getTimeString(false, QLocale::ShortFormat, m_isPending, lastUpdated);
+        return eventHandler.getTimeString(QStringLiteral("hh:mm"), m_isPending, lastUpdated);
     }
     if (role == AuthorRole) {
-        return QVariant::fromValue(eventHandler.getAuthor(m_isPending));
+        return QVariant::fromValue<NeochatRoomMember *>(m_eventSenderObject.get());
     }
     if (role == MediaInfoRole) {
         return eventHandler.getMediaInfo();
     }
     if (role == FileTransferInfoRole) {
-        return QVariant::fromValue(fileInfo());
+        return QVariant::fromValue(m_room->cachedFileTransferInfo(m_event.get()));
     }
     if (role == ItineraryModelRole) {
         return QVariant::fromValue<ItineraryModel *>(m_itineraryModel);
@@ -437,27 +444,37 @@ QList<MessageComponent> MessageContentModel::componentsForType(MessageComponentT
         QList<MessageComponent> components;
         components += MessageComponent{MessageComponentType::File, QString(), {}};
         const auto event = eventCast<const Quotient::RoomMessageEvent>(m_event);
-        auto body = EventHandler::rawMessageBody(*event);
-        components += TextHandler().textComponents(body, EventHandler::messageBodyInputFormat(*event), m_room, event, event->isReplaced());
 
         if (m_emptyItinerary) {
-            auto fileTransferInfo = fileInfo();
+            if (!m_isReply) {
+                auto fileTransferInfo = m_room->cachedFileTransferInfo(m_event.get());
 
 #ifndef Q_OS_ANDROID
-            KSyntaxHighlighting::Repository repository;
-            const auto definitionForFile = repository.definitionForFileName(fileTransferInfo.localPath.toString());
-            if (definitionForFile.isValid() || QFileInfo(fileTransferInfo.localPath.path()).suffix() == QStringLiteral("txt")) {
-                QFile file(fileTransferInfo.localPath.path());
-                file.open(QIODevice::ReadOnly);
-                components += MessageComponent{MessageComponentType::Code,
-                    QString::fromStdString(file.readAll().toStdString()),
-                    {{QStringLiteral("class"), definitionForFile.name()}}};
-            }
+                Q_ASSERT(event->content() != nullptr && event->content()->fileInfo() != nullptr);
+                const QMimeType mimeType = event->content()->fileInfo()->mimeType;
+                if (mimeType.name() == QStringLiteral("text/plain") || mimeType.parentMimeTypes().contains(QStringLiteral("text/plain"))) {
+                    QString originalName = event->content()->fileInfo()->originalName;
+                    if (originalName.isEmpty()) {
+                        originalName = event->plainBody();
+                    }
+                    KSyntaxHighlighting::Repository repository;
+                    KSyntaxHighlighting::Definition definitionForFile = repository.definitionForFileName(originalName);
+                    if (!definitionForFile.isValid()) {
+                        definitionForFile = repository.definitionForMimeType(mimeType.name());
+                    }
+
+                    QFile file(fileTransferInfo.localPath.path());
+                    file.open(QIODevice::ReadOnly);
+                    components += MessageComponent{MessageComponentType::Code,
+                                                   QString::fromStdString(file.readAll().toStdString()),
+                                                   {{QStringLiteral("class"), definitionForFile.name()}}};
+                }
 #endif
 
-            if (FileType::instance().fileHasImage(fileTransferInfo.localPath)) {
-                QImageReader reader(fileTransferInfo.localPath.path());
-                components += MessageComponent{MessageComponentType::Pdf, QString(), {{QStringLiteral("size"), reader.size()}}};
+                if (FileType::instance().fileHasImage(fileTransferInfo.localPath)) {
+                    QImageReader reader(fileTransferInfo.localPath.path());
+                    components += MessageComponent{MessageComponentType::Pdf, QString(), {{QStringLiteral("size"), reader.size()}}};
+                }
             }
         } else if (m_itineraryModel != nullptr) {
             components += MessageComponent{MessageComponentType::Itinerary, QString(), {}};
@@ -467,9 +484,12 @@ QList<MessageComponent> MessageContentModel::componentsForType(MessageComponentT
         } else {
             updateItineraryModel();
         }
+        auto body = EventHandler::rawMessageBody(*event);
+        components += TextHandler().textComponents(body, EventHandler::messageBodyInputFormat(*event), m_room, event, event->isReplaced());
         return components;
     }
     case MessageComponentType::Image:
+    case MessageComponentType::Audio:
     case MessageComponentType::Video: {
         if (!m_event->is<StickerEvent>()) {
             const auto event = eventCast<const Quotient::RoomMessageEvent>(m_event);
@@ -552,7 +572,7 @@ void MessageContentModel::updateItineraryModel()
 
     if (auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
         if (event->hasFileContent()) {
-            auto filePath = fileInfo().localPath;
+            auto filePath = m_room->cachedFileTransferInfo(m_event.get()).localPath;
             if (filePath.isEmpty() && m_itineraryModel != nullptr) {
                 delete m_itineraryModel;
                 m_itineraryModel = nullptr;
@@ -580,42 +600,4 @@ void MessageContentModel::updateItineraryModel()
     }
 }
 
-FileTransferInfo MessageContentModel::fileInfo() const
-{
-    if (m_room == nullptr || m_event == nullptr) {
-        return {};
-    }
-
-    QString mxcUrl;
-    int total;
-    if (auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
-        if (event->hasFileContent()) {
-            mxcUrl = event->content()->fileInfo()->url().toString();
-            total = event->content()->fileInfo()->payloadSize;
-        }
-    } else if (auto event = eventCast<const Quotient::StickerEvent>(m_event)) {
-        mxcUrl = event->image().fileInfo()->url().toString();
-        total = event->image().fileInfo()->payloadSize;
-    }
-    auto config = KSharedConfig::openStateConfig(QStringLiteral("neochatdownloads"))->group(QStringLiteral("downloads"));
-    if (!config.hasKey(mxcUrl.mid(6))) {
-        return m_room->fileTransferInfo(m_eventId);
-    }
-    const auto path = config.readPathEntry(mxcUrl.mid(6), QString());
-    QFileInfo info(path);
-    if (!info.isFile()) {
-        config.deleteEntry(mxcUrl);
-        return m_room->fileTransferInfo(m_eventId);
-    }
-    // TODO: we could check the hash here
-    return FileTransferInfo{
-        .status = FileTransferInfo::Completed,
-        .isUpload = false,
-        .progress = total,
-        .total = total,
-        .localDir = QUrl(info.dir().path()),
-        .localPath = QUrl::fromLocalFile(path),
-    };
-}
-
 #include "moc_messagecontentmodel.cpp"

src/models/messagecontentmodel.h

@@ -6,11 +6,13 @@
 #include <QAbstractListModel>
 #include <QQmlEngine>
 
+#include <Quotient/events/roomevent.h>
 #include <Quotient/room.h>
 
 #include "enums/messagecomponenttype.h"
 #include "eventhandler.h"
 #include "itinerarymodel.h"
+#include "neochatroommember.h"
 
 struct MessageComponent {
     MessageComponentType::Type type = MessageComponentType::Other;
@@ -115,6 +117,7 @@ private:
     QPointer<NeoChatRoom> m_room;
     QString m_eventId;
     QString m_eventSenderId;
+    std::unique_ptr<NeochatRoomMember> m_eventSenderObject = nullptr;
     Quotient::RoomEventPtr m_event;
 
     bool m_isPending;
@@ -122,6 +125,8 @@ private:
     bool m_isReply;
 
     void initializeModel();
+    void intiializeEvent(const QString &eventId);
+    void intiializeEvent(const Quotient::RoomEvent *event);
 
     QList<MessageComponent> m_components;
     void resetModel();
@@ -141,6 +146,4 @@ private:
 
     void updateItineraryModel();
     bool m_emptyItinerary = false;
-
-    Quotient::FileTransferInfo fileInfo() const;
 };

src/models/messageeventmodel.cpp

@@ -26,6 +26,9 @@
 #include "messagecontentmodel.h"
 #include "models/messagefiltermodel.h"
 #include "models/reactionmodel.h"
+#include "neochatroom.h"
+#include "neochatroommember.h"
+#include "readmarkermodel.h"
 #include "texthandler.h"
 
 using namespace Quotient;
@@ -45,8 +48,6 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[ThreadRootRole] = "threadRoot";
     roles[ShowSectionRole] = "showSection";
     roles[ReadMarkersRole] = "readMarkers";
-    roles[ExcessReadMarkersRole] = "excessReadMarkers";
-    roles[ReadMarkersStringRole] = "readMarkersString";
     roles[ShowReadMarkersRole] = "showReadMarkers";
     roles[ReactionRole] = "reaction";
     roles[ShowReactionsRole] = "showReactions";
@@ -87,9 +88,14 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
         // HACK: Reset the model to a null room first to make sure QML dismantles
         // last room's objects before the room is actually changed
         beginResetModel();
+        m_readMarkerModels.clear();
         m_currentRoom->disconnect(this);
         m_currentRoom = nullptr;
         endResetModel();
+
+        // Don't clear the member objects until the model has been fully reset and all
+        // refs cleared.
+        m_memberObjects.clear();
     }
 
     beginResetModel();
@@ -100,9 +106,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
         room->setDisplayed();
 
         for (auto event = m_currentRoom->messageEvents().begin(); event != m_currentRoom->messageEvents().end(); ++event) {
-            if (const auto &roomMessageEvent = &*event->viewAs<RoomMessageEvent>()) {
-                createEventObjects(roomMessageEvent);
-            }
+            createEventObjects(&*event->viewAs<RoomEvent>());
             if (event->event()->is<PollStartEvent>()) {
                 m_currentRoom->createPollHandler(eventCast<const PollStartEvent>(event->event()));
             }
@@ -115,11 +119,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
 
         connect(m_currentRoom, &Room::aboutToAddNewMessages, this, [this](RoomEventsRange events) {
             for (auto &&event : events) {
-                const RoomMessageEvent *message = dynamic_cast<RoomMessageEvent *>(event.get());
-
-                if (message != nullptr) {
-                    createEventObjects(message);
-                }
+                createEventObjects(event.get());
                 if (event->is<PollStartEvent>()) {
                     m_currentRoom->createPollHandler(eventCast<const PollStartEvent>(event.get()));
                 }
@@ -129,9 +129,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
         });
         connect(m_currentRoom, &Room::aboutToAddHistoricalMessages, this, [this](RoomEventsRange events) {
             for (auto &event : events) {
-                if (const auto &roomMessageEvent = dynamic_cast<RoomMessageEvent *>(event.get())) {
-                    createEventObjects(roomMessageEvent);
-                }
+                createEventObjects(event.get());
                 if (event->is<PollStartEvent>()) {
                     m_currentRoom->createPollHandler(eventCast<const PollStartEvent>(event.get()));
                 }
@@ -158,8 +156,9 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
                 refreshLastUserEvents(i);
             }
         });
-        connect(m_currentRoom, &Room::pendingEventAboutToAdd, this, [this] {
+        connect(m_currentRoom, &Room::pendingEventAboutToAdd, this, [this](Quotient::RoomEvent *event) {
             m_initialized = true;
+            createEventObjects(event);
             beginInsertRows({}, 0, 0);
         });
         connect(m_currentRoom, &Room::pendingEventAdded, this, &MessageEventModel::endInsertRows);
@@ -195,10 +194,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             moveReadMarker(toEventId);
         });
         connect(m_currentRoom, &Room::replacedEvent, this, [this](const RoomEvent *newEvent) {
-            const RoomMessageEvent *message = eventCast<const RoomMessageEvent>(newEvent);
-            if (message != nullptr) {
-                createEventObjects(message);
-            }
+            createEventObjects(newEvent);
         });
         connect(m_currentRoom, &Room::updatedEvent, this, [this](const QString &eventId) {
             if (eventId.isEmpty()) { // How did we get here?
@@ -206,9 +202,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             }
             const auto eventIt = m_currentRoom->findInTimeline(eventId);
             if (eventIt != m_currentRoom->historyEdge()) {
-                if (const auto &event = dynamic_cast<const RoomMessageEvent *>(&**eventIt)) {
-                    createEventObjects(event);
-                }
+                createEventObjects(eventIt->event());
                 if (eventIt->event()->is<PollStartEvent>()) {
                     m_currentRoom->createPollHandler(eventCast<const PollStartEvent>(eventIt->event()));
                 }
@@ -216,11 +210,10 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             refreshEventRoles(eventId, {Qt::DisplayRole});
         });
         connect(m_currentRoom, &Room::changed, this, [this](Room::Changes changes) {
-            if (changes & (Room::Change::PartiallyReadStats | Room::Change::UnreadStats | Room::Change::Other | Room::Change::Members)) {
+            if (changes.testFlag(Quotient::Room::Change::Other)) {
                 // this is slow
                 for (auto it = m_currentRoom->messageEvents().rbegin(); it != m_currentRoom->messageEvents().rend(); ++it) {
-                    auto event = it->event();
-                    refreshEventRoles(event->id(), {ReadMarkersRole, ReadMarkersStringRole, ExcessReadMarkersRole});
+                    createEventObjects(it->event());
                 }
             }
         });
@@ -228,22 +221,6 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             beginResetModel();
             endResetModel();
         });
-        connect(m_currentRoom, &Room::memberNameUpdated, this, [this](RoomMember member) {
-            for (auto it = m_currentRoom->messageEvents().rbegin(); it != m_currentRoom->messageEvents().rend(); ++it) {
-                auto event = it->event();
-                if (event->senderId() == member.id()) {
-                    refreshEventRoles(event->id(), {AuthorRole});
-                }
-            }
-        });
-        connect(m_currentRoom, &Room::memberAvatarUpdated, this, [this](RoomMember member) {
-            for (auto it = m_currentRoom->messageEvents().rbegin(); it != m_currentRoom->messageEvents().rend(); ++it) {
-                auto event = it->event();
-                if (event->senderId() == member.id()) {
-                    refreshEventRoles(event->id(), {AuthorRole});
-                }
-            }
-        });
 
         qCDebug(MessageEvent) << "Connected to room" << room->id() << "as" << room->localMember().id();
     } else {
@@ -411,6 +388,8 @@ void MessageEventModel::fetchMore(const QModelIndex &parent)
     }
 }
 
+static NeochatRoomMember *emptyNeochatRoomMember = new NeochatRoomMember;
+
 QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
 {
     if (!checkIndex(idx, QAbstractItemModel::CheckIndexOption::IndexIsValid)) {
@@ -483,7 +462,18 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == AuthorRole) {
-        return QVariant::fromValue(eventHandler.getAuthor(isPending));
+        QString mId;
+        if (isPending) {
+            mId = m_currentRoom->localMember().id();
+        } else {
+            mId = evt.senderId();
+        }
+
+        if (!m_memberObjects.contains(mId)) {
+            return QVariant::fromValue<NeochatRoomMember *>(emptyNeochatRoomMember);
+        }
+
+        return QVariant::fromValue<NeochatRoomMember *>(m_memberObjects.at(mId).get());
     }
 
     if (role == HighlightRole) {
@@ -514,11 +504,11 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     if (role == ProgressInfoRole) {
         if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
             if (e->hasFileContent()) {
-                return QVariant::fromValue(m_currentRoom->fileTransferInfo(e->id()));
+                return QVariant::fromValue(m_currentRoom->cachedFileTransferInfo(&evt));
             }
         }
-        if (auto e = eventCast<const StickerEvent>(&evt)) {
-            return QVariant::fromValue(m_currentRoom->fileTransferInfo(e->id()));
+        if (eventCast<const StickerEvent>(&evt)) {
+            return QVariant::fromValue(m_currentRoom->cachedFileTransferInfo(&evt));
         }
     }
 
@@ -557,19 +547,15 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == ReadMarkersRole) {
-        return QVariant::fromValue(eventHandler.getReadMarkers());
-    }
-
-    if (role == ExcessReadMarkersRole) {
-        return eventHandler.getNumberExcessReadMarkers();
-    }
-
-    if (role == ReadMarkersStringRole) {
-        return eventHandler.getReadMarkersString();
+        if (m_readMarkerModels.contains(evt.id())) {
+            return QVariant::fromValue<ReadMarkerModel *>(m_readMarkerModels[evt.id()].get());
+        } else {
+            return QVariantList();
+        }
     }
 
     if (role == ShowReadMarkersRole) {
-        return eventHandler.hasReadMarkers();
+        return m_readMarkerModels.contains(evt.id());
     }
 
     if (role == ReactionRole) {
@@ -630,30 +616,71 @@ int MessageEventModel::eventIdToRow(const QString &eventID) const
     return it - m_currentRoom->messageEvents().rbegin() + timelineBaseIndex();
 }
 
-void MessageEventModel::createEventObjects(const Quotient::RoomMessageEvent *event)
+void MessageEventModel::createEventObjects(const Quotient::RoomEvent *event)
 {
-    auto eventId = event->id();
+    if (event == nullptr) {
+        return;
+    }
 
-    // ReactionModel handles updates to add and remove reactions, we only need to
+    auto eventId = event->id();
+    auto senderId = event->senderId();
+    // A pending event might not have a sender ID set yet but in that case it must
+    // be the local member.
+    if (senderId.isEmpty()) {
+        senderId = m_currentRoom->localMember().id();
+    }
+
+    if (!m_memberObjects.contains(senderId)) {
+        m_memberObjects[senderId] = std::unique_ptr<NeochatRoomMember>(new NeochatRoomMember(m_currentRoom, senderId));
+    }
+
+    // ReadMarkerModel handles updates to add and remove markers, we only need to
     // handle adding and removing whole models here.
-    if (m_reactionModels.contains(eventId)) {
+    if (m_readMarkerModels.contains(eventId)) {
         // If a model already exists but now has no reactions remove it
-        if (m_reactionModels[eventId]->rowCount() <= 0) {
-            m_reactionModels.remove(eventId);
+        if (m_readMarkerModels[eventId]->rowCount() <= 0) {
+            m_readMarkerModels.remove(eventId);
             if (!resetting) {
-                refreshEventRoles(eventId, {ReactionRole, ShowReactionsRole});
+                refreshEventRoles(eventId, {ReadMarkersRole, ShowReadMarkersRole});
             }
         }
     } else {
-        if (m_currentRoom->relatedEvents(*event, Quotient::EventRelation::AnnotationType).count() > 0) {
+        auto memberIds = m_currentRoom->userIdsAtEvent(eventId);
+        memberIds.remove(m_currentRoom->localMember().id());
+        if (memberIds.size() > 0) {
             // If a model doesn't exist and there are reactions add it.
-            auto reactionModel = QSharedPointer<ReactionModel>(new ReactionModel(event, m_currentRoom));
-            if (reactionModel->rowCount() > 0) {
-                m_reactionModels[eventId] = reactionModel;
+            auto newModel = QSharedPointer<ReadMarkerModel>(new ReadMarkerModel(eventId, m_currentRoom));
+            if (newModel->rowCount() > 0) {
+                m_readMarkerModels[eventId] = newModel;
+                if (!resetting) {
+                    refreshEventRoles(eventId, {ReadMarkersRole, ShowReadMarkersRole});
+                }
+            }
+        }
+    }
+
+    if (const auto roomEvent = eventCast<const RoomMessageEvent>(event)) {
+        // ReactionModel handles updates to add and remove reactions, we only need to
+        // handle adding and removing whole models here.
+        if (m_reactionModels.contains(eventId)) {
+            // If a model already exists but now has no reactions remove it
+            if (m_reactionModels[eventId]->rowCount() <= 0) {
+                m_reactionModels.remove(eventId);
                 if (!resetting) {
                     refreshEventRoles(eventId, {ReactionRole, ShowReactionsRole});
                 }
             }
+        } else {
+            if (m_currentRoom->relatedEvents(*event, Quotient::EventRelation::AnnotationType).count() > 0) {
+                // If a model doesn't exist and there are reactions add it.
+                auto reactionModel = QSharedPointer<ReactionModel>(new ReactionModel(roomEvent, m_currentRoom));
+                if (reactionModel->rowCount() > 0) {
+                    m_reactionModels[eventId] = reactionModel;
+                    if (!resetting) {
+                        refreshEventRoles(eventId, {ReactionRole, ShowReactionsRole});
+                    }
+                }
+            }
         }
     }
 }

src/models/messageeventmodel.h

@@ -9,7 +9,9 @@
 
 #include "linkpreviewer.h"
 #include "neochatroom.h"
+#include "neochatroommember.h"
 #include "pollhandler.h"
+#include "readmarkermodel.h"
 
 class ReactionModel;
 
@@ -58,8 +60,6 @@ public:
         ShowSectionRole, /**< Whether the section header should be shown. */
 
         ReadMarkersRole, /**< The first 5 other users at the event for read marker tracking. */
-        ExcessReadMarkersRole, /**< The number of other users at the event after the first 5. */
-        ReadMarkersStringRole, /**< String with the display name and mxID of the users at the event. */
         ShowReadMarkersRole, /**< Whether there are any other user read markers to be shown. */
         ReactionRole, /**< List model for this event. */
         ShowReactionsRole, /**< Whether there are any reactions to be shown. */
@@ -116,6 +116,8 @@ private:
     bool movingEvent = false;
     KFormat m_format;
 
+    std::map<QString, std::unique_ptr<NeochatRoomMember>> m_memberObjects;
+    QMap<QString, QSharedPointer<ReadMarkerModel>> m_readMarkerModels;
     QMap<QString, QSharedPointer<ReactionModel>> m_reactionModels;
 
     [[nodiscard]] int timelineBaseIndex() const;
@@ -130,7 +132,7 @@ private:
     int refreshEventRoles(const QString &eventId, const QList<int> &roles = {});
     void moveReadMarker(const QString &toEventId);
 
-    void createEventObjects(const Quotient::RoomMessageEvent *event);
+    void createEventObjects(const Quotient::RoomEvent *event);
     // Hack to ensure that we don't call endInsertRows when we haven't called beginInsertRows
     bool m_initialized = false;
 

src/models/messagefiltermodel.cpp

@@ -4,11 +4,13 @@
 #include "messagefiltermodel.h"
 
 #include <KLocalizedString>
+#include <QVariant>
 
 #include "enums/delegatetype.h"
 #include "messagecontentmodel.h"
 #include "messageeventmodel.h"
 #include "neochatconfig.h"
+#include "neochatroommember.h"
 #include "timelinemodel.h"
 
 using namespace Quotient;

src/models/pushrulemodel.cpp

@@ -99,7 +99,7 @@ void PushRuleModel::setRules(QList<Quotient::PushRule> rules, PushRuleKind::Kind
     for (const auto &rule : rules) {
         QString roomId;
         if (rule.conditions.size() > 0) {
-            for (const auto &condition : rule.conditions) {
+            for (const auto &condition : std::as_const(rule.conditions)) {
                 if (condition.key == QStringLiteral("room_id")) {
                     roomId = condition.pattern;
                 }
@@ -163,7 +163,7 @@ PushRuleSection::Section PushRuleModel::getSection(Quotient::PushRule rule)
         }
         // If the rule has push conditions and one is a room ID it is a room only keyword.
         if (!rule.conditions.isEmpty()) {
-            for (auto condition : rule.conditions) {
+            for (const auto &condition : std::as_const(rule.conditions)) {
                 if (condition.key == QStringLiteral("room_id")) {
                     return PushRuleSection::RoomKeywords;
                 }

src/models/readmarkermodel.cpp

@@ -0,0 +1,136 @@
+// SPDX-FileCopyrightText: 2024 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 "readmarkermodel.h"
+
+#include <KLocalizedString>
+
+#include <Quotient/roommember.h>
+
+#define MAXMARKERS 5
+
+ReadMarkerModel::ReadMarkerModel(const QString &eventId, NeoChatRoom *room)
+    : QAbstractListModel(nullptr)
+    , m_room(room)
+    , m_eventId(eventId)
+{
+    Q_ASSERT(!m_eventId.isEmpty());
+    Q_ASSERT(m_room != nullptr);
+
+    connect(m_room, &NeoChatRoom::changed, this, [this](Quotient::Room::Changes changes) {
+        if (m_room != nullptr && changes.testFlag(Quotient::Room::Change::Other)) {
+            auto memberIds = m_room->userIdsAtEvent(m_eventId).values();
+            if (memberIds == m_markerIds) {
+                return;
+            }
+
+            beginResetModel();
+            m_markerIds.clear();
+            endResetModel();
+
+            beginResetModel();
+            memberIds.removeAll(m_room->localMember().id());
+            m_markerIds = memberIds;
+            endResetModel();
+
+            Q_EMIT reactionUpdated();
+        }
+    });
+    connect(m_room, &NeoChatRoom::memberNameUpdated, this, [this](Quotient::RoomMember member) {
+        if (m_markerIds.contains(member.id())) {
+            const auto memberIndex = index(m_markerIds.indexOf(member.id()));
+            Q_EMIT dataChanged(memberIndex, memberIndex);
+        }
+    });
+    connect(m_room, &NeoChatRoom::memberAvatarUpdated, this, [this](Quotient::RoomMember member) {
+        if (m_markerIds.contains(member.id())) {
+            const auto memberIndex = index(m_markerIds.indexOf(member.id()));
+            Q_EMIT dataChanged(memberIndex, memberIndex);
+        }
+    });
+
+    beginResetModel();
+    auto userIds = m_room->userIdsAtEvent(m_eventId);
+    userIds.remove(m_room->localMember().id());
+    m_markerIds = userIds.values();
+    endResetModel();
+
+    Q_EMIT reactionUpdated();
+}
+
+QVariant ReadMarkerModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid()) {
+        return {};
+    }
+
+    if (index.row() >= rowCount()) {
+        qDebug() << "ReactionModel, something's wrong: index.row() >= rowCount()";
+        return {};
+    }
+
+    const auto member = m_room->member(m_markerIds.value(index.row()));
+
+    if (role == DisplayNameRole) {
+        return member.htmlSafeDisplayName();
+    }
+
+    if (role == AvatarUrlRole) {
+        return member.avatarUrl();
+    }
+
+    if (role == ColorRole) {
+        return member.color();
+    }
+
+    return {};
+}
+
+int ReadMarkerModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent)
+    return std::min(int(m_markerIds.size()), MAXMARKERS);
+}
+
+QHash<int, QByteArray> ReadMarkerModel::roleNames() const
+{
+    return {
+        {DisplayNameRole, "displayName"},
+        {AvatarUrlRole, "avatarUrl"},
+        {ColorRole, "memberColor"},
+    };
+}
+
+QString ReadMarkerModel::readMarkersString()
+{
+    /**
+     * The string ends up in the form
+     * "x users: user1DisplayName, user2DisplayName, etc."
+     */
+    QString readMarkersString = i18np("1 user: ", "%1 users: ", m_markerIds.size());
+    for (const auto &memberId : m_markerIds) {
+        auto member = m_room->member(memberId);
+        QString displayName = member.htmlSafeDisambiguatedName();
+        if (displayName.isEmpty()) {
+            displayName = i18nc("A member who is not in the room has been requested.", "unknown member");
+        }
+        readMarkersString += displayName + i18nc("list separator", ", ");
+    }
+    readMarkersString.chop(2);
+    return readMarkersString;
+}
+
+QString ReadMarkerModel::excessReadMarkersString()
+{
+    if (m_room == nullptr) {
+        return {};
+    }
+
+    if (m_markerIds.size() > MAXMARKERS) {
+        return QStringLiteral("+ ") + QString::number(m_markerIds.size() - MAXMARKERS);
+    } else {
+        return QString();
+    }
+}
+
+#include "moc_readmarkermodel.cpp"

src/models/readmarkermodel.h

@@ -0,0 +1,79 @@
+// SPDX-FileCopyrightText: 2024 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 <QAbstractListModel>
+#include <qtmetamacros.h>
+
+#include "neochatroom.h"
+
+/**
+ * @class ReadMarkerModel
+ *
+ * This class defines the model for visualising a list of reactions to an event.
+ */
+class ReadMarkerModel : public QAbstractListModel
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
+    /**
+     * @brief Returns a string with the names of the read markers at the event.
+     *
+     * This is in the form "x users: name 1, name 2, ...".
+     */
+    Q_PROPERTY(QString readMarkersString READ readMarkersString NOTIFY reactionUpdated)
+
+    /**
+     * @brief Returns the number of excess user read markers for the event.
+     *
+     * This returns a string in the form "+ x" ready for use in the UI.
+     */
+    Q_PROPERTY(QString excessReadMarkersString READ excessReadMarkersString NOTIFY reactionUpdated)
+
+public:
+    /**
+     * @brief Defines the model roles.
+     */
+    enum Roles {
+        DisplayNameRole = Qt::DisplayRole, /**< The display name of the member in the room. */
+        AvatarUrlRole, /**< The avatar for the member in the room. */
+        ColorRole, /**< The color for the member. */
+    };
+
+    explicit ReadMarkerModel(const QString &eventId, NeoChatRoom *room);
+
+    QString readMarkersString();
+    QString excessReadMarkersString();
+
+    /**
+     * @brief Get the given role value at the given index.
+     *
+     * @sa QAbstractItemModel::data
+     */
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+    /**
+     * @brief Number of rows in the model.
+     *
+     * @sa QAbstractItemModel::rowCount
+     */
+    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    /**
+     * @brief Returns a mapping from Role enum values to role names.
+     *
+     * @sa Roles, QAbstractItemModel::roleNames()
+     */
+    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
+
+Q_SIGNALS:
+    void reactionUpdated();
+
+private:
+    QPointer<NeoChatRoom> m_room;
+    QString m_eventId;
+    QList<QString> m_markerIds;
+};

src/models/searchmodel.cpp

@@ -7,6 +7,7 @@
 #include "eventhandler.h"
 #include "models/messagecontentmodel.h"
 #include "neochatroom.h"
+#include "neochatroommember.h"
 
 #include <QGuiApplication>
 
@@ -66,7 +67,17 @@ void SearchModel::search()
     m_job = job;
     connect(job, &BaseJob::finished, this, [this, job] {
         beginResetModel();
+        m_memberObjects.clear();
         m_result = job->searchCategories().roomEvents;
+
+        if (m_result.has_value()) {
+            for (const auto &result : m_result.value().results) {
+                if (!m_memberObjects.contains(result.result->senderId())) {
+                    m_memberObjects[result.result->senderId()] = std::unique_ptr<NeochatRoomMember>(new NeochatRoomMember(m_room, result.result->senderId()));
+                }
+            }
+        }
+
         endResetModel();
         setSearching(false);
         m_job = nullptr;
@@ -83,7 +94,7 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
 
     switch (role) {
     case AuthorRole:
-        return QVariant::fromValue(eventHandler.getAuthor());
+        return QVariant::fromValue<NeochatRoomMember *>(m_memberObjects.at(event.senderId()).get());
     case ShowSectionRole:
         if (row == 0) {
             return true;

src/models/searchmodel.h

@@ -9,6 +9,8 @@
 
 #include <Quotient/csapi/search.h>
 
+#include "neochatroommember.h"
+
 namespace Quotient
 {
 class Connection;
@@ -123,4 +125,6 @@ private:
     std::optional<Quotient::SearchJob::ResultRoomEvents> m_result = std::nullopt;
     Quotient::SearchJob *m_job = nullptr;
     bool m_searching = false;
+
+    std::map<QString, std::unique_ptr<NeochatRoomMember>> m_memberObjects;
 };

src/models/userlistmodel.cpp

@@ -33,6 +33,7 @@ void UserListModel::setRoom(NeoChatRoom *room)
         m_currentRoom->disconnect(this);
         m_currentRoom->connection()->disconnect(this);
         m_currentRoom = nullptr;
+        m_members.clear();
         endResetModel();
     }
 
@@ -56,7 +57,7 @@ void UserListModel::setRoom(NeoChatRoom *room)
         });
     }
 
-    refreshAllMembers();
+    m_active = false;
     Q_EMIT roomChanged();
 }
 
@@ -169,7 +170,6 @@ void UserListModel::refreshMember(const Quotient::RoomMember &member, const QLis
 void UserListModel::refreshAllMembers()
 {
     beginResetModel();
-    m_members.clear();
 
     if (m_currentRoom != nullptr) {
         m_members = m_currentRoom->joinedMemberIds();
@@ -179,8 +179,17 @@ void UserListModel::refreshAllMembers()
         MemberSorter sorter(m_currentRoom);
 #endif
         std::sort(m_members.begin(), m_members.end(), [&sorter, this](const auto &left, const auto &right) {
+            const auto leftPl = m_currentRoom->getUserPowerLevel(left);
+            const auto rightPl = m_currentRoom->getUserPowerLevel(right);
+            if (leftPl > rightPl) {
+                return true;
+            } else if (rightPl > leftPl) {
+                return false;
+            }
+
             return sorter(m_currentRoom->member(left), m_currentRoom->member(right));
         });
+
     }
     endResetModel();
     Q_EMIT usersRefreshed();
@@ -216,4 +225,14 @@ QHash<int, QByteArray> UserListModel::roleNames() const
     return roles;
 }
 
+void UserListModel::activate()
+{
+    if (m_active) {
+        return;
+    }
+
+    m_active = true;
+    refreshAllMembers();
+}
+
 #include "moc_userlistmodel.cpp"

src/models/userlistmodel.h

@@ -77,6 +77,8 @@ public:
      */
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
 
+    void activate();
+
 Q_SIGNALS:
     void roomChanged();
     void usersRefreshed();
@@ -94,6 +96,8 @@ private:
     QPointer<NeoChatRoom> m_currentRoom;
     QList<QString> m_members;
 
+    bool m_active = false;
+
     int findUserPos(const Quotient::RoomMember &member) const;
     [[nodiscard]] int findUserPos(const QString &username) const;
 };

src/models/webshortcutmodel.cpp

@@ -125,7 +125,7 @@ void WebShortcutModel::trigger(const QString &data)
 void WebShortcutModel::configureWebShortcuts()
 {
 #ifdef HAVE_KIO
-    auto job = new KIO::CommandLauncherJob(QStringLiteral("kcmshell5"), QStringList() << QStringLiteral("webshortcuts"), this);
+    auto job = new KIO::CommandLauncherJob(QStringLiteral("kcmshell6"), QStringList() << QStringLiteral("webshortcuts"), this);
     job->exec();
 #endif
 }

src/neochat.notifyrc

@@ -16,6 +16,7 @@ Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[gl]=NeoChat
+Name[he]=NeoChat
 Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
@@ -58,6 +59,7 @@ 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[he]=לקוח ל־matrix, פרוטוקול התקשורת המבוזר
 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
@@ -102,6 +104,7 @@ Name[eu]=Mezu berria
 Name[fi]=Uusi viesti
 Name[fr]=Nouveau message
 Name[gl]=Nova mensaxe
+Name[he]=הודעה חדשה
 Name[hu]=Új üzenet
 Name[ia]=Nove message
 Name[id]=Pesan baru
@@ -142,6 +145,7 @@ 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[he]=יש הודעה חדשה
 Comment[hu]=Új üzenet érkezett
 Comment[ia]=Il ha un nove message
 Comment[id]=Ada pesan baru
@@ -186,6 +190,7 @@ Name[eu]=Gonbidapen berria
 Name[fi]=Uusi kutsu
 Name[fr]=Nouvelle invitation
 Name[gl]=Novo convite
+Name[he]=הזמנה חדשה
 Name[hu]=Új meghívó
 Name[ia]=Nove invitation
 Name[id]=Undangan Baru
@@ -225,6 +230,7 @@ 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[he]=יש הזמנה חדשה לחדר
 Comment[hu]=Új meghívó érkezett egy szobába
 Comment[ia]=Il ha un nove invitation a un sala
 Comment[id]=Ada undangan baru ke sebuah ruangan
@@ -255,7 +261,7 @@ Action=Popup
 Name=Share
 Name[ar]=شارك
 Name[ca]=Compartició
-Name[ca@valencia]=Compartició
+Name[ca@valencia]=Compartiu
 Name[cs]=Sdílet
 Name[en_GB]=Share
 Name[eo]=Kundividi
@@ -263,6 +269,8 @@ Name[es]=Compartir
 Name[eu]=Partekatu
 Name[fi]=Jaa
 Name[fr]=Partager
+Name[gl]=Compartir
+Name[he]=שיתוף
 Name[hu]=Megosztás
 Name[ia]=Comparti
 Name[it]=Condivisione
@@ -271,6 +279,7 @@ Name[lv]=Kopīgot
 Name[nl]=Gedeelde
 Name[nn]=Del
 Name[pl]=Udostępnij
+Name[pt_BR]=Compartilhar
 Name[sl]=Deli
 Name[sv]=Dela
 Name[ta]=பகிர்
@@ -288,6 +297,8 @@ Comment[es]=El resultado de compartir una parte de contenido
 Comment[eu]=Eduki pieza bat partekatzearen emaitza
 Comment[fi]=Tulos yhden sisältöosasen jakamisesta
 Comment[fr]=Le résultat du partage d'une partie de contenu.
+Comment[gl]=O resultado de compartir un fragmento de contido.
+Comment[he]=תוצאת שיתוף פיסת תוכן
 Comment[hu]=Tartalom megosztásának eredménye
 Comment[ia]=Le exito de compartir un pecietta de contento
 Comment[it]=Il risultato della condivisione di un contenuto
@@ -296,6 +307,7 @@ Comment[lv]=Satura kopīgošanas rezultāts
 Comment[nl]=Het resultaat van het delen van een stukje inhoud
 Comment[nn]=Resultatet av deling av innhald
 Comment[pl]=Wynik udostępniania kawałka treści
+Comment[pt_BR]=O resultado de compartilhar um conteúdo
 Comment[sl]=Rezultat deljenega kosa vsebine
 Comment[sv]=Resultatet av att dela innehåll
 Comment[ta]=எதையோ பகிர்ந்த‍தன் விளைவு

src/neochatconfig.kcfg

@@ -187,5 +187,11 @@
       <default>false</default>
     </entry>
   </group>
+  <group name="Security">
+    <entry name="RejectUnknownInvites" type="bool">
+      <label>Reject unknown invites</label>
+      <default>false</default>
+    </entry>
+  </group>
 </kcfg>
 

src/neochatconnection.cpp

@@ -25,6 +25,7 @@
 
 #include <Quotient/csapi/content-repo.h>
 #include <Quotient/csapi/profile.h>
+#include <Quotient/csapi/versions.h>
 #include <Quotient/database.h>
 #include <Quotient/jobs/downloadfilejob.h>
 #include <Quotient/qt_connection_util.h>
@@ -132,6 +133,21 @@ void NeoChatConnection::connectSignals()
         Q_EMIT homeNotificationsChanged();
         Q_EMIT homeHaveHighlightNotificationsChanged();
     });
+
+    // Fetch unstable features
+    // TODO: Expose unstableFeatures() in libQuotient
+    connect(
+        this,
+        &Connection::connected,
+        this,
+        [this] {
+            auto job = callApi<GetVersionsJob>(BackgroundRequest);
+            connect(job, &GetVersionsJob::success, this, [this, job] {
+                m_canCheckMutualRooms = job->unstableFeatures().contains("uk.half-shot.msc2666.query_mutual_rooms"_ls);
+                Q_EMIT canCheckMutualRoomsChanged();
+            });
+        },
+        Qt::SingleShotConnection);
 }
 
 int NeoChatConnection::badgeNotificationCount() const
@@ -200,6 +216,11 @@ QVariantList NeoChatConnection::getSupportedRoomVersions() const
     return supportedRoomVersions;
 }
 
+bool NeoChatConnection::canCheckMutualRooms() const
+{
+    return m_canCheckMutualRooms;
+}
+
 void NeoChatConnection::changePassword(const QString &currentPassword, const QString &newPassword)
 {
     auto job = callApi<NeochatChangePasswordJob>(newPassword, false);

src/neochatconnection.h

@@ -79,6 +79,11 @@ class NeoChatConnection : public Quotient::Connection
      */
     Q_PROPERTY(bool isOnline READ isOnline WRITE setIsOnline NOTIFY isOnlineChanged)
 
+    /**
+     * @brief Whether the server supports querying a user's mutual rooms.
+     */
+    Q_PROPERTY(bool canCheckMutualRooms READ canCheckMutualRooms NOTIFY canCheckMutualRoomsChanged)
+
 public:
     /**
      * @brief Defines the status after an attempt to change the password on an account.
@@ -95,6 +100,7 @@ public:
 
     Q_INVOKABLE void logout(bool serverSideLogout);
     Q_INVOKABLE QVariantList getSupportedRoomVersions() const;
+    bool canCheckMutualRooms() const;
 
     /**
      * @brief Change the password for an account.
@@ -196,6 +202,7 @@ Q_SIGNALS:
     void passwordStatus(NeoChatConnection::PasswordStatus status);
     void userConsentRequired(QUrl url);
     void badgeNotificationCountChanged(NeoChatConnection *connection, int count);
+    void canCheckMutualRoomsChanged();
 
 private:
     bool m_isOnline = true;
@@ -208,4 +215,6 @@ private:
     int m_badgeNotificationCount = 0;
 
     QHash<QUrl, LinkPreviewer *> m_linkPreviewers;
+
+    bool m_canCheckMutualRooms = false;
 };

src/neochatroom.cpp

@@ -41,6 +41,7 @@
 #include "events/joinrulesevent.h"
 #include "events/pollevent.h"
 #include "filetransferpseudojob.h"
+#include "jobs/neochatgetcommonroomsjob.h"
 #include "neochatconfig.h"
 #include "notificationsmanager.h"
 #include "roomlastmessageprovider.h"
@@ -69,6 +70,26 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
         setFileUploadingProgress(0);
         setHasFileUploading(false);
     });
+    connect(this, &Room::fileTransferCompleted, this, [this](QString eventId) {
+        const auto evtIt = findInTimeline(eventId);
+        if (evtIt != messageEvents().rend()) {
+            const auto m_event = evtIt->viewAs<RoomEvent>();
+            QString mxcUrl;
+            if (auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
+                if (event->hasFileContent()) {
+                    mxcUrl = event->content()->fileInfo()->url().toString();
+                }
+            } else if (auto event = eventCast<const Quotient::StickerEvent>(m_event)) {
+                mxcUrl = event->image().fileInfo()->url().toString();
+            }
+            if (mxcUrl.isEmpty()) {
+                return;
+            }
+            auto localPath = this->fileTransferInfo(eventId).localPath.toLocalFile();
+            auto config = KSharedConfig::openStateConfig(QStringLiteral("neochatdownloads"))->group(QStringLiteral("downloads"));
+            config.writePathEntry(mxcUrl.mid(6), localPath);
+        }
+    });
 
     connect(this, &Room::addedMessages, this, &NeoChatRoom::readMarkerLoadedChanged);
     connect(this, &Room::aboutToAddHistoricalMessages, this, &NeoChatRoom::cleanupExtraEventRange);
@@ -109,14 +130,38 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
                 return;
             }
             auto roomMemberEvent = currentState().get<RoomMemberEvent>(localMember().id());
-            QImage avatar_image;
-            if (roomMemberEvent && !member(roomMemberEvent->senderId()).avatarUrl().isEmpty()) {
-                avatar_image = memberAvatar(roomMemberEvent->senderId()).get(this->connection(), 128, [] {});
+
+            auto showNotification = [this, roomMemberEvent] {
+                QImage avatar_image;
+                if (roomMemberEvent && !member(roomMemberEvent->senderId()).avatarUrl().isEmpty()) {
+                    avatar_image = memberAvatar(roomMemberEvent->senderId()).get(this->connection(), 128, [] {});
+                } else {
+                    qWarning() << "using this room's avatar";
+                    avatar_image = avatar(128);
+                }
+
+                NotificationsManager::instance().postInviteNotification(this,
+                                                                        displayName(),
+                                                                        member(roomMemberEvent->senderId()).htmlSafeDisplayName(),
+                                                                        avatar_image);
+            };
+
+            if (NeoChatConfig::rejectUnknownInvites()) {
+                auto job = this->connection()->callApi<NeochatGetCommonRoomsJob>(roomMemberEvent->senderId());
+                connect(job, &BaseJob::result, this, [this, job, roomMemberEvent, showNotification] {
+                    QJsonObject replyData = job->jsonData();
+                    if (replyData.contains(QStringLiteral("joined"))) {
+                        const bool inAnyOfOurRooms = !replyData[QStringLiteral("joined")].toArray().isEmpty();
+                        if (inAnyOfOurRooms) {
+                            showNotification();
+                        } else {
+                            leaveRoom();
+                        }
+                    }
+                });
             } else {
-                qWarning() << "using this room's avatar";
-                avatar_image = avatar(128);
+                showNotification();
             }
-            NotificationsManager::instance().postInviteNotification(this, displayName(), member(roomMemberEvent->senderId()).htmlSafeDisplayName(), avatar_image);
         },
         Qt::SingleShotConnection);
     connect(this, &Room::changed, this, [this] {
@@ -846,11 +891,18 @@ void NeoChatRoom::setUserPowerLevel(const QString &userID, const int &powerLevel
 
 int NeoChatRoom::getUserPowerLevel(const QString &userId) const
 {
-    auto powerLevelEvent = currentState().get<RoomPowerLevelsEvent>();
-    if (!powerLevelEvent) {
-        return 0;
+    if (!successorId().isEmpty()) {
+        return 0; // No one can upgrade a room that's already upgraded
     }
-    return powerLevelEvent->powerLevelForUser(userId);
+
+    const auto &mId = userId.isEmpty() ? connection()->userId() : userId;
+    if (const auto *plEvent = currentState().get<RoomPowerLevelsEvent>()) {
+        return plEvent->powerLevelForUser(mId);
+    }
+    if (const auto *createEvent = creation()) {
+        return createEvent->senderId() == mId ? 100 : 0;
+    }
+    return 0; // That's rather weird but may happen, according to rvdh
 }
 
 QCoro::Task<void> NeoChatRoom::doDeleteMessagesByUser(const QString &user, QString reason)
@@ -1286,7 +1338,6 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
 
     m_currentPushNotificationState = state;
     Q_EMIT pushNotificationStateChanged(m_currentPushNotificationState);
-
 }
 
 void NeoChatRoom::updatePushNotificationState(QString type)
@@ -1370,7 +1421,7 @@ void NeoChatRoom::openEventMediaExternally(const QString &eventId)
     if (evtIt != messageEvents().rend() && is<RoomMessageEvent>(**evtIt)) {
         const auto event = evtIt->viewAs<RoomMessageEvent>();
         if (event->hasFileContent()) {
-            const auto transferInfo = fileTransferInfo(eventId);
+            const auto transferInfo = cachedFileTransferInfo(event);
             if (transferInfo.completed()) {
                 UrlHelper helper;
                 helper.openUrl(transferInfo.localPath);
@@ -1378,15 +1429,20 @@ void NeoChatRoom::openEventMediaExternally(const QString &eventId)
                 downloadFile(eventId,
                              QUrl(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + u'/'
                                   + event->id().replace(u':', u'_').replace(u'/', u'_').replace(u'+', u'_') + fileNameToDownload(eventId)));
-                connect(this, &Room::fileTransferCompleted, this, [this, eventId](QString id, QUrl localFile, FileSourceInfo fileMetadata) {
-                    Q_UNUSED(localFile);
-                    Q_UNUSED(fileMetadata);
-                    if (id == eventId) {
-                        auto transferInfo = fileTransferInfo(eventId);
-                        UrlHelper helper;
-                        helper.openUrl(transferInfo.localPath);
-                    }
-                });
+                connect(
+                    this,
+                    &Room::fileTransferCompleted,
+                    this,
+                    [this, eventId](QString id, QUrl localFile, FileSourceInfo fileMetadata) {
+                        Q_UNUSED(localFile);
+                        Q_UNUSED(fileMetadata);
+                        if (id == eventId) {
+                            auto transferInfo = fileTransferInfo(eventId);
+                            UrlHelper helper;
+                            helper.openUrl(transferInfo.localPath);
+                        }
+                    },
+                    static_cast<Qt::ConnectionType>(Qt::SingleShotConnection));
             }
         }
     }
@@ -1406,20 +1462,66 @@ void NeoChatRoom::copyEventMedia(const QString &eventId)
                 downloadFile(eventId,
                              QUrl(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + u'/'
                                   + event->id().replace(u':', u'_').replace(u'/', u'_').replace(u'+', u'_') + fileNameToDownload(eventId)));
-                connect(this, &Room::fileTransferCompleted, this, [this, eventId](QString id, QUrl localFile, FileSourceInfo fileMetadata) {
-                    Q_UNUSED(localFile);
-                    Q_UNUSED(fileMetadata);
-                    if (id == eventId) {
-                        auto transferInfo = fileTransferInfo(eventId);
-                        Clipboard clipboard;
-                        clipboard.setImage(transferInfo.localPath);
-                    }
-                });
+                connect(
+                    this,
+                    &Room::fileTransferCompleted,
+                    this,
+                    [this, eventId](QString id, QUrl localFile, FileSourceInfo fileMetadata) {
+                        Q_UNUSED(localFile);
+                        Q_UNUSED(fileMetadata);
+                        if (id == eventId) {
+                            auto transferInfo = fileTransferInfo(eventId);
+                            Clipboard clipboard;
+                            clipboard.setImage(transferInfo.localPath);
+                        }
+                    },
+                    static_cast<Qt::ConnectionType>(Qt::SingleShotConnection));
             }
         }
     }
 }
 
+FileTransferInfo NeoChatRoom::cachedFileTransferInfo(const Quotient::RoomEvent *event) const
+{
+    QString mxcUrl;
+    int total = 0;
+    if (auto evt = eventCast<const Quotient::RoomMessageEvent>(event)) {
+        if (evt->hasFileContent()) {
+            mxcUrl = evt->content()->fileInfo()->url().toString();
+            total = evt->content()->fileInfo()->payloadSize;
+        }
+    } else if (auto evt = eventCast<const Quotient::StickerEvent>(event)) {
+        mxcUrl = evt->image().fileInfo()->url().toString();
+        total = evt->image().fileInfo()->payloadSize;
+    }
+
+    FileTransferInfo transferInfo = fileTransferInfo(event->id());
+    if (transferInfo.active()) {
+        return transferInfo;
+    }
+
+    auto config = KSharedConfig::openStateConfig(QStringLiteral("neochatdownloads"))->group(QStringLiteral("downloads"));
+    if (!config.hasKey(mxcUrl.mid(6))) {
+        return transferInfo;
+    }
+
+    const auto path = config.readPathEntry(mxcUrl.mid(6), QString());
+    QFileInfo info(path);
+    if (!info.isFile()) {
+        config.deleteEntry(mxcUrl);
+        return transferInfo;
+    }
+    // TODO: we could check the hash here
+    return FileTransferInfo{
+        .status = FileTransferInfo::Completed,
+        .isUpload = false,
+        .progress = total,
+        .total = total,
+        .localDir = QUrl(info.dir().path()),
+        .localPath = QUrl::fromLocalFile(path),
+    };
+}
+
 ChatBarCache *NeoChatRoom::mainCache() const
 {
     return m_mainCache;
@@ -1665,6 +1767,11 @@ const RoomEvent *NeoChatRoom::getEvent(const QString &eventId) const
         return timelineIt->get();
     }
 
+    const auto pendingIt = findPendingEvent(eventId);
+    if (pendingIt != pendingEvents().end()) {
+        return pendingIt->event();
+    }
+
     auto extraIt = std::find_if(m_extraEvents.begin(), m_extraEvents.end(), [eventId](const Quotient::event_ptr_tt<Quotient::RoomEvent> &event) {
         return event->id() == eventId;
     });

src/neochatroom.h

@@ -579,6 +579,14 @@ public:
      */
     Q_INVOKABLE QString invitingUserId() const;
 
+    /**
+     * @brief Return the cached file transfer information for the event.
+     *
+     * If we downloaded the file previously, return a struct with Completed status
+     * and the local file path stored in KSharedCOnfig
+     */
+    Quotient::FileTransferInfo cachedFileTransferInfo(const Quotient::RoomEvent *event) const;
+
 private:
     QSet<const Quotient::RoomEvent *> highlights;
 

src/neochatroommember.cpp

@@ -0,0 +1,166 @@
+// SPDX-FileCopyrightText: 2024 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 "neochatroommember.h"
+
+#include "neochatroom.h"
+
+NeochatRoomMember::NeochatRoomMember(NeoChatRoom *room, const QString &memberId)
+    : m_room(room)
+    , m_memberId(memberId)
+{
+    Q_ASSERT(!m_memberId.isEmpty());
+
+    if (m_room != nullptr) {
+        connect(m_room, &NeoChatRoom::memberNameUpdated, this, [this](Quotient::RoomMember member) {
+            if (member.id() == m_memberId) {
+                Q_EMIT displayNameUpdated();
+            }
+        });
+        connect(m_room, &NeoChatRoom::memberAvatarUpdated, this, [this](Quotient::RoomMember member) {
+            if (member.id() == m_memberId) {
+                Q_EMIT avatarUpdated();
+            }
+        });
+    }
+}
+
+QString NeochatRoomMember::id() const
+{
+    return m_memberId;
+}
+
+Quotient::Uri NeochatRoomMember::uri() const
+{
+    if (m_room == nullptr || m_memberId.isEmpty()) {
+        return {};
+    }
+
+    return m_room->member(m_memberId).uri();
+}
+
+bool NeochatRoomMember::isLocalMember() const
+{
+    if (m_room == nullptr || m_memberId.isEmpty()) {
+        return false;
+    }
+
+    return m_room->member(m_memberId).isLocalMember();
+}
+
+Quotient::Membership NeochatRoomMember::membershipState() const
+{
+    if (m_room == nullptr || m_memberId.isEmpty()) {
+        return Quotient::Membership::Leave;
+    }
+
+    return m_room->member(m_memberId).membershipState();
+}
+
+QString NeochatRoomMember::name() const
+{
+    if (m_room == nullptr || m_memberId.isEmpty()) {
+        return id();
+    }
+
+    return m_room->member(m_memberId).name();
+}
+
+QString NeochatRoomMember::displayName() const
+{
+    if (m_room == nullptr || m_memberId.isEmpty()) {
+        return id();
+    }
+
+    return m_room->member(m_memberId).displayName();
+}
+
+QString NeochatRoomMember::htmlSafeDisplayName() const
+{
+    if (m_room == nullptr || m_memberId.isEmpty()) {
+        return id();
+    }
+
+    return m_room->member(m_memberId).htmlSafeDisplayName();
+}
+
+QString NeochatRoomMember::fullName() const
+{
+    if (m_room == nullptr || m_memberId.isEmpty()) {
+        return id();
+    }
+
+    return m_room->member(m_memberId).fullName();
+}
+
+QString NeochatRoomMember::htmlSafeFullName() const
+{
+    if (m_room == nullptr || m_memberId.isEmpty()) {
+        return id();
+    }
+
+    return m_room->member(m_memberId).htmlSafeFullName();
+}
+
+QString NeochatRoomMember::disambiguatedName() const
+{
+    if (m_room == nullptr || m_memberId.isEmpty()) {
+        return id();
+    }
+
+    return m_room->member(m_memberId).disambiguatedName();
+}
+
+QString NeochatRoomMember::htmlSafeDisambiguatedName() const
+{
+    if (m_room == nullptr || m_memberId.isEmpty()) {
+        return id();
+    }
+
+    return m_room->member(m_memberId).htmlSafeDisambiguatedName();
+}
+
+int NeochatRoomMember::hue() const
+{
+    if (m_room == nullptr || m_memberId.isEmpty()) {
+        return 0;
+    }
+
+    return m_room->member(m_memberId).hue();
+}
+
+qreal NeochatRoomMember::hueF() const
+{
+    if (m_room == nullptr || m_memberId.isEmpty()) {
+        return 0.0;
+    }
+
+    return m_room->member(m_memberId).hueF();
+}
+
+QColor NeochatRoomMember::color() const
+{
+    if (m_room == nullptr || m_memberId.isEmpty()) {
+        return {};
+    }
+
+    return m_room->member(m_memberId).color();
+}
+
+QString NeochatRoomMember::avatarMediaId() const
+{
+    if (m_room == nullptr || m_memberId.isEmpty()) {
+        return {};
+    }
+
+    return m_room->member(m_memberId).avatarMediaId();
+}
+
+QUrl NeochatRoomMember::avatarUrl() const
+{
+    if (m_room == nullptr || m_memberId.isEmpty()) {
+        return {};
+    }
+
+    return m_room->member(m_memberId).avatarUrl();
+}

src/neochatroommember.h

@@ -0,0 +1,83 @@
+// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#pragma once
+
+#include <QObject>
+#include <QPointer>
+#include <qqmlintegration.h>
+
+#include <Quotient/roommember.h>
+#include <Quotient/uri.h>
+
+class NeoChatRoom;
+
+/**
+ * @class NeochatRoomMember
+ *
+ * This class is a shim around RoomMember that can be safety passed to QML.
+ *
+ * Because RoomMember has an internal pointer to a RoomMemberEvent it is
+ * designed to be created used then quickly discarded as the stste event is changed
+ * every time the member updates. Passing these to QML which will hold onto them
+ * can lead to accessing an already deleted Quotient::RoomMemberEvent relatively easily.
+ *
+ * This class instead holds a member ID and can therefore always safely create and
+ * access Quotient::RoomMember objects while being used as long as needed by QML.
+ *
+ * @note This is only needed to pass to QML if only accessing in CPP RoomMmeber can
+ *       be used safely.
+ *
+ * @note The interface is the same as Quotient::RoomMember.
+ *
+ * @sa Quotient::RoomMember
+ */
+class NeochatRoomMember : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
+    Q_PROPERTY(QString id READ id CONSTANT)
+    Q_PROPERTY(Quotient::Uri uri READ uri CONSTANT)
+    Q_PROPERTY(bool isLocalMember READ isLocalMember CONSTANT)
+    Q_PROPERTY(QString displayName READ displayName NOTIFY displayNameUpdated)
+    Q_PROPERTY(QString htmlSafeDisplayName READ htmlSafeDisplayName NOTIFY displayNameUpdated)
+    Q_PROPERTY(QString fullName READ fullName NOTIFY displayNameUpdated)
+    Q_PROPERTY(QString htmlSafeFullName READ htmlSafeFullName NOTIFY displayNameUpdated)
+    Q_PROPERTY(QString disambiguatedName READ disambiguatedName NOTIFY displayNameUpdated)
+    Q_PROPERTY(QString htmlSafeDisambiguatedName READ htmlSafeDisambiguatedName NOTIFY displayNameUpdated)
+    Q_PROPERTY(int hue READ hue CONSTANT)
+    Q_PROPERTY(qreal hueF READ hueF CONSTANT)
+    Q_PROPERTY(QColor color READ color CONSTANT)
+    Q_PROPERTY(QUrl avatarUrl READ avatarUrl NOTIFY avatarUpdated)
+
+public:
+    NeochatRoomMember() = default;
+    explicit NeochatRoomMember(NeoChatRoom *room, const QString &memberId);
+
+    QString id() const;
+    Quotient::Uri uri() const;
+    bool isLocalMember() const;
+    Quotient::Membership membershipState() const;
+    QString name() const;
+    QString displayName() const;
+    QString htmlSafeDisplayName() const;
+    QString fullName() const;
+    QString htmlSafeFullName() const;
+    QString disambiguatedName() const;
+    QString htmlSafeDisambiguatedName() const;
+    int hue() const;
+    qreal hueF() const;
+    QColor color() const;
+    QString avatarMediaId() const;
+    QUrl avatarUrl() const;
+
+Q_SIGNALS:
+    void displayNameUpdated();
+    void avatarUpdated();
+
+private:
+    QPointer<NeoChatRoom> m_room;
+    const QString m_memberId = QString();
+};

src/notificationsmanager.cpp

@@ -110,6 +110,12 @@ void NotificationsManager::processNotificationJob(QPointer<NeoChatConnection> co
         }
         auto sender = room->member(notification["event"_ls]["sender"_ls].toString());
 
+        // Don't display notifications for events in invited rooms
+        // This should prevent empty notifications from appearing when they shouldn't
+        if (room->joinState() == JoinState::Invite) {
+            continue;
+        }
+
         QString body;
         if (notification["event"_ls]["type"_ls].toString() == "org.matrix.msc3381.poll.start"_ls) {
             body = notification["event"_ls]["content"_ls]["org.matrix.msc3381.poll.start"_ls]["question"_ls]["body"_ls].toString();
@@ -243,7 +249,6 @@ void NotificationsManager::postInviteNotification(NeoChatRoom *rawRoom, const QS
     notification->setText(i18n("%1 invited you to a room", sender));
     notification->setTitle(title);
     notification->setPixmap(createNotificationImage(icon, nullptr));
-    notification->setFlags(KNotification::Persistent);
     auto defaultAction = notification->addDefaultAction(i18n("Open this invitation in NeoChat"));
     connect(defaultAction, &KNotificationAction::activated, this, [notification, room]() {
         if (!room) {

src/plasma-runner-neochat.desktop

@@ -17,6 +17,7 @@ Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[gl]=NeoChat
+Name[he]=NeoChat
 Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
@@ -57,6 +58,7 @@ 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[he]=איתור חדרים ב־NeoChat
 Comment[hu]=Szobák keresése a NeoChatben
 Comment[ia]=Trova salas in NeoChat
 Comment[id]=Cari ruangan di NeoChat

src/purpose/purposeplugin.json

@@ -4,8 +4,34 @@
             {
                 "Name": "Tobias Fella",
                 "Name[ar]": "توبياس فلة",
+                "Name[ca@valencia]": "Tobias Fella",
+                "Name[ca]": "Tobias Fella",
+                "Name[cs]": "Tobias Fella",
+                "Name[de]": "Tobias Fella",
+                "Name[en_GB]": "Tobias Fella",
+                "Name[eo]": "Tobias Fella",
+                "Name[es]": "Tobias Fella",
+                "Name[eu]": "Tobias Fella",
+                "Name[fi]": "Tobias Fella",
+                "Name[fr]": "Tobias Fella",
+                "Name[gl]": "Tobias Fella",
+                "Name[hu]": "Tobias Fella",
+                "Name[ia]": "Tobias Fella",
+                "Name[it]": "Tobias Fella",
+                "Name[ka]": "Tobias Fella",
+                "Name[lv]": "Tobias Fella",
+                "Name[nl]": "Tobias Fella",
+                "Name[nn]": "Tobias Fella",
+                "Name[pl]": "Tobias Fella",
+                "Name[pt_BR]": "Tobias Fella",
+                "Name[ru]": "Tobias Fella",
+                "Name[sl]": "Tobias Fella",
+                "Name[sv]": "Tobias Fella",
                 "Name[ta]": "டோபியாஸ் ஃபெல்லா",
-                "Name[x-test]": "xxTobias Fellaxx"
+                "Name[tr]": "Tobias Fella",
+                "Name[uk]": "Tobias Fella",
+                "Name[x-test]": "xxTobias Fellaxx",
+                "Name[zh_TW]": "Tobias Fella"
             }
         ],
         "Category": "Utilities",
@@ -14,6 +40,7 @@
         "Description[ca@valencia]": "Compartix a través de NeoChat",
         "Description[ca]": "Comparteix a través del NeoChat",
         "Description[de]": "Über NeoChat teilen",
+        "Description[en_GB]": "Share via NeoChat",
         "Description[eo]": "Kundividi per NeoChat",
         "Description[es]": "Compartir mediante NeoChat",
         "Description[eu]": "Partekatu NeoChat bidez",
@@ -28,6 +55,7 @@
         "Description[nl]": "Delen via NeoChat",
         "Description[nn]": "Del via NeoChat",
         "Description[pl]": "Udostępnij przez NeoChat",
+        "Description[pt_BR]": "Compartilhar via NeoChat",
         "Description[ru]": "Опубликовать в NeoChat",
         "Description[sl]": "Deli prek NeoChat",
         "Description[sv]": "Dela via NeoChat",
@@ -40,9 +68,35 @@
         "License": "GPL",
         "Name": "NeoChat",
         "Name[ar]": "نيوتشات",
+        "Name[ast]": "NeoChat",
+        "Name[ca@valencia]": "NeoChat",
+        "Name[ca]": "NeoChat",
+        "Name[cs]": "NeoChat",
+        "Name[de]": "NeoChat",
+        "Name[en_GB]": "NeoChat",
+        "Name[eo]": "NeoChat",
+        "Name[es]": "NeoChat",
+        "Name[eu]": "NeoChat",
+        "Name[fi]": "NeoChat",
+        "Name[fr]": "NeoChat",
+        "Name[gl]": "NeoChat",
+        "Name[hu]": "NeoChat",
         "Name[ia]": "Neochat",
+        "Name[it]": "NeoChat",
+        "Name[ka]": "NeoChat",
+        "Name[lv]": "NeoChat",
+        "Name[nl]": "NeoChat",
+        "Name[nn]": "NeoChat",
+        "Name[pl]": "NeoChat",
+        "Name[pt_BR]": "NeoChat",
+        "Name[ru]": "NeoChat",
+        "Name[sl]": "NeoChat",
+        "Name[sv]": "NeoChat",
         "Name[ta]": "நியோச்சாட்",
+        "Name[tr]": "NeoChat",
+        "Name[uk]": "NeoChat",
         "Name[x-test]": "xxNeoChatxx",
+        "Name[zh_TW]": "NeoChat",
         "X-Purpose-ActionDisplay": "NeoChat"
     },
     "X-Purpose-PluginTypes": [

src/qml/AccountDialog.qml

@@ -1,84 +0,0 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick
-import QtQuick.Controls as QQC2
-import QtQuick.Layouts
-
-import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.components as KirigamiComponents
-import org.kde.kirigamiaddons.formcard as FormCard
-import org.kde.prison
-
-import org.kde.neochat
-
-Kirigami.Dialog {
-    id: root
-
-    property NeoChatConnection connection
-
-    leftPadding: 0
-    rightPadding: 0
-    topPadding: 0
-    bottomPadding: 0
-
-    standardButtons: Kirigami.Dialog.NoButton
-
-    width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
-
-    contentItem: ColumnLayout {
-        spacing: 0
-
-        KirigamiComponents.Avatar {
-            id: avatar
-
-            readonly property string mediaId: root.connection.localUser.avatarMediaId
-
-            Layout.preferredWidth: Kirigami.Units.iconSizes.huge * 2
-            Layout.preferredHeight: Kirigami.Units.iconSizes.huge * 2
-            Layout.alignment: Qt.AlignHCenter
-
-            name: root.room ? root.room.member(root.user.id).displayName : root.user.displayName
-            source: mediaId ? root.connection.makeMediaUrl("mxc://" + mediaId) : ""
-            color: root.room ? root.room.member(root.user.id).color : QmlUtils.getUserColor(root.user.hueF)
-        }
-
-        QQC2.Label {
-            Layout.fillWidth: true
-            font.bold: false
-            font.weight: Font.DemiBold
-            font.pixelSize: 32
-
-            elide: Text.ElideRight
-            wrapMode: Text.NoWrap
-            text: root.connection.localUser.displayName
-            textFormat: Text.PlainText
-            horizontalAlignment: Text.AlignHCenter
-        }
-
-        Kirigami.SelectableLabel {
-            Layout.fillWidth: true
-            Layout.bottomMargin: Kirigami.Units.largeSpacing
-            font.pixelSize: 16
-            textFormat: TextEdit.PlainText
-            text: root.connection.localUser.id
-            horizontalAlignment: Text.AlignHCenter
-        }
-        FormCard.FormDelegateSeparator {}
-        FormCard.FormButtonDelegate {
-            text: i18n("Edit Account")
-        }
-        FormCard.FormButtonDelegate {
-            text: i18n("Switch Account")
-        }
-        FormCard.FormButtonDelegate {
-            text: i18n("Logout")
-        }
-
-    }
-    Component {
-        id: qrMaximizeComponent
-        QrCodeMaximizeComponent {}
-    }
-}

src/qml/CodeMaximizeComponent.qml

@@ -17,7 +17,7 @@ Components.AbstractMaximizeComponent {
     /**
      * @brief The message author.
      */
-    property RoomMember author
+    property NeochatRoomMember author
 
     /**
      * @brief The timestamp of the message.

src/qml/InvitationView.qml

@@ -15,7 +15,10 @@ Kirigami.PlaceholderMessage {
     required property NeoChatRoom currentRoom
 
     text: i18n("Accept this invitation?")
+    explanation: root.currentRoom.connection.canCheckMutualRooms ? i18n("You can reject invitations from unknown users under Security settings.") : ""
     RowLayout {
+        Layout.alignment: Qt.AlignHCenter
+
         QQC2.Button {
             Layout.alignment: Qt.AlignHCenter
             text: i18nc("@action:button The thing being rejected is an invitation to chat", "Reject and ignore user")

src/qml/LocationsPage.qml

@@ -27,7 +27,10 @@ Kirigami.Page {
             let c = LocationHelper.center(LocationHelper.unite(locationsModel.boundingBox, liveLocationsModel.boundingBox));
             return QtPositioning.coordinate(c.y, c.x);
         }
-        map.zoomLevel: LocationHelper.zoomToFit(LocationHelper.unite(locationsModel.boundingBox, liveLocationsModel.boundingBox), mapView.width, mapView.height)
+        map.zoomLevel: {
+            const zoom = LocationHelper.zoomToFit(LocationHelper.unite(locationsModel.boundingBox, liveLocationsModel.boundingBox), mapView.width, mapView.height)
+            return Math.min(Math.max(zoom, map.minimumZoomLevel), map.maximumZoomLevel);
+        }
 
         MapItemView {
             Component.onCompleted: mapView.map.addMapItemView(this)

src/qml/RoomInformation.qml

@@ -192,20 +192,7 @@ QQC2.ScrollView {
             }
         }
 
-        KSortFilterProxyModel {
-            id: sortedMessageEventModel
-
-            sourceModel: UserListModel {
-                room: root.room
-            }
-
-            sortRoleName: "powerLevel"
-            sortOrder: Qt.DescendingOrder
-            filterRoleName: "name"
-            filterCaseSensitivity: Qt.CaseInsensitive
-        }
-
-        model: root.room.isDirectChat() ? 0 : sortedMessageEventModel
+        model: root.room.isDirectChat() ? 0 : RoomManager.userListModel
 
         clip: true
         focus: true

src/qml/RoomListPage.qml

@@ -227,6 +227,11 @@ Kirigami.Page {
         }
     }
 
+    footer: Loader {
+        width: parent.width
+        sourceComponent: Kirigami.Settings.isMobile ? exploreComponentMobile : userInfoDesktop
+    }
+
     MouseArea {
         anchors.top: parent.top
         anchors.bottom: parent.bottom

src/qml/SpaceDrawer.qml

@@ -47,22 +47,6 @@ QQC2.Control {
                 width: scrollView.width
                 spacing: 0
 
-                AvatarTabButton {
-                    readonly property string mediaId: root.connection.localUser.avatarMediaId
-
-                    Layout.fillWidth: true
-                    Layout.preferredHeight: width - Kirigami.Units.smallSpacing
-                    Layout.maximumHeight: width - Kirigami.Units.smallSpacing
-                    Layout.topMargin: Kirigami.Units.smallSpacing / 2
-                    Layout.bottomMargin: Kirigami.Units.smallSpacing / 2
-
-                    text: root.connection.localUser.displayName
-                    source: mediaId ? root.connection.makeMediaUrl("mxc://" + mediaId) : ""
-                    onClicked: Qt.createComponent("org.kde.neochat", "AccountDialog").createObject(root, {
-                        connection: root.connection
-                    }).open()
-                }
-
                 AvatarTabButton {
                     id: notificationsButton
 

src/qml/TimelineView.qml

@@ -108,6 +108,7 @@ QQC2.ScrollView {
             onTriggered: {
                 root.roomChanging = false;
                 markReadIfVisibleTimer.reset();
+                RoomManager.activateUserModel();
             }
         }
         onAtYEndChanged: if (!root.roomChanging) {
@@ -190,7 +191,7 @@ QQC2.ScrollView {
             implicitHeight: Kirigami.Units.gridUnit * 2
 
             z: 2
-            visible: root.currentRoom && root.currentRoom.hasUnreadMessages
+            visible: (root.currentRoom?.hasUnreadMessages ?? false)
 
             text: root.currentRoom.readMarkerLoaded ? i18n("Jump to first unread message") : i18n("Jump to oldest loaded message")
             action: Kirigami.Action {

src/registration.cpp

@@ -106,9 +106,7 @@ void Registration::registerAccount()
                 account.setHomeserver(connection->homeserver());
                 account.setDeviceId(connection->deviceId());
                 account.setDeviceName(displayName);
-                if (!Controller::instance().saveAccessTokenToKeyChain(account.userId(), connection->accessToken())) {
-                    qWarning() << "Couldn't save access token";
-                }
+                Controller::instance().saveAccessTokenToKeyChain(account.userId(), connection->accessToken());
                 account.sync();
                 Controller::instance().addConnection(connection);
                 Controller::instance().setActiveConnection(connection);

src/roommanager.cpp

@@ -11,6 +11,7 @@
 #include "neochatconfig.h"
 #include "neochatconnection.h"
 #include "neochatroom.h"
+#include "neochatroommember.h"
 #include "spacehierarchycache.h"
 #include "urlhelper.h"
 
@@ -39,6 +40,7 @@ RoomManager::RoomManager(QObject *parent)
     , m_timelineModel(new TimelineModel(this))
     , m_messageFilterModel(new MessageFilterModel(this, m_timelineModel))
     , m_mediaMessageFilterModel(new MediaMessageFilterModel(this, m_messageFilterModel))
+    , m_userListModel(new UserListModel(this))
 {
     m_lastRoomConfig = m_config->group(QStringLiteral("LastOpenRoom"));
     m_lastSpaceConfig = m_config->group(QStringLiteral("LastOpenSpace"));
@@ -46,6 +48,7 @@ RoomManager::RoomManager(QObject *parent)
 
     connect(this, &RoomManager::currentRoomChanged, this, [this]() {
         m_timelineModel->setRoom(m_currentRoom);
+        m_userListModel->setRoom(m_currentRoom);
     });
 
     connect(&Controller::instance(), &Controller::activeConnectionChanged, this, [this](NeoChatConnection *connection) {
@@ -113,6 +116,16 @@ MediaMessageFilterModel *RoomManager::mediaMessageFilterModel() const
     return m_mediaMessageFilterModel;
 }
 
+UserListModel *RoomManager::userListModel() const
+{
+    return m_userListModel;
+}
+
+void RoomManager::activateUserModel()
+{
+    m_userListModel->activate();
+}
+
 UriResolveResult RoomManager::resolveResource(const Uri &uri)
 {
     return UriResolverBase::visitResource(m_connection, uri);
@@ -172,7 +185,7 @@ void RoomManager::maximizeMedia(int index)
     Q_EMIT showMaximizedMedia(index);
 }
 
-void RoomManager::maximizeCode(const RoomMember &author, const QDateTime &time, const QString &codeText, const QString &language)
+void RoomManager::maximizeCode(NeochatRoomMember *author, const QDateTime &time, const QString &codeText, const QString &language)
 {
     if (codeText.isEmpty()) {
         return;
@@ -190,14 +203,14 @@ void RoomManager::viewEventSource(const QString &eventId)
     Q_EMIT showEventSource(eventId);
 }
 
-void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, const QString &selectedText)
+void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, NeochatRoomMember *sender, const QString &selectedText)
 {
     const auto &event = **room->findInTimeline(eventId);
     const auto eventHandler = EventHandler(room, &event);
 
     if (eventHandler.getMediaInfo().contains("mimeType"_ls)) {
         Q_EMIT showFileMenu(eventId,
-                            eventHandler.getAuthor(),
+                            sender,
                             eventHandler.messageComponentType(),
                             eventHandler.getPlainBody(),
                             eventHandler.getMediaInfo()["mimeType"_ls].toString(),
@@ -205,12 +218,7 @@ void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, const
         return;
     }
 
-    Q_EMIT showMessageMenu(eventId,
-                           eventHandler.getAuthor(),
-                           eventHandler.messageComponentType(),
-                           eventHandler.getPlainBody(),
-                           eventHandler.getRichBody(),
-                           selectedText);
+    Q_EMIT showMessageMenu(eventId, sender, eventHandler.messageComponentType(), eventHandler.getPlainBody(), eventHandler.getRichBody(), selectedText);
 }
 
 bool RoomManager::hasOpenRoom() const

src/roommanager.h

@@ -22,6 +22,8 @@
 #include "models/sortfilterroomtreemodel.h"
 #include "models/sortfilterspacelistmodel.h"
 #include "models/timelinemodel.h"
+#include "models/userlistmodel.h"
+#include "neochatroommember.h"
 
 class NeoChatRoom;
 class NeoChatConnection;
@@ -120,6 +122,14 @@ class RoomManager : public QObject, public UriResolverBase
      */
     Q_PROPERTY(MediaMessageFilterModel *mediaMessageFilterModel READ mediaMessageFilterModel CONSTANT)
 
+    /**
+     * @brief The UserListModel that should be used for room member visualisation.
+     *
+     * @note Available here so that the room page and drawer both have access to the
+     *       same model.
+     */
+    Q_PROPERTY(UserListModel *userListModel READ userListModel CONSTANT)
+
     /**
      * @brief Whether a room is currently open in NeoChat.
      *
@@ -155,6 +165,9 @@ public:
     MessageFilterModel *messageFilterModel() const;
     MediaMessageFilterModel *mediaMessageFilterModel() const;
 
+    UserListModel *userListModel() const;
+    Q_INVOKABLE void activateUserModel();
+
     /**
      * @brief Resolve the given URI resource.
      *
@@ -204,7 +217,7 @@ public:
      */
     Q_INVOKABLE void maximizeMedia(int index);
 
-    Q_INVOKABLE void maximizeCode(const RoomMember &author, const QDateTime &time, const QString &codeText, const QString &language);
+    Q_INVOKABLE void maximizeCode(NeochatRoomMember *author, const QDateTime &time, const QString &codeText, const QString &language);
 
     /**
      * @brief Request that any full screen overlay currently open closes.
@@ -219,7 +232,7 @@ public:
     /**
      * @brief Show a context menu for the given event.
      */
-    Q_INVOKABLE void viewEventMenu(const QString &eventId, NeoChatRoom *room, const QString &selectedText = {});
+    Q_INVOKABLE void viewEventMenu(const QString &eventId, NeoChatRoom *room, NeochatRoomMember *sender, const QString &selectedText = {});
 
     ChatDocumentHandler *chatDocumentHandler() const;
     void setChatDocumentHandler(ChatDocumentHandler *handler);
@@ -275,7 +288,7 @@ Q_SIGNALS:
     /**
      * @brief Request a block of code is shown maximized.
      */
-    void showMaximizedCode(const RoomMember &author, const QDateTime &time, const QString &codeText, const QString &language);
+    void showMaximizedCode(NeochatRoomMember *author, const QDateTime &time, const QString &codeText, const QString &language);
 
     /**
      * @brief Request that any full screen overlay closes.
@@ -291,7 +304,7 @@ Q_SIGNALS:
      * @brief Request to show a menu for the given event.
      */
     void showMessageMenu(const QString &eventId,
-                         const Quotient::RoomMember &author,
+                         const NeochatRoomMember *author,
                          MessageComponentType::Type messageComponentType,
                          const QString &plainText,
                          const QString &htmlText,
@@ -301,7 +314,7 @@ Q_SIGNALS:
      * @brief Request to show a menu for the given media event.
      */
     void showFileMenu(const QString &eventId,
-                      const Quotient::RoomMember &author,
+                      const NeochatRoomMember *author,
                       MessageComponentType::Type messageComponentType,
                       const QString &plainText,
                       const QString &mimeType,
@@ -359,6 +372,9 @@ private:
     TimelineModel *m_timelineModel;
     MessageFilterModel *m_messageFilterModel;
     MediaMessageFilterModel *m_mediaMessageFilterModel;
+
+    UserListModel *m_userListModel;
+
     QPointer<NeoChatConnection> m_connection;
 
     void setCurrentRoom(const QString &roomId);

src/settings/EmoticonFormCard.qml

@@ -41,7 +41,7 @@ FormCard.FormCard {
                 width: stickerFlow.width / 4
                 height: width
 
-                onClicked: pageStack.pushDialogLayer(emoticonEditorPage, {
+                onClicked: root.QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(emoticonEditorPage, {
                     description: model.body ?? "",
                     index: model.index,
                     url: model.url,
@@ -90,7 +90,7 @@ FormCard.FormCard {
             width: stickerFlow.width / 4
             height: width
 
-            onClicked: pageStack.pushDialogLayer(emoticonEditorPage, {
+            onClicked: root.QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(emoticonEditorPage, {
                 description: "",
                 index: -1,
                 url: "",

src/settings/IgnoredUsersDialog.qml

@@ -50,7 +50,7 @@ FormCard.FormCardPage {
                     QQC2.ToolButton {
                         text: i18nc("@action:button", "Unignore this user")
                         icon.name: "list-remove-symbolic"
-                        onClicked: root.connection.removeFromIgnoredUsers(root.connection.user(modelData))
+                        onClicked: root.connection.removeFromIgnoredUsers(modelData)
                         display: QQC2.Button.IconOnly
                         QQC2.ToolTip.text: text
                         QQC2.ToolTip.visible: hovered

src/settings/NeoChatSecurityPage.qml

@@ -16,6 +16,32 @@ FormCard.FormCardPage {
 
     title: i18nc("@title", "Security")
 
+    FormCard.FormHeader {
+        title: i18nc("@title:group", "Invitations")
+    }
+    FormCard.FormCard {
+        FormCard.FormCheckDelegate {
+            text: i18nc("@option:check", "Reject invitations from unknown users")
+            description: connection.canCheckMutualRooms ? i18n("If enabled, NeoChat will reject invitations from from users you don't share a room with.") : i18n("Your server does not support this setting.")
+            checked: Config.rejectUnknownInvites
+            enabled: !Config.isRejectUnknownInvitesImmutable && connection.canCheckMutualRooms
+            onToggled: {
+                Config.rejectUnknownInvites = checked;
+                Config.save();
+            }
+        }
+    }
+    FormCard.FormHeader {
+        title: i18nc("@title:group", "Ignored Users")
+    }
+    FormCard.FormCard {
+        FormCard.FormButtonDelegate {
+            text: i18nc("@action:button", "Manage ignored users")
+            onClicked: root.ApplicationWindow.window.pageStack.push(ignoredUsersDialogComponent, {}, {
+                title: i18nc("@title:window", "Ignored Users")
+            });
+        }
+    }
     FormCard.FormHeader {
         title: i18nc("@title", "Keys")
     }
@@ -33,17 +59,6 @@ FormCard.FormCardPage {
             description: i18n("Device id")
         }
     }
-    FormCard.FormHeader {
-        title: i18nc("@title:group", "Ignored Users")
-    }
-    FormCard.FormCard {
-        FormCard.FormButtonDelegate {
-            text: i18nc("@action:button", "Manage ignored users")
-            onClicked: pageStack.pushDialogLayer(ignoredUsersDialogComponent, {}, {
-                title: i18nc("@title:window", "Ignored Users")
-            });
-        }
-    }
 
     Component {
         id: ignoredUsersDialogComponent

src/settings/Permissions.qml

@@ -20,11 +20,6 @@ FormCard.FormCardPage {
 
     title: i18nc('@title:window', 'Permissions')
 
-    property UserListModel userListModel: UserListModel {
-        id: userListModel
-        room: root.room
-    }
-
     readonly property PowerLevelModel powerLevelModel: PowerLevelModel {
         showMute: false
     }
@@ -39,7 +34,7 @@ FormCard.FormCardPage {
     FormCard.FormCard {
         Repeater {
             model: KSortFilterProxyModel {
-                sourceModel: userListModel
+                sourceModel: RoomManager.userListModel
                 sortRoleName: "powerLevel"
                 sortOrder: Qt.DescendingOrder
                 filterRowCallback: function (source_row, source_parent) {
@@ -158,7 +153,7 @@ FormCard.FormCardPage {
 
                         model: UserFilterModel {
                             id: userListFilterModel
-                            sourceModel: userListModel
+                            sourceModel: RoomManager.userListModel
                             filterText: userListSearchField.text
 
                             onFilterTextChanged: {

src/timeline/AudioComponent.qml

@@ -28,11 +28,6 @@ ColumnLayout {
      */
     required property string eventId
 
-    /**
-     * @brief The display text of the message.
-     */
-    required property string display
-
     /**
      * @brief The media info for the event.
      *
@@ -44,6 +39,7 @@ ColumnLayout {
      *  - width - The width in pixels of the audio media.
      *  - height - The height in pixels of the audio media.
      *  - tempInfo - mediaInfo (with the same properties as this except no tempInfo) for a temporary image while the file downloads.
+     *  - filename - original filename of the media
      */
     required property var mediaInfo
 
@@ -138,7 +134,7 @@ ColumnLayout {
             id: playButton
         }
         QQC2.Label {
-            text: root.display
+            text: root.mediaInfo.filename
             wrapMode: Text.Wrap
             Layout.fillWidth: true
         }
@@ -159,7 +155,7 @@ ColumnLayout {
             from: 0
             to: audio.duration
             value: audio.position
-            onMoved: audio.seek(value)
+            onMoved: audio.setPosition(value)
         }
 
         QQC2.Label {