Fix port deprecated [=] operator in c++20

Previously, some functions that conceptually belong to the connection needed to be in the Controller, since we didn't have a place to put them.
This fixes that by extending the Connection class in a similar way as we extend the Room class.

.kde-ci.yml

@@ -57,6 +57,7 @@ Dependencies:
 - 'on': ['Linux/Qt6', 'FreeBSD/Qt6']
   'require':
     'frameworks/kdbusaddons': '@latest-kf6'
+    'frameworks/kstatusnotifieritem': '@latest-kf6'
 
 - 'on': ['Linux/Qt6', 'Linux/Qt5']
   'require':

CMakeLists.txt

@@ -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)
@@ -77,7 +77,7 @@ ecm_setup_version(${PROJECT_VERSION}
     VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
 )
 
-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg)
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg WebView)
 set_package_properties(Qt${QT_MAJOR_VERSION} PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
@@ -93,6 +93,10 @@ set_package_properties(KF${QT_MAJOR_VERSION}Kirigami2 PROPERTIES
         )
 find_package(KF${QT_MAJOR_VERSION}KirigamiAddons 0.7.2 REQUIRED)
 
+if(QT_MAJOR_VERSION STREQUAL "6")
+    find_package(KF6StatusNotifierItem ${KF_MIN_VERSION} REQUIRED)
+endif()
+
 if(ANDROID)
     find_package(OpenSSL)
     set_package_properties(OpenSSL PROPERTIES

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

android/AndroidManifest.xml

@@ -9,7 +9,7 @@
           android:versionName="${versionName}"
           android:versionCode="${versionCode}"
           android:installLocation="auto">
-    <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="NeoChat" android:icon="@drawable/neochat">
+    <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="NeoChat" android:icon="@drawable/neochat" android:usesCleartextTraffic="true">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"
                   android:name="org.qtproject.qt5.android.bindings.QtActivity"
                   android:label="NeoChat"

autotests/texthandlertest.cpp

@@ -604,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),
                                       });
 }
 

org.kde.neochat.appdata.xml

@@ -47,12 +47,17 @@
   <name xml:lang="x-test">xxNeoChatxx</name>
   <name xml:lang="zh-CN">NeoChat</name>
   <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="ko">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>
@@ -263,48 +268,6 @@ to provide a convergent experience across multiple platforms.</p>
     <value key="KDE::windows_store::StoreLogoSquare">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/storelogo-1080x1080.png</value>
     <value key="KDE::windows_store::Icon">https://invent.kde.org/network/neochat/-/raw/master/icons/300-apps-neochat.png</value>
     <value key="KDE::windows_store::PromotionalArt16x9">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/promoimage-1920x1080.png</value>
-    <value key="KDE::windows_store::screenshots::1::image">https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Timeline.png</value>
-    <value key="KDE::windows_store::screenshots::1::caption">Main view with room list, chat, and room information</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="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="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="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="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>
   </custom>
   <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
   <screenshots>
@@ -314,15 +277,77 @@ to provide a convergent experience across multiple platforms.</p>
     <screenshot type="default">
       <image>https://cdn.kde.org/screenshots/neochat/application.png</image>
     </screenshot>
+    <screenshot x-kde-os="windows">
+      <image>https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Timeline.png</image>
+      <caption>Main view with room list, chat, and room information</caption>
+      <caption xml:lang="ar">العرض الرئيسة مع قائمة الغرف والدردشات و معلومات الغرفة</caption>
+      <caption xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</caption>
+      <caption xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</caption>
+      <caption xml:lang="eo">Ĉefa vido kun ĉambra listo, babilejo kaj ĉambra informo</caption>
+      <caption xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</caption>
+      <caption xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</caption>
+      <caption xml:lang="fi">Päänäkymä, jossa huoneluettelo, keskustelu ja huoneen tiedot</caption>
+      <caption xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</caption>
+      <caption xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</caption>
+      <caption xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</caption>
+      <caption xml:lang="ka">მთავარი ხედი სურათების სიით, ჩატით და ოთახის ინფორმაციით</caption>
+      <caption xml:lang="ko">대화방 목록, 채팅, 대화방 정보가 표시된 주 보기</caption>
+      <caption xml:lang="nl">Hoofdweergave met lijst met rooms, chat en roominformatie</caption>
+      <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
+      <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
+      <caption xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</caption>
+      <caption xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</caption>
+      <caption xml:lang="tr">Oda listesini, sohbet penceresini ve oda bilgisini gösteren ana görünüm</caption>
+      <caption xml:lang="uk">Головна панель із списком кімнат, спілкуванням та даними щодо кімнати</caption>
+      <caption xml:lang="x-test">xxMain view with room list, chat, and room informationxx</caption>
+    </screenshot>
+    <screenshot x-kde-os="windows">
+      <image>https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Login.png</image>
+      <caption>Login screen</caption>
+      <caption xml:lang="ar">شاشة الدخول</caption>
+      <caption xml:lang="ca">Pantalla d'inici de sessió</caption>
+      <caption xml:lang="ca-valencia">Pantalla d'inici de sessió</caption>
+      <caption xml:lang="eo">Ensaluta ekrano</caption>
+      <caption xml:lang="es">Pantalla de inicio de sesión</caption>
+      <caption xml:lang="eu">Saio-hasteko pantaila</caption>
+      <caption xml:lang="fi">Kirjautumisnäkymä</caption>
+      <caption xml:lang="fr">Écran de connexion</caption>
+      <caption xml:lang="gl">Pantalla de identificación.</caption>
+      <caption xml:lang="it">Schermata di accesso</caption>
+      <caption xml:lang="ka">შესვლის ეკრანი</caption>
+      <caption xml:lang="ko">로그인 화면</caption>
+      <caption xml:lang="nl">Aanmeldscherm</caption>
+      <caption xml:lang="nn">Innloggingsbilete</caption>
+      <caption xml:lang="pt">Ecrã de autenticação</caption>
+      <caption xml:lang="sl">Prijavni zaslon</caption>
+      <caption xml:lang="sv">Inloggningsfönster</caption>
+      <caption xml:lang="ta">நுழைவுத் திரை</caption>
+      <caption xml:lang="tr">Oturum açma ekranı</caption>
+      <caption xml:lang="uk">Вікно входу</caption>
+      <caption xml:lang="x-test">xxLogin screenxx</caption>
+    </screenshot>
   </screenshots>
   <content_rating type="oars-1.1">
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="23.08.0" date="2023-08-24">
+      <url>https://kde.org/announcements/gear/23.08.0/#neochathttpsappskdeorgneochat</url>
+      <description>
+        <p>Apart from a visual overhaul, NeoChat can now display location events and also a map with the location of all the users currently broadcasting their location using Itineray's Matrix integration. Great for locating where your friends are.</p>
+      </description>
+    </release>
     <release version="23.04.3" date="2023-07-06"/>
     <release version="23.04.2" date="2023-06-08"/>
     <release version="23.04.1" date="2023-05-11"/>
     <release version="23.04.0" date="2023-04-20">
+      <url>https://kde.org/announcements/gear/23.04.0/#neochathttpsappskdeorgneochat</url>
+      <description>
+        <p>NeoChat improves its design with tweaks that provide a more compact layout and a simpler menu which works better for the collapsed room list.</p>
+        <p>We have also improved the video controls, added a new command /knock &lt;room-id&gt; to send a knock event to a room, and you can now edit a prior message inline, within the chat pane.</p>
+        <p>Other usability improvements include an overhaul of the keyboard navigation and shortcuts like Ctrl+PgUp/PgDn that allow you to skip from room to room.</p>
+      </description>
       <artifacts>
         <artifact type="binary" platform="x86_64-windows-msvc">
           <location>https://download.kde.org/stable/release-service/23.04.0/windows/neochat-23.04.0-512-windows-cl-msvc2019-x86_64.exe</location>

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

@@ -74,8 +74,6 @@ add_library(neochat STATIC
     blurhash.h
     blurhashimageprovider.cpp
     blurhashimageprovider.h
-    models/collapsestateproxymodel.cpp
-    models/collapsestateproxymodel.h
     models/mediamessagefiltermodel.cpp
     models/mediamessagefiltermodel.h
     urlhelper.cpp
@@ -125,6 +123,9 @@ add_library(neochat STATIC
     events/pollevent.cpp
     pollhandler.cpp
     utils.h
+    registration.cpp
+    neochatconnection.cpp
+    neochatconnection.h
 )
 
 ecm_qt_declare_logging_category(neochat
@@ -141,6 +142,11 @@ add_executable(neochat-app
     ${CMAKE_CURRENT_SOURCE_DIR}/res.generated.qrc
 )
 
+if(TARGET Qt::WebView)
+    target_link_libraries(neochat-app PUBLIC Qt::WebView)
+    target_compile_definitions(neochat-app PUBLIC -DHAVE_WEBVIEW)
+endif()
+
 target_include_directories(neochat-app PRIVATE ${CMAKE_BINARY_DIR})
 
 target_link_libraries(neochat-app PRIVATE
@@ -155,6 +161,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()
@@ -174,6 +183,7 @@ 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 QCoro::Core)
+
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
 
 if(NEOCHAT_FLATPAK)

src/actionshandler.cpp

@@ -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/chatdocumenthandler.cpp

@@ -225,7 +225,7 @@ void ChatDocumentHandler::complete(int index)
         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);
@@ -246,7 +246,7 @@ void ChatDocumentHandler::complete(int index)
         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);

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

@@ -21,7 +21,6 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QGuiApplication>
-#include <QImageReader>
 #include <QNetworkProxy>
 #include <QQuickTextDocument>
 #include <QQuickWindow>
@@ -33,10 +32,8 @@
 
 #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>
