GIT_SILENT Sync po/docbooks with svn

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

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 "3")
 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();
@@ -96,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());
@@ -191,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()

org.kde.neochat.appdata.xml

@@ -22,9 +22,11 @@
   <name xml:lang="eo">NeoChat</name>
   <name xml:lang="es">NeoChat</name>
   <name xml:lang="eu">NeoChat</name>
+  <name xml:lang="fa">نئوچت</name>
   <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>
@@ -54,6 +56,7 @@
   <summary xml:lang="ca">Xategeu amb els vostres amics a Matrix</summary>
   <summary xml:lang="ca-valencia">Xategeu amb els vostres amics a Matrix</summary>
   <summary xml:lang="cs">Mluvte se svými přáteli na Matrixu</summary>
+  <summary xml:lang="de">Mit den Freunden auf Matrix unterhalten</summary>
   <summary xml:lang="en-GB">Chat with your friends on matrix</summary>
   <summary xml:lang="eo">Babilu kun viaj amikoj sur matrix</summary>
   <summary xml:lang="es">Charle con sus amigos en matrix</summary>
@@ -61,6 +64,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>
@@ -70,6 +74,7 @@
   <summary xml:lang="nl">Met uw vrienden chatten op matrix</summary>
   <summary xml:lang="nn">Prat med vennar på Matrix</summary>
   <summary xml:lang="pl">Rozmawiaj ze swoimi znajomymi w Matriksie</summary>
+  <summary xml:lang="ru">Общение с друзьями в Matrix</summary>
   <summary xml:lang="sl">Klepet z vašimi prijatelji na matrixu</summary>
   <summary xml:lang="sv">Chatta med dina vänner på Matrix</summary>
   <summary xml:lang="ta">மேட்ரிக்ஸு மூலம் உங்கள் நண்பர்களிடம் பேசலாம்</summary>
@@ -83,12 +88,15 @@
     <p xml:lang="ar">نيوتشات هو تطبيق دردشة يتيح لك الاستفادة الكاملة من شبكة Matrix. فهو يوفر لك طريقة آمنة لإرسال الرسائل النصية ومقاطع الفيديو والملفات الصوتية إلى عائلتك وزملائك وأصدقائك.</p>
     <p xml:lang="ca">El NeoChat és una aplicació de xat que us permet aprofitar plenament la xarxa Matrix. Proporciona una manera segura d'enviar missatges de text, vídeos i arxius d'àudio a la vostra família, companys i amics.</p>
     <p xml:lang="ca-valencia">NeoChat és una aplicació de xat que us permet aprofitar plenament la xarxa Matrix. Proporciona una manera segura d'enviar missatges de text, vídeos i arxius d'àudio a la vostra família, companys i amics.</p>
+    <p xml:lang="de">NeoChat ist eine Anwendung für Unterhaltungen mit allen Vorteilen des Matrix-Netzwerkes. Sie bietet eine sichere Möglichkeit zum Versenden von Nachrichten, Videos und Audiodateien and die Familienmitglieder.</p>
     <p xml:lang="en-GB">NeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.</p>
     <p xml:lang="eo">NeoChat estas babilej-apo, kiu ebligas al vi plene profiti de la Matrix-reto. Ĝi provizas al vi sekuran manieron sendi tekstmesaĝojn, filmetojn kaj sondosierojn al via familio, kolegoj kaj amikoj.</p>
     <p xml:lang="es">NeoChat es una aplicación de chat que le permite aprovechar al máximo la red Matrix. Le proporciona un modo seguro de enviar mensajes de texto, vídeos y archivos de sonido a su familia, colegas y amigos.</p>
     <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>
@@ -97,6 +105,7 @@
     <p xml:lang="nl">NeoChat is een chat-toepassing die u het volledige voordeel van het Matrix-netwerk laat genieten. Het levert u op een veilige manier tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden te verzenden.</p>
     <p xml:lang="nn">NeoChat er ein prateapp som lèt deg bruka all funksjonalitet i Matrix-nettverket. Du kan utveksla tekst, lyd og videoar med vennar, familie og kollegaar på ein trygg måte.</p>
     <p xml:lang="pl">NoeChat to aplikacja do rozmów, która umożliwia wykorzystanie wszystkich możliwości Matriksa. Umożliwia wysyłanie wiadomości tekstowych, filmów i dźwięków w bezpieczny sposób do twojej rodziny, kolegów i przyjaciół.</p>
+    <p xml:lang="ru">NeoChat — приложение для общения, предоставляющее все преимущества сети Matrix. С его помощью можно безопасно отправлять текстовые сообщения, видеозаписи и звуковые файлы родственникам, коллегам и друзьям.</p>
     <p xml:lang="sl">NeoChat je aplikacija za klepet, ki vam omogoča, da v celoti izkoristite omrežje Matrix. Zagotavlja vam varen način za pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, sodelavcem in prijateljem.</p>
     <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>
     <p xml:lang="tr">NeoChat, Matrix ağının tüm özelliklerini kullanan bir sohbet uygulamasıdır. Ailenize, arkadaşlarınıza ve iş arkadaşlarınıza metin iletileri, ses ve video dosyaları göndermenin kolay bir yolunu sunar.</p>
@@ -107,6 +116,7 @@
     <p xml:lang="ar">يهدف نيوتشات إلى أن يكون تطبيقًا كامل الميزات لمواصفات ماتركس. على هذا النحو يتم دعم كل شيء في المواصفات المستقرة الحالية مع الاستثناءات الملحوظة لـ VoIP والخيوط وبعض جوانب التشفير من طرف إلى طرف. هناك عدد قليل من الإغفالات الصغيرة الأخرى بسبب حقيقة أن مواصفات ماتركس تتطور باستمرار ، ولكن يبقى الهدف توفير الدعم النهائي للمواصفات بأكملها.</p>
     <p xml:lang="ca">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de la VoIP, fils i alguns aspectes de l'encriptatge d'extrem a extrem. Hi ha algunes altres omissions més petites a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu segueix sent proporcionar suport eventual per a tota l'especificació.</p>
     <p xml:lang="ca-valencia">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de la VoIP, fils i alguns aspectes de l'encriptació d'extrem a extrem. Hi ha algunes altres omissions més xicotetes a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu seguix sent proporcionar suport eventual per a tota l'especificació.</p>
+    <p xml:lang="de">NeoChat versucht eine vollumfängliche Anwendung für die Spezifikation von Matrix zu sein. Damit wird alles der aktuellen stabilen Spezifikation mit den erwähnenswerten Ausnahmen von VoIP, Diskussionsfäden und ein paar Teilen der Ende-zu-Ende-Verschlüsselung unterstützt. Zudem sind andere kleinere Auslassungen vorhanden, da sich die Matrixspezifikation ständig weiterentwickelt. Nichtsdestotrotz soll letztendlich die gesamte Spezifikation unterstützt werden.</p>
     <p xml:lang="en-GB">NeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.</p>
     <p xml:lang="eo">NeoChat celas esti plene kapabla aplikaĵo por la Matrix-specifo. Kiel tia, ĉio en la nuna stabila specifo kun la rimarkindaj esceptoj de VoIP, fadenoj kaj kelkaj aspektoj de Fin-al-Fina Ĉifrado estas subtenataj. Estas kelkaj aliaj pli malgrandaj preterlasoj pro la fakto, ke la Matrix-speco konstante evoluas, sed la celo restas provizi finfine subtenon por la tuta specifaĵo.</p>
     <p xml:lang="es">NeoChat pretende ser una aplicación con todas las funciones para la especificación de Matrix. Como tal, admite todo en la especificación estable actual, con las notables excepciones de VoIP, subprocesos y algunas funciones de cifrado de extremo a extremo. Existen algunas omisiones menos importantes debido al hecho de que la especificación de Matrix está en constante evolución, pero el objetivo sigue siendo brindar compatibilidad final con toda la especificación.</p>
@@ -114,6 +124,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>
@@ -135,6 +146,7 @@
     <p xml:lang="ar">نظرًا لطبيعة تطوير مواصفات ماتركس، يدعم نيوتشات أيضًا العديد من الميزات غير المستقرة وهي:</p>
     <p xml:lang="ca">A causa de la naturalesa del desenvolupament de l'especificació de Matrix, el NeoChat també implementa nombroses característiques inestables. Actualment són:</p>
     <p xml:lang="ca-valencia">A causa de la naturalea del desenvolupament de l'especificació de Matrix, NeoChat també implementa nombroses característiques inestables. Actualment són:</p>
+    <p xml:lang="de">Durch die Weiterentwicklung der Matrix-Spezifikation unterstützt auch NeoChat einige als noch instabil gekennzeichnete Funktionen. Derzeit sind das:</p>
     <p xml:lang="en-GB">Due to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:</p>
     <p xml:lang="eo">Pro la naturo de la Matrix-specifevoluo NeoChat ankaŭ subtenas multajn malstabilajn funkciojn. Nuntempe ĉi tiuj estas:</p>
     <p xml:lang="es">Debido a la naturaleza del desarrollo de la especificación de Matrix, NeoChat también permite numerosas funciones no estables, como:</p>
