Port About page to FormCard

- DevTools
- Network settings
- Push notification
- Permissions

.kde-ci.yml

@@ -57,6 +57,11 @@ Dependencies:
 - 'on': ['Linux/Qt6', 'FreeBSD/Qt6']
   'require':
     'frameworks/kdbusaddons': '@latest-kf6'
+    'frameworks/kstatusnotifieritem': '@latest-kf6'
+
+- 'on': ['Linux/Qt6', 'Linux/Qt5']
+  'require':
+    'sdk/selenium-webdriver-at-spi': '@latest-kf6'
 
 Options:
-  require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD' ]
+  require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD', 'Windows' ]

CMakeLists.txt

@@ -8,7 +8,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_MINOR "11")
 set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
@@ -27,7 +27,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(KDE_COMPILERSETTINGS_LEVEL 5.84)
+set(KDE_COMPILERSETTINGS_LEVEL 5.105)
 
 include(FeatureSummary)
 include(ECMSetupVersion)
@@ -53,13 +53,24 @@ if(QT_MAJOR_VERSION STREQUAL "6")
     set(OVERLAYSHEET_OPEN "onOpened")
     set(QTQUICK_MODULE_QML_VERSION "")
     set(QTLOCATION_MODULE_QML_VERSION "")
+    set(QTMULTIMEDIA_MODULE_QML_VERSION "")
+    set(QTMULTIMEDIA_AUDIO "MediaPlayer")
+    # in Audio qt6 we don't have it but we disable it in qt5 => it seems ok
+    set(QTMULTIMEDIA_AUDIO_AUTOLOAD "")
+    # In Video qml qt6 we don't have it.
+    set(QTMULTIMEDIA_VIDEO_FLUSHMODE "")
 else()
     set(BASICLISTITEM_BOLD "bold")
     set(OVERLAYSHEET_OPEN "onSheetOpenChanged")
     set(QTQUICK_MODULE_QML_VERSION "2.15")
     set(QTLOCATION_MODULE_QML_VERSION "5.15")
+    set(QTMULTIMEDIA_MODULE_QML_VERSION "5.15")
+    set(QTMULTIMEDIA_AUDIO "Audio")
+    set(QTMULTIMEDIA_AUDIO_AUTOLOAD "autoLoad: false")
+    set(QTMULTIMEDIA_VIDEO_FLUSHMODE "flushMode: VideoOutput.FirstFrame")
 endif()
 
+set(QUOTIENT_FORCE_NAMESPACED_INCLUDES TRUE)
 
 ecm_setup_version(${PROJECT_VERSION}
     VARIABLE_PREFIX NEOCHAT
@@ -82,11 +93,9 @@ set_package_properties(KF${QT_MAJOR_VERSION}Kirigami2 PROPERTIES
         )
 find_package(KF${QT_MAJOR_VERSION}KirigamiAddons 0.7.2 REQUIRED)
 
-find_package(Qt${QT_MAJOR_VERSION}Keychain)
-set_package_properties(Qt${QT_MAJOR_VERSION}Keychain PROPERTIES
-    TYPE REQUIRED
-    PURPOSE "Secure storage of account secrets"
-)
+if(QT_MAJOR_VERSION STREQUAL "6")
+    find_package(KF6StatusNotifierItem ${KF_MIN_VERSION} REQUIRED)
+endif()
 
 if(ANDROID)
     find_package(OpenSSL)
@@ -119,6 +128,11 @@ set_package_properties(Quotient${QUOTIENT_SUFFIX} PROPERTIES
     PURPOSE "Talk with matrix server"
 )
 
+if (NOT TARGET Olm::Olm)
+    message(FATAL_ERROR "NeoChat requires Quotient with the E2EE feature enabled")
+endif()
+
+
 find_package(cmark)
 set_package_properties(cmark PROPERTIES
     TYPE REQUIRED
@@ -149,10 +163,6 @@ set_package_properties(KF${QT_MAJOR_VERSION}DocTools PROPERTIES DESCRIPTION
     TYPE OPTIONAL
 )
 
-if(NOT Quotient${QUOTIENT_SUFFIX}_VERSION_MINOR GREATER 6)
-    cmake_policy(SET CMP0063 OLD)
-endif()
-
 if(ANDROID)
     find_package(Sqlite3)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/android/version.gradle.in ${CMAKE_BINARY_DIR}/version.gradle)
@@ -168,9 +178,11 @@ install(FILES org.kde.neochat.tray.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/h
 add_definitions(-DQT_NO_FOREACH)
 
 add_subdirectory(src)
-if (BUILD_TESTING AND Quotient${QUOTIENT_SUFFIX}_VERSION_MINOR GREATER 6)
+
+if (BUILD_TESTING)
     find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
     add_subdirectory(autotests)
+    add_subdirectory(appiumtests)
 endif()
 
 if(KF${QT_MAJOR_VERSION}DocTools_FOUND)

README.md

@@ -9,7 +9,7 @@
 
 A Qt/QML based Matrix client.
 
-<a href='https://matrix.org'><img src='https://matrix.org/docs/projects/images/made-for-matrix.png' alt='Made for Matrix' height=64 target=_blank /></a>
+<a href='https://matrix.org'><img src='https://matrix.org/docs/legacy/made-for-matrix.png' alt='Made for Matrix' height=64 target=_blank /></a>
 <a href='https://flathub.org/apps/details/org.kde.neochat'><img width='190px' alt='Download on Flathub' src='https://flathub.org/assets/badges/flathub-badge-i-en.png'/></a>
 
 ## Introduction

appiumtests/CMakeLists.txt

@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-FileCopyrightText: 2022 Harald Sitter <sitter@kde.org>
+
+
+if(NOT BUILD_TESTING OR NOT CMAKE_SYSTEM_NAME MATCHES "Linux")
+    return()
+endif()
+
+find_package(SeleniumWebDriverATSPI)
+set_package_properties(SeleniumWebDriverATSPI PROPERTIES
+    DESCRIPTION "Server component for selenium tests using Linux accessibility infrastructure"
+    PURPOSE "Needed for GUI tests"
+    URL "https://invent.kde.org/sdk/selenium-webdriver-at-spi"
+    TYPE OPTIONAL
+)
+if(NOT SeleniumWebDriverATSPI_FOUND)
+    return()
+endif()
+
+add_test(
+    NAME logintest
+    COMMAND selenium-webdriver-at-spi-run ${CMAKE_CURRENT_SOURCE_DIR}/logintest.py
+)

appiumtests/login-server.py

@@ -0,0 +1,42 @@
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+
+
+from flask import Flask, request, abort
+app = Flask(__name__)
+
+@app.route("/_matrix/client/v3/login", methods=["GET"])
+def login_get():
+    result = dict()
+    result["flows"] = [dict()]
+    result["flows"][0]["type"] = "m.login.password"
+    return result
+
+@app.route("/_matrix/client/v3/login", methods=["POST"])
+def login_post():
+    data = request.get_json()
+    if data["identifier"]["user"] != "user" or data["password"] != "1234":
+        abort(403)
+    print(data)
+    result = dict()
+    result["access_token"] = "token_1234"
+    result["device_id"] = "device_1234"
+    result["user_id"] = "@user:localhost:1234"
+    return result
+
+@app.route("/_matrix/client/r0/sync")
+def sync():
+    result = dict()
+    result["next_batch"] = "batch1234"
+    return result
+
+@app.route("/.well-known/matrix/client")
+def well_known():
+    reply = dict()
+    reply["m.homeserver"] = dict()
+    reply["m.homeserver"]["base_url"] = "https://localhost:1234"
+    return reply
+
+
+if __name__ == "__main__":
+    app.run(ssl_context='adhoc', port=1234)

appiumtests/logintest.py

@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2021-2022 Harald Sitter <sitter@kde.org>
+# SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+
+import unittest
+from appium import webdriver
+from appium.webdriver.common.appiumby import AppiumBy
+from selenium.webdriver.support.ui import WebDriverWait
+import time
+import subprocess
+
+class LoginTest(unittest.TestCase):
+    @classmethod
+    def setUpClass(self):
+        desired_caps = {}
+        desired_caps["app"] = "neochat --ignore-ssl-errors"
+        desired_caps["timeouts"] = {'implicit': 10000}
+        self.driver = webdriver.Remote(
+            command_executor='http://127.0.0.1:4723',
+            desired_capabilities=desired_caps)
+        subprocess.Popen(["python","login-server.py"])
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        if not self._outcome.result.wasSuccessful():
+            self.driver.get_screenshot_as_file("failed_test_shot_{}.png".format(self.id()))
+
+    @classmethod
+    def tearDownClass(self):
+        self.driver.quit()
+
+    def test_login(self):
+        self.driver.find_element(by=AppiumBy.NAME, value="Matrix ID").send_keys("@user:localhost:1234")
+        self.driver.find_element(by=AppiumBy.NAME, value="Continue").click()
+        self.driver.find_element(by=AppiumBy.NAME, value="Password").send_keys("1234")
+        self.driver.find_element(by=AppiumBy.NAME, value="Login").click()
+        self.driver.find_element(by=AppiumBy.NAME, value="Join some rooms to get started").click()
+
+if __name__ == '__main__':
+    unittest.main()

autotests/neochatroomtest.cpp

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

autotests/texthandlertest.cpp

@@ -6,9 +6,11 @@
 
 #include "texthandler.h"
 
+#include <Quotient/quotient_common.h>
+#include <Quotient/syncdata.h>
 #include <qnamespace.h>
-#include <quotient_common.h>
-#include <syncdata.h>
+
+#include "utils.h"
 
 using namespace Quotient;
 
@@ -555,10 +557,10 @@ void TextHandlerTest::receiveRichPlainUrl()
 void TextHandlerTest::receiveRichEmote()
 {
     auto event = room->messageEvents().at(1).get();
-    auto author = static_cast<NeoChatUser *>(room->user(event->senderId()));
+    auto author = room->user(event->senderId());
     const QString testInputString = QStringLiteral("This is an emote.");
-    const QString testOutputString = QStringLiteral("* <a href=\"https://matrix.to/#/@example:example.org\" style=\"color:") + author->color().name()
-        + QStringLiteral("\">@example:example.org</a> This is an emote.");
+    const QString testOutputString = QStringLiteral("* <a href=\"https://matrix.to/#/@example:example.org\" style=\"color:")
+        + Utils::getUserColor(author->hueF()).name() + QStringLiteral("\">@example:example.org</a> This is an emote.");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -602,13 +604,13 @@ void TextHandlerTest::linkPreviewsMatch_data()
     QTest::addColumn<QString>("testInputString");
     QTest::addColumn<QList<QUrl>>("testOutputLinks");
 
-    QTest::newRow("plainHttps") << QStringLiteral("https://kde.org") << QList<QUrl>({QUrl("https://kde.org")});
-    QTest::newRow("richHttps") << QStringLiteral("<a href=\"https://kde.org\">Rich Link</a>") << QList<QUrl>({QUrl("https://kde.org")});
-    QTest::newRow("plainWww") << QStringLiteral("www.example.org") << QList<QUrl>({QUrl("www.example.org")});
+    QTest::newRow("plainHttps") << QStringLiteral("https://kde.org") << QList<QUrl>({QUrl("https://kde.org"_ls)});
+    QTest::newRow("richHttps") << QStringLiteral("<a href=\"https://kde.org\">Rich Link</a>") << QList<QUrl>({QUrl("https://kde.org"_ls)});
+    QTest::newRow("plainWww") << QStringLiteral("www.example.org") << QList<QUrl>({QUrl("www.example.org"_ls)});
     QTest::newRow("multipleHttps") << QStringLiteral("https://kde.org www.example.org")
                                    << QList<QUrl>({
-                                          QUrl("https://kde.org"),
-                                          QUrl("www.example.org"),
+                                          QUrl("https://kde.org"_ls),
+                                          QUrl("www.example.org"_ls),
                                       });
 }
 
@@ -644,5 +646,5 @@ void TextHandlerTest::linkPreviewsReject()
     QCOMPARE(testTextHandler.getLinkPreviews(), testOutputLinks);
 }
 
-QTEST_GUILESS_MAIN(TextHandlerTest)
+QTEST_MAIN(TextHandlerTest)
 #include "texthandlertest.moc"

org.kde.neochat.appdata.xml

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

org.kde.neochat.desktop

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

po/sv/docs/neochat/man-neochat.1.docbook

@@ -0,0 +1,122 @@
+<?xml version="1.0" ?>
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
+<!ENTITY % Swedish "INCLUDE">
+]>
+<!--
+SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
+SPDX-License-Identifier: CC-BY-SA-4.0
+-->
+
+<refentry lang="&language;">
+<refentryinfo>
+<title
+>NeoChat användarmanual</title>
+<author
+><firstname
+>Carl</firstname
+><surname
+>Schwan</surname
+> <contrib
+>NeoChat manualsida.</contrib
+> <email
+>carl@carlschwan.eu</email
+></author>
+<date
+>2022-11-01</date>
+<releaseinfo
+>22.09</releaseinfo>
+<productname
+>NeoChat</productname>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>
+    <command
+>neochat</command>
+  </refentrytitle>
+  <manvolnum
+>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+  <refname
+>neochat</refname>
+  <refpurpose
+>Klient för att interagera med meddelandeprotokollet matrix</refpurpose>
+  </refnamediv>
+  <!-- body begins here -->
+  <refsynopsisdiv id='synopsis'>
+  <cmdsynopsis
+><command
+>neochat</command
+> <arg choice="opt"
+><replaceable
+>URI</replaceable
+></arg
+> </cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsect1 id="description">
+  <title
+>Beskrivning</title>
+  <para
+><command
+>neochat</command
+> är ett chattprogram för protokollet matrix som fungerar både på skrivbord och mobil. </para>
+</refsect1>
+
+<refsect1 id="options"
+><title
+>Väljare</title>
+<variablelist>
+  <varlistentry>
+  <term
+><option
+>URI</option
+></term>
+  <listitem>
+    <para
+>Matrix webbadress för en användare eller ett rum, t.ex. matrix:u/användare:exempel.org. Det gör att NeoChat försöker öppna det angivna rummet eller konversationen. </para>
+  </listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1 id="bug">
+  <title
+>Rapportera fel</title>
+  <para
+>Rapportera fel och funktionsönskemål på <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General"
+>https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General</ulink
+></para>
+</refsect1>
+
+<refsect1>
+  <title
+>Se också</title>
+  <simplelist>
+    <member
+>En lista över vanliga frågor om Matrix <ulink url="https://matrix.org/faq/"
+>https://matrix.org/faq/</ulink
+> </member>
+    <member
+>kf5options(7)</member>
+    <member
+>qt5options(7)</member>
+  </simplelist>
+</refsect1>
+
+<refsect1 id="copyright"
+><title
+>Copyright</title>
+<para
+>Copyright &copy; 2020-2022 Tobias Fella </para>
+<para
+>Copyright &copy; 2020-2022 Carl Schwan </para>
+<para
+>Licens: GNU General Public Version 3 eller senare &lt;<ulink url="https://wwwgnuorg/licenses/gpl-html"
+>http://www.gnu.org/licenses/gpl-3.0.html</ulink
+>&gt;</para>
+</refsect1>
+</refentry>

src/CMakeLists.txt

@@ -5,8 +5,9 @@
 
 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)
@@ -42,8 +43,6 @@ add_library(neochat STATIC
     roommanager.h
     neochatroom.cpp
     neochatroom.h
-    neochatuser.cpp
-    neochatuser.h
     models/userlistmodel.cpp
     models/userlistmodel.h
     models/userfiltermodel.cpp
@@ -64,6 +63,7 @@ add_library(neochat STATIC
     chatdocumenthandler.h
     models/devicesmodel.cpp
     models/devicesmodel.h
+    models/devicesproxymodel.cpp
     filetypesingleton.cpp
     filetypesingleton.h
     login.cpp
@@ -124,6 +124,7 @@ add_library(neochat STATIC
     locationhelper.h
     events/pollevent.cpp
     pollhandler.cpp
+    utils.h
 )
 
 ecm_qt_declare_logging_category(neochat
@@ -154,6 +155,9 @@ if(NOT ANDROID)
     target_sources(neochat PRIVATE colorschemer.cpp colorschemer.h)
     if (NOT WIN32 AND NOT APPLE)
         target_sources(neochat PRIVATE trayicon_sni.cpp trayicon_sni.h)
+        if(QT_MAJOR_VERSION STREQUAL "6")
+            target_link_libraries(neochat PRIVATE KF6::StatusNotifierItem)
+        endif()
     else()
         target_sources(neochat PRIVATE trayicon.cpp trayicon.h)
     endif()
@@ -172,7 +176,7 @@ else()
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR})
-target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::Kirigami2 KF${QT_MAJOR_VERSION}::Notifications KF${QT_MAJOR_VERSION}::ConfigCore KF${QT_MAJOR_VERSION}::ConfigGui KF${QT_MAJOR_VERSION}::CoreAddons KF${QT_MAJOR_VERSION}::SonnetCore  KF${QT_MAJOR_VERSION}::ItemModels Quotient${QUOTIENT_SUFFIX} cmark::cmark ${QTKEYCHAIN_LIBRARIES} QCoro::Core)
+target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::Kirigami2 KF${QT_MAJOR_VERSION}::Notifications KF${QT_MAJOR_VERSION}::ConfigCore KF${QT_MAJOR_VERSION}::ConfigGui KF${QT_MAJOR_VERSION}::CoreAddons KF${QT_MAJOR_VERSION}::SonnetCore  KF${QT_MAJOR_VERSION}::ItemModels Quotient${QUOTIENT_SUFFIX} cmark::cmark QCoro::Core)
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
 
 if(NEOCHAT_FLATPAK)