@@ -105,8 +102,8 @@ Controller::Controller(QObject *parent)
     static int oldAccountCount = 0;
     connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, [this]() {
         if (m_accountRegistry.size() > oldAccountCount) {
-            auto connection = m_accountRegistry.accounts()[m_accountRegistry.size() - 1];
-            connect(connection, &Connection::syncDone, this, [connection]() {
+            auto connection = dynamic_cast<NeoChatConnection *>(m_accountRegistry.accounts()[m_accountRegistry.size() - 1]);
+            connect(connection, &NeoChatConnection::syncDone, this, [connection]() {
                 NotificationsManager::instance().handleNotifications(connection);
             });
         }
@@ -124,43 +121,24 @@ Controller &Controller::instance()
     return _instance;
 }
 
-void Controller::showWindow()
+void Controller::toggleWindow()
 {
-    WindowController::instance().showAndRaiseWindow(QString());
-}
-
-void Controller::logout(Connection *conn, bool serverSideLogout)
-{
-    if (!conn) {
-        qCritical() << "Attempt to logout null connection";
-        return;
-    }
-
-    SettingsGroup("Accounts").remove(conn->userId());
-
-    QKeychain::DeletePasswordJob job(qAppName());
-    job.setAutoDelete(true);
-    job.setKey(conn->userId());
-    QEventLoop loop;
-    QKeychain::DeletePasswordJob::connect(&job, &QKeychain::Job::finished, &loop, &QEventLoop::quit);
-    job.start();
-    loop.exec();
-
-    if (m_accountRegistry.count() > 1) {
-        // Only set the connection if the the account being logged out is currently active
-        if (conn == activeConnection()) {
-            setActiveConnection(m_accountRegistry.accounts()[0]);
+    auto &instance = WindowController::instance();
+    auto window = instance.window();
+    if (window->isVisible()) {
+        if (window->windowStates() & Qt::WindowMinimized) {
+            window->showNormal();
+            window->requestActivate();
+        } else {
+            window->close();
         }
     } else {
-        setActiveConnection(nullptr);
+        instance.showAndRaiseWindow({});
+        instance.window()->requestActivate();
     }
-    if (!serverSideLogout) {
-        return;
-    }
-    conn->logout();
 }
 
-void Controller::addConnection(Connection *c)
+void Controller::addConnection(NeoChatConnection *c)
 {
     Q_ASSERT_X(c, __FUNCTION__, "Attempt to add a null connection");
 
@@ -168,17 +146,17 @@ void Controller::addConnection(Connection *c)
 
     c->setLazyLoading(true);
 
-    connect(c, &Connection::syncDone, this, [this, c] {
+    connect(c, &NeoChatConnection::syncDone, this, [this, c] {
         Q_EMIT syncDone();
 
         c->sync(30000);
         c->saveState();
     });
-    connect(c, &Connection::loggedOut, this, [this, c] {
+    connect(c, &NeoChatConnection::loggedOut, this, [this, c] {
         dropConnection(c);
     });
 
-    connect(c, &Connection::requestFailed, this, [this](BaseJob *job) {
+    connect(c, &NeoChatConnection::requestFailed, this, [this](BaseJob *job) {
         if (job->error() == BaseJob::UserConsentRequired) {
             Q_EMIT userConsentRequired(job->errorUrl());
         }
@@ -190,7 +168,7 @@ void Controller::addConnection(Connection *c)
     Q_EMIT accountCountChanged();
 }
 
-void Controller::dropConnection(Connection *c)
+void Controller::dropConnection(NeoChatConnection *c)
 {
     Q_ASSERT_X(c, __FUNCTION__, "Attempt to drop a null connection");
 
@@ -200,7 +178,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};
@@ -214,36 +192,36 @@ void Controller::invokeLogin()
                 AccountSettings account{accountId};
                 QString accessToken;
                 if (accessTokenLoadingJob->error() == QKeychain::Error::NoError) {
-                    accessToken = accessTokenLoadingJob->binaryData();
+                    accessToken = QString::fromLatin1(accessTokenLoadingJob->binaryData());
                 } else {
                     return;
                 }
 
-                auto connection = new Connection(account.homeserver());
-                connect(connection, &Connection::connected, this, [this, connection, id] {
+                auto connection = new NeoChatConnection(account.homeserver());
+                connect(connection, &NeoChatConnection::connected, this, [this, connection, id] {
                     connection->loadState();
                     addConnection(connection);
                     if (connection->userId() == id) {
                         setActiveConnection(connection);
-                        connectSingleShot(connection, &Connection::syncDone, this, &Controller::initiated);
+                        connectSingleShot(connection, &NeoChatConnection::syncDone, this, &Controller::initiated);
                     }
                 });
-                connect(connection, &Connection::loginError, this, [this, connection](const QString &error, const QString &) {
-                    if (error == "Unrecognised access token") {
+                connect(connection, &NeoChatConnection::loginError, this, [this, connection](const QString &error, const QString &) {
+                    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") {
+                        connection->logout(false);
+                    } 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
                         // connect to the homeserver. In this case, we don't want to do logout().
                     } else {
                         Q_EMIT errorOccured(i18n("Login Failed: %1", error));
-                        logout(connection, true);
+                        connection->logout(true);
                     }
                     Q_EMIT initiated();
                 });
-                connect(connection, &Connection::networkError, this, [this](const QString &error, const QString &, int, int) {
+                connect(connection, &NeoChatConnection::networkError, this, [this](const QString &error, const QString &, int, int) {
                     Q_EMIT errorOccured(i18n("Network Error: %1", error));
                 });
                 connection->assumeIdentity(account.userId(), accessToken);
@@ -309,75 +287,16 @@ bool Controller::saveAccessTokenToKeyChain(const AccountSettings &account, const
     return true;
 }
 
-void Controller::changeAvatar(Connection *conn, const QUrl &localFile)
-{
-    auto job = conn->uploadFile(localFile.toLocalFile());
-    connect(job, &BaseJob::success, this, [conn, job] {
-        conn->callApi<SetAvatarUrlJob>(conn->userId(), job->contentUri());
-    });
-}
-
-void Controller::markAllMessagesAsRead(Connection *conn)
-{
-    const auto rooms = conn->allRooms();
-    for (auto room : rooms) {
-        room->markAllMessagesAsRead();
-    }
-}
-
 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
 }
 
-void Controller::changePassword(Connection *connection, const QString &currentPassword, const QString &newPassword)
-{
-    NeochatChangePasswordJob *job = connection->callApi<NeochatChangePasswordJob>(newPassword, false);
-    connect(job, &BaseJob::result, this, [this, job, currentPassword, newPassword, connection] {
-        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;
-            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") {
-                    Q_EMIT passwordStatus(PasswordStatus::Wrong);
-                } else {
-                    Q_EMIT passwordStatus(PasswordStatus::Other);
-                }
-            });
-        }
-    });
-}
-
-bool Controller::setAvatar(Connection *connection, const QUrl &avatarSource)
-{
-    User *localUser = connection->user();
-    QString decoded = avatarSource.path();
-    if (decoded.isEmpty()) {
-        connection->callApi<SetAvatarUrlJob>(localUser->id(), avatarSource);
-        return true;
-    }
-    if (QImageReader(decoded).read().isNull()) {
-        return false;
-    } else {
-        return localUser->setAvatar(decoded);
-    }
-}
-
 NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Omittable<QJsonObject> &auth)
     : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), "/_matrix/client/r0/account/password")
 {
@@ -388,6 +307,14 @@ NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, b
     setRequestData(_data);
 }
 
+NeoChatDeactivateAccountJob::NeoChatDeactivateAccountJob(const Quotient::Omittable<QJsonObject> &auth)
+    : BaseJob(HttpVerb::Post, QStringLiteral("DisableDeviceJob"), "_matrix/client/v3/account/deactivate")
+{
+    QJsonObject data;
+    addParam<IfNotEmpty>(data, QStringLiteral("auth"), auth);
+    setRequestData(data);
+}
+
 int Controller::accountCount() const
 {
     return m_accountRegistry.count();
@@ -399,10 +326,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;
         }
@@ -413,7 +340,7 @@ void Controller::setQuitOnLastWindowClosed()
 #endif
 }
 
-Connection *Controller::activeConnection() const
+NeoChatConnection *Controller::activeConnection() const
 {
     if (m_connection.isNull()) {
         return nullptr;
@@ -421,49 +348,43 @@ Connection *Controller::activeConnection() const
     return m_connection;
 }
 
-void Controller::setActiveConnection(Connection *connection)
+void Controller::setActiveConnection(NeoChatConnection *connection)
 {
     if (connection == m_connection) {
         return;
     }
     if (m_connection != nullptr) {
-        disconnect(m_connection, &Connection::syncError, this, nullptr);
-        disconnect(m_connection, &Connection::accountDataChanged, this, nullptr);
+        disconnect(m_connection, &NeoChatConnection::syncError, this, nullptr);
+        disconnect(m_connection, &NeoChatConnection::accountDataChanged, this, nullptr);
     }
     m_connection = connection;
     if (connection != nullptr) {
         NeoChatConfig::self()->setActiveConnection(connection->userId());
-        connect(connection, &Connection::networkError, this, [this]() {
+        connect(connection, &NeoChatConnection::networkError, this, [this]() {
             if (!m_isOnline) {
                 return;
             }
             m_isOnline = false;
             Q_EMIT isOnlineChanged(false);
         });
-        connect(connection, &Connection::syncDone, this, [this] {
+        connect(connection, &NeoChatConnection::syncDone, this, [this] {
             if (m_isOnline) {
                 return;
             }
             m_isOnline = true;
             Q_EMIT isOnlineChanged(true);
         });
-        connect(connection, &Connection::requestFailed, this, [](BaseJob *job) {
-            if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"].toString() == "M_TOO_LARGE"_ls) {
+        connect(connection, &NeoChatConnection::requestFailed, this, [](BaseJob *job) {
+            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."));
             }
         });
-        connect(connection, &Connection::accountDataChanged, this, [this](const QString &type) {
-            if (type == QLatin1String("org.kde.neochat.account_label")) {
-                Q_EMIT activeAccountLabelChanged();
-            }
-        });
     } else {
         NeoChatConfig::self()->setActiveConnection(QString());
     }
     NeoChatConfig::self()->save();
     Q_EMIT activeConnectionChanged();
     Q_EMIT activeConnectionIndexChanged();
-    Q_EMIT activeAccountLabelChanged();
 }
 
 PushRuleModel *Controller::pushRuleModel() const
@@ -486,7 +407,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()));
     });
@@ -522,12 +443,12 @@ 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});
 }
 
@@ -581,11 +502,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
@@ -630,12 +546,6 @@ int Controller::activeConnectionIndex() const
     return result - m_accountRegistry.accounts().begin();
 }
 
-int Controller::quotientMinorVersion() const
-{
-    // TODO libQuotient 0.7: Replace with version function from libQuotient
-    return 7;
-}
-
 bool Controller::isFlatpak() const
 {
 #ifdef NEOCHAT_FLATPAK
@@ -645,41 +555,6 @@ bool Controller::isFlatpak() const
 #endif
 }
 
-void Controller::setActiveAccountLabel(const QString &label)
-{
-    if (!m_connection) {
-        return;
-    }
-    QJsonObject json{
-        {"account_label", label},
-    };
-    m_connection->setAccountData("org.kde.neochat.account_label", json);
-}
-
-QString Controller::activeAccountLabel() const
-{
-    if (!m_connection) {
-        return {};
-    }
-    return m_connection->accountDataJson("org.kde.neochat.account_label")["account_label"].toString();
-}
-
-QVariantList Controller::getSupportedRoomVersions(Quotient::Connection *connection)
-{
-    auto roomVersions = connection->availableRoomVersions();
-
-    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());
-        supportedRoomVersions.append(roomVersionMap);
-    }
-
-    return supportedRoomVersions;
-}
-
 AccountRegistry &Controller::accounts()
 {
     return m_accountRegistry;

src/controller.h

@@ -9,6 +9,7 @@
 
 #include <KFormat>
 
+#include "neochatconnection.h"
 #include <Quotient/accountregistry.h>
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/settings.h>
@@ -20,7 +21,6 @@ class QQuickTextDocument;
 
 namespace Quotient
 {
-class Connection;
 class Room;
 class User;
 }
@@ -50,7 +50,7 @@ class Controller : public QObject
     /**
      * @brief The current connection for the rest of NeoChat to use.
      */
-    Q_PROPERTY(Quotient::Connection *activeConnection READ activeConnection WRITE setActiveConnection NOTIFY activeConnectionChanged)
+    Q_PROPERTY(NeoChatConnection *activeConnection READ activeConnection WRITE setActiveConnection NOTIFY activeConnectionChanged)
 
     /**
      * @brief The PushRuleModel that has the active connection's push rules.
@@ -62,16 +62,6 @@ class Controller : public QObject
      */
     Q_PROPERTY(int activeConnectionIndex READ activeConnectionIndex NOTIFY activeConnectionIndexChanged)
 
-    /**
-     * @brief The account label for the active account.
-     *
-     * Account labels are a concept specific to NeoChat, allowing accounts to be
-     * labelled, e.g. for "Work", "Private", etc.
-     *
-     * Set to an empty string to remove the label.
-     */
-    Q_PROPERTY(QString activeAccountLabel READ activeAccountLabel WRITE setActiveAccountLabel NOTIFY activeAccountLabelChanged)
-
     /**
      * @brief Whether the OS NeoChat is running on supports sytem tray icons.
      */
@@ -87,20 +77,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.
      *
@@ -123,46 +99,28 @@ public:
 
     [[nodiscard]] int accountCount() const;
 
-    void setActiveConnection(Quotient::Connection *connection);
-    [[nodiscard]] Quotient::Connection *activeConnection() const;
+    void setActiveConnection(NeoChatConnection *connection);
+    [[nodiscard]] NeoChatConnection *activeConnection() const;
 
     [[nodiscard]] PushRuleModel *pushRuleModel() const;
 
     /**
      * @brief Add a new connection to the account registry.
      */
-    void addConnection(Quotient::Connection *c);
+    void addConnection(NeoChatConnection *c);
 
     /**
      * @brief Drop a connection from the account registry.
      */
-    void dropConnection(Quotient::Connection *c);
+    void dropConnection(NeoChatConnection *c);
 
     int activeConnectionIndex() const;
 
-    [[nodiscard]] QString activeAccountLabel() const;
-    void setActiveAccountLabel(const QString &label);
-
     /**
      * @brief Save an access token to the keychain for the given account.
      */
     bool saveAccessTokenToKeyChain(const Quotient::AccountSettings &account, const QByteArray &accessToken);
 
-    /**
-     * @brief Change the password for an account.
-     *
-     * The function emits a passwordStatus signal with a PasswordStatus value when
-     * complete.
-     *
-     * @sa PasswordStatus, passwordStatus
-     */
-    Q_INVOKABLE void changePassword(Quotient::Connection *connection, const QString &currentPassword, const QString &newPassword);
-
-    /**
-     * @brief Change the avatar for an account.
-     */
-    Q_INVOKABLE bool setAvatar(Quotient::Connection *connection, const QUrl &avatarSource);
-
     /**
      * @brief Create new room for a group chat.
      */
@@ -194,8 +152,6 @@ public:
 
     bool isOnline() const;
 
-    bool encryptionSupported() const;
-
     /**
      * @brief Sets the QNetworkProxy for the application.
      *
@@ -203,8 +159,6 @@ public:
      */
     Q_INVOKABLE void setApplicationProxy();
 
-    int quotientMinorVersion() const;
-
     bool isFlatpak() const;
 
     /**
@@ -228,14 +182,12 @@ public:
      */
     Q_INVOKABLE void forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item);
 
-    Q_INVOKABLE QVariantList getSupportedRoomVersions(Quotient::Connection *connection);
-
     Quotient::AccountRegistry &accounts();
 
 private:
     explicit Controller(QObject *parent = nullptr);
 
-    QPointer<Quotient::Connection> m_connection;
+    QPointer<NeoChatConnection> m_connection;
     TrayIcon *m_trayIcon = nullptr;
 
     QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const Quotient::AccountSettings &account);
@@ -252,7 +204,7 @@ private:
 
 private Q_SLOTS:
     void invokeLogin();
-    void showWindow();
+    void toggleWindow();
     void setQuitOnLastWindowClosed();
 
 Q_SIGNALS:
@@ -262,8 +214,8 @@ Q_SIGNALS:
     /// Error occurred because of server or bug in NeoChat
     void globalErrorOccured(QString error, QString detail);
     void syncDone();
-    void connectionAdded(Quotient::Connection *_t1);
-    void connectionDropped(Quotient::Connection *_t1);
+    void connectionAdded(NeoChatConnection *connection);
+    void connectionDropped(NeoChatConnection *connection);
     void accountCountChanged();
     void initiated();
     void notificationClicked(const QString &_t1, const QString &_t2);
@@ -274,18 +226,14 @@ Q_SIGNALS:
     void userConsentRequired(QUrl url);
     void testConnectionResult(const QString &connection, bool usable);
     void isOnlineChanged(bool isOnline);
-    void keyVerificationRequest(int timeLeft, Quotient::Connection *connection, const QString &transactionId, const QString &deviceId);
+    void keyVerificationRequest(int timeLeft, NeoChatConnection *connection, const QString &transactionId, const QString &deviceId);
     void keyVerificationStart();
     void keyVerificationAccept(const QString &commitment);
     void keyVerificationKey(const QString &sas);
     void activeConnectionIndexChanged();
     void roomAdded(NeoChatRoom *room);
-    void activeAccountLabelChanged();
 
 public Q_SLOTS:
-    void logout(Quotient::Connection *conn, bool serverSideLogout);
-    void changeAvatar(Quotient::Connection *conn, const QUrl &localFile);
-    static void markAllMessagesAsRead(Quotient::Connection *conn);
     void saveWindowGeometry();
 };
 
@@ -301,3 +249,9 @@ class NeochatDeleteDeviceJob : public Quotient::BaseJob
 public:
     explicit NeochatDeleteDeviceJob(const QString &deviceId, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
 };
+
+class NeoChatDeactivateAccountJob : public Quotient::BaseJob
+{
+public:
+    explicit NeoChatDeactivateAccountJob(const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
+};

src/delegatesizehelper.cpp

@@ -124,7 +124,7 @@ int DelegateSizeHelper::calculateCurrentPercentageWidth() const
     int maxPercentWidth = endPercentBigger ? m_endPercentWidth : m_startPercentWidth;
     int minPercentWidth = endPercentBigger ? m_startPercentWidth : m_endPercentWidth;
 
-    int calcPercentWidth = std::ceil(m * m_parentWidth + c);
+    int calcPercentWidth = std::round(m * m_parentWidth + c);
     return std::clamp(calcPercentWidth, minPercentWidth, maxPercentWidth);
 }
 
@@ -146,9 +146,9 @@ qreal DelegateSizeHelper::currentWidth() const
 
     qreal absoluteWidth = m_parentWidth * percentWidth * 0.01;
     if (m_maxWidth < 0.0) {
-        return std::ceil(absoluteWidth);
+        return std::round(absoluteWidth);
     } else {
-        return std::ceil(std::min(absoluteWidth, m_maxWidth));
+        return std::round(std::min(absoluteWidth, m_maxWidth));
     }
 }
 

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

@@ -8,6 +8,7 @@
 #include <Quotient/connection.h>
 #include <Quotient/csapi/content-repo.h>
 
+#include "neochatconfig.h"
 #include "neochatroom.h"
 
 using namespace Quotient;
@@ -19,6 +20,10 @@ LinkPreviewer::LinkPreviewer(QObject *parent, NeoChatRoom *room, const QUrl &url
     , m_url(url)
 {
     loadUrlPreview();
+    if (m_currentRoom) {
+        connect(m_currentRoom, &NeoChatRoom::urlPreviewEnabledChanged, this, &LinkPreviewer::loadUrlPreview);
+    }
+    connect(NeoChatConfig::self(), &NeoChatConfig::ShowLinkPreviewChanged, this, &LinkPreviewer::loadUrlPreview);
 }
 
 bool LinkPreviewer::loaded() const
@@ -57,19 +62,22 @@ void LinkPreviewer::setUrl(QUrl url)
 
 void LinkPreviewer::loadUrlPreview()
 {
+    if (!m_currentRoom || !NeoChatConfig::showLinkPreview() || !m_currentRoom->urlPreviewEnabled()) {
+        return;
+    }
     if (m_url.scheme() == QStringLiteral("https")) {
         m_loaded = false;
         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

@@ -22,7 +22,7 @@ Login::Login(QObject *parent)
 void Login::init()
 {
     m_homeserverReachable = false;
-    m_connection = new Connection();
+    m_connection = new NeoChatConnection();
     m_matrixId = QString();
     m_password = QString();
     m_deviceName = QStringLiteral("NeoChat %1 %2 %3 %4")
@@ -33,12 +33,12 @@ 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;
         }
 
@@ -51,7 +51,7 @@ void Login::init()
         m_testing = true;
         Q_EMIT testingChanged();
         if (!m_connection) {
-            m_connection = new Connection();
+            m_connection = new NeoChatConnection();
         }
         m_connection->resolveServer(m_matrixId);
         connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [this]() {
@@ -87,7 +87,11 @@ void Login::init()
         Q_EMIT isLoggingInChanged();
     });
     connect(m_connection, &Connection::loginError, this, [this](QString error, const QString &) {
-        Q_EMIT errorOccured(i18n("Login Failed: %1", error));
+        if (error == QStringLiteral("Invalid username or password")) {
+            setInvalidPassword(true);
+        } else {
+            Q_EMIT errorOccured(i18n("Login Failed: %1", error));
+        }
         m_isLoggingIn = false;
         Q_EMIT isLoggingInChanged();
     });
@@ -120,8 +124,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();
 }
@@ -133,6 +137,7 @@ QString Login::password() const
 
 void Login::setPassword(const QString &password)
 {
+    setInvalidPassword(false);
     m_password = password;
     Q_EMIT passwordChanged();
 }
@@ -155,7 +160,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());
 }
 
