[QT6] Use icon.name

.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

.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

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 "80")
+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})
@@ -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"

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;
 

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.

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>
@@ -40,6 +39,7 @@
   <name xml:lang="ru">NeoChat</name>
   <name xml:lang="sk">NeoChat</name>
   <name xml:lang="sl">NeoChat</name>
+  <name xml:lang="sv">NeoChat</name>
   <name xml:lang="ta">நியோச்சாட்</name>
   <name xml:lang="tr">NeoChat</name>
   <name xml:lang="uk">NeoChat</name>
@@ -54,7 +54,6 @@
   <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>
@@ -76,6 +75,7 @@
   <summary xml:lang="ru">Клиент для Matrix — децентрализованного коммуникационного протокола</summary>
   <summary xml:lang="sk">Klient pre matrix, decentralizovaný komunikačný protokol</summary>
   <summary xml:lang="sl">Odjemalec za matrix, decentralizirani komunikacijski protokol</summary>
+  <summary xml:lang="sv">En klient för Matrix, det decentraliserade kommunikationsprotokollet</summary>
   <summary xml:lang="ta">மையமில்லா தகவல் பரிமாற்ற நெறிமுறையான மேட்ரிக்ஸுக்கான செயலி</summary>
   <summary xml:lang="tr">Merkezi olmayan iletişim protokolü Matrix için bir istemci</summary>
   <summary xml:lang="uk">Клієнт matrix, децентралізованого протоколу обміну даними</summary>
@@ -88,7 +88,6 @@ 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="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>
@@ -96,7 +95,6 @@ to provide a convergent experience across multiple platforms.</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>
@@ -117,7 +115,6 @@ to provide a convergent experience across multiple platforms.</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>
@@ -138,7 +135,6 @@ to provide a convergent experience across multiple platforms.</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>
@@ -160,7 +156,6 @@ to provide a convergent experience across multiple platforms.</p>
       <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>
@@ -181,7 +176,6 @@ to provide a convergent experience across multiple platforms.</p>
       <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>
@@ -202,7 +196,6 @@ to provide a convergent experience across multiple platforms.</p>
       <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>
@@ -227,7 +220,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>
@@ -249,6 +241,7 @@ to provide a convergent experience across multiple platforms.</p>
   <developer_name xml:lang="ru">Сообщество KDE</developer_name>
   <developer_name xml:lang="sk">KDE Komunita</developer_name>
   <developer_name xml:lang="sl">Skupnost KDE</developer_name>
+  <developer_name xml:lang="sv">KDE-gemenskapen</developer_name>
   <developer_name xml:lang="ta">கே.டீ.யீ. சமூகம்</developer_name>
   <developer_name xml:lang="tr">KDE Topluluğu</developer_name>
   <developer_name xml:lang="uk">Спільнота KDE</developer_name>
@@ -269,15 +262,9 @@ to provide a convergent experience across multiple platforms.</p>
     <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</value>
     <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</value>
     <value key="KDE::windows_store::screenshots::1::caption" xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="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="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="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="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>
@@ -286,15 +273,9 @@ to provide a convergent experience across multiple platforms.</p>
     <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ca">Pantalla d'inici de sessió</value>
     <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ca-valencia">Pantalla d'inici de sessió</value>
     <value key="KDE::windows_store::screenshots::2::caption" xml:lang="es">Pantalla de inicio de sesión</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="fr">Écran de connexion</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="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="ta">நுழைவுத் திரை</value>
     <value key="KDE::windows_store::screenshots::2::caption" xml:lang="tr">Oturum açma ekranı</value>
     <value key="KDE::windows_store::screenshots::2::caption" xml:lang="uk">Вікно входу</value>
     <value key="KDE::windows_store::screenshots::2::caption" xml:lang="x-test">xxLogin screenxx</value>

org.kde.neochat.desktop

@@ -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
@@ -35,6 +34,7 @@ Name[ro]=NeoChat
 Name[ru]=NeoChat
 Name[sk]=NeoChat
 Name[sl]=NeoChat
+Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[tr]=NeoChat
 Name[uk]=NeoChat
@@ -49,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
@@ -73,6 +72,7 @@ GenericName[ro]=Client Matrix
 GenericName[ru]=Клиент Matrix
 GenericName[sk]=Matrix Client
 GenericName[sl]=Odjemalec Matrix
+GenericName[sv]=Matrix-klient
 GenericName[ta]=Matrix வாங்கி
 GenericName[tr]=Matrix İstemcisi
 GenericName[uk]=Клієнт Matrix
@@ -86,7 +86,6 @@ 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
@@ -110,6 +109,7 @@ Comment[ro]=Client pentru protocolul Matrix
 Comment[ru]=Клиент для протокола Matrix
 Comment[sk]=Klient protokolu Matrix
 Comment[sl]=Odjemalec za protokol Matrix