@@ -142,6 +154,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>
@@ -172,6 +185,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>
@@ -182,6 +196,7 @@
       <li xml:lang="nn">Avstemmingar – MSC3381</li>
       <li xml:lang="pl">Ankiety - MSC3381</li>
       <li xml:lang="pt">Inquéritos - MSC3381</li>
+      <li xml:lang="ru">Голосования — MSC3381</li>
       <li xml:lang="sl">Polls - MSC3381</li>
       <li xml:lang="sv">Polls - MSC3381</li>
       <li xml:lang="ta">வாக்கெடுப்புகள் - MSC3381</li>
@@ -200,6 +215,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>
@@ -229,6 +245,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>
@@ -285,6 +302,7 @@
       <caption xml:lang="ar">العرض الرئيسة مع قائمة الغرف والدردشات و معلومات الغرفة</caption>
       <caption xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</caption>
       <caption xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</caption>
+      <caption xml:lang="de">Hauptansicht mit Raumliste, Unterhaltung und Raum-Informationen</caption>
       <caption xml:lang="en-GB">Main view with room list, chat, and room information</caption>
       <caption xml:lang="eo">Ĉefa vido kun ĉambra listo, babilejo kaj ĉambra informo</caption>
       <caption xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</caption>
@@ -292,6 +310,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>
@@ -317,12 +336,15 @@
       <caption xml:lang="ar">اكتشف مجتمعات جديدة مع فضاءات ماتركس</caption>
       <caption xml:lang="ca">Descobriu comunitats noves amb els espais de Matrix</caption>
       <caption xml:lang="ca-valencia">Descobriu comunitats noves amb els espais de Matrix</caption>
+      <caption xml:lang="de">Neue Gemeinschaften mit den Umgebungen von Matrix erkunden</caption>
       <caption xml:lang="en-GB">Discover new communities with Matrix Spaces</caption>
       <caption xml:lang="eo">Malkovru novajn komunumojn per Matrix Spaces</caption>
       <caption xml:lang="es">Descubra nuevas comunidades con los espacios de Matrix</caption>
       <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>
@@ -331,8 +353,10 @@
       <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="ru">Поиск новых сообществ с помощью Matrix Spaces</caption>
       <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
       <caption xml:lang="sv">Upptäck nya gemenskaper med Matrix Spaces</caption>
+      <caption xml:lang="ta">மேட்ரிக்ஸு இடங்களின் மூலம் புதிய சமூகங்களைக் கண்டுபிடிக்கலாம்</caption>
       <caption xml:lang="tr">Matrix Alanlar ile yeni topluluklar keşfedin</caption>
       <caption xml:lang="uk">Пошук нових спільнот за допомогою Matrix Spaces</caption>
       <caption xml:lang="x-test">xxDiscover new communities with Matrix Spacesxx</caption>
@@ -351,6 +375,7 @@
       <caption xml:lang="ar">العرض الرئيسة مع قائمة الغرف والدردشات و معلومات الغرفة</caption>
       <caption xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</caption>
       <caption xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</caption>
+      <caption xml:lang="de">Hauptansicht mit Raumliste, Unterhaltung und Raum-Informationen</caption>
       <caption xml:lang="en-GB">Main view with room list, chat, and room information</caption>
       <caption xml:lang="eo">Ĉefa vido kun ĉambra listo, babilejo kaj ĉambra informo</caption>
       <caption xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</caption>
@@ -358,6 +383,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>
@@ -384,6 +410,7 @@
       <caption xml:lang="ca">Pantalla d'inici de sessió</caption>
       <caption xml:lang="ca-valencia">Pantalla d'inici de sessió</caption>
       <caption xml:lang="cs">Přihlašovací obrazovka</caption>
+      <caption xml:lang="de">Anmeldebildschirm</caption>
       <caption xml:lang="en-GB">Login screen</caption>
       <caption xml:lang="eo">Ensaluta ekrano</caption>
       <caption xml:lang="es">Pantalla de inicio de sesión</caption>
@@ -391,6 +418,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>
@@ -415,6 +443,10 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="24.08.3" date="2024-11-07"/>
+    <release version="24.08.2" date="2024-10-10"/>
+    <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

@@ -15,9 +15,11 @@ Name[en_GB]=NeoChat
 Name[eo]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
+Name[fa]=نئوچت
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[gl]=NeoChat
+Name[he]=NeoChat
 Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
@@ -59,6 +61,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 +102,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

snapcraft.yaml