@@ -199,4 +204,15 @@ bool Login::isLoggedIn() const
     return m_isLoggedIn;
 }
 
+void Login::setInvalidPassword(bool invalid)
+{
+    m_invalidPassword = invalid;
+    Q_EMIT isInvalidPasswordChanged();
+}
+
+bool Login::isInvalidPassword() const
+{
+    return m_invalidPassword;
+}
+
 #include "moc_login.cpp"

src/login.h

@@ -6,10 +6,7 @@
 #include <QObject>
 #include <QUrl>
 
-namespace Quotient
-{
-class Connection;
-}
+class NeoChatConnection;
 
 /**
  * @class Login
@@ -73,6 +70,11 @@ class Login : public QObject
      */
     Q_PROPERTY(bool isLoggedIn READ isLoggedIn NOTIFY isLoggedInChanged)
 
+    /**
+     * @brief Whether the password (or the username) is invalid.
+     */
+    Q_PROPERTY(bool isInvalidPassword READ isInvalidPassword NOTIFY isInvalidPasswordChanged)
+
 public:
     explicit Login(QObject *parent = nullptr);
 
@@ -100,6 +102,9 @@ public:
 
     bool isLoggedIn() const;
 
+    bool isInvalidPassword() const;
+    void setInvalidPassword(bool invalid);
+
     Q_INVOKABLE void login();
     Q_INVOKABLE void loginWithSso();
 
@@ -116,6 +121,7 @@ Q_SIGNALS:
     void testingChanged();
     void isLoggingInChanged();
     void isLoggedInChanged();
+    void isInvalidPasswordChanged();
 
 private:
     void setHomeserverReachable(bool reachable);
@@ -126,9 +132,10 @@ private:
     QString m_deviceName;
     bool m_supportsSso = false;
     bool m_supportsPassword = false;
-    Quotient::Connection *m_connection = nullptr;
+    NeoChatConnection *m_connection = nullptr;
     QUrl m_ssoUrl;
     bool m_testing = false;
     bool m_isLoggingIn = false;
     bool m_isLoggedIn = false;
+    bool m_invalidPassword = false;
 };

src/main.cpp

@@ -3,6 +3,7 @@
 
 #include <QCommandLineParser>
 #include <QIcon>
+#include <QNetworkDiskCache>
 #include <QNetworkProxyFactory>
 #include <QObject>
 #include <QQmlApplicationEngine>
@@ -17,6 +18,10 @@
 #include <QApplication>
 #endif
 
+#ifdef HAVE_WEBVIEW
+#include <QtWebView>
+#endif
+
 #include <KAboutData>
 #ifdef HAVE_KDBUSADDONS
 #include <KDBusService>
@@ -49,7 +54,6 @@
 #include "login.h"
 #include "matriximageprovider.h"
 #include "models/accountemoticonmodel.h"
-#include "models/collapsestateproxymodel.h"
 #include "models/customemojimodel.h"
 #include "models/devicesmodel.h"
 #include "models/devicesproxymodel.h"
@@ -76,6 +80,7 @@
 #include "models/userlistmodel.h"
 #include "models/webshortcutmodel.h"
 #include "neochatconfig.h"
+#include "neochatconnection.h"
 #include "neochatroom.h"
 #include "notificationsmanager.h"
 #include "pollhandler.h"
@@ -94,6 +99,7 @@
 #include "runner.h"
 #include <QDBusConnection>
 #endif
+#include "registration.h"
 
 #ifdef Q_OS_WINDOWS
 #include <Windows.h>
@@ -105,7 +111,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;
     }
 };
 
@@ -128,11 +144,15 @@ int main(int argc, char *argv[])
 
     QNetworkProxyFactory::setUseSystemConfiguration(true);
 
+#ifdef HAVE_WEBVIEW
+    QtWebView::initialize();
+#endif
+
 #ifdef Q_OS_ANDROID
     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")) {
@@ -154,7 +174,7 @@ int main(int argc, char *argv[])
 #endif
     KLocalizedString::setApplicationDomain("neochat");
 
-    QGuiApplication::setOrganizationName("KDE");
+    QGuiApplication::setOrganizationName("KDE"_ls);
 
     KAboutData about(QStringLiteral("neochat"),
                      i18n("NeoChat"),
@@ -191,7 +211,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;
@@ -221,6 +242,7 @@ int main(int argc, char *argv[])
     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());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Registration", &Registration::instance());
     qmlRegisterType<ActionsHandler>("org.kde.neochat", 1, 0, "ActionsHandler");
     qmlRegisterType<ChatDocumentHandler>("org.kde.neochat", 1, 0, "ChatDocumentHandler");
     qmlRegisterType<RoomListModel>("org.kde.neochat", 1, 0, "RoomListModel");
@@ -228,7 +250,6 @@ int main(int argc, char *argv[])
     qmlRegisterType<UserListModel>("org.kde.neochat", 1, 0, "UserListModel");
     qmlRegisterType<MessageEventModel>("org.kde.neochat", 1, 0, "MessageEventModel");
     qmlRegisterType<ReactionModel>("org.kde.neochat", 1, 0, "ReactionModel");
-    qmlRegisterType<CollapseStateProxyModel>("org.kde.neochat", 1, 0, "CollapseStateProxyModel");
     qmlRegisterType<MediaMessageFilterModel>("org.kde.neochat", 1, 0, "MediaMessageFilterModel");
     qmlRegisterType<MessageFilterModel>("org.kde.neochat", 1, 0, "MessageFilterModel");
     qmlRegisterType<UserFilterModel>("org.kde.neochat", 1, 0, "UserFilterModel");
@@ -253,34 +274,32 @@ 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<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", {});
+    qmlRegisterUncreatableType<NeoChatConnection>("org.kde.neochat", 1, 0, "NeoChatConnection", {});
 
     qRegisterMetaType<User *>("User*");
     qRegisterMetaType<User *>("const User*");
     qRegisterMetaType<User *>("const Quotient::User*");
     qRegisterMetaType<Room *>("Room*");
-    qRegisterMetaType<Connection *>("Connection*");
     qRegisterMetaType<MessageEventType>("MessageEventType");
     qRegisterMetaType<NeoChatRoom *>("NeoChatRoom*");
     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());
     });
@@ -323,13 +342,13 @@ 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", i18n("Ignore all SSL Errors, e.g., unsigned certificates.")));
+    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")) {
+    if (parser.isSet("ignore-ssl-errors"_ls)) {
         QObject::connect(NetworkAccessManager::instance(), &QNetworkAccessManager::sslErrors, NetworkAccessManager::instance(), [](QNetworkReply *reply) {
             reply->ignoreSslErrors();
         });
@@ -349,7 +368,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

@@ -25,13 +25,13 @@ 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) {
+    if (mediaId.count(QLatin1Char('/')) != 1) {
         if (mediaId.startsWith(QLatin1Char('/'))) {
             mediaId = mediaId.mid(1);
         } else {

src/models/accountemoticonmodel.cpp

@@ -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/actionsmodel.cpp

@@ -14,9 +14,10 @@
 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 {
@@ -450,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();
         },
@@ -527,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/collapsestateproxymodel.cpp

@@ -1,177 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#include "collapsestateproxymodel.h"
-
-#include <KLocalizedString>
-
-bool CollapseStateProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
-{
-    Q_UNUSED(source_parent);
-    return sourceModel()->data(sourceModel()->index(source_row, 0), MessageEventModel::DelegateTypeRole)
-        != MessageEventModel::DelegateType::State // If this is not a state, show it
-        || (source_row < sourceModel()->rowCount() - 1
-            && sourceModel()->data(sourceModel()->index(source_row + 1, 0), MessageEventModel::DelegateTypeRole)
-                != MessageEventModel::DelegateType::State) // If this is the first state in a block, show it. TODO hidden events?
-        || sourceModel()->data(sourceModel()->index(source_row, 0), MessageEventModel::ShowSectionRole).toBool(); // If it's a new day, show it
-}
-
-QVariant CollapseStateProxyModel::data(const QModelIndex &index, int role) const
-{
-    if (role == AggregateDisplayRole) {
-        return aggregateEventToString(mapToSource(index).row());
-    } else if (role == StateEventsRole) {
-        return stateEventsList(mapToSource(index).row());
-    } else if (role == AuthorListRole) {
-        return authorList(mapToSource(index).row());
-    } else if (role == ExcessAuthorsRole) {
-        return excessAuthors(mapToSource(index).row());
-    }
-    return sourceModel()->data(mapToSource(index), role);
-}
-
-QHash<int, QByteArray> CollapseStateProxyModel::roleNames() const
-{
-    auto roles = sourceModel()->roleNames();
-    roles[AggregateDisplayRole] = "aggregateDisplay";
-    roles[StateEventsRole] = "stateEvents";
-    roles[AuthorListRole] = "authorList";
-    roles[ExcessAuthorsRole] = "excessAuthors";
-    return roles;
-}
-
-QString CollapseStateProxyModel::aggregateEventToString(int sourceRow) const
-{
-    QStringList parts;
-    QVariantList uniqueAuthors;
-    for (int i = sourceRow; i >= 0; i--) {
-        parts += sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::GenericDisplayRole).toString();
-        QVariant nextAuthor = sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorRole);
-        if (!uniqueAuthors.contains(nextAuthor)) {
-            uniqueAuthors.append(nextAuthor);
-        }
-        if (i > 0
-            && (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
-                    != MessageEventModel::DelegateType::State // If it's not a state event
-                || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
-                )) {
-            break;
-        }
-    }
-    parts.sort(); // Sort them so that all identical events can be collected.
-    if (!parts.isEmpty()) {
-        QStringList chunks;
-        while (!parts.isEmpty()) {
-            chunks += QString();
-            int count = 1;
-            auto part = parts.takeFirst();
-            chunks.last() += part;
-            while (!parts.isEmpty() && parts.first() == part) {
-                parts.removeFirst();
-                count++;
-            }
-            if (count > 1 && uniqueAuthors.length() == 1) {
-                chunks.last() += i18ncp("n times", " %1 time ", " %1 times ", count);
-            }
-        }
-        chunks.removeDuplicates();
-        QString text = "<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().toHtmlEscaped());
-        text += userText;
-        text += chunks.takeFirst();
-
-        if (chunks.size() > 0) {
-            while (chunks.size() > 1) {
-                text += i18nc("[action 1], [action 2 and/or action 3]", ", ");
-                text += chunks.takeFirst();
-            }
-            text += uniqueAuthors.length() > 1 ? i18nc("[action 1, action 2] or [action 3]", " or ") : i18nc("[action 1, action 2] and [action 3]", " and ");
-            text += chunks.takeFirst();
-        }
-        return text;
-    } else {
-        return {};
-    }
-}
-
-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()},
-        };
-        stateEvents.append(nextState);
-        if (i > 0
-            && (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
-                    != MessageEventModel::DelegateType::State // If it's not a state event
-                || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
-                )) {
-            break;
-        }
-    }
-    return stateEvents;
-}
-
-QVariantList CollapseStateProxyModel::authorList(int sourceRow) const
-{
-    QVariantList uniqueAuthors;
-    for (int i = sourceRow; i >= 0; i--) {
-        QVariant nextAvatar = sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorRole);
-        if (!uniqueAuthors.contains(nextAvatar)) {
-            uniqueAuthors.append(nextAvatar);
-        }
-        if (i > 0
-            && (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
-                    != MessageEventModel::DelegateType::State // If it's not a state event
-                || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
-                )) {
-            break;
-        }
-    }
-
-    if (uniqueAuthors.count() > 5) {
-        uniqueAuthors = uniqueAuthors.mid(0, 5);
-    }
-    return uniqueAuthors;
-}
-
-QString CollapseStateProxyModel::excessAuthors(int row) const
-{
-    QVariantList uniqueAuthors;
-    for (int i = row; i >= 0; i--) {
-        QVariant nextAvatar = sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorRole);
-        if (!uniqueAuthors.contains(nextAvatar)) {
-            uniqueAuthors.append(nextAvatar);
-        }
-        if (i > 0
-            && (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
-                    != MessageEventModel::DelegateType::State // If it's not a state event
-                || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
-                )) {
-            break;
-        }
-    }
-
-    int excessAuthors;
-    if (uniqueAuthors.count() > 5) {
-        excessAuthors = uniqueAuthors.count() - 5;
-    } else {
-        excessAuthors = 0;
-    }
-    QString excessAuthorsString;
-    if (excessAuthors == 0) {
-        return QString();
-    } else {
-        return QStringLiteral("+ %1").arg(excessAuthors);
-    }
-}
-
-#include "moc_collapsestateproxymodel.cpp"

src/models/collapsestateproxymodel.h

@@ -1,80 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#pragma once
-
-#include "messageeventmodel.h"
-#include <QSortFilterProxyModel>
-
-/**
- * @class CollapseStateProxyModel
- *
- * This model aggregates multiple sequential state events into a single entry.
- *
- * Events are only aggregated if they happened on the same day.
- *
- * @sa MessageEventModel
- */
-class CollapseStateProxyModel : public QSortFilterProxyModel
-{
-    Q_OBJECT
-public:
-    /**
-     * @brief Defines the model roles.
-     */
-    enum Roles {
-        AggregateDisplayRole = MessageEventModel::LastRole + 1, /**< Single line aggregation of all the state events. */
-        StateEventsRole, /**< List of state events in the aggregated state. */
-        AuthorListRole, /**< List of the first 5 unique authors of the aggregated state event. */
-        ExcessAuthorsRole, /**< The number of unique authors beyond the first 5. */
-        LastRole, // Keep this last
-    };
-
-    /**
-     * @brief Whether a row should be shown out or not.
-     *
-     * @sa QSortFilterProxyModel::filterAcceptsRow
-     */
-    [[nodiscard]] bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
-
-    /**
-     * @brief Get the given role value at the given index.
-     *
-     * @sa QSortFilterProxyModel::data
-     */
-    [[nodiscard]] QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override;
-
-    /**
-     * @brief Returns a mapping from Role enum values to role names.
-     *
-     * @sa Roles, QAbstractProxyModel::roleNames()
-     */
-    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
-
-private:
-    /**
-     * @brief Aggregation of the text of consecutive state events starting at row.
-     *
-     * If state events happen on different days they will be split into two aggregate
-     * events.
-     */
-    [[nodiscard]] QString aggregateEventToString(int row) const;
-
-    /**
-     * @brief Return a list of consecutive state events starting at row.
-     *
-     * If state events happen on different days they will be split into two aggregate
-     * events.
-     */
-    [[nodiscard]] QVariantList stateEventsList(int row) const;
-
-    /**
-     * @brief List of the first 5 unique authors for the aggregate state events starting at row.
-     */
-    [[nodiscard]] QVariantList authorList(int row) const;
-
-    /**
-     * @brief The number of unique authors beyond the first 5 for the aggregate state events starting at row.
-     */
-    [[nodiscard]] QString excessAuthors(int row) const;
-};