+Comment[sv]=Klient för protokollet Matrix
 Comment[ta]=Matrix நெறிமுறைக்கான வாங்கி
 Comment[tr]=Matrix protokolü için istemci
 Comment[uk]=Клієнт протоколу Matrix

src/CMakeLists.txt

@@ -3,130 +3,63 @@
 # 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/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
@@ -140,7 +73,7 @@ ecm_qt_declare_logging_category(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 +82,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)

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"

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:
 

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"

src/clipboard.cpp

@@ -79,5 +79,3 @@ void Clipboard::setImage(const QUrl &url)
         }
     }
 }
-
-#include "moc_clipboard.cpp"

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"

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;

src/controller.cpp

@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "controller.h"
+#include "models/pushrulemodel.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <qt5keychain/keychain.h>
@@ -31,15 +32,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,18 +109,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();
+        oldAccountCount = Accounts.size();
     });
+#endif
 
     QTimer::singleShot(0, this, [this] {
         m_pushRuleModel = new PushRuleModel;
@@ -147,10 +161,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 +187,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 +206,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 +221,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 +280,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 +296,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 +402,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 +417,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 +432,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()
@@ -478,7 +523,11 @@ void Controller::saveWindowGeometry()
 }
 
 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 +633,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 +678,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 +746,3 @@ QVariantList Controller::getSupportedRoomVersions(Quotient::Connection *connecti
 
     return supportedRoomVersions;
 }
-
-AccountRegistry &Controller::accounts()
-{
-    return m_accountRegistry;
-}
-
-#include "moc_controller.cpp"

src/controller.h

@@ -9,9 +9,8 @@
 
 #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;
@@ -117,7 +116,7 @@ public:
         Wrong, /**< The current password entered was wrong. */
         Other, /**< An unknown problem occurred. */
     };
-    Q_ENUM(PasswordStatus)
+    Q_ENUM(PasswordStatus);
 
     static Controller &instance();
 
@@ -230,8 +229,6 @@ public:
 
     Q_INVOKABLE QVariantList getSupportedRoomVersions(Quotient::Connection *connection);
 
-    Quotient::AccountRegistry &accounts();
-
 private:
     explicit Controller(QObject *parent = nullptr);
 
@@ -248,7 +245,6 @@ private:
     bool hasWindowSystem() const;
 
     QPointer<PushRuleModel> m_pushRuleModel;
-    Quotient::AccountRegistry m_accountRegistry;
 
 private Q_SLOTS:
     void invokeLogin();

src/delegatesizehelper.cpp

@@ -151,5 +151,3 @@ qreal DelegateSizeHelper::currentWidth() const
         return std::ceil(std::min(absoluteWidth, m_maxWidth));
     }
 }
-
-#include "moc_delegatesizehelper.cpp"

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

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"]),

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)

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
     {
     }
 

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
 {

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
+}

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)
+}

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;

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.

src/filetypesingleton.cpp

@@ -112,5 +112,3 @@ QStringList FileTypeSingleton::supportedAnimatedImageFormats() const
     Q_D(const FileTypeSingleton);
     return d->supportedAnimatedImageFormats;
 }
-
-#include "moc_filetypesingleton.cpp"

src/filetypesingleton.h

@@ -5,7 +5,6 @@
 
 #pragma once
 
-#include <QFileInfo>
 #include <QMimeDatabase>
 #include <QObject>
 #include <qqml.h>

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"

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

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"

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>

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;
@@ -198,5 +207,3 @@ bool Login::isLoggedIn() const
 {
     return m_isLoggedIn;
 }
-
-#include "moc_login.cpp"

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

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,7 +54,6 @@
 #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"
@@ -67,8 +70,6 @@
 #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 +78,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 +129,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 +177,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,10 +193,6 @@ int main(int argc, char *argv[])
 
     initLogging();
 
-#if Quotient_VERSION_MINOR == 8
-    Connection::setEncryptionDefault(true);
-#endif
-
 #ifdef NEOCHAT_FLATPAK
     // Copy over the included FontConfig configuration to the
     // app's config dir:
@@ -218,7 +223,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");
@@ -238,7 +247,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");
@@ -246,7 +254,9 @@ 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");
+#endif
     qmlRegisterType<PushRuleModel>("org.kde.neochat", 1, 0, "PushRuleModel");
     qmlRegisterType<StickerModel>("org.kde.neochat", 1, 0, "StickerModel");
     qmlRegisterType<ImagePacksModel>("org.kde.neochat", 1, 0, "ImagePacksModel");
@@ -272,10 +282,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());

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"

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;

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"

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;
 

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."));

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.

src/models/collapsestateproxymodel.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "collapsestateproxymodel.h"
+#include "messageeventmodel.h"
 
 #include <KLocalizedString>
 
