GIT_SILENT Upgrade release service version to 23.07.90.

We already check with a regex if the message only contains emoji so it is safe
to hardcode the font family as emoji for these messages.


(cherry picked from commit 58213ee3e6)

CMakeLists.txt

@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.16)
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "23")
 set(RELEASE_SERVICE_VERSION_MINOR "07")
-set(RELEASE_SERVICE_VERSION_MICRO "70")
+set(RELEASE_SERVICE_VERSION_MICRO "90")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
@@ -53,13 +53,24 @@ if(QT_MAJOR_VERSION STREQUAL "6")
     set(OVERLAYSHEET_OPEN "onOpened")
     set(QTQUICK_MODULE_QML_VERSION "")
     set(QTLOCATION_MODULE_QML_VERSION "")
+    set(QTMULTIMEDIA_MODULE_QML_VERSION "")
+    set(QTMULTIMEDIA_AUDIO "MediaPlayer")
+    # in Audio qt6 we don't have it but we disable it in qt5 => it seems ok
+    set(QTMULTIMEDIA_AUDIO_AUTOLOAD "")
+    # In Video qml qt6 we don't have it.
+    set(QTMULTIMEDIA_VIDEO_FLUSHMODE "")
 else()
     set(BASICLISTITEM_BOLD "bold")
     set(OVERLAYSHEET_OPEN "onSheetOpenChanged")
     set(QTQUICK_MODULE_QML_VERSION "2.15")
     set(QTLOCATION_MODULE_QML_VERSION "5.15")
+    set(QTMULTIMEDIA_MODULE_QML_VERSION "5.15")
+    set(QTMULTIMEDIA_AUDIO "Audio")
+    set(QTMULTIMEDIA_AUDIO_AUTOLOAD "autoLoad: false")
+    set(QTMULTIMEDIA_VIDEO_FLUSHMODE "flushMode: VideoOutput.FirstFrame")
 endif()
 