src/models/completionmodel.cpp

@@ -66,8 +66,8 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
 
     if (m_autoCompletionType == Command) {
         if (role == DisplayNameRole) {
-            return m_filterModel->data(filterIndex, ActionsModel::Prefix).toString() + QStringLiteral(" ")
-                + m_filterModel->data(filterIndex, ActionsModel::Parameters).toString();
+            return QStringLiteral("%1 %2").arg(m_filterModel->data(filterIndex, ActionsModel::Prefix).toString(),
+                                               m_filterModel->data(filterIndex, ActionsModel::Parameters).toString());
         }
         if (role == SubtitleRole) {
             return m_filterModel->data(filterIndex, ActionsModel::Description);
@@ -87,7 +87,8 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
             return m_filterModel->data(filterIndex, RoomListModel::CanonicalAliasRole);
         }
         if (role == IconNameRole) {
-            return m_filterModel->data(filterIndex, RoomListModel::AvatarRole);
+            return QStringLiteral("mxc://%1")
+                .arg(m_roomListModel->connection()->makeMediaUrl(m_filterModel->data(filterIndex, RoomListModel::AvatarRole).toUrl()).toString());
         }
     }
     if (m_autoCompletionType == Emoji) {
@@ -144,7 +145,7 @@ void CompletionModel::updateCompletion()
         m_filterModel->setFullText(m_fullText);
         m_filterModel->setFilterText(m_text);
         m_filterModel->invalidate();
-    } else if (text().startsWith(QLatin1Char(':')) && !text()[1].isUpper()
+    } else if (text().startsWith(QLatin1Char(':')) && text().size() > 1 && !text()[1].isUpper()
                && (m_fullText.indexOf(QLatin1Char(':'), 1) == -1
                    || (m_fullText.indexOf(QLatin1Char(' ')) != -1 && m_fullText.indexOf(QLatin1Char(':'), 1) > m_fullText.indexOf(QLatin1Char(' '), 1)))) {
         m_filterModel->setSourceModel(m_emojiModel);

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

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

@@ -21,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];
@@ -41,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();
@@ -56,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},
@@ -77,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);
     });
 }
 
@@ -86,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)
@@ -174,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;
@@ -187,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

@@ -113,11 +113,11 @@ void DevicesModel::logout(const QString &deviceId, const QString &password)
         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 {

src/models/devicesproxymodel.h

@@ -8,7 +8,7 @@
 class DevicesProxyModel : public QSortFilterProxyModel
 {
     Q_OBJECT
-    Q_PROPERTY(int type READ type WRITE setType NOTIFY typeChanged);
+    Q_PROPERTY(int type READ type WRITE setType NOTIFY typeChanged)
 
 public:
     DevicesProxyModel(QObject *parent = nullptr);

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

@@ -78,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: {
@@ -129,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/locationsmodel.cpp

@@ -15,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));
             }
@@ -25,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));
                 }
@@ -36,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));
                 }
@@ -53,7 +53,7 @@ LocationsModel::LocationsModel(QObject *parent)
 
 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;

src/models/mediamessagefiltermodel.cpp

@@ -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

@@ -5,7 +5,7 @@
 
 #include <QSortFilterProxyModel>
 
-#include "models/collapsestateproxymodel.h"
+#include "models/messagefiltermodel.h"
 
 /**
  * @class MediaMessageFilterModel
@@ -22,7 +22,7 @@ public:
      * @brief Defines the model roles.
      */
     enum Roles {
-        SourceRole = CollapseStateProxyModel::LastRole + 1, /**< The mxc source URL for the item. */
+        SourceRole = MessageFilterModel::LastRole + 1, /**< The mxc source URL for the item. */
         TempSourceRole, /**< Source for the temporary content (either blurhash or mxc URL). */
         TypeRole, /**< The type of the media (image or video). */
         CaptionRole, /**< The caption for the item. */

src/models/messageeventmodel.cpp

@@ -20,6 +20,7 @@
 
 #include <QDebug>
 #include <QGuiApplication>
+#include <QMovie>
 #include <QTimeZone>
 
 #include <KLocalizedString>
@@ -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();
@@ -667,11 +668,11 @@ 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) {
@@ -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 {};
         }
@@ -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();
         }
@@ -865,13 +866,11 @@ 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;
     }
 
@@ -881,8 +880,8 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     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();
             }
@@ -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;
         }
     }
 

src/models/messagefiltermodel.cpp

@@ -3,6 +3,8 @@
 
 #include "messagefiltermodel.h"
 
+#include <KLocalizedString>
+
 #include "messageeventmodel.h"
 #include "neochatconfig.h"
 
@@ -32,22 +34,192 @@ bool MessageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sour
 {
     const QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
 
+    // Don't show redacted (i.e. deleted) messages.
     if (index.data(MessageEventModel::IsRedactedRole).toBool() && !NeoChatConfig::self()->showDeletedMessages()) {
         return false;
     }
 
+    // Don't show hidden or replaced messages.
     const int specialMarks = index.data(MessageEventModel::SpecialMarksRole).toInt();
     if (specialMarks == EventStatus::Hidden || specialMarks == EventStatus::Replaced) {
         return false;
     }
 
+    // Don't show events with an unknown type.
     const auto eventType = index.data(MessageEventModel::DelegateTypeRole).toInt();
-
     if (eventType == MessageEventModel::Other) {
         return false;
     }
 
+    // Don't show state events that are not the first in a consecutive group on the
+    // same day as they will be grouped as a single delegate.
+    const bool notLastRow = sourceRow < sourceModel()->rowCount() - 1;
+    const bool previousEventIsState =
+        sourceModel()->data(sourceModel()->index(sourceRow + 1, 0), MessageEventModel::DelegateTypeRole) == MessageEventModel::DelegateType::State;
+    const bool newDay = sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageEventModel::ShowSectionRole).toBool();
+    if (eventType == MessageEventModel::State && notLastRow && previousEventIsState && !newDay) {
+        return false;
+    }
+
     return true;
 }
 
+QVariant MessageFilterModel::data(const QModelIndex &index, int role) const
+{
+    if (role == AggregateDisplayRole) {
+        return aggregateEventToString(mapToSource(index).row());
+    } else if (role == StateEventsRole) {
+        return stateEventsList(mapToSource(index).row());
+    } else if (role == AuthorListRole) {
+        return authorList(mapToSource(index).row());
+    } else if (role == ExcessAuthorsRole) {
+        return excessAuthors(mapToSource(index).row());
+    }
+    return sourceModel()->data(mapToSource(index), role);
+}
+
+QHash<int, QByteArray> MessageFilterModel::roleNames() const
+{
+    auto roles = sourceModel()->roleNames();
+    roles[AggregateDisplayRole] = "aggregateDisplay";
+    roles[StateEventsRole] = "stateEvents";
+    roles[AuthorListRole] = "authorList";
+    roles[ExcessAuthorsRole] = "excessAuthors";
+    return roles;
+}
+
+QString MessageFilterModel::aggregateEventToString(int sourceRow) const
+{
+    QStringList parts;
+    QVariantList uniqueAuthors;
+    for (int i = sourceRow; i >= 0; i--) {
+        parts += sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::GenericDisplayRole).toString();
+        QVariant nextAuthor = sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorRole);
+        if (!uniqueAuthors.contains(nextAuthor)) {
+            uniqueAuthors.append(nextAuthor);
+        }
+        if (i > 0
+            && (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
+                    != MessageEventModel::DelegateType::State // If it's not a state event
+                || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
+                )) {
+            break;
+        }
+    }
+    parts.sort(); // Sort them so that all identical events can be collected.
+    if (!parts.isEmpty()) {
+        QStringList chunks;
+        while (!parts.isEmpty()) {
+            chunks += QString();
+            int count = 1;
+            auto part = parts.takeFirst();
+            chunks.last() += part;
+            while (!parts.isEmpty() && parts.first() == part) {
+                parts.removeFirst();
+                count++;
+            }
+            if (count > 1 && uniqueAuthors.length() == 1) {
+                chunks.last() += i18ncp("n times", " %1 time ", " %1 times ", count);
+            }
+        }
+        chunks.removeDuplicates();
+        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()[QStringLiteral("id")].toString(),
+                                                                 uniqueAuthors[0].toMap()[QStringLiteral("color")].toString(),
+                                                                 uniqueAuthors[0].toMap()[QStringLiteral("displayName")].toString().toHtmlEscaped());
+        text += userText;
+        text += chunks.takeFirst();
+
+        if (chunks.size() > 0) {
+            while (chunks.size() > 1) {
+                text += i18nc("[action 1], [action 2 and/or action 3]", ", ");
+                text += chunks.takeFirst();
+            }
+            text += uniqueAuthors.length() > 1 ? i18nc("[action 1, action 2] or [action 3]", " or ") : i18nc("[action 1, action 2] and [action 3]", " and ");
+            text += chunks.takeFirst();
+        }
+        return text;
+    } else {
+        return {};
+    }
+}
+
+QVariantList MessageFilterModel::stateEventsList(int sourceRow) const
+{
+    QVariantList stateEvents;
+    for (int i = sourceRow; i >= 0; i--) {
+        auto nextState = QVariantMap{
+            {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
+            && (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
+                    != MessageEventModel::DelegateType::State // If it's not a state event
+                || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
+                )) {
+            break;
+        }
+    }
+    return stateEvents;
+}
+
+QVariantList MessageFilterModel::authorList(int sourceRow) const
+{
+    QVariantList uniqueAuthors;
+    for (int i = sourceRow; i >= 0; i--) {
+        QVariant nextAvatar = sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorRole);
+        if (!uniqueAuthors.contains(nextAvatar)) {
+            uniqueAuthors.append(nextAvatar);
+        }
+        if (i > 0
+            && (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
+                    != MessageEventModel::DelegateType::State // If it's not a state event
+                || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
+                )) {
+            break;
+        }
+    }
+
+    if (uniqueAuthors.count() > 5) {
+        uniqueAuthors = uniqueAuthors.mid(0, 5);
+    }
+    return uniqueAuthors;
+}
+
+QString MessageFilterModel::excessAuthors(int row) const
+{
+    QVariantList uniqueAuthors;
+    for (int i = row; i >= 0; i--) {
+        QVariant nextAvatar = sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorRole);
+        if (!uniqueAuthors.contains(nextAvatar)) {
+            uniqueAuthors.append(nextAvatar);
+        }
+        if (i > 0
+            && (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
+                    != MessageEventModel::DelegateType::State // If it's not a state event
+                || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
+                )) {
+            break;
+        }
+    }
+
+    int excessAuthors;
+    if (uniqueAuthors.count() > 5) {
+        excessAuthors = uniqueAuthors.count() - 5;
+    } else {
+        excessAuthors = 0;
+    }
+    QString excessAuthorsString;
+    if (excessAuthors == 0) {
+        return QString();
+    } else {
+        return QStringLiteral("+ %1").arg(excessAuthors);
+    }
+}
+
 #include "moc_messagefiltermodel.cpp"

src/models/messagefiltermodel.h

@@ -5,21 +5,79 @@
 
 #include <QSortFilterProxyModel>
 
+#include "messageeventmodel.h"
+
 /**
  * @class MessageFilterModel
  *
  * This model filters out any messages that should be hidden.
  *
  * Deleted messages are only hidden if the user hasn't set them to be shown.
+ *
+ * The model also contains the roles and functions to support aggregating multiple
+ * consecutive state events into a single delegate. The state events must all happen
+ * on the same day to be aggregated.
  */
 class MessageFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 public:
+    /**
+     * @brief Defines the model roles.
+     */
+    enum Roles {
+        AggregateDisplayRole = MessageEventModel::LastRole + 1, /**< Single line aggregation of all the state events. */
+        StateEventsRole, /**< List of state events in the aggregated state. */
+        AuthorListRole, /**< List of the first 5 unique authors of the aggregated state event. */
+        ExcessAuthorsRole, /**< The number of unique authors beyond the first 5. */
+        LastRole, // Keep this last
+    };
+
     explicit MessageFilterModel(QObject *parent = nullptr);
 
     /**
      * @brief Custom filter function to remove hidden messages.
      */
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+
+    /**
+     * @brief Get the given role value at the given index.
+     *
+     * @sa QSortFilterProxyModel::data
+     */
+    [[nodiscard]] QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override;
+
+    /**
+     * @brief Returns a mapping from Role enum values to role names.
+     *
+     * @sa Roles, QAbstractProxyModel::roleNames()
+     */
+    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
+
+private:
+    /**
+     * @brief Aggregation of the text of consecutive state events starting at row.
+     *
+     * If state events happen on different days they will be split into two aggregate
+     * events.
+     */
+    [[nodiscard]] QString aggregateEventToString(int row) const;
+
+    /**
+     * @brief Return a list of consecutive state events starting at row.
+     *
+     * If state events happen on different days they will be split into two aggregate
+     * events.
+     */
+    [[nodiscard]] QVariantList stateEventsList(int row) const;
+
+    /**
+     * @brief List of the first 5 unique authors for the aggregate state events starting at row.
+     */
+    [[nodiscard]] QVariantList authorList(int row) const;
+
+    /**
+     * @brief The number of unique authors beyond the first 5 for the aggregate state events starting at row.
+     */
+    [[nodiscard]] QString excessAuthors(int row) const;
 };

src/models/publicroomlistmodel.cpp

@@ -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

@@ -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.
@@ -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

@@ -69,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();
@@ -201,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
@@ -302,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();
     });
@@ -340,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();
     });
@@ -348,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);
         }
     });
 }
@@ -359,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)
@@ -383,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;
             }
         }
@@ -423,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

@@ -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

@@ -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, QString::number(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/roomlistmodel.cpp

@@ -40,19 +40,19 @@ RoomListModel::RoomListModel(QObject *parent)
 #if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
 #ifndef Q_OS_ANDROID
         // copied from Telegram desktop
-        const auto launcherUrl = "application://org.kde.neochat.desktop";
+        const auto launcherUrl = "application://org.kde.neochat.desktop"_ls;
         // Gnome requires that count is a 64bit integer
         const qint64 counterSlice = std::min(m_notificationCount, 9999);
         QVariantMap dbusUnityProperties;
 
         if (counterSlice > 0) {
-            dbusUnityProperties["count"] = counterSlice;
-            dbusUnityProperties["count-visible"] = true;
+            dbusUnityProperties["count"_ls] = counterSlice;
+            dbusUnityProperties["count-visible"_ls] = true;
         } else {
-            dbusUnityProperties["count-visible"] = false;
+            dbusUnityProperties["count-visible"_ls] = false;
         }
 
-        auto signal = QDBusMessage::createSignal("/com/canonical/unity/launcherentry/neochat", "com.canonical.Unity.LauncherEntry", "Update");
+        auto signal = QDBusMessage::createSignal("/com/canonical/unity/launcherentry/neochat"_ls, "com.canonical.Unity.LauncherEntry"_ls, "Update"_ls);
 
         signal.setArguments({launcherUrl, dbusUnityProperties});
 
@@ -297,9 +297,9 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
             return NeoChatRoomType::Normal;
         }
         QJsonObject contentJson = creationEvent->contentJson();