@@ -173,5 +174,3 @@ QString CollapseStateProxyModel::excessAuthors(int row) const
         return QStringLiteral("+ %1").arg(excessAuthors);
     }
 }
-
-#include "moc_collapsestateproxymodel.cpp"

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"

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.

src/models/completionproxymodel.cpp

@@ -59,5 +59,3 @@ void CompletionProxyModel::setFullText(const QString &fullText)
 {
     m_fullText = fullText;
 }
-
-#include "moc_completionproxymodel.cpp"

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"

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

src/models/devicesmodel.cpp

@@ -3,19 +3,23 @@
 
 #include "devicesmodel.h"
 
+#include <csapi/device_management.h>
+
 #include "controller.h"
-
-#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()
@@ -26,7 +30,6 @@ void DevicesModel::fetchDevices()
             beginResetModel();
             m_devices = job->devices();
             endResetModel();
-            Q_EMIT countChanged();
         });
     }
 }
@@ -37,33 +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 Type:
-        if (device.deviceId == m_connection->deviceId()) {
-            return This;
-        }
-        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;
-        }
+        if (m_devices[index.row()].lastSeenTs)
+            return *m_devices[index.row()].lastSeenTs;
     }
     return {};
 }
@@ -76,21 +62,11 @@ int DevicesModel::rowCount(const QModelIndex &parent) const
 
 QHash<int, QByteArray> DevicesModel::roleNames() const
 {
-    return {
-        {Id, "id"},
-        {DisplayName, "displayName"},
-        {LastIp, "lastIp"},
-        {LastTimestamp, "lastTimestamp"},
-        {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] {
@@ -98,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();
@@ -116,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();
@@ -135,27 +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();
-
-    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();
-    });
-}
-
-#include "moc_devicesmodel.cpp"

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,17 +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. */
-        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.
@@ -74,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;
 };

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"

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;
-};

src/models/emojimodel.cpp

@@ -216,5 +216,3 @@ QVariantList EmojiModel::categoriesWithCustom() const
     ;
     return cats;
 }
-
-#include "moc_emojimodel.cpp"

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.

src/models/emoticonfiltermodel.cpp

@@ -53,5 +53,3 @@ void EmoticonFilterModel::setShowEmojis(bool showEmojis)
     endResetModel();
     Q_EMIT showEmojisChanged();
 }
-
-#include "moc_emoticonfiltermodel.cpp"

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>
 
 /**

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"

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

src/models/keywordnotificationrulemodel.cpp

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

src/models/keywordnotificationrulemodel.h

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

src/models/livelocationsmodel.cpp

@@ -4,7 +4,7 @@
 
 #include "livelocationsmodel.h"
 
-#include <Quotient/events/roommessageevent.h>
+#include <events/roommessageevent.h>
 
 #include <QDebug>
 
@@ -169,5 +169,3 @@ void LiveLocationsModel::updateLocationData(LiveLocationData &&data)
 
     Q_EMIT dataChanged(idx, idx);
 }
-
-#include "moc_livelocationsmodel.cpp"

src/models/locationsmodel.cpp

@@ -8,7 +8,7 @@ using namespace Quotient;
 LocationsModel::LocationsModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    connect(this, &LocationsModel::roomChanged, this, [this]() {
+    connect(this, &LocationsModel::roomChanged, this, [=]() {
         for (const auto &event : m_room->messageEvents()) {
             if (!is<RoomMessageEvent>(*event)) {
                 continue;
@@ -18,7 +18,7 @@ LocationsModel::LocationsModel(QObject *parent)
                 addLocation(eventCast<const RoomMessageEvent>(&e));
             }
         }
-        connect(m_room, &NeoChatRoom::aboutToAddHistoricalMessages, this, [this](const auto &events) {
+        connect(m_room, &NeoChatRoom::aboutToAddHistoricalMessages, this, [=](const auto &events) {
             for (const auto &event : events) {
                 if (!is<RoomMessageEvent>(*event)) {
                     continue;
@@ -29,7 +29,7 @@ LocationsModel::LocationsModel(QObject *parent)
                 }
             }
         });
-        connect(m_room, &NeoChatRoom::aboutToAddNewMessages, this, [this](const auto &events) {
+        connect(m_room, &NeoChatRoom::aboutToAddNewMessages, this, [=](const auto &events) {
             for (const auto &event : events) {
                 if (!is<RoomMessageEvent>(*event)) {
                     continue;
@@ -110,7 +110,6 @@ QVariant LocationsModel::data(const QModelIndex &index, int roleName) const
 
 int LocationsModel::rowCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
     return m_locations.size();
 }
 
@@ -128,5 +127,3 @@ QRectF LocationsModel::boundingBox() const
     }
     return bbox;
 }
-
-#include "moc_locationsmodel.cpp"

src/models/locationsmodel.h

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