+set(QUOTIENT_FORCE_NAMESPACED_INCLUDES TRUE)
 
 ecm_setup_version(${PROJECT_VERSION}
     VARIABLE_PREFIX NEOCHAT

autotests/neochatroomtest.cpp

@@ -7,9 +7,9 @@
 
 #include "neochatroom.h"
 
-#include <connection.h>
-#include <quotient_common.h>
-#include <syncdata.h>
+#include <Quotient/connection.h>
+#include <Quotient/quotient_common.h>
+#include <Quotient/syncdata.h>
 
 using namespace Quotient;
 

autotests/texthandlertest.cpp

@@ -6,9 +6,9 @@
 
 #include "texthandler.h"
 
+#include <Quotient/quotient_common.h>
+#include <Quotient/syncdata.h>
 #include <qnamespace.h>
-#include <quotient_common.h>
-#include <syncdata.h>
 
 using namespace Quotient;
 

org.kde.neochat.appdata.xml

@@ -60,7 +60,7 @@
   <summary xml:lang="eu">Matrix, deszentralizatutako komunikazio protokolorako bezero bat</summary>
   <summary xml:lang="fi">Asiakas Matrixille, hajautetulle viestintäyhteyskäytännölle</summary>
   <summary xml:lang="fr">Un client pour « Matrix », le protocole décentralisé de communications.</summary>
-  <summary xml:lang="gl">Un cliente para Matrix, o protocolo de comunicación descentralizada</summary>
+  <summary xml:lang="gl">Un cliente para Matrix, o protocolo de comunicación descentralizada.</summary>
   <summary xml:lang="hu">Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz</summary>
   <summary xml:lang="ia">Un cliente per Matrix, le protocollo de communication decentralisate</summary>
   <summary xml:lang="id">Klien untuk matrix, protokol komunikasi terdesentralisasi</summary>
@@ -92,17 +92,20 @@ to provide a convergent experience across multiple platforms.</p>
     <p xml:lang="en-GB">NeoChat is a client for Matrix, the decentralised communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami to provide a convergent experience across multiple platforms.</p>
     <p xml:lang="eo">NeoChat estas kliento por Matrix, la malcentra komunikoprotokolo por tuja mesaĝado. Ĝi ebligas al vi sendi tekstmesaĝojn, filmetojn kaj sondosierojn al via familio, kolegoj kaj amikoj. Ĝi uzas KDE-framojn kaj precipe Kirigami por disponigi konverĝan sperton tra pluraj platformoj.</p>
     <p xml:lang="es">NeoChat es un cliente para Matrix, el protocolo de comunicaciones descentralizado para mensajería instantánea. Le permite enviar mensajes de texto, vídeos y archivos de sonido a su familia, compañeros de trabajo y amigos. Usa la infraestructura de KDE y, en particular, Kirigami para proporcionar una experiencia convergente en muchas plataformas.</p>
+    <p xml:lang="eu">NeoChat «Matrix»erako, bat-bateko mezularitzarako komunikazio deszentralizatuko protokolorako, bezero bat da. Zure sendiari, kide eta lagunei testu mezuak, bideo eta audio fitxategiak bidaltzeko aukera ematen dizu. «KDE Frameworks» eta bereziki «Kirigami» erabiltzen ditu plataforma anitzen artean esperientzia konbergente bat eskaintzeko.</p>
     <p xml:lang="fi">NeoChat on asiakassovellus Matrixille, hajautetulle pikaviestinyhteyskäytännölle. Sillä voi lähettää teksti-, video- ja ääniviestejä perheelle, tutuille ja ystäville. Se käyttää KDE-kehystä ja erityisesti Kirigamia tuottaakseen mukautuvan monialustaisen käyttökokemuksen.</p>
     <p xml:lang="fr">NeoChat est un client pour le protocole Matrix, un protocole décentralisé de communications pour messagerie instantané. Il vous permet d'envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos amis. Il utilise les environnements de développement et plus précisément Kirigami pour fournir une expérience convergente sur plusieurs plate-formes. </p>
-    <p xml:lang="gl">NeoChat é un cliente para Matrix, o protocolo de comunicación descentralizada para mensaxería instantánea. Podes enviar mensaxes de texto, vídeos e ficheiros de son á túa familia, colegas e amizades. Usas infraestruturas de KDE e principalmente Kirigami para proporcionar unha experiencia de uso converxente para varias plataformas.</p>
+    <p xml:lang="gl">NeoChat é un cliente para Matrix, o protocolo de comunicación descentralizada para mensaxaría instantánea. Podes enviar mensaxes de texto, vídeos e ficheiros de son á túa familia, colegas e amizades. Usas infraestruturas de KDE e principalmente Kirigami para proporcionar unha experiencia de uso converxente para varias plataformas.</p>
     <p xml:lang="ia">NeoChat es un cliente per Matrix, le protocollo de communication decentralisate per messager instantanee. Illo te permitte inviar messager de texto, files de video e audio a tu familia, collegas e amicos usante. Illo usa KDE frameworks e super toto Kirigamii forni un experientia convergente trans platteforme multiple.</p>
     <p xml:lang="it">NeoChat è un client per Matrix, il protocollo di comunicazione decentralizzato per la messaggistica istantanea. Ti consente di inviare messaggi di testo, video e file audio a familiari, colleghi e amici. Utilizza i framework KDE e in particolare Kirigami per fornire un'esperienza convergente su più piattaforme.</p>
     <p xml:lang="ka">NeoChat არის Matrix კლიენტი. ის საშუალებას გაძლევთ გაგზავნოთ ტექსტური შეტყობინებები, ვიდეოები და აუდიო ფაილები თქვენს ოჯახს, კოლეგებსა და მეგობრებს მატრიქსის პროტოკოლის გამოყენებით.</p>
+    <p xml:lang="ko">NeoChat은 분산형 인스턴트 메시징 통신 프로토콜인 Matrix 클라이언트입니다. 가족, 동료, 친구에게 텍스트 메시지, 동영상, 오디오 파일을 전송할 수 있습니다. KDE 프레임워크와 Kirigami를 사용하여 다양한 플랫폼에서 일관적인 사용자 경험을 제공합니다.</p>
     <p xml:lang="nl">NeoChat is een client voor Matrix, het gedecentraliseerde communicatieprotocol voor instant messages. Het biedt u het verzenden van tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden. Het gebruik KDE frameworks en het meest opmerkelijk Kirigami om een convergente ervaring te leveren op meerdere platforms.</p>
     <p xml:lang="nn">NeoChat er ein klient for Matrix, ein protokoll for desentralisert kommunikasjon. Du kan utveksla tekst, lyd og videoar med kollegaar, vennar og familie. Programmet brukar KDE Frameworks og Kirigami for å gje ei brukarflate tilpassa ulike plattformer.</p>
     <p xml:lang="pl">NeoChat jest programem do Matriksa, protokołu rozproszonego porozumiewania się w czasie rzeczywistym. Umożliwia wysyłanie wiadomości tekstowych, filmów oraz dźwięku do twojej rodziny, znajomych oraz przyjaciół. Używa szkieletów KDE i głównie Kirigami, aby zapewnić spójne wrażenia na wielu platformach</p>
     <p xml:lang="pt">O NeoChat é um cliente do Matrix. O mesmo permite-lhe enviar mensagens de texto, ficheiros de vídeo e áudio para a sua família, colegas e amigos com o protocolo Matrix. Usa as plataformas do KDE, e principalmente o Kirigami, para oferecer uma experiência convergente entre várias plataformas.</p>
     <p xml:lang="sl">Neochat je odjemalec za Matrix, decentralizirani komunikacijski protokol za takojšnje sporočanje. Omogoča vam pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek svoji družini, sodelavcem in prijateljem. Uporablja okvire ogrodje KDE frameworks in predvsem Kirigami za zagotavljanje konvergentne izkušnje na več platformah.</p>
+    <p xml:lang="sv">NeoChat är en klient för Matrix, det decentraliserade kommunikationsprotokollet för direktmeddelanden. Den låter dig skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner. Den använder KDE Ramverk, i synnerhet Kirigami, för att tillhandahålla en konvergent upplevelse på flera plattformar.</p>
     <p xml:lang="tr">NeoChat, anlık iletileşme için merkezi olmayan iletişim protokolü olan Matrix için bir istemcidir. Ailenize, iş arkadaşlarınıza ve arkadaşlarınıza metin iletiler, videolar ve ses dosyaları göndermenize olanak tanır. Birden çok platformda yakınsak bir deneyim sağlamak için KDE Frameworks ve en önemlilerinden Kirigami'yi kullanır.</p>
     <p xml:lang="uk">NeoChat — клієнт Matrix, децентралізованого протоколу спілкування для миттєвого обміну повідомленнями. За його допомогою ви можете надсилати текстові повідомлення, відео та звукові файли вашій родин, колегами та друзям. У програмі використано бібліотеки KDE, зокрема Kirigami, для надання однорідного середовища на декількох програмних та апаратних платформах.</p>
     <p xml:lang="x-test">xxNeoChat is a client for Matrix, the decentralized communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami to provide a convergent experience across multiple platforms.xx</p>
@@ -112,17 +115,20 @@ to provide a convergent experience across multiple platforms.</p>
     <p xml:lang="ca-valencia">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de VoIP, fils i alguns aspectes de l'encriptació d'extrem a extrem. Hi ha algunes altres omissions més xicotetes a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu seguix sent proporcionar suport eventual per a tota l'especificació.</p>
     <p xml:lang="en-GB">NeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.</p>
     <p xml:lang="es">NeoChat pretende ser una aplicación con todas las funciones para la especificación de Matrix. Como tal, admite todo en la especificación estable actual, con las notables excepciones de VoIP, subprocesos y algunas funciones de cifrado de extremo a extremo. Existen algunas omisiones menos importantes debido al hecho de que la especificación de Matrix está en constante evolución, pero el objetivo sigue siendo brindar compatibilidad final con toda la especificación.</p>
+    <p xml:lang="eu">«NeoChat»ek «Matrix» zehaztapenaren ezaugarri guztiak eskaintzen dituen aplikazio bat izan nahi du. Beraz, egungo zehaztapen egonkorrean dagoen guztiaren euskarria du, VoIP, hariak eta muturren artean zifratzeko salbuespen nabarmenekin. Badira beste ez-betetze txikiago batzuk, «Matrix»en zehaztapena etengabe eboluzioan dagoelako, baina azken helburua zehaztapen osoaren euskarria ematea izaten jarraitzen du.</p>
     <p xml:lang="fi">NeoChat pyrkii olemaan Matrix-määritelmän täysominaisuuksinen sovellus, joten se tukee kaikkea nykyisessä vakaassa määritelmässä muutamaa huomattavaa poikkeusta lukuun ottamatta (VoIP, säikeet ja jotkin piirteet päästä päähän -salauksessa). Joitakin pienempiäkin puutteita on Matrix-määritelmän jatkuvan kehityksen vuoksi, mutta lopputavoitteena on tarjota määritelmän täysi tuki.</p>
     <p xml:lang="fr">L'objectif de NeoChat est d'être une application complète pour le protocole Matrix. En tant que tel, tout dans la spécification stable actuelle avec les exceptions notables de VoIP, les processus et certains aspects du chiffrement de bout en bout sont pris en charge. Il y a quelques autres petites omissions en raison du fait que la spécification du protocole Matrix est en constante évolution. Cependant, l'objectif reste de fournir un soutien éventuel pour l'ensemble de la spécification.</p>
     <p xml:lang="gl">NeoChat pretende ser unha aplicación completa para a especificación de Matrix. Coas excepcións de VoIP, conversas fiadas e algúns aspectos da cifraxe de extremo a extremo, a versión estábel segue as especificacións. Existen algunhas outras pequenas omisións debido ao feito de que Matrix está en continua evolución pero a intención é implementar a especificación completa.</p>
     <p xml:lang="ia">NeoChat aspira a esser un application plenemente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
     <p xml:lang="it">NeoChat mira ad essere un'applicazione completa per le specifiche Matrix. Pertanto, sono supportati tutti gli elementi dell'attuale specifica stabile con le notevoli eccezioni di VoIP, conversazioni e alcuni aspetti della cifratura end-to-end. Ci sono alcune altre piccole omissioni dovute al fatto che le specifiche Matrix sono in continua evoluzione, ma l'obiettivo rimane quello di fornire un eventuale supporto per l'intera specifica.</p>
     <p xml:lang="ka">NeoChat-ი მიზნად ისახავს Matrix სპეციფიკაციის სრული განხორციელება ჰქონდეს. როგორც ასეთი, ყველაფერი მიმდინარე სპეციფიკაციიდან, VoIP-ის, ძაფებისა და გამჭოლი დაშიფვრის ზოგიერთი ასპექტის გარდა, მხარდაჭერილია. შეძლება ასევე იყოს მცირე ლაფსუსებიც იმის გამო, რომ Matrix-ის სპეციფიკაცია მუდმივად ვითარგდება, მაგრამ ჩვენი მიზანი მისი სრული მხარდაჭერაა.</p>
+    <p xml:lang="ko">NeoChat은 Matrix 표준을 따르는 프로그램을 목표로 합니다. 현재 안정 버전의 표준에서 제공하는 기능의 대부분을 지원하며, VoIP, 스레드, 일부 종단간 암호화와 같은 기능은 아직 지원하지 않습니다. Matrix 표준은 계속하여 진화 중이기 때문에 일부 기능이 빠져 있을 수도 있지만 장기적으로는 전체 표준을 지원하는 것이 목표입니다.</p>
     <p xml:lang="nl">NeoChat richt zich op het volledig bieden van alle mogelijkheden van de Matrix-specificatie. Alles in de huidige stabiele specificatie met merkbare uitzondering van VoIP, gekoppelde discussies en sommige aspecten van eind-tot-eind versleuteling worden ondersteund. Er zijn een paar andere kleinere omissies vanwege het feit dat de Matrix specificatie constant evolueert maar het doel blijft het eventueel bieden van ondersteuning van de gehele specificatie.</p>
     <p xml:lang="nn">NeoChat har som mål å støtta all funksjonalitet i Matrix-spesifikasjonen. Førebels er alt i den gjeldande stabile spesifikasjonen støtta, med unntak av VoIP, trådar og nokre delar av ende-til-kryptering. Det finst òg andre småting som ikkje er støtta, sidan Matrix-spesifikasjon er i stadig endring, men målet er altså støtte for alt.</p>
     <p xml:lang="pl">NeoChat w zamyśle ma być pełnowartościową aplikacją wg wytycznych Matriksa. Z tego powodu, wszystko, co jest obecnie w stabilnych wytycznych z pominięciem VoIP, wątków i niektórych części szyfrowania Użytkownik-do-Użytkownika są obecnie obsługiwane. Pominięto też kilka mniejszych rzeczy ze względu na ciągły rozwój wytycznych Matriksa, lecz celem nadal jest zapewnienie obsługi wszystkich wytycznych.</p>
     <p xml:lang="pt">O NeoChat pretende ser uma aplicação completa para a especificação do Matrix. Como tal, tudo o que existe na especificação estável actual, com as notáveis excepções do VoIP, tópicos e alguns aspectos da Encriptação Ponto-a-Ponto, são suportados. Existem mais algumas omissões, devido ao facto que a norma do Matrix está em constante evolução, mas o objectivo continua a ser oferecer o suporte eventual para a norma por inteiro.</p>
     <p xml:lang="sl">Neochat cilja, da bi bila popolna aplikacija po specifikaciji Matrixa. Kot takšna vsebuje vse v trenutni stabilni specifikaciji z pomembnimi izjemami pri VoIP, nitih in nekaterih vidikov šifriranja od konca do konca. Obstaja nekaj drugih manjših opustitev zaradi dejstva, da se specifikacija Matrix nenehno razvija, vendar cilj ostaja zagotoviti morebitno podporo celotni specifikaciji.</p>
+    <p xml:lang="sv">NeoChat har som mål att vara ett fullständigt program enligt Matrix-specifikationen. Som sådant stöds allt i den nuvarande stabila specifikationen, med de nämnvärda undantagen VoIP, trådar och några aspekter av kryptering hela vägen. Det finns några ytterligare utelämnanden på grund av att Matrix-specifikationen hela tiden utvecklas, men målet förblir att till slut erbjuda stöd för hela specifikationen.</p>
     <p xml:lang="tr">NeoChat, Matrix belirtimi için tam özellikli bir uygulama olmayı hedefler. Bu nedenle; VoIP, ileti zincirleri ve Uçtan Uca Şifreleme'nin bazı yönleri gibi dikkate değer istisnalar dışında var olan kararlı belirtimdeki her şey desteklenir. Matrix belirtiminin sürekli gelişmesi nedeniyle birkaç küçük eksiklik daha var; ancak amaç tüm belirtim için nihai destek sağlamak olmayı sürdürüyor.</p>
     <p xml:lang="uk">Метою створення NeoChat є повноцінна реалізація програми для специфікації Matrix. Як наслідок, реалізовано усе у поточній стабільній специфікації, окрім голосового інтернет-зв'язку, потоків та деяких аспектів міжвузлового шифрування. Є також декілька інших незначних прогалин через те, що специфікація Matrix постійно змінюється, але метою лишається повна підтримка специфікації.</p>
     <p xml:lang="x-test">xxNeoChat 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.xx</p>
@@ -132,17 +138,21 @@ to provide a convergent experience across multiple platforms.</p>
     <p xml:lang="ca-valencia">A causa de la naturalea del desenvolupament de l'especificació de Matrix, NeoChat també implementa nombroses característiques inestables. Actualment són:</p>
     <p xml:lang="en-GB">Due to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:</p>
     <p xml:lang="es">Debido a la naturaleza del desarrollo de la especificación de Matrix, NeoChat también permite numerosas funciones no estables, como:</p>
+    <p xml:lang="eu">«Matrix» zehaztapenaren garapenaren izaeragatik, «Neo¢hat»ek ezaugarri ezegonkor ugari ere onartzen ditu. Gaur egun hauek:</p>
     <p xml:lang="fi">Matrix-määritelmän kehittyessä NeoChat tukee myös monia epävakaita ominaisuuksia. Tällä hetkellä näitä ovat:</p>
     <p xml:lang="fr">En raison de la nature du développement des spécifications du protocole Matrix, NeoChat prend également en charge de nombreuses fonctionnalités instables. Actuellement, ce sont :</p>
     <p xml:lang="gl">Debido á natureza do desenvolvemento da especificación de Matrix, NeoChat tamén inclúe varias funcionalidades non estábeis:</p>
     <p xml:lang="ia">Debite al natura del disveloppamento de specification de Matrix NeoChat tamben supporta numerose characteristicas instabile. Currentemente istes es:</p>
     <p xml:lang="it">A causa della natura dello sviluppo delle specifiche Matrix, NeoChat supporta anche numerose funzionalità instabili. Attualmente queste sono:</p>
     <p xml:lang="ka">Matrix-ის სპეციფიკაციის განვითარების ბუნების გამო NeoChat-ს ასევე აქვს უამრავი არასტაბილური ფუნქციაც. ახლა ისინია:</p>
+    <p xml:lang="ko">Matrix 표준 개발의 특징으로 인하여 NeoChat은 일부 실험적인 기능을 지원합니다. 현재 지원하는 기능은 다음과 같습니다.</p>
     <p xml:lang="nl">Vanwege de aard van de ontwikkeling van de Matrix specificatie ondersteunt NeoChat ook talloze onstabiele mogelijkheden. Dit zijn nu:</p>
     <p xml:lang="nn">På grunn av måten Matrix-spesifikasjonen vert utvikla på, støttar NeoChat òg nokre uferdige funksjonar:</p>
     <p xml:lang="pl">Ze względu na sposób rozwoju Matriksa, NeoChat obsługuje także kilka niestabilnych możliwości. Obecnie są to:</p>
     <p xml:lang="pt">Devido à natureza do desenvolvimento da especificação do Matrix, o NeoChat também suporta diversas funcionalidades instáveis. De momento são:</p>
     <p xml:lang="sl">Zaradi narave razvoja specifikacije Matrixa NeoChat podpira tudi številne nestabilne zmožnosti. Trenutno so to:</p>
+    <p xml:lang="sv">På grund av sättet Matrix-specifikationens utvecklas, stöder NeoChat också ett stor antal instabila funktioner. För närvarande är de:</p>
+    <p xml:lang="ta">மேட்ரிக்ஸு நெறிமுறை வரையறுக்கப்படும் வித‍த்தின் காரணமாக, பல நிலையற்ற அம்சங்களையும் நியோச்சாட் ஆதரிக்கிறது. தற்போது ஆதரிக்கப்படுபவை:</p>
     <p xml:lang="tr">NeoChat, Matrix belirtimi geliştirmesinin doğası gereği çok sayıda kararsız özelliği de destekler. Şu anda bunlar:</p>
     <p xml:lang="uk">Через природу розробки специфікації Matrix, у NeoChat також передбачено підтримку численних нестабільних можливостей. У поточній версії цими можливостями є:</p>
     <p xml:lang="x-test">xxDue to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:xx</p>
@@ -153,16 +163,19 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="ca-valencia">Enquestes - MSC3381</li>
       <li xml:lang="en-GB">Polls - MSC3381</li>
       <li xml:lang="es">Encuestas - MSC3381</li>
+      <li xml:lang="eu">Polls - MSC3381</li>
       <li xml:lang="fi">Kyselyt – MSC3381</li>
       <li xml:lang="fr">Sondages - MSC3381</li>
-      <li xml:lang="gl">Enquisas - MSC3381</li>
+      <li xml:lang="gl">Enquisas — MSC3381</li>
       <li xml:lang="ia">Inquestas - MSC3381</li>
       <li xml:lang="it">Sondaggi - MSC3381</li>
       <li xml:lang="ka">Polls - MSC3381</li>
+      <li xml:lang="ko">투표 - MSC3381</li>
       <li xml:lang="nl">Polls - MSC3381</li>
       <li xml:lang="nn">Avstemmingar – MSC3381</li>
       <li xml:lang="pt">Inquéritos - MSC3381</li>
       <li xml:lang="sl">Polls - MSC3381</li>
+      <li xml:lang="sv">Polls - MSC3381</li>
       <li xml:lang="ta">வாக்கெடுப்புகள் - MSC3381</li>
       <li xml:lang="tr">Anketler - MSC3381</li>
       <li xml:lang="uk">Опитування - MSC3381</li>
@@ -173,16 +186,19 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="ca-valencia">Paquets d'adhesius - MSC2545</li>
       <li xml:lang="en-GB">Sticker Packs - MSC2545</li>
       <li xml:lang="es">Paquetes de pegatinas - MSC2545</li>
+      <li xml:lang="eu">Eranskailu paketeak - MSC2545</li>
       <li xml:lang="fi">Tarrapakkaukset – MSC2545</li>
       <li xml:lang="fr">Paquets d'auto-collants - MSC2545</li>
-      <li xml:lang="gl">Paquetes de adhesivos - MSC2545</li>
+      <li xml:lang="gl">Paquetes de adhesivos — MSC2545</li>
       <li xml:lang="ia">Etiquetta gummate (sticker) -MSC2545</li>
       <li xml:lang="it">Pacchetti di adesivi - MSC2545</li>
       <li xml:lang="ka">სტიკერების პაკეტები - MSC2545</li>
+      <li xml:lang="ko">스티커 팩 - MSC2545</li>
       <li xml:lang="nl">Sticker Packs - MSC2545</li>
       <li xml:lang="nn">Klistremerke-pakkar – MSC2545</li>
       <li xml:lang="pt">Pacotes de Autocolantes - MSC2545</li>
       <li xml:lang="sl">Sticker Packs - MSC2545</li>
+      <li xml:lang="sv">Sticker Packs - MSC2545</li>
       <li xml:lang="ta">ஒட்டி தொகுப்புகள் - MSC2545</li>
       <li xml:lang="tr">Yapışkan Paketleri - MSC2545</li>
       <li xml:lang="uk">Пакунки наліпок - MSC2545</li>
@@ -193,16 +209,19 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="ca-valencia">Esdeveniments d'ubicació - MSC3488</li>
       <li xml:lang="en-GB">Location Events - MSC3488</li>
       <li xml:lang="es">Eventos de ubicación - MSC3488</li>
+      <li xml:lang="eu">Kokaleku-gertaerak - MSC3488</li>
       <li xml:lang="fi">Sijaintitapahtumat – MSC3488</li>
       <li xml:lang="fr">Événements de lieu - MSC3488</li>
-      <li xml:lang="gl">Localización de eventos - MSC3488</li>
+      <li xml:lang="gl">Localización de eventos — MSC3488</li>
       <li xml:lang="ia">Eventos de Location - MSC3488</li>
       <li xml:lang="it">Località eventi - MSC3488</li>
       <li xml:lang="ka">მდებარეობის მოვლენები - MSC3488</li>
+      <li xml:lang="ko">위치 이벤트 - MSC3488</li>
       <li xml:lang="nl">Locatie gebeurtenissen - MSC3488</li>
       <li xml:lang="nn">Posisjonshendingar – MSC3488</li>
       <li xml:lang="pt">Eventos com Localizações - MSC3488</li>
       <li xml:lang="sl">Location Events - MSC3488</li>
+      <li xml:lang="sv">Location Events - MSC3488</li>
       <li xml:lang="ta">இட நிகழ்வுகள் - MSC3488</li>
       <li xml:lang="tr">Konum Etkinlikleri - MSC3488</li>
       <li xml:lang="uk">Місцеві зустрічі - MSC3488</li>
@@ -266,10 +285,19 @@ to provide a convergent experience across multiple platforms.</p>
     <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</value>
     <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</value>
     <value key="KDE::windows_store::screenshots::1::caption" xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ia">Vista principal con lista de sala, chat e information de sala</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</value>
     <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ka">მთავარი ხედი სურათების სიით, ჩატით და ოთახის ინფორმაციით</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ko">대화방 목록, 채팅, 대화방 정보가 표시된 주 보기</value>
     <value key="KDE::windows_store::screenshots::1::caption" xml:lang="nl">Hoofdweergave met lijst met rooms, chat en roominformatie</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</value>
     <value key="KDE::windows_store::screenshots::1::caption" xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</value>
     <value key="KDE::windows_store::screenshots::1::caption" xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</value>
     <value key="KDE::windows_store::screenshots::1::caption" xml:lang="tr">Oda listesini, sohbet penceresini ve oda bilgisini gösteren ana görünüm</value>
     <value key="KDE::windows_store::screenshots::1::caption" xml:lang="uk">Головна панель із списком кімнат, спілкуванням та даними щодо кімнати</value>
     <value key="KDE::windows_store::screenshots::1::caption" xml:lang="x-test">xxMain view with room list, chat, and room informationxx</value>
@@ -278,10 +306,19 @@ to provide a convergent experience across multiple platforms.</p>
     <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ca">Pantalla d'inici de sessió</value>
     <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ca-valencia">Pantalla d'inici de sessió</value>
     <value key="KDE::windows_store::screenshots::2::caption" xml:lang="es">Pantalla de inicio de sesión</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="eu">Saio-hasteko pantaila</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="fr">Écran de connexion</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="gl">Pantalla de identificación.</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ia">Schermo de accesso</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="it">Schermata di accesso</value>
     <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ka">შესვლის ეკრანი</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ko">로그인 화면</value>
     <value key="KDE::windows_store::screenshots::2::caption" xml:lang="nl">Aanmeldscherm</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="nn">Innloggingsbilete</value>
     <value key="KDE::windows_store::screenshots::2::caption" xml:lang="pt">Ecrã de autenticação</value>
     <value key="KDE::windows_store::screenshots::2::caption" xml:lang="sl">Prijavni zaslon</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="sv">Inloggningsfönster</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ta">நுழைவுத் திரை</value>
     <value key="KDE::windows_store::screenshots::2::caption" xml:lang="tr">Oturum açma ekranı</value>
     <value key="KDE::windows_store::screenshots::2::caption" xml:lang="uk">Вікно входу</value>
     <value key="KDE::windows_store::screenshots::2::caption" xml:lang="x-test">xxLogin screenxx</value>

org.kde.neochat.desktop

@@ -93,7 +93,7 @@ Comment[es]=Cliente para el protocolo Matrix
 Comment[eu]=Matrix protokolorako bezeroa
 Comment[fi]=Asiakas Matrix-yhteyskäytännölle
 Comment[fr]=Client pour le protocole « Matrix »
-Comment[gl]=Cliente para o protocolo Matrix
+Comment[gl]=Cliente para o protocolo Matrix.
 Comment[hu]=Kliens a Matrix protokollhoz
 Comment[ia]=Cliente per le protocollo de Matrix
 Comment[id]=Klien untuk protokol Matrix

src/CMakeLists.txt

@@ -7,6 +7,8 @@ configure_file(qml/Page/RoomList/RoomDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qm
 configure_file(qml/Component/QuickSwitcher.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/QuickSwitcher.qml)
 configure_file(qml/Dialog/UserDetailDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/UserDetailDialog.qml)
 configure_file(qml/Dialog/PowerLevelDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/PowerLevelDialog.qml)
+configure_file(qml/Component/Timeline/AudioDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/AudioDelegate.qml)
+configure_file(qml/Component/Timeline/VideoDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/VideoDelegate.qml)
 configure_file(qml/Component/Timeline/OsmLocationPlugin.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/OsmLocationPlugin.qml)
 
 configure_file(res.qrc ${CMAKE_CURRENT_SOURCE_DIR}/res.generated.qrc)
@@ -64,6 +66,7 @@ add_library(neochat STATIC
     chatdocumenthandler.h
     models/devicesmodel.cpp
     models/devicesmodel.h
+    models/devicesproxymodel.cpp
     filetypesingleton.cpp
     filetypesingleton.h
     login.cpp

src/actionshandler.cpp

@@ -3,8 +3,8 @@
 
 #include "actionshandler.h"
 
-#include <csapi/joining.h>
-#include <events/roommemberevent.h>
+#include <Quotient/csapi/joining.h>
+#include <Quotient/events/roommemberevent.h>
 
 #include <cmark.h>
 

src/actionshandler.h

@@ -5,7 +5,7 @@
 
 #include <QObject>
 
-#include <events/roommessageevent.h>
+#include <Quotient/events/roommessageevent.h>
 
 #include "neochatroom.h"
 

src/chatdocumenthandler.cpp

@@ -218,8 +218,8 @@ void ChatDocumentHandler::setRoom(NeoChatRoom *room)
 void ChatDocumentHandler::complete(int index)
 {
     if (m_completionModel->autoCompletionType() == CompletionModel::User) {
-        auto name = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Text).toString();
-        auto id = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
+        auto name = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::DisplayNameRole).toString();
+        auto id = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::SubtitleRole).toString();
         auto text = getText();
         auto at = text.lastIndexOf(QLatin1Char('@'), cursorPosition() - 1);
         QTextCursor cursor(document()->textDocument());
@@ -232,7 +232,7 @@ void ChatDocumentHandler::complete(int index)
         pushMention({cursor, name, 0, 0, id});
         m_highlighter->rehighlight();
     } else if (m_completionModel->autoCompletionType() == CompletionModel::Command) {
-        auto command = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
+        auto command = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedTextRole).toString();
         auto text = getText();
         auto at = text.lastIndexOf(QLatin1Char('/'));
         QTextCursor cursor(document()->textDocument());
@@ -240,7 +240,7 @@ void ChatDocumentHandler::complete(int index)
         cursor.setPosition(cursorPosition(), QTextCursor::KeepAnchor);
         cursor.insertText(QStringLiteral("/%1 ").arg(command));
     } else if (m_completionModel->autoCompletionType() == CompletionModel::Room) {
-        auto alias = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
+        auto alias = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::SubtitleRole).toString();
         auto text = getText();
         auto at = text.lastIndexOf(QLatin1Char('#'), cursorPosition() - 1);
         QTextCursor cursor(document()->textDocument());