-        QJsonObject::const_iterator typeIter = contentJson.find("type");
+        QJsonObject::const_iterator typeIter = contentJson.find("type"_ls);
         if (typeIter != contentJson.end()) {
-            if (typeIter.value().toString() == "m.space") {
+            if (typeIter.value().toString() == "m.space"_ls) {
                 return NeoChatRoomType::Space;
             }
         }
@@ -400,7 +400,7 @@ QString RoomListModel::categoryName(int category)
     case NeoChatRoomType::Space:
         return i18n("Spaces");
     default:
-        return "Deadbeef";
+        return {};
     }
 }
 

src/models/roomlistmodel.h

@@ -163,7 +163,7 @@ private:
     QMap<int, bool> m_categoryVisibility;
 
     int m_notificationCount = 0;
-    QString m_activeSpaceId = "";
+    QString m_activeSpaceId;
 
     void connectRoomSignals(NeoChatRoom *room);
 

src/models/searchmodel.cpp

@@ -57,7 +57,7 @@ void SearchModel::search()
         .searchTerm = m_searchText,
         .keys = {},
         .filter = filter,
-        .orderBy = "recent",
+        .orderBy = "recent"_ls,
         .eventContext = SearchJob::IncludeEventContext{3, 3, true},
         .includeState = false,
         .groupings = none,
@@ -157,8 +157,8 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
             }
 
             return QVariantMap{
-                {"display", m_room->eventToString(*replyPtr, Qt::RichText)},
-                {"type", type},
+                {"display"_ls, m_room->eventToString(*replyPtr, Qt::RichText)},
+                {"type"_ls, type},
             };
         }
     case IsPendingRole:
@@ -166,13 +166,13 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
     case ShowLinkPreviewRole:
         return false;
     case IsReplyRole:
-        return !event.contentJson()["m.relates_to"].toObject()["m.in_reply_to"].toObject()["event_id"].toString().isEmpty();
+        return !event.contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString().isEmpty();
     case HighlightRole:
         return !m_room->isDirectChat() && m_room->isEventHighlighted(&event);
     case EventIdRole:
         return event.id();
     case ReplyIdRole:
-        return event.contentJson()["m.relates_to"].toObject()["m.in_reply_to"].toObject()["event_id"].toString();
+        return event.contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString();
     }
     return MessageEventModel::DelegateType::Message;
 }
@@ -261,7 +261,7 @@ QString renderDate(const QDateTime &timestamp)
         return i18n("The day before yesterday");
     }
     if (date > QDate::currentDate().addDays(-7)) {
-        return date.toString("dddd");
+        return date.toString("dddd"_ls);
     }
 
     return QLocale::system().toString(date, QLocale::ShortFormat);

src/models/serverlistmodel.cpp

@@ -15,8 +15,8 @@
 ServerListModel::ServerListModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    KConfig dataResource("data", KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
-    KConfigGroup serverGroup(&dataResource, "Servers");
+    KConfig dataResource(QStringLiteral("data"), KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
+    KConfigGroup serverGroup(&dataResource, QStringLiteral("Servers"));
 
     QString domain = Controller::instance().activeConnection()->domain();
 
@@ -91,8 +91,8 @@ int ServerListModel::rowCount(const QModelIndex &parent) const
 
 void ServerListModel::checkServer(const QString &url)
 {
-    KConfig dataResource("data", KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
-    KConfigGroup serverGroup(&dataResource, "Servers");
+    KConfig dataResource(QStringLiteral("data"), KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
+    KConfigGroup serverGroup(&dataResource, QStringLiteral("Servers"));
 
     if (!serverGroup.hasKey(url)) {
         if (Quotient::isJobPending(m_checkServerJob)) {
@@ -108,8 +108,8 @@ void ServerListModel::checkServer(const QString &url)
 
 void ServerListModel::addServer(const QString &url)
 {
-    KConfig dataResource("data", KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
-    KConfigGroup serverGroup(&dataResource, "Servers");
+    KConfig dataResource(QStringLiteral("data"), KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
+    KConfigGroup serverGroup(&dataResource, QStringLiteral("Servers"));
 
     if (!serverGroup.hasKey(url)) {
         Server newServer = Server{
@@ -129,8 +129,8 @@ void ServerListModel::addServer(const QString &url)
 
 void ServerListModel::removeServerAtIndex(int row)
 {
-    KConfig dataResource("data", KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
-    KConfigGroup serverGroup(&dataResource, "Servers");
+    KConfig dataResource(QStringLiteral("data"), KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
+    KConfigGroup serverGroup(&dataResource, QStringLiteral("Servers"));
     serverGroup.deleteEntry(data(index(row), UrlRole).toString());
 
     beginRemoveRows(QModelIndex(), row, row);

src/models/sortfilterroomlistmodel.cpp

@@ -80,7 +80,7 @@ bool SortFilterRoomListModel::filterAcceptsRow(int source_row, const QModelIndex
 
     bool acceptRoom =
         sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::DisplayNameRole).toString().contains(m_filterText, Qt::CaseInsensitive)
-        && sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::JoinStateRole).toString() != "upgraded"
+        && sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::JoinStateRole).toString() != QStringLiteral("upgraded")
         && sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::IsSpaceRole).toBool() == false;
 
     if (m_activeSpaceId.isEmpty()) {

src/models/sortfilterspacelistmodel.cpp

@@ -27,7 +27,7 @@ bool SortFilterSpaceListModel::filterAcceptsRow(int source_row, const QModelInde
 {
     Q_UNUSED(source_parent);
     return sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::IsSpaceRole).toBool()
-        && sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::JoinStateRole).toString() != "upgraded"
+        && sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::JoinStateRole).toString() != QStringLiteral("upgraded")
         && !sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::IsChildSpaceRole).toBool();
 }
 

src/models/stickermodel.cpp

@@ -112,10 +112,10 @@ void StickerModel::postSticker(int index)
     const auto &body = image.body ? *image.body : QString();
     QJsonObject infoJson;
     if (image.info) {
-        infoJson["w"] = image.info->imageSize.width();
-        infoJson["h"] = image.info->imageSize.height();
-        infoJson["mimetype"] = image.info->mimeType.name();
-        infoJson["size"] = image.info->payloadSize;
+        infoJson["w"_ls] = image.info->imageSize.width();
+        infoJson["h"_ls] = image.info->imageSize.height();
+        infoJson["mimetype"_ls] = image.info->mimeType.name();
+        infoJson["size"_ls] = image.info->payloadSize;
         // TODO thumbnail
     }
     QJsonObject content{
@@ -123,7 +123,7 @@ void StickerModel::postSticker(int index)
         {"url"_ls, image.url.toString()},
         {"info"_ls, infoJson},
     };
-    m_room->postJson("m.sticker", content);
+    m_room->postJson("m.sticker"_ls, content);
 }
 
 #include "moc_stickermodel.cpp"

src/models/userdirectorylistmodel.cpp

@@ -138,7 +138,7 @@ QVariant UserDirectoryListModel::data(const QModelIndex &index, int role) const
             return displayName;
         }
 
-        return "Unknown User";
+        return QStringLiteral("Unknown User");
     }
     if (role == AvatarRole) {
         auto avatarUrl = user.avatarUrl;

src/models/userlistmodel.cpp

@@ -163,17 +163,19 @@ void UserListModel::refreshAllUsers()
     }
     m_users.clear();
 
-    m_users = m_currentRoom->users();
-    std::sort(m_users.begin(), m_users.end(), m_currentRoom->memberSorter());
+    if (m_currentRoom != nullptr) {
+        m_users = m_currentRoom->users();
+        std::sort(m_users.begin(), m_users.end(), m_currentRoom->memberSorter());
 
-    for (User *user : std::as_const(m_users)) {
-        connect(user, &User::defaultAvatarChanged, this, [this, user]() {
-            refreshUser(user, {AvatarRole});
+        for (User *user : std::as_const(m_users)) {
+            connect(user, &User::defaultAvatarChanged, this, [this, user]() {
+                refreshUser(user, {AvatarRole});
+            });
+        }
+        connect(m_currentRoom->connection(), &Connection::loggedOut, this, [this]() {
+            setRoom(nullptr);
         });
     }
-    connect(m_currentRoom->connection(), &Connection::loggedOut, this, [this]() {
-        setRoom(nullptr);
-    });
     endResetModel();
     Q_EMIT usersRefreshed();
 }

src/models/webshortcutmodel.cpp

@@ -62,7 +62,7 @@ void KWebShortcutModel::setSelectedText(const QString &selectedText)
     }
 
     QString searchText = selectedText;
-    searchText = searchText.replace('\n', ' ').replace('\r', ' ').simplified();
+    searchText = searchText.replace(QLatin1Char('\n'), QLatin1Char(' ')).replace(QLatin1Char('\r'), QLatin1Char(' ')).simplified();
     if (searchText.isEmpty()) {
         endResetModel();
         return;
@@ -115,7 +115,7 @@ void KWebShortcutModel::trigger(const QString &data)
 #ifdef HAVE_KIO
     KUriFilterData filterData(data);
     if (KUriFilter::self()->filterSearchUri(filterData, KUriFilter::WebShortcutFilter)) {
-        Q_EMIT openUrl(filterData.uri().url());
+        Q_EMIT openUrl(filterData.uri());
     }
 #else
     Q_UNUSED(data);
@@ -125,7 +125,7 @@ void KWebShortcutModel::trigger(const QString &data)
 void KWebShortcutModel::configureWebShortcuts()
 {
 #ifdef HAVE_KIO
-    auto job = new KIO::CommandLauncherJob("kcmshell5", QStringList() << "webshortcuts", this);
+    auto job = new KIO::CommandLauncherJob(QStringLiteral("kcmshell5"), QStringList() << QStringLiteral("webshortcuts"), this);
     job->exec();
 #endif
 }

src/neochatconnection.cpp

@@ -0,0 +1,155 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "neochatconnection.h"
+
+#include <QImageReader>
+
+#include "controller.h"
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#include <qt5keychain/keychain.h>
+#else
+#include <qt6keychain/keychain.h>
+#endif
+
+#include <Quotient/csapi/content-repo.h>
+#include <Quotient/csapi/profile.h>
+#include <Quotient/settings.h>
+#include <Quotient/user.h>
+
+using namespace Quotient;
+
+NeoChatConnection::NeoChatConnection(QObject *parent)
+    : Connection(parent)
+{
+    connect(this, &NeoChatConnection::accountDataChanged, this, [this](const QString &type) {
+        if (type == QLatin1String("org.kde.neochat.account_label")) {
+            Q_EMIT labelChanged();
+        }
+    });
+}
+
+NeoChatConnection::NeoChatConnection(const QUrl &server, QObject *parent)
+    : Connection(server, parent)
+{
+    connect(this, &NeoChatConnection::accountDataChanged, this, [this](const QString &type) {
+        if (type == QLatin1String("org.kde.neochat.account_label")) {
+            Q_EMIT labelChanged();
+        }
+    });
+}
+
+void NeoChatConnection::logout(bool serverSideLogout)
+{
+    SettingsGroup(QStringLiteral("Accounts")).remove(userId());
+
+    QKeychain::DeletePasswordJob job(qAppName());
+    job.setAutoDelete(true);
+    job.setKey(userId());
+    QEventLoop loop;
+    QKeychain::DeletePasswordJob::connect(&job, &QKeychain::Job::finished, &loop, &QEventLoop::quit);
+    job.start();
+    loop.exec();
+
+    if (Controller::instance().accounts().count() > 1) {
+        // Only set the connection if the the account being logged out is currently active
+        if (this == Controller::instance().activeConnection()) {
+            Controller::instance().setActiveConnection(dynamic_cast<NeoChatConnection *>(Controller::instance().accounts().accounts()[0]));
+        }
+    } else {
+        Controller::instance().setActiveConnection(nullptr);
+    }
+    if (!serverSideLogout) {
+        return;
+    }
+    Connection::logout();
+}
+
+bool NeoChatConnection::setAvatar(const QUrl &avatarSource)
+{
+    QString decoded = avatarSource.path();
+    if (decoded.isEmpty()) {
+        callApi<SetAvatarUrlJob>(user()->id(), avatarSource);
+        return true;
+    }
+    if (QImageReader(decoded).read().isNull()) {
+        return false;
+    } else {
+        return user()->setAvatar(decoded);
+    }
+}
+
+QVariantList NeoChatConnection::getSupportedRoomVersions() const
+{
+    const auto &roomVersions = availableRoomVersions();
+    QVariantList supportedRoomVersions;
+    for (const auto &v : roomVersions) {
+        QVariantMap roomVersionMap;
+        roomVersionMap.insert("id"_ls, v.id);
+        roomVersionMap.insert("status"_ls, v.status);
+        roomVersionMap.insert("isStable"_ls, v.isStable());
+        supportedRoomVersions.append(roomVersionMap);
+    }
+    return supportedRoomVersions;
+}
+
+void NeoChatConnection::changePassword(const QString &currentPassword, const QString &newPassword)
+{
+    auto job = callApi<NeochatChangePasswordJob>(newPassword, false);
+    connect(job, &BaseJob::result, this, [this, job, currentPassword, newPassword] {
+        if (job->error() == 103) {
+            QJsonObject replyData = job->jsonData();
+            QJsonObject authData;
+            authData["session"_ls] = replyData["session"_ls];
+            authData["password"_ls] = currentPassword;
+            authData["type"_ls] = "m.login.password"_ls;
+            authData["user"_ls] = user()->id();
+            QJsonObject identifier = {{"type"_ls, "m.id.user"_ls}, {"user"_ls, user()->id()}};
+            authData["identifier"_ls] = identifier;
+            NeochatChangePasswordJob *innerJob = callApi<NeochatChangePasswordJob>(newPassword, false, authData);
+            connect(innerJob, &BaseJob::success, this, []() {
+                Q_EMIT Controller::instance().passwordStatus(Controller::PasswordStatus::Success);
+            });
+            connect(innerJob, &BaseJob::failure, this, [innerJob]() {
+                Q_EMIT Controller::instance().passwordStatus(innerJob->jsonData()["errcode"_ls] == "M_FORBIDDEN"_ls ? Controller::PasswordStatus::Wrong
+                                                                                                                    : Controller::PasswordStatus::Other);
+            });
+        }
+    });
+}
+
+void NeoChatConnection::setLabel(const QString &label)
+{
+    QJsonObject json{
+        {"account_label"_ls, label},
+    };
+    setAccountData("org.kde.neochat.account_label"_ls, json);
+    Q_EMIT labelChanged();
+}
+
+QString NeoChatConnection::label() const
+{
+    return accountDataJson("org.kde.neochat.account_label"_ls)["account_label"_ls].toString();
+}
+
+void NeoChatConnection::deactivateAccount(const QString &password)
+{
+    auto job = callApi<NeoChatDeactivateAccountJob>();
+    connect(job, &BaseJob::result, this, [this, job, password] {
+        if (job->error() == 103) {
+            QJsonObject replyData = job->jsonData();
+            QJsonObject authData;
+            authData["session"_ls] = replyData["session"_ls];
+            authData["password"_ls] = password;
+            authData["type"_ls] = "m.login.password"_ls;
+            authData["user"_ls] = user()->id();
+            QJsonObject identifier = {{"type"_ls, "m.id.user"_ls}, {"user"_ls, user()->id()}};
+            authData["identifier"_ls] = identifier;
+            auto innerJob = callApi<NeoChatDeactivateAccountJob>(authData);
+            connect(innerJob, &BaseJob::success, this, [this]() {
+                logout(false);
+            });
+        }
+    });
+}

src/neochatconnection.h

@@ -0,0 +1,53 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <QObject>
+
+#include <Quotient/connection.h>
+
+class NeoChatConnection : public Quotient::Connection
+{
+    Q_OBJECT
+
+    /**
+     * @brief The account label for this account.
+     *
+     * Account labels are a concept specific to NeoChat, allowing accounts to be
+     * labelled, e.g. for "Work", "Private", etc.
+     *
+     * Set to an empty string to remove the label.
+     */
+    Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
+
+public:
+    NeoChatConnection(QObject *parent = nullptr);
+    NeoChatConnection(const QUrl &server, QObject *parent = nullptr);
+
+    Q_INVOKABLE void logout(bool serverSideLogout);
+    Q_INVOKABLE QVariantList getSupportedRoomVersions() const;
+
+    /**
+     * @brief Change the password for an account.
+     *
+     * The function emits a passwordStatus signal with a PasswordStatus value when
+     * complete.
+     *
+     * @sa PasswordStatus, passwordStatus
+     */
+    Q_INVOKABLE void changePassword(const QString &currentPassword, const QString &newPassword);
+
+    /**
+     * @brief Change the avatar for an account.
+     */
+    Q_INVOKABLE bool setAvatar(const QUrl &avatarSource);
+
+    [[nodiscard]] QString label() const;
+    void setLabel(const QString &label);
+
+    Q_INVOKABLE void deactivateAccount(const QString &password);
+
+Q_SIGNALS:
+    void labelChanged();
+};

src/neochatroom.cpp

@@ -70,8 +70,8 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
     connect(this, &Room::aboutToAddHistoricalMessages, this, &NeoChatRoom::readMarkerLoadedChanged);
 
     // Load cached event if available.
-    KConfig dataResource("data", KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
-    KConfigGroup eventCacheGroup(&dataResource, "EventCache");
+    KConfig dataResource("data"_ls, KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
+    KConfigGroup eventCacheGroup(&dataResource, "EventCache"_ls);
 
     if (eventCacheGroup.hasKey(id())) {
         auto eventJson = QJsonDocument::fromJson(eventCacheGroup.readEntry(id(), QByteArray())).object();
@@ -111,7 +111,7 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
             qWarning() << "using this room's avatar";
             avatar_image = avatar(128);
         }
-        NotificationsManager::instance().postInviteNotification(this, htmlSafeDisplayName(), htmlSafeMemberName(senderId), avatar_image);
+        NotificationsManager::instance().postInviteNotification(this, displayNameForHtml(), htmlSafeMemberName(senderId), avatar_image);
     });
     connect(this, &Room::changed, this, [this] {
         Q_EMIT canEncryptRoomChanged();
@@ -121,7 +121,7 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
         Q_EMIT defaultUrlPreviewStateChanged();
     });
     connect(this, &Room::accountDataChanged, this, [this](QString type) {
-        if (type == "org.matrix.room.preview_urls") {
+        if (type == "org.matrix.room.preview_urls"_ls) {
             Q_EMIT urlPreviewEnabledChanged();
         }
     });
@@ -167,15 +167,15 @@ QCoro::Task<void> NeoChatRoom::doUploadFile(QUrl url, QString body)
     }
 
     auto mime = QMimeDatabase().mimeTypeForUrl(url);
-    url.setScheme("file");
+    url.setScheme("file"_ls);
     QFileInfo fileInfo(url.isLocalFile() ? url.toLocalFile() : url.toString());
     EventContent::TypedBase *content;
-    if (mime.name().startsWith("image/")) {
+    if (mime.name().startsWith("image/"_ls)) {
         QImage image(url.toLocalFile());
         content = new EventContent::ImageContent(url, fileInfo.size(), mime, image.size(), fileInfo.fileName());
-    } else if (mime.name().startsWith("audio/")) {
+    } else if (mime.name().startsWith("audio/"_ls)) {
         content = new EventContent::AudioContent(url, fileInfo.size(), mime, fileInfo.fileName());
-    } else if (mime.name().startsWith("video/")) {
+    } else if (mime.name().startsWith("video/"_ls)) {
         QMediaPlayer player;
 #if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
         player.setSource(url);
@@ -238,10 +238,10 @@ QVariantList NeoChatRoom::getUsersTyping() const
     QVariantList userVariants;
     for (User *user : users) {
         userVariants.append(QVariantMap{
-            {"id", user->id()},
-            {"avatarMediaId", user->avatarMediaId(this)},
-            {"displayName", user->displayname(this)},
-            {"display", user->name()},
+            {"id"_ls, user->id()},
+            {"avatarMediaId"_ls, user->avatarMediaId(this)},
+            {"displayName"_ls, user->displayname(this)},
+            {"display"_ls, user->name()},
         });
     }
     return userVariants;
@@ -314,8 +314,8 @@ void NeoChatRoom::cacheLastEvent()
 {
     auto event = lastEvent();
     if (event != nullptr) {
-        KConfig dataResource("data", KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
-        KConfigGroup eventCacheGroup(&dataResource, "EventCache");
+        KConfig dataResource("data"_ls, KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
+        KConfigGroup eventCacheGroup(&dataResource, "EventCache"_ls);
 
         auto eventJson = QJsonDocument(event->fullJson()).toJson();
         eventCacheGroup.writeEntry(id(), eventJson);
@@ -332,9 +332,9 @@ bool NeoChatRoom::lastEventIsSpoiler() const
 {
     if (auto event = lastEvent()) {
         if (auto e = eventCast<const RoomMessageEvent>(event)) {
-            if (e->hasTextContent() && e->content() && e->mimeType().name() == "text/html") {
+            if (e->hasTextContent() && e->content() && e->mimeType().name() == "text/html"_ls) {
                 auto htmlBody = static_cast<const Quotient::EventContent::TextContent *>(e->content())->body;
-                return htmlBody.contains("data-mx-spoiler");
+                return htmlBody.contains("data-mx-spoiler"_ls);
             }
         }
     }
@@ -435,13 +435,13 @@ QVariantList NeoChatRoom::getUsers(const QString &keyword, int limit) const
 
 // An empty user is useful for returning as a model value to avoid properties being undefined.
 static const QVariantMap emptyUser = {
-    {"isLocalUser", false},
-    {"id", QString()},
-    {"displayName", QString()},
-    {"avatarSource", QUrl()},
-    {"avatarMediaId", QString()},
-    {"color", QColor()},
-    {"object", QVariant()},
+    {"isLocalUser"_ls, false},
+    {"id"_ls, QString()},
+    {"displayName"_ls, QString()},
+    {"avatarSource"_ls, QUrl()},
+    {"avatarMediaId"_ls, QString()},
+    {"color"_ls, QColor()},
+    {"object"_ls, QVariant()},
 };
 
 QVariantMap NeoChatRoom::getUser(const QString &userID) const
@@ -500,7 +500,7 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                 if (fileCaption.isEmpty()) {
                     fileCaption = e.plainBody();
                 } else if (e.content()->fileInfo()->originalName != e.plainBody()) {
-                    fileCaption = e.plainBody() + " | " + fileCaption;
+                    fileCaption = e.plainBody() + " | "_ls + fileCaption;
                 }
                 textHandler.setData(fileCaption);
                 return !fileCaption.isEmpty() ? textHandler.handleRecievePlainText(Qt::PlainText, stripNewlines) : i18n("a file");
@@ -516,7 +516,7 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
             textHandler.setData(body);
 
             Qt::TextFormat inputFormat;
-            if (e.mimeType().name() == "text/plain") {
+            if (e.mimeType().name() == "text/plain"_ls) {
                 inputFormat = Qt::PlainText;
             } else {
                 inputFormat = Qt::RichText;
@@ -644,8 +644,8 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
             return i18n("activated End-to-End Encryption");
         },
         [](const RoomCreateEvent &e) {
-            return e.isUpgrade() ? i18n("upgraded the room to version %1", e.version().isEmpty() ? "1" : e.version().toHtmlEscaped())
-                                 : i18n("created the room, version %1", e.version().isEmpty() ? "1" : e.version().toHtmlEscaped());
+            return e.isUpgrade() ? i18n("upgraded the room to version %1", e.version().isEmpty() ? "1"_ls : e.version().toHtmlEscaped())
+                                 : i18n("created the room, version %1", e.version().isEmpty() ? "1"_ls : e.version().toHtmlEscaped());
         },
         [](const RoomPowerLevelsEvent &) {
             return i18nc("'power level' means permission level", "changed the power levels for this room");
@@ -655,13 +655,13 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                 return i18n("changed the server access control lists for this room");
             }
             if (e.matrixType() == QLatin1String("im.vector.modular.widgets")) {
-                if (e.fullJson()["unsigned"]["prev_content"].toObject().isEmpty()) {
-                    return i18nc("[User] added <name> widget", "added %1 widget", e.contentJson()["name"].toString());
+                if (e.fullJson()["unsigned"_ls]["prev_content"_ls].toObject().isEmpty()) {
+                    return i18nc("[User] added <name> widget", "added %1 widget", e.contentJson()["name"_ls].toString());
                 }
                 if (e.contentJson().isEmpty()) {
-                    return i18nc("[User] removed <name> widget", "removed %1 widget", e.fullJson()["unsigned"]["prev_content"]["name"].toString());
+                    return i18nc("[User] removed <name> widget", "removed %1 widget", e.fullJson()["unsigned"_ls]["prev_content"_ls]["name"_ls].toString());
                 }
-                return i18nc("[User] configured <name> widget", "configured %1 widget", e.contentJson()["name"].toString());
+                return i18nc("[User] configured <name> widget", "configured %1 widget", e.contentJson()["name"_ls].toString());
             }
             if (e.matrixType() == "org.matrix.msc3672.beacon_info"_ls) {
                 return e.contentJson()["description"_ls].toString();
@@ -778,7 +778,7 @@ QString NeoChatRoom::eventToGenericString(const RoomEvent &evt) const
                 return i18n("changed the server access control lists for this room");
             }
             if (e.matrixType() == QLatin1String("im.vector.modular.widgets")) {
-                if (e.fullJson()["unsigned"]["prev_content"].toObject().isEmpty()) {
+                if (e.fullJson()["unsigned"_ls]["prev_content"_ls].toObject().isEmpty()) {
                     return i18n("added a widget");
                 }
                 if (e.contentJson().isEmpty()) {
@@ -800,7 +800,7 @@ void NeoChatRoom::changeAvatar(const QUrl &localFile)
     const auto job = connection()->uploadFile(localFile.toLocalFile());
     if (isJobPending(job)) {
         connect(job, &BaseJob::success, this, [this, job] {
-            connection()->callApi<SetRoomStateWithKeyJob>(id(), "m.room.avatar", QString(), QJsonObject{{"url", job->contentUri().toString()}});
+            connection()->callApi<SetRoomStateWithKeyJob>(id(), "m.room.avatar"_ls, QString(), QJsonObject{{"url"_ls, job->contentUri().toString()}});
         });
     }
 }
@@ -809,23 +809,23 @@ QString msgTypeToString(MessageEventType msgType)
 {
     switch (msgType) {
     case MessageEventType::Text:
-        return "m.text";
+        return "m.text"_ls;
     case MessageEventType::File:
-        return "m.file";
+        return "m.file"_ls;
     case MessageEventType::Audio:
-        return "m.audio";
+        return "m.audio"_ls;
     case MessageEventType::Emote:
-        return "m.emote";
+        return "m.emote"_ls;
     case MessageEventType::Image:
-        return "m.image";
+        return "m.image"_ls;
     case MessageEventType::Video:
-        return "m.video";
+        return "m.video"_ls;
     case MessageEventType::Notice:
-        return "m.notice";
+        return "m.notice"_ls;
     case MessageEventType::Location:
-        return "m.location";
+        return "m.location"_ls;
     default:
-        return "m.text";
+        return "m.text"_ls;
     }
 }
 
@@ -845,15 +845,16 @@ void NeoChatRoom::postHtmlMessage(const QString &text, const QString &html, Mess
 
     if (isEdit) {
         QJsonObject json{
-            {"type", "m.room.message"},
-            {"msgtype", msgTypeToString(type)},
-            {"body", "* " + text},
-            {"format", "org.matrix.custom.html"},
-            {"formatted_body", html},
-            {"m.new_content", QJsonObject{{"body", text}, {"msgtype", msgTypeToString(type)}, {"format", "org.matrix.custom.html"}, {"formatted_body", html}}},
-            {"m.relates_to", QJsonObject{{"rel_type", "m.replace"}, {"event_id", relateToEventId}}}};
+            {"type"_ls, "m.room.message"_ls},
+            {"msgtype"_ls, msgTypeToString(type)},
+            {"body"_ls, "* %1"_ls.arg(text)},
+            {"format"_ls, "org.matrix.custom.html"_ls},
+            {"formatted_body"_ls, html},
+            {"m.new_content"_ls,
+             QJsonObject{{"body"_ls, text}, {"msgtype"_ls, msgTypeToString(type)}, {"format"_ls, "org.matrix.custom.html"_ls}, {"formatted_body"_ls, html}}},
+            {"m.relates_to"_ls, QJsonObject{{"rel_type"_ls, "m.replace"_ls}, {"event_id"_ls, relateToEventId}}}};
 
-        postJson("m.room.message", json);
+        postJson("m.room.message"_ls, json);
         return;
     }
 
@@ -862,31 +863,25 @@ void NeoChatRoom::postHtmlMessage(const QString &text, const QString &html, Mess
 
         // clang-format off
         QJsonObject json{
-          {"msgtype", msgTypeToString(type)},
-          {"body", "> <" + replyEvt.senderId() + "> " + eventToString(replyEvt) + "\n\n" + text},
-          {"format", "org.matrix.custom.html"},
-          {"m.relates_to",
+          {"msgtype"_ls, msgTypeToString(type)},
+          {"body"_ls, "> <%1> %2\n\n%3"_ls.arg(replyEvt.senderId(), eventToString(replyEvt), text)},
+          {"format"_ls, "org.matrix.custom.html"_ls},
+          {"m.relates_to"_ls,
             QJsonObject {
-              {"m.in_reply_to",
+              {"m.in_reply_to"_ls,
                 QJsonObject {
-                  {"event_id", replyEventId}
+                  {"event_id"_ls, replyEventId}
                 }
               }
             }
           },
-          {"formatted_body",
-            "<mx-reply><blockquote><a href=\"https://matrix.to/#/" +
-            id() + "/" +
-            replyEventId +
-            "\">In reply to</a> <a href=\"https://matrix.to/#/" +
-            replyEvt.senderId() + "\">" + replyEvt.senderId() +
-            "</a><br>" + eventToString(replyEvt, Qt::RichText) +
-            "</blockquote></mx-reply>" + html
+          {"formatted_body"_ls,
+              "<mx-reply><blockquote><a href=\"https://matrix.to/#/%1/%2\">In reply to</a> <a href=\"https://matrix.to/#/%3\">%4</a><br>%5</blockquote></mx-reply>%6"_ls.arg(id(), replyEventId, replyEvt.senderId(), replyEvt.senderId(), eventToString(replyEvt, Qt::RichText), html)
           }
         };
         // clang-format on
 
-        postJson("m.room.message", json);
+        postJson("m.room.message"_ls, json);
 
         return;
     }
@@ -983,11 +978,6 @@ bool NeoChatRoom::isUserBanned(const QString &user) const
     return roomMemberEvent->membership() == Membership::Ban;
 }
 
-QString NeoChatRoom::htmlSafeDisplayName() const
-{
-    return displayName().toHtmlEscaped();
-}
-
 void NeoChatRoom::deleteMessagesByUser(const QString &user, const QString &reason)
 {
     doDeleteMessagesByUser(user, reason);
@@ -1004,37 +994,37 @@ QString NeoChatRoom::joinRule() const
 
 void NeoChatRoom::setJoinRule(const QString &joinRule)
 {
-    if (!canSendState("m.room.join_rules")) {
+    if (!canSendState("m.room.join_rules"_ls)) {
         qWarning() << "Power level too low to set join rules";
         return;
     }
-    setState("m.room.join_rules", "", QJsonObject{{"join_rule", joinRule}});
+    setState("m.room.join_rules"_ls, {}, QJsonObject{{"join_rule"_ls, joinRule}});
     // Not emitting joinRuleChanged() here, since that would override the change in the UI with the *current* value, which is not the *new* value.
 }
 
 QString NeoChatRoom::historyVisibility() const
 {
-    return currentState().get("m.room.history_visibility")->contentJson()["history_visibility"_ls].toString();
+    return currentState().get("m.room.history_visibility"_ls)->contentJson()["history_visibility"_ls].toString();
 }
 
 void NeoChatRoom::setHistoryVisibility(const QString &historyVisibilityRule)
 {
-    if (!canSendState("m.room.history_visibility")) {
+    if (!canSendState("m.room.history_visibility"_ls)) {
         qWarning() << "Power level too low to set history visibility";
         return;
     }
 
-    setState("m.room.history_visibility", "", QJsonObject{{"history_visibility", historyVisibilityRule}});
+    setState("m.room.history_visibility"_ls, {}, QJsonObject{{"history_visibility"_ls, historyVisibilityRule}});
     // Not emitting historyVisibilityChanged() here, since that would override the change in the UI with the *current* value, which is not the *new* value.
 }
 
 bool NeoChatRoom::defaultUrlPreviewState() const
 {
-    auto urlPreviewsDisabled = currentState().get("org.matrix.room.preview_urls");
+    auto urlPreviewsDisabled = currentState().get("org.matrix.room.preview_urls"_ls);
 
     // Some rooms will not have this state event set so check for a nullptr return.
     if (urlPreviewsDisabled != nullptr) {
-        return !urlPreviewsDisabled->contentJson()["disable"].toBool();
+        return !urlPreviewsDisabled->contentJson()["disable"_ls].toBool();
     } else {
         return false;
     }
@@ -1042,7 +1032,7 @@ bool NeoChatRoom::defaultUrlPreviewState() const
 
 void NeoChatRoom::setDefaultUrlPreviewState(const bool &defaultUrlPreviewState)
 {
-    if (!canSendState("org.matrix.room.preview_urls")) {
+    if (!canSendState("org.matrix.room.preview_urls"_ls)) {
         qWarning() << "Power level too low to set the default URL preview state for the room";
         return;
     }
@@ -1076,13 +1066,13 @@ void NeoChatRoom::setDefaultUrlPreviewState(const bool &defaultUrlPreviewState)
      *
      * You just have to set disable to true to disable URL previews by default.
      */
-    setState("org.matrix.room.preview_urls", "", QJsonObject{{"disable", !defaultUrlPreviewState}});
+    setState("org.matrix.room.preview_urls"_ls, {}, QJsonObject{{"disable"_ls, !defaultUrlPreviewState}});
 }
 
 bool NeoChatRoom::urlPreviewEnabled() const
 {
-    if (hasAccountData("org.matrix.room.preview_urls")) {
-        return !accountData("org.matrix.room.preview_urls")->contentJson()["disable"].toBool();
+    if (hasAccountData("org.matrix.room.preview_urls"_ls)) {
+        return !accountData("org.matrix.room.preview_urls"_ls)->contentJson()["disable"_ls].toBool();
     } else {
         return defaultUrlPreviewState();
     }
@@ -1101,7 +1091,10 @@ void NeoChatRoom::setUrlPreviewEnabled(const bool &urlPreviewEnabled)
      *  "type": "org.matrix.room.preview_urls",
      * }
      */
-    connection()->callApi<SetAccountDataPerRoomJob>(localUser()->id(), id(), "org.matrix.room.preview_urls", QJsonObject{{"disable", !urlPreviewEnabled}});
+    connection()->callApi<SetAccountDataPerRoomJob>(localUser()->id(),
+                                                    id(),
+                                                    "org.matrix.room.preview_urls"_ls,
+                                                    QJsonObject{{"disable"_ls, !urlPreviewEnabled}});
 }
 
 void NeoChatRoom::setUserPowerLevel(const QString &userID, const int &powerLevel)
@@ -1110,7 +1103,7 @@ void NeoChatRoom::setUserPowerLevel(const QString &userID, const int &powerLevel
         qWarning() << "Cannot modify the power level of the only user";
         return;
     }
-    if (!canSendState("m.room.power_levels")) {
+    if (!canSendState("m.room.power_levels"_ls)) {
         qWarning() << "Power level too low to set user power levels";
         return;
     }
@@ -1120,14 +1113,14 @@ void NeoChatRoom::setUserPowerLevel(const QString &userID, const int &powerLevel
     }
     int clampPowerLevel = std::clamp(powerLevel, 0, 100);
 
-    auto powerLevelContent = currentState().get("m.room.power_levels")->contentJson();
-    auto powerLevelUserOverrides = powerLevelContent["users"].toObject();
+    auto powerLevelContent = currentState().get("m.room.power_levels"_ls)->contentJson();
+    auto powerLevelUserOverrides = powerLevelContent["users"_ls].toObject();
 
     if (powerLevelUserOverrides[userID] != clampPowerLevel) {
         powerLevelUserOverrides[userID] = clampPowerLevel;
-        powerLevelContent["users"] = powerLevelUserOverrides;
+        powerLevelContent["users"_ls] = powerLevelUserOverrides;
 
-        setState("m.room.power_levels", "", powerLevelContent);
+        setState("m.room.power_levels"_ls, {}, powerLevelContent);
     }
 }
 
@@ -1143,19 +1136,19 @@ int NeoChatRoom::getUserPowerLevel(const QString &userId) const
 int NeoChatRoom::powerLevel(const QString &eventName, const bool &isStateEvent) const
 {
     const auto powerLevelEvent = currentState().get<RoomPowerLevelsEvent>();
-    if (eventName == "ban") {
+    if (eventName == "ban"_ls) {
         return powerLevelEvent->ban();
-    } else if (eventName == "kick") {
+    } else if (eventName == "kick"_ls) {
         return powerLevelEvent->kick();
-    } else if (eventName == "invite") {
+    } else if (eventName == "invite"_ls) {
         return powerLevelEvent->invite();
-    } else if (eventName == "redact") {
+    } else if (eventName == "redact"_ls) {
         return powerLevelEvent->redact();
-    } else if (eventName == "users_default") {
+    } else if (eventName == "users_default"_ls) {
         return powerLevelEvent->usersDefault();
-    } else if (eventName == "state_default") {
+    } else if (eventName == "state_default"_ls) {
         return powerLevelEvent->stateDefault();
-    } else if (eventName == "events_default") {
+    } else if (eventName == "events_default"_ls) {
         return powerLevelEvent->eventsDefault();
     } else if (isStateEvent) {
         return powerLevelEvent->powerLevelForState(eventName);
@@ -1166,7 +1159,7 @@ int NeoChatRoom::powerLevel(const QString &eventName, const bool &isStateEvent)
 
 void NeoChatRoom::setPowerLevel(const QString &eventName, const int &newPowerLevel, const bool &isStateEvent)
 {
-    auto powerLevelContent = currentState().get("m.room.power_levels")->contentJson();
+    auto powerLevelContent = currentState().get("m.room.power_levels"_ls)->contentJson();
     int clampPowerLevel = std::clamp(newPowerLevel, 0, 100);
     int powerLevel = 0;
 
@@ -1177,215 +1170,215 @@ void NeoChatRoom::setPowerLevel(const QString &eventName, const int &newPowerLev
             powerLevelContent[eventName] = clampPowerLevel;
         }
     } else {
-        auto eventPowerLevels = powerLevelContent["events"].toObject();
+        auto eventPowerLevels = powerLevelContent["events"_ls].toObject();
 
         if (eventPowerLevels.contains(eventName)) {
             powerLevel = eventPowerLevels[eventName].toInt();
         } else {
             if (isStateEvent) {
-                powerLevel = powerLevelContent["state_default"].toInt();
+                powerLevel = powerLevelContent["state_default"_ls].toInt();
             } else {
-                powerLevel = powerLevelContent["events_default"].toInt();
+                powerLevel = powerLevelContent["events_default"_ls].toInt();
             }
         }
 
         if (powerLevel != clampPowerLevel) {
             eventPowerLevels[eventName] = clampPowerLevel;
-            powerLevelContent["events"] = eventPowerLevels;
+            powerLevelContent["events"_ls] = eventPowerLevels;
         }
     }
 
-    setState("m.room.power_levels", "", powerLevelContent);
+    setState("m.room.power_levels"_ls, {}, powerLevelContent);
 }
 
 int NeoChatRoom::defaultUserPowerLevel() const
 {
-    return powerLevel("users_default");
+    return powerLevel("users_default"_ls);
 }
 
 void NeoChatRoom::setDefaultUserPowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("users_default", newPowerLevel);
+    setPowerLevel("users_default"_ls, newPowerLevel);
 }
 
 int NeoChatRoom::invitePowerLevel() const
 {
-    return powerLevel("invite");
+    return powerLevel("invite"_ls);
 }
 
 void NeoChatRoom::setInvitePowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("invite", newPowerLevel);
+    setPowerLevel("invite"_ls, newPowerLevel);
 }
 
 int NeoChatRoom::kickPowerLevel() const
 {
-    return powerLevel("kick");
+    return powerLevel("kick"_ls);
 }
 
 void NeoChatRoom::setKickPowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("kick", newPowerLevel);
+    setPowerLevel("kick"_ls, newPowerLevel);
 }
 
 int NeoChatRoom::banPowerLevel() const
 {
-    return powerLevel("ban");
+    return powerLevel("ban"_ls);
 }
 
 void NeoChatRoom::setBanPowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("ban", newPowerLevel);
+    setPowerLevel("ban"_ls, newPowerLevel);
 }
 
 int NeoChatRoom::redactPowerLevel() const
 {
-    return powerLevel("redact");
+    return powerLevel("redact"_ls);
 }
 
 void NeoChatRoom::setRedactPowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("redact", newPowerLevel);
+    setPowerLevel("redact"_ls, newPowerLevel);
 }
 
 int NeoChatRoom::statePowerLevel() const
 {
-    return powerLevel("state_default");
+    return powerLevel("state_default"_ls);
 }
 
 void NeoChatRoom::setStatePowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("state_default", newPowerLevel);
+    setPowerLevel("state_default"_ls, newPowerLevel);
 }
 
 int NeoChatRoom::defaultEventPowerLevel() const
 {
-    return powerLevel("events_default");
+    return powerLevel("events_default"_ls);
 }
 
 void NeoChatRoom::setDefaultEventPowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("events_default", newPowerLevel);
+    setPowerLevel("events_default"_ls, newPowerLevel);
 }
 
 int NeoChatRoom::powerLevelPowerLevel() const
 {
-    return powerLevel("m.room.power_levels", true);
+    return powerLevel("m.room.power_levels"_ls, true);
 }
 
 void NeoChatRoom::setPowerLevelPowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("m.room.power_levels", newPowerLevel, true);
+    setPowerLevel("m.room.power_levels"_ls, newPowerLevel, true);
 }
 
 int NeoChatRoom::namePowerLevel() const
 {
-    return powerLevel("m.room.name", true);
+    return powerLevel("m.room.name"_ls, true);
 }
 
 void NeoChatRoom::setNamePowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("m.room.name", newPowerLevel, true);
+    setPowerLevel("m.room.name"_ls, newPowerLevel, true);
 }
 
 int NeoChatRoom::avatarPowerLevel() const
 {
-    return powerLevel("m.room.avatar", true);
+    return powerLevel("m.room.avatar"_ls, true);
 }
 
 void NeoChatRoom::setAvatarPowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("m.room.avatar", newPowerLevel, true);
+    setPowerLevel("m.room.avatar"_ls, newPowerLevel, true);
 }
 
 int NeoChatRoom::canonicalAliasPowerLevel() const
 {
-    return powerLevel("m.room.canonical_alias", true);
+    return powerLevel("m.room.canonical_alias"_ls, true);
 }
 
 void NeoChatRoom::setCanonicalAliasPowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("m.room.canonical_alias", newPowerLevel, true);
+    setPowerLevel("m.room.canonical_alias"_ls, newPowerLevel, true);
 }
 
 int NeoChatRoom::topicPowerLevel() const
 {
-    return powerLevel("m.room.topic", true);
+    return powerLevel("m.room.topic"_ls, true);
 }
 
 void NeoChatRoom::setTopicPowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("m.room.topic", newPowerLevel, true);
+    setPowerLevel("m.room.topic"_ls, newPowerLevel, true);
 }
 
 int NeoChatRoom::encryptionPowerLevel() const
 {
-    return powerLevel("m.room.encryption", true);
+    return powerLevel("m.room.encryption"_ls, true);
 }
 
 void NeoChatRoom::setEncryptionPowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("m.room.encryption", newPowerLevel, true);
+    setPowerLevel("m.room.encryption"_ls, newPowerLevel, true);
 }
 
 int NeoChatRoom::historyVisibilityPowerLevel() const
 {
-    return powerLevel("m.room.history_visibility", true);
+    return powerLevel("m.room.history_visibility"_ls, true);
 }
 
 void NeoChatRoom::setHistoryVisibilityPowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("m.room.history_visibility", newPowerLevel, true);
+    setPowerLevel("m.room.history_visibility"_ls, newPowerLevel, true);
 }
 
 int NeoChatRoom::pinnedEventsPowerLevel() const
 {
-    return powerLevel("m.room.pinned_events", true);
+    return powerLevel("m.room.pinned_events"_ls, true);
 }
 
 void NeoChatRoom::setPinnedEventsPowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("m.room.pinned_events", newPowerLevel, true);
+    setPowerLevel("m.room.pinned_events"_ls, newPowerLevel, true);
 }
 
 int NeoChatRoom::tombstonePowerLevel() const
 {
-    return powerLevel("m.room.tombstone", true);
+    return powerLevel("m.room.tombstone"_ls, true);
 }
 
 void NeoChatRoom::setTombstonePowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("m.room.tombstone", newPowerLevel, true);
+    setPowerLevel("m.room.tombstone"_ls, newPowerLevel, true);
 }
 
 int NeoChatRoom::serverAclPowerLevel() const
 {
-    return powerLevel("m.room.server_acl", true);
+    return powerLevel("m.room.server_acl"_ls, true);
 }
 
 void NeoChatRoom::setServerAclPowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("m.room.server_acl", newPowerLevel, true);
+    setPowerLevel("m.room.server_acl"_ls, newPowerLevel, true);
 }
 
 int NeoChatRoom::spaceChildPowerLevel() const
 {
-    return powerLevel("m.space.child", true);
+    return powerLevel("m.space.child"_ls, true);
 }
 
 void NeoChatRoom::setSpaceChildPowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("m.space.child", newPowerLevel, true);
+    setPowerLevel("m.space.child"_ls, newPowerLevel, true);
 }
 
 int NeoChatRoom::spaceParentPowerLevel() const
 {
-    return powerLevel("m.space.parent", true);
+    return powerLevel("m.space.parent"_ls, true);
 }
 
 void NeoChatRoom::setSpaceParentPowerLevel(const int &newPowerLevel)
 {
-    setPowerLevel("m.space.parent", newPowerLevel, true);
+    setPowerLevel("m.space.parent"_ls, newPowerLevel, true);
 }
 
 QCoro::Task<void> NeoChatRoom::doDeleteMessagesByUser(const QString &user, QString reason)
@@ -1397,7 +1390,7 @@ QCoro::Task<void> NeoChatRoom::doDeleteMessagesByUser(const QString &user, QStri
         }
     }
     for (const auto &e : events) {
-        auto job = connection()->callApi<RedactEventJob>(id(), QUrl::toPercentEncoding(e), connection()->generateTxnId(), reason);
+        auto job = connection()->callApi<RedactEventJob>(id(), QString::fromLatin1(QUrl::toPercentEncoding(e)), connection()->generateTxnId(), reason);
         co_await qCoro(job, &BaseJob::finished);
         if (job->error() != BaseJob::Success) {
             qWarning() << "Error: \"" << job->error() << "\" while deleting messages. Aborting";
@@ -1448,26 +1441,26 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
      * Note to prevent race conditions any rule that is going ot be overridden later is not removed.
      * If the default push notification state is chosen any exisiting rule needs to be removed.
      */
-    QJsonObject accountData = connection()->accountDataJson("m.push_rules");
+    QJsonObject accountData = connection()->accountDataJson("m.push_rules"_ls);
 
     // For default and mute check for a room rule and remove if found.
     if (state == PushNotificationState::Default || state == PushNotificationState::Mute) {
-        QJsonArray roomRuleArray = accountData["global"].toObject()["room"].toArray();
+        QJsonArray roomRuleArray = accountData["global"_ls].toObject()["room"_ls].toArray();
         for (const auto &i : roomRuleArray) {
             QJsonObject roomRule = i.toObject();
-            if (roomRule["rule_id"] == id()) {
-                Controller::instance().activeConnection()->callApi<DeletePushRuleJob>("global", "room", id());
+            if (roomRule["rule_id"_ls] == id()) {
+                Controller::instance().activeConnection()->callApi<DeletePushRuleJob>("global"_ls, "room"_ls, id());
             }
         }
     }
 
     // For default, all and @mentions and keywords check for an override rule and remove if found.
     if (state == PushNotificationState::Default || state == PushNotificationState::All || state == PushNotificationState::MentionKeyword) {
-        QJsonArray overrideRuleArray = accountData["global"].toObject()["override"].toArray();
+        QJsonArray overrideRuleArray = accountData["global"_ls].toObject()["override"_ls].toArray();
         for (const auto &i : overrideRuleArray) {
             QJsonObject overrideRule = i.toObject();
-            if (overrideRule["rule_id"] == id()) {
-                Controller::instance().activeConnection()->callApi<DeletePushRuleJob>("global", "override", id());
+            if (overrideRule["rule_id"_ls] == id()) {
+                Controller::instance().activeConnection()->callApi<DeletePushRuleJob>("global"_ls, "override"_ls, id());
             }
         }
     }
@@ -1483,7 +1476,7 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
          *      "don't_notify"
          * ]
          */
-        const QVector<QVariant> actions = {"dont_notify"};
+        const QVector<QVariant> actions = {"dont_notify"_ls};
         /**
          * Setup the push condition to get all events for the current room
          * see https://spec.matrix.org/v1.3/client-server-api/#conditions-1
@@ -1497,15 +1490,17 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
          * ]
          */
         PushCondition pushCondition;
-        pushCondition.kind = "event_match";
-        pushCondition.key = "room_id";
+        pushCondition.kind = "event_match"_ls;
+        pushCondition.key = "room_id"_ls;
         pushCondition.pattern = id();
         const QVector<PushCondition> conditions = {pushCondition};
 
         // Add new override rule and make sure it's enabled
-        auto job = Controller::instance().activeConnection()->callApi<SetPushRuleJob>("global", "override", id(), actions, "", "", conditions, "");
+        auto job = Controller::instance()
+                       .activeConnection()
+                       ->callApi<SetPushRuleJob>("global"_ls, "override"_ls, id(), actions, QString(), QString(), conditions, QString());
         connect(job, &BaseJob::success, this, [this]() {
-            auto enableJob = Controller::instance().activeConnection()->callApi<SetPushRuleEnabledJob>("global", "override", id(), true);
+            auto enableJob = Controller::instance().activeConnection()->callApi<SetPushRuleEnabledJob>("global"_ls, "override"_ls, id(), true);
             connect(enableJob, &BaseJob::success, this, [this]() {
                 m_pushNotificationStateUpdating = false;
             });
@@ -1525,13 +1520,15 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
          *      "don't_notify"
          * ]
          */
-        const QVector<QVariant> actions = {"dont_notify"};
+        const QVector<QVariant> actions = {"dont_notify"_ls};
         // No conditions for a room rule
         const QVector<PushCondition> conditions;
 
-        auto setJob = Controller::instance().activeConnection()->callApi<SetPushRuleJob>("global", "room", id(), actions, "", "", conditions, "");
+        auto setJob = Controller::instance()
+                          .activeConnection()
+                          ->callApi<SetPushRuleJob>("global"_ls, "room"_ls, id(), actions, QString(), QString(), conditions, QString());
         connect(setJob, &BaseJob::success, this, [this]() {
-            auto enableJob = Controller::instance().activeConnection()->callApi<SetPushRuleEnabledJob>("global", "room", id(), true);
+            auto enableJob = Controller::instance().activeConnection()->callApi<SetPushRuleEnabledJob>("global"_ls, "room"_ls, id(), true);
             connect(enableJob, &BaseJob::success, this, [this]() {
                 m_pushNotificationStateUpdating = false;
             });
@@ -1553,16 +1550,18 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
          * ]
          */
         QJsonObject tweaks;
-        tweaks.insert("set_tweak", "sound");
-        tweaks.insert("value", "default");
-        const QVector<QVariant> actions = {"notify", tweaks};
+        tweaks.insert("set_tweak"_ls, "sound"_ls);
+        tweaks.insert("value"_ls, "default"_ls);
+        const QVector<QVariant> actions = {"notify"_ls, tweaks};
         // No conditions for a room rule
         const QVector<PushCondition> conditions;
 
         // Add new room rule and make sure enabled
-        auto setJob = Controller::instance().activeConnection()->callApi<SetPushRuleJob>("global", "room", id(), actions, "", "", conditions, "");
+        auto setJob = Controller::instance()
+                          .activeConnection()
+                          ->callApi<SetPushRuleJob>("global"_ls, "room"_ls, id(), actions, QString(), QString(), conditions, QString());
         connect(setJob, &BaseJob::success, this, [this]() {
-            auto enableJob = Controller::instance().activeConnection()->callApi<SetPushRuleEnabledJob>("global", "room", id(), true);
+            auto enableJob = Controller::instance().activeConnection()->callApi<SetPushRuleEnabledJob>("global"_ls, "room"_ls, id(), true);
             connect(enableJob, &BaseJob::success, this, [this]() {
                 m_pushNotificationStateUpdating = false;
             });
@@ -1576,23 +1575,23 @@ void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
 
 void NeoChatRoom::updatePushNotificationState(QString type)
 {
-    if (type != "m.push_rules" || m_pushNotificationStateUpdating) {
+    if (type != "m.push_rules"_ls || m_pushNotificationStateUpdating) {
         return;
     }
 
-    QJsonObject accountData = connection()->accountDataJson("m.push_rules");
+    QJsonObject accountData = connection()->accountDataJson("m.push_rules"_ls);
 
     // First look for a room rule with the room id
-    QJsonArray roomRuleArray = accountData["global"].toObject()["room"].toArray();
+    QJsonArray roomRuleArray = accountData["global"_ls].toObject()["room"_ls].toArray();
     for (const auto &i : roomRuleArray) {
         QJsonObject roomRule = i.toObject();
-        if (roomRule["rule_id"] == id()) {
-            QString notifyAction = roomRule["actions"].toArray()[0].toString();
-            if (notifyAction == "notify") {
+        if (roomRule["rule_id"_ls] == id()) {
+            QString notifyAction = roomRule["actions"_ls].toArray()[0].toString();
+            if (notifyAction == "notify"_ls) {
                 m_currentPushNotificationState = PushNotificationState::All;
                 Q_EMIT pushNotificationStateChanged(m_currentPushNotificationState);
                 return;
-            } else if (notifyAction == "dont_notify") {
+            } else if (notifyAction == "dont_notify"_ls) {
                 m_currentPushNotificationState = PushNotificationState::MentionKeyword;
                 Q_EMIT pushNotificationStateChanged(m_currentPushNotificationState);
                 return;
@@ -1601,12 +1600,12 @@ void NeoChatRoom::updatePushNotificationState(QString type)
     }
 
     // Check for an override rule with the room id
-    QJsonArray overrideRuleArray = accountData["global"].toObject()["override"].toArray();
+    QJsonArray overrideRuleArray = accountData["global"_ls].toObject()["override"_ls].toArray();
     for (const auto &i : overrideRuleArray) {
         QJsonObject overrideRule = i.toObject();
-        if (overrideRule["rule_id"] == id()) {
-            QString notifyAction = overrideRule["actions"].toArray()[0].toString();
-            if (notifyAction == "dont_notify") {
+        if (overrideRule["rule_id"_ls] == id()) {
+            QString notifyAction = overrideRule["actions"_ls].toArray()[0].toString();
+            if (notifyAction == "dont_notify"_ls) {
                 m_currentPushNotificationState = PushNotificationState::Mute;
                 Q_EMIT pushNotificationStateChanged(m_currentPushNotificationState);
                 return;
@@ -1762,9 +1761,9 @@ void NeoChatRoom::replyLastMessage()
 
         if (e->msgtype() != MessageEventType::Unknown) {
             QString eventId;
-            if (content.contains("m.new_content")) {
+            if (content.contains("m.new_content"_ls)) {
                 // The message has been edited so we have to return the id of the original message instead of the replacement
-                eventId = content["m.relates_to"].toObject()["event_id"].toString();
+                eventId = content["m.relates_to"_ls].toObject()["event_id"_ls].toString();
             } else {
                 // For any message that isn't an edit return the id of the current message
                 eventId = (*it)->id();
@@ -1796,9 +1795,9 @@ void NeoChatRoom::editLastMessage()
 
             if (e->msgtype() != MessageEventType::Unknown) {
                 QString eventId;
-                if (content.contains("m.new_content")) {
+                if (content.contains("m.new_content"_ls)) {
                     // The message has been edited so we have to return the id of the original message instead of the replacement
-                    eventId = content["m.relates_to"].toObject()["event_id"].toString();
+                    eventId = content["m.relates_to"_ls].toObject()["event_id"_ls].toString();
                 } else {
                     // For any message that isn't an edit return the id of the current message
                     eventId = (*it)->id();
@@ -1812,10 +1811,7 @@ void NeoChatRoom::editLastMessage()
 
 bool NeoChatRoom::canEncryptRoom() const
 {
-#ifdef Quotient_E2EE_ENABLED
-    return !usesEncryption() && canSendState("m.room.encryption");
-#endif
-    return false;
+    return !usesEncryption() && canSendState("m.room.encryption"_ls);
 }
 
 PollHandler *NeoChatRoom::poll(const QString &eventId)
@@ -1916,25 +1912,25 @@ Quotient::User *NeoChatRoom::directChatRemoteUser() const
 void NeoChatRoom::sendLocation(float lat, float lon, const QString &description)
 {
     QJsonObject locationContent{
-        {"uri", "geo:%1,%2"_ls.arg(QString::number(lat), QString::number(lon))},
+        {"uri"_ls, "geo:%1,%2"_ls.arg(QString::number(lat), QString::number(lon))},
     };
 
     if (!description.isEmpty()) {
-        locationContent["description"] = description;
+        locationContent["description"_ls] = description;
     }
 
     QJsonObject content{
-        {"body", i18nc("'Lat' and 'Lon' as in Latitude and Longitude", "Lat: %1, Lon: %2", lat, lon)},
-        {"msgtype", "m.location"},
-        {"geo_uri", "geo:%1,%2"_ls.arg(QString::number(lat), QString::number(lon))},
-        {"org.matrix.msc3488.location", locationContent},
-        {"org.matrix.msc3488.asset",
+        {"body"_ls, i18nc("'Lat' and 'Lon' as in Latitude and Longitude", "Lat: %1, Lon: %2", lat, lon)},
+        {"msgtype"_ls, "m.location"_ls},
+        {"geo_uri"_ls, "geo:%1,%2"_ls.arg(QString::number(lat), QString::number(lon))},
+        {"org.matrix.msc3488.location"_ls, locationContent},
+        {"org.matrix.msc3488.asset"_ls,
          QJsonObject{
-             {"type", "m.pin"},
+             {"type"_ls, "m.pin"_ls},
          }},
-        {"org.matrix.msc1767.text", i18nc("'Lat' and 'Lon' as in Latitude and Longitude", "Lat: %1, Lon: %2", lat, lon)},
+        {"org.matrix.msc1767.text"_ls, i18nc("'Lat' and 'Lon' as in Latitude and Longitude", "Lat: %1, Lon: %2", lat, lon)},
     };
-    postJson("m.room.message", content);
+    postJson("m.room.message"_ls, content);
 }
 
 QByteArray NeoChatRoom::roomAcountDataJson(const QString &eventType)
@@ -1958,7 +1954,7 @@ QUrl NeoChatRoom::avatarForMember(Quotient::User *user) const
 
 const RoomEvent *NeoChatRoom::getReplyForEvent(const RoomEvent &event) const
 {
-    const QString &replyEventId = event.contentJson()["m.relates_to"].toObject()["m.in_reply_to"].toObject()["event_id"].toString();
+    const QString &replyEventId = event.contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString();
     if (replyEventId.isEmpty()) {
         return {};
     };

src/neochatroom.h

@@ -111,11 +111,6 @@ class NeoChatRoom : public Quotient::Room
      */
     Q_PROPERTY(bool readMarkerLoaded READ readMarkerLoaded NOTIFY readMarkerLoadedChanged)
 
-    /**
-     * @brief Display name with any html special characters escaped.
-     */
-    Q_PROPERTY(QString htmlSafeDisplayName READ htmlSafeDisplayName NOTIFY displayNameChanged)
-
     /**
      * @brief The avatar image to be used for the room.
      */
@@ -186,9 +181,6 @@ class NeoChatRoom : public Quotient::Room
     /**
      * @brief Whether the local user can encrypt the room.
      *
-     * Requires libQuotient 0.7 compiled with the Quotient_E2EE_ENABLED parameter to
-     * be able to return true.
-     *
      * A local user can encrypt a room if they have permission to send the m.room.encryption
      * state event.
      *
@@ -594,8 +586,6 @@ public:
 
     [[nodiscard]] bool readMarkerLoaded() const;
 
-    QString htmlSafeDisplayName() const;
-
     /**
      * @brief Get subtitle text for room
      *