src/actionshandler.cpp

@@ -3,8 +3,8 @@
 
 #include "actionshandler.h"
 
-#include <csapi/joining.h>
-#include <events/roommemberevent.h>
+#include <Quotient/csapi/joining.h>
+#include <Quotient/events/roommemberevent.h>
 
 #include <cmark.h>
 
@@ -44,7 +44,7 @@ void ActionsHandler::handleNewMessage()
     if (!m_room->chatBoxAttachmentPath().isEmpty()) {
         QUrl url(m_room->chatBoxAttachmentPath());
         auto path = url.isLocalFile() ? url.toLocalFile() : url.toString();
-        m_room->uploadFile(path, m_room->chatBoxText().isEmpty() ? path.mid(path.lastIndexOf('/') + 1) : m_room->chatBoxText());
+        m_room->uploadFile(QUrl(path), m_room->chatBoxText().isEmpty() ? path.mid(path.lastIndexOf(u'/') + 1) : m_room->chatBoxText());
         m_room->setChatBoxAttachmentPath({});
         m_room->setChatBoxText({});
         return;
@@ -97,7 +97,7 @@ QString ActionsHandler::handleMentions(QString handledText, const bool &isEdit)
 void ActionsHandler::handleMessage(const QString &text, QString handledText, const bool &isEdit)
 {
     if (NeoChatConfig::allowQuickEdit()) {
-        QRegularExpression sed("^s/([^/]*)/([^/]*)(/g)?$");
+        QRegularExpression sed(QStringLiteral("^s/([^/]*)/([^/]*)(/g)?$"));
         auto match = sed.match(text);
         if (match.hasMatch()) {
             const QString regex = match.captured(1);
@@ -113,13 +113,13 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, con
                         } else {
                             originalString = event->plainBody();
                         }
-                        if (flags == "/g") {
-                            m_room->postHtmlMessage(handledText, originalString.replace(regex, replacement), event->msgtype(), "", event->id());
+                        if (flags == "/g"_ls) {
+                            m_room->postHtmlMessage(handledText, originalString.replace(regex, replacement), event->msgtype(), {}, event->id());
                         } else {
                             m_room->postHtmlMessage(handledText,
                                                     originalString.replace(originalString.indexOf(regex), regex.size(), replacement),
                                                     event->msgtype(),
-                                                    "",
+                                                    {},
                                                     event->id());
                         }
                         return;
@@ -133,7 +133,7 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, con
     if (handledText.startsWith(QLatin1Char('/'))) {
         for (const auto &action : ActionsModel::instance().allActions()) {
             if (handledText.indexOf(action.prefix) == 1
-                && (handledText.indexOf(" ") == action.prefix.length() + 1 || handledText.length() == action.prefix.length() + 1)) {
+                && (handledText.indexOf(" "_ls) == action.prefix.length() + 1 || handledText.length() == action.prefix.length() + 1)) {
                 handledText = action.handle(handledText.mid(action.prefix.length() + 1).trimmed(), m_room);
                 if (action.messageType.has_value()) {
                     messageType = *action.messageType;
@@ -152,30 +152,30 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, con
     textHandler.setData(handledText);
     handledText = textHandler.handleSendText();
 
-    if (handledText.count("<p>") == 1 && handledText.count("</p>") == 1) {
-        handledText.remove("<p>");
-        handledText.remove("</p>");
+    if (handledText.count("<p>"_ls) == 1 && handledText.count("</p>"_ls) == 1) {
+        handledText.remove("<p>"_ls);
+        handledText.remove("</p>"_ls);
     }
 
     if (handledText.length() == 0) {
         return;
     }
 
-    m_room->postMessage(text, handledText, messageType, m_room->chatBoxReplyId(), isEdit ? m_room->chatBoxEditId() : "");
+    m_room->postMessage(text, handledText, messageType, m_room->chatBoxReplyId(), isEdit ? m_room->chatBoxEditId() : QString());
 }
 
 void ActionsHandler::checkEffects(const QString &text)
 {
     std::optional<QString> effect = std::nullopt;
-    if (text.contains("\u2744")) {
+    if (text.contains(QStringLiteral("\u2744"))) {
         effect = QLatin1String("snowflake");
-    } else if (text.contains("\u1F386")) {
+    } else if (text.contains(QStringLiteral("\u1F386"))) {
         effect = QLatin1String("fireworks");
-    } else if (text.contains("\u2F387")) {
+    } else if (text.contains(QStringLiteral("\u2F387"))) {
         effect = QLatin1String("fireworks");
-    } else if (text.contains("\u1F389")) {
+    } else if (text.contains(QStringLiteral("\u1F389"))) {
         effect = QLatin1String("confetti");
-    } else if (text.contains("\u1F38A")) {
+    } else if (text.contains(QStringLiteral("\u1F38A"))) {
         effect = QLatin1String("confetti");
     }
     if (effect.has_value()) {

src/actionshandler.h

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

src/chatdocumenthandler.cpp

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

src/chatdocumenthandler.h

@@ -104,12 +104,12 @@ class ChatDocumentHandler : public QObject
     /**
      * @brief The color to highlight user mentions.
      */
-    Q_PROPERTY(QColor mentionColor READ mentionColor WRITE setMentionColor NOTIFY mentionColorChanged);
+    Q_PROPERTY(QColor mentionColor READ mentionColor WRITE setMentionColor NOTIFY mentionColorChanged)
 
     /**
      * @brief The color to highlight spelling errors.
      */
-    Q_PROPERTY(QColor errorColor READ errorColor WRITE setErrorColor NOTIFY errorColorChanged);
+    Q_PROPERTY(QColor errorColor READ errorColor WRITE setErrorColor NOTIFY errorColorChanged)
 
 public:
     explicit ChatDocumentHandler(QObject *parent = nullptr);

src/controller.cpp

@@ -31,20 +31,19 @@
 
 #include <signal.h>
 
-#include "accountregistry.h"
-
-#include <connection.h>
-#include <csapi/content-repo.h>
-#include <csapi/logout.h>
-#include <csapi/profile.h>
-#include <jobs/downloadfilejob.h>
-#include <qt_connection_util.h>
-
-#include <eventstats.h>
+#include <Quotient/accountregistry.h>
+#include <Quotient/connection.h>
+#include <Quotient/csapi/content-repo.h>
+#include <Quotient/csapi/logout.h>
+#include <Quotient/csapi/notifications.h>
+#include <Quotient/csapi/profile.h>
+#include <Quotient/eventstats.h>
+#include <Quotient/jobs/downloadfilejob.h>
+#include <Quotient/qt_connection_util.h>
+#include <Quotient/user.h>
 
 #include "neochatconfig.h"
 #include "neochatroom.h"
-#include "neochatuser.h"
 #include "notificationsmanager.h"
 #include "roommanager.h"
 #include "windowcontroller.h"
@@ -61,7 +60,6 @@ Controller::Controller(QObject *parent)
     : QObject(parent)
 {
     Connection::setRoomType<NeoChatRoom>();
-    Connection::setUserType<NeoChatUser>();
 
     setApplicationProxy();
 
@@ -102,17 +100,17 @@ Controller::Controller(QObject *parent)
     }
 #endif
 
-    connect(&Accounts, &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
+    connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
 
     static int oldAccountCount = 0;
-    connect(&Accounts, &AccountRegistry::accountCountChanged, this, [this]() {
-        if (Accounts.size() > oldAccountCount) {
-            auto connection = Accounts.accounts()[Accounts.size() - 1];
+    connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, [this]() {
+        if (m_accountRegistry.size() > oldAccountCount) {
+            auto connection = m_accountRegistry.accounts()[m_accountRegistry.size() - 1];
             connect(connection, &Connection::syncDone, this, [connection]() {
                 NotificationsManager::instance().handleNotifications(connection);
             });
         }
-        oldAccountCount = Accounts.size();
+        oldAccountCount = m_accountRegistry.size();
     });
 
     QTimer::singleShot(0, this, [this] {
@@ -126,9 +124,21 @@ Controller &Controller::instance()
     return _instance;
 }
 
-void Controller::showWindow()
+void Controller::toggleWindow()
 {
-    WindowController::instance().showAndRaiseWindow(QString());
+    auto &instance = WindowController::instance();
+    auto window = instance.window();
+    if (window->isVisible()) {
+        if (window->windowStates() & Qt::WindowMinimized) {
+            window->showNormal();
+            window->requestActivate();
+        } else {
+            window->close();
+        }
+    } else {
+        instance.showAndRaiseWindow({});
+        instance.window()->requestActivate();
+    }
 }
 
 void Controller::logout(Connection *conn, bool serverSideLogout)
@@ -138,7 +148,7 @@ void Controller::logout(Connection *conn, bool serverSideLogout)
         return;
     }
 
-    SettingsGroup("Accounts").remove(conn->userId());
+    SettingsGroup("Accounts"_ls).remove(conn->userId());
 
     QKeychain::DeletePasswordJob job(qAppName());
     job.setAutoDelete(true);
@@ -148,10 +158,10 @@ void Controller::logout(Connection *conn, bool serverSideLogout)
     job.start();
     loop.exec();
 
-    if (Accounts.count() > 1) {
+    if (m_accountRegistry.count() > 1) {
         // Only set the connection if the the account being logged out is currently active
         if (conn == activeConnection()) {
-            setActiveConnection(Accounts.accounts()[0]);
+            setActiveConnection(m_accountRegistry.accounts()[0]);
         }
     } else {
         setActiveConnection(nullptr);
@@ -166,7 +176,7 @@ void Controller::addConnection(Connection *c)
 {
     Q_ASSERT_X(c, __FUNCTION__, "Attempt to add a null connection");
 
-    Accounts.add(c);
+    m_accountRegistry.add(c);
 
     c->setLazyLoading(true);
 
@@ -181,7 +191,7 @@ void Controller::addConnection(Connection *c)
     });
 
     connect(c, &Connection::requestFailed, this, [this](BaseJob *job) {
-        if (job->error() == BaseJob::UserConsentRequiredError) {
+        if (job->error() == BaseJob::UserConsentRequired) {
             Q_EMIT userConsentRequired(job->errorUrl());
         }
     });
@@ -202,7 +212,7 @@ void Controller::dropConnection(Connection *c)
 
 void Controller::invokeLogin()
 {
-    const auto accounts = SettingsGroup("Accounts").childGroups();
+    const auto accounts = SettingsGroup("Accounts"_ls).childGroups();
     QString id = NeoChatConfig::self()->activeConnection();
     for (const auto &accountId : accounts) {
         AccountSettings account{accountId};
@@ -216,7 +226,7 @@ void Controller::invokeLogin()
                 AccountSettings account{accountId};
                 QString accessToken;
                 if (accessTokenLoadingJob->error() == QKeychain::Error::NoError) {
-                    accessToken = accessTokenLoadingJob->binaryData();
+                    accessToken = QString::fromLatin1(accessTokenLoadingJob->binaryData());
                 } else {
                     return;
                 }
@@ -231,10 +241,10 @@ void Controller::invokeLogin()
                     }
                 });
                 connect(connection, &Connection::loginError, this, [this, connection](const QString &error, const QString &) {
-                    if (error == "Unrecognised access token") {
+                    if (error == "Unrecognised access token"_ls) {
                         Q_EMIT errorOccured(i18n("Login Failed: Access Token invalid or revoked"));
                         logout(connection, false);
-                    } else if (error == "Connection closed") {
+                    } else if (error == "Connection closed"_ls) {
                         Q_EMIT errorOccured(i18n("Login Failed: %1", error));
                         // Failed due to network connection issue. This might happen when the homeserver is
                         // temporary down, or the user trying to re-launch NeoChat in a network that cannot
@@ -248,7 +258,7 @@ void Controller::invokeLogin()
                 connect(connection, &Connection::networkError, this, [this](const QString &error, const QString &, int, int) {
                     Q_EMIT errorOccured(i18n("Network Error: %1", error));
                 });
-                connection->assumeIdentity(account.userId(), accessToken, account.deviceId());
+                connection->assumeIdentity(account.userId(), accessToken);
             });
         }
     }
@@ -264,7 +274,7 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const Accoun
     job->setKey(account.userId());
 
     // Handling of errors
-    connect(job, &QKeychain::Job::finished, this, [this, &account, job]() {
+    connect(job, &QKeychain::Job::finished, this, [this, job]() {
         if (job->error() == QKeychain::Error::NoError) {
             return;
         }
@@ -332,7 +342,7 @@ bool Controller::supportSystemTray() const
 #ifdef Q_OS_ANDROID
     return false;
 #else
-    QString de = getenv("XDG_CURRENT_DESKTOP");
+    auto de = QString::fromLatin1(qgetenv("XDG_CURRENT_DESKTOP"));
     return de != QStringLiteral("GNOME") && de != QStringLiteral("Pantheon");
 #endif
 }
@@ -344,18 +354,18 @@ void Controller::changePassword(Connection *connection, const QString &currentPa
         if (job->error() == 103) {
             QJsonObject replyData = job->jsonData();
             QJsonObject authData;
-            authData["session"] = replyData["session"];
-            authData["password"] = currentPassword;
-            authData["type"] = "m.login.password";
-            authData["user"] = connection->user()->id();
-            QJsonObject identifier = {{"type", "m.id.user"}, {"user", connection->user()->id()}};
-            authData["identifier"] = identifier;
+            authData["session"_ls] = replyData["session"_ls];
+            authData["password"_ls] = currentPassword;
+            authData["type"_ls] = "m.login.password"_ls;
+            authData["user"_ls] = connection->user()->id();
+            QJsonObject identifier = {{"type"_ls, "m.id.user"_ls}, {"user"_ls, connection->user()->id()}};
+            authData["identifier"_ls] = identifier;
             NeochatChangePasswordJob *innerJob = connection->callApi<NeochatChangePasswordJob>(newPassword, false, authData);
             connect(innerJob, &BaseJob::success, this, [this]() {
                 Q_EMIT passwordStatus(PasswordStatus::Success);
             });
             connect(innerJob, &BaseJob::failure, this, [innerJob, this]() {
-                if (innerJob->jsonData()["errcode"] == "M_FORBIDDEN") {
+                if (innerJob->jsonData()["errcode"_ls] == "M_FORBIDDEN"_ls) {
                     Q_EMIT passwordStatus(PasswordStatus::Wrong);
                 } else {
                     Q_EMIT passwordStatus(PasswordStatus::Other);
@@ -392,7 +402,7 @@ NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, b
 
 int Controller::accountCount() const
 {
-    return Accounts.count();
+    return m_accountRegistry.count();
 }
 
 void Controller::setQuitOnLastWindowClosed()
@@ -401,10 +411,10 @@ void Controller::setQuitOnLastWindowClosed()
     if (NeoChatConfig::self()->systemTray()) {
         m_trayIcon = new TrayIcon(this);
         m_trayIcon->show();
-        connect(m_trayIcon, &TrayIcon::showWindow, this, &Controller::showWindow);
+        connect(m_trayIcon, &TrayIcon::toggleWindow, this, &Controller::toggleWindow);
     } else {
         if (m_trayIcon) {
-            disconnect(m_trayIcon, &TrayIcon::showWindow, this, &Controller::showWindow);
+            disconnect(m_trayIcon, &TrayIcon::toggleWindow, this, &Controller::toggleWindow);
             delete m_trayIcon;
             m_trayIcon = nullptr;
         }
@@ -450,7 +460,7 @@ void Controller::setActiveConnection(Connection *connection)
             Q_EMIT isOnlineChanged(true);
         });
         connect(connection, &Connection::requestFailed, this, [](BaseJob *job) {
-            if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"].toString() == "M_TOO_LARGE"_ls) {
+            if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"_ls].toString() == "M_TOO_LARGE"_ls) {
                 RoomManager::instance().warning(i18n("File too large to download."), i18n("Contact your matrix server administrator for support."));
             }
         });
@@ -488,7 +498,7 @@ NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Om
 
 void Controller::createRoom(const QString &name, const QString &topic)
 {
-    auto createRoomJob = m_connection->createRoom(Connection::PublishRoom, "", name, topic, QStringList());
+    auto createRoomJob = m_connection->createRoom(Connection::PublishRoom, QString(), name, topic, QStringList());
     connect(createRoomJob, &CreateRoomJob::failure, this, [this, createRoomJob] {
         Q_EMIT errorOccured(i18n("Room creation failed: %1", createRoomJob->errorString()));
     });
@@ -524,16 +534,16 @@ bool Controller::isOnline() const
 // TODO: Remove in favor of RoomManager::joinRoom
 void Controller::joinRoom(const QString &alias)
 {
-    if (!alias.contains(":")) {
+    if (!alias.contains(":"_ls)) {
         Q_EMIT errorOccured(i18n("The room id you are trying to join is not valid"));
         return;
     }
 
-    const auto knownServer = alias.mid(alias.indexOf(":") + 1);
+    const auto knownServer = alias.mid(alias.indexOf(":"_ls) + 1);
     RoomManager::instance().joinRoom(m_connection, alias, QStringList{knownServer});
 }
 
-void Controller::openOrCreateDirectChat(NeoChatUser *user)
+void Controller::openOrCreateDirectChat(User *user)
 {
     const auto existing = activeConnection()->directChats();
 
@@ -583,11 +593,6 @@ bool Controller::hasWindowSystem() const
 #endif
 }
 
-bool Controller::encryptionSupported() const
-{
-    return Quotient::encryptionSupported();
-}
-
 void Controller::forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item)
 {
     // HACK: Workaround bug QTBUG 93281
@@ -626,16 +631,10 @@ void Controller::setApplicationProxy()
 
 int Controller::activeConnectionIndex() const
 {
-    auto result = std::find_if(Accounts.accounts().begin(), Accounts.accounts().end(), [this](const auto &it) {
+    auto result = std::find_if(m_accountRegistry.accounts().begin(), m_accountRegistry.accounts().end(), [this](const auto &it) {
         return it == m_connection;
     });
-    return result - Accounts.accounts().begin();
-}
-
-int Controller::quotientMinorVersion() const
-{
-    // TODO libQuotient 0.7: Replace with version function from libQuotient
-    return 7;
+    return result - m_accountRegistry.accounts().begin();
 }
 
 bool Controller::isFlatpak() const
@@ -653,9 +652,9 @@ void Controller::setActiveAccountLabel(const QString &label)
         return;
     }
     QJsonObject json{
-        {"account_label", label},
+        {"account_label"_ls, label},
     };
-    m_connection->setAccountData("org.kde.neochat.account_label", json);
+    m_connection->setAccountData("org.kde.neochat.account_label"_ls, json);
 }
 
 QString Controller::activeAccountLabel() const
@@ -663,7 +662,7 @@ QString Controller::activeAccountLabel() const
     if (!m_connection) {
         return {};
     }
-    return m_connection->accountDataJson("org.kde.neochat.account_label")["account_label"].toString();
+    return m_connection->accountDataJson("org.kde.neochat.account_label"_ls)["account_label"_ls].toString();
 }
 
 QVariantList Controller::getSupportedRoomVersions(Quotient::Connection *connection)
@@ -673,13 +672,18 @@ QVariantList Controller::getSupportedRoomVersions(Quotient::Connection *connecti
     QVariantList supportedRoomVersions;
     for (const Quotient::Connection::SupportedRoomVersion &v : roomVersions) {
         QVariantMap roomVersionMap;
-        roomVersionMap.insert("id", v.id);
-        roomVersionMap.insert("status", v.status);
-        roomVersionMap.insert("isStable", v.isStable());
+        roomVersionMap.insert("id"_ls, v.id);
+        roomVersionMap.insert("status"_ls, v.status);
+        roomVersionMap.insert("isStable"_ls, v.isStable());
         supportedRoomVersions.append(roomVersionMap);
     }
 
     return supportedRoomVersions;
 }
 
+AccountRegistry &Controller::accounts()
+{
+    return m_accountRegistry;
+}
+
 #include "moc_controller.cpp"

src/controller.h

@@ -9,11 +9,11 @@
 
 #include <KFormat>
 
-#include <jobs/basejob.h>
-#include <settings.h>
+#include <Quotient/accountregistry.h>
+#include <Quotient/jobs/basejob.h>
+#include <Quotient/settings.h>
 
 class NeoChatRoom;
-class NeoChatUser;
 class TrayIcon;
 class QWindow;
 class QQuickTextDocument;
@@ -22,6 +22,7 @@ namespace Quotient
 {
 class Connection;
 class Room;
+class User;
 }
 
 namespace QKeychain
@@ -86,20 +87,6 @@ class Controller : public QObject
      */
     Q_PROPERTY(bool isOnline READ isOnline NOTIFY isOnlineChanged)
 
-    /**
-     * @brief Whether the ecryption support has been enabled.
-     */
-    Q_PROPERTY(bool encryptionSupported READ encryptionSupported CONSTANT)
-
-    /**
-     * @brief The current minor version number of libQuotient being used.
-     *
-     * This is the only way to gate NeoChat features by libQuotient version in QML.
-     *
-     * @note No major version because libQuotient doesn't have any; All are 0.x.
-     */
-    Q_PROPERTY(int quotientMinorVersion READ quotientMinorVersion CONSTANT)
-
     /**
      * @brief Whether NeoChat is running as a flatpak.
      *
@@ -182,7 +169,7 @@ public:
      *
      * If a direct chat with the user doesn't exist one is created and then joined.
      */
-    Q_INVOKABLE void openOrCreateDirectChat(NeoChatUser *user);
+    Q_INVOKABLE void openOrCreateDirectChat(Quotient::User *user);
 
     [[nodiscard]] bool supportSystemTray() const;
 
@@ -193,8 +180,6 @@ public:
 
     bool isOnline() const;
 
-    bool encryptionSupported() const;
-
     /**
      * @brief Sets the QNetworkProxy for the application.
      *
@@ -202,8 +187,6 @@ public:
      */
     Q_INVOKABLE void setApplicationProxy();
 
-    int quotientMinorVersion() const;
-
     bool isFlatpak() const;
 
     /**
@@ -229,6 +212,8 @@ public:
 
     Q_INVOKABLE QVariantList getSupportedRoomVersions(Quotient::Connection *connection);
 
+    Quotient::AccountRegistry &accounts();
+
 private:
     explicit Controller(QObject *parent = nullptr);
 
@@ -245,10 +230,11 @@ private:
     bool hasWindowSystem() const;
 
     QPointer<PushRuleModel> m_pushRuleModel;
+    Quotient::AccountRegistry m_accountRegistry;
 
 private Q_SLOTS:
     void invokeLogin();
-    void showWindow();
+    void toggleWindow();
     void setQuitOnLastWindowClosed();
 
 Q_SIGNALS:

src/events/imagepackevent.cpp

@@ -10,29 +10,29 @@ ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
 {
     if (json.contains(QStringLiteral("pack"))) {
         pack = ImagePackEventContent::Pack{
-            fromJson<Omittable<QString>>(json["pack"].toObject()["display_name"]),
-            fromJson<Omittable<QUrl>>(json["pack"].toObject()["avatar_url"]),
-            fromJson<Omittable<QStringList>>(json["pack"].toObject()["usage"]),
-            fromJson<Omittable<QString>>(json["pack"].toObject()["attribution"]),
+            fromJson<Omittable<QString>>(json["pack"_ls].toObject()["display_name"_ls]),
+            fromJson<Omittable<QUrl>>(json["pack"_ls].toObject()["avatar_url"_ls]),
+            fromJson<Omittable<QStringList>>(json["pack"_ls].toObject()["usage"_ls]),
+            fromJson<Omittable<QString>>(json["pack"_ls].toObject()["attribution"_ls]),
         };
     } else {
         pack = none;
     }
 
-    const auto &keys = json["images"].toObject().keys();
+    const auto &keys = json["images"_ls].toObject().keys();
     for (const auto &k : keys) {
         Omittable<EventContent::ImageInfo> info;
-        if (json["images"][k].toObject().contains(QStringLiteral("info"))) {
-            info = EventContent::ImageInfo(QUrl(json["images"][k]["url"].toString()), json["images"][k]["info"].toObject(), k);
+        if (json["images"_ls][k].toObject().contains(QStringLiteral("info"))) {
+            info = EventContent::ImageInfo(QUrl(json["images"_ls][k]["url"_ls].toString()), json["images"_ls][k]["info"_ls].toObject(), k);
         } else {
             info = none;
         }
         images += ImagePackImage{
             k,
-            fromJson<QUrl>(json["images"][k]["url"].toString()),
-            fromJson<Omittable<QString>>(json["images"][k]["body"]),
+            fromJson<QUrl>(json["images"_ls][k]["url"_ls].toString()),
+            fromJson<Omittable<QString>>(json["images"_ls][k]["body"_ls]),
             info,
-            fromJson<Omittable<QStringList>>(json["images"][k]["usage"]),
+            fromJson<Omittable<QStringList>>(json["images"_ls][k]["usage"_ls]),
         };
     }
 }
@@ -42,20 +42,20 @@ void ImagePackEventContent::fillJson(QJsonObject *o) const
     if (pack) {
         QJsonObject packJson;
         if (pack->displayName) {
-            packJson["display_name"] = *pack->displayName;
+            packJson["display_name"_ls] = *pack->displayName;
         }
         if (pack->usage) {
             QJsonArray usageJson;
             for (const auto &usage : *pack->usage) {
                 usageJson += usage;
             }
-            packJson["usage"] = usageJson;
+            packJson["usage"_ls] = usageJson;
         }
         if (pack->avatarUrl) {
-            packJson["avatar_url"] = pack->avatarUrl->toString();
+            packJson["avatar_url"_ls] = pack->avatarUrl->toString();
         }
         if (pack->attribution) {
-            packJson["attribution"] = *pack->attribution;
+            packJson["attribution"_ls] = *pack->attribution;
         }
         (*o)["pack"_ls] = packJson;
     }
@@ -63,16 +63,16 @@ void ImagePackEventContent::fillJson(QJsonObject *o) const
     QJsonObject imagesJson;
     for (const auto &image : images) {
         QJsonObject imageJson;
-        imageJson["url"] = image.url.toString();
+        imageJson["url"_ls] = image.url.toString();
         if (image.body) {
-            imageJson["body"] = *image.body;
+            imageJson["body"_ls] = *image.body;
         }
         if (image.usage) {
             QJsonArray usageJson;
             for (const auto &usage : *image.usage) {
                 usageJson += usage;
             }
-            imageJson["usage"] = usageJson;
+            imageJson["usage"_ls] = usageJson;
         }
         imagesJson[image.shortcode] = imageJson;
     }

src/events/imagepackevent.h

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

src/events/joinrulesevent.h

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

src/events/pollevent.cpp

@@ -12,12 +12,12 @@ PollStartEvent::PollStartEvent(const QJsonObject &obj)
 
 int PollStartEvent::maxSelections() const
 {
-    return contentJson()["org.matrix.msc3381.poll.start"]["max_selections"].toInt();
+    return contentJson()["org.matrix.msc3381.poll.start"_ls]["max_selections"_ls].toInt();
 }
 
 QString PollStartEvent::question() const
 {
-    return contentJson()["org.matrix.msc3381.poll.start"]["question"]["body"].toString();
+    return contentJson()["org.matrix.msc3381.poll.start"_ls]["question"_ls]["body"_ls].toString();
 }
 
 PollResponseEvent::PollResponseEvent(const QJsonObject &obj)
@@ -32,7 +32,7 @@ PollEndEvent::PollEndEvent(const QJsonObject &obj)
 
 PollResponseEvent::PollResponseEvent(const QString &pollStartEventId, QStringList responses)
     : RoomEvent(basicJson(TypeId,
-                          {{"org.matrix.msc3381.poll.response", QJsonObject{{"answers", QJsonArray::fromStringList(responses)}}},
-                           {"m.relates_to", QJsonObject{{"rel_type", "m.reference"}, {"event_id", pollStartEventId}}}}))
+                          {{"org.matrix.msc3381.poll.response"_ls, QJsonObject{{"answers"_ls, QJsonArray::fromStringList(responses)}}},
+                           {"m.relates_to"_ls, QJsonObject{{"rel_type"_ls, "m.reference"_ls}, {"event_id"_ls, pollStartEventId}}}}))
 {
 }

src/events/pollevent.h

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

src/linkpreviewer.cpp

@@ -3,8 +3,10 @@
 
 #include "linkpreviewer.h"
 
-#include <connection.h>
-#include <csapi/content-repo.h>
+#include "controller.h"
+
+#include <Quotient/connection.h>
+#include <Quotient/csapi/content-repo.h>
 
 #include "neochatroom.h"
 
@@ -60,14 +62,14 @@ void LinkPreviewer::loadUrlPreview()
         Q_EMIT loadedChanged();
 
         auto conn = m_currentRoom->connection();
-        GetUrlPreviewJob *job = conn->callApi<GetUrlPreviewJob>(m_url.toString());
+        GetUrlPreviewJob *job = conn->callApi<GetUrlPreviewJob>(m_url);
 
         connect(job, &BaseJob::success, this, [this, job, conn]() {
             const auto json = job->jsonData();
-            m_title = json["og:title"].toString().trimmed();
-            m_description = json["og:description"].toString().trimmed().replace("\n", " ");
+            m_title = json["og:title"_ls].toString().trimmed();
+            m_description = json["og:description"_ls].toString().trimmed().replace("\n"_ls, " "_ls);
 
-            auto imageUrl = QUrl(json["og:image"].toString());
+            auto imageUrl = QUrl(json["og:image"_ls].toString());
             if (imageUrl.isValid() && imageUrl.scheme() == QStringLiteral("mxc")) {
                 m_imageSource = conn->makeMediaUrl(imageUrl);
             } else {

src/logger.cpp

@@ -87,32 +87,32 @@ public:
         QMutexLocker locker(&mutex);
         QByteArray buf;
         QTextStream str(&buf);
-        str << QDateTime::currentDateTime().toString(Qt::ISODate) << " [";
+        str << QDateTime::currentDateTime().toString(Qt::ISODate) << QStringLiteral(" [");
         switch (type) {
         case QtDebugMsg:
-            str << "DEBUG";
+            str << QStringLiteral("DEBUG");
             break;
         case QtInfoMsg:
-            str << "INFO ";
+            str << QStringLiteral("INFO ");
             break;
         case QtWarningMsg:
-            str << "WARN ";
+            str << QStringLiteral("WARN ");
             break;
         case QtFatalMsg:
-            str << "FATAL";
+            str << QStringLiteral("FATAL");
             break;
         case QtCriticalMsg:
-            str << "CRITICAL";
+            str << QStringLiteral("CRITICAL");
             break;
         }
-        str << "] " << context.category << ": ";
+        str << QStringLiteral("] ") << context.category << QStringLiteral(": ");
         if (context.file && *context.file && context.line) {
-            str << context.file << ":" << context.line << ": ";
+            str << context.file << QStringLiteral(":") << context.line << QStringLiteral(": ");
         }
         if (context.function && *context.function) {
-            str << context.function << ": ";
+            str << context.function << QStringLiteral(": ");
         }
-        str << message << "\n";
+        str << message << QStringLiteral("\n");
         str.flush();
         file.write(buf.constData(), buf.size());
         file.flush();
@@ -129,18 +129,18 @@ public:
         if (file.isOpen()) {
             file.close();
         }
-        auto filePath = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QDir::separator() + appName;
+        const auto &filePath = QStringLiteral("%1%2%3").arg(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation), QDir::separator(), appName);
 
         QDir dir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QDir::separator());
         auto entryList = dir.entryList({appName + QStringLiteral(".*")});
         std::sort(entryList.begin(), entryList.end(), [](const auto &left, const auto &right) {
-            auto leftIndex = left.split(".").last().toInt();
-            auto rightIndex = right.split(".").last().toInt();
+            auto leftIndex = left.split(QStringLiteral(".")).last().toInt();
+            auto rightIndex = right.split(QStringLiteral(".")).last().toInt();
             return leftIndex > rightIndex;
         });
         for (const auto &entry : entryList) {
             bool ok = false;
-            const auto index = entry.split(".").last().toInt(&ok);
+            const auto index = entry.split(QStringLiteral(".")).last().toInt(&ok);
             if (!ok) {
                 continue;
             }
@@ -151,8 +151,8 @@ public:
                     file.remove();
                     continue;
                 }
-                const QString newName = filePath + QStringLiteral(".%1").arg(index + 1);
-                const bool success = file.copy(newName);
+                const auto &newName = QStringLiteral("%1.%2").arg(filePath, QString::number(index + 1));
+                const auto success = file.copy(newName);
                 if (success) {
                     file.remove();
                 } else {
@@ -216,7 +216,7 @@ void initLogging()
     oldCategoryFilter = QLoggingCategory::installFilter(filter);
     oldHandler = qInstallMessageHandler(messageHandler);
     sInstance->setOrigHandler(oldHandler);
-    sInstance->setName("neochat.log");
+    sInstance->setName(QStringLiteral("neochat.log"));
 }
 
 #include "logger.moc"

src/login.cpp

@@ -3,10 +3,9 @@
 
 #include "login.h"
 
-#include <accountregistry.h>
-
-#include <connection.h>
-#include <qt_connection_util.h>
+#include <Quotient/accountregistry.h>
+#include <Quotient/connection.h>
+#include <Quotient/qt_connection_util.h>
 
 #include "controller.h"
 
@@ -34,16 +33,16 @@ void Login::init()
 
     connect(this, &Login::matrixIdChanged, this, [this]() {
         setHomeserverReachable(false);
-        QRegularExpression validator("^\\@?[a-zA-Z0-9\\._=\\-/]+\\:[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)*(\\:[0-9]+)?$");
+        QRegularExpression validator(QStringLiteral("^\\@?[a-zA-Z0-9\\._=\\-/]+\\:[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)*(\\:[0-9]+)?$"));
         if (!validator.match(m_matrixId).hasMatch()) {
             return;
         }
 
-        if (m_matrixId == "@") {
+        if (m_matrixId == QLatin1Char('@')) {
             return;
         }
 
-        m_isLoggedIn = Accounts.isLoggedIn(m_matrixId);
+        m_isLoggedIn = Controller::instance().accounts().isLoggedIn(m_matrixId);
         Q_EMIT isLoggedInChanged();
         if (m_isLoggedIn) {
             return;
@@ -121,8 +120,8 @@ QString Login::matrixId() const
 void Login::setMatrixId(const QString &matrixId)
 {
     m_matrixId = matrixId;
-    if (!m_matrixId.startsWith('@')) {
-        m_matrixId.prepend('@');
+    if (!m_matrixId.startsWith(QLatin1Char('@'))) {
+        m_matrixId.prepend(QLatin1Char('@'));
     }
     Q_EMIT matrixIdChanged();
 }
@@ -156,7 +155,7 @@ void Login::login()
 
     // Some servers do not have a .well_known file. So we login via the username part from the mxid,
     // rather than with the full mxid, as that would lead to an invalid user.
-    auto username = m_matrixId.mid(1, m_matrixId.indexOf(":") - 1);
+    auto username = m_matrixId.mid(1, m_matrixId.indexOf(QLatin1Char(':')) - 1);
     m_connection->loginWithPassword(username, m_password, m_deviceName, QString());
 }
 

src/main.cpp

@@ -3,7 +3,9 @@
 
 #include <QCommandLineParser>
 #include <QIcon>
+#include <QNetworkDiskCache>
 #include <QNetworkProxyFactory>
+#include <QObject>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <QQmlNetworkAccessManagerFactory>
@@ -28,10 +30,12 @@
 
 #include "neochat-version.h"
 
-#include <accountregistry.h>
-#include <networkaccessmanager.h>
-#include <room.h>
-#include <util.h>
+#include <Quotient/accountregistry.h>
+#include <Quotient/keyverificationsession.h>
+#include <Quotient/networkaccessmanager.h>
+#include <Quotient/room.h>
+#include <Quotient/user.h>
+#include <Quotient/util.h>
 
 #include "actionshandler.h"
 #include "blurhashimageprovider.h"
@@ -49,6 +53,7 @@
 #include "models/collapsestateproxymodel.h"
 #include "models/customemojimodel.h"
 #include "models/devicesmodel.h"
+#include "models/devicesproxymodel.h"
 #include "models/emojimodel.h"
 #include "models/emoticonfiltermodel.h"
 #include "models/imagepacksmodel.h"
@@ -73,20 +78,18 @@
 #include "models/webshortcutmodel.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
-#include "neochatuser.h"
 #include "notificationsmanager.h"
 #include "pollhandler.h"
 #include "roommanager.h"
 #include "spacehierarchycache.h"
 #include "urlhelper.h"
 #include "windowcontroller.h"
-#include <keyverificationsession.h>
+
 #ifdef HAVE_COLORSCHEME
 #include "colorschemer.h"
 #endif
 #include "models/completionmodel.h"
 #include "models/statemodel.h"
-#include "neochatuser.h"
 
 #ifdef HAVE_RUNNER
 #include "runner.h"
@@ -103,7 +106,17 @@ class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
 {
     QNetworkAccessManager *create(QObject *) override
     {
-        return NetworkAccessManager::instance();
+        auto nam = NetworkAccessManager::instance();
+        nam->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
+
+        nam->enableStrictTransportSecurityStore(true, QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1String("/hsts/"));
+        nam->setStrictTransportSecurityEnabled(true);
+
+        auto namDiskCache = new QNetworkDiskCache(nam);
+        namDiskCache->setCacheDirectory(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1String("/nam/"));
+        nam->setCache(namDiskCache);
+
+        return nam;
     }
 };
 
@@ -130,7 +143,7 @@ int main(int argc, char *argv[])
     QGuiApplication app(argc, argv);
     QQuickStyle::setStyle(QStringLiteral("org.kde.breeze"));
 #else
-    QIcon::setFallbackThemeName("breeze");
+    QIcon::setFallbackThemeName("breeze"_ls);
     QApplication app(argc, argv);
     // Default to org.kde.desktop style unless the user forces another style
     if (qEnvironmentVariableIsEmpty("QT_QUICK_CONTROLS_STYLE")) {
@@ -152,7 +165,7 @@ int main(int argc, char *argv[])
 #endif
     KLocalizedString::setApplicationDomain("neochat");
 
-    QGuiApplication::setOrganizationName("KDE");
+    QGuiApplication::setOrganizationName("KDE"_ls);
 
     KAboutData about(QStringLiteral("neochat"),
                      i18n("NeoChat"),
@@ -189,7 +202,8 @@ int main(int argc, char *argv[])
 #ifdef NEOCHAT_FLATPAK
     // Copy over the included FontConfig configuration to the
     // app's config dir:
-    QFile::copy("/app/etc/fonts/conf.d/99-noto-mono-color-emoji.conf", "/var/config/fontconfig/conf.d/99-noto-mono-color-emoji.conf");
+    QFile::copy(QStringLiteral("/app/etc/fonts/conf.d/99-noto-mono-color-emoji.conf"),
+                QStringLiteral("/var/config/fontconfig/conf.d/99-noto-mono-color-emoji.conf"));
 #endif
 
     Clipboard clipboard;
@@ -216,7 +230,7 @@ int main(int argc, char *argv[])
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "LoginHelper", login);
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "UrlHelper", &urlHelper);
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "EmojiModel", &EmojiModel::instance());
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "AccountRegistry", &Quotient::Accounts);
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "AccountRegistry", &Controller::instance().accounts());
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "SpaceHierarchyCache", &SpaceHierarchyCache::instance());
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "CustomEmojiModel", &CustomEmojiModel::instance());
     qmlRegisterType<ActionsHandler>("org.kde.neochat", 1, 0, "ActionsHandler");
@@ -236,6 +250,7 @@ int main(int argc, char *argv[])
     qmlRegisterType<SortFilterRoomListModel>("org.kde.neochat", 1, 0, "SortFilterRoomListModel");
     qmlRegisterType<SortFilterSpaceListModel>("org.kde.neochat", 1, 0, "SortFilterSpaceListModel");
     qmlRegisterType<DevicesModel>("org.kde.neochat", 1, 0, "DevicesModel");
+    qmlRegisterType<DevicesProxyModel>("org.kde.neochat", 1, 0, "DevicesProxyModel");
     qmlRegisterType<LinkPreviewer>("org.kde.neochat", 1, 0, "LinkPreviewer");
     qmlRegisterType<CompletionModel>("org.kde.neochat", 1, 0, "CompletionModel");
     qmlRegisterType<StateModel>("org.kde.neochat", 1, 0, "StateModel");
@@ -250,13 +265,13 @@ int main(int argc, char *argv[])
     qmlRegisterType<AccountEmoticonModel>("org.kde.neochat", 1, 0, "AccountEmoticonModel");
     qmlRegisterType<EmoticonFilterModel>("org.kde.neochat", 1, 0, "EmoticonFilterModel");
     qmlRegisterType<DelegateSizeHelper>("org.kde.neochat", 1, 0, "DelegateSizeHelper");
-    qmlRegisterUncreatableType<RoomMessageEvent>("org.kde.neochat", 1, 0, "RoomMessageEvent", "ENUM");
-    qmlRegisterUncreatableType<PushNotificationKind>("org.kde.neochat", 1, 0, "PushNotificationKind", "ENUM");
-    qmlRegisterUncreatableType<PushNotificationSection>("org.kde.neochat", 1, 0, "PushNotificationSection", "ENUM");
-    qmlRegisterUncreatableType<PushNotificationState>("org.kde.neochat", 1, 0, "PushNotificationState", "ENUM");
-    qmlRegisterUncreatableType<PushNotificationAction>("org.kde.neochat", 1, 0, "PushNotificationAction", "ENUM");
-    qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM");
-    qmlRegisterUncreatableType<NeoChatUser>("org.kde.neochat", 1, 0, "NeoChatUser", {});
+    qmlRegisterUncreatableType<RoomMessageEvent>("org.kde.neochat", 1, 0, "RoomMessageEvent", "ENUM"_ls);
+    qmlRegisterUncreatableType<PushNotificationKind>("org.kde.neochat", 1, 0, "PushNotificationKind", "ENUM"_ls);
+    qmlRegisterUncreatableType<PushNotificationSection>("org.kde.neochat", 1, 0, "PushNotificationSection", "ENUM"_ls);
+    qmlRegisterUncreatableType<PushNotificationState>("org.kde.neochat", 1, 0, "PushNotificationState", "ENUM"_ls);
+    qmlRegisterUncreatableType<PushNotificationAction>("org.kde.neochat", 1, 0, "PushNotificationAction", "ENUM"_ls);
+    qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM"_ls);
+    qmlRegisterUncreatableType<User>("org.kde.neochat", 1, 0, "User", {});
     qmlRegisterUncreatableType<NeoChatRoom>("org.kde.neochat", 1, 0, "NeoChatRoom", {});
 
     qRegisterMetaType<User *>("User*");
@@ -266,18 +281,16 @@ int main(int argc, char *argv[])
     qRegisterMetaType<Connection *>("Connection*");
     qRegisterMetaType<MessageEventType>("MessageEventType");
     qRegisterMetaType<NeoChatRoom *>("NeoChatRoom*");
-    qRegisterMetaType<NeoChatUser *>("NeoChatUser*");
+    qRegisterMetaType<User *>("User*");
     qRegisterMetaType<GetRoomEventsJob *>("GetRoomEventsJob*");
     qRegisterMetaType<QMimeType>("QMimeType");
-#ifdef Quotient_E2EE_ENABLED
     qRegisterMetaType<KeyVerificationSession *>("KeyVerificationSession*");
     qmlRegisterUncreatableType<KeyVerificationSession>("org.kde.neochat", 1, 0, "KeyVerificationSession", {});
     qRegisterMetaType<QVector<EmojiEntry>>("QVector<EmojiEntry>");
-#endif
     qmlRegisterSingletonType("org.kde.neochat", 1, 0, "About", [](QQmlEngine *engine, QJSEngine *) -> QJSValue {
         return engine->toScriptValue(KAboutData::applicationData());
     });
-    qmlRegisterSingletonType(QUrl("qrc:/OsmLocationPlugin.qml"), "org.kde.neochat", 1, 0, "OsmLocationPlugin");
+    qmlRegisterSingletonType(QUrl("qrc:/OsmLocationPlugin.qml"_ls), "org.kde.neochat", 1, 0, "OsmLocationPlugin");
     qmlRegisterSingletonType("org.kde.neochat", 1, 0, "LocationHelper", [](QQmlEngine *engine, QJSEngine *) -> QJSValue {
         return engine->toScriptValue(LocationHelper());
     });
@@ -320,11 +333,18 @@ int main(int argc, char *argv[])
     QCommandLineParser parser;
     parser.setApplicationDescription(i18n("Client for the matrix communication protocol"));
     parser.addPositionalArgument(QStringLiteral("urls"), i18n("Supports matrix: url scheme"));
+    parser.addOption(QCommandLineOption("ignore-ssl-errors"_ls, i18n("Ignore all SSL Errors, e.g., unsigned certificates.")));
 
     about.setupCommandLine(&parser);
     parser.process(app);
     about.processCommandLine(&parser);
 
+    if (parser.isSet("ignore-ssl-errors"_ls)) {
+        QObject::connect(NetworkAccessManager::instance(), &QNetworkAccessManager::sslErrors, NetworkAccessManager::instance(), [](QNetworkReply *reply) {
+            reply->ignoreSslErrors();
+        });
+    }
+
     engine.addImageProvider(QLatin1String("mxc"), new MatrixImageProvider);
     engine.addImageProvider(QLatin1String("blurhash"), new BlurhashImageProvider);
 
@@ -339,7 +359,7 @@ int main(int argc, char *argv[])
 
 #ifdef HAVE_RUNNER
     Runner runner;
-    QDBusConnection::sessionBus().registerObject("/RoomRunner", &runner, QDBusConnection::ExportScriptableContents);
+    QDBusConnection::sessionBus().registerObject("/RoomRunner"_ls, &runner, QDBusConnection::ExportScriptableContents);
 #endif
 
     QWindow *window = windowFromEngine(&engine);

src/matriximageprovider.cpp

@@ -13,7 +13,7 @@
 #include <KLocalizedString>
 
 #include "controller.h"
-#include <connection.h>
+#include <Quotient/connection.h>
 
 using namespace Quotient;
 
@@ -25,18 +25,24 @@ ThumbnailResponse::ThumbnailResponse(QString id, QSize size)
                          mediaId,
                          QString::number(requestedSize.width()),
                          QString::number(requestedSize.height())))
-    , errorStr("Image request hasn't started")
+    , errorStr("Image request hasn't started"_ls)
 {
     if (requestedSize.isEmpty()) {
         requestedSize.setHeight(100);
         requestedSize.setWidth(100);
     }
-    if (mediaId.count('/') != 1) {
-        errorStr = i18n("Media id '%1' doesn't follow server/mediaId pattern", mediaId);
-        Q_EMIT finished();
-        return;
+    if (mediaId.count(QLatin1Char('/')) != 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;
+        }
     }
 
+    mediaId = mediaId.split(QLatin1Char('?'))[0];
+
     QImage cachedImage;
     if (cachedImage.load(localFile)) {
         image = cachedImage;

src/matriximageprovider.h

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

src/models/accountemoticonmodel.cpp

@@ -3,7 +3,7 @@
 
 #include "accountemoticonmodel.h"
 
-#include <csapi/content-repo.h>
+#include <Quotient/csapi/content-repo.h>
 #include <qcoro/qcorosignal.h>
 
 using namespace Quotient;
@@ -138,7 +138,7 @@ QCoro::Task<void> AccountEmoticonModel::doSetEmoticonImage(int index, QUrl sourc
     if (job->error() != BaseJob::NoError) {
         co_return;
     }
-    m_images->images[index].url = job->contentUri().toString();
+    m_images->images[index].url = job->contentUri();
     m_images->images[index].info = none;
     QJsonObject data;
     m_images->fillJson(&data);

src/models/accountemoticonmodel.h

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

src/models/actionsmodel.cpp

@@ -6,17 +6,18 @@
 #include "controller.h"
 #include "neochatroom.h"
 #include "roommanager.h"
-#include <events/roommemberevent.h>
-#include <events/roompowerlevelsevent.h>
+#include <Quotient/events/roommemberevent.h>
+#include <Quotient/events/roompowerlevelsevent.h>
 
 #include <KLocalizedString>
 
 using Action = ActionsModel::Action;
 using namespace Quotient;
 
-QStringList rainbowColors{"#ff2b00", "#ff5500", "#ff8000", "#ffaa00", "#ffd500", "#ffff00", "#d4ff00", "#aaff00", "#80ff00", "#55ff00", "#2bff00", "#00ff00",
-                          "#00ff2b", "#00ff55", "#00ff80", "#00ffaa", "#00ffd5", "#00ffff", "#00d4ff", "#00aaff", "#007fff", "#0055ff", "#002bff", "#0000ff",
-                          "#2a00ff", "#5500ff", "#7f00ff", "#aa00ff", "#d400ff", "#ff00ff", "#ff00d4", "#ff00aa", "#ff0080", "#ff0055", "#ff002b", "#ff0000"};
+QStringList rainbowColors{"#ff2b00"_ls, "#ff5500"_ls, "#ff8000"_ls, "#ffaa00"_ls, "#ffd500"_ls, "#ffff00"_ls, "#d4ff00"_ls, "#aaff00"_ls, "#80ff00"_ls,
+                          "#55ff00"_ls, "#2bff00"_ls, "#00ff00"_ls, "#00ff2b"_ls, "#00ff55"_ls, "#00ff80"_ls, "#00ffaa"_ls, "#00ffd5"_ls, "#00ffff"_ls,
+                          "#00d4ff"_ls, "#00aaff"_ls, "#007fff"_ls, "#0055ff"_ls, "#002bff"_ls, "#0000ff"_ls, "#2a00ff"_ls, "#5500ff"_ls, "#7f00ff"_ls,
+                          "#aa00ff"_ls, "#d400ff"_ls, "#ff00ff"_ls, "#ff00d4"_ls, "#ff00aa"_ls, "#ff0080"_ls, "#ff0055"_ls, "#ff002b"_ls, "#ff0000"_ls};
 
 auto leaveRoomLambda = [](const QString &text, NeoChatRoom *room) {
     if (text.isEmpty()) {
@@ -260,7 +261,7 @@ QVector<ActionsModel::Action> actions{
             }
             Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Knocking room <roomname>.", "Knocking room %1.", text));
             auto connection = Controller::instance().activeConnection();
-            const auto knownServer = roomName.mid(roomName.indexOf(":") + 1);
+            const auto knownServer = roomName.mid(roomName.indexOf(":"_ls) + 1);
             if (parts.length() >= 2) {
                 RoomManager::instance().knockRoom(connection, roomName, parts[1], QStringList{knownServer});
             } else {
@@ -436,7 +437,10 @@ QVector<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is already banned from this room.", "%1 is already banned from this room.", text));
                 return QString();
             }
-            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
+            auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
+            if (!plEvent) {
+                return QString();
+            }
             if (plEvent->ban() > plEvent->powerLevelForUser(room->localUser()->id())) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to ban users from this room."));
                 return QString();
@@ -447,7 +451,7 @@ QVector<ActionsModel::Action> actions{
                     i18nc("You are not allowed to ban <username> from this room.", "You are not allowed to ban %1 from this room.", parts[0]));
                 return QString();
             }
-            room->ban(parts[0], parts.size() > 1 ? parts.mid(1).join(" ") : QString());
+            room->ban(parts[0], parts.size() > 1 ? parts.mid(1).join(QLatin1Char(' ')) : QString());
             Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> was banned from this room.", "%1 was banned from this room.", parts[0]));
             return QString();
         },
@@ -466,7 +470,10 @@ QVector<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
-            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
+            auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
+            if (!plEvent) {
+                return QString();
+            }
             if (plEvent->ban() > plEvent->powerLevelForUser(room->localUser()->id())) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to unban users from this room."));
                 return QString();
@@ -506,7 +513,10 @@ QVector<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("<username> is not in this room", "%1 is not in this room.", parts[0]));
                 return QString();
             }
-            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
+            auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
+            if (!plEvent) {
+                return QString();
+            }
             auto kick = plEvent->kick();
             if (plEvent->powerLevelForUser(room->localUser()->id()) < kick) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to kick users from this room."));
@@ -518,7 +528,7 @@ QVector<ActionsModel::Action> actions{
                     i18nc("You are not allowed to kick <username> from this room", "You are not allowed to kick %1 from this room.", parts[0]));
                 return QString();
             }
-            room->kickMember(parts[0], parts.size() > 1 ? parts.mid(1).join(" ") : QString());
+            room->kickMember(parts[0], parts.size() > 1 ? parts.mid(1).join(QLatin1Char(' ')) : QString());
             Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> was kicked from this room.", "%1 was kicked from this room.", parts[0]));
             return QString();
         },

src/models/actionsmodel.h

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

src/models/collapsestateproxymodel.cpp

@@ -75,13 +75,13 @@ QString CollapseStateProxyModel::aggregateEventToString(int sourceRow) const
             }
         }
         chunks.removeDuplicates();
-        QString text = "<style>a {text-decoration: none;}</style>"; // There can be links in the event text so make sure all are styled.
+        QString text = QStringLiteral("<style>a {text-decoration: none;}</style>"); // There can be links in the event text so make sure all are styled.
         // The author text is either "n users" if > 1 user or the matrix.to link to a single user.
         QString userText = uniqueAuthors.length() > 1 ? i18ncp("n users", " %1 user ", " %1 users ", uniqueAuthors.length())
                                                       : QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a> ")
-                                                            .arg(uniqueAuthors[0].toMap()["id"].toString(),
-                                                                 uniqueAuthors[0].toMap()["color"].toString(),
-                                                                 uniqueAuthors[0].toMap()["displayName"].toString());
+                                                            .arg(uniqueAuthors[0].toMap()[QStringLiteral("id")].toString(),
+                                                                 uniqueAuthors[0].toMap()[QStringLiteral("color")].toString(),
+                                                                 uniqueAuthors[0].toMap()[QStringLiteral("displayName")].toString().toHtmlEscaped());
         text += userText;
         text += chunks.takeFirst();
 
@@ -104,9 +104,9 @@ QVariantList CollapseStateProxyModel::stateEventsList(int sourceRow) const
     QVariantList stateEvents;
     for (int i = sourceRow; i >= 0; i--) {
         auto nextState = QVariantMap{
-            {"author", sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorRole)},
-            {"authorDisplayName", sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorDisplayNameRole).toString()},
-            {"text", sourceModel()->data(sourceModel()->index(i, 0), Qt::DisplayRole).toString()},
+            {QStringLiteral("author"), sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorRole)},
+            {QStringLiteral("authorDisplayName"), sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorDisplayNameRole).toString()},
+            {QStringLiteral("text"), sourceModel()->data(sourceModel()->index(i, 0), Qt::DisplayRole).toString()},
         };
         stateEvents.append(nextState);
         if (i > 0

src/models/completionmodel.cpp

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

src/models/completionmodel.h

@@ -40,12 +40,12 @@ class CompletionModel : public QAbstractListModel
      *
      * @sa AutoCompletionType
      */
-    Q_PROPERTY(AutoCompletionType autoCompletionType READ autoCompletionType NOTIFY autoCompletionTypeChanged);
+    Q_PROPERTY(AutoCompletionType autoCompletionType READ autoCompletionType NOTIFY autoCompletionTypeChanged)
 
     /**
      * @brief The RoomListModel to be used for room completions.
      */
-    Q_PROPERTY(RoomListModel *roomListModel READ roomListModel WRITE setRoomListModel NOTIFY roomListModelChanged);
+    Q_PROPERTY(RoomListModel *roomListModel READ roomListModel WRITE setRoomListModel NOTIFY roomListModelChanged)
 
 public:
     /**
@@ -64,14 +64,14 @@ public:
      * @brief Defines the model roles.
      */
     enum Roles {
-        Text = Qt::DisplayRole, /**< The main text to show. */
-        Subtitle, /**< The subtitle text to show. */
-        Icon, /**< The icon to show. */
-        ReplacedText, /**< The text to replace the input text with for the completion. */
+        DisplayNameRole = Qt::DisplayRole, /**< The main text to show. */
+        SubtitleRole, /**< The subtitle text to show. */
+        IconNameRole, /**< The icon to show. */
+        ReplacedTextRole, /**< The text to replace the input text with for the completion. */
     };
     Q_ENUM(Roles)
 
-    CompletionModel(QObject *parent = nullptr);
+    explicit CompletionModel(QObject *parent = nullptr);
 
     /**
      * @brief Get the given role value at the given index.

src/models/completionproxymodel.cpp

@@ -11,6 +11,11 @@ bool CompletionProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &so
     if (m_filterText.isEmpty()) {
         return false;
     }
+
+    if (sourceModel()->data(sourceModel()->index(sourceRow, 0), filterRole()).toString().isEmpty()) {
+        return false;
+    }
+
     return (sourceModel()->data(sourceModel()->index(sourceRow, 0), filterRole()).toString().startsWith(m_filterText, Qt::CaseInsensitive)
             && !m_fullText.startsWith(sourceModel()->data(sourceModel()->index(sourceRow, 0), filterRole()).toString()))
         || (m_secondaryFilterRole != -1

src/models/customemojimodel.cpp

@@ -9,10 +9,9 @@
 #include "controller.h"
 #include "emojimodel.h"
 
-#include <connection.h>
-#include <csapi/account-data.h>
-#include <csapi/content-repo.h>
-#include <events/eventcontent.h>
+#include <Quotient/connection.h>
+#include <Quotient/csapi/account-data.h>
+#include <Quotient/csapi/content-repo.h>
 
 using namespace Quotient;
 
@@ -22,14 +21,14 @@ void CustomEmojiModel::fetchEmojis()
         return;
     }
 
-    const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes");
+    const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes"_ls);
     if (data == nullptr) {
         return;
     }
-    QJsonObject emojis = data->contentJson()["images"].toObject();
+    QJsonObject emojis = data->contentJson()["images"_ls].toObject();
 
     // TODO: Remove with stable migration
-    const auto legacyEmojis = data->contentJson()["emoticons"].toObject();
+    const auto legacyEmojis = data->contentJson()["emoticons"_ls].toObject();
     for (const auto &emoji : legacyEmojis.keys()) {
         if (!emojis.contains(emoji)) {
             emojis[emoji] = legacyEmojis[emoji];
@@ -42,9 +41,9 @@ void CustomEmojiModel::fetchEmojis()
     for (const auto &emoji : emojis.keys()) {
         const auto &data = emojis[emoji];
 
-        const auto e = emoji.startsWith(":") ? emoji : (QStringLiteral(":") + emoji + QStringLiteral(":"));
+        const auto e = emoji.startsWith(":"_ls) ? emoji : (QStringLiteral(":") + emoji + QStringLiteral(":"));
 
-        m_emojis << CustomEmoji{e, data.toObject()["url"].toString(), QRegularExpression(e)};
+        m_emojis << CustomEmoji{e, data.toObject()["url"_ls].toString(), QRegularExpression(e)};
     }
 
     endResetModel();
@@ -57,19 +56,19 @@ void CustomEmojiModel::addEmoji(const QString &name, const QUrl &location)
     auto job = Controller::instance().activeConnection()->uploadFile(location.toLocalFile());
 
     connect(job, &BaseJob::success, this, [name, location, job] {
-        const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes");
+        const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes"_ls);
         auto json = data != nullptr ? data->contentJson() : QJsonObject();
-        auto emojiData = json["images"].toObject();
+        auto emojiData = json["images"_ls].toObject();
 
         QString url;
         url = job->contentUri().toString();
 
         QImage image(location.toLocalFile());
         QJsonObject imageInfo;
-        imageInfo["w"] = image.width();
-        imageInfo["h"] = image.height();
-        imageInfo["mimetype"] = QMimeDatabase().mimeTypeForFile(location.toLocalFile()).name();
-        imageInfo["size"] = image.sizeInBytes();
+        imageInfo["w"_ls] = image.width();
+        imageInfo["h"_ls] = image.height();
+        imageInfo["mimetype"_ls] = QMimeDatabase().mimeTypeForFile(location.toLocalFile()).name();
+        imageInfo["size"_ls] = image.sizeInBytes();
 
         emojiData[QStringLiteral("%1").arg(name)] = QJsonObject({
             {QStringLiteral("url"), url},
@@ -78,8 +77,8 @@ void CustomEmojiModel::addEmoji(const QString &name, const QUrl &location)
             {"usage"_ls, "emoticon"_ls},
         });
 
-        json["images"] = emojiData;
-        Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes", json);
+        json["images"_ls] = emojiData;
+        Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes"_ls, json);
     });
 }
 
@@ -87,30 +86,30 @@ void CustomEmojiModel::removeEmoji(const QString &name)
 {
     using namespace Quotient;
 
-    const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes");
+    const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes"_ls);
     Q_ASSERT(data);
     auto json = data->contentJson();
     const QString _name = name.mid(1).chopped(1);
-    auto emojiData = json["images"].toObject();
+    auto emojiData = json["images"_ls].toObject();
 
     if (emojiData.contains(name)) {
         emojiData.remove(name);
-        json["images"] = emojiData;
+        json["images"_ls] = emojiData;
     }
     if (emojiData.contains(_name)) {
         emojiData.remove(_name);
-        json["images"] = emojiData;
+        json["images"_ls] = emojiData;
     }
-    emojiData = json["emoticons"].toObject();
+    emojiData = json["emoticons"_ls].toObject();
     if (emojiData.contains(name)) {
         emojiData.remove(name);
-        json["emoticons"] = emojiData;
+        json["emoticons"_ls] = emojiData;
     }
     if (emojiData.contains(_name)) {
         emojiData.remove(_name);
-        json["emoticons"] = emojiData;
+        json["emoticons"_ls] = emojiData;
     }
-    Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes", json);
+    Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes"_ls, json);
 }
 
 CustomEmojiModel::CustomEmojiModel(QObject *parent)
@@ -175,7 +174,7 @@ QHash<int, QByteArray> CustomEmojiModel::roleNames() const
 
 QString CustomEmojiModel::preprocessText(const QString &text)
 {
-    auto parts = text.split("```");
+    auto parts = text.split("```"_ls);
     bool skip = true;
     for (auto &part : parts) {
         skip = !skip;
@@ -188,7 +187,7 @@ QString CustomEmojiModel::preprocessText(const QString &text)
                 QStringLiteral(R"(<img data-mx-emoticon="" src="%1" alt="%2" title="%2" height="32" vertical-align="middle" />)").arg(emoji.url, emoji.name));
         }
     }
-    return parts.join("```");
+    return parts.join("```"_ls);
 }
 
 QVariantList CustomEmojiModel::filterModel(const QString &filter)

src/models/devicesmodel.cpp

@@ -3,23 +3,22 @@
 
 #include "devicesmodel.h"
 
-#include <csapi/device_management.h>
-
 #include "controller.h"
-#include <connection.h>
-#include <user.h>
+
+#include <QDateTime>
+#include <QLocale>
+
+#include <KLocalizedString>
+
+#include <Quotient/csapi/device_management.h>
+#include <Quotient/connection.h>
+#include <Quotient/user.h>
 
 using namespace Quotient;
 
 DevicesModel::DevicesModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    connect(&Controller::instance(), &Controller::activeConnectionChanged, this, [this]() {
-        DevicesModel::fetchDevices();
-        Q_EMIT connectionChanged();
-    });
-
-    fetchDevices();
 }
 
 void DevicesModel::fetchDevices()
@@ -30,6 +29,7 @@ void DevicesModel::fetchDevices()
             beginResetModel();
             m_devices = job->devices();
             endResetModel();
+            Q_EMIT countChanged();
         });
     }
 }
@@ -40,16 +40,39 @@ QVariant DevicesModel::data(const QModelIndex &index, int role) const
         return {};
     }
 
+    const auto &device = m_devices[index.row()];
+
     switch (role) {
     case Id:
-        return m_devices[index.row()].deviceId;
+        return device.deviceId;
     case DisplayName:
-        return m_devices[index.row()].displayName;
+        return device.displayName;
     case LastIp:
-        return m_devices[index.row()].lastSeenIp;
+        return device.lastSeenIp;
     case LastTimestamp:
-        if (m_devices[index.row()].lastSeenTs)
-            return *m_devices[index.row()].lastSeenTs;
+        if (device.lastSeenTs) {
+            return *device.lastSeenTs;
+        } else {
+            return false;
+        }
+    case TimestampString:
+        if (device.lastSeenTs) {
+            return QDateTime::fromMSecsSinceEpoch(*device.lastSeenTs).toString(QLocale().dateTimeFormat(QLocale::ShortFormat));
+        } else {
+            return false;
+        }
+    case Type:
+        if (device.deviceId == m_connection->deviceId()) {
+            return This;
+        }
+        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;
+        }
     }
     return {};
 }
@@ -62,11 +85,22 @@ int DevicesModel::rowCount(const QModelIndex &parent) const
 
 QHash<int, QByteArray> DevicesModel::roleNames() const
 {
-    return {{Id, "id"}, {DisplayName, "displayName"}, {LastIp, "lastIp"}, {LastTimestamp, "lastTimestamp"}};
+    return {
+        {Id, "id"},
+        {DisplayName, "displayName"},
+        {LastIp, "lastIp"},
+        {LastTimestamp, "lastTimestamp"},
+        {TimestampString, "timestamp"},
+        {Type, "type"},
+    };
 }
 
-void DevicesModel::logout(int index, const QString &password)
+void DevicesModel::logout(const QString &deviceId, const QString &password)
 {
+    int index;
+    for (index = 0; m_devices[index].deviceId != deviceId; index++)
+        ;
+
     auto job = Controller::instance().activeConnection()->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId);
 
     connect(job, &BaseJob::result, this, [this, job, password, index] {
@@ -74,15 +108,16 @@ void DevicesModel::logout(int index, const QString &password)
             beginRemoveRows(QModelIndex(), index, index);
             m_devices.remove(index);
             endRemoveRows();
+            Q_EMIT countChanged();
         };
         if (job->error() != BaseJob::Success) {
             QJsonObject replyData = job->jsonData();
             QJsonObject authData;
-            authData["session"] = replyData["session"];
-            authData["password"] = password;
-            authData["type"] = "m.login.password";
-            QJsonObject identifier = {{"type", "m.id.user"}, {"user", Controller::instance().activeConnection()->user()->id()}};
-            authData["identifier"] = identifier;
+            authData["session"_ls] = replyData["session"_ls];
+            authData["password"_ls] = password;
+            authData["type"_ls] = "m.login.password"_ls;
+            QJsonObject identifier = {{"type"_ls, "m.id.user"_ls}, {"user"_ls, Controller::instance().activeConnection()->user()->id()}};
+            authData["identifier"_ls] = identifier;
             auto *innerJob = Controller::instance().activeConnection()->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId, authData);
             connect(innerJob, &BaseJob::success, this, onSuccess);
         } else {
@@ -91,8 +126,11 @@ void DevicesModel::logout(int index, const QString &password)
     });
 }
 
-void DevicesModel::setName(int index, const QString &name)
+void DevicesModel::setName(const QString &deviceId, const QString &name)
 {
+    int index;
+    for (index = 0; m_devices[index].deviceId != deviceId; index++);
+
     auto job = Controller::instance().activeConnection()->callApi<UpdateDeviceJob>(m_devices[index].deviceId, name);
     QString oldName = m_devices[index].displayName;
     beginResetModel();
@@ -107,7 +145,27 @@ void DevicesModel::setName(int index, const QString &name)
 
 Connection *DevicesModel::connection() const
 {
-    return Controller::instance().activeConnection();
+    return m_connection;
+}
+
+void DevicesModel::setConnection(Connection *connection)
+{
+    if (m_connection) {
+        disconnect(m_connection, nullptr, this, nullptr);
+    }
+    m_connection = connection;
+    Q_EMIT connectionChanged();
+    fetchDevices();
+
+    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,8 +4,9 @@
 #pragma once
 
 #include <QAbstractListModel>
+#include <QPointer>
 
-#include <csapi/definitions/client_device.h>
+#include <Quotient/csapi/definitions/client_device.h>
 
 namespace Quotient
 {
@@ -28,7 +29,7 @@ class DevicesModel : public QAbstractListModel
     /**
      * @brief The current connection that the model is getting its devices from.
      */
-    Q_PROPERTY(Quotient::Connection *connection READ connection NOTIFY connectionChanged)
+    Q_PROPERTY(Quotient::Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged REQUIRED)
 
 public:
     /**
@@ -39,10 +40,18 @@ public:
         DisplayName, /**< Display name set by the user for this device. */
         LastIp, /**< The IP address where this device was last seen. */
         LastTimestamp, /**< The timestamp when this devices was last seen. */
+        TimestampString, /**< String for the timestamp when this devices was last seen. */
+        Type, /**< The category to sort this device into. */
     };
     Q_ENUM(Roles)
 
-    DevicesModel(QObject *parent = nullptr);
+    enum DeviceType {
+        This,
+        Verified,
+        Unverified,
+        Unencrypted,
+    };
+    Q_ENUM(DeviceType);
 
     /**
      * @brief Get the given role value at the given index.
@@ -66,21 +75,27 @@ public:
     QHash<int, QByteArray> roleNames() const override;
 
     /**
-     * @brief Logout the device at the given index.
+     * @brief Logout the device with the given id.
      */
-    Q_INVOKABLE void logout(int index, const QString &password);
+    Q_INVOKABLE void logout(const QString &deviceId, const QString &password);
 
     /**
-     * @brief Set the display name of the device at the given index.
+     * @brief Set the display name of the device with the given id.
      */
-    Q_INVOKABLE void setName(int index, const QString &name);
+    Q_INVOKABLE void setName(const QString &deviceId, const QString &name);
 
-    Quotient::Connection *connection() const;
+    explicit DevicesModel(QObject *parent = nullptr);
+
+
+    [[nodiscard]] Quotient::Connection *connection() const;
+    void setConnection(Quotient::Connection *connection);
 
 Q_SIGNALS:
     void connectionChanged();
+    void countChanged();
 
 private:
     void fetchDevices();
     QVector<Quotient::Device> m_devices;
+    QPointer<Quotient::Connection> m_connection;
 };

src/models/devicesproxymodel.cpp

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

src/models/devicesproxymodel.h

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

src/models/emojimodel.cpp

@@ -63,7 +63,7 @@ QHash<int, QByteArray> EmojiModel::roleNames() const
 
 QVariantList EmojiModel::history() const
 {
-    return m_settings.value("Editor/emojis", QVariantList()).toList();
+    return m_settings.value(QStringLiteral("Editor/emojis"), QVariantList()).toList();
 }
 
 QVariantList EmojiModel::filterModel(const QString &filter, bool limit)
@@ -105,7 +105,7 @@ void EmojiModel::emojiUsed(const QVariant &modelData)
     }
 
     list.push_front(modelData);
-    m_settings.setValue("Editor/emojis", list);
+    m_settings.setValue(QStringLiteral("Editor/emojis"), list);
 
     Q_EMIT historyChanged();
 }
@@ -133,8 +133,8 @@ QVariantList EmojiModel::emojis(Category category) const
 
 QVariantList EmojiModel::tones(const QString &baseEmoji) const
 {
-    if (baseEmoji.endsWith("tone")) {
-        return EmojiTones::_tones.values(baseEmoji.split(":")[0]);
+    if (baseEmoji.endsWith(QStringLiteral("tone"))) {
+        return EmojiTones::_tones.values(baseEmoji.split(QStringLiteral(":"))[0]);
     }
     return EmojiTones::_tones.values(baseEmoji);
 }
@@ -145,54 +145,54 @@ QVariantList EmojiModel::categories() const
 {
     return QVariantList{
         {QVariantMap{
-            {"category", EmojiModel::HistoryNoCustom},
-            {"name", i18nc("Previously used emojis", "History")},
-            {"emoji", QStringLiteral("⌛️")},
+            {QStringLiteral("category"), EmojiModel::HistoryNoCustom},
+            {QStringLiteral("name"), i18nc("Previously used emojis", "History")},
+            {QStringLiteral("emoji"), QStringLiteral("⌛️")},
         }},
         {QVariantMap{
-            {"category", EmojiModel::Smileys},
-            {"name", i18nc("'Smileys' is a category of emoji", "Smileys")},
-            {"emoji", QStringLiteral("😏")},
+            {QStringLiteral("category"), EmojiModel::Smileys},
+            {QStringLiteral("name"), i18nc("'Smileys' is a category of emoji", "Smileys")},
+            {QStringLiteral("emoji"), QStringLiteral("😏")},
         }},
         {QVariantMap{
-            {"category", EmojiModel::People},
-            {"name", i18nc("'People' is a category of emoji", "People")},
-            {"emoji", QStringLiteral("🙋‍♂️")},
+            {QStringLiteral("category"), EmojiModel::People},
+            {QStringLiteral("name"), i18nc("'People' is a category of emoji", "People")},
+            {QStringLiteral("emoji"), QStringLiteral("🙋‍♂️")},
         }},
         {QVariantMap{
-            {"category", EmojiModel::Nature},
-            {"name", i18nc("'Nature' is a category of emoji", "Nature")},
-            {"emoji", QStringLiteral("🌲")},
+            {QStringLiteral("category"), EmojiModel::Nature},
+            {QStringLiteral("name"), i18nc("'Nature' is a category of emoji", "Nature")},
+            {QStringLiteral("emoji"), QStringLiteral("🌲")},
         }},
         {QVariantMap{
-            {"category", EmojiModel::Food},
-            {"name", i18nc("'Food' is a category of emoji", "Food")},
-            {"emoji", QStringLiteral("🍛")},
+            {QStringLiteral("category"), EmojiModel::Food},
+            {QStringLiteral("name"), i18nc("'Food' is a category of emoji", "Food")},
+            {QStringLiteral("emoji"), QStringLiteral("🍛")},
         }},
         {QVariantMap{
-            {"category", EmojiModel::Activities},
-            {"name", i18nc("'Activities' is a category of emoji", "Activities")},
-            {"emoji", QStringLiteral("🚁")},
+            {QStringLiteral("category"), EmojiModel::Activities},
+            {QStringLiteral("name"), i18nc("'Activities' is a category of emoji", "Activities")},
+            {QStringLiteral("emoji"), QStringLiteral("🚁")},
         }},
         {QVariantMap{
-            {"category", EmojiModel::Travel},
-            {"name", i18nc("'Travel' is  a category of emoji", "Travel")},
-            {"emoji", QStringLiteral("🚅")},
+            {QStringLiteral("category"), EmojiModel::Travel},
+            {QStringLiteral("name"), i18nc("'Travel' is  a category of emoji", "Travel")},
+            {QStringLiteral("emoji"), QStringLiteral("🚅")},
         }},
         {QVariantMap{
-            {"category", EmojiModel::Objects},
-            {"name", i18nc("'Objects' is a category of emoji", "Objects")},
-            {"emoji", QStringLiteral("💡")},
+            {QStringLiteral("category"), EmojiModel::Objects},
+            {QStringLiteral("name"), i18nc("'Objects' is a category of emoji", "Objects")},
+            {QStringLiteral("emoji"), QStringLiteral("💡")},
         }},
         {QVariantMap{
-            {"category", EmojiModel::Symbols},
-            {"name", i18nc("'Symbols' is a category of emoji", "Symbols")},
-            {"emoji", QStringLiteral("🔣")},
+            {QStringLiteral("category"), EmojiModel::Symbols},
+            {QStringLiteral("name"), i18nc("'Symbols' is a category of emoji", "Symbols")},
+            {QStringLiteral("emoji"), QStringLiteral("🔣")},
         }},
         {QVariantMap{
-            {"category", EmojiModel::Flags},
-            {"name", i18nc("'Flags' is a category of emoji", "Flags")},
-            {"emoji", QStringLiteral("🏁")},
+            {QStringLiteral("category"), EmojiModel::Flags},
+            {QStringLiteral("name"), i18nc("'Flags' is a category of emoji", "Flags")},
+            {QStringLiteral("emoji"), QStringLiteral("🏁")},
         }},
     };
 }
@@ -203,15 +203,15 @@ QVariantList EmojiModel::categoriesWithCustom() const
     cats.removeAt(0);
     cats.insert(0,
                 QVariantMap{
-                    {"category", EmojiModel::History},
-                    {"name", i18nc("Previously used emojis", "History")},
-                    {"emoji", QStringLiteral("⌛️")},
+                    {QStringLiteral("category"), EmojiModel::History},
+                    {QStringLiteral("name"), i18nc("Previously used emojis", "History")},
+                    {QStringLiteral("emoji"), QStringLiteral("⌛️")},
                 });
     cats.insert(1,
                 QVariantMap{
-                    {"category", EmojiModel::Custom},
-                    {"name", i18nc("'Custom' is a category of emoji", "Custom")},
-                    {"emoji", QStringLiteral("🖼️")},
+                    {QStringLiteral("category"), EmojiModel::Custom},
+                    {QStringLiteral("name"), i18nc("'Custom' is a category of emoji", "Custom")},
+                    {QStringLiteral("emoji"), QStringLiteral("🖼️")},
                 });
     ;
     return cats;

src/models/emojimodel.h

@@ -33,7 +33,7 @@ struct Emoji {
     {
         arch >> object.unicode;
         arch >> object.shortName;
-        object.isCustom = object.unicode.startsWith("image://");
+        object.isCustom = object.unicode.startsWith(QStringLiteral("image://"));
         return arch;
     }
 

src/models/imagepacksmodel.cpp

@@ -82,8 +82,9 @@ void ImagePacksModel::reloadImages()
     // Load emoticons from the account data
     if (m_room->connection()->hasAccountData("im.ponies.user_emotes"_ls)) {
         auto json = m_room->connection()->accountData("im.ponies.user_emotes"_ls)->contentJson();
-        json["pack"] = QJsonObject{
-            {"display_name", m_showStickers ? i18nc("As in 'The user's own Stickers'", "Own Stickers") : i18nc("As in 'The user's own emojis", "Own Emojis")},
+        json["pack"_ls] = QJsonObject{
+            {"display_name"_ls,
+             m_showStickers ? i18nc("As in 'The user's own Stickers'", "Own Stickers") : i18nc("As in 'The user's own emojis", "Own Emojis")},
         };
         const auto &content = ImagePackEventContent(json);
         if (!content.images.isEmpty()) {
@@ -104,8 +105,8 @@ void ImagePacksModel::reloadImages()
             for (const auto &packKey : packs.keys()) {
                 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())
-                         || (packContent.pack->usage->contains("sticker") && showStickers()))
+                    if ((!packContent.pack || !packContent.pack->usage || (packContent.pack->usage->contains("emoticon"_ls) && showEmoticons())
+                         || (packContent.pack->usage->contains("sticker"_ls) && showStickers()))
                         && !packContent.images.isEmpty()) {
                         m_events += packContent;
                     }
@@ -115,12 +116,12 @@ void ImagePacksModel::reloadImages()
     }
 
     // Load emoticons from the current room
-    auto events = m_room->currentState().eventsOfType("im.ponies.room_emotes");
+    auto events = m_room->currentState().eventsOfType("im.ponies.room_emotes"_ls);
     for (const auto &event : events) {
         auto packContent = eventCast<const ImagePackEvent>(event)->content();
         if (packContent.pack.has_value()) {
-            if (!packContent.pack->usage || (packContent.pack->usage->contains("emoticon") && showEmoticons())
-                || (packContent.pack->usage->contains("sticker") && showStickers())) {
+            if (!packContent.pack->usage || (packContent.pack->usage->contains("emoticon"_ls) && showEmoticons())
+                || (packContent.pack->usage->contains("sticker"_ls) && showStickers())) {
                 m_events += packContent;
             }
         }

src/models/keywordnotificationrulemodel.cpp

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

src/models/keywordnotificationrulemodel.h

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

src/models/livelocationsmodel.cpp

@@ -4,10 +4,12 @@
 
 #include "livelocationsmodel.h"
 
-#include <events/roommessageevent.h>
+#include <Quotient/events/roommessageevent.h>
 
 #include <QDebug>
 
+#include <cmath>
+
 using namespace Quotient;
 
 bool operator<(const LiveLocationData &lhs, const LiveLocationData &rhs)
@@ -76,7 +78,7 @@ QVariant LiveLocationsModel::data(const QModelIndex &index, int roleName) const
         return longitude.toFloat();
     }
     case AssetRole:
-        return data.beaconInfo["org.matrix.msc3488.asset"_ls].toObject()["type"].toString();
+        return data.beaconInfo["org.matrix.msc3488.asset"_ls].toObject()["type"_ls].toString();
     case AuthorRole:
         return m_room->getUser(data.senderId);
     case IsLiveRole: {
@@ -88,6 +90,11 @@ QVariant LiveLocationsModel::data(const QModelIndex &index, int roleName) const
         const auto timeout = data.beaconInfo.value("timeout"_ls).toDouble(600000);
         return lastTs + timeout >= QDateTime::currentDateTime().toMSecsSinceEpoch();
     }
+    case HeadingRole: {
+        bool success = false;
+        const auto heading = data.beacon["org.matrix.msc3488.location"_ls].toObject()["org.kde.itinerary.heading"_ls].toString().toDouble(&success);
+        return success ? heading : NAN;
+    }
     }
 
     return {};
@@ -101,6 +108,7 @@ QHash<int, QByteArray> LiveLocationsModel::roleNames() const
     r.insert(AssetRole, "asset");
     r.insert(AuthorRole, "author");
     r.insert(IsLiveRole, "isLive");
+    r.insert(HeadingRole, "heading");
     return r;
 }
 
@@ -121,7 +129,7 @@ QRectF LiveLocationsModel::boundingBox() const
 
 void LiveLocationsModel::addEvent(const Quotient::RoomEvent *event)
 {
-    if (event->isStateEvent() && event->matrixType() == "org.matrix.msc3672.beacon_info") {
+    if (event->isStateEvent() && event->matrixType() == "org.matrix.msc3672.beacon_info"_ls) {
         LiveLocationData data;
         data.senderId = event->senderId();
         data.beaconInfo = event->contentJson();

src/models/livelocationsmodel.h

@@ -49,6 +49,7 @@ public:
         AssetRole, /**< Type of location event, e.g. self pin of the user location. */
         AuthorRole, /**< The author of the event. */
         IsLiveRole, /**< Boolean that indicates whether a live location beacon is still live. */
+        HeadingRole, /**< Heading in degree (not part of any MSC yet, using an Itinerary extension). */
     };
     Q_ENUM(Roles)
 

src/models/locationsmodel.cpp

@@ -3,6 +3,8 @@
 
 #include "locationsmodel.h"
 
+#include <QGuiApplication>
+
 using namespace Quotient;
 
 LocationsModel::LocationsModel(QObject *parent)
@@ -13,7 +15,7 @@ LocationsModel::LocationsModel(QObject *parent)
             if (!is<RoomMessageEvent>(*event)) {
                 continue;
             }
-            if (event->contentJson()["msgtype"] == "m.location") {
+            if (event->contentJson()["msgtype"_ls] == "m.location"_ls) {
                 const auto &e = *event;
                 addLocation(eventCast<const RoomMessageEvent>(&e));
             }
@@ -23,7 +25,7 @@ LocationsModel::LocationsModel(QObject *parent)
                 if (!is<RoomMessageEvent>(*event)) {
                     continue;
                 }
-                if (event->contentJson()["msgtype"] == "m.location") {
+                if (event->contentJson()["msgtype"_ls] == "m.location"_ls) {
                     const auto &e = *event;
                     addLocation(eventCast<const RoomMessageEvent>(&e));
                 }
@@ -34,7 +36,7 @@ LocationsModel::LocationsModel(QObject *parent)
                 if (!is<RoomMessageEvent>(*event)) {
                     continue;
                 }
-                if (event->contentJson()["msgtype"] == "m.location") {
+                if (event->contentJson()["msgtype"_ls] == "m.location"_ls) {
                     const auto &e = *event;
                     addLocation(eventCast<const RoomMessageEvent>(&e));
                 }
@@ -43,11 +45,15 @@ LocationsModel::LocationsModel(QObject *parent)
     });
 
     connect(this, &LocationsModel::rowsInserted, this, &LocationsModel::boundingBoxChanged);
+
+    connect(static_cast<QGuiApplication *>(QGuiApplication::instance()), &QGuiApplication::paletteChanged, this, [this] {
+        Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {AuthorRole});
+    });
 }
 
 void LocationsModel::addLocation(const RoomMessageEvent *event)
 {
-    const auto uri = event->contentJson()["org.matrix.msc3488.location"]["uri"].toString();
+    const auto uri = event->contentJson()["org.matrix.msc3488.location"_ls]["uri"_ls].toString();
     const auto parts = uri.mid(4).split(QLatin1Char(','));
     if (parts.size() < 2) {
         qWarning() << "invalid geo: URI" << uri;
@@ -61,7 +67,7 @@ void LocationsModel::addLocation(const RoomMessageEvent *event)
         .latitude = latitude,
         .longitude = longitude,
         .content = event->contentJson(),
-        .author = dynamic_cast<NeoChatUser *>(m_room->user(event->senderId())),
+        .author = m_room->user(event->senderId()),
     };
     endInsertRows();
 }
@@ -110,6 +116,7 @@ QVariant LocationsModel::data(const QModelIndex &index, int roleName) const
 
 int LocationsModel::rowCount(const QModelIndex &parent) const
 {
+    Q_UNUSED(parent);
     return m_locations.size();
 }
 

src/models/locationsmodel.h

@@ -9,7 +9,8 @@
 
 #include "neochatroom.h"
 
-#include <events/roommessageevent.h>
+#include <Quotient/events/roommessageevent.h>
+#include <Quotient/user.h>
 
 class LocationsModel : public QAbstractListModel
 {
@@ -51,7 +52,7 @@ private:
         float latitude;
         float longitude;
         QJsonObject content;
-        NeoChatUser *author;
+        Quotient::User *author;
     };
     QList<LocationData> m_locations;
     void addLocation(const Quotient::RoomMessageEvent *event);

src/models/mediamessagefiltermodel.cpp

@@ -3,7 +3,7 @@
 
 #include "mediamessagefiltermodel.h"
 #include "models/messageeventmodel.h"
-#include <room.h>
+#include <Quotient/room.h>
 
 MediaMessageFilterModel::MediaMessageFilterModel(QObject *parent)
     : QSortFilterProxyModel(parent)
@@ -25,7 +25,7 @@ QVariant MediaMessageFilterModel::data(const QModelIndex &index, int role) const
 {
     if (role == SourceRole) {
         if (mapToSource(index).data(MessageEventModel::DelegateTypeRole).toInt() == MessageEventModel::DelegateType::Image) {
-            return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()["source"].toUrl();
+            return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QStringLiteral("source")].toUrl();
         } else if (mapToSource(index).data(MessageEventModel::DelegateTypeRole).toInt() == MessageEventModel::DelegateType::Video) {
             auto progressInfo = mapToSource(index).data(MessageEventModel::ProgressInfoRole).value<Quotient::FileTransferInfo>();
 
@@ -39,7 +39,7 @@ QVariant MediaMessageFilterModel::data(const QModelIndex &index, int role) const
         }
     }
     if (role == TempSourceRole) {
-        return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()["tempInfo"].toMap()["source"].toUrl();
+        return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QStringLiteral("tempInfo")].toMap()[QStringLiteral("source")].toUrl();
     }
     if (role == TypeRole) {
         if (mapToSource(index).data(MessageEventModel::DelegateTypeRole).toInt() == MessageEventModel::DelegateType::Image) {
@@ -52,10 +52,10 @@ QVariant MediaMessageFilterModel::data(const QModelIndex &index, int role) const
         return mapToSource(index).data(Qt::DisplayRole);
     }
     if (role == SourceWidthRole) {
-        return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()["width"].toFloat();
+        return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QStringLiteral("width")].toFloat();
     }
     if (role == SourceHeightRole) {
-        return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()["height"].toFloat();
+        return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QStringLiteral("height")].toFloat();
     }
 
     return sourceModel()->data(mapToSource(index), role);

src/models/mediamessagefiltermodel.h

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

src/models/messageeventmodel.cpp

@@ -5,26 +5,27 @@
 #include "messageeventmodel_logging.h"
 
 #include "neochatconfig.h"
-#include <connection.h>
-#include <events/reactionevent.h>
-#include <events/redactionevent.h>
-#include <events/roomavatarevent.h>
-#include <events/roommemberevent.h>
-#include <events/simplestateevents.h>
-#include <qt_connection_util.h>
-#include <user.h>
+
+#include <Quotient/connection.h>
+#include <Quotient/csapi/rooms.h>
+#include <Quotient/events/reactionevent.h>
+#include <Quotient/events/redactionevent.h>
+#include <Quotient/events/roomavatarevent.h>
+#include <Quotient/events/roommemberevent.h>
+#include <Quotient/events/simplestateevents.h>
+#include <Quotient/user.h>
 
 #include "events/pollevent.h"
-#include "events/stickerevent.h"
+#include <Quotient/events/stickerevent.h>
 
 #include <QDebug>
 #include <QGuiApplication>
+#include <QMovie>
 #include <QTimeZone>
 
 #include <KLocalizedString>
 
 #include "models/reactionmodel.h"
-#include "neochatuser.h"
 #include "texthandler.h"
 
 using namespace Quotient;
@@ -77,7 +78,7 @@ MessageEventModel::MessageEventModel(QObject *parent)
     : QAbstractListModel(parent)
 {
     connect(static_cast<QGuiApplication *>(QGuiApplication::instance()), &QGuiApplication::paletteChanged, this, [this] {
-        Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {AuthorRole, ReplyRole});
+        Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {AuthorRole, ReplyAuthor, ReadMarkersRole});
     });
 }
 
@@ -227,7 +228,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             beginRemoveRows({}, i, i);
         });
         connect(m_currentRoom, &Room::pendingEventDiscarded, this, &MessageEventModel::endRemoveRows);
-        connect(m_currentRoom, &Room::readMarkerMoved, this, [this](const QString &fromEventId, const QString &toEventId) {
+        connect(m_currentRoom, &Room::fullyReadMarkerMoved, this, [this](const QString &fromEventId, const QString &toEventId) {
             Q_UNUSED(fromEventId);
             moveReadMarker(toEventId);
         });
@@ -530,7 +531,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == AuthorRole) {
-        auto author = static_cast<NeoChatUser *>(isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId()));
+        auto author = isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId());
         return m_currentRoom->getUser(author);
     }
 
@@ -578,7 +579,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         if (isPending) {
             // A pending event with an m.new_content key will be merged into the
             // original event so don't show.
-            if (evt.contentJson().contains("m.new_content")) {
+            if (evt.contentJson().contains("m.new_content"_ls)) {
                 return EventStatus::Hidden;
             }
             return pendingIt->deliveryStatus();
@@ -608,7 +609,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
             return EventStatus::Hidden;
         }
 
-        if (evt.isStateEvent() && static_cast<const StateEventBase &>(evt).repeatsState()) {
+        if (evt.isStateEvent() && static_cast<const StateEvent &>(evt).repeatsState()) {
             return EventStatus::Hidden;
         }
 
@@ -667,18 +668,18 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == IsReplyRole) {
-        return !evt.contentJson()["m.relates_to"].toObject()["m.in_reply_to"].toObject()["event_id"].toString().isEmpty();
+        return !evt.contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString().isEmpty();
     }
 
     if (role == ReplyIdRole) {
-        return evt.contentJson()["m.relates_to"].toObject()["m.in_reply_to"].toObject()["event_id"].toString();
+        return evt.contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString();
     }
 
     if (role == ReplyAuthor) {
         auto replyPtr = m_currentRoom->getReplyForEvent(evt);
 
         if (replyPtr) {
-            auto replyUser = static_cast<NeoChatUser *>(m_currentRoom->user(replyPtr->senderId()));
+            auto replyUser = m_currentRoom->user(replyPtr->senderId());
             return m_currentRoom->getUser(replyUser);
         } else {
             return m_currentRoom->getUser(nullptr);
@@ -732,8 +733,8 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         }
 
         return QVariantMap{
-            {"display", m_currentRoom->eventToString(*replyPtr, Qt::RichText)},
-            {"type", type},
+            {"display"_ls, m_currentRoom->eventToString(*replyPtr, Qt::RichText)},
+            {"type"_ls, type},
         };
     }
 
@@ -788,7 +789,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == AssetRole) {
-        const auto assetType = evt.contentJson()["org.matrix.msc3488.asset"].toObject()["type"].toString();
+        const auto assetType = evt.contentJson()["org.matrix.msc3488.asset"_ls].toObject()["type"_ls].toString();
         if (assetType.isEmpty()) {
             return {};
         }
@@ -807,7 +808,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         QVariantList users;
         users.reserve(userIds.size());
         for (const auto &userId : userIds) {
-            auto user = static_cast<NeoChatUser *>(m_currentRoom->user(userId));
+            auto user = m_currentRoom->user(userId);
             users += m_currentRoom->getUser(user);
         }
 
@@ -819,7 +820,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         userIds.remove(m_currentRoom->localUser()->id());
 
         if (userIds.count() > 5) {
-            return QStringLiteral("+ ") + QString::number(userIds.count() - 5);
+            return QStringLiteral("+ %1").arg(userIds.count() - 5);
         } else {
             return QString();
         }
@@ -835,7 +836,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
          */
         QString readMarkersString = i18np("1 user: ", "%1 users: ", userIds.size());
         for (const auto &userId : userIds) {
-            auto user = static_cast<NeoChatUser *>(m_currentRoom->user(userId));
+            auto user = m_currentRoom->user(userId);
             readMarkersString += user->displayname(m_currentRoom) + i18nc("list separator", ", ");
         }
         readMarkersString.chop(2);
@@ -865,30 +866,28 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == VerifiedRole) {
-#ifdef Quotient_E2EE_ENABLED
         if (evt.originalEvent()) {
             auto encrypted = dynamic_cast<const EncryptedEvent *>(evt.originalEvent());
             Q_ASSERT(encrypted);
             return m_currentRoom->connection()->isVerifiedSession(encrypted->sessionId().toLatin1());
         }
-#endif
         return false;
     }
 
     if (role == DisplayNameForInitialsRole) {
-        auto user = static_cast<NeoChatUser *>(isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId()));
+        auto user = isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId());
         return user->displayname(m_currentRoom).remove(QStringLiteral(" (%1)").arg(user->id()));
     }
 
     if (role == AuthorDisplayNameRole) {
-        if (is<RoomMemberEvent>(evt) && !evt.unsignedJson()["prev_content"]["displayname"].isNull() && evt.stateKey() == evt.senderId()) {
-            auto previousDisplayName = evt.unsignedJson()["prev_content"]["displayname"].toString().toHtmlEscaped();
+        if (is<RoomMemberEvent>(evt) && !evt.unsignedJson()["prev_content"_ls]["displayname"_ls].isNull() && evt.stateKey() == evt.senderId()) {
+            auto previousDisplayName = evt.unsignedJson()["prev_content"_ls]["displayname"_ls].toString().toHtmlEscaped();
             if (previousDisplayName.isEmpty()) {
                 previousDisplayName = evt.senderId();
             }
             return previousDisplayName;
         } else {
-            auto author = static_cast<NeoChatUser *>(isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId()));
+            auto author = isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId());
             return m_currentRoom->htmlSafeMemberName(author->id());
         }
     }
@@ -944,76 +943,79 @@ QVariantMap MessageEventModel::getMediaInfoFromFileInfo(const EventContent::File
 
     // Get the mxc URL for the media.
     if (!fileInfo->url().isValid() || eventId.isEmpty()) {
-        mediaInfo["source"] = QUrl();
+        mediaInfo["source"_ls] = QUrl();
     } else {
         QUrl source = m_currentRoom->makeMediaUrl(eventId, fileInfo->url());
 
         if (source.isValid() && source.scheme() == QStringLiteral("mxc")) {
-            mediaInfo["source"] = source;
+            mediaInfo["source"_ls] = source;
         } else {
-            mediaInfo["source"] = QUrl();
+            mediaInfo["source"_ls] = QUrl();
         }
     }
 
     auto mimeType = fileInfo->mimeType;
     // Add the MIME type for the media if available.
-    mediaInfo["mimeType"] = mimeType.name();
+    mediaInfo["mimeType"_ls] = mimeType.name();
 
     // Add the MIME type icon if available.
-    mediaInfo["mimeIcon"] = mimeType.iconName();
+    mediaInfo["mimeIcon"_ls] = mimeType.iconName();
 
     // Add media size if available.
-    mediaInfo["size"] = fileInfo->payloadSize;
+    mediaInfo["size"_ls] = fileInfo->payloadSize;
 
     // Add parameter depending on media type.
     if (mimeType.name().contains(QStringLiteral("image"))) {
         if (auto castInfo = static_cast<const EventContent::ImageContent *>(fileInfo)) {
-            mediaInfo["width"] = castInfo->imageSize.width();
-            mediaInfo["height"] = castInfo->imageSize.height();
+            mediaInfo["width"_ls] = castInfo->imageSize.width();
+            mediaInfo["height"_ls] = castInfo->imageSize.height();
+
+            // TODO: Images in certain formats (e.g. WebP) will be erroneously marked as animated, even if they are static.
+            mediaInfo["animated"_ls] = QMovie::supportedFormats().contains(mimeType.preferredSuffix().toUtf8());
 
             if (!isThumbnail) {
                 QVariantMap tempInfo;
                 auto thumbnailInfo = getMediaInfoFromFileInfo(castInfo->thumbnailInfo(), eventId, true);
-                if (thumbnailInfo["source"].toUrl().scheme() == "mxc") {
+                if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
                     tempInfo = thumbnailInfo;
                 } else {
-                    QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"].toString();
+                    QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"_ls].toString();
                     if (blurhash.isEmpty()) {
-                        tempInfo["source"] = QUrl();
+                        tempInfo["source"_ls] = QUrl();
                     } else {
-                        tempInfo["source"] = QUrl("image://blurhash/" + blurhash);
+                        tempInfo["source"_ls] = QUrl("image://blurhash/"_ls + blurhash);
                     }
                 }
-                mediaInfo["tempInfo"] = tempInfo;
+                mediaInfo["tempInfo"_ls] = tempInfo;
             }
         }
     }
     if (mimeType.name().contains(QStringLiteral("video"))) {
         if (auto castInfo = static_cast<const EventContent::VideoContent *>(fileInfo)) {
-            mediaInfo["width"] = castInfo->imageSize.width();
-            mediaInfo["height"] = castInfo->imageSize.height();
-            mediaInfo["duration"] = castInfo->duration;
+            mediaInfo["width"_ls] = castInfo->imageSize.width();
+            mediaInfo["height"_ls] = castInfo->imageSize.height();
+            mediaInfo["duration"_ls] = castInfo->duration;
 
             if (!isThumbnail) {
                 QVariantMap tempInfo;
                 auto thumbnailInfo = getMediaInfoFromFileInfo(castInfo->thumbnailInfo(), eventId, true);
-                if (thumbnailInfo["source"].toUrl().scheme() == "mxc") {
+                if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
                     tempInfo = thumbnailInfo;
                 } else {
-                    QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"].toString();
+                    QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"_ls].toString();
                     if (blurhash.isEmpty()) {
-                        tempInfo["source"] = QUrl();
+                        tempInfo["source"_ls] = QUrl();
                     } else {
-                        tempInfo["source"] = QUrl("image://blurhash/" + blurhash);
+                        tempInfo["source"_ls] = QUrl("image://blurhash/"_ls + blurhash);
                     }
                 }
-                mediaInfo["tempInfo"] = tempInfo;
+                mediaInfo["tempInfo"_ls] = tempInfo;
             }
         }
     }
     if (mimeType.name().contains(QStringLiteral("audio"))) {
         if (auto castInfo = static_cast<const EventContent::AudioContent *>(fileInfo)) {
-            mediaInfo["duration"] = castInfo->duration;
+            mediaInfo["duration"_ls] = castInfo->duration;
         }
     }
 
@@ -1052,7 +1054,7 @@ void MessageEventModel::createReactionModelForEvent(const Quotient::RoomMessageE
         return;
     }
     auto eventId = event->id();
-    const auto &annotations = m_currentRoom->relatedEvents(eventId, EventRelation::Annotation());
+    const auto &annotations = m_currentRoom->relatedEvents(eventId, EventRelation::AnnotationType);
     if (annotations.isEmpty()) {
         if (m_reactionModels.contains(eventId)) {
             delete m_reactionModels[eventId];
@@ -1061,13 +1063,13 @@ void MessageEventModel::createReactionModelForEvent(const Quotient::RoomMessageE
         return;
     };
 
-    QMap<QString, QList<NeoChatUser *>> reactions = {};
+    QMap<QString, QList<Quotient::User *>> reactions = {};
     for (const auto &a : annotations) {
         if (a->isRedacted()) { // Just in case?
             continue;
         }
         if (const auto &e = eventCast<const ReactionEvent>(a)) {
-            reactions[e->relation().key].append(static_cast<NeoChatUser *>(m_currentRoom->user(e->senderId())));
+            reactions[e->key()].append(m_currentRoom->user(e->senderId()));
         }
     }
 
@@ -1094,7 +1096,7 @@ void MessageEventModel::createReactionModelForEvent(const Quotient::RoomMessageE
     if (m_reactionModels.contains(eventId)) {
         m_reactionModels[eventId]->setReactions(res);
     } else if (res.size() > 0) {
-        m_reactionModels[eventId] = new ReactionModel(this, res, static_cast<NeoChatUser *>(m_currentRoom->localUser()));
+        m_reactionModels[eventId] = new ReactionModel(this, res, m_currentRoom->localUser());
     } else {
         if (m_reactionModels.contains(eventId)) {
             delete m_reactionModels[eventId];

src/models/messagefiltermodel.h

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

src/models/publicroomlistmodel.cpp

@@ -3,7 +3,7 @@
 
 #include "publicroomlistmodel.h"
 
-#include <connection.h>
+#include <Quotient/connection.h>
 
 using namespace Quotient;
 
@@ -25,7 +25,7 @@ void PublicRoomListModel::setConnection(Connection *conn)
 
     beginResetModel();
 
-    nextBatch = "";
+    nextBatch = QString();
     attempted = false;
     rooms.clear();
     m_server.clear();
@@ -41,6 +41,7 @@ void PublicRoomListModel::setConnection(Connection *conn)
     if (job) {
         job->abandon();
         job = nullptr;
+        Q_EMIT loadingChanged();
     }
 
     if (m_connection) {
@@ -67,15 +68,17 @@ void PublicRoomListModel::setServer(const QString &value)
 
     beginResetModel();
 
-    nextBatch = "";
+    nextBatch = QString();
     attempted = false;
     rooms.clear();
+    Q_EMIT loadingChanged();
 
     endResetModel();
 
     if (job) {
         job->abandon();
         job = nullptr;
+        Q_EMIT loadingChanged();
     }
 
     if (m_connection) {
@@ -101,7 +104,7 @@ void PublicRoomListModel::setKeyword(const QString &value)
 
     beginResetModel();
 
-    nextBatch = "";
+    nextBatch = QString();
     attempted = false;
     rooms.clear();
 
@@ -110,6 +113,7 @@ void PublicRoomListModel::setKeyword(const QString &value)
     if (job) {
         job->abandon();
         job = nullptr;
+        Q_EMIT loadingChanged();
     }
 
     if (m_connection) {
@@ -133,6 +137,7 @@ void PublicRoomListModel::next(int count)
     }
 
     job = m_connection->callApi<QueryPublicRoomsJob>(m_server, count, nextBatch, QueryPublicRoomsJob::Filter{m_keyword, {}});
+    Q_EMIT loadingChanged();
 
     connect(job, &BaseJob::finished, this, [this] {
         attempted = true;
@@ -150,6 +155,7 @@ void PublicRoomListModel::next(int count)
         }
 
         this->job = nullptr;
+        Q_EMIT loadingChanged();
     });
 }
 
@@ -186,7 +192,7 @@ QVariant PublicRoomListModel::data(const QModelIndex &index, int role) const
         auto avatarUrl = room.avatarUrl;
 
         if (avatarUrl.isEmpty()) {
-            return "";
+            return {};
         }
         return avatarUrl.url().remove(0, 6);
     }
@@ -253,4 +259,9 @@ bool PublicRoomListModel::hasMore() const
     return !(attempted && nextBatch.isEmpty());
 }
 
+bool PublicRoomListModel::loading() const
+{
+    return job != nullptr;
+}
+
 #include "moc_publicroomlistmodel.cpp"

src/models/publicroomlistmodel.h

@@ -6,7 +6,7 @@
 #include <QAbstractListModel>
 #include <QObject>
 
-#include <csapi/list_public_rooms.h>
+#include <Quotient/csapi/list_public_rooms.h>
 
 namespace Quotient
 {
@@ -48,6 +48,11 @@ class PublicRoomListModel : public QAbstractListModel
      */
     Q_PROPERTY(bool hasMore READ hasMore NOTIFY hasMoreChanged)
 
+    /**
+     * @biref Whether the model is still loading.
+     */
+    Q_PROPERTY(bool loading READ loading NOTIFY loadingChanged)
+
 public:
     /**
      * @brief Defines the model roles.
@@ -64,7 +69,7 @@ public:
         IsJoinedRole, /**< Whether the local user has joined the room. */
     };
 
-    PublicRoomListModel(QObject *parent = nullptr);
+    explicit PublicRoomListModel(QObject *parent = nullptr);
 
     /**
      * @brief Get the given role value at the given index.
@@ -98,6 +103,8 @@ public:
 
     [[nodiscard]] bool hasMore() const;
 
+    [[nodiscard]] bool loading() const;
+
     /**
      * @brief Load the next set of rooms.
      *
@@ -111,6 +118,7 @@ private:
     QString m_keyword;
 
     bool attempted = false;
+    bool m_loading = false;
     QString nextBatch;
 
     QVector<Quotient::PublicRoomsChunk> rooms;
@@ -122,4 +130,5 @@ Q_SIGNALS:
     void serverChanged();
     void keywordChanged();
     void hasMoreChanged();
+    void loadingChanged();
 };

src/models/pushrulemodel.cpp

@@ -5,12 +5,11 @@
 
 #include <QDebug>
 
-#include <connection.h>
-#include <converters.h>
-#include <csapi/definitions/push_ruleset.h>
-#include <csapi/pushrules.h>
-#include <jobs/basejob.h>
-#include <qobjectdefs.h>
+#include <Quotient/connection.h>
+#include <Quotient/converters.h>
+#include <Quotient/csapi/definitions/push_ruleset.h>
+#include <Quotient/csapi/pushrules.h>
+#include <Quotient/jobs/basejob.h>
 
 #include "controller.h"
 #include "neochatconfig.h"
@@ -70,18 +69,20 @@ PushRuleModel::PushRuleModel(QObject *parent)
 
 void PushRuleModel::controllerConnectionChanged()
 {
-    connect(Controller::instance().activeConnection(), &Quotient::Connection::accountDataChanged, this, &PushRuleModel::updateNotificationRules);
-    updateNotificationRules("m.push_rules");
+    if (Controller::instance().activeConnection()) {
+        connect(Controller::instance().activeConnection(), &Quotient::Connection::accountDataChanged, this, &PushRuleModel::updateNotificationRules);
+        updateNotificationRules(QStringLiteral("m.push_rules"));
+    }
 }
 
 void PushRuleModel::updateNotificationRules(const QString &type)
 {
-    if (type != "m.push_rules") {
+    if (type != QStringLiteral("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 QJsonObject ruleDataJson = Controller::instance().activeConnection()->accountDataJson(QStringLiteral("m.push_rules"));
+    const Quotient::PushRuleset ruleData = Quotient::fromJson<Quotient::PushRuleset>(ruleDataJson[QStringLiteral("global")].toObject());
 
     beginResetModel();
     m_rules.clear();
@@ -202,7 +203,7 @@ bool PushRuleModel::globalNotificationsEnabled() const
 
 void PushRuleModel::setGlobalNotificationsEnabled(bool enabled)
 {
-    setNotificationRuleEnabled("override", ".m.rule.master", !enabled);
+    setNotificationRuleEnabled(QStringLiteral("override"), QStringLiteral(".m.rule.master"), !enabled);
 }
 
 bool PushRuleModel::globalNotificationsSet() const
@@ -303,26 +304,26 @@ void PushRuleModel::addKeyword(const QString &keyword, const QString &roomId)
         kind = PushNotificationKind::Override;
 
         Quotient::PushCondition roomCondition;
-        roomCondition.kind = "event_match";
-        roomCondition.key = "room_id";
+        roomCondition.kind = QStringLiteral("event_match");
+        roomCondition.key = QStringLiteral("room_id");
         roomCondition.pattern = roomId;
         pushConditions.append(roomCondition);
 
         Quotient::PushCondition keywordCondition;
-        keywordCondition.kind = "event_match";
-        keywordCondition.key = "content.body";
+        keywordCondition.kind = QStringLiteral("event_match");
+        keywordCondition.key = QStringLiteral("content.body");
         keywordCondition.pattern = keyword;
         pushConditions.append(keywordCondition);
     }
 
-    auto job = Controller::instance().activeConnection()->callApi<Quotient::SetPushRuleJob>("global",
+    auto job = Controller::instance().activeConnection()->callApi<Quotient::SetPushRuleJob>(QLatin1String("global"),
                                                                                             PushNotificationKind::kindString(kind),
                                                                                             keyword,
                                                                                             actions,
-                                                                                            QLatin1String(""),
-                                                                                            QLatin1String(""),
+                                                                                            QString(),
+                                                                                            QString(),
                                                                                             pushConditions,
-                                                                                            roomId.isEmpty() ? keyword : QLatin1String(""));
+                                                                                            roomId.isEmpty() ? keyword : QString());
     connect(job, &Quotient::BaseJob::failure, this, [job, keyword]() {
         qWarning() << QLatin1String("Unable to set push rule for keyword %1: ").arg(keyword) << job->errorString();
     });
@@ -341,7 +342,7 @@ void PushRuleModel::removeKeyword(const QString &keyword)
     }
 
     auto kind = PushNotificationKind::kindString(m_rules[index].kind);
-    auto job = Controller::instance().activeConnection()->callApi<Quotient::DeletePushRuleJob>("global", kind, m_rules[index].id);
+    auto job = Controller::instance().activeConnection()->callApi<Quotient::DeletePushRuleJob>(QStringLiteral("global"), kind, m_rules[index].id);
     connect(job, &Quotient::BaseJob::failure, this, [this, job, index]() {
         qWarning() << QLatin1String("Unable to remove push rule for keyword %1: ").arg(m_rules[index].id) << job->errorString();
     });
@@ -349,10 +350,10 @@ void PushRuleModel::removeKeyword(const QString &keyword)
 
 void PushRuleModel::setNotificationRuleEnabled(const QString &kind, const QString &ruleId, bool enabled)
 {
-    auto job = Controller::instance().activeConnection()->callApi<Quotient::IsPushRuleEnabledJob>("global", kind, ruleId);
+    auto job = Controller::instance().activeConnection()->callApi<Quotient::IsPushRuleEnabledJob>(QStringLiteral("global"), kind, ruleId);
     connect(job, &Quotient::BaseJob::success, this, [job, kind, ruleId, enabled]() {
         if (job->enabled() != enabled) {
-            Controller::instance().activeConnection()->callApi<Quotient::SetPushRuleEnabledJob>("global", kind, ruleId, enabled);
+            Controller::instance().activeConnection()->callApi<Quotient::SetPushRuleEnabledJob>(QStringLiteral("global"), kind, ruleId, enabled);
         }
     });
 }
@@ -360,13 +361,13 @@ void PushRuleModel::setNotificationRuleEnabled(const QString &kind, const QStrin
 void PushRuleModel::setNotificationRuleActions(const QString &kind, const QString &ruleId, PushNotificationAction::Action action)
 {
     QVector<QVariant> actions;
-    if (ruleId == ".m.rule.call") {
-        actions = actionToVariant(action, "ring");
+    if (ruleId == QStringLiteral(".m.rule.call")) {
+        actions = actionToVariant(action, QStringLiteral("ring"));
     } else {
         actions = actionToVariant(action);
     }
 
-    Controller::instance().activeConnection()->callApi<Quotient::SetPushRuleActionsJob>("global", kind, ruleId, actions);
+    Controller::instance().activeConnection()->callApi<Quotient::SetPushRuleActionsJob>(QStringLiteral("global"), kind, ruleId, actions);
 }
 
 PushNotificationAction::Action PushRuleModel::variantToAction(const QVector<QVariant> &actions, bool enabled)
@@ -384,10 +385,10 @@ PushNotificationAction::Action PushRuleModel::variantToAction(const QVector<QVar
         }
 
         QJsonObject action = i.toJsonObject();
-        if (action["set_tweak"].toString() == "sound") {
+        if (action[QStringLiteral("set_tweak")].toString() == QStringLiteral("sound")) {
             isNoisy = true;
-        } else if (action["set_tweak"].toString() == "highlight") {
-            if (action["value"].toString() != "false") {
+        } else if (action[QStringLiteral("set_tweak")].toString() == QStringLiteral("highlight")) {
+            if (action[QStringLiteral("value")].toString() != QStringLiteral("false")) {
                 highlightEnabled = true;
             }
         }
@@ -424,19 +425,19 @@ QVector<QVariant> PushRuleModel::actionToVariant(PushNotificationAction::Action
     QVector<QVariant> actions;
 
     if (action != PushNotificationAction::Off) {
-        actions.append("notify");
+        actions.append(QStringLiteral("notify"));
     } else {
-        actions.append("dont_notify");
+        actions.append(QStringLiteral("dont_notify"));
     }
     if (action == PushNotificationAction::Noisy || action == PushNotificationAction::NoisyHighlight) {
         QJsonObject soundTweak;
-        soundTweak.insert("set_tweak", "sound");
-        soundTweak.insert("value", sound);
+        soundTweak.insert(QStringLiteral("set_tweak"), QStringLiteral("sound"));
+        soundTweak.insert(QStringLiteral("value"), sound);
         actions.append(soundTweak);
     }
     if (action == PushNotificationAction::Highlight || action == PushNotificationAction::NoisyHighlight) {
         QJsonObject highlightTweak;
-        highlightTweak.insert("set_tweak", "highlight");
+        highlightTweak.insert(QStringLiteral("set_tweak"), QStringLiteral("highlight"));
         actions.append(highlightTweak);
     }
 

src/models/pushrulemodel.h

@@ -5,7 +5,7 @@
 
 #include <QAbstractListModel>
 
-#include <csapi/definitions/push_rule.h>
+#include <Quotient/csapi/definitions/push_rule.h>
 
 #include "notificationsmanager.h"
 
@@ -172,7 +172,7 @@ public:
     };
     Q_ENUM(EventRoles)
 
-    PushRuleModel(QObject *parent = nullptr);
+    explicit PushRuleModel(QObject *parent = nullptr);
 
     [[nodiscard]] PushNotificationAction::Action defaultState() const;
     void setDefaultState(PushNotificationAction::Action defaultState);
@@ -236,6 +236,6 @@ private:
     void setNotificationRuleEnabled(const QString &kind, const QString &ruleId, bool enabled);
     void setNotificationRuleActions(const QString &kind, const QString &ruleId, PushNotificationAction::Action action);
     PushNotificationAction::Action variantToAction(const QVector<QVariant> &actions, bool enabled);
-    QVector<QVariant> actionToVariant(PushNotificationAction::Action action, const QString &sound = "default");
+    QVector<QVariant> actionToVariant(PushNotificationAction::Action action, const QString &sound = QStringLiteral("default"));
 };
 Q_DECLARE_METATYPE(PushRuleModel *)

src/models/reactionmodel.cpp

@@ -7,9 +7,9 @@
 
 #include <KLocalizedString>
 
-#include "neochatuser.h"
+#include <Quotient/user.h>
 
-ReactionModel::ReactionModel(QObject *parent, QList<Reaction> reactions, NeoChatUser *localUser)
+ReactionModel::ReactionModel(QObject *parent, QList<Reaction> reactions, Quotient::User *localUser)
     : QAbstractListModel(parent)
     , m_localUser(localUser)
 {
@@ -31,7 +31,7 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const
 
     if (role == TextRole) {
         if (reaction.authors.count() > 1) {
-            return reaction.reaction + QStringLiteral("  %1").arg(reaction.authors.count());
+            return QStringLiteral("%1  %2").arg(reaction.reaction, reaction.authors.count());
         } else {
             return reaction.reaction;
         }
@@ -52,7 +52,7 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const
                     text += i18nc("Separate the usernames of users", " and ");
                 }
             }
-            text += reaction.authors.at(i).toMap()["displayName"].toString();
+            text += reaction.authors.at(i).toMap()[QStringLiteral("displayName")].toString();
         }
 
         if (reaction.authors.count() > 3) {
@@ -74,7 +74,7 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const
 
     if (role == HasLocalUser) {
         for (auto author : reaction.authors) {
-            if (author.toMap()["id"] == m_localUser->id()) {
+            if (author.toMap()[QStringLiteral("id")] == m_localUser->id()) {
                 return true;
             }
         }

src/models/reactionmodel.h

@@ -5,7 +5,10 @@
 
 #include <QAbstractListModel>
 
-class NeoChatUser;
+namespace Quotient
+{
+class User;
+}
 
 /**
  * @class ReactionModel
@@ -36,7 +39,7 @@ public:
         HasLocalUser, /**< Whether the local user is in the list of authors. */
     };
 
-    ReactionModel(QObject *parent = nullptr, QList<Reaction> reactions = {}, NeoChatUser *localUser = nullptr);
+    explicit ReactionModel(QObject *parent = nullptr, QList<Reaction> reactions = {}, Quotient::User *localUser = nullptr);
 
     /**
      * @brief Get the given role value at the given index.
@@ -67,6 +70,6 @@ public:
 private:
     QList<Reaction> m_reactions;
 
-    NeoChatUser *m_localUser;
+    Quotient::User *m_localUser;
 };
 Q_DECLARE_METATYPE(ReactionModel *)