@@ -253,7 +253,7 @@ void ChatDocumentHandler::complete(int index)
         pushMention({cursor, alias, 0, 0, alias});
         m_highlighter->rehighlight();
     } else if (m_completionModel->autoCompletionType() == CompletionModel::Emoji) {
-        auto shortcode = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
+        auto shortcode = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedTextRole).toString();
         auto text = getText();
         auto at = text.lastIndexOf(QLatin1Char(':'));
         QTextCursor cursor(document()->textDocument());

src/controller.cpp

@@ -31,16 +31,15 @@
 
 #include <signal.h>
 
-#include "accountregistry.h"
-
-#include <connection.h>
-#include <csapi/content-repo.h>
-#include <csapi/logout.h>
-#include <csapi/profile.h>
-#include <jobs/downloadfilejob.h>
-#include <qt_connection_util.h>
-
-#include <eventstats.h>
+#include <Quotient/accountregistry.h>
+#include <Quotient/connection.h>
+#include <Quotient/csapi/content-repo.h>
+#include <Quotient/csapi/logout.h>
+#include <Quotient/csapi/profile.h>
+#include <Quotient/jobs/downloadfilejob.h>
+#include <Quotient/qt_connection_util.h>
+#include <Quotient/csapi/notifications.h>
+#include <Quotient/eventstats.h>
 
 #include "neochatconfig.h"
 #include "neochatroom.h"
@@ -102,17 +101,17 @@ Controller::Controller(QObject *parent)
     }
 #endif
 