@@ -0,0 +1,158 @@
+# SPDX-FileCopyrightText: 2024 Scarlett Moore <sgmoore@kde.org>
+#
+# SPDX-License-Identifier: CC0-1.0
+---
+name: neochat
+base: core22
+adopt-info: neochat
+grade: stable
+confinement: strict
+apps:
+  neochat:
+    extensions:
+      - kde-neon-6
+    command: usr/bin/neochat
+    common-id: org.kde.neochat
+    desktop: usr/share/applications/org.kde.neochat.desktop
+    plugs:
+      - home
+      - removable-media
+      - audio-playback
+      - unity7
+      - network
+      - network-bind
+      - network-manager-observe
+      - password-manager-service
+      - accounts-service
+
+compression: lzo
+
+slots:
+  session-dbus-interface:
+    interface: dbus
+    name: org.kde.neochat
+    bus: session
+
+parts:
+  olm:
+    source: https://gitlab.matrix.org/matrix-org/olm.git
+    source-depth: 1
+    source-tag: '3.2.12'
+    plugin: cmake
+    cmake-parameters:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_PREFIX=/usr
+    prime:
+      - -usr/include
+      - -usr/lib/*/pkgconfig
+      - -usr/lib/*/cmake
+
+  libsecret:
+    source: https://gitlab.gnome.org/GNOME/libsecret.git
+    source-tag: '0.21.4'
+    source-depth: 1
+    plugin: meson
+    meson-parameters:
+      - --prefix=/usr
+      - -Doptimization=3
+      - -Ddebug=true
+      - -Dmanpage=false
+      - -Dvapi=false
+      - -Dintrospection=false
+      - -Dcrypto=disabled
+      - -Dgtk_doc=false
+    build-packages:
+      - meson
+      - libglib2.0-dev
+      - libgcrypt20-dev
+    prime:
+      - -usr/include
+      - -usr/lib/*/pkgconfig
+
+  qtkeychain:
+    after: [libsecret]
+    source: https://github.com/frankosterfeld/qtkeychain.git
+    source-tag: 0.14.3
+    source-depth: 1
+    plugin: cmake
+    build-environment:
+      - PKG_CONFIG_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig:$PKG_CONFIG_PATH
+    cmake-parameters:
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DBUILD_TRANSLATIONS=NO
+      - -DBUILD_WITH_QT6=ON
+    prime:
+      - -usr/include
+      - -usr/lib/*/pkgconfig
+      - -usr/lib/*/cmake
+
+  libquotient:
+    after:
+      - olm
+      - qtkeychain
+    source: https://github.com/quotient-im/libQuotient.git
+    source-tag: 0.8.2
+    source-depth: 1
+    plugin: cmake
+    build-packages:
+      - libssl-dev
+    cmake-parameters:
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DBUILD_TESTING=OFF
+      - -DQuotient_ENABLE_E2EE=ON
+      - -DBUILD_WITH_QT6=ON
+    prime:
+      - -usr/include
+      - -usr/lib/*/pkgconfig
+      - -usr/lib/*/cmake
+
+  kquickimageeditor:
+    source: https://invent.kde.org/libraries/kquickimageeditor.git
+    source-tag: 'v0.3.0'
+    source-depth: 1
+    plugin: cmake
+    cmake-parameters:
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DBUILD_WITH_QT6=ON
+      - -DBUILD_TESTING=OFF
+    prime:
+      - -usr/include
+      - -usr/lib/*/pkgconfig
+      - -usr/lib/*/cmake
+
+  neochat:
+    after:
+      - qtkeychain
+      - libquotient
+      - kquickimageeditor
+    parse-info:
+      - usr/share/metainfo/org.kde.neochat.appdata.xml
+    source: .
+    source-type: local
+    plugin: cmake
+    build-packages:
+      - cmark
+      - libcmark-dev
+      - libsqlite3-dev
+      - libvulkan-dev
+      - libxkbcommon-dev
+      - libicu-dev
+      - libpulse0
+    cmake-parameters:
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DBUILD_TESTING=OFF
+    prime:
+      - -usr/share/man
+
+  deps:
+    after: [neochat]
+    plugin: nil
+    stage-packages:
+      - libcmark0.30.2
+    prime:
+      - usr/lib/*/libcmark.so*
+

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
@@ -188,6 +190,8 @@ add_library(neochat STATIC
     threepidbindhelper.h
     models/readmarkermodel.cpp
     models/readmarkermodel.h
+    neochatroommember.cpp
+    neochatroommember.h
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES

src/actionshandler.cpp

@@ -91,10 +91,18 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, Cha
 
             for (auto it = m_room->messageEvents().crbegin(); it != m_room->messageEvents().crend(); it++) {
                 if (const auto event = eventCast<const RoomMessageEvent>(&**it)) {
+#if Quotient_VERSION_MINOR > 8
+                    if (event->senderId() == m_room->localMember().id() && event->has<EventContent::TextContent>()) {
+#else
                     if (event->senderId() == m_room->localMember().id() && event->hasTextContent()) {
+#endif
                         QString originalString;
                         if (event->content()) {
+#if Quotient_VERSION_MINOR > 8
+                            originalString = event->get<EventContent::TextContent>()->body;
+#else
                             originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content())->body;
+#endif
                         } else {
                             originalString = event->plainBody();
                         }

src/chatbarcache.cpp

@@ -120,7 +120,11 @@ QString ChatBarCache::relationMessage() const
 
     if (auto event = room->findInTimeline(m_relationId); event != room->historyEdge()) {
         EventHandler eventhandler(room, &**event);
-        return eventhandler.getMarkdownBody();
+        if (isEditing()) {
+            return eventhandler.getMarkdownBody();
+        } else {
+            return eventhandler.getMarkdownBody().toHtmlEscaped();
+        }
     }
     return {};
 }

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

@@ -9,6 +9,8 @@
 
 #include <Quotient/eventitem.h>
 #include <Quotient/events/encryptionevent.h>
+#include <Quotient/events/event.h>
+#include <Quotient/events/eventcontent.h>
 #include <Quotient/events/reactionevent.h>
 #include <Quotient/events/redactionevent.h>
 #include <Quotient/events/roomavatarevent.h>
@@ -61,20 +63,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 +145,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) {
@@ -243,10 +236,18 @@ QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
 {
     QString body;
 
+#if Quotient_VERSION_MINOR > 8
+    if (event.has<EventContent::FileContent>()) {
+#else
     if (event.hasFileContent()) {
+#endif
         // if filename is given or body is equal to filename,
         // then body is a caption
+#if Quotient_VERSION_MINOR > 8
+        QString filename = event.get<EventContent::FileContent>()->originalName;
+#else
         QString filename = event.content()->fileInfo()->originalName;
+#endif
         QString body = event.plainBody();
         if (filename.isEmpty() || filename == body) {
             return QString();
@@ -254,8 +255,13 @@ QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
         return body;
     }
 
+#if Quotient_VERSION_MINOR > 8
+    if (event.has<EventContent::TextContent>() && event.content()) {
+        body = event.get<EventContent::TextContent>()->body;
+#else
     if (event.hasTextContent() && event.content()) {
         body = static_cast<const EventContent::TextContent *>(event.content())->body;
+#endif
     } else {
         body = event.plainBody();
     }
@@ -303,7 +309,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
 {
     if (event->isRedacted()) {
         auto reason = event->redactedBecause()->reason();
-        return (reason.isEmpty()) ? i18n("<i>[This message was deleted]</i>") : i18n("<i>[This message was deleted: %1]</i>", reason);
+        return (reason.isEmpty()) ? i18n("<i>[This message was deleted]</i>") : i18n("<i>[This message was deleted: %1]</i>", reason.toHtmlEscaped());
     }
 
     const bool prettyPrint = (format == Qt::RichText);
@@ -470,11 +476,16 @@ QString EventHandler::getMessageBody(const RoomMessageEvent &event, Qt::TextForm
 {
     TextHandler textHandler;
 
+#if Quotient_VERSION_MINOR > 8
+    if (event.has<EventContent::FileContent>()) {
+        QString fileCaption = event.get<EventContent::FileContent>()->originalName;
+#else
     if (event.hasFileContent()) {
         auto fileCaption = event.content()->fileInfo()->originalName;
+#endif
         if (fileCaption.isEmpty()) {
             fileCaption = event.plainBody();
-        } else if (event.content()->fileInfo()->originalName != event.plainBody()) {
+        } else if (fileCaption != event.plainBody()) {
             fileCaption = event.plainBody() + " | "_ls + fileCaption;
         }
         textHandler.setData(fileCaption);
@@ -482,8 +493,13 @@ QString EventHandler::getMessageBody(const RoomMessageEvent &event, Qt::TextForm
     }
 
     QString body;
+#if Quotient_VERSION_MINOR > 8
+    if (event.has<EventContent::TextContent>() && event.content()) {
+        body = event.get<EventContent::TextContent>()->body;
+#else
     if (event.hasTextContent() && event.content()) {
         body = static_cast<const EventContent::TextContent *>(event.content())->body;
+#endif
     } else {
         body = event.plainBody();
     }
@@ -664,39 +680,65 @@ QVariantMap EventHandler::getMediaInfoForEvent(const Quotient::RoomEvent *event)
     // Get the file info for the event.
     if (event->is<RoomMessageEvent>()) {
         auto roomMessageEvent = eventCast<const RoomMessageEvent>(event);
+#if Quotient_VERSION_MINOR > 8
+        if (!roomMessageEvent->has<EventContent::FileContentBase>()) {
+#else
         if (!roomMessageEvent->hasFileContent()) {
+#endif
             return {};
         }
 
-        const EventContent::FileInfo *fileInfo;
-        fileInfo = roomMessageEvent->content()->fileInfo();
-        QVariantMap mediaInfo = getMediaInfoFromFileInfo(fileInfo, eventId, false, false);
+#if Quotient_VERSION_MINOR > 8
+        const auto content = roomMessageEvent->get<EventContent::FileContentBase>();
+        QVariantMap mediaInfo = getMediaInfoFromFileInfo(content.get(), eventId, false, false);
+#else
+        const auto content = static_cast<const EventContent::FileContent *>(roomMessageEvent->content());
+        QVariantMap mediaInfo = getMediaInfoFromFileInfo(content, eventId, false, false);
+#endif
         // 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;
+#if Quotient_VERSION_MINOR > 8
+        mediaInfo["filename"_ls] = content->commonInfo().originalName.isEmpty() ? roomMessageEvent->plainBody() : content->commonInfo().originalName;
+#else
+        mediaInfo["filename"_ls] = (content->fileInfo()->originalName.isEmpty()) ? roomMessageEvent->plainBody() : content->fileInfo()->originalName;
+#endif
 
         return mediaInfo;
     } else if (event->is<StickerEvent>()) {
-        const EventContent::FileInfo *fileInfo;
-
         auto stickerEvent = eventCast<const StickerEvent>(event);
-        fileInfo = &stickerEvent->image();
+        auto content = &stickerEvent->image();
 
-        return getMediaInfoFromFileInfo(fileInfo, eventId, false, true);
+        return getMediaInfoFromFileInfo(content, eventId, false, true);
     } else {
         return {};
     }
 }
 
-QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo *fileInfo, const QString &eventId, bool isThumbnail, bool isSticker) const
+QVariantMap EventHandler::getMediaInfoFromFileInfo(
+#if Quotient_VERSION_MINOR > 8
+    const Quotient::EventContent::FileContentBase *fileContent,
+#else
+    const Quotient::EventContent::TypedBase *fileContent,
+#endif
+    const QString &eventId,
+    bool isThumbnail,
+    bool isSticker) const
 {
     QVariantMap mediaInfo;
 
     // Get the mxc URL for the media.
-    if (!fileInfo->url().isValid() || fileInfo->url().scheme() != QStringLiteral("mxc") || eventId.isEmpty()) {
+#if Quotient_VERSION_MINOR > 8
+    if (!fileContent->url().isValid() || fileContent->url().scheme() != QStringLiteral("mxc") || eventId.isEmpty()) {
+#else
+    if (!fileContent->fileInfo()->url().isValid() || fileContent->fileInfo()->url().scheme() != QStringLiteral("mxc") || eventId.isEmpty()) {
+#endif
         mediaInfo["source"_ls] = QUrl();
     } else {
-        QUrl source = m_room->makeMediaUrl(eventId, fileInfo->url());
+#if Quotient_VERSION_MINOR > 8
+        QUrl source = m_room->makeMediaUrl(eventId, fileContent->url());
+#else
+        QUrl source = m_room->makeMediaUrl(eventId, fileContent->fileInfo()->url());
+#endif
 
         if (source.isValid()) {
             mediaInfo["source"_ls] = source;
@@ -705,7 +747,7 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo
         }
     }
 
-    auto mimeType = fileInfo->mimeType;
+    auto mimeType = fileContent->type();
     // Add the MIME type for the media if available.
     mediaInfo["mimeType"_ls] = mimeType.name();
 
@@ -713,45 +755,53 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo
     mediaInfo["mimeIcon"_ls] = mimeType.iconName();
 
     // Add media size if available.
-    mediaInfo["size"_ls] = fileInfo->payloadSize;
+#if Quotient_VERSION_MINOR > 8
+    mediaInfo["size"_ls] = fileContent->commonInfo().payloadSize;
+#else
+    mediaInfo["size"_ls] = static_cast<const EventContent::FileContent *>(fileContent)->fileInfo()->payloadSize;
+#endif
 
     mediaInfo["isSticker"_ls] = isSticker;
 
     // Add parameter depending on media type.
     if (mimeType.name().contains(QStringLiteral("image"))) {
-        if (auto castInfo = static_cast<const EventContent::ImageContent *>(fileInfo)) {
+        if (auto castInfo = static_cast<const EventContent::ImageContent *>(fileContent)) {
+#if Quotient_VERSION_MINOR > 8
             mediaInfo["width"_ls] = castInfo->imageSize.width();
             mediaInfo["height"_ls] = castInfo->imageSize.height();
+#else
+            const auto imageInfo = static_cast<const EventContent::ImageInfo *>(castInfo->fileInfo());
+            mediaInfo["width"_ls] = imageInfo->imageSize.width();
+            mediaInfo["height"_ls] = imageInfo->imageSize.height();
+#endif
 
             // TODO: Images in certain formats (e.g. WebP) will be erroneously marked as animated, even if they are static.
             mediaInfo["animated"_ls] = QMovie::supportedFormats().contains(mimeType.preferredSuffix().toUtf8());
 
-            if (!isThumbnail) {
-                QVariantMap tempInfo;
-                auto thumbnailInfo = getMediaInfoFromFileInfo(castInfo->thumbnailInfo(), eventId, true);
-                if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
-                    tempInfo = thumbnailInfo;
+            QVariantMap tempInfo;
+            auto thumbnailInfo = getMediaInfoFromTumbnail(castInfo->thumbnail, eventId);
+            if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
+                tempInfo = thumbnailInfo;
+            } else {
+                QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"_ls].toString();
+                if (blurhash.isEmpty()) {
+                    tempInfo["source"_ls] = QUrl();
                 } else {
-                    QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"_ls].toString();
-                    if (blurhash.isEmpty()) {
-                        tempInfo["source"_ls] = QUrl();
-                    } else {
-                        tempInfo["source"_ls] = QUrl("image://blurhash/"_ls + blurhash);
-                    }
+                    tempInfo["source"_ls] = QUrl("image://blurhash/"_ls + blurhash);
                 }
-                mediaInfo["tempInfo"_ls] = tempInfo;
             }
+            mediaInfo["tempInfo"_ls] = tempInfo;
         }
     }
     if (mimeType.name().contains(QStringLiteral("video"))) {
-        if (auto castInfo = static_cast<const EventContent::VideoContent *>(fileInfo)) {
+        if (auto castInfo = static_cast<const EventContent::VideoContent *>(fileContent)) {
             mediaInfo["width"_ls] = castInfo->imageSize.width();
             mediaInfo["height"_ls] = castInfo->imageSize.height();
             mediaInfo["duration"_ls] = castInfo->duration;
 
             if (!isThumbnail) {
                 QVariantMap tempInfo;
-                auto thumbnailInfo = getMediaInfoFromFileInfo(castInfo->thumbnailInfo(), eventId, true);
+                auto thumbnailInfo = getMediaInfoFromTumbnail(castInfo->thumbnail, eventId);
                 if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
                     tempInfo = thumbnailInfo;
                 } else {
@@ -767,7 +817,7 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo
         }
     }
     if (mimeType.name().contains(QStringLiteral("audio"))) {
-        if (auto castInfo = static_cast<const EventContent::AudioContent *>(fileInfo)) {
+        if (auto castInfo = static_cast<const EventContent::AudioContent *>(fileContent)) {
             mediaInfo["duration"_ls] = castInfo->duration;
         }
     }
@@ -775,6 +825,38 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo
     return mediaInfo;
 }
 
+QVariantMap EventHandler::getMediaInfoFromTumbnail(const Quotient::EventContent::Thumbnail &thumbnail, const QString &eventId) const
+{
+    QVariantMap thumbnailInfo;
+
+    if (!thumbnail.url().isValid() || thumbnail.url().scheme() != QStringLiteral("mxc") || eventId.isEmpty()) {
+        thumbnailInfo["source"_ls] = QUrl();
+    } else {
+        QUrl source = m_room->makeMediaUrl(eventId, thumbnail.url());
+
+        if (source.isValid()) {
+            thumbnailInfo["source"_ls] = source;
+        } else {
+            thumbnailInfo["source"_ls] = QUrl();
+        }
+    }
+
+    auto mimeType = thumbnail.mimeType;
+    // Add the MIME type for the media if available.
+    thumbnailInfo["mimeType"_ls] = mimeType.name();
+
+    // Add the MIME type icon if available.
+    thumbnailInfo["mimeIcon"_ls] = mimeType.iconName();
+
+    // Add media size if available.
+    thumbnailInfo["size"_ls] = thumbnail.payloadSize;
+
+    thumbnailInfo["width"_ls] = thumbnail.imageSize.width();
+    thumbnailInfo["height"_ls] = thumbnail.imageSize.height();
+
+    return thumbnailInfo;
+}
+
 bool EventHandler::hasReply() const
 {
     if (m_event == nullptr) {

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.
      *
@@ -352,6 +339,14 @@ private:
     QString getMessageBody(const Quotient::RoomMessageEvent &event, Qt::TextFormat format, bool stripNewlines) const;
 
     QVariantMap getMediaInfoForEvent(const Quotient::RoomEvent *event) const;
-    QVariantMap
-    getMediaInfoFromFileInfo(const Quotient::EventContent::FileInfo *fileInfo, const QString &eventId, bool isThumbnail = false, bool isSticker = false) const;
+    QVariantMap getMediaInfoFromFileInfo(
+#if Quotient_VERSION_MINOR > 8
+        const Quotient::EventContent::FileContentBase *fileContent,
+#else
+        const Quotient::EventContent::TypedBase *fileContent,
+#endif
+        const QString &eventId,
+        bool isThumbnail = false,
+        bool isSticker = false) const;
+    QVariantMap getMediaInfoFromTumbnail(const Quotient::EventContent::Thumbnail &thumbnail, const QString &eventId) const;
 };

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/messagecontentmodel.cpp

@@ -3,9 +3,11 @@
 
 #include "messagecontentmodel.h"
 #include "neochatconfig.h"
+#include "neochatroommember.h"
 
 #include <QImageReader>
 
+#include <Quotient/events/eventcontent.h>
 #include <Quotient/events/redactionevent.h>
 #include <Quotient/events/roommessageevent.h>
 #include <Quotient/events/stickerevent.h>
@@ -35,10 +37,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 +83,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 +92,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();
             }
         }
@@ -154,6 +154,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;
@@ -203,11 +226,6 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const
         if (m_event == nullptr) {
             return QString();
         }
-        if (m_event->isRedacted()) {
-            auto reason = m_event->redactedBecause()->reason();
-            return (reason.isEmpty()) ? i18n("<i>[This message was deleted]</i>")
-                                      : i18n("<i>[This message was deleted: %1]</i>", m_event->redactedBecause()->reason());
-        }
         if (!component.content.isEmpty()) {
             return component.content;
         }
@@ -236,10 +254,10 @@ 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();
@@ -428,10 +446,19 @@ QList<MessageComponent> MessageContentModel::componentsForType(MessageComponentT
                 auto fileTransferInfo = m_room->cachedFileTransferInfo(m_event.get());
 
 #ifndef Q_OS_ANDROID
-                Q_ASSERT(event->content() != nullptr && event->content()->fileInfo() != nullptr);
+#if Quotient_VERSION_MINOR > 8
+                Q_ASSERT(event->content() != nullptr && event->has<EventContent::FileContent>());
+                const QMimeType mimeType = event->get<EventContent::FileContent>()->mimeType;
+#else
+                Q_ASSERT(event->content() != nullptr && event->hasFileContent());
                 const QMimeType mimeType = event->content()->fileInfo()->mimeType;
+#endif
                 if (mimeType.name() == QStringLiteral("text/plain") || mimeType.parentMimeTypes().contains(QStringLiteral("text/plain"))) {
+#if Quotient_VERSION_MINOR > 8
+                    QString originalName = event->get<EventContent::FileContent>()->originalName;
+#else
                     QString originalName = event->content()->fileInfo()->originalName;
+#endif
                     if (originalName.isEmpty()) {
                         originalName = event->plainBody();
                     }
@@ -492,7 +519,7 @@ MessageComponent MessageContentModel::linkPreviewComponent(const QUrl &link)
     if (linkPreviewer->loaded()) {
         return MessageComponent{MessageComponentType::LinkPreview, QString(), {{"link"_ls, link}}};
     } else {
-        connect(linkPreviewer, &LinkPreviewer::loadedChanged, [this, link]() {
+        connect(linkPreviewer, &LinkPreviewer::loadedChanged, this, [this, link]() {
             const auto linkPreviewer = dynamic_cast<NeoChatConnection *>(m_room->connection())->previewerForLink(link);
             if (linkPreviewer != nullptr && linkPreviewer->loaded()) {
                 for (auto &component : m_components) {
@@ -533,6 +560,11 @@ QList<MessageComponent> MessageContentModel::addLinkPreviews(QList<MessageCompon
 
 void MessageContentModel::closeLinkPreview(int row)
 {
+    if (row < 0 || row > m_components.size()) {
+        qWarning() << "closeLinkPreview() called with row" << row << "which does not exist. m_components.size() =" << m_components.size();
+        return;
+    }
+
     if (m_components[row].type == MessageComponentType::LinkPreview || m_components[row].type == MessageComponentType::LinkPreviewLoad) {
         beginResetModel();
         m_removedLinkPreviews += m_components[row].attributes["link"_ls].toUrl();
@@ -549,8 +581,12 @@ void MessageContentModel::updateItineraryModel()
     }
 
     if (auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
+#if Quotient_VERSION_MINOR > 8
+        if (event->has<EventContent::FileContent>()) {
+#else
         if (event->hasFileContent()) {
-            auto filePath = m_room->cachedFileTransferInfo(m_event.get()).localPath;
+#endif
+            auto filePath = m_room->cachedFileTransferInfo(event).localPath;
             if (filePath.isEmpty() && m_itineraryModel != nullptr) {
                 delete m_itineraryModel;
                 m_itineraryModel = nullptr;

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();

src/models/messageeventmodel.cpp

@@ -8,6 +8,7 @@
 #include "neochatconfig.h"
 
 #include <Quotient/csapi/rooms.h>
+#include <Quotient/events/eventcontent.h>
 #include <Quotient/events/redactionevent.h>
 #include <Quotient/events/roommessageevent.h>
 #include <Quotient/events/stickerevent.h>
@@ -26,6 +27,8 @@
 #include "messagecontentmodel.h"
 #include "models/messagefiltermodel.h"
 #include "models/reactionmodel.h"
+#include "neochatroom.h"
+#include "neochatroommember.h"
 #include "readmarkermodel.h"
 #include "texthandler.h"
 
@@ -90,6 +93,10 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
         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();
@@ -150,8 +157,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);
@@ -214,22 +222,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 {
@@ -397,6 +389,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)) {
@@ -440,11 +434,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     EventHandler eventHandler(m_currentRoom, &evt);
 
     if (role == Qt::DisplayRole) {
-        if (evt.isRedacted()) {
-            auto reason = evt.redactedBecause()->reason();
-            return (reason.isEmpty()) ? i18n("<i>[This message was deleted]</i>")
-                                      : i18n("<i>[This message was deleted: %1]</i>", evt.redactedBecause()->reason());
-        }
         return eventHandler.getRichBody();
     }
 
@@ -469,7 +458,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) {
@@ -499,7 +499,11 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
 
     if (role == ProgressInfoRole) {
         if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
+#if Quotient_VERSION_MINOR > 8
+            if (e->has<EventContent::FileContent>()) {
+#else
             if (e->hasFileContent()) {
+#endif
                 return QVariant::fromValue(m_currentRoom->cachedFileTransferInfo(&evt));
             }
         }
@@ -619,6 +623,16 @@ void MessageEventModel::createEventObjects(const Quotient::RoomEvent *event)
     }
 
     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.

src/models/messageeventmodel.h

@@ -9,6 +9,7 @@
 
 #include "linkpreviewer.h"
 #include "neochatroom.h"
+#include "neochatroommember.h"
 #include "pollhandler.h"
 #include "readmarkermodel.h"
 
@@ -115,6 +116,7 @@ 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;
 

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/permissionsmodel.cpp

@@ -247,7 +247,7 @@ void PermissionsModel::setPowerLevel(const QString &permission, const int &newPo
             powerLevelContent[QLatin1String("events")] = eventPowerLevels;
         }
 
-        m_room->setState<Quotient::RoomPowerLevelsEvent>(powerLevelContent);
+        m_room->setState<Quotient::RoomPowerLevelsEvent>(Quotient::fromJson<Quotient::PowerLevelsEventContent>(powerLevelContent));
     }
 }
 

src/models/pushrulemodel.cpp

@@ -312,8 +312,12 @@ void PushRuleModel::addKeyword(const QString &keyword, const QString &roomId)
         pushConditions.append(keywordCondition);
     }
 
+#if Quotient_VERSION_MINOR > 8
+    auto job = m_connection->callApi<Quotient::SetPushRuleJob>(PushRuleKind::kindString(kind),
+#else
     auto job = m_connection->callApi<Quotient::SetPushRuleJob>(QLatin1String("global"),
                                                                PushRuleKind::kindString(kind),
+#endif
                                                                keyword,
                                                                actions,
                                                                QString(),
@@ -338,7 +342,11 @@ void PushRuleModel::removeKeyword(const QString &keyword)
     }
 
     auto kind = PushRuleKind::kindString(m_rules[index].kind);
+#if Quotient_VERSION_MINOR > 8
+    auto job = m_connection->callApi<Quotient::DeletePushRuleJob>(kind, m_rules[index].id);
+#else
     auto job = m_connection->callApi<Quotient::DeletePushRuleJob>(QStringLiteral("global"), kind, m_rules[index].id);
+#endif
     connect(job, &Quotient::BaseJob::failure, this, [this, job, index]() {
         qWarning() << QLatin1String("Unable to remove push rule for keyword %1: ").arg(m_rules[index].id) << job->errorString();
     });
@@ -346,10 +354,18 @@ void PushRuleModel::removeKeyword(const QString &keyword)
 
 void PushRuleModel::setNotificationRuleEnabled(const QString &kind, const QString &ruleId, bool enabled)
 {
+#if Quotient_VERSION_MINOR > 8
+    auto job = m_connection->callApi<Quotient::IsPushRuleEnabledJob>(kind, ruleId);
+#else
     auto job = m_connection->callApi<Quotient::IsPushRuleEnabledJob>(QStringLiteral("global"), kind, ruleId);
+#endif
     connect(job, &Quotient::BaseJob::success, this, [job, kind, ruleId, enabled, this]() {
         if (job->enabled() != enabled) {
+#if Quotient_VERSION_MINOR > 8
+            m_connection->callApi<Quotient::SetPushRuleEnabledJob>(kind, ruleId, enabled);
+#else
             m_connection->callApi<Quotient::SetPushRuleEnabledJob>(QStringLiteral("global"), kind, ruleId, enabled);
+#endif
         }
     });
 }
@@ -363,7 +379,11 @@ void PushRuleModel::setNotificationRuleActions(const QString &kind, const QStrin
         actions = actionToVariant(action);
     }
 
+#if Quotient_VERSION_MINOR > 8
+    m_connection->callApi<Quotient::SetPushRuleActionsJob>(kind, ruleId, actions);
+#else
     m_connection->callApi<Quotient::SetPushRuleActionsJob>(QStringLiteral("global"), kind, ruleId, actions);
+#endif
 }
 
 PushRuleAction::Action PushRuleModel::variantToAction(const QList<QVariant> &actions, bool enabled)

src/models/reactionmodel.cpp

@@ -3,15 +3,10 @@
 
 #include "reactionmodel.h"
 #include "neochatroom.h"
+#include "utils.h"
 
 #include <QDebug>
 #include <QFont>
-#ifdef HAVE_ICU
-#include <QTextBoundaryFinder>
-#include <QTextCharFormat>
-#include <unicode/uchar.h>
-#include <unicode/urename.h>
-#endif
 
 #include <KLocalizedString>
 
@@ -157,30 +152,6 @@ QHash<int, QByteArray> ReactionModel::roleNames() const
     };
 }
 
-bool isEmoji(const QString &text)
-{
-#ifdef HAVE_ICU
-    QTextBoundaryFinder finder(QTextBoundaryFinder::Grapheme, text);
-    int from = 0;
-    while (finder.toNextBoundary() != -1) {
-        auto to = finder.position();
-        if (text[from].isSpace()) {
-            from = to;
-            continue;
-        }
-
-        auto first = text.mid(from, to - from).toUcs4()[0];
-        if (!u_hasBinaryProperty(first, UCHAR_EMOJI)) {
-            return false;
-        }
-        from = to;
-    }
-    return true;
-#else
-    return false;
-#endif
-}
-
 QString ReactionModel::reactionText(QString text) const
 {
     text = text.toHtmlEscaped();
@@ -194,7 +165,7 @@ QString ReactionModel::reactionText(QString text) const
             .arg(m_room->connection()->makeMediaUrl(QUrl(text)).toString(), QString::number(size));
     }
 
-    return isEmoji(text) ? QStringLiteral("<span style=\"font-family: 'emoji';\">") + text + QStringLiteral("</span>") : text;
+    return Utils::isEmoji(text) ? QStringLiteral("<span style=\"font-family: 'emoji';\">") + text + QStringLiteral("</span>") : text;
 }
 
 #include "moc_reactionmodel.cpp"

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/userfiltermodel.cpp

@@ -8,7 +8,7 @@
 bool UserFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
 {
     Q_UNUSED(sourceParent);
-    if (m_filterText.length() < 1) {
+    if (!m_allowEmpty && m_filterText.length() < 1) {
         return false;
     }
     return sourceModel()->data(sourceModel()->index(sourceRow, 0), UserListModel::DisplayNameRole).toString().contains(m_filterText, Qt::CaseInsensitive)
@@ -27,4 +27,15 @@ void UserFilterModel::setFilterText(const QString &filterText)
     invalidateFilter();
 }
 
+bool UserFilterModel::allowEmpty() const
+{
+    return m_allowEmpty;
+}
+
+void UserFilterModel::setAllowEmpty(bool allowEmpty)
+{
+    m_allowEmpty = allowEmpty;
+    Q_EMIT allowEmptyChanged();
+}
+
 #include "moc_userfiltermodel.cpp"

src/models/userfiltermodel.h

@@ -24,6 +24,7 @@ class UserFilterModel : public QSortFilterProxyModel
      * The text is either a desired display name or matrix id.
      */
     Q_PROPERTY(QString filterText READ filterText WRITE setFilterText NOTIFY filterTextChanged)
+    Q_PROPERTY(bool allowEmpty READ allowEmpty WRITE setAllowEmpty NOTIFY allowEmptyChanged)
 
 public:
     /**
@@ -36,9 +37,14 @@ public:
     QString filterText() const;
     void setFilterText(const QString &filterText);
 
+    bool allowEmpty() const;
+    void setAllowEmpty(bool allowEmpty);
+
 Q_SIGNALS:
     void filterTextChanged();
+    void allowEmptyChanged();
 
 private:
     QString m_filterText;
+    bool m_allowEmpty = false;
 };

src/models/userlistmodel.cpp

@@ -88,7 +88,11 @@ QVariant UserListModel::data(const QModelIndex &index, int role) const
         return memberId;
     }
     if (role == AvatarRole) {
+#if Quotient_VERSION_MINOR > 8
+        return m_currentRoom->member(memberId).avatarUrl();
+#else
         return m_currentRoom->memberAvatar(memberId).url();
+#endif
     }
     if (role == ObjectRole) {
         return QVariant::fromValue(memberId);

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

@@ -13,9 +13,11 @@ Name[en_GB]=NeoChat
 Name[eo]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
+Name[fa]=نئوچت
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[gl]=NeoChat
+Name[he]=NeoChat
 Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
@@ -58,6 +60,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 +105,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 +146,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 +191,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 +231,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,14 +262,17 @@ Action=Popup
 Name=Share
 Name[ar]=شارك
 Name[ca]=Compartició
-Name[ca@valencia]=Compartició
+Name[ca@valencia]=Compartiu
 Name[cs]=Sdílet
+Name[de]=Teilen
 Name[en_GB]=Share
 Name[eo]=Kundividi
 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 +281,8 @@ Name[lv]=Kopīgot
 Name[nl]=Gedeelde
 Name[nn]=Del
 Name[pl]=Udostępnij
+Name[pt_BR]=Compartilhar
+Name[ru]=Публикация
 Name[sl]=Deli
 Name[sv]=Dela
 Name[ta]=பகிர்
@@ -282,12 +294,15 @@ Comment=The result of sharing a piece of content
 Comment[ar]=نتيجة مشاركة محتوى
 Comment[ca]=El resultat de compartir una peça de contingut
 Comment[ca@valencia]=El resultat de compartir una peça de contingut
+Comment[de]=Das Ergebnis nach dem Teilen eines Teils des Inhalts
 Comment[en_GB]=The result of sharing a piece of content
 Comment[eo]=La rezulto el kundividado de enhavero
 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 +311,8 @@ 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[ru]=Результат публикации данных
 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

@@ -9,6 +9,7 @@
 #include <QMimeDatabase>
 #include <QTemporaryFile>
 
+#include <Quotient/events/eventcontent.h>
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/quotient_common.h>
 #include <qcoro/qcorosignal.h>
@@ -41,6 +42,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"
@@ -75,11 +77,16 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
             const auto m_event = evtIt->viewAs<RoomEvent>();
             QString mxcUrl;
             if (auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
+#if Quotient_VERSION_MINOR > 8
+                if (event->has<EventContent::FileContentBase>()) {
+                    mxcUrl = event->get<EventContent::FileContentBase>()->url().toString();
+#else
                 if (event->hasFileContent()) {
                     mxcUrl = event->content()->fileInfo()->url().toString();
+#endif
                 }
             } else if (auto event = eventCast<const Quotient::StickerEvent>(m_event)) {
-                mxcUrl = event->image().fileInfo()->url().toString();
+                mxcUrl = event->image().url().toString();
             }
             if (mxcUrl.isEmpty()) {
                 return;
@@ -129,14 +136,42 @@ 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()) {
+#if Quotient_VERSION_MINOR > 8
+                    avatar_image = member(roomMemberEvent->senderId()).avatar(128, 128, {});
+#else
+                    avatar_image = memberAvatar(roomMemberEvent->senderId()).get(this->connection(), 128, [] {});
+#endif
+                } 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] {
@@ -226,7 +261,11 @@ QCoro::Task<void> NeoChatRoom::doUploadFile(QUrl url, QString body)
     auto mime = QMimeDatabase().mimeTypeForUrl(url);
     url.setScheme("file"_ls);
     QFileInfo fileInfo(url.isLocalFile() ? url.toLocalFile() : url.toString());
+#if Quotient_VERSION_MINOR > 8
+    EventContent::FileContentBase *content;
+#else
     EventContent::TypedBase *content;
+#endif
     if (mime.name().startsWith("image/"_ls)) {
         QImage image(url.toLocalFile());
         content = new EventContent::ImageContent(url, fileInfo.size(), mime, image.size(), fileInfo.fileName());
@@ -241,7 +280,11 @@ QCoro::Task<void> NeoChatRoom::doUploadFile(QUrl url, QString body)
     } else {
         content = new EventContent::FileContent(url, fileInfo.size(), mime, fileInfo.fileName());
     }
+#if Quotient_VERSION_MINOR > 8
+    QString txnId = postFile(body.isEmpty() ? url.fileName() : body, std::unique_ptr<EventContent::FileContentBase>(content));
+#else
     QString txnId = postFile(body.isEmpty() ? url.fileName() : body, content);
+#endif
     setHasFileUploading(true);
     connect(this, &Room::fileTransferCompleted, [this, txnId](const QString &id, FileSourceInfo) {
         if (id == txnId) {
@@ -367,8 +410,13 @@ bool NeoChatRoom::lastEventIsSpoiler() const
 {
     if (auto event = lastEvent()) {
         if (auto e = eventCast<const RoomMessageEvent>(event)) {
+#if Quotient_VERSION_MINOR > 8
+            if (e->has<EventContent::TextContent>() && e->content() && e->mimeType().name() == "text/html"_ls) {
+                auto htmlBody = e->get<EventContent::TextContent>()->body;
+#else
             if (e->hasTextContent() && e->content() && e->mimeType().name() == "text/html"_ls) {
                 auto htmlBody = static_cast<const Quotient::EventContent::TextContent *>(e->content())->body;
+#endif
                 return htmlBody.contains("data-mx-spoiler"_ls);
             }
         }
@@ -1198,7 +1246,11 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
         for (const auto &i : roomRuleArray) {
             QJsonObject roomRule = i.toObject();
             if (roomRule["rule_id"_ls] == id()) {
-                connection()->callApi<DeletePushRuleJob>("global"_ls, "room"_ls, id());
+#if Quotient_VERSION_MINOR > 8
+                connection()->callApi<DeletePushRuleJob>("room"_ls, id());
+#else
+                connection()->callApi<DeletePushRuleJob>(QLatin1String("global"), "room"_ls, id());
+#endif
             }
         }
     }
@@ -1209,7 +1261,11 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
         for (const auto &i : overrideRuleArray) {
             QJsonObject overrideRule = i.toObject();
             if (overrideRule["rule_id"_ls] == id()) {
+#if Quotient_VERSION_MINOR > 8
+                connection()->callApi<DeletePushRuleJob>("override"_ls, id());
+#else
                 connection()->callApi<DeletePushRuleJob>("global"_ls, "override"_ls, id());
+#endif
             }
         }
     }
@@ -1245,9 +1301,17 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
         const QList<PushCondition> conditions = {pushCondition};
 
         // Add new override rule and make sure it's enabled
+#if Quotient_VERSION_MINOR > 8
+        auto job = connection()->callApi<SetPushRuleJob>("override"_ls, id(), actions, QString(), QString(), conditions, QString());
+#else
         auto job = connection()->callApi<SetPushRuleJob>("global"_ls, "override"_ls, id(), actions, QString(), QString(), conditions, QString());
+#endif
         connect(job, &BaseJob::success, this, [this]() {
+#if Quotient_VERSION_MINOR > 8
+            auto enableJob = connection()->callApi<SetPushRuleEnabledJob>("override"_ls, id(), true);
+#else
             auto enableJob = connection()->callApi<SetPushRuleEnabledJob>("global"_ls, "override"_ls, id(), true);
+#endif
             connect(enableJob, &BaseJob::success, this, [this]() {
                 m_pushNotificationStateUpdating = false;
             });
@@ -1271,9 +1335,17 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
         // No conditions for a room rule
         const QList<PushCondition> conditions;
 
+#if Quotient_VERSION_MINOR > 8
+        auto setJob = connection()->callApi<SetPushRuleJob>("room"_ls, id(), actions, QString(), QString(), conditions, QString());
+#else
         auto setJob = connection()->callApi<SetPushRuleJob>("global"_ls, "room"_ls, id(), actions, QString(), QString(), conditions, QString());
+#endif
         connect(setJob, &BaseJob::success, this, [this]() {
+#if Quotient_VERSION_MINOR > 8
+            auto enableJob = connection()->callApi<SetPushRuleEnabledJob>("room"_ls, id(), true);
+#else
             auto enableJob = connection()->callApi<SetPushRuleEnabledJob>("global"_ls, "room"_ls, id(), true);
+#endif
             connect(enableJob, &BaseJob::success, this, [this]() {
                 m_pushNotificationStateUpdating = false;
             });
@@ -1302,9 +1374,17 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
         const QList<PushCondition> conditions;
 
         // Add new room rule and make sure enabled
+#if Quotient_VERSION_MINOR > 8
+        auto setJob = connection()->callApi<SetPushRuleJob>("room"_ls, id(), actions, QString(), QString(), conditions, QString());
+#else
         auto setJob = connection()->callApi<SetPushRuleJob>("global"_ls, "room"_ls, id(), actions, QString(), QString(), conditions, QString());
+#endif
         connect(setJob, &BaseJob::success, this, [this]() {
+#if Quotient_VERSION_MINOR > 8
+            auto enableJob = connection()->callApi<SetPushRuleEnabledJob>("room"_ls, id(), true);
+#else
             auto enableJob = connection()->callApi<SetPushRuleEnabledJob>("global"_ls, "room"_ls, id(), true);
+#endif
             connect(enableJob, &BaseJob::success, this, [this]() {
                 m_pushNotificationStateUpdating = false;
             });
@@ -1313,7 +1393,6 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
 
     m_currentPushNotificationState = state;
     Q_EMIT pushNotificationStateChanged(m_currentPushNotificationState);
-
 }
 
 void NeoChatRoom::updatePushNotificationState(QString type)
@@ -1396,7 +1475,11 @@ void NeoChatRoom::openEventMediaExternally(const QString &eventId)
     const auto evtIt = findInTimeline(eventId);
     if (evtIt != messageEvents().rend() && is<RoomMessageEvent>(**evtIt)) {
         const auto event = evtIt->viewAs<RoomMessageEvent>();
+#if Quotient_VERSION_MINOR > 8
+        if (event->has<EventContent::FileContent>()) {
+#else
         if (event->hasFileContent()) {
+#endif
             const auto transferInfo = cachedFileTransferInfo(event);
             if (transferInfo.completed()) {
                 UrlHelper helper;
@@ -1429,7 +1512,11 @@ void NeoChatRoom::copyEventMedia(const QString &eventId)
     const auto evtIt = findInTimeline(eventId);
     if (evtIt != messageEvents().rend() && is<RoomMessageEvent>(**evtIt)) {
         const auto event = evtIt->viewAs<RoomMessageEvent>();
+#if Quotient_VERSION_MINOR > 8
+        if (event->has<EventContent::FileContent>()) {
+#else
         if (event->hasFileContent()) {
+#endif
             const auto transferInfo = fileTransferInfo(eventId);
             if (transferInfo.completed()) {
                 Clipboard clipboard;
@@ -1462,13 +1549,20 @@ FileTransferInfo NeoChatRoom::cachedFileTransferInfo(const Quotient::RoomEvent *
     QString mxcUrl;
     int total = 0;
     if (auto evt = eventCast<const Quotient::RoomMessageEvent>(event)) {
+#if Quotient_VERSION_MINOR > 8
+        if (evt->has<EventContent::FileContent>()) {
+            const auto fileContent = evt->get<EventContent::FileContent>();
+#else
         if (evt->hasFileContent()) {
-            mxcUrl = evt->content()->fileInfo()->url().toString();
-            total = evt->content()->fileInfo()->payloadSize;
+            const auto fileContent = evt->content()->fileInfo();
+#endif
+
+            mxcUrl = fileContent->url().toString();
+            total = fileContent->payloadSize;
         }
     } else if (auto evt = eventCast<const Quotient::StickerEvent>(event)) {
-        mxcUrl = evt->image().fileInfo()->url().toString();
-        total = evt->image().fileInfo()->payloadSize;
+        mxcUrl = evt->image().url().toString();
+        total = evt->image().payloadSize;
     }
 
     FileTransferInfo transferInfo = fileTransferInfo(event->id());
@@ -1681,9 +1775,13 @@ int NeoChatRoom::maxRoomVersion() const
     return maxVersion;
 }
 
-Quotient::RoomMember NeoChatRoom::directChatRemoteMember() const
+NeochatRoomMember *NeoChatRoom::directChatRemoteMember()
 {
-    return directChatMembers()[0];
+    if (directChatMembers().size() == 0) {
+        qWarning() << "No other member available in this room";
+        return {};
+    }
+    return new NeochatRoomMember(this, directChatMembers()[0].id());
 }
 
 void NeoChatRoom::sendLocation(float lat, float lon, const QString &description)
@@ -1743,6 +1841,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

@@ -13,6 +13,7 @@
 #include <Quotient/roommember.h>
 
 #include "enums/pushrule.h"
+#include "neochatroommember.h"
 #include "pollhandler.h"
 
 namespace Quotient
@@ -74,7 +75,7 @@ class NeoChatRoom : public Quotient::Room
     /**
      * @brief Get a RoomMember object for the other person in a direct chat.
      */
-    Q_PROPERTY(Quotient::RoomMember directChatRemoteMember READ directChatRemoteMember CONSTANT)
+    Q_PROPERTY(NeochatRoomMember *directChatRemoteMember READ directChatRemoteMember CONSTANT)
 
     /**
      * @brief The Matrix IDs of this room's parents.
@@ -319,7 +320,7 @@ public:
 
     [[nodiscard]] QString avatarMediaId() const;
 
-    Quotient::RoomMember directChatRemoteMember() const;
+    NeochatRoomMember *directChatRemoteMember();
 
     /**
      * @brief Whether this room has one or more parent spaces set.

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();
@@ -125,7 +131,11 @@ void NotificationsManager::processNotificationJob(QPointer<NeoChatConnection> co
 
         QImage avatar_image;
         if (!sender.avatarUrl().isEmpty()) {
+#if Quotient_VERSION_MINOR > 8
+            avatar_image = room->member(sender.id()).avatar(128, 128, {});
+#else
             avatar_image = room->memberAvatar(sender.id()).get(connection, 128, {});
+#endif
         } else {
             avatar_image = room->avatar(128);
         }
@@ -243,7 +253,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

@@ -14,9 +14,11 @@ Name[en_GB]=NeoChat
 Name[eo]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
+Name[fa]=نئوچت
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[gl]=NeoChat
+Name[he]=NeoChat
 Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
@@ -57,6 +59,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,36 @@
         "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[fa]": "نئوچت",
+        "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/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

@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
@@ -188,11 +190,17 @@ QQC2.ScrollView {
 
                 focusSequence: "Ctrl+Shift+F"
 
-                onAccepted: sortedMessageEventModel.filterString = text
+                onAccepted: userFilterModel.filterText = text
             }
         }
 
-        model: root.room.isDirectChat() ? 0 : RoomManager.userListModel
+        model: root.room.isDirectChat() ? 0 : userFilterModel
+
+        UserFilterModel {
+            id: userFilterModel
+            sourceModel: RoomManager.userListModel
+            allowEmpty: true
+        }
 
         clip: true
         focus: true

src/qml/TimelineView.qml

@@ -183,12 +183,17 @@ QQC2.ScrollView {
         KirigamiComponents.FloatingButton {
             id: goReadMarkerFab
 
-            anchors.right: parent.right
-            anchors.top: parent.top
-            anchors.topMargin: Kirigami.Units.largeSpacing
-            anchors.rightMargin: Kirigami.Units.largeSpacing
-            implicitWidth: Kirigami.Units.gridUnit * 2
-            implicitHeight: Kirigami.Units.gridUnit * 2
+            anchors {
+                right: parent.right
+                top: parent.top
+                topMargin: Kirigami.Units.largeSpacing
+                rightMargin: Kirigami.Units.largeSpacing
+            }
+
+            implicitWidth: Kirigami.Settings.hasTransientTouchInput ? Kirigami.Units.gridUnit * 3 : Kirigami.Units.gridUnit * 2
+            implicitHeight: Kirigami.Settings.hasTransientTouchInput ? Kirigami.Units.gridUnit * 3 : Kirigami.Units.gridUnit * 2
+
+            padding: Kirigami.Units.largeSpacing
 
             z: 2
             visible: (root.currentRoom?.hasUnreadMessages ?? false)
@@ -215,12 +220,16 @@ QQC2.ScrollView {
         }
         KirigamiComponents.FloatingButton {
             id: goMarkAsReadFab
-            anchors.right: parent.right
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: Kirigami.Units.largeSpacing
-            anchors.rightMargin: Kirigami.Units.largeSpacing
-            implicitWidth: Kirigami.Units.gridUnit * 2
-            implicitHeight: Kirigami.Units.gridUnit * 2
+            anchors {
+                right: parent.right
+                bottom: parent.bottom
+                bottomMargin: Kirigami.Units.largeSpacing
+                rightMargin: Kirigami.Units.largeSpacing
+            }
+            implicitWidth: Kirigami.Settings.hasTransientTouchInput ? Kirigami.Units.gridUnit * 3 : Kirigami.Units.gridUnit * 2
+            implicitHeight: Kirigami.Settings.hasTransientTouchInput ? Kirigami.Units.gridUnit * 3 : Kirigami.Units.gridUnit * 2
+
+            padding: Kirigami.Units.largeSpacing
 
             z: 2
             visible: !messageListView.atYEnd

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,10 +11,12 @@
 #include "neochatconfig.h"
 #include "neochatconnection.h"
 #include "neochatroom.h"
+#include "neochatroommember.h"
 #include "spacehierarchycache.h"
 #include "urlhelper.h"
 
 #include <KLocalizedString>
+#include <KRuntimePlatform>
 #include <QDesktopServices>
 #include <QQuickTextDocument>
 #include <QStandardPaths>
@@ -184,7 +186,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;
@@ -202,14 +204,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(),
@@ -217,12 +219,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
@@ -243,6 +240,12 @@ void RoomManager::loadInitialRoom()
         resolveResource(m_arg);
     }
 
+    const auto runtimePlatform = KRuntimePlatform::runtimePlatform();
+    if (runtimePlatform.contains(QStringLiteral("phone")) || runtimePlatform.contains(QStringLiteral("handset"))) {
+        // We don't want to open a room on startup on mobile
+        return;
+    }
+
     if (m_currentRoom) {
         // we opened a room with the arg parsing already
         return;
@@ -354,7 +357,11 @@ void RoomManager::joinRoom(Quotient::Connection *account, const QString &roomAli
 
 void RoomManager::knockRoom(NeoChatConnection *account, const QString &roomAliasOrId, const QString &reason, const QStringList &viaServers)
 {
+#if Quotient_VERSION_MINOR > 8
+    auto job = account->callApi<KnockRoomJob>(roomAliasOrId, viaServers, viaServers, reason);
+#else
     auto job = account->callApi<KnockRoomJob>(roomAliasOrId, viaServers, reason);
+#endif
     // Upon completion, ensure a room object is created in case it hasn't come
     // with a sync yet. If the room object is not there, provideRoom() will
     // create it in Join state. finished() is used here instead of success()

src/roommanager.h

@@ -23,6 +23,7 @@
 #include "models/sortfilterspacelistmodel.h"
 #include "models/timelinemodel.h"
 #include "models/userlistmodel.h"
+#include "neochatroommember.h"
 
 class NeoChatRoom;
 class NeoChatConnection;
@@ -216,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.
@@ -231,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);
@@ -287,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.
@@ -303,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,
@@ -313,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,

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/timeline/AuthorComponent.qml

@@ -43,7 +43,6 @@ RowLayout {
 
     QQC2.AbstractButton {
         id: nameButton
-        Layout.fillWidth: true
         contentItem: QQC2.Label {
             text: root.author.disambiguatedName
             color: root.author.color
@@ -53,6 +52,13 @@ RowLayout {
         }
         Accessible.name: contentItem.text
         onClicked: RoomManager.resolveResource(root.author.uri)
+
+        HoverHandler {
+            cursorShape: Qt.PointingHandCursor
+        }
+    }
+    Item {
+        Layout.fillWidth: true
     }
     QQC2.Label {
         id: timeLabel
@@ -60,7 +66,7 @@ RowLayout {
         horizontalAlignment: Text.AlignRight
         color: Kirigami.Theme.disabledTextColor
         QQC2.ToolTip.visible: timeHoverHandler.hovered
-        QQC2.ToolTip.text: root.time.toLocaleString(Qt.locale(), Locale.LongFormat)
+        QQC2.ToolTip.text: root.time.toLocaleString(Qt.locale(), Locale.ShortFormat)
         QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
 
         HoverHandler {

src/timeline/Bubble.qml

@@ -74,6 +74,8 @@ QQC2.Control {
      */
     property real maxContentWidth: -1
 
+    required property bool isPending
+
     /**
      * @brief The reply has been clicked.
      */
@@ -89,29 +91,43 @@ QQC2.Control {
      */
     signal showMessageMenu
 
-    contentItem: ColumnLayout {
-        id: contentColumn
-        spacing: Kirigami.Units.smallSpacing
-        Repeater {
-            id: contentRepeater
-            model: root.contentModel
-            delegate: MessageComponentChooser {
-                room: root.room
-                index: root.index
-                actionsHandler: root.actionsHandler
-                timeline: root.timeline
-                maxContentWidth: root.maxContentWidth
+    contentItem: RowLayout {
+        Kirigami.Icon {
+            source: "content-loading-symbolic"
+            Layout.preferredWidth: Kirigami.Units.iconSizes.small
+            Layout.preferredHeight: Kirigami.Units.iconSizes.small
+            visible: root.isPending && Config.showLocalMessagesOnRight
+        }
+        ColumnLayout {
+            id: contentColumn
+            spacing: Kirigami.Units.smallSpacing
+            Repeater {
+                id: contentRepeater
+                model: root.contentModel
+                delegate: MessageComponentChooser {
+                    room: root.room
+                    index: root.index
+                    actionsHandler: root.actionsHandler
+                    timeline: root.timeline
+                    maxContentWidth: root.maxContentWidth
 
-                onReplyClicked: eventId => {
-                    root.replyClicked(eventId);
+                    onReplyClicked: eventId => {
+                        root.replyClicked(eventId);
+                    }
+                    onSelectedTextChanged: selectedText => {
+                        root.selectedTextChanged(selectedText);
+                    }
+                    onShowMessageMenu: root.showMessageMenu()
+                    onRemoveLinkPreview: index => root.contentModel.closeLinkPreview(index)
                 }
-                onSelectedTextChanged: selectedText => {
-                    root.selectedTextChanged(selectedText);
-                }
-                onShowMessageMenu: root.showMessageMenu()
-                onRemoveLinkPreview: index => root.contentModel.closeLinkPreview(index)
             }
         }
+        Kirigami.Icon {
+            source: "content-loading-symbolic"
+            Layout.preferredWidth: Kirigami.Units.iconSizes.small
+            Layout.preferredHeight: Kirigami.Units.iconSizes.small
+            visible: root.isPending && !Config.showLocalMessagesOnRight
+        }
     }
 
     background: Kirigami.ShadowedRectangle {

src/timeline/CodeComponent.qml

@@ -20,7 +20,7 @@ QQC2.Control {
      *
      * @sa Quotient::RoomMember
      */
-    required property RoomMember author
+    required property NeochatRoomMember author
 
     /**
      * @brief The timestamp of the message.

src/timeline/HiddenDelegate.qml

@@ -26,7 +26,7 @@ TimelineDelegate {
     /**
      * @brief The message author.
      */
-    required property RoomMember author
+    required property NeochatRoomMember author
 
     width: parent?.width
     rightPadding: Config.compactLayout && root.ListView.view.width >= Kirigami.Units.gridUnit * 20 ? Kirigami.Units.gridUnit * 2 + Kirigami.Units.largeSpacing : Kirigami.Units.largeSpacing
@@ -88,7 +88,7 @@ TimelineDelegate {
     QtObject {
         id: _private
         function showMessageMenu() {
-            RoomManager.viewEventMenu(root.eventId, root.room, "");
+            RoomManager.viewEventMenu(root.eventId, root.room, root.author, "");
         }
     }
 }