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

For details, where this image is used, see https://learn.microsoft.com/en-us/windows/apps/publish/publish-your-app/screenshots-and-images?pivots=store-installer-msix#windows-10-and-xbox-image-169-super-hero-art
Add some logos in different sizes for the Microsoft Store
2023-06-26 15:38:12 +02:00 · 2023-06-26 15:36:35 +02:00 · 2023-06-26 15:31:06 +02:00 · 2023-06-26 15:19:16 +02:00 · 2023-06-26 15:12:24 +02:00
216 changed files with 28042 additions and 28450 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-build*
+build
 .clang-format
 .DS_Store
 .kdev4/
@@ -11,4 +11,3 @@ kate.project.ctags.*
 .flatpak-builder/
 .idea/
 cmake-build-*
-src/res.generated.qrc
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,10 +5,10 @@ include:
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml
 #  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml
-#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
 #  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml
-#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
 #  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml
--- a/CMakeLists.txt
+++ b/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 "90")
+set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")

 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
@@ -17,7 +17,7 @@ project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
 set(KF_MIN_VERSION "5.105.0")
 set(QT_MIN_VERSION "5.15.2")
 if (ANDROID)
-    set(QT_MIN_VERSION "5.15.10")
+    set(QT_MIN_VERSION "5.15.8")
 endif()

 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
@@ -48,30 +48,6 @@ if(NEOCHAT_FLATPAK)
    include(cmake/Flatpak.cmake)
 endif()

-if(QT_MAJOR_VERSION STREQUAL "6")
-    set(BASICLISTITEM_BOLD "font.bold")
-    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
    VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
@@ -122,7 +98,7 @@ if(QT_MAJOR_VERSION STREQUAL "6" AND NOT ANDROID AND NOT WIN32)
    set(QUOTIENT_SUFFIX "Qt6")
 endif()

-find_package(Quotient${QUOTIENT_SUFFIX} 0.7)
+find_package(Quotient${QUOTIENT_SUFFIX} 0.6)
 set_package_properties(Quotient${QUOTIENT_SUFFIX} PROPERTIES
    TYPE REQUIRED
    DESCRIPTION "Qt wrapper around Matrix API"
@@ -202,9 +178,3 @@ file(GLOB_RECURSE ALL_SOURCE_FILES *.cpp *.h *.qml)
 # Fixes the test by excluding this directory
 list(FILTER ALL_SOURCE_FILES EXCLUDE REGEX [[_(install|build)/.*]])
 ecm_check_outbound_license(LICENSES GPL-3.0-only FILES ${ALL_SOURCE_FILES})
-
-ecm_qt_install_logging_categories(
-        EXPORT NEOCHAT
-        FILE neochat.categories
-        DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
-        )
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -47,7 +47,6 @@ android {
    compileSdkVersion androidCompileSdkVersion.toInteger()

    buildToolsVersion androidBuildToolsVersion
-    ndkVersion androidNdkVersion

    sourceSets {
        main {
--- a/autotests/neochatroomtest.cpp
+++ b/autotests/neochatroomtest.cpp
@@ -7,9 +7,9 @@

 #include "neochatroom.h"

-#include <Quotient/connection.h>
-#include <Quotient/quotient_common.h>
-#include <Quotient/syncdata.h>
+#include <connection.h>
+#include <quotient_common.h>
+#include <syncdata.h>

 using namespace Quotient;

--- a/autotests/texthandlertest.cpp
+++ b/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;

@@ -71,6 +71,7 @@ private Q_SLOTS:
    void linkPreviewsReject();
 };

+#ifdef QUOTIENT_07
 void TextHandlerTest::initTestCase()
 {
    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
@@ -203,6 +204,7 @@ void TextHandlerTest::initTestCase()
    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, json.object());
    room->update(std::move(roomData));
 }
+#endif

 void TextHandlerTest::allowedAttributes()
 {
@@ -477,6 +479,7 @@ void TextHandlerTest::receiveRichtextIn()
    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
 }

+#ifdef QUOTIENT_07
 void TextHandlerTest::receiveRichMxcUrl()
 {
    const QString testInputString = QStringLiteral(
@@ -494,6 +497,7 @@ void TextHandlerTest::receiveRichMxcUrl()

    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, room->messageEvents().at(0).get()), testOutputString);
 }
+#endif

 /**
 * For when your rich input string has a plain text url left in.
--- a/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
@@ -18,7 +18,6 @@
  <name xml:lang="de">NeoChat</name>
  <name xml:lang="el">NeoChat</name>
  <name xml:lang="en-GB">NeoChat</name>
-  <name xml:lang="eo">NeoChat</name>
  <name xml:lang="es">NeoChat</name>
  <name xml:lang="eu">NeoChat</name>
  <name xml:lang="fi">NeoChat</name>
@@ -55,12 +54,11 @@
  <summary xml:lang="de">Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll</summary>
  <summary xml:lang="el">Ένας πελάτης για το Matrix, το αποκεντρωμένο πρωτόκολλο επικοινωνίας</summary>
  <summary xml:lang="en-GB">A client for matrix, the decentralised communication protocol</summary>
-  <summary xml:lang="eo">Kliento por matrix, la malcentra komunikprotokolo</summary>
  <summary xml:lang="es">Un cliente para Matrix, el protocolo de comunicaciones descentralizado</summary>
  <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>
@@ -69,7 +67,7 @@
  <summary xml:lang="ka">კლიენტი Matrix-სთვის, დეცენტრალიზებული კომუნიკაციის პროტოკოლისთვის</summary>
  <summary xml:lang="ko">Matrix, 분산 대화 프로토콜 클라이언트</summary>
  <summary xml:lang="nl">Een client voor matrix, het gedecentraliseerde communicatieprotocol</summary>
-  <summary xml:lang="nn">Ein klient for Matrix – protokollen for desentralisert kommunikasjon</summary>
+  <summary xml:lang="nn">Ein klient for Matrix, den desentraliserte lynmeldingsprotokollen</summary>
  <summary xml:lang="pa">ਮੈਟਰਿਕਸ, ਸਰਬ-ਸਾਂਝੇ ਸੰਚਾਰ ਪਰੋਟੋਕਾਲ, ਲਈ ਕਲਾਈਂਟ ਹੈ</summary>
  <summary xml:lang="pl">Program do obsługi matriksa, rozproszonego protokołu porozumiewania się</summary>
  <summary xml:lang="pt">Um cliente para o Matrix, o protocolo de comunicação descentralizado</summary>
@@ -90,22 +88,17 @@ to provide a convergent experience across multiple platforms.</p>
    <p xml:lang="ca">El NeoChat és un client de Matrix, el protocol descentralitzat de comunicacions de missatgeria instantània. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics. Fa servir els Frameworks de KDE i, sobretot, el Kirigami per a proporcionar una experiència convergent a través de diverses plataformes.</p>
    <p xml:lang="ca-valencia">NeoChat és un client de Matrix, el protocol descentralitzat de comunicacions de missatgeria instantània. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics. Utilitza els Frameworks de KDE i, sobretot, Kirigami per a proporcionar una experiència convergent a través de diverses plataformes.</p>
    <p xml:lang="en-GB">NeoChat is a client for Matrix, the decentralised communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami to provide a convergent experience across multiple platforms.</p>
-    <p xml:lang="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 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="gl">NeoChat é un cliente para Matrix, o protocolo de comunicación descentralizada para mensaxería instantánea. Podes enviar mensaxes de texto, vídeos e ficheiros de son á túa familia, colegas e amizades. Usas infraestruturas de KDE e principalmente Kirigami para proporcionar unha experiencia de uso converxente para varias plataformas.</p>
    <p xml:lang="ia">NeoChat es un cliente per Matrix, le protocollo de communication decentralisate per messager instantanee. Illo te permitte inviar messager de texto, files de video e audio a tu familia, collegas e amicos usante. Illo usa KDE frameworks e super toto Kirigamii forni un experientia convergente trans platteforme multiple.</p>
    <p xml:lang="it">NeoChat è un client per Matrix, il protocollo di comunicazione decentralizzato per la messaggistica istantanea. Ti consente di inviare messaggi di testo, video e file audio a familiari, colleghi e amici. Utilizza i framework KDE e in particolare Kirigami per fornire un'esperienza convergente su più piattaforme.</p>
    <p xml:lang="ka">NeoChat არის Matrix კლიენტი. ის საშუალებას გაძლევთ გაგზავნოთ ტექსტური შეტყობინებები, ვიდეოები და აუდიო ფაილები თქვენს ოჯახს, კოლეგებსა და მეგობრებს მატრიქსის პროტოკოლის გამოყენებით.</p>
-    <p xml:lang="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>
@@ -115,20 +108,16 @@ 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>
@@ -138,21 +127,16 @@ 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>
@@ -163,19 +147,15 @@ 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>
@@ -186,19 +166,15 @@ 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>
@@ -209,25 +185,26 @@ 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>
      <li xml:lang="x-test">xxLocation Events - MSC3488xx</li>
    </ul>
  </description>
+  <keywords>
+    <keyword>instant messaging</keyword>
+    <keyword>chat</keyword>
+    <keyword>matrix</keyword>
+  </keywords>
  <url type="homepage">https://apps.kde.org/neochat/</url>
  <url type="bugtracker">https://bugs.kde.org/buglist.cgi?component=General&amp;product=NeoChat</url>
  <categories>
@@ -242,7 +219,6 @@ to provide a convergent experience across multiple platforms.</p>
  <developer_name xml:lang="de">Die KDE-Gemeinschaft</developer_name>
  <developer_name xml:lang="el">Η Κοινότητα του KDE</developer_name>
  <developer_name xml:lang="en-GB">The KDE Community</developer_name>
-  <developer_name xml:lang="eo">La KDE-Komunumo</developer_name>
  <developer_name xml:lang="es">La comunidad KDE</developer_name>
  <developer_name xml:lang="eu">KDE komunitatea</developer_name>
  <developer_name xml:lang="fi">KDE-yhteisö</developer_name>
@@ -280,48 +256,15 @@ to provide a convergent experience across multiple platforms.</p>
    <value key="KDE::windows_store::StoreLogoSquare">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/storelogo-1080x1080.png</value>
    <value key="KDE::windows_store::Icon">https://invent.kde.org/network/neochat/-/raw/master/icons/300-apps-neochat.png</value>
    <value key="KDE::windows_store::PromotionalArt16x9">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/promoimage-1920x1080.png</value>
-    <value key="KDE::windows_store::screenshots::1::image">https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Timeline.png</value>
-    <value key="KDE::windows_store::screenshots::1::caption">Main view with room list, chat, and room information</value>
-    <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>
-    <value key="KDE::windows_store::screenshots::2::image">https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Login.png</value>
-    <value key="KDE::windows_store::screenshots::2::caption">Login screen</value>
-    <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>
+    <value key="KDE::feature1">Supports the Matrix protocol for instant messaging.</value>
+    <value key="KDE::feature2">End-to-End Encryption</value>
+    <value key="KDE::feature3">Polls (experimental)</value>
+    <value key="KDE::feature4">Sticker Packs (experimental)</value>
+    <value key="KDE::feature5">Location Events (experimental)</value>
+    <value key="KDE::windows_store::DesktopScreenshot1">https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Timeline.png</value>
+    <value key="KDE::windows_store::DesktopScreenshotCaption1">Main view of NeoChat with room list, chat, and room information pane</value>
+    <value key="KDE::windows_store::DesktopScreenshot2">https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Login.png</value>
+    <value key="KDE::windows_store::DesktopScreenshotCaption2">Login screen of NeoChat</value>
  </custom>
  <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
  <screenshots>
@@ -336,7 +279,6 @@ to provide a convergent experience across multiple platforms.</p>
    <content_attribute id="social-chat">intense</content_attribute>
  </content_rating>
  <releases>
-    <release version="23.04.3" date="2023-07-06"/>
    <release version="23.04.2" date="2023-06-08"/>
    <release version="23.04.1" date="2023-05-11"/>
    <release version="23.04.0" date="2023-04-20">
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -11,7 +11,6 @@ Name[cs]=NeoChat
 Name[de]=NeoChat
 Name[el]=NeoChat
 Name[en_GB]=NeoChat
-Name[eo]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
 Name[fi]=NeoChat
@@ -50,7 +49,6 @@ GenericName[cs]=Klient protokolu Matrix
 GenericName[de]=Matrix-Programm
 GenericName[el]=Εφαρμογή του Matrix
 GenericName[en_GB]=Matrix Client
-GenericName[eo]=Matrix-Kliento
 GenericName[es]=Cliente para Matrix
 GenericName[eu]=Matrix bezeroa
 GenericName[fi]=Matrix-asiakas
@@ -88,12 +86,11 @@ Comment[ca@valencia]=Client per al protocol Matrix
 Comment[de]=Programm für das Matrix-Protokoll
 Comment[el]=Πελάτης για το πρωτόκολλο Matrix
 Comment[en_GB]=Client for the Matrix protocol
-Comment[eo]=Kliento por la Matrix-protokolo
 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
@@ -103,7 +100,7 @@ Comment[ka]=კლიენტი Matrix-ის პროტოკოლის
 Comment[ko]=Matrix 프로토콜용 클라이언트
 Comment[lt]=Matrix protokolo kliento programa
 Comment[nl]=Client voor het Matrix-protocol
-Comment[nn]=Klient for Matrix-protokollen
+Comment[nn]=Lynmeldingsklient for Matrix-protokollen
 Comment[pa]=ਮੈਟਰਿਕਸ ਪਰੋਟੋਕਾਲ ਲਈ ਕਲਾਈਂਟ ਹੈ
 Comment[pl]=Program obsługi protokołu Matriksa
 Comment[pt]=Cliente para o protocolo Matrix
--- a/po/ar/neochat.po
+++ b/po/ar/neochat.po
--- a/po/az/neochat.po
+++ b/po/az/neochat.po
--- a/po/ca/neochat.po
+++ b/po/ca/neochat.po
--- a/po/ca@valencia/neochat.po
+++ b/po/ca@valencia/neochat.po
--- a/po/cs/neochat.po
+++ b/po/cs/neochat.po
--- a/po/da/neochat.po
+++ b/po/da/neochat.po
--- a/po/de/neochat.po
+++ b/po/de/neochat.po
--- a/po/el/neochat.po
+++ b/po/el/neochat.po
--- a/po/en_GB/neochat.po
+++ b/po/en_GB/neochat.po
--- a/po/es/neochat.po
+++ b/po/es/neochat.po
--- a/po/eu/neochat.po
+++ b/po/eu/neochat.po
--- a/po/fi/neochat.po
+++ b/po/fi/neochat.po
--- a/po/fr/neochat.po
+++ b/po/fr/neochat.po
--- a/po/hu/neochat.po
+++ b/po/hu/neochat.po
--- a/po/ia/neochat.po
+++ b/po/ia/neochat.po
--- a/po/id/neochat.po
+++ b/po/id/neochat.po
--- a/po/ie/neochat.po
+++ b/po/ie/neochat.po
--- a/po/it/neochat.po
+++ b/po/it/neochat.po
--- a/po/ja/neochat.po
+++ b/po/ja/neochat.po
--- a/po/ka/neochat.po
+++ b/po/ka/neochat.po
--- a/po/ko/neochat.po
+++ b/po/ko/neochat.po
--- a/po/lt/neochat.po
+++ b/po/lt/neochat.po
--- a/po/nl/neochat.po
+++ b/po/nl/neochat.po
--- a/po/nn/neochat.po
+++ b/po/nn/neochat.po
--- a/po/pa/neochat.po
+++ b/po/pa/neochat.po
--- a/po/pl/neochat.po
+++ b/po/pl/neochat.po
--- a/po/pt/neochat.po
+++ b/po/pt/neochat.po
--- a/po/pt_BR/neochat.po
+++ b/po/pt_BR/neochat.po
--- a/po/ru/neochat.po
+++ b/po/ru/neochat.po
--- a/po/sk/neochat.po
+++ b/po/sk/neochat.po
--- a/po/sl/neochat.po
+++ b/po/sl/neochat.po
--- a/po/sv/neochat.po
+++ b/po/sv/neochat.po
--- a/po/ta/neochat.po
+++ b/po/ta/neochat.po
--- a/po/tok/neochat.po
+++ b/po/tok/neochat.po
--- a/po/tr/neochat.po
+++ b/po/tr/neochat.po
--- a/po/uk/neochat.po
+++ b/po/uk/neochat.po
--- a/po/zh_CN/neochat.po
+++ b/po/zh_CN/neochat.po
--- a/po/zh_TW/neochat.po
+++ b/po/zh_TW/neochat.po
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,144 +3,74 @@
 # SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
 # SPDX-License-Identifier: BSD-2-Clause

-configure_file(qml/Page/RoomList/RoomDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Page/RoomList/RoomDelegate.qml)
-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)
-
 add_library(neochat STATIC
    controller.cpp
-    controller.h
    actionshandler.cpp
-    actionshandler.h
    models/emojimodel.cpp
-    models/emojimodel.h
    emojitones.cpp
-    emojitones.h
    models/customemojimodel.cpp
-    models/customemojimodel.h
    clipboard.cpp
-    clipboard.h
    matriximageprovider.cpp
-    matriximageprovider.h
    models/messageeventmodel.cpp
-    models/messageeventmodel.h
    models/messagefiltermodel.cpp
-    models/messagefiltermodel.h
    models/roomlistmodel.cpp
-    models/roomlistmodel.h
    models/sortfilterspacelistmodel.cpp
-    models/sortfilterspacelistmodel.h
    models/accountemoticonmodel.cpp
-    models/accountemoticonmodel.h
    spacehierarchycache.cpp
-    spacehierarchycache.h
    roommanager.cpp
-    roommanager.h
    neochatroom.cpp
-    neochatroom.h
    neochatuser.cpp
-    neochatuser.h
    models/userlistmodel.cpp
-    models/userlistmodel.h
    models/userfiltermodel.cpp
-    models/userfiltermodel.h
    models/publicroomlistmodel.cpp
-    models/publicroomlistmodel.h
    models/userdirectorylistmodel.cpp
-    models/userdirectorylistmodel.h
-    models/pushrulemodel.cpp
-    models/pushrulemodel.h
+    models/keywordnotificationrulemodel.cpp
    models/emoticonfiltermodel.cpp
-    models/emoticonfiltermodel.h
    notificationsmanager.cpp
-    notificationsmanager.h
    models/sortfilterroomlistmodel.cpp
-    models/sortfilterroomlistmodel.h
    chatdocumenthandler.cpp
-    chatdocumenthandler.h
    models/devicesmodel.cpp
-    models/devicesmodel.h
-    models/devicesproxymodel.cpp
    filetypesingleton.cpp
-    filetypesingleton.h
    login.cpp
-    login.h
    models/webshortcutmodel.cpp
-    models/webshortcutmodel.h
    blurhash.cpp
-    blurhash.h
    blurhashimageprovider.cpp
-    blurhashimageprovider.h
    models/collapsestateproxymodel.cpp
-    models/collapsestateproxymodel.h
-    models/mediamessagefiltermodel.cpp
-    models/mediamessagefiltermodel.h
    urlhelper.cpp
-    urlhelper.h
    windowcontroller.cpp
-    windowcontroller.h
    linkpreviewer.cpp
-    linkpreviewer.h
    models/completionmodel.cpp
-    models/completionmodel.h
    models/completionproxymodel.cpp
-    models/completionproxymodel.h
    models/actionsmodel.cpp
-    models/actionsmodel.h
    models/serverlistmodel.cpp
-    models/serverlistmodel.h
    models/statemodel.cpp
-    models/statemodel.h
    models/statefiltermodel.cpp
-    models/statefiltermodel.h
    filetransferpseudojob.cpp
-    filetransferpseudojob.h
    models/searchmodel.cpp
-    models/searchmodel.h
    texthandler.cpp
-    texthandler.h
    logger.cpp
-    logger.h
    models/stickermodel.cpp
-    models/stickermodel.h
    models/imagepacksmodel.cpp
-    models/imagepacksmodel.h
    events/imagepackevent.cpp
-    events/imagepackevent.h
    events/joinrulesevent.cpp
-    events/joinrulesevent.h
+    events/stickerevent.cpp
    models/reactionmodel.cpp
-    models/reactionmodel.h
    delegatesizehelper.cpp
-    delegatesizehelper.h
    models/livelocationsmodel.cpp
-    models/livelocationsmodel.h
    models/locationsmodel.cpp
-    models/locationsmodel.h
    locationhelper.cpp
-    locationhelper.h
-    events/pollevent.cpp
-    pollhandler.cpp
 )

 ecm_qt_declare_logging_category(neochat
    HEADER "messageeventmodel_logging.h"
    IDENTIFIER "MessageEvent"
    CATEGORY_NAME "org.kde.neochat.messageeventmodel"
-    DESCRIPTION "Neochat: messageeventmodel"
    DEFAULT_SEVERITY Info
-    EXPORT NEOCHAT
 )

 add_executable(neochat-app
    main.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/res.generated.qrc
+    res.qrc
 )

 target_include_directories(neochat-app PRIVATE ${CMAKE_BINARY_DIR})
@@ -149,16 +79,24 @@ target_link_libraries(neochat-app PRIVATE
    neochat
 )

+if(Quotient${QUOTIENT_SUFFIX}_VERSION_MINOR GREATER 6)
+    target_compile_definitions(neochat PUBLIC QUOTIENT_07)
+    target_sources(neochat PRIVATE events/pollevent.cpp pollhandler.cpp)
+else()
+    target_compile_definitions(neochat PUBLIC QUOTIENT_VERSION=\"${Quotient${QUOTIENT_SUFFIX}_VERSION}\")
+    target_sources(neochat PRIVATE neochataccountregistry.cpp)
+endif()
+
 ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)

 target_sources(neochat-app PRIVATE ${NEOCHAT_ICON})

 if(NOT ANDROID)
-    target_sources(neochat PRIVATE colorschemer.cpp colorschemer.h)
+    target_sources(neochat PRIVATE colorschemer.cpp)
    if (NOT WIN32 AND NOT APPLE)
-        target_sources(neochat PRIVATE trayicon_sni.cpp trayicon_sni.h)
+        target_sources(neochat PRIVATE trayicon_sni.cpp)
    else()
-        target_sources(neochat PRIVATE trayicon.cpp trayicon.h)
+        target_sources(neochat PRIVATE trayicon.cpp)
    endif()
    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::ConfigWidgets KF${QT_MAJOR_VERSION}::WindowSystem)
    target_compile_definitions(neochat PUBLIC -DHAVE_COLORSCHEME)
--- a/src/actionshandler.cpp
+++ b/src/actionshandler.cpp
@@ -3,8 +3,8 @@

 #include "actionshandler.h"

-#include <Quotient/csapi/joining.h>
-#include <Quotient/events/roommemberevent.h>
+#include <csapi/joining.h>
+#include <events/roommemberevent.h>

 #include <cmark.h>

@@ -14,6 +14,7 @@
 #include "models/actionsmodel.h"
 #include "models/customemojimodel.h"
 #include "neochatconfig.h"
+#include "neochatroom.h"
 #include "texthandler.h"

 using namespace Quotient;
@@ -182,5 +183,3 @@ void ActionsHandler::checkEffects(const QString &text)
        Q_EMIT showEffect(*effect);
    }
 }
-
-#include "moc_actionshandler.cpp"
--- a/src/actionshandler.h
+++ b/src/actionshandler.h
@@ -5,7 +5,7 @@

 #include <QObject>

-#include <Quotient/events/roommessageevent.h>
+#include <events/roommessageevent.h>

 #include "neochatroom.h"

@@ -47,7 +47,7 @@ public:

 Q_SIGNALS:
    void roomChanged();
-    void showEffect(const QString &effect);
+    void showEffect(QString effect);

 public Q_SLOTS:

--- a/src/chatdocumenthandler.cpp
+++ b/src/chatdocumenthandler.cpp
@@ -14,6 +14,8 @@
 #include <Sonnet/BackgroundChecker>
 #include <Sonnet/Settings>

+#include "neochatroom.h"
+
 class SyntaxHighlighter : public QSyntaxHighlighter
 {
 public:
@@ -218,8 +220,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::DisplayNameRole).toString();
-        auto id = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::SubtitleRole).toString();
+        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 text = getText();
        auto at = text.lastIndexOf(QLatin1Char('@'), cursorPosition() - 1);
        QTextCursor cursor(document()->textDocument());
@@ -232,7 +234,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::ReplacedTextRole).toString();
+        auto command = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
        auto text = getText();
        auto at = text.lastIndexOf(QLatin1Char('/'));
        QTextCursor cursor(document()->textDocument());
@@ -240,7 +242,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::SubtitleRole).toString();
+        auto alias = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
        auto text = getText();
        auto at = text.lastIndexOf(QLatin1Char('#'), cursorPosition() - 1);
        QTextCursor cursor(document()->textDocument());
@@ -253,7 +255,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::ReplacedTextRole).toString();
+        auto shortcode = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
        auto text = getText();
        auto at = text.lastIndexOf(QLatin1Char(':'));
        QTextCursor cursor(document()->textDocument());
@@ -353,5 +355,3 @@ void ChatDocumentHandler::setErrorColor(const QColor &color)
    m_highlighter->rehighlight();
    Q_EMIT errorColorChanged();
 }
-
-#include "moc_chatdocumenthandler.cpp"
--- a/src/clipboard.cpp
+++ b/src/clipboard.cpp
@@ -79,5 +79,3 @@ void Clipboard::setImage(const QUrl &url)
        }
    }
 }
-
-#include "moc_clipboard.cpp"
--- a/src/colorschemer.cpp
+++ b/src/colorschemer.cpp
@@ -44,5 +44,3 @@ QString ColorSchemer::nameForIndex(int index) const
 {
    return c->model()->data(c->model()->index(index, 0), Qt::DisplayRole).toString();
 }
-
-#include "moc_colorschemer.cpp"
--- a/src/colorschemer.h
+++ b/src/colorschemer.h
@@ -28,7 +28,7 @@ class ColorSchemer : public QObject
    Q_PROPERTY(QAbstractItemModel *model READ model CONSTANT)

 public:
-    explicit ColorSchemer(QObject *parent = nullptr);
+    ColorSchemer(QObject *parent = nullptr);
    ~ColorSchemer();

    QAbstractItemModel *model() const;
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -31,15 +31,22 @@

 #include <signal.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>
+#ifdef QUOTIENT_07
+#include "accountregistry.h"
+#else
+#include "neochataccountregistry.h"
+#endif
+
+#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>
+
+#ifdef QUOTIENT_07
+#include <eventstats.h>
+#endif

 #include "neochatconfig.h"
 #include "neochatroom.h"
@@ -101,22 +108,24 @@ Controller::Controller(QObject *parent)
    }
 #endif

-    connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
+#ifdef QUOTIENT_07
+    connect(&Accounts, &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
+#else
+    connect(&AccountRegistry::instance(), &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
+#endif

+#ifdef QUOTIENT_07
    static int oldAccountCount = 0;
-    connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, [this]() {
-        if (m_accountRegistry.size() > oldAccountCount) {
-            auto connection = m_accountRegistry.accounts()[m_accountRegistry.size() - 1];
+    connect(&Accounts, &AccountRegistry::accountCountChanged, this, [this]() {
+        if (Accounts.size() > oldAccountCount) {
+            auto connection = Accounts.accounts()[Accounts.size() - 1];
            connect(connection, &Connection::syncDone, this, [connection]() {
                NotificationsManager::instance().handleNotifications(connection);
            });
        }
-        oldAccountCount = m_accountRegistry.size();
-    });
-
-    QTimer::singleShot(0, this, [this] {
-        m_pushRuleModel = new PushRuleModel;
+        oldAccountCount = Accounts.size();
    });
+#endif
 }

 Controller &Controller::instance()
@@ -147,10 +156,18 @@ void Controller::logout(Connection *conn, bool serverSideLogout)
    job.start();
    loop.exec();

-    if (m_accountRegistry.count() > 1) {
+#ifdef QUOTIENT_07
+    if (Accounts.count() > 1) {
+#else
+    if (AccountRegistry::instance().count() > 1) {
+#endif
        // Only set the connection if the the account being logged out is currently active
        if (conn == activeConnection()) {
-            setActiveConnection(m_accountRegistry.accounts()[0]);
+#ifdef QUOTIENT_07
+            setActiveConnection(Accounts.accounts()[0]);
+#else
+            setActiveConnection(AccountRegistry::instance().accounts()[0]);
+#endif
        }
    } else {
        setActiveConnection(nullptr);
@@ -165,7 +182,11 @@ void Controller::addConnection(Connection *c)
 {
    Q_ASSERT_X(c, __FUNCTION__, "Attempt to add a null connection");

-    m_accountRegistry.add(c);
+#ifdef QUOTIENT_07
+    Accounts.add(c);
+#else
+    AccountRegistry::instance().add(c);
+#endif

    c->setLazyLoading(true);

@@ -180,7 +201,7 @@ void Controller::addConnection(Connection *c)
    });

    connect(c, &Connection::requestFailed, this, [this](BaseJob *job) {
-        if (job->error() == BaseJob::UserConsentRequired) {
+        if (job->error() == BaseJob::UserConsentRequiredError) {
            Q_EMIT userConsentRequired(job->errorUrl());
        }
    });
@@ -195,8 +216,15 @@ void Controller::dropConnection(Connection *c)
 {
    Q_ASSERT_X(c, __FUNCTION__, "Attempt to drop a null connection");

+#ifndef QUOTIENT_07
+    AccountRegistry::instance().drop(c);
+#endif
+
    Q_EMIT connectionDropped(c);
    Q_EMIT accountCountChanged();
+#ifndef QUOTIENT_07
+    c->deleteLater();
+#endif
 }

 void Controller::invokeLogin()
@@ -247,7 +275,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);
+                connection->assumeIdentity(account.userId(), accessToken, account.deviceId());
            });
        }
    }
@@ -263,7 +291,7 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const Accoun
    job->setKey(account.userId());

    // Handling of errors
-    connect(job, &QKeychain::Job::finished, this, [this, job]() {
+    connect(job, &QKeychain::Job::finished, this, [this, &account, job]() {
        if (job->error() == QKeychain::Error::NoError) {
            return;
        }
@@ -369,7 +397,11 @@ bool Controller::setAvatar(Connection *connection, const QUrl &avatarSource)
    User *localUser = connection->user();
    QString decoded = avatarSource.path();
    if (decoded.isEmpty()) {
+#ifdef QUOTIENT_07
        connection->callApi<SetAvatarUrlJob>(localUser->id(), avatarSource);
+#else
+        connection->callApi<SetAvatarUrlJob>(localUser->id(), QString());
+#endif
        return true;
    }
    if (QImageReader(decoded).read().isNull()) {
@@ -380,7 +412,11 @@ bool Controller::setAvatar(Connection *connection, const QUrl &avatarSource)
 }

 NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Omittable<QJsonObject> &auth)
+#ifdef QUOTIENT_07
    : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), "/_matrix/client/r0/account/password")
+#else
+    : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), QStringLiteral("/_matrix/client/r0/account/password"))
+#endif
 {
    QJsonObject _data;
    addParam<>(_data, QStringLiteral("new_password"), newPassword);
@@ -391,7 +427,11 @@ NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, b

 int Controller::accountCount() const
 {
-    return m_accountRegistry.count();
+#ifdef QUOTIENT_07
+    return Accounts.count();
+#else
+    return AccountRegistry::instance().count();
+#endif
 }

 void Controller::setQuitOnLastWindowClosed()
@@ -467,18 +507,17 @@ void Controller::setActiveConnection(Connection *connection)
    Q_EMIT activeAccountLabelChanged();
 }

-PushRuleModel *Controller::pushRuleModel() const
-{
-    return m_pushRuleModel;
-}
-
 void Controller::saveWindowGeometry()
 {
    WindowController::instance().saveGeometry();
 }

 NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth)
+#ifdef QUOTIENT_07
    : Quotient::BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId).toLatin1())
+#else
+    : Quotient::BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId))
+#endif
 {
    QJsonObject _data;
    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
@@ -584,7 +623,11 @@ bool Controller::hasWindowSystem() const

 bool Controller::encryptionSupported() const
 {
+#ifdef QUOTIENT_07
    return Quotient::encryptionSupported();
+#else
+    return false;
+#endif
 }

 void Controller::forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item)
@@ -625,16 +668,29 @@ void Controller::setApplicationProxy()

 int Controller::activeConnectionIndex() const
 {
-    auto result = std::find_if(m_accountRegistry.accounts().begin(), m_accountRegistry.accounts().end(), [this](const auto &it) {
+#ifdef QUOTIENT_07
+    auto result = std::find_if(Accounts.accounts().begin(), Accounts.accounts().end(), [this](const auto &it) {
        return it == m_connection;
    });
-    return result - m_accountRegistry.accounts().begin();
+    return result - Accounts.accounts().begin();
+#else
+    for (int i = 0; i < AccountRegistry::instance().rowCount(); i++) {
+        if (AccountRegistry::instance().data(AccountRegistry::instance().index(i, 0), AccountRegistry::UserIdRole).toString() == m_connection->userId()) {
+            return i;
+        }
+    }
+    return 0;
+#endif
 }

 int Controller::quotientMinorVersion() const
 {
-    // TODO libQuotient 0.7: Replace with version function from libQuotient
+// TODO libQuotient 0.7: Replace with version function from libQuotient
+#ifdef QUOTIENT_07
    return 7;
+#else
+    return 6;
+#endif
 }

 bool Controller::isFlatpak() const
@@ -680,10 +736,3 @@ QVariantList Controller::getSupportedRoomVersions(Quotient::Connection *connecti

    return supportedRoomVersions;
 }
-
-AccountRegistry &Controller::accounts()
-{
-    return m_accountRegistry;
-}
-
-#include "moc_controller.cpp"
--- a/src/controller.h
+++ b/src/controller.h
@@ -3,15 +3,13 @@

 #pragma once

-#include "models/pushrulemodel.h"
 #include <QObject>
 #include <QQuickItem>

 #include <KFormat>

-#include <Quotient/accountregistry.h>
-#include <Quotient/jobs/basejob.h>
-#include <Quotient/settings.h>
+#include <jobs/basejob.h>
+#include <settings.h>

 class NeoChatRoom;
 class NeoChatUser;
@@ -52,11 +50,6 @@ class Controller : public QObject
     */
    Q_PROPERTY(Quotient::Connection *activeConnection READ activeConnection WRITE setActiveConnection NOTIFY activeConnectionChanged)

-    /**
-     * @brief The PushRuleModel that has the active connection's push rules.
-     */
-    Q_PROPERTY(PushRuleModel *pushRuleModel READ pushRuleModel CONSTANT)
-
    /**
     * @brief The row number in the accounts directory of the active connection.
     */
@@ -117,7 +110,7 @@ public:
        Wrong, /**< The current password entered was wrong. */
        Other, /**< An unknown problem occurred. */
    };
-    Q_ENUM(PasswordStatus)
+    Q_ENUM(PasswordStatus);

    static Controller &instance();

@@ -126,8 +119,6 @@ public:
    void setActiveConnection(Quotient::Connection *connection);
    [[nodiscard]] Quotient::Connection *activeConnection() const;

-    [[nodiscard]] PushRuleModel *pushRuleModel() const;
-
    /**
     * @brief Add a new connection to the account registry.
     */
@@ -230,8 +221,6 @@ public:

    Q_INVOKABLE QVariantList getSupportedRoomVersions(Quotient::Connection *connection);

-    Quotient::AccountRegistry &accounts();
-
 private:
    explicit Controller(QObject *parent = nullptr);

@@ -247,9 +236,6 @@ private:

    bool hasWindowSystem() const;

-    QPointer<PushRuleModel> m_pushRuleModel;
-    Quotient::AccountRegistry m_accountRegistry;
-
 private Q_SLOTS:
    void invokeLogin();
    void showWindow();
--- a/src/delegatesizehelper.cpp
+++ b/src/delegatesizehelper.cpp
@@ -151,5 +151,3 @@ qreal DelegateSizeHelper::currentWidth() const
        return std::ceil(std::min(absoluteWidth, m_maxWidth));
    }
 }
-
-#include "moc_delegatesizehelper.cpp"
--- a/src/delegatesizehelper.h
+++ b/src/delegatesizehelper.h
@@ -77,7 +77,7 @@ class DelegateSizeHelper : public QObject
    Q_PROPERTY(qreal currentWidth READ currentWidth NOTIFY currentWidthChanged)

 public:
-    explicit DelegateSizeHelper(QObject *parent = nullptr);
+    DelegateSizeHelper(QObject *parent = nullptr);

    qreal parentWidth() const;
    void setParentWidth(qreal parentWidth);
--- a/src/events/imagepackevent.cpp
+++ b/src/events/imagepackevent.cpp
@@ -11,7 +11,11 @@ ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
    if (json.contains(QStringLiteral("pack"))) {
        pack = ImagePackEventContent::Pack{
            fromJson<Omittable<QString>>(json["pack"].toObject()["display_name"]),
+#ifdef QUOTIENT_07
            fromJson<Omittable<QUrl>>(json["pack"].toObject()["avatar_url"]),
+#else
+            QUrl(),
+#endif
            fromJson<Omittable<QStringList>>(json["pack"].toObject()["usage"]),
            fromJson<Omittable<QString>>(json["pack"].toObject()["attribution"]),
        };
@@ -23,13 +27,21 @@ ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
    for (const auto &k : keys) {
        Omittable<EventContent::ImageInfo> info;
        if (json["images"][k].toObject().contains(QStringLiteral("info"))) {
+#ifdef QUOTIENT_07
            info = EventContent::ImageInfo(QUrl(json["images"][k]["url"].toString()), json["images"][k]["info"].toObject(), k);
+#else
+            info = EventContent::ImageInfo(QUrl(json["images"][k]["url"].toString()), json["images"][k].toObject(), k);
+#endif
        } else {
            info = none;
        }
        images += ImagePackImage{
            k,
+#ifdef QUOTIENT_07
            fromJson<QUrl>(json["images"][k]["url"].toString()),
+#else
+            QUrl(),
+#endif
            fromJson<Omittable<QString>>(json["images"][k]["body"]),
            info,
            fromJson<Omittable<QStringList>>(json["images"][k]["usage"]),
--- a/src/events/imagepackevent.h
+++ b/src/events/imagepackevent.h
@@ -4,8 +4,8 @@
 #pragma once

 #include <QVector>
-#include <Quotient/events/eventcontent.h>
-#include <Quotient/events/stateevent.h>
+#include <events/eventcontent.h>
+#include <events/stateevent.h>

 namespace Quotient
 {
@@ -83,11 +83,23 @@ public:
 *
 * @sa Quotient::StateEvent, ImagePackEventContent
 */
+#ifdef QUOTIENT_07
 class ImagePackEvent : public KeyedStateEventBase<ImagePackEvent, ImagePackEventContent>
+#else
+class ImagePackEvent : public StateEvent<ImagePackEventContent>
+#endif
 {
 public:
+#ifdef QUOTIENT_07
    QUO_EVENT(ImagePackEvent, "im.ponies.room_emotes")
    using KeyedStateEventBase::KeyedStateEventBase;
+#else
+    DEFINE_EVENT_TYPEID("im.ponies.room_emotes", ImagePackEvent)
+    explicit ImagePackEvent(const QJsonObject &obj)
+        : StateEvent(typeId(), obj)
+    {
+    }
+#endif
 };

 REGISTER_EVENT_TYPE(ImagePackEvent)
--- a/src/events/joinrulesevent.h
+++ b/src/events/joinrulesevent.h
@@ -3,7 +3,7 @@

 #pragma once

-#include <Quotient/events/stateevent.h>
+#include <events/stateevent.h>

 namespace Quotient
 {
@@ -14,13 +14,25 @@ namespace Quotient
 *
 * @sa Quotient::StateEvent
 */
+#ifdef QUOTIENT_07
 class JoinRulesEvent : public StateEvent
+#else
+class JoinRulesEvent : public StateEventBase
+#endif
 {
 public:
+#ifdef QUOTIENT_07
    QUO_EVENT(JoinRulesEvent, "m.room.join_rules")
+#else
+    DEFINE_EVENT_TYPEID("m.room.join_rules", JoinRulesEvent)
+#endif

    explicit JoinRulesEvent(const QJsonObject &obj)
+#ifdef QUOTIENT_07
        : StateEvent(obj)
+#else
+        : StateEventBase(typeId(), obj)
+#endif
    {
    }

--- a/src/events/pollevent.h
+++ b/src/events/pollevent.h
@@ -3,7 +3,8 @@

 #pragma once

-#include <Quotient/events/roomevent.h>
+#include <events/eventcontent.h>
+#include <events/roomevent.h>

 namespace Quotient
 {
--- a/src/events/stickerevent.cpp
+++ b/src/events/stickerevent.cpp
@@ -0,0 +1,35 @@
+// SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#include "stickerevent.h"
+
+using namespace Quotient;
+
+StickerEvent::StickerEvent(const QJsonObject &obj)
+#ifdef QUOTIENT_07
+    : RoomEvent(obj)
+#else
+    : RoomEvent(typeId(), obj)
+#endif
+    , m_imageContent(EventContent::ImageContent(obj["content"_ls].toObject()))
+{
+}
+
+QString StickerEvent::body() const
+{
+    return content<QString>("body"_ls);
+}
+
+const EventContent::ImageContent &StickerEvent::image() const
+{
+    return m_imageContent;
+}
+
+QUrl StickerEvent::url() const
+{
+#ifdef QUOTIENT_07
+    return m_imageContent.url();
+#else
+    return m_imageContent.url;
+#endif
+}
--- a/src/events/stickerevent.h
+++ b/src/events/stickerevent.h
@@ -0,0 +1,55 @@
+// SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#pragma once
+
+#include <events/eventcontent.h>
+#include <events/roomevent.h>
+
+namespace Quotient
+{
+/**
+ * @class StickerEvent
+ *
+ * Class to define a sticker event.
+ *
+ * Sticker messages are specialised image messages that are displayed without
+ * controls (e.g. no "download" link, or light-box view on click, as would be
+ * displayed for for m.image events).
+ *
+ * @sa Quotient::RoomEvent
+ */
+class StickerEvent : public RoomEvent
+{
+public:
+#ifdef QUOTIENT_07
+    QUO_EVENT(StickerEvent, "m.sticker")
+#else
+    DEFINE_EVENT_TYPEID("m.sticker", StickerEvent)
+#endif
+
+    explicit StickerEvent(const QJsonObject &obj);
+
+    /**
+     * @brief A textual representation or associated description of the sticker image.
+     *
+     * This could be the alt text of the original image, or a message to accompany
+     * and further describe the sticker.
+     */
+    QString body() const;
+
+    /**
+     * @brief Metadata about the image referred to in url including a thumbnail representation.
+     */
+    const EventContent::ImageContent &image() const;
+
+    /**
+     * @brief The URL to the sticker image. This must be a valid mxc:// URI.
+     */
+    QUrl url() const;
+
+private:
+    EventContent::ImageContent m_imageContent;
+};
+REGISTER_EVENT_TYPE(StickerEvent)
+}
--- a/src/filetransferpseudojob.cpp
+++ b/src/filetransferpseudojob.cpp
@@ -14,7 +14,7 @@ FileTransferPseudoJob::FileTransferPseudoJob(Operation operation, const QString
 {
 }

-void FileTransferPseudoJob::fileTransferProgress(const QString &id, qint64 progress, qint64 total)
+void FileTransferPseudoJob::fileTransferProgress(QString id, qint64 progress, qint64 total)
 {
    if (id != m_eventId) {
        return;
@@ -23,7 +23,7 @@ void FileTransferPseudoJob::fileTransferProgress(const QString &id, qint64 progr
    setTotalAmount(Unit::Bytes, total);
 }

-void FileTransferPseudoJob::fileTransferCompleted(const QString &id, const QUrl &localFile)
+void FileTransferPseudoJob::fileTransferCompleted(QString id, QUrl localFile)
 {
    Q_UNUSED(localFile);
    if (id != m_eventId) {
@@ -32,7 +32,7 @@ void FileTransferPseudoJob::fileTransferCompleted(const QString &id, const QUrl
    emitResult();
 }

-void FileTransferPseudoJob::fileTransferFailed(const QString &id, const QString &errorMessage)
+void FileTransferPseudoJob::fileTransferFailed(QString id, QString errorMessage)
 {
    if (id != m_eventId) {
        return;
--- a/src/filetransferpseudojob.h
+++ b/src/filetransferpseudojob.h
@@ -20,23 +20,23 @@ public:
        Download,
        Upload,
    };
-    Q_ENUM(Operation)
+    Q_ENUM(Operation);
    FileTransferPseudoJob(Operation operation, const QString &srcDest, const QString &path);

    /**
     * @brief Set the current number of bytes transferred.
     */
-    void fileTransferProgress(const QString &id, qint64 progress, qint64 total);
+    void fileTransferProgress(QString id, qint64 progress, qint64 total);

    /**
     * @brief Set the file transfer as complete.
     */
-    void fileTransferCompleted(const QString &id, const QUrl &localFile);
+    void fileTransferCompleted(QString id, QUrl localFile);

    /**
     * @brief Set the file transfer as failed.
     */
-    void fileTransferFailed(const QString &id, const QString &errorMessage = {});
+    void fileTransferFailed(QString id, QString errorMessage = {});

    /**
     * @brief Start the file transfer.
--- a/src/filetypesingleton.cpp
+++ b/src/filetypesingleton.cpp
@@ -112,5 +112,3 @@ QStringList FileTypeSingleton::supportedAnimatedImageFormats() const
    Q_D(const FileTypeSingleton);
    return d->supportedAnimatedImageFormats;
 }
-
-#include "moc_filetypesingleton.cpp"
--- a/src/filetypesingleton.h
+++ b/src/filetypesingleton.h
@@ -5,7 +5,6 @@

 #pragma once

-#include <QFileInfo>
 #include <QMimeDatabase>
 #include <QObject>
 #include <qqml.h>
--- a/src/linkpreviewer.cpp
+++ b/src/linkpreviewer.cpp
@@ -3,16 +3,14 @@

 #include "linkpreviewer.h"

-#include "controller.h"
-
-#include <Quotient/connection.h>
-#include <Quotient/csapi/content-repo.h>
+#include <connection.h>
+#include <csapi/content-repo.h>

 #include "neochatroom.h"

 using namespace Quotient;

-LinkPreviewer::LinkPreviewer(QObject *parent, NeoChatRoom *room, const QUrl &url)
+LinkPreviewer::LinkPreviewer(QObject *parent, NeoChatRoom *room, QUrl url)
    : QObject(parent)
    , m_currentRoom(room)
    , m_loaded(false)
@@ -71,7 +69,14 @@ void LinkPreviewer::loadUrlPreview()

            auto imageUrl = QUrl(json["og:image"].toString());
            if (imageUrl.isValid() && imageUrl.scheme() == QStringLiteral("mxc")) {
+#ifdef QUOTIENT_07
                m_imageSource = conn->makeMediaUrl(imageUrl);
+#else
+                QUrlQuery q(imageUrl.query());
+                q.addQueryItem(QStringLiteral("user_id"), conn->userId());
+                imageUrl.setQuery(q);
+                m_imageSource = imageUrl;
+#endif
            } else {
                m_imageSource = QUrl();
            }
@@ -84,5 +89,3 @@ void LinkPreviewer::loadUrlPreview()
        });
    }
 }
-
-#include "moc_linkpreviewer.cpp"
--- a/src/linkpreviewer.h
+++ b/src/linkpreviewer.h
@@ -45,7 +45,7 @@ class LinkPreviewer : public QObject
    Q_PROPERTY(QUrl imageSource READ imageSource NOTIFY imageSourceChanged)

 public:
-    explicit LinkPreviewer(QObject *parent = nullptr, NeoChatRoom *room = nullptr, const QUrl &url = {});
+    explicit LinkPreviewer(QObject *parent = nullptr, NeoChatRoom *room = nullptr, QUrl url = {});

    [[nodiscard]] QUrl url() const;
    void setUrl(QUrl);
--- a/src/locationhelper.cpp
+++ b/src/locationhelper.cpp
@@ -42,5 +42,3 @@ float LocationHelper::zoomToFit(const QRectF &r, float mapWidth, float mapHeight

    return std::clamp(z, 5.0, 18.0);
 }
-
-#include "moc_locationhelper.cpp"
--- a/src/locationhelper.h
+++ b/src/locationhelper.h
@@ -1,6 +1,5 @@
 // SPDX-FileCopyrightText: 2023 Volker Krause <vkrause@kde.org>
 // SPDX-License-Identifier: LGPL-2.0-or-later
-#pragma once

 #include "linkpreviewer.h"
 #include <QMetaType>
--- a/src/login.cpp
+++ b/src/login.cpp
@@ -3,9 +3,14 @@

 #include "login.h"

-#include <Quotient/accountregistry.h>
-#include <Quotient/connection.h>
-#include <Quotient/qt_connection_util.h>
+#ifdef QUOTIENT_07
+#include <accountregistry.h>
+#else
+#include "neochataccountregistry.h"
+#endif
+
+#include <connection.h>
+#include <qt_connection_util.h>

 #include "controller.h"

@@ -42,7 +47,11 @@ void Login::init()
            return;
        }

-        m_isLoggedIn = Controller::instance().accounts().isLoggedIn(m_matrixId);
+#ifdef QUOTIENT_07
+        m_isLoggedIn = Accounts.isLoggedIn(m_matrixId);
+#else
+        m_isLoggedIn = AccountRegistry::instance().isLoggedIn(m_matrixId);
+#endif
        Q_EMIT isLoggedInChanged();
        if (m_isLoggedIn) {
            return;
@@ -96,7 +105,7 @@ void Login::init()
        Q_EMIT Controller::instance().globalErrorOccured(i18n("Network Error"), std::move(error));
    });

-    connectSingleShot(m_connection, &Connection::syncDone, this, []() {
+    connectSingleShot(m_connection, &Connection::syncDone, this, [this]() {
        Q_EMIT Controller::instance().initiated();
    });
 }
@@ -198,5 +207,3 @@ bool Login::isLoggedIn() const
 {
    return m_isLoggedIn;
 }
-
-#include "moc_login.cpp"
--- a/src/login.h
+++ b/src/login.h
@@ -112,7 +112,7 @@ Q_SIGNALS:
    void loginFlowsChanged();
    void ssoUrlChanged();
    void connected();
-    void errorOccured(const QString &message);
+    void errorOccured(QString message);
    void testingChanged();
    void isLoggingInChanged();
    void isLoggedInChanged();
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,11 +28,15 @@

 #include "neochat-version.h"

-#include <Quotient/keyverificationsession.h>
-#include <Quotient/accountregistry.h>
-#include <Quotient/networkaccessmanager.h>
-#include <Quotient/room.h>
-#include <Quotient/util.h>
+#ifdef QUOTIENT_07
+#include <accountregistry.h>
+#else
+#include "neochataccountregistry.h"
+#endif
+
+#include <networkaccessmanager.h>
+#include <room.h>
+#include <util.h>

 #include "actionshandler.h"
 #include "blurhashimageprovider.h"
@@ -50,25 +54,21 @@
 #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"
+#include "models/keywordnotificationrulemodel.h"
 #include "models/livelocationsmodel.h"
 #include "models/locationsmodel.h"
-#include "models/mediamessagefiltermodel.h"
 #include "models/messageeventmodel.h"
 #include "models/messagefiltermodel.h"
 #include "models/publicroomlistmodel.h"
-#include "models/pushrulemodel.h"
 #include "models/reactionmodel.h"
 #include "models/roomlistmodel.h"
 #include "models/searchmodel.h"
 #include "models/serverlistmodel.h"
 #include "models/sortfilterroomlistmodel.h"
 #include "models/sortfilterspacelistmodel.h"
-#include "models/statefiltermodel.h"
-#include "models/stickermodel.h"
 #include "models/userdirectorylistmodel.h"
 #include "models/userfiltermodel.h"
 #include "models/userlistmodel.h"
@@ -77,12 +77,18 @@
 #include "neochatroom.h"
 #include "neochatuser.h"
 #include "notificationsmanager.h"
+#ifdef QUOTIENT_07
 #include "pollhandler.h"
+#endif
+#include "models/statefiltermodel.h"
+#include "models/stickermodel.h"
 #include "roommanager.h"
 #include "spacehierarchycache.h"
 #include "urlhelper.h"
 #include "windowcontroller.h"
-
+#ifdef QUOTIENT_07
+#include <keyverificationsession.h>
+#endif
 #ifdef HAVE_COLORSCHEME
 #include "colorschemer.h"
 #endif
@@ -122,9 +128,7 @@ Q_DECL_EXPORT
 #endif
 int main(int argc, char *argv[])
 {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif

    QNetworkProxyFactory::setUseSystemConfiguration(true);

@@ -172,10 +176,14 @@ int main(int argc, char *argv[])

    about.addComponent(QStringLiteral("libQuotient"),
                       i18n("A Qt5 library to write cross-platform clients for Matrix"),
+#ifdef QUOTIENT_07
                       i18nc("<version number> (built against <possibly different version number>)",
                             "%1 (built against %2)",
                             Quotient::versionString(),
                             QStringLiteral(Quotient_VERSION_STRING)),
+#else
+                       QStringLiteral(QUOTIENT_VERSION),
+#endif
                       QStringLiteral("https://github.com/quotient-im/libquotient"),
                       KAboutLicense::LGPL_V2_1);

@@ -184,12 +192,6 @@ 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
    // app's config dir:
@@ -220,7 +222,11 @@ 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", &Controller::instance().accounts());
+#ifdef QUOTIENT_07
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "AccountRegistry", &Quotient::Accounts);
+#else
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "AccountRegistry", &Quotient::AccountRegistry::instance());
+#endif
    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");
@@ -231,7 +237,6 @@ int main(int argc, char *argv[])
    qmlRegisterType<MessageEventModel>("org.kde.neochat", 1, 0, "MessageEventModel");
    qmlRegisterType<ReactionModel>("org.kde.neochat", 1, 0, "ReactionModel");
    qmlRegisterType<CollapseStateProxyModel>("org.kde.neochat", 1, 0, "CollapseStateProxyModel");
-    qmlRegisterType<MediaMessageFilterModel>("org.kde.neochat", 1, 0, "MediaMessageFilterModel");
    qmlRegisterType<MessageFilterModel>("org.kde.neochat", 1, 0, "MessageFilterModel");
    qmlRegisterType<UserFilterModel>("org.kde.neochat", 1, 0, "UserFilterModel");
    qmlRegisterType<PublicRoomListModel>("org.kde.neochat", 1, 0, "PublicRoomListModel");
@@ -240,7 +245,6 @@ 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");
@@ -248,16 +252,16 @@ int main(int argc, char *argv[])
    qmlRegisterType<SearchModel>("org.kde.neochat", 1, 0, "SearchModel");
    qmlRegisterType<LiveLocationsModel>("org.kde.neochat", 1, 0, "LiveLocationsModel");
    qmlRegisterType<LocationsModel>("org.kde.neochat", 1, 0, "LocationsModel");
+#ifdef QUOTIENT_07
    qmlRegisterType<PollHandler>("org.kde.neochat", 1, 0, "PollHandler");
-    qmlRegisterType<PushRuleModel>("org.kde.neochat", 1, 0, "PushRuleModel");
+#endif
+    qmlRegisterType<KeywordNotificationRuleModel>("org.kde.neochat", 1, 0, "KeywordNotificationRuleModel");
    qmlRegisterType<StickerModel>("org.kde.neochat", 1, 0, "StickerModel");
    qmlRegisterType<ImagePacksModel>("org.kde.neochat", 1, 0, "ImagePacksModel");
    qmlRegisterType<AccountEmoticonModel>("org.kde.neochat", 1, 0, "AccountEmoticonModel");
    qmlRegisterType<EmoticonFilterModel>("org.kde.neochat", 1, 0, "EmoticonFilterModel");
    qmlRegisterType<DelegateSizeHelper>("org.kde.neochat", 1, 0, "DelegateSizeHelper");
    qmlRegisterUncreatableType<RoomMessageEvent>("org.kde.neochat", 1, 0, "RoomMessageEvent", "ENUM");
-    qmlRegisterUncreatableType<PushNotificationKind>("org.kde.neochat", 1, 0, "PushNotificationKind", "ENUM");
-    qmlRegisterUncreatableType<PushNotificationSection>("org.kde.neochat", 1, 0, "PushNotificationSection", "ENUM");
    qmlRegisterUncreatableType<PushNotificationState>("org.kde.neochat", 1, 0, "PushNotificationState", "ENUM");
    qmlRegisterUncreatableType<PushNotificationAction>("org.kde.neochat", 1, 0, "PushNotificationAction", "ENUM");
    qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM");
@@ -274,10 +278,12 @@ int main(int argc, char *argv[])
    qRegisterMetaType<NeoChatUser *>("NeoChatUser*");
    qRegisterMetaType<GetRoomEventsJob *>("GetRoomEventsJob*");
    qRegisterMetaType<QMimeType>("QMimeType");
+#ifdef QUOTIENT_07
 #ifdef Quotient_E2EE_ENABLED
    qRegisterMetaType<KeyVerificationSession *>("KeyVerificationSession*");
    qmlRegisterUncreatableType<KeyVerificationSession>("org.kde.neochat", 1, 0, "KeyVerificationSession", {});
    qRegisterMetaType<QVector<EmojiEntry>>("QVector<EmojiEntry>");
+#endif
 #endif
    qmlRegisterSingletonType("org.kde.neochat", 1, 0, "About", [](QQmlEngine *engine, QJSEngine *) -> QJSValue {
        return engine->toScriptValue(KAboutData::applicationData());
--- a/src/matriximageprovider.cpp
+++ b/src/matriximageprovider.cpp
@@ -13,7 +13,7 @@
 #include <KLocalizedString>

 #include "controller.h"
-#include <Quotient/connection.h>
+#include <connection.h>

 using namespace Quotient;

@@ -32,17 +32,11 @@ ThumbnailResponse::ThumbnailResponse(QString id, QSize size)
        requestedSize.setWidth(100);
    }
    if (mediaId.count('/') != 1) {
-        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;
-        }
+        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;
@@ -120,5 +114,3 @@ QQuickImageResponse *MatrixImageProvider::requestImageResponse(const QString &id
 {
    return new ThumbnailResponse(id, requestedSize);
 }
-
-#include "moc_matriximageprovider.cpp"
--- a/src/matriximageprovider.h
+++ b/src/matriximageprovider.h
@@ -6,7 +6,7 @@

 #include <QQuickAsyncImageProvider>

-#include <Quotient/jobs/mediathumbnailjob.h>
+#include <jobs/mediathumbnailjob.h>

 #include <QReadWriteLock>

@@ -26,7 +26,7 @@ class ThumbnailResponse : public QQuickImageResponse
 {
    Q_OBJECT
 public:
-    explicit ThumbnailResponse(QString mediaId, QSize requestedSize);
+    ThumbnailResponse(QString mediaId, QSize requestedSize);
    ~ThumbnailResponse() override = default;

 private Q_SLOTS:
@@ -34,7 +34,7 @@ private Q_SLOTS:
    void prepareResult();

 private:
-    QString mediaId;
+    const QString mediaId;
    QSize requestedSize;
    const QString localFile;
    Quotient::MediaThumbnailJob *job = nullptr;
--- a/src/models/accountemoticonmodel.cpp
+++ b/src/models/accountemoticonmodel.cpp
@@ -3,7 +3,7 @@

 #include "accountemoticonmodel.h"

-#include <Quotient/csapi/content-repo.h>
+#include <csapi/content-repo.h>
 #include <qcoro/qcorosignal.h>

 using namespace Quotient;
@@ -27,7 +27,11 @@ QVariant AccountEmoticonModel::data(const QModelIndex &index, int role) const
    const auto &row = index.row();
    const auto &image = m_images->images[row];
    if (role == UrlRole) {
+#ifdef QUOTIENT_07
        return m_connection->makeMediaUrl(image.url);
+#else
+        return QUrl();
+#endif
    }
    if (role == BodyRole) {
        if (image.body) {
@@ -138,7 +142,11 @@ QCoro::Task<void> AccountEmoticonModel::doSetEmoticonImage(int index, QUrl sourc
    if (job->error() != BaseJob::NoError) {
        co_return;
    }
+#ifdef QUOTIENT_07
    m_images->images[index].url = job->contentUri().toString();
+#else
+    m_images->images[index].url = job->contentUri();
+#endif
    m_images->images[index].info = none;
    QJsonObject data;
    m_images->fillJson(&data);
@@ -168,5 +176,3 @@ void AccountEmoticonModel::addEmoticon(const QUrl &source, const QString &shortc
 {
    doAddEmoticon(source, shortcode, description, type);
 }
-
-#include "moc_accountemoticonmodel.cpp"
--- a/src/models/accountemoticonmodel.h
+++ b/src/models/accountemoticonmodel.h
@@ -4,14 +4,12 @@
 #pragma once

 #include "events/imagepackevent.h"
-
 #include <QAbstractListModel>
 #include <QCoroTask>
 #include <QObject>
 #include <QPointer>
 #include <QVector>
-
-#include <Quotient/connection.h>
+#include <connection.h>

 class ImagePacksModel;

--- a/src/models/actionsmodel.cpp
+++ b/src/models/actionsmodel.cpp
@@ -6,8 +6,8 @@
 #include "controller.h"
 #include "neochatroom.h"
 #include "roommanager.h"
-#include <Quotient/events/roommemberevent.h>
-#include <Quotient/events/roompowerlevelsevent.h>
+#include <events/roommemberevent.h>
+#include <events/roompowerlevelsevent.h>

 #include <KLocalizedString>

@@ -191,6 +191,7 @@ 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();
            }
+#ifdef QUOTIENT_07
            const RoomMemberEvent *roomMemberEvent = room->currentState().get<RoomMemberEvent>(text);
            if (roomMemberEvent && roomMemberEvent->membership() == Membership::Invite) {
                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is already invited to this room.", "%1 is already invited to this room.", text));
@@ -200,6 +201,7 @@ QVector<ActionsModel::Action> actions{
                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is banned from this room.", "%1 is banned from this room.", text));
                return QString();
            }
+#endif
            if (room->localUser()->id() == text) {
                Q_EMIT room->showMessage(NeoChatRoom::Positive, i18n("You are already in this room."));
                return QString();
@@ -241,6 +243,7 @@ QVector<ActionsModel::Action> actions{
        kli18n("<room alias or id>"),
        kli18n("Joins the given room"),
    },
+#ifdef QUOTIENT_07
    Action{
        QStringLiteral("knock"),
        [](const QString &text, NeoChatRoom *room) {
@@ -273,6 +276,7 @@ QVector<ActionsModel::Action> actions{
        kli18n("<room alias or id> [<reason>]"),
        kli18n("Requests to join the given room"),
    },
+#endif
    Action{
        QStringLiteral("j"),
        [](const QString &text, NeoChatRoom *room) {
@@ -431,15 +435,14 @@ 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();
            }
+#ifdef QUOTIENT_07
            auto state = room->currentState().get<RoomMemberEvent>(parts[0]);
            if (state && state->membership() == Membership::Ban) {
                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->currentState().get<RoomPowerLevelsEvent>();
-            if (!plEvent) {
-                return QString();
-            }
+#endif
+            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
            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();
@@ -469,19 +472,18 @@ 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->currentState().get<RoomPowerLevelsEvent>();
-            if (!plEvent) {
-                return QString();
-            }
+            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
            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();
            }
+#ifdef QUOTIENT_07
            auto state = room->currentState().get<RoomMemberEvent>(text);
            if (state && state->membership() != Membership::Ban) {
                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is not banned from this room.", "%1 is not banned from this room.", text));
                return QString();
            }
+#endif
            room->unban(text);
            Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> was unbanned from this room.", "%1 was unbanned from this room.", text));

@@ -508,14 +510,13 @@ QVector<ActionsModel::Action> actions{
                Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You cannot kick yourself from the room."));
                return QString();
            }
+#ifdef QUOTIENT_07
            if (!room->isMember(parts[0])) {
                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->currentState().get<RoomPowerLevelsEvent>();
-            if (!plEvent) {
-                return QString();
-            }
+#endif
+            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
            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."));
--- a/src/models/actionsmodel.h
+++ b/src/models/actionsmodel.h
@@ -5,7 +5,7 @@

 #include <KLazyLocalizedString>
 #include <QAbstractListModel>
-#include <Quotient/events/roommessageevent.h>
+#include <events/roommessageevent.h>

 class NeoChatRoom;

@@ -61,7 +61,7 @@ public:
        CompletionType, /**< The completion type (always "action" for this model). */
        Parameters, /**< The input parameters expected by the action. */
    };
-    Q_ENUM(Roles)
+    Q_ENUM(Roles);

    /**
     * @brief Get the given role value at the given index.
--- a/src/models/collapsestateproxymodel.cpp
+++ b/src/models/collapsestateproxymodel.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #include "collapsestateproxymodel.h"
+#include "messageeventmodel.h"

 #include <KLocalizedString>

@@ -81,7 +82,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().toHtmlEscaped());
+                                                                 uniqueAuthors[0].toMap()["displayName"].toString());
        text += userText;
        text += chunks.takeFirst();

@@ -173,5 +174,3 @@ QString CollapseStateProxyModel::excessAuthors(int row) const
        return QStringLiteral("+ %1").arg(excessAuthors);
    }
 }
-
-#include "moc_collapsestateproxymodel.cpp"
--- a/src/models/collapsestateproxymodel.h
+++ b/src/models/collapsestateproxymodel.h
@@ -27,7 +27,6 @@ public:
        StateEventsRole, /**< List of state events in the aggregated state. */
        AuthorListRole, /**< List of the first 5 unique authors of the aggregated state event. */
        ExcessAuthorsRole, /**< The number of unique authors beyond the first 5. */
-        LastRole, // Keep this last
    };

    /**
--- a/src/models/completionmodel.cpp
+++ b/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 == DisplayNameRole) {
+        if (role == Text) {
            return m_filterModel->data(filterIndex, UserListModel::DisplayNameRole);
        }
-        if (role == SubtitleRole) {
+        if (role == Subtitle) {
            return m_filterModel->data(filterIndex, UserListModel::UserIdRole);
        }
-        if (role == IconNameRole) {
+        if (role == Icon) {
            return m_filterModel->data(filterIndex, UserListModel::AvatarRole);
        }
    }

    if (m_autoCompletionType == Command) {
-        if (role == DisplayNameRole) {
+        if (role == Text) {
            return m_filterModel->data(filterIndex, ActionsModel::Prefix).toString() + QStringLiteral(" ")
                + m_filterModel->data(filterIndex, ActionsModel::Parameters).toString();
        }
-        if (role == SubtitleRole) {
+        if (role == Subtitle) {
            return m_filterModel->data(filterIndex, ActionsModel::Description);
        }
-        if (role == IconNameRole) {
+        if (role == Icon) {
            return QStringLiteral("invalid");
        }
-        if (role == ReplacedTextRole) {
+        if (role == ReplacedText) {
            return m_filterModel->data(filterIndex, ActionsModel::Prefix);
        }
    }
    if (m_autoCompletionType == Room) {
-        if (role == DisplayNameRole) {
+        if (role == Text) {
            return m_filterModel->data(filterIndex, RoomListModel::DisplayNameRole);
        }
-        if (role == SubtitleRole) {
+        if (role == Subtitle) {
            return m_filterModel->data(filterIndex, RoomListModel::CanonicalAliasRole);
        }
-        if (role == IconNameRole) {
+        if (role == Icon) {
            return m_filterModel->data(filterIndex, RoomListModel::AvatarRole);
        }
    }
    if (m_autoCompletionType == Emoji) {
-        if (role == DisplayNameRole) {
+        if (role == Text) {
            return m_filterModel->data(filterIndex, CustomEmojiModel::DisplayRole);
        }
-        if (role == IconNameRole) {
+        if (role == Icon) {
            return m_filterModel->data(filterIndex, CustomEmojiModel::MxcUrl);
        }
-        if (role == ReplacedTextRole) {
+        if (role == ReplacedText) {
            return m_filterModel->data(filterIndex, CustomEmojiModel::ReplacedTextRole);
        }
-        if (role == SubtitleRole) {
+        if (role == Subtitle) {
            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 {
-        {DisplayNameRole, "displayName"},
-        {SubtitleRole, "subtitle"},
-        {IconNameRole, "iconName"},
-        {ReplacedTextRole, "replacedText"},
+        {Text, "text"},
+        {Subtitle, "subtitle"},
+        {Icon, "icon"},
+        {ReplacedText, "replacedText"},
    };
 }

@@ -193,5 +193,3 @@ void CompletionModel::setRoomListModel(RoomListModel *roomListModel)
    m_roomListModel = roomListModel;
    Q_EMIT roomListModelChanged();
 }
-
-#include "moc_completionmodel.cpp"
--- a/src/models/completionmodel.h
+++ b/src/models/completionmodel.h
@@ -64,14 +64,14 @@ public:
     * @brief Defines the model roles.
     */
    enum Roles {
-        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. */
+        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. */
    };
-    Q_ENUM(Roles)
+    Q_ENUM(Roles);

-    explicit CompletionModel(QObject *parent = nullptr);
+    CompletionModel(QObject *parent = nullptr);

    /**
     * @brief Get the given role value at the given index.
--- a/src/models/completionproxymodel.cpp
+++ b/src/models/completionproxymodel.cpp
@@ -59,5 +59,3 @@ void CompletionProxyModel::setFullText(const QString &fullText)
 {
    m_fullText = fullText;
 }
-
-#include "moc_completionproxymodel.cpp"
--- a/src/models/customemojimodel.cpp
+++ b/src/models/customemojimodel.cpp
@@ -9,9 +9,10 @@
 #include "controller.h"
 #include "emojimodel.h"

-#include <Quotient/connection.h>
-#include <Quotient/csapi/account-data.h>
-#include <Quotient/csapi/content-repo.h>
+#include <connection.h>
+#include <csapi/account-data.h>
+#include <csapi/content-repo.h>
+#include <events/eventcontent.h>

 using namespace Quotient;

@@ -61,7 +62,11 @@ void CustomEmojiModel::addEmoji(const QString &name, const QUrl &location)
        auto emojiData = json["images"].toObject();

        QString url;
+#ifdef QUOTIENT_07
        url = job->contentUri().toString();
+#else
+        url = job->contentUri();
+#endif

        QImage image(location.toLocalFile());
        QJsonObject imageInfo;
@@ -203,5 +208,3 @@ QVariantList CustomEmojiModel::filterModel(const QString &filter)
    }
    return results;
 }
-
-#include "moc_customemojimodel.cpp"
--- a/src/models/customemojimodel.h
+++ b/src/models/customemojimodel.h
@@ -41,7 +41,7 @@ public:
        ReplacedTextRole = 52, /**< The name of the emoji. For compatibility with EmojiModel. */
        DescriptionRole = 53, /**< Invalid, reserved. For compatibility with EmojiModel. */
    };
-    Q_ENUM(Roles)
+    Q_ENUM(Roles);

    static CustomEmojiModel &instance()
    {
--- a/src/models/devicesmodel.cpp
+++ b/src/models/devicesmodel.cpp
@@ -3,22 +3,23 @@

 #include "devicesmodel.h"

+#include <csapi/device_management.h>
+
 #include "controller.h"
-
-#include <QDateTime>
-#include <QLocale>
-
-#include <KLocalizedString>
-
-#include <Quotient/csapi/device_management.h>
-#include <Quotient/connection.h>
-#include <Quotient/user.h>
+#include <connection.h>
+#include <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()
@@ -29,7 +30,6 @@ void DevicesModel::fetchDevices()
            beginResetModel();
            m_devices = job->devices();
            endResetModel();
-            Q_EMIT countChanged();
        });
    }
 }
@@ -40,43 +40,16 @@ QVariant DevicesModel::data(const QModelIndex &index, int role) const
        return {};
    }

-    const auto &device = m_devices[index.row()];
-
    switch (role) {
    case Id:
-        return device.deviceId;
+        return m_devices[index.row()].deviceId;
    case DisplayName:
-        return device.displayName;
+        return m_devices[index.row()].displayName;
    case LastIp:
-        return device.lastSeenIp;
+        return m_devices[index.row()].lastSeenIp;
    case LastTimestamp:
-        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
+        if (m_devices[index.row()].lastSeenTs)
+            return *m_devices[index.row()].lastSeenTs;
    }
    return {};
 }
@@ -89,22 +62,11 @@ int DevicesModel::rowCount(const QModelIndex &parent) const

 QHash<int, QByteArray> DevicesModel::roleNames() const
 {
-    return {
-        {Id, "id"},
-        {DisplayName, "displayName"},
-        {LastIp, "lastIp"},
-        {LastTimestamp, "lastTimestamp"},
-        {TimestampString, "timestamp"},
-        {Type, "type"},
-    };
+    return {{Id, "id"}, {DisplayName, "displayName"}, {LastIp, "lastIp"}, {LastTimestamp, "lastTimestamp"}};
 }

-void DevicesModel::logout(const QString &deviceId, const QString &password)
+void DevicesModel::logout(int index, 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] {
@@ -112,7 +74,6 @@ void DevicesModel::logout(const QString &deviceId, const QString &password)
            beginRemoveRows(QModelIndex(), index, index);
            m_devices.remove(index);
            endRemoveRows();
-            Q_EMIT countChanged();
        };
        if (job->error() != BaseJob::Success) {
            QJsonObject replyData = job->jsonData();
@@ -130,11 +91,8 @@ void DevicesModel::logout(const QString &deviceId, const QString &password)
    });
 }

-void DevicesModel::setName(const QString &deviceId, const QString &name)
+void DevicesModel::setName(int index, 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();
@@ -149,29 +107,5 @@ void DevicesModel::setName(const QString &deviceId, const QString &name)

 Connection *DevicesModel::connection() const
 {
-    return m_connection;
+    return Controller::instance().activeConnection();
 }
-
-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"
--- a/src/models/devicesmodel.h
+++ b/src/models/devicesmodel.h
@@ -4,9 +4,8 @@
 #pragma once

 #include <QAbstractListModel>
-#include <QPointer>

-#include <Quotient/csapi/definitions/client_device.h>
+#include <csapi/definitions/client_device.h>

 namespace Quotient
 {
@@ -29,7 +28,7 @@ class DevicesModel : public QAbstractListModel
    /**
     * @brief The current connection that the model is getting its devices from.
     */
-    Q_PROPERTY(Quotient::Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged REQUIRED)
+    Q_PROPERTY(Quotient::Connection *connection READ connection NOTIFY connectionChanged)

 public:
    /**
@@ -40,18 +39,10 @@ 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)
+    Q_ENUM(Roles);

-    enum DeviceType {
-        This,
-        Verified,
-        Unverified,
-        Unencrypted,
-    };
-    Q_ENUM(DeviceType);
+    DevicesModel(QObject *parent = nullptr);

    /**
     * @brief Get the given role value at the given index.
@@ -75,27 +66,21 @@ public:
    QHash<int, QByteArray> roleNames() const override;

    /**
-     * @brief Logout the device with the given id.
+     * @brief Logout the device at the given index.
     */
-    Q_INVOKABLE void logout(const QString &deviceId, const QString &password);
+    Q_INVOKABLE void logout(int index, const QString &password);

    /**
-     * @brief Set the display name of the device with the given id.
+     * @brief Set the display name of the device at the given index.
     */
-    Q_INVOKABLE void setName(const QString &deviceId, const QString &name);
+    Q_INVOKABLE void setName(int index, const QString &name);

-    explicit DevicesModel(QObject *parent = nullptr);
-
-
-    [[nodiscard]] Quotient::Connection *connection() const;
-    void setConnection(Quotient::Connection *connection);
+    Quotient::Connection *connection() const;

 Q_SIGNALS:
    void connectionChanged();
-    void countChanged();

 private:
    void fetchDevices();
    QVector<Quotient::Device> m_devices;
-    QPointer<Quotient::Connection> m_connection;
 };
--- a/src/models/devicesproxymodel.cpp
+++ b/src/models/devicesproxymodel.cpp
@@ -1,30 +0,0 @@
-// 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"
--- a/src/models/devicesproxymodel.h
+++ b/src/models/devicesproxymodel.h
@@ -1,25 +0,0 @@
-// 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;
-};
--- a/src/models/emojimodel.cpp
+++ b/src/models/emojimodel.cpp
@@ -216,5 +216,3 @@ QVariantList EmojiModel::categoriesWithCustom() const
    ;
    return cats;
 }
-
-#include "moc_emojimodel.cpp"
--- a/src/models/emojimodel.h
+++ b/src/models/emojimodel.h
@@ -95,7 +95,7 @@ public:
        ReplacedTextRole = 52, /**< The text to replace the short name with (i.e. the unicode character). */
        DescriptionRole = 53, /**< The long description of an emoji. */
    };
-    Q_ENUM(RoleNames)
+    Q_ENUM(RoleNames);

    /**
     * @brief Defines the potential categories an emoji can be placed in.
--- a/src/models/emoticonfiltermodel.cpp
+++ b/src/models/emoticonfiltermodel.cpp
@@ -53,5 +53,3 @@ void EmoticonFilterModel::setShowEmojis(bool showEmojis)
    endResetModel();
    Q_EMIT showEmojisChanged();
 }
-
-#include "moc_emoticonfiltermodel.cpp"
--- a/src/models/emoticonfiltermodel.h
+++ b/src/models/emoticonfiltermodel.h
@@ -1,8 +1,6 @@
 // SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later

-#pragma once
-
 #include <QSortFilterProxyModel>

 /**
--- a/src/models/imagepacksmodel.cpp
+++ b/src/models/imagepacksmodel.cpp
@@ -33,9 +33,13 @@ QVariant ImagePacksModel::data(const QModelIndex &index, int role) const
    }
    if (role == AvatarUrlRole) {
        if (event.pack->avatarUrl) {
+#ifdef QUOTIENT_07
            return m_room->connection()->makeMediaUrl(*event.pack->avatarUrl);
+#endif
        } else if (!event.images.empty()) {
+#ifdef QUOTIENT_07
            return m_room->connection()->makeMediaUrl(event.images[0].url);
+#endif
        }
    }
    return {};
@@ -102,6 +106,7 @@ void ImagePacksModel::reloadImages()
            auto packs = rooms[roomId].toObject();
            const auto &stickerRoom = m_room->connection()->room(roomId);
            for (const auto &packKey : packs.keys()) {
+#ifdef QUOTIENT_07
                if (const auto &pack = stickerRoom->currentState().get<ImagePackEvent>(packKey)) {
                    const auto packContent = pack->content();
                    if ((!packContent.pack || !packContent.pack->usage || (packContent.pack->usage->contains("emoticon") && showEmoticons())
@@ -110,9 +115,11 @@ void ImagePacksModel::reloadImages()
                        m_events += packContent;
                    }
                }
+#endif
            }
        }
    }
+#ifdef QUOTIENT_07

    // Load emoticons from the current room
    auto events = m_room->currentState().eventsOfType("im.ponies.room_emotes");
@@ -125,6 +132,7 @@ void ImagePacksModel::reloadImages()
            }
        }
    }
+#endif
    Q_EMIT imagesLoaded();
    endResetModel();
 }
@@ -157,5 +165,3 @@ QVector<Quotient::ImagePackEventContent::ImagePackImage> ImagePacksModel::images
    }
    return m_events[index].images;
 }
-
-#include "moc_imagepacksmodel.cpp"
--- a/src/models/imagepacksmodel.h
+++ b/src/models/imagepacksmodel.h
@@ -47,7 +47,7 @@ public:
        AttributionRole, /**< The attribution for the pack author(s). */
        IdRole, /**< The ID of the image pack. */
    };
-    Q_ENUM(Roles)
+    Q_ENUM(Roles);

    explicit ImagePacksModel(QObject *parent = nullptr);

--- a/src/models/keywordnotificationrulemodel.cpp
+++ b/src/models/keywordnotificationrulemodel.cpp
@@ -6,11 +6,11 @@
 #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>
+#include <connection.h>
+#include <converters.h>
+#include <csapi/definitions/push_ruleset.h>
+#include <csapi/pushrules.h>
+#include <jobs/basejob.h>

 KeywordNotificationRuleModel::KeywordNotificationRuleModel(QObject *parent)
    : QAbstractListModel(parent)
@@ -108,5 +108,3 @@ QHash<int, QByteArray> KeywordNotificationRuleModel::roleNames() const
 {
    return {{NameRole, QByteArrayLiteral("name")}};
 }
-
-#include "moc_keywordnotificationrulemodel.cpp"
--- a/src/models/keywordnotificationrulemodel.h
+++ b/src/models/keywordnotificationrulemodel.h
@@ -3,7 +3,7 @@

 #pragma once

-#include <Quotient/csapi/definitions/push_rule.h>
+#include <csapi/definitions/push_rule.h>

 #include <QAbstractListModel>

--- a/src/models/livelocationsmodel.cpp
+++ b/src/models/livelocationsmodel.cpp
@@ -169,5 +169,3 @@ void LiveLocationsModel::updateLocationData(LiveLocationData &&data)

    Q_EMIT dataChanged(idx, idx);
 }
-
-#include "moc_livelocationsmodel.cpp"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ingo Klöcker	238e31fe23	Add "16:9 Super hero art" for Microsoft Store For details, where this image is used, see https://learn.microsoft.com/en-us/windows/apps/publish/publish-your-app/screenshots-and-images?pivots=store-installer-msix#windows-10-and-xbox-image-169-super-hero-art	2023-06-26 15:38:12 +02:00
Ingo Klöcker	99aeba2882	Add some logos in different sizes for the Microsoft Store For details, where those images are used see https://learn.microsoft.com/en-us/windows/apps/publish/publish-your-app/screenshots-and-images?pivots=store-installer-msix#store-logos	2023-06-26 15:36:35 +02:00
Ingo Klöcker	a65724ebc7	Add features as custom values Microsoft Store allows adding a list of up-to 20 features to an app submission. It's not clear whether this adds value over the common practice for KDE apps to add a list of features to the description. If the search in Microsoft Store would rank matching features higher than a full-text match in the description, then it might make sense. The problem is that this would duplicate the list of features in Microsoft Store because removing the list of features from the description would remove the features from the app listing in Linux app stores. Therefore, we should probably stick to the established practice and leave the list of features in Microsoft Store empty. See also https://github.com/ximion/appstream/issues/388	2023-06-26 15:31:06 +02:00
Ingo Klöcker	d5ab724edb	Add Windows-specific screenshots as custom values This is clearly a hack. It would be preferable to add those directly to the existing list of screenshots with some property marking them as screenshots of the Windows version for the Microsoft Store (https://github.com/ximion/appstream/issues/390). The IDs are derived from the IDs used by the CSV export of an app submission in Microsoft Partner Center.	2023-06-26 15:19:16 +02:00
Ingo Klöcker	67ff7e0842	Add a few keywords for easier finding in stores This is supported by AppStream https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-keywords and can be used in the Microsoft Store.	2023-06-26 15:12:24 +02:00