-    connect(&Accounts, &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
+    connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
 
     static int oldAccountCount = 0;
-    connect(&Accounts, &AccountRegistry::accountCountChanged, this, [this]() {
-        if (Accounts.size() > oldAccountCount) {
-            auto connection = Accounts.accounts()[Accounts.size() - 1];
+    connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, [this]() {
+        if (m_accountRegistry.size() > oldAccountCount) {
+            auto connection = m_accountRegistry.accounts()[m_accountRegistry.size() - 1];
             connect(connection, &Connection::syncDone, this, [connection]() {
                 NotificationsManager::instance().handleNotifications(connection);
             });
         }
-        oldAccountCount = Accounts.size();
+        oldAccountCount = m_accountRegistry.size();
     });
 
     QTimer::singleShot(0, this, [this] {
@@ -148,10 +147,10 @@ void Controller::logout(Connection *conn, bool serverSideLogout)
     job.start();
     loop.exec();
 
-    if (Accounts.count() > 1) {
+    if (m_accountRegistry.count() > 1) {
         // Only set the connection if the the account being logged out is currently active
         if (conn == activeConnection()) {
-            setActiveConnection(Accounts.accounts()[0]);
+            setActiveConnection(m_accountRegistry.accounts()[0]);
         }
     } else {
         setActiveConnection(nullptr);
@@ -166,7 +165,7 @@ void Controller::addConnection(Connection *c)
 {
     Q_ASSERT_X(c, __FUNCTION__, "Attempt to add a null connection");
 
-    Accounts.add(c);
+    m_accountRegistry.add(c);
 
     c->setLazyLoading(true);
 
@@ -181,7 +180,7 @@ void Controller::addConnection(Connection *c)
     });
 
     connect(c, &Connection::requestFailed, this, [this](BaseJob *job) {
-        if (job->error() == BaseJob::UserConsentRequiredError) {
+        if (job->error() == BaseJob::UserConsentRequired) {
             Q_EMIT userConsentRequired(job->errorUrl());
         }
     });
@@ -248,7 +247,7 @@ void Controller::invokeLogin()
                 connect(connection, &Connection::networkError, this, [this](const QString &error, const QString &, int, int) {
                     Q_EMIT errorOccured(i18n("Network Error: %1", error));
                 });
-                connection->assumeIdentity(account.userId(), accessToken, account.deviceId());
+                connection->assumeIdentity(account.userId(), accessToken);
             });
         }
     }
@@ -264,7 +263,7 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const Accoun
     job->setKey(account.userId());
 
     // Handling of errors
-    connect(job, &QKeychain::Job::finished, this, [this, &account, job]() {
+    connect(job, &QKeychain::Job::finished, this, [this, job]() {
         if (job->error() == QKeychain::Error::NoError) {
             return;
         }
@@ -392,7 +391,7 @@ NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, b
 
 int Controller::accountCount() const
 {
-    return Accounts.count();
+    return m_accountRegistry.count();
 }
 
 void Controller::setQuitOnLastWindowClosed()
@@ -626,10 +625,10 @@ void Controller::setApplicationProxy()
 
 int Controller::activeConnectionIndex() const
 {
-    auto result = std::find_if(Accounts.accounts().begin(), Accounts.accounts().end(), [this](const auto &it) {
+    auto result = std::find_if(m_accountRegistry.accounts().begin(), m_accountRegistry.accounts().end(), [this](const auto &it) {
         return it == m_connection;
     });
-    return result - Accounts.accounts().begin();
+    return result - m_accountRegistry.accounts().begin();
 }
 
 int Controller::quotientMinorVersion() const
@@ -682,4 +681,9 @@ QVariantList Controller::getSupportedRoomVersions(Quotient::Connection *connecti
     return supportedRoomVersions;
 }
 
+AccountRegistry &Controller::accounts()
+{
+    return m_accountRegistry;
+}
+
 #include "moc_controller.cpp"

src/controller.h

@@ -9,8 +9,9 @@
 
 #include <KFormat>
 
-#include <jobs/basejob.h>
-#include <settings.h>
+#include <Quotient/accountregistry.h>
+#include <Quotient/jobs/basejob.h>
+#include <Quotient/settings.h>
 
 class NeoChatRoom;
 class NeoChatUser;
@@ -229,6 +230,8 @@ public:
 
     Q_INVOKABLE QVariantList getSupportedRoomVersions(Quotient::Connection *connection);
 
+    Quotient::AccountRegistry &accounts();
+
 private:
     explicit Controller(QObject *parent = nullptr);
 
@@ -245,6 +248,7 @@ private:
     bool hasWindowSystem() const;
 
     QPointer<PushRuleModel> m_pushRuleModel;
+    Quotient::AccountRegistry m_accountRegistry;
 
 private Q_SLOTS:
     void invokeLogin();

src/events/imagepackevent.h

@@ -4,8 +4,8 @@
 #pragma once
 
 #include <QVector>
-#include <events/eventcontent.h>
-#include <events/stateevent.h>
+#include <Quotient/events/eventcontent.h>
+#include <Quotient/events/stateevent.h>
 
 namespace Quotient
 {

src/events/joinrulesevent.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <events/stateevent.h>
+#include <Quotient/events/stateevent.h>
 
 namespace Quotient
 {

src/events/pollevent.h

@@ -3,8 +3,7 @@
 
 #pragma once
 
-#include <events/eventcontent.h>
-#include <events/roomevent.h>
+#include <Quotient/events/roomevent.h>
 
 namespace Quotient
 {

src/linkpreviewer.cpp

@@ -3,8 +3,10 @@
 
 #include "linkpreviewer.h"
 
-#include <connection.h>
-#include <csapi/content-repo.h>
+#include "controller.h"
+
+#include <Quotient/connection.h>
+#include <Quotient/csapi/content-repo.h>
 
 #include "neochatroom.h"
 

src/login.cpp

@@ -3,10 +3,9 @@
 
 #include "login.h"
 
-#include <accountregistry.h>
-
-#include <connection.h>
-#include <qt_connection_util.h>
+#include <Quotient/accountregistry.h>
+#include <Quotient/connection.h>
+#include <Quotient/qt_connection_util.h>
 
 #include "controller.h"
 
@@ -43,7 +42,7 @@ void Login::init()
             return;
         }
 
-        m_isLoggedIn = Accounts.isLoggedIn(m_matrixId);
+        m_isLoggedIn = Controller::instance().accounts().isLoggedIn(m_matrixId);
         Q_EMIT isLoggedInChanged();
         if (m_isLoggedIn) {
             return;

src/main.cpp

@@ -28,10 +28,11 @@
 
 #include "neochat-version.h"
 
-#include <accountregistry.h>
-#include <networkaccessmanager.h>
-#include <room.h>
-#include <util.h>
+#include <Quotient/keyverificationsession.h>
+#include <Quotient/accountregistry.h>
+#include <Quotient/networkaccessmanager.h>
+#include <Quotient/room.h>
+#include <Quotient/util.h>
 
 #include "actionshandler.h"
 #include "blurhashimageprovider.h"
@@ -49,6 +50,7 @@
 #include "models/collapsestateproxymodel.h"
 #include "models/customemojimodel.h"
 #include "models/devicesmodel.h"
+#include "models/devicesproxymodel.h"
 #include "models/emojimodel.h"
 #include "models/emoticonfiltermodel.h"
 #include "models/imagepacksmodel.h"
@@ -80,7 +82,7 @@
 #include "spacehierarchycache.h"
 #include "urlhelper.h"
 #include "windowcontroller.h"
-#include <keyverificationsession.h>
+
 #ifdef HAVE_COLORSCHEME
 #include "colorschemer.h"
 #endif
@@ -183,8 +185,10 @@ int main(int argc, char *argv[])
     initLogging();
 
 #if Quotient_VERSION_MINOR == 8
+#ifdef Quotient_E2EE_ENABLED
     Connection::setEncryptionDefault(true);
 #endif
+#endif
 
 #ifdef NEOCHAT_FLATPAK
     // Copy over the included FontConfig configuration to the
@@ -216,7 +220,7 @@ int main(int argc, char *argv[])
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "LoginHelper", login);
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "UrlHelper", &urlHelper);
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "EmojiModel", &EmojiModel::instance());
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "AccountRegistry", &Quotient::Accounts);
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "AccountRegistry", &Controller::instance().accounts());
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "SpaceHierarchyCache", &SpaceHierarchyCache::instance());
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "CustomEmojiModel", &CustomEmojiModel::instance());
     qmlRegisterType<ActionsHandler>("org.kde.neochat", 1, 0, "ActionsHandler");
@@ -236,6 +240,7 @@ int main(int argc, char *argv[])
     qmlRegisterType<SortFilterRoomListModel>("org.kde.neochat", 1, 0, "SortFilterRoomListModel");
     qmlRegisterType<SortFilterSpaceListModel>("org.kde.neochat", 1, 0, "SortFilterSpaceListModel");
     qmlRegisterType<DevicesModel>("org.kde.neochat", 1, 0, "DevicesModel");
+    qmlRegisterType<DevicesProxyModel>("org.kde.neochat", 1, 0, "DevicesProxyModel");
     qmlRegisterType<LinkPreviewer>("org.kde.neochat", 1, 0, "LinkPreviewer");
     qmlRegisterType<CompletionModel>("org.kde.neochat", 1, 0, "CompletionModel");
     qmlRegisterType<StateModel>("org.kde.neochat", 1, 0, "StateModel");

src/matriximageprovider.cpp

@@ -13,7 +13,7 @@
 #include <KLocalizedString>
 
 #include "controller.h"
-#include <connection.h>
+#include <Quotient/connection.h>
 
 using namespace Quotient;
 
@@ -32,11 +32,17 @@ ThumbnailResponse::ThumbnailResponse(QString id, QSize size)
         requestedSize.setWidth(100);
     }
     if (mediaId.count('/') != 1) {
-        errorStr = i18n("Media id '%1' doesn't follow server/mediaId pattern", mediaId);
-        Q_EMIT finished();
-        return;
+        if (mediaId.startsWith(QLatin1Char('/'))) {
+            mediaId = mediaId.mid(1);
+        } else {
+            errorStr = i18n("Media id '%1' doesn't follow server/mediaId pattern", mediaId);
+            Q_EMIT finished();
+            return;
+        }
     }
 
+    mediaId = mediaId.split(QLatin1Char('?'))[0];
+
     QImage cachedImage;
     if (cachedImage.load(localFile)) {
         image = cachedImage;

src/matriximageprovider.h

@@ -6,7 +6,7 @@
 
 #include <QQuickAsyncImageProvider>
 
-#include <jobs/mediathumbnailjob.h>
+#include <Quotient/jobs/mediathumbnailjob.h>
 
 #include <QReadWriteLock>
 
@@ -26,7 +26,7 @@ class ThumbnailResponse : public QQuickImageResponse
 {
     Q_OBJECT
 public:
-    ThumbnailResponse(QString mediaId, QSize requestedSize);
+    explicit ThumbnailResponse(QString mediaId, QSize requestedSize);
     ~ThumbnailResponse() override = default;
 
 private Q_SLOTS:
@@ -34,7 +34,7 @@ private Q_SLOTS:
     void prepareResult();
 
 private:
-    const QString mediaId;
+    QString mediaId;
     QSize requestedSize;
     const QString localFile;
     Quotient::MediaThumbnailJob *job = nullptr;

src/models/accountemoticonmodel.cpp

@@ -3,7 +3,7 @@
 
 #include "accountemoticonmodel.h"
 
-#include <csapi/content-repo.h>
+#include <Quotient/csapi/content-repo.h>
 #include <qcoro/qcorosignal.h>
 
 using namespace Quotient;

src/models/accountemoticonmodel.h

@@ -4,12 +4,14 @@
 #pragma once
 
 #include "events/imagepackevent.h"
+
 #include <QAbstractListModel>
 #include <QCoroTask>
 #include <QObject>
 #include <QPointer>
 #include <QVector>
-#include <connection.h>
+
+#include <Quotient/connection.h>
 
 class ImagePacksModel;
 

src/models/actionsmodel.cpp

@@ -6,8 +6,8 @@
 #include "controller.h"
 #include "neochatroom.h"
 #include "roommanager.h"
-#include <events/roommemberevent.h>
-#include <events/roompowerlevelsevent.h>
+#include <Quotient/events/roommemberevent.h>
+#include <Quotient/events/roompowerlevelsevent.h>
 
 #include <KLocalizedString>
 
@@ -436,7 +436,10 @@ QVector<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is already banned from this room.", "%1 is already banned from this room.", text));
                 return QString();
             }
-            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
+            auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
+            if (!plEvent) {
+                return QString();
+            }
             if (plEvent->ban() > plEvent->powerLevelForUser(room->localUser()->id())) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to ban users from this room."));
                 return QString();
@@ -466,7 +469,10 @@ QVector<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
-            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
+            auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
+            if (!plEvent) {
+                return QString();
+            }
             if (plEvent->ban() > plEvent->powerLevelForUser(room->localUser()->id())) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to unban users from this room."));
                 return QString();
@@ -506,7 +512,10 @@ QVector<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("<username> is not in this room", "%1 is not in this room.", parts[0]));
                 return QString();
             }
-            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
+            auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
+            if (!plEvent) {
+                return QString();
+            }
             auto kick = plEvent->kick();
             if (plEvent->powerLevelForUser(room->localUser()->id()) < kick) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to kick users from this room."));

src/models/actionsmodel.h

@@ -5,7 +5,7 @@
 
 #include <KLazyLocalizedString>
 #include <QAbstractListModel>
-#include <events/roommessageevent.h>
+#include <Quotient/events/roommessageevent.h>
 
 class NeoChatRoom;
 

src/models/collapsestateproxymodel.cpp

@@ -81,7 +81,7 @@ QString CollapseStateProxyModel::aggregateEventToString(int sourceRow) const
                                                       : QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a> ")
                                                             .arg(uniqueAuthors[0].toMap()["id"].toString(),
                                                                  uniqueAuthors[0].toMap()["color"].toString(),
-                                                                 uniqueAuthors[0].toMap()["displayName"].toString());
+                                                                 uniqueAuthors[0].toMap()["displayName"].toString().toHtmlEscaped());
         text += userText;
         text += chunks.takeFirst();
 

src/models/completionmodel.cpp

@@ -53,54 +53,54 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
     }
     auto filterIndex = m_filterModel->index(index.row(), 0);
     if (m_autoCompletionType == User) {
-        if (role == Text) {
+        if (role == DisplayNameRole) {
             return m_filterModel->data(filterIndex, UserListModel::DisplayNameRole);
         }
-        if (role == Subtitle) {
+        if (role == SubtitleRole) {
             return m_filterModel->data(filterIndex, UserListModel::UserIdRole);
         }
-        if (role == Icon) {
+        if (role == IconNameRole) {
             return m_filterModel->data(filterIndex, UserListModel::AvatarRole);
         }
     }
 
     if (m_autoCompletionType == Command) {
-        if (role == Text) {
+        if (role == DisplayNameRole) {
             return m_filterModel->data(filterIndex, ActionsModel::Prefix).toString() + QStringLiteral(" ")
                 + m_filterModel->data(filterIndex, ActionsModel::Parameters).toString();
         }
-        if (role == Subtitle) {
+        if (role == SubtitleRole) {
             return m_filterModel->data(filterIndex, ActionsModel::Description);
         }
-        if (role == Icon) {
+        if (role == IconNameRole) {
             return QStringLiteral("invalid");
         }
-        if (role == ReplacedText) {
+        if (role == ReplacedTextRole) {
             return m_filterModel->data(filterIndex, ActionsModel::Prefix);
         }
     }
     if (m_autoCompletionType == Room) {
-        if (role == Text) {
+        if (role == DisplayNameRole) {
             return m_filterModel->data(filterIndex, RoomListModel::DisplayNameRole);
         }
-        if (role == Subtitle) {
+        if (role == SubtitleRole) {
             return m_filterModel->data(filterIndex, RoomListModel::CanonicalAliasRole);
         }
-        if (role == Icon) {
+        if (role == IconNameRole) {
             return m_filterModel->data(filterIndex, RoomListModel::AvatarRole);
         }
     }
     if (m_autoCompletionType == Emoji) {
-        if (role == Text) {
+        if (role == DisplayNameRole) {
             return m_filterModel->data(filterIndex, CustomEmojiModel::DisplayRole);
         }
-        if (role == Icon) {
+        if (role == IconNameRole) {
             return m_filterModel->data(filterIndex, CustomEmojiModel::MxcUrl);
         }
-        if (role == ReplacedText) {
+        if (role == ReplacedTextRole) {
             return m_filterModel->data(filterIndex, CustomEmojiModel::ReplacedTextRole);
         }
-        if (role == Subtitle) {
+        if (role == SubtitleRole) {
             return m_filterModel->data(filterIndex, EmojiModel::DescriptionRole);
         }
     }
@@ -111,10 +111,10 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
 QHash<int, QByteArray> CompletionModel::roleNames() const
 {
     return {
-        {Text, "text"},
-        {Subtitle, "subtitle"},
-        {Icon, "icon"},
-        {ReplacedText, "replacedText"},
+        {DisplayNameRole, "displayName"},
+        {SubtitleRole, "subtitle"},
+        {IconNameRole, "iconName"},
+        {ReplacedTextRole, "replacedText"},
     };
 }
 

src/models/completionmodel.h

@@ -64,14 +64,14 @@ public:
      * @brief Defines the model roles.
      */
     enum Roles {
-        Text = Qt::DisplayRole, /**< The main text to show. */
-        Subtitle, /**< The subtitle text to show. */
-        Icon, /**< The icon to show. */
-        ReplacedText, /**< The text to replace the input text with for the completion. */
+        DisplayNameRole = Qt::DisplayRole, /**< The main text to show. */
+        SubtitleRole, /**< The subtitle text to show. */
+        IconNameRole, /**< The icon to show. */
+        ReplacedTextRole, /**< The text to replace the input text with for the completion. */
     };
     Q_ENUM(Roles)
 
-    CompletionModel(QObject *parent = nullptr);
+    explicit CompletionModel(QObject *parent = nullptr);
 
     /**
      * @brief Get the given role value at the given index.

src/models/customemojimodel.cpp

@@ -9,10 +9,9 @@
 #include "controller.h"
 #include "emojimodel.h"
 
-#include <connection.h>
-#include <csapi/account-data.h>
-#include <csapi/content-repo.h>
-#include <events/eventcontent.h>
+#include <Quotient/connection.h>
+#include <Quotient/csapi/account-data.h>
+#include <Quotient/csapi/content-repo.h>
 
 using namespace Quotient;
 

src/models/devicesmodel.cpp

@@ -3,23 +3,22 @@
 
 #include "devicesmodel.h"
 
-#include <csapi/device_management.h>
-
 #include "controller.h"
-#include <connection.h>
-#include <user.h>
+
+#include <QDateTime>
+#include <QLocale>
+
+#include <KLocalizedString>
+
+#include <Quotient/csapi/device_management.h>
+#include <Quotient/connection.h>
+#include <Quotient/user.h>
 
 using namespace Quotient;
 
 DevicesModel::DevicesModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    connect(&Controller::instance(), &Controller::activeConnectionChanged, this, [this]() {
-        DevicesModel::fetchDevices();
-        Q_EMIT connectionChanged();
-    });
-
-    fetchDevices();
 }
 
 void DevicesModel::fetchDevices()
@@ -30,6 +29,7 @@ void DevicesModel::fetchDevices()
             beginResetModel();
             m_devices = job->devices();
             endResetModel();
+            Q_EMIT countChanged();
         });
     }
 }
@@ -40,16 +40,43 @@ QVariant DevicesModel::data(const QModelIndex &index, int role) const
         return {};
     }
 
+    const auto &device = m_devices[index.row()];
+
     switch (role) {
     case Id:
-        return m_devices[index.row()].deviceId;
+        return device.deviceId;
     case DisplayName:
-        return m_devices[index.row()].displayName;
+        return device.displayName;
     case LastIp:
-        return m_devices[index.row()].lastSeenIp;
+        return device.lastSeenIp;
     case LastTimestamp:
-        if (m_devices[index.row()].lastSeenTs)
-            return *m_devices[index.row()].lastSeenTs;
+        if (device.lastSeenTs) {
+            return *device.lastSeenTs;
+        } else {
+            return false;
+        }
+    case TimestampString:
+        if (device.lastSeenTs) {
+            return QDateTime::fromMSecsSinceEpoch(*device.lastSeenTs).toString(QLocale().dateTimeFormat(QLocale::ShortFormat));
+        } else {
+            return false;
+        }
+    case Type:
+        if (device.deviceId == m_connection->deviceId()) {
+            return This;
+        }
+#ifdef Quotient_E2EE_ENABLED
+        if (!m_connection->isKnownE2eeCapableDevice(m_connection->userId(), device.deviceId)) {
+            return Unencrypted;
+        }
+        if (m_connection->isVerifiedDevice(m_connection->userId(), device.deviceId)) {
+            return Verified;
+        } else {
+            return Unverified;
+        }
+#else
+        return Unverified;
+#endif
     }
     return {};
 }
@@ -62,11 +89,22 @@ int DevicesModel::rowCount(const QModelIndex &parent) const
 
 QHash<int, QByteArray> DevicesModel::roleNames() const
 {
-    return {{Id, "id"}, {DisplayName, "displayName"}, {LastIp, "lastIp"}, {LastTimestamp, "lastTimestamp"}};
+    return {
+        {Id, "id"},
+        {DisplayName, "displayName"},
+        {LastIp, "lastIp"},
+        {LastTimestamp, "lastTimestamp"},
+        {TimestampString, "timestamp"},
+        {Type, "type"},
+    };
 }
 
-void DevicesModel::logout(int index, const QString &password)
+void DevicesModel::logout(const QString &deviceId, const QString &password)
 {
+    int index;
+    for (index = 0; m_devices[index].deviceId != deviceId; index++)
+        ;
+
     auto job = Controller::instance().activeConnection()->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId);
 
     connect(job, &BaseJob::result, this, [this, job, password, index] {
@@ -74,6 +112,7 @@ void DevicesModel::logout(int index, const QString &password)
             beginRemoveRows(QModelIndex(), index, index);
             m_devices.remove(index);
             endRemoveRows();
+            Q_EMIT countChanged();
         };
         if (job->error() != BaseJob::Success) {
             QJsonObject replyData = job->jsonData();
@@ -91,8 +130,11 @@ void DevicesModel::logout(int index, const QString &password)
     });
 }
 
-void DevicesModel::setName(int index, const QString &name)
+void DevicesModel::setName(const QString &deviceId, const QString &name)
 {
+    int index;
+    for (index = 0; m_devices[index].deviceId != deviceId; index++);
+
     auto job = Controller::instance().activeConnection()->callApi<UpdateDeviceJob>(m_devices[index].deviceId, name);
     QString oldName = m_devices[index].displayName;
     beginResetModel();
@@ -107,7 +149,29 @@ void DevicesModel::setName(int index, const QString &name)
 
 Connection *DevicesModel::connection() const
 {
-    return Controller::instance().activeConnection();
+    return m_connection;
+}
+
+void DevicesModel::setConnection(Connection *connection)
+{
+    if (m_connection) {
+        disconnect(m_connection, nullptr, this, nullptr);
+    }
+    m_connection = connection;
+    Q_EMIT connectionChanged();
+    fetchDevices();
+
+#ifdef Quotient_E2EE_ENABLED
+    connect(m_connection, &Connection::sessionVerified, this, [this](const QString &userId, const QString &deviceId) {
+        Q_UNUSED(deviceId);
+        if (userId == Controller::instance().activeConnection()->userId()) {
+            fetchDevices();
+        }
+    });
+    connect(m_connection, &Connection::finishedQueryingKeys, this, [this]() {
+        fetchDevices();
+    });
+#endif
 }
 
 #include "moc_devicesmodel.cpp"

src/models/devicesmodel.h

@@ -4,8 +4,9 @@
 #pragma once
 
 #include <QAbstractListModel>
+#include <QPointer>
 
-#include <csapi/definitions/client_device.h>
+#include <Quotient/csapi/definitions/client_device.h>
 
 namespace Quotient
 {
@@ -28,7 +29,7 @@ class DevicesModel : public QAbstractListModel
     /**
      * @brief The current connection that the model is getting its devices from.
      */
-    Q_PROPERTY(Quotient::Connection *connection READ connection NOTIFY connectionChanged)
+    Q_PROPERTY(Quotient::Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged REQUIRED)
 
 public:
     /**
@@ -39,10 +40,18 @@ public:
         DisplayName, /**< Display name set by the user for this device. */
         LastIp, /**< The IP address where this device was last seen. */
         LastTimestamp, /**< The timestamp when this devices was last seen. */
+        TimestampString, /**< String for the timestamp when this devices was last seen. */
+        Type, /**< The category to sort this device into. */
     };
     Q_ENUM(Roles)
 
-    DevicesModel(QObject *parent = nullptr);
+    enum DeviceType {
+        This,
+        Verified,
+        Unverified,
+        Unencrypted,
+    };
+    Q_ENUM(DeviceType);
 
     /**
      * @brief Get the given role value at the given index.
@@ -66,21 +75,27 @@ public:
     QHash<int, QByteArray> roleNames() const override;
 
     /**
-     * @brief Logout the device at the given index.
+     * @brief Logout the device with the given id.
      */
-    Q_INVOKABLE void logout(int index, const QString &password);
+    Q_INVOKABLE void logout(const QString &deviceId, const QString &password);
 
     /**
-     * @brief Set the display name of the device at the given index.
+     * @brief Set the display name of the device with the given id.
      */
-    Q_INVOKABLE void setName(int index, const QString &name);
+    Q_INVOKABLE void setName(const QString &deviceId, const QString &name);
 
-    Quotient::Connection *connection() const;
+    explicit DevicesModel(QObject *parent = nullptr);
+
+
+    [[nodiscard]] Quotient::Connection *connection() const;
+    void setConnection(Quotient::Connection *connection);
 
 Q_SIGNALS:
     void connectionChanged();
+    void countChanged();
 
 private:
     void fetchDevices();
     QVector<Quotient::Device> m_devices;
+    QPointer<Quotient::Connection> m_connection;
 };

src/models/devicesproxymodel.cpp

@@ -0,0 +1,30 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "devicesproxymodel.h"
+#include "devicesmodel.h"
+
+int DevicesProxyModel::type() const
+{
+    return m_type;
+}
+void DevicesProxyModel::setType(int type)
+{
+    m_type = type;
+    Q_EMIT typeChanged();
+}
+
+bool DevicesProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
+{
+    Q_UNUSED(source_parent)
+    return sourceModel()->data(sourceModel()->index(source_row, 0), DevicesModel::Type).toInt() == m_type;
+}
+DevicesProxyModel::DevicesProxyModel(QObject *parent)
+    : QSortFilterProxyModel(parent)
+    , m_type(0)
+{
+    setSortRole(DevicesModel::LastTimestamp);
+    sort(0, Qt::DescendingOrder);
+}
+
+#include "moc_devicesproxymodel.cpp"

src/models/devicesproxymodel.h

@@ -0,0 +1,25 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <QSortFilterProxyModel>
+
+class DevicesProxyModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+    Q_PROPERTY(int type READ type WRITE setType NOTIFY typeChanged);
+
+public:
+    DevicesProxyModel(QObject *parent = nullptr);
+    [[nodiscard]] bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
+
+    void setType(int type);
+    [[nodiscard]] int type() const;
+
+Q_SIGNALS:
+    void typeChanged();
+
+private:
+    int m_type;
+};

src/models/keywordnotificationrulemodel.cpp

@@ -0,0 +1,112 @@
+// SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include "keywordnotificationrulemodel.h"
+#include "controller.h"
+#include "notificationsmanager.h"
+
+#include <QDebug>
+#include <Quotient/connection.h>
+#include <Quotient/converters.h>
+#include <Quotient/csapi/definitions/push_ruleset.h>
+#include <Quotient/csapi/pushrules.h>
+#include <Quotient/jobs/basejob.h>
+
+KeywordNotificationRuleModel::KeywordNotificationRuleModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+    if (Controller::instance().activeConnection()) {
+        controllerConnectionChanged();
+    }
+    connect(&Controller::instance(), &Controller::activeConnectionChanged, this, &KeywordNotificationRuleModel::controllerConnectionChanged);
+}
+
+void KeywordNotificationRuleModel::controllerConnectionChanged()
+{
+    connect(Controller::instance().activeConnection(), &Quotient::Connection::accountDataChanged, this, &KeywordNotificationRuleModel::updateNotificationRules);
+    updateNotificationRules("m.push_rules");
+}
+
+void KeywordNotificationRuleModel::updateNotificationRules(const QString &type)
+{
+    if (type != "m.push_rules") {
+        return;
+    }
+
+    const QJsonObject ruleDataJson = Controller::instance().activeConnection()->accountDataJson("m.push_rules");
+    const Quotient::PushRuleset ruleData = Quotient::fromJson<Quotient::PushRuleset>(ruleDataJson["global"].toObject());
+    const QVector<Quotient::PushRule> contentRules = ruleData.content;
+
+    beginResetModel();
+    m_notificationRules.clear();
+    for (const auto &i : contentRules) {
+        if (!m_notificationRules.contains(i.ruleId) && i.ruleId[0] != '.') {
+            m_notificationRules.append(i.ruleId);
+        }
+    }
+    endResetModel();
+}
+
+QVariant KeywordNotificationRuleModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid()) {
+        return {};
+    }
+
+    if (index.row() >= m_notificationRules.count()) {
+        qDebug() << "KeywordNotificationRuleModel, something's wrong: index.row() >= m_notificationRules.count()";
+        return {};
+    }
+
+    if (role == NameRole) {
+        return m_notificationRules.at(index.row());
+    }
+
+    return {};
+}
+
+int KeywordNotificationRuleModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent)
+
+    return m_notificationRules.count();
+}
+
+void KeywordNotificationRuleModel::addKeyword(const QString &keyword)
+{
+    if (m_notificationRules.count() == 0) {
+        NotificationsManager::instance().initializeKeywordNotificationAction();
+    }
+
+    const QVector<QVariant> actions = NotificationsManager::instance().getKeywordNotificationActions();
+
+    auto job = Controller::instance()
+                   .activeConnection()
+                   ->callApi<Quotient::SetPushRuleJob>("global", "content", keyword, actions, "", "", QVector<Quotient::PushCondition>(), keyword);
+    connect(job, &Quotient::BaseJob::success, this, [this, keyword]() {
+        beginInsertRows(QModelIndex(), m_notificationRules.count(), m_notificationRules.count());
+        m_notificationRules.append(keyword);
+        endInsertRows();
+    });
+}
+
+void KeywordNotificationRuleModel::removeKeywordAtIndex(int index)
+{
+    auto job = Controller::instance().activeConnection()->callApi<Quotient::DeletePushRuleJob>("global", "content", m_notificationRules[index]);
+    connect(job, &Quotient::BaseJob::success, this, [this, index]() {
+        beginRemoveRows(QModelIndex(), index, index);
+        m_notificationRules.removeAt(index);
+        endRemoveRows();
+
+        if (m_notificationRules.count() == 0) {
+            NotificationsManager::instance().deactivateKeywordNotificationAction();
+        }
+    });
+}
+
+QHash<int, QByteArray> KeywordNotificationRuleModel::roleNames() const
+{
+    return {{NameRole, QByteArrayLiteral("name")}};
+}
+
+#include "moc_keywordnotificationrulemodel.cpp"

src/models/keywordnotificationrulemodel.h

@@ -0,0 +1,66 @@
+// SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#pragma once
+
+#include <Quotient/csapi/definitions/push_rule.h>
+
+#include <QAbstractListModel>
+
+/**
+ * @class KeywordNotificationRuleModel
+ *
+ * This class defines the model for managing notification push rule keywords.
+ */
+class KeywordNotificationRuleModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    /**
+     * @brief Defines the model roles.
+     */
+    enum EventRoles {
+        NameRole = Qt::DisplayRole, /**< The push rule keyword. */
+    };
+
+    KeywordNotificationRuleModel(QObject *parent = nullptr);
+
+    /**
+     * @brief Get the given role value at the given index.
+     *
+     * @sa QAbstractItemModel::data
+     */
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+    /**
+     * @brief Number of rows in the model.
+     *
+     * @sa QAbstractItemModel::rowCount
+     */
+    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    /**
+     * @brief Returns a mapping from Role enum values to role names.
+     *
+     * @sa EventRoles, QAbstractItemModel::roleNames()
+     */
+    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
+
+    /**
+     * @brief Add a new keyword to the model.
+     */
+    Q_INVOKABLE void addKeyword(const QString &keyword);
+
+    /**
+     * @brief Remove a keyword from the model.
+     */
+    Q_INVOKABLE void removeKeywordAtIndex(int index);
+
+private Q_SLOTS:
+    void controllerConnectionChanged();
+    void updateNotificationRules(const QString &type);
+
+private:
+    QList<QString> m_notificationRules;
+};

src/models/livelocationsmodel.cpp

@@ -4,7 +4,7 @@
 
 #include "livelocationsmodel.h"
 
-#include <events/roommessageevent.h>
+#include <Quotient/events/roommessageevent.h>
 
 #include <QDebug>
 

src/models/locationsmodel.cpp

@@ -110,6 +110,7 @@ QVariant LocationsModel::data(const QModelIndex &index, int roleName) const
 
 int LocationsModel::rowCount(const QModelIndex &parent) const
 {
+    Q_UNUSED(parent);
     return m_locations.size();
 }
 

src/models/locationsmodel.h

@@ -9,7 +9,7 @@
 
 #include "neochatroom.h"
 
-#include <events/roommessageevent.h>
+#include <Quotient/events/roommessageevent.h>
 
 class LocationsModel : public QAbstractListModel
 {

src/models/mediamessagefiltermodel.cpp

@@ -3,7 +3,7 @@
 
 #include "mediamessagefiltermodel.h"
 #include "models/messageeventmodel.h"
-#include <room.h>
+#include <Quotient/room.h>
 
 MediaMessageFilterModel::MediaMessageFilterModel(QObject *parent)
     : QSortFilterProxyModel(parent)

src/models/mediamessagefiltermodel.h

@@ -31,7 +31,7 @@ public:
     };
     Q_ENUM(Roles)
 
-    MediaMessageFilterModel(QObject *parent = nullptr);
+    explicit MediaMessageFilterModel(QObject *parent = nullptr);
 
     /**
      * @brief Custom filter to show only image and video messages.

src/models/messageeventmodel.cpp

@@ -5,17 +5,18 @@
 #include "messageeventmodel_logging.h"
 
 #include "neochatconfig.h"
-#include <connection.h>
-#include <events/reactionevent.h>
-#include <events/redactionevent.h>
-#include <events/roomavatarevent.h>
-#include <events/roommemberevent.h>
-#include <events/simplestateevents.h>
-#include <qt_connection_util.h>
-#include <user.h>
+
+#include <Quotient/connection.h>
+#include <Quotient/csapi/rooms.h>
+#include <Quotient/events/reactionevent.h>
+#include <Quotient/events/redactionevent.h>
+#include <Quotient/events/roomavatarevent.h>
+#include <Quotient/events/roommemberevent.h>
+#include <Quotient/events/simplestateevents.h>
+#include <Quotient/user.h>
 
 #include "events/pollevent.h"
-#include "events/stickerevent.h"
+#include <Quotient/events/stickerevent.h>
 
 #include <QDebug>
 #include <QGuiApplication>
@@ -227,7 +228,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             beginRemoveRows({}, i, i);
         });
         connect(m_currentRoom, &Room::pendingEventDiscarded, this, &MessageEventModel::endRemoveRows);
-        connect(m_currentRoom, &Room::readMarkerMoved, this, [this](const QString &fromEventId, const QString &toEventId) {
+        connect(m_currentRoom, &Room::fullyReadMarkerMoved, this, [this](const QString &fromEventId, const QString &toEventId) {
             Q_UNUSED(fromEventId);
             moveReadMarker(toEventId);
         });
@@ -608,7 +609,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
             return EventStatus::Hidden;
         }
 
-        if (evt.isStateEvent() && static_cast<const StateEventBase &>(evt).repeatsState()) {
+        if (evt.isStateEvent() && static_cast<const StateEvent &>(evt).repeatsState()) {
             return EventStatus::Hidden;
         }
 
@@ -1052,7 +1053,7 @@ void MessageEventModel::createReactionModelForEvent(const Quotient::RoomMessageE
         return;
     }
     auto eventId = event->id();
-    const auto &annotations = m_currentRoom->relatedEvents(eventId, EventRelation::Annotation());
+    const auto &annotations = m_currentRoom->relatedEvents(eventId, EventRelation::AnnotationType);
     if (annotations.isEmpty()) {
         if (m_reactionModels.contains(eventId)) {
             delete m_reactionModels[eventId];
@@ -1067,7 +1068,7 @@ void MessageEventModel::createReactionModelForEvent(const Quotient::RoomMessageE
             continue;
         }
         if (const auto &e = eventCast<const ReactionEvent>(a)) {
-            reactions[e->relation().key].append(static_cast<NeoChatUser *>(m_currentRoom->user(e->senderId())));
+            reactions[e->key()].append(static_cast<NeoChatUser *>(m_currentRoom->user(e->senderId())));
         }
     }
 

src/models/messagefiltermodel.h

@@ -16,7 +16,7 @@ class MessageFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 public:
-    MessageFilterModel(QObject *parent = nullptr);
+    explicit MessageFilterModel(QObject *parent = nullptr);
 
     /**
      * @brief Custom filter function to remove hidden messages.

src/models/publicroomlistmodel.cpp

@@ -3,7 +3,7 @@
 
 #include "publicroomlistmodel.h"
 
-#include <connection.h>
+#include <Quotient/connection.h>
 
 using namespace Quotient;
 

src/models/publicroomlistmodel.h

@@ -6,7 +6,7 @@
 #include <QAbstractListModel>
 #include <QObject>
 
-#include <csapi/list_public_rooms.h>
+#include <Quotient/csapi/list_public_rooms.h>
 
 namespace Quotient
 {
@@ -64,7 +64,7 @@ public:
         IsJoinedRole, /**< Whether the local user has joined the room. */
     };
 
-    PublicRoomListModel(QObject *parent = nullptr);
+    explicit PublicRoomListModel(QObject *parent = nullptr);
 
     /**
      * @brief Get the given role value at the given index.

src/models/pushrulemodel.cpp

@@ -5,12 +5,11 @@
 
 #include <QDebug>
 
-#include <connection.h>
-#include <converters.h>
-#include <csapi/definitions/push_ruleset.h>
-#include <csapi/pushrules.h>
-#include <jobs/basejob.h>
-#include <qobjectdefs.h>
+#include <Quotient/connection.h>
+#include <Quotient/converters.h>
+#include <Quotient/csapi/definitions/push_ruleset.h>
+#include <Quotient/csapi/pushrules.h>
+#include <Quotient/jobs/basejob.h>
 
 #include "controller.h"
 #include "neochatconfig.h"

src/models/pushrulemodel.h

@@ -5,7 +5,7 @@
 
 #include <QAbstractListModel>
 
-#include <csapi/definitions/push_rule.h>
+#include <Quotient/csapi/definitions/push_rule.h>
 
 #include "notificationsmanager.h"
 
@@ -172,7 +172,7 @@ public:
     };
     Q_ENUM(EventRoles)
 
-    PushRuleModel(QObject *parent = nullptr);
+    explicit PushRuleModel(QObject *parent = nullptr);
 
     [[nodiscard]] PushNotificationAction::Action defaultState() const;
     void setDefaultState(PushNotificationAction::Action defaultState);

src/models/reactionmodel.h

@@ -36,7 +36,7 @@ public:
         HasLocalUser, /**< Whether the local user is in the list of authors. */
     };
 
-    ReactionModel(QObject *parent = nullptr, QList<Reaction> reactions = {}, NeoChatUser *localUser = nullptr);
+    explicit ReactionModel(QObject *parent = nullptr, QList<Reaction> reactions = {}, NeoChatUser *localUser = nullptr);
 
     /**
      * @brief Get the given role value at the given index.

src/models/roomlistmodel.cpp

@@ -8,7 +8,8 @@
 #include "neochatroom.h"
 #include "roommanager.h"
 #include "spacehierarchycache.h"
-#include "user.h"
+
+#include <Quotient/user.h>
 
 #include <QDebug>
 #if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
@@ -155,7 +156,7 @@ void RoomListModel::connectRoomSignals(NeoChatRoom *room)
     connect(room, &Room::displaynameChanged, this, [this, room] {
         refresh(room, {DisplayNameRole});
     });
-    connect(room, &Room::unreadMessagesChanged, this, [this, room] {
+    connect(room, &Room::unreadStatsChanged, this, [this, room] {
         refresh(room, {NotificationCountRole, HighlightCountRole});
     });
     connect(room, &Room::notificationCountChanged, this, [this, room] {
@@ -337,7 +338,7 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
     if (role == AvatarImageRole) {
         return room->avatar(128);
     }
-    if (role == IdRole) {
+    if (role == RoomIdRole) {
         return room->id();
     }
     if (role == IsSpaceRole) {
@@ -378,7 +379,7 @@ QHash<int, QByteArray> RoomListModel::roleNames() const
     roles[CategoryVisibleRole] = "categoryVisible";
     roles[SubtitleTextRole] = "subtitleText";
     roles[IsSpaceRole] = "isSpace";
-    roles[IdRole] = "id";
+    roles[RoomIdRole] = "roomId";
     roles[IsChildSpaceRole] = "isChildSpace";
     return roles;
 }

src/models/roomlistmodel.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <events/roomevent.h>
+#include <Quotient/events/roomevent.h>
 
 #include <QAbstractListModel>
 
@@ -72,7 +72,7 @@ public:
         CategoryVisibleRole, /**< If the room's category is visible. */
         SubtitleTextRole, /**< The text to show as the room subtitle. */
         AvatarImageRole, /**< The room avatar as an image. */
-        IdRole, /**< The room matrix ID. */
+        RoomIdRole, /**< The room matrix ID. */
         IsSpaceRole, /**< Whether the room is a space. */
         IsChildSpaceRole, /**< Whether this space is a child of a different space. */
     };

src/models/searchmodel.cpp

@@ -2,12 +2,15 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "searchmodel.h"
-#include "events/stickerevent.h"
+
 #include "messageeventmodel.h"
 #include "neochatroom.h"
 #include "neochatuser.h"
+#include <Quotient/events/stickerevent.h>
+
 #include <KLocalizedString>
-#include <connection.h>
+
+#include <Quotient/connection.h>
 
 using namespace Quotient;
 

src/models/searchmodel.h

@@ -6,7 +6,7 @@
 #include <QAbstractListModel>
 #include <QString>
 
-#include <csapi/search.h>
+#include <Quotient/csapi/search.h>
 
 namespace Quotient
 {

src/models/serverlistmodel.cpp

@@ -5,7 +5,7 @@
 
 #include "controller.h"
 
-#include <connection.h>
+#include <Quotient/connection.h>
 
 #include <QDebug>
 

src/models/serverlistmodel.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <csapi/list_public_rooms.h>
+#include <Quotient/csapi/list_public_rooms.h>
 
 #include <QAbstractListModel>
 #include <QPointer>

src/models/sortfilterroomlistmodel.cpp

@@ -87,7 +87,8 @@ bool SortFilterRoomListModel::filterAcceptsRow(int source_row, const QModelIndex
         return acceptRoom;
     } else {
         const auto &rooms = SpaceHierarchyCache::instance().getRoomListForSpace(m_activeSpaceId, false);
-        return std::find(rooms.begin(), rooms.end(), sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::IdRole).toString()) != rooms.end()
+        return std::find(rooms.begin(), rooms.end(), sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::RoomIdRole).toString())
+            != rooms.end()
             && acceptRoom;
     }
 }

src/models/sortfilterspacelistmodel.cpp

@@ -8,7 +8,7 @@
 SortFilterSpaceListModel::SortFilterSpaceListModel(QObject *parent)
     : QSortFilterProxyModel{parent}
 {
-    setSortRole(RoomListModel::IdRole);
+    setSortRole(RoomListModel::RoomIdRole);
     sort(0);
     invalidateFilter();
     connect(this, &QAbstractProxyModel::sourceModelChanged, this, [this]() {
@@ -33,8 +33,8 @@ bool SortFilterSpaceListModel::filterAcceptsRow(int source_row, const QModelInde
 
 bool SortFilterSpaceListModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
 {
-    const auto idLeft = sourceModel()->data(source_left, RoomListModel::IdRole).toString();
-    const auto idRight = sourceModel()->data(source_right, RoomListModel::IdRole).toString();
+    const auto idLeft = sourceModel()->data(source_left, RoomListModel::RoomIdRole).toString();
+    const auto idRight = sourceModel()->data(source_right, RoomListModel::RoomIdRole).toString();
     return idLeft < idRight;
 }
 

src/models/userdirectorylistmodel.cpp

@@ -3,8 +3,8 @@
 
 #include "userdirectorylistmodel.h"
 
-#include <connection.h>
-#include <room.h>
+#include <Quotient/connection.h>
+#include <Quotient/room.h>
 
 using namespace Quotient;
 
@@ -144,7 +144,7 @@ QVariant UserDirectoryListModel::data(const QModelIndex &index, int role) const
         auto avatarUrl = user.avatarUrl;
 
         if (avatarUrl.isEmpty()) {
-            return "";
+            return QString();
         }
         return avatarUrl.url().remove(0, 6);
     }
@@ -153,7 +153,7 @@ QVariant UserDirectoryListModel::data(const QModelIndex &index, int role) const
     }
     if (role == DirectChatsRole) {
         if (!m_connection) {
-            return {};
+            return QStringList();
         };
 
         auto userObj = m_connection->user(user.userId);
@@ -165,6 +165,8 @@ QVariant UserDirectoryListModel::data(const QModelIndex &index, int role) const
                 return QVariant::fromValue(directChatsForUser);
             }
         }
+
+        return QStringList();
     }
 
     return {};

src/models/userdirectorylistmodel.h

@@ -6,7 +6,7 @@
 #include <QAbstractListModel>
 #include <QObject>
 
-#include <csapi/users.h>
+#include <Quotient/csapi/users.h>
 
 namespace Quotient
 {

src/models/userlistmodel.cpp

@@ -3,8 +3,8 @@
 
 #include "userlistmodel.h"
 
-#include <connection.h>
-#include <events/roompowerlevelsevent.h>
+#include <Quotient/connection.h>
+#include <Quotient/events/roompowerlevelsevent.h>
 
 #include "neochatroom.h"
 
@@ -78,8 +78,11 @@ QVariant UserListModel::data(const QModelIndex &index, int role) const
         return QVariant::fromValue(user);
     }
     if (role == PowerLevelRole) {
-        auto pl = m_currentRoom->getCurrentState<RoomPowerLevelsEvent>();
-        return pl->powerLevelForUser(user->id());
+        auto plEvent = m_currentRoom->currentState().get<RoomPowerLevelsEvent>();
+        if (!plEvent) {
+            return 0;
+        }
+        return plEvent->powerLevelForUser(user->id());
     }
     if (role == PowerLevelStringRole) {
         auto pl = m_currentRoom->currentState().get<RoomPowerLevelsEvent>();

src/models/userlistmodel.h

@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <Quotient/room.h>
+
 #include <QAbstractListModel>
 #include <QObject>
 #include <QPointer>

src/neochat.notifyrc

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

src/neochatroom.cpp

@@ -12,35 +12,33 @@
 #include <QMediaMetaData>
 #include <QMediaPlayer>
 
-#include <jobs/basejob.h>
+#include <Quotient/jobs/basejob.h>
 #include <qcoro/qcorosignal.h>
 
-#include <connection.h>
-#include <csapi/account-data.h>
-#include <csapi/directory.h>
-#include <csapi/event_context.h>
-#include <csapi/pushrules.h>
-#include <csapi/redaction.h>
-#include <csapi/report_content.h>
-#include <csapi/room_state.h>
-#include <csapi/rooms.h>
-#include <csapi/typing.h>
-#include <events/encryptionevent.h>
-#include <events/reactionevent.h>
-#include <events/redactionevent.h>
-#include <events/roomavatarevent.h>
-#include <events/roomcanonicalaliasevent.h>
-#include <events/roommemberevent.h>
-#include <events/roompowerlevelsevent.h>
-#include <events/simplestateevents.h>
-#include <jobs/downloadfilejob.h>
-
-#include <qt_connection_util.h>
+#include <Quotient/connection.h>
+#include <Quotient/csapi/account-data.h>
+#include <Quotient/csapi/directory.h>
+#include <Quotient/csapi/pushrules.h>
+#include <Quotient/csapi/redaction.h>
+#include <Quotient/csapi/report_content.h>
+#include <Quotient/csapi/room_state.h>
+#include <Quotient/csapi/rooms.h>
+#include <Quotient/csapi/typing.h>
+#include <Quotient/events/encryptionevent.h>
+#include <Quotient/events/reactionevent.h>
+#include <Quotient/events/redactionevent.h>
+#include <Quotient/events/roomavatarevent.h>
+#include <Quotient/events/roomcanonicalaliasevent.h>
+#include <Quotient/events/roommemberevent.h>
+#include <Quotient/events/roompowerlevelsevent.h>
+#include <Quotient/events/simplestateevents.h>
+#include <Quotient/events/stickerevent.h>
+#include <Quotient/jobs/downloadfilejob.h>
+#include <Quotient/qt_connection_util.h>
 
 #include "controller.h"
 #include "events/joinrulesevent.h"
 #include "events/pollevent.h"
-#include "events/stickerevent.h"
 #include "filetransferpseudojob.h"
 #include "neochatconfig.h"
 #include "notificationsmanager.h"
@@ -99,7 +97,9 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
         if (this->joinState() != JoinState::Invite) {
             return;
         }
-        const QString senderId = getCurrentState<RoomMemberEvent>(localUser()->id())->senderId();
+        auto roomMemberEvent = currentState().get<RoomMemberEvent>(localUser()->id());
+        Q_ASSERT(roomMemberEvent);
+        const QString senderId = roomMemberEvent->senderId();
         QImage avatar_image;
         if (!user(senderId)->avatarUrl(this).isEmpty()) {
             avatar_image = user(senderId)->avatar(128, this);
@@ -273,7 +273,7 @@ const RoomEvent *NeoChatRoom::lastEvent() const
                 continue;
             }
         }
-        if (event->isStateEvent() && static_cast<const StateEventBase &>(*event).repeatsState()) {
+        if (event->isStateEvent() && static_cast<const StateEvent &>(*event).repeatsState()) {
             continue;
         }
 
@@ -340,7 +340,7 @@ bool NeoChatRoom::lastEventIsSpoiler() const
 QString NeoChatRoom::lastEventToString(Qt::TextFormat format, bool stripNewlines) const
 {
     if (auto event = lastEvent()) {
-        return roomMembername(event->senderId()) + (event->isStateEvent() ? QLatin1String(" ") : QLatin1String(": "))
+        return safeMemberName(event->senderId()) + (event->isStateEvent() ? QLatin1String(" ") : QLatin1String(": "))
             + eventToString(*event, format, stripNewlines);
     }
     return {};
@@ -359,7 +359,7 @@ void NeoChatRoom::checkForHighlights(const Quotient::TimelineItem &ti)
     }
     if (auto *e = ti.viewAs<RoomMessageEvent>()) {
         const auto &text = e->plainBody();
-        if (text.contains(localUserId) || text.contains(roomMembername(localUserId))) {
+        if (text.contains(localUserId) || text.contains(safeMemberName(localUserId))) {
             highlights.insert(e);
         }
     }
@@ -382,7 +382,7 @@ void NeoChatRoom::onAddHistoricalTimelineEvents(rev_iter_t from)
 void NeoChatRoom::onRedaction(const RoomEvent &prevEvent, const RoomEvent & /*after*/)
 {
     if (const auto &e = eventCast<const ReactionEvent>(&prevEvent)) {
-        if (auto relatedEventId = e->relation().eventId; !relatedEventId.isEmpty()) {
+        if (auto relatedEventId = e->eventId(); !relatedEventId.isEmpty()) {
             Q_EMIT updatedEvent(relatedEventId);
         }
     }
@@ -531,7 +531,7 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
         [this, prettyPrint](const RoomMemberEvent &e) {
             // FIXME: Rewind to the name that was at the time of this event
             auto subjectName = this->htmlSafeMemberName(e.userId());
-            if (e.membership() == MembershipType::Leave) {
+            if (e.membership() == Membership::Leave) {
                 if (e.prevContent() && e.prevContent()->displayName) {
                     subjectName = sanitized(*e.prevContent()->displayName).toHtmlEscaped();
                 }
@@ -544,7 +544,7 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
 
             // The below code assumes senderName output in AuthorRole
             switch (e.membership()) {
-            case MembershipType::Invite:
+            case Membership::Invite:
                 if (e.repeatsState()) {
                     auto text = i18n("reinvited %1 to the room", subjectName);
                     if (!e.reason().isEmpty()) {
@@ -553,13 +553,13 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                     return text;
                 }
                 Q_FALLTHROUGH();
-            case MembershipType::Join: {
+            case Membership::Join: {
                 QString text{};
                 // Part 1: invites and joins
                 if (e.repeatsState()) {
                     text = i18n("joined the room (repeated)");
                 } else if (e.changesMembership()) {
-                    text = e.membership() == MembershipType::Invite ? i18n("invited %1 to the room", subjectName) : i18n("joined the room");
+                    text = e.membership() == Membership::Invite ? i18n("invited %1 to the room", subjectName) : i18n("joined the room");
                 }
                 if (!text.isEmpty()) {
                     if (!e.reason().isEmpty()) {
@@ -569,17 +569,17 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                 }
                 // Part 2: profile changes of joined members
                 if (e.isRename()) {
-                    if (e.displayName().isEmpty()) {
+                    if (!e.newDisplayName()) {
                         text = i18nc("their refers to a singular user", "cleared their display name");
                     } else {
-                        text = i18nc("their refers to a singular user", "changed their display name to %1", e.displayName().toHtmlEscaped());
+                        text = i18nc("their refers to a singular user", "changed their display name to %1", e.newDisplayName()->toHtmlEscaped());
                     }
                 }
                 if (e.isAvatarUpdate()) {
                     if (!text.isEmpty()) {
                         text += i18n(" and ");
                     }
-                    if (e.avatarUrl().isEmpty()) {
+                    if (!e.newAvatarUrl()) {
                         text += i18nc("their refers to a singular user", "cleared their avatar");
                     } else if (!e.prevContent()->avatarUrl) {
                         text += i18n("set an avatar");
@@ -592,18 +592,18 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                 }
                 return text;
             }
-            case MembershipType::Leave:
-                if (e.prevContent() && e.prevContent()->membership == MembershipType::Invite) {
+            case Membership::Leave:
+                if (e.prevContent() && e.prevContent()->membership == Membership::Invite) {
                     return (e.senderId() != e.userId()) ? i18n("withdrew %1's invitation", subjectName) : i18n("rejected the invitation");
                 }
 
-                if (e.prevContent() && e.prevContent()->membership == MembershipType::Ban) {
+                if (e.prevContent() && e.prevContent()->membership == Membership::Ban) {
                     return (e.senderId() != e.userId()) ? i18n("unbanned %1", subjectName) : i18n("self-unbanned");
                 }
                 return (e.senderId() != e.userId())
                     ? i18n("has put %1 out of the room: %2", subjectName, e.contentJson()["reason"_ls].toString().toHtmlEscaped())
                     : i18n("left the room");
-            case MembershipType::Ban:
+            case Membership::Ban:
                 if (e.senderId() != e.userId()) {
                     if (e.reason().isEmpty()) {
                         return i18n("banned %1 from the room", subjectName);
@@ -613,7 +613,7 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                 } else {
                     return i18n("self-banned from the room");
                 }
-            case MembershipType::Knock: {
+            case Membership::Knock: {
                 QString reason(e.contentJson()["reason"_ls].toString().toHtmlEscaped());
                 return reason.isEmpty() ? i18n("requested an invite") : i18n("requested an invite with reason: %1", reason);
             }
@@ -647,7 +647,7 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
         [](const RoomPowerLevelsEvent &) {
             return i18nc("'power level' means permission level", "changed the power levels for this room");
         },
-        [](const StateEventBase &e) {
+        [](const StateEvent &e) {
             if (e.matrixType() == QLatin1String("m.room.server_acl")) {
                 return i18n("changed the server access control lists for this room");
             }
@@ -686,25 +686,25 @@ QString NeoChatRoom::eventToGenericString(const RoomEvent &evt) const
         },
         [](const RoomMemberEvent &e) {
             switch (e.membership()) {
-            case MembershipType::Invite:
+            case Membership::Invite:
                 if (e.repeatsState()) {
                     return i18n("reinvited someone to the room");
                 }
                 Q_FALLTHROUGH();
-            case MembershipType::Join: {
+            case Membership::Join: {
                 QString text{};
                 // Part 1: invites and joins
                 if (e.repeatsState()) {
                     text = i18n("joined the room (repeated)");
                 } else if (e.changesMembership()) {
-                    text = e.membership() == MembershipType::Invite ? i18n("invited someone to the room") : i18n("joined the room");
+                    text = e.membership() == Membership::Invite ? i18n("invited someone to the room") : i18n("joined the room");
                 }
                 if (!text.isEmpty()) {
                     return text;
                 }
                 // Part 2: profile changes of joined members
                 if (e.isRename()) {
-                    if (e.displayName().isEmpty()) {
+                    if (!e.newDisplayName()) {
                         text = i18nc("their refers to a singular user", "cleared their display name");
                     } else {
                         text = i18nc("their refers to a singular user", "changed their display name");
@@ -714,7 +714,7 @@ QString NeoChatRoom::eventToGenericString(const RoomEvent &evt) const
                     if (!text.isEmpty()) {
                         text += i18n(" and ");
                     }
-                    if (e.avatarUrl().isEmpty()) {
+                    if (!e.newAvatarUrl()) {
                         text += i18nc("their refers to a singular user", "cleared their avatar");
                     } else if (!e.prevContent()->avatarUrl) {
                         text += i18n("set an avatar");
@@ -727,22 +727,22 @@ QString NeoChatRoom::eventToGenericString(const RoomEvent &evt) const
                 }
                 return text;
             }
-            case MembershipType::Leave:
-                if (e.prevContent() && e.prevContent()->membership == MembershipType::Invite) {
+            case Membership::Leave:
+                if (e.prevContent() && e.prevContent()->membership == Membership::Invite) {
                     return (e.senderId() != e.userId()) ? i18n("withdrew a user's invitation") : i18n("rejected the invitation");
                 }
 
-                if (e.prevContent() && e.prevContent()->membership == MembershipType::Ban) {
+                if (e.prevContent() && e.prevContent()->membership == Membership::Ban) {
                     return (e.senderId() != e.userId()) ? i18n("unbanned a user") : i18n("self-unbanned");
                 }
                 return (e.senderId() != e.userId()) ? i18n("put a user out of the room") : i18n("left the room");
-            case MembershipType::Ban:
+            case Membership::Ban:
                 if (e.senderId() != e.userId()) {
                     return i18n("banned a user from the room");
                 } else {
                     return i18n("self-banned from the room");
                 }
-            case MembershipType::Knock: {
+            case Membership::Knock: {
                 return i18n("requested an invite");
             }
             default:;
@@ -770,7 +770,7 @@ QString NeoChatRoom::eventToGenericString(const RoomEvent &evt) const
         [](const RoomPowerLevelsEvent &) {
             return i18nc("'power level' means permission level", "changed the power levels for this room");
         },
-        [](const StateEventBase &e) {
+        [](const StateEvent &e) {
             if (e.matrixType() == QLatin1String("m.room.server_acl")) {
                 return i18n("changed the server access control lists for this room");
             }
@@ -906,11 +906,11 @@ void NeoChatRoom::toggleReaction(const QString &eventId, const QString &reaction
 
     QStringList redactEventIds; // What if there are multiple reaction events?
 
-    const auto &annotations = relatedEvents(evt, EventRelation::Annotation());
+    const auto &annotations = relatedEvents(evt, EventRelation::AnnotationType);
     if (!annotations.isEmpty()) {
         for (const auto &a : annotations) {
             if (auto e = eventCast<const ReactionEvent>(a)) {
-                if (e->relation().key != reaction) {
+                if (e->key() != reaction) {
                     continue;
                 }
 
@@ -938,7 +938,10 @@ bool NeoChatRoom::containsUser(const QString &userID) const
 
 bool NeoChatRoom::canSendEvent(const QString &eventType) const
 {
-    auto plEvent = getCurrentState<RoomPowerLevelsEvent>();
+    auto plEvent = currentState().get<RoomPowerLevelsEvent>();
+    if (!plEvent) {
+        return false;
+    }
     auto pl = plEvent->powerLevelForEvent(eventType);
     auto currentPl = plEvent->powerLevelForUser(localUser()->id());
 
@@ -947,7 +950,10 @@ bool NeoChatRoom::canSendEvent(const QString &eventType) const
 
 bool NeoChatRoom::canSendState(const QString &eventType) const
 {
-    auto plEvent = getCurrentState<RoomPowerLevelsEvent>();
+    auto plEvent = currentState().get<RoomPowerLevelsEvent>();
+    if (!plEvent) {
+        return false;
+    }
     auto pl = plEvent->powerLevelForState(eventType);
     auto currentPl = plEvent->powerLevelForUser(localUser()->id());
 
@@ -967,7 +973,11 @@ bool NeoChatRoom::isInvite() const
 
 bool NeoChatRoom::isUserBanned(const QString &user) const
 {
-    return getCurrentState<RoomMemberEvent>(user)->membership() == MembershipType::Ban;
+    auto roomMemberEvent = currentState().get<RoomMemberEvent>(user);
+    if (!roomMemberEvent) {
+        return false;
+    }
+    return roomMemberEvent->membership() == Membership::Ban;
 }
 
 QString NeoChatRoom::htmlSafeDisplayName() const
@@ -982,7 +992,11 @@ void NeoChatRoom::deleteMessagesByUser(const QString &user, const QString &reaso
 
 QString NeoChatRoom::joinRule() const
 {
-    return getCurrentState<JoinRulesEvent>()->joinRule();
+    auto joinRulesEvent = currentState().get<JoinRulesEvent>();
+    if (!joinRulesEvent) {
+        return {};
+    }
+    return joinRulesEvent->joinRule();
 }
 
 void NeoChatRoom::setJoinRule(const QString &joinRule)
@@ -1116,7 +1130,10 @@ void NeoChatRoom::setUserPowerLevel(const QString &userID, const int &powerLevel
 
 int NeoChatRoom::getUserPowerLevel(const QString &userId) const
 {
-    auto powerLevelEvent = getCurrentState<RoomPowerLevelsEvent>();
+    auto powerLevelEvent = currentState().get<RoomPowerLevelsEvent>();
+    if (!powerLevelEvent) {
+        return 0;
+    }
     return powerLevelEvent->powerLevelForUser(userId);
 }
 
@@ -1924,7 +1941,7 @@ QByteArray NeoChatRoom::roomAcountDataJson(const QString &eventType)
 QUrl NeoChatRoom::avatarForMember(NeoChatUser *user) const
 {
     const auto &url = memberAvatarUrl(user->id());
-    if (url.isEmpty()) {
+    if (url.isEmpty() || url.scheme() != "mxc"_ls) {
         return {};
     }
     auto avatar = connection()->makeMediaUrl(url);

src/neochatroom.h

@@ -3,8 +3,7 @@
 
 #pragma once
 
-#include <qobjectdefs.h>
-#include <room.h>
+#include <Quotient/room.h>
 
 #include <QCache>
 #include <QObject>

src/neochatuser.cpp

@@ -7,7 +7,7 @@
 #include <QJsonObject>
 #include <QPalette>
 
-#include <connection.h>
+#include <Quotient/connection.h>
 
 using namespace Quotient;
 

src/neochatuser.h

@@ -5,7 +5,7 @@
 
 #include <QObject>
 
-#include <user.h>
+#include <Quotient/user.h>
 
 /**
  * @class NeoChatUser
@@ -23,7 +23,7 @@ class NeoChatUser : public Quotient::User
      */
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
 public:
-    NeoChatUser(QString userId, Quotient::Connection *connection);
+    explicit NeoChatUser(QString userId, Quotient::Connection *connection);
 
 public Q_SLOTS:
     QColor color();