Try fixing qt6

2023-08-02 22:20:13 +02:00
187 changed files with 24153 additions and 31178 deletions
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -57,7 +57,6 @@ Dependencies:
 - 'on': ['Linux/Qt6', 'FreeBSD/Qt6']
  'require':
    'frameworks/kdbusaddons': '@latest-kf6'
-    'frameworks/kstatusnotifieritem': '@latest-kf6'

 - 'on': ['Linux/Qt6', 'Linux/Qt5']
  'require':
--- a/CMakeLists.txt
+++ b/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.105)
+set(KDE_COMPILERSETTINGS_LEVEL 5.84)

 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 WebView)
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg)
 set_package_properties(Qt${QT_MAJOR_VERSION} PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
@@ -93,10 +93,6 @@ 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
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@

 A Qt/QML based Matrix client.

-<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://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://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
--- a/android/AndroidManifest.xml
+++ b/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" android:usesCleartextTraffic="true">
+    <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="NeoChat" android:icon="@drawable/neochat">
        <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"
--- a/autotests/texthandlertest.cpp
+++ b/autotests/texthandlertest.cpp
@@ -10,8 +10,6 @@
 #include <Quotient/syncdata.h>
 #include <qnamespace.h>

-#include "utils.h"
-
 using namespace Quotient;

 class TestRoom : public NeoChatRoom
@@ -557,10 +555,10 @@ void TextHandlerTest::receiveRichPlainUrl()
 void TextHandlerTest::receiveRichEmote()
 {
    auto event = room->messageEvents().at(1).get();
-    auto author = room->user(event->senderId());
+    auto author = static_cast<NeoChatUser *>(room->user(event->senderId()));
    const QString testInputString = QStringLiteral("This is an emote.");
-    const QString testOutputString = QStringLiteral("* <a href=\"https://matrix.to/#/@example:example.org\" style=\"color:")
-        + Utils::getUserColor(author->hueF()).name() + QStringLiteral("\">@example:example.org</a> This is an emote.");
+    const QString testOutputString = QStringLiteral("* <a href=\"https://matrix.to/#/@example:example.org\" style=\"color:") + author->color().name()
+        + QStringLiteral("\">@example:example.org</a> This is an emote.");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -604,13 +602,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"_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("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("multipleHttps") << QStringLiteral("https://kde.org www.example.org")
                                   << QList<QUrl>({
-                                          QUrl("https://kde.org"_ls),
-                                          QUrl("www.example.org"_ls),
+                                          QUrl("https://kde.org"),
+                                          QUrl("www.example.org"),
                                      });
 }

@@ -646,5 +644,5 @@ void TextHandlerTest::linkPreviewsReject()
    QCOMPARE(testTextHandler.getLinkPreviews(), testOutputLinks);
 }

-QTEST_MAIN(TextHandlerTest)
+QTEST_GUILESS_MAIN(TextHandlerTest)
 #include "texthandlertest.moc"
--- a/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
@@ -46,26 +46,43 @@
  <name xml:lang="uk">NeoChat</name>
  <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>
-  <summary xml:lang="sv">Chatta med dina vänner på Matrix</summary>
-  <summary xml:lang="ta">மேட்ரிக்ஸு மூலம் உங்கள் நண்பர்களிடம் பேசலாம்</summary>
-  <summary xml:lang="tr">Matrix'te arkadaşlarınızla sohbet edin</summary>
-  <summary xml:lang="uk">Спілкуйтеся з вашими друзями у matrix</summary>
-  <summary xml:lang="x-test">xxChat with your friends on matrixxx</summary>
+  <summary>A client for matrix, the decentralized communication protocol</summary>
+  <summary xml:lang="ar">عميل لماتركس، ميفاق الاتصال اللامركزي</summary>
+  <summary xml:lang="az">Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu</summary>
+  <summary xml:lang="ca">Un client de Matrix, el protocol de comunicacions descentralitzat</summary>
+  <summary xml:lang="ca-valencia">Un client de Matrix, el protocol de comunicacions descentralitzat</summary>
+  <summary xml:lang="cs">Klient pro decentralizovaný komunikační protokol matrix</summary>
+  <summary xml:lang="de">Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll</summary>
+  <summary xml:lang="el">Ένας πελάτης για το Matrix, το αποκεντρωμένο πρωτόκολλο επικοινωνίας</summary>
+  <summary xml:lang="en-GB">A client for matrix, the decentralised communication protocol</summary>
+  <summary xml:lang="eo">Kliento por matrix, la malcentra komunikprotokolo</summary>
+  <summary xml:lang="es">Un cliente para Matrix, el protocolo de comunicaciones descentralizado</summary>
+  <summary xml:lang="eu">Matrix, deszentralizatutako komunikazio protokolorako bezero bat</summary>
+  <summary xml:lang="fi">Asiakas Matrixille, hajautetulle viestintäyhteyskäytännölle</summary>
+  <summary xml:lang="fr">Un client pour « Matrix », le protocole décentralisé de communications.</summary>
+  <summary xml:lang="gl">Un cliente para Matrix, o protocolo de comunicación descentralizada.</summary>
+  <summary xml:lang="hu">Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz</summary>
+  <summary xml:lang="ia">Un cliente per Matrix, le protocollo de communication decentralisate</summary>
+  <summary xml:lang="id">Klien untuk matrix, protokol komunikasi terdesentralisasi</summary>
+  <summary xml:lang="ie">Un cliente de Matrix, li protocol de communication decentralisat</summary>
+  <summary xml:lang="it">Un client per matrix, il protocollo di comunicazione decentralizzato</summary>
+  <summary xml:lang="ka">კლიენტი Matrix-სთვის, დეცენტრალიზებული კომუნიკაციის პროტოკოლისთვის</summary>
+  <summary xml:lang="ko">Matrix, 분산 대화 프로토콜 클라이언트</summary>
+  <summary xml:lang="nl">Een client voor matrix, het gedecentraliseerde communicatieprotocol</summary>
+  <summary xml:lang="nn">Ein klient for Matrix – protokollen for desentralisert kommunikasjon</summary>
+  <summary xml:lang="pa">ਮੈਟਰਿਕਸ, ਸਰਬ-ਸਾਂਝੇ ਸੰਚਾਰ ਪਰੋਟੋਕਾਲ, ਲਈ ਕਲਾਈਂਟ ਹੈ</summary>
+  <summary xml:lang="pl">Program do obsługi matriksa, rozproszonego protokołu porozumiewania się</summary>
+  <summary xml:lang="pt">Um cliente para o Matrix, o protocolo de comunicação descentralizado</summary>
+  <summary xml:lang="pt-BR">Um cliente do Matrix, o protocolo de comunicação descentralizado</summary>
+  <summary xml:lang="ru">Клиент для Matrix — децентрализованного коммуникационного протокола</summary>
+  <summary xml:lang="sk">Klient pre matrix, decentralizovaný komunikačný protokol</summary>
+  <summary xml:lang="sl">Odjemalec za matrix, decentralizirani komunikacijski protokol</summary>
+  <summary xml:lang="sv">En klient för Matrix, det decentraliserade kommunikationsprotokollet</summary>
+  <summary xml:lang="ta">மையமில்லா தகவல் பரிமாற்ற நெறிமுறையான மேட்ரிக்ஸுக்கான செயலி</summary>
+  <summary xml:lang="tr">Merkezi olmayan iletişim protokolü Matrix için bir istemci</summary>
+  <summary xml:lang="uk">Клієнт matrix, децентралізованого протоколу обміну даними</summary>
+  <summary xml:lang="x-test">xxA client for matrix, the decentralized communication protocolxx</summary>
+  <summary xml:lang="zh-CN">分布式通讯协议 Matrix 的客户端</summary>
  <description>
    <p>NeoChat is a client for Matrix, the decentralized communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami
 to provide a convergent experience across multiple platforms.</p>
@@ -137,7 +154,6 @@ to provide a convergent experience across multiple platforms.</p>
    <p xml:lang="pt">Devido à natureza do desenvolvimento da especificação do Matrix, o NeoChat também suporta diversas funcionalidades instáveis. De momento são:</p>
    <p xml:lang="sl">Zaradi narave razvoja specifikacije Matrixa NeoChat podpira tudi številne nestabilne zmožnosti. Trenutno so to:</p>
    <p xml:lang="sv">På grund av sättet Matrix-specifikationens utvecklas, stöder NeoChat också ett stor antal instabila funktioner. För närvarande är de:</p>
-    <p xml:lang="ta">மேட்ரிக்ஸு நெறிமுறை வரையறுக்கப்படும் வித‍த்தின் காரணமாக, பல நிலையற்ற அம்சங்களையும் நியோச்சாட் ஆதரிக்கிறது. தற்போது ஆதரிக்கப்படுபவை:</p>
    <p xml:lang="tr">NeoChat, Matrix belirtimi geliştirmesinin doğası gereği çok sayıda kararsız özelliği de destekler. Şu anda bunlar:</p>
    <p xml:lang="uk">Через природу розробки специфікації Matrix, у NeoChat також передбачено підтримку численних нестабільних можливостей. У поточній версії цими можливостями є:</p>
    <p xml:lang="x-test">xxDue to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:xx</p>
@@ -268,6 +284,48 @@ 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 conversa, 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>
@@ -277,77 +335,15 @@ 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>
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -93,7 +93,7 @@ Comment[es]=Cliente para el protocolo Matrix
 Comment[eu]=Matrix protokolorako bezeroa
 Comment[fi]=Asiakas Matrix-yhteyskäytännölle
 Comment[fr]=Client pour le protocole « Matrix »
-Comment[gl]=Cliente para o protocolo Matrix.
+Comment[gl]=Cliente para o protocolo Matrix
 Comment[hu]=Kliens a Matrix protokollhoz
 Comment[ia]=Cliente per le protocollo de Matrix
 Comment[id]=Klien untuk protokol Matrix
--- a/po/ar/neochat.po
+++ b/po/ar/neochat.po
--- a/po/az/neochat.po
+++ b/po/az/neochat.po
--- a/po/ca/neochat.po
+++ b/po/ca/neochat.po
--- a/po/ca@valencia/neochat.po
+++ b/po/ca@valencia/neochat.po
--- a/po/cs/neochat.po
+++ b/po/cs/neochat.po
--- a/po/da/neochat.po
+++ b/po/da/neochat.po
--- a/po/de/neochat.po
+++ b/po/de/neochat.po
--- a/po/el/neochat.po
+++ b/po/el/neochat.po
--- a/po/en_GB/neochat.po
+++ b/po/en_GB/neochat.po
--- a/po/es/neochat.po
+++ b/po/es/neochat.po
--- a/po/eu/neochat.po
+++ b/po/eu/neochat.po
--- a/po/fi/neochat.po
+++ b/po/fi/neochat.po
--- a/po/fr/neochat.po
+++ b/po/fr/neochat.po
--- a/po/hu/neochat.po
+++ b/po/hu/neochat.po
--- a/po/ia/neochat.po
+++ b/po/ia/neochat.po
--- a/po/id/neochat.po
+++ b/po/id/neochat.po
--- a/po/ie/neochat.po
+++ b/po/ie/neochat.po
--- a/po/it/neochat.po
+++ b/po/it/neochat.po
--- a/po/ja/neochat.po
+++ b/po/ja/neochat.po
--- a/po/ka/neochat.po
+++ b/po/ka/neochat.po
--- a/po/ko/neochat.po
+++ b/po/ko/neochat.po
--- a/po/lt/neochat.po
+++ b/po/lt/neochat.po
--- a/po/nl/neochat.po
+++ b/po/nl/neochat.po
--- a/po/nn/neochat.po
+++ b/po/nn/neochat.po
--- a/po/pa/neochat.po
+++ b/po/pa/neochat.po
--- a/po/pl/neochat.po
+++ b/po/pl/neochat.po
--- a/po/pt/neochat.po
+++ b/po/pt/neochat.po
--- a/po/pt_BR/neochat.po
+++ b/po/pt_BR/neochat.po
--- a/po/ru/neochat.po
+++ b/po/ru/neochat.po
--- a/po/sk/neochat.po
+++ b/po/sk/neochat.po
--- a/po/sl/neochat.po
+++ b/po/sl/neochat.po
--- a/po/sv/docs/neochat/man-neochat.1.docbook
+++ b/po/sv/docs/neochat/man-neochat.1.docbook
@@ -1,122 +0,0 @@
-<?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>
--- a/po/sv/neochat.po
+++ b/po/sv/neochat.po
--- a/po/ta/neochat.po
+++ b/po/ta/neochat.po
--- a/po/tok/neochat.po
+++ b/po/tok/neochat.po
--- a/po/tr/neochat.po
+++ b/po/tr/neochat.po
--- a/po/uk/neochat.po
+++ b/po/uk/neochat.po
--- a/po/zh_CN/neochat.po
+++ b/po/zh_CN/neochat.po
--- a/po/zh_TW/neochat.po
+++ b/po/zh_TW/neochat.po
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,10 +5,12 @@

 configure_file(qml/Page/RoomList/RoomDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Page/RoomList/RoomDelegate.qml)
 configure_file(qml/Component/QuickSwitcher.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/QuickSwitcher.qml)
+configure_file(qml/Dialog/UserDetailDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/UserDetailDialog.qml)
 configure_file(qml/Dialog/PowerLevelDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/PowerLevelDialog.qml)
 configure_file(qml/Component/Timeline/AudioDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/AudioDelegate.qml)
 configure_file(qml/Component/Timeline/VideoDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/VideoDelegate.qml)
 configure_file(qml/Component/Timeline/OsmLocationPlugin.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/OsmLocationPlugin.qml)
+configure_file(qml/Component/NeochatMaximizeComponent.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/NeochatMaximizeComponent.qml)

 configure_file(res.qrc ${CMAKE_CURRENT_SOURCE_DIR}/res.generated.qrc)

@@ -43,6 +45,8 @@ add_library(neochat STATIC
    roommanager.h
    neochatroom.cpp
    neochatroom.h
+    neochatuser.cpp
+    neochatuser.h
    models/userlistmodel.cpp
    models/userlistmodel.h
    models/userfiltermodel.cpp
@@ -74,6 +78,8 @@ add_library(neochat STATIC
    blurhash.h
    blurhashimageprovider.cpp
    blurhashimageprovider.h
+    models/collapsestateproxymodel.cpp
+    models/collapsestateproxymodel.h
    models/mediamessagefiltermodel.cpp
    models/mediamessagefiltermodel.h
    urlhelper.cpp
@@ -122,10 +128,6 @@ add_library(neochat STATIC
    locationhelper.h
    events/pollevent.cpp
    pollhandler.cpp
-    utils.h
-    registration.cpp
-    neochatconnection.cpp
-    neochatconnection.h
 )

 ecm_qt_declare_logging_category(neochat
@@ -142,11 +144,6 @@ 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
@@ -161,9 +158,6 @@ 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()
@@ -183,7 +177,6 @@ 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)
--- a/src/actionshandler.cpp
+++ b/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(QUrl(path), m_room->chatBoxText().isEmpty() ? path.mid(path.lastIndexOf(u'/') + 1) : m_room->chatBoxText());
+        m_room->uploadFile(path, m_room->chatBoxText().isEmpty() ? path.mid(path.lastIndexOf('/') + 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(QStringLiteral("^s/([^/]*)/([^/]*)(/g)?$"));
+        QRegularExpression sed("^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"_ls) {
-                            m_room->postHtmlMessage(handledText, originalString.replace(regex, replacement), event->msgtype(), {}, event->id());
+                        if (flags == "/g") {
+                            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(" "_ls) == action.prefix.length() + 1 || handledText.length() == action.prefix.length() + 1)) {
+                && (handledText.indexOf(" ") == 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>"_ls) == 1 && handledText.count("</p>"_ls) == 1) {
-        handledText.remove("<p>"_ls);
-        handledText.remove("</p>"_ls);
+    if (handledText.count("<p>") == 1 && handledText.count("</p>") == 1) {
+        handledText.remove("<p>");
+        handledText.remove("</p>");
    }

    if (handledText.length() == 0) {
        return;
    }

-    m_room->postMessage(text, handledText, messageType, m_room->chatBoxReplyId(), isEdit ? m_room->chatBoxEditId() : QString());
+    m_room->postMessage(text, handledText, messageType, m_room->chatBoxReplyId(), isEdit ? m_room->chatBoxEditId() : "");
 }

 void ActionsHandler::checkEffects(const QString &text)
 {
    std::optional<QString> effect = std::nullopt;
-    if (text.contains(QStringLiteral("\u2744"))) {
+    if (text.contains("\u2744")) {
        effect = QLatin1String("snowflake");
-    } else if (text.contains(QStringLiteral("\u1F386"))) {
+    } else if (text.contains("\u1F386")) {
        effect = QLatin1String("fireworks");
-    } else if (text.contains(QStringLiteral("\u2F387"))) {
+    } else if (text.contains("\u2F387")) {
        effect = QLatin1String("fireworks");
-    } else if (text.contains(QStringLiteral("\u1F389"))) {
+    } else if (text.contains("\u1F389")) {
        effect = QLatin1String("confetti");
-    } else if (text.contains(QStringLiteral("\u1F38A"))) {
+    } else if (text.contains("\u1F38A")) {
        effect = QLatin1String("confetti");
    }
    if (effect.has_value()) {
--- a/src/chatdocumenthandler.cpp
+++ b/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 + QStringLiteral(" "));
+        cursor.insertText(name % " ");
        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 + QStringLiteral(" "));
+        cursor.insertText(alias % " ");
        cursor.setPosition(at);
        cursor.setPosition(cursor.position() + alias.size(), QTextCursor::KeepAnchor);
        cursor.setKeepPositionOnInsert(true);
--- a/src/chatdocumenthandler.h
+++ b/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);
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -21,6 +21,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QGuiApplication>
+#include <QImageReader>
 #include <QNetworkProxy>
 #include <QQuickTextDocument>
 #include <QQuickWindow>
@@ -32,15 +33,17 @@

 #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/eventstats.h>
+#include <Quotient/csapi/profile.h>
 #include <Quotient/jobs/downloadfilejob.h>
 #include <Quotient/qt_connection_util.h>
-#include <Quotient/user.h>
+#include <Quotient/csapi/notifications.h>
+#include <Quotient/eventstats.h>

 #include "neochatconfig.h"
 #include "neochatroom.h"
+#include "neochatuser.h"
 #include "notificationsmanager.h"
 #include "roommanager.h"
 #include "windowcontroller.h"
@@ -57,6 +60,7 @@ Controller::Controller(QObject *parent)
    : QObject(parent)
 {
    Connection::setRoomType<NeoChatRoom>();
+    Connection::setUserType<NeoChatUser>();

    setApplicationProxy();

@@ -102,8 +106,8 @@ Controller::Controller(QObject *parent)
    static int oldAccountCount = 0;
    connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, [this]() {
        if (m_accountRegistry.size() > oldAccountCount) {
-            auto connection = dynamic_cast<NeoChatConnection *>(m_accountRegistry.accounts()[m_accountRegistry.size() - 1]);
-            connect(connection, &NeoChatConnection::syncDone, this, [connection]() {
+            auto connection = m_accountRegistry.accounts()[m_accountRegistry.size() - 1];
+            connect(connection, &Connection::syncDone, this, [connection]() {
                NotificationsManager::instance().handleNotifications(connection);
            });
        }
@@ -121,24 +125,43 @@ Controller &Controller::instance()
    return _instance;
 }

-void Controller::toggleWindow()
+void Controller::showWindow()
 {
-    auto &instance = WindowController::instance();
-    auto window = instance.window();
-    if (window->isVisible()) {
-        if (window->windowStates() & Qt::WindowMinimized) {
-            window->showNormal();
-            window->requestActivate();
-        } else {
-            window->close();
-        }
-    } else {
-        instance.showAndRaiseWindow({});
-        instance.window()->requestActivate();
-    }
+    WindowController::instance().showAndRaiseWindow(QString());
 }

-void Controller::addConnection(NeoChatConnection *c)
+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]);
+        }
+    } else {
+        setActiveConnection(nullptr);
+    }
+    if (!serverSideLogout) {
+        return;
+    }
+    conn->logout();
+}
+
+void Controller::addConnection(Connection *c)
 {
    Q_ASSERT_X(c, __FUNCTION__, "Attempt to add a null connection");

@@ -146,17 +169,17 @@ void Controller::addConnection(NeoChatConnection *c)

    c->setLazyLoading(true);

-    connect(c, &NeoChatConnection::syncDone, this, [this, c] {
+    connect(c, &Connection::syncDone, this, [this, c] {
        Q_EMIT syncDone();

        c->sync(30000);
        c->saveState();
    });
-    connect(c, &NeoChatConnection::loggedOut, this, [this, c] {
+    connect(c, &Connection::loggedOut, this, [this, c] {
        dropConnection(c);
    });

-    connect(c, &NeoChatConnection::requestFailed, this, [this](BaseJob *job) {
+    connect(c, &Connection::requestFailed, this, [this](BaseJob *job) {
        if (job->error() == BaseJob::UserConsentRequired) {
            Q_EMIT userConsentRequired(job->errorUrl());
        }
@@ -168,7 +191,7 @@ void Controller::addConnection(NeoChatConnection *c)
    Q_EMIT accountCountChanged();
 }

-void Controller::dropConnection(NeoChatConnection *c)
+void Controller::dropConnection(Connection *c)
 {
    Q_ASSERT_X(c, __FUNCTION__, "Attempt to drop a null connection");

@@ -178,7 +201,7 @@ void Controller::dropConnection(NeoChatConnection *c)

 void Controller::invokeLogin()
 {
-    const auto accounts = SettingsGroup("Accounts"_ls).childGroups();
+    const auto accounts = SettingsGroup("Accounts").childGroups();
    QString id = NeoChatConfig::self()->activeConnection();
    for (const auto &accountId : accounts) {
        AccountSettings account{accountId};
@@ -192,36 +215,36 @@ void Controller::invokeLogin()
                AccountSettings account{accountId};
                QString accessToken;
                if (accessTokenLoadingJob->error() == QKeychain::Error::NoError) {
-                    accessToken = QString::fromLatin1(accessTokenLoadingJob->binaryData());
+                    accessToken = accessTokenLoadingJob->binaryData();
                } else {
                    return;
                }

-                auto connection = new NeoChatConnection(account.homeserver());
-                connect(connection, &NeoChatConnection::connected, this, [this, connection, id] {
+                auto connection = new Connection(account.homeserver());
+                connect(connection, &Connection::connected, this, [this, connection, id] {
                    connection->loadState();
                    addConnection(connection);
                    if (connection->userId() == id) {
                        setActiveConnection(connection);
-                        connectSingleShot(connection, &NeoChatConnection::syncDone, this, &Controller::initiated);
+                        connectSingleShot(connection, &Connection::syncDone, this, &Controller::initiated);
                    }
                });
-                connect(connection, &NeoChatConnection::loginError, this, [this, connection](const QString &error, const QString &) {
-                    if (error == "Unrecognised access token"_ls) {
+                connect(connection, &Connection::loginError, this, [this, connection](const QString &error, const QString &) {
+                    if (error == "Unrecognised access token") {
                        Q_EMIT errorOccured(i18n("Login Failed: Access Token invalid or revoked"));
-                        connection->logout(false);
-                    } else if (error == "Connection closed"_ls) {
+                        logout(connection, false);
+                    } else if (error == "Connection closed") {
                        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));
-                        connection->logout(true);
+                        logout(connection, true);
                    }
                    Q_EMIT initiated();
                });
-                connect(connection, &NeoChatConnection::networkError, this, [this](const QString &error, const QString &, int, int) {
+                connect(connection, &Connection::networkError, this, [this](const QString &error, const QString &, int, int) {
                    Q_EMIT errorOccured(i18n("Network Error: %1", error));
                });
                connection->assumeIdentity(account.userId(), accessToken);
@@ -287,16 +310,75 @@ 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
-    auto de = QString::fromLatin1(qgetenv("XDG_CURRENT_DESKTOP"));
+    QString de = getenv("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")
 {
@@ -307,14 +389,6 @@ 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();
@@ -326,10 +400,10 @@ void Controller::setQuitOnLastWindowClosed()
    if (NeoChatConfig::self()->systemTray()) {
        m_trayIcon = new TrayIcon(this);
        m_trayIcon->show();
-        connect(m_trayIcon, &TrayIcon::toggleWindow, this, &Controller::toggleWindow);
+        connect(m_trayIcon, &TrayIcon::showWindow, this, &Controller::showWindow);
    } else {
        if (m_trayIcon) {
-            disconnect(m_trayIcon, &TrayIcon::toggleWindow, this, &Controller::toggleWindow);
+            disconnect(m_trayIcon, &TrayIcon::showWindow, this, &Controller::showWindow);
            delete m_trayIcon;
            m_trayIcon = nullptr;
        }
@@ -340,7 +414,7 @@ void Controller::setQuitOnLastWindowClosed()
 #endif
 }

-NeoChatConnection *Controller::activeConnection() const
+Connection *Controller::activeConnection() const
 {
    if (m_connection.isNull()) {
        return nullptr;
@@ -348,43 +422,49 @@ NeoChatConnection *Controller::activeConnection() const
    return m_connection;
 }

-void Controller::setActiveConnection(NeoChatConnection *connection)
+void Controller::setActiveConnection(Connection *connection)
 {
    if (connection == m_connection) {
        return;
    }
    if (m_connection != nullptr) {
-        disconnect(m_connection, &NeoChatConnection::syncError, this, nullptr);
-        disconnect(m_connection, &NeoChatConnection::accountDataChanged, this, nullptr);
+        disconnect(m_connection, &Connection::syncError, this, nullptr);
+        disconnect(m_connection, &Connection::accountDataChanged, this, nullptr);
    }
    m_connection = connection;
    if (connection != nullptr) {
        NeoChatConfig::self()->setActiveConnection(connection->userId());
-        connect(connection, &NeoChatConnection::networkError, this, [this]() {
+        connect(connection, &Connection::networkError, this, [this]() {
            if (!m_isOnline) {
                return;
            }
            m_isOnline = false;
            Q_EMIT isOnlineChanged(false);
        });
-        connect(connection, &NeoChatConnection::syncDone, this, [this] {
+        connect(connection, &Connection::syncDone, this, [this] {
            if (m_isOnline) {
                return;
            }
            m_isOnline = true;
            Q_EMIT isOnlineChanged(true);
        });
-        connect(connection, &NeoChatConnection::requestFailed, this, [](BaseJob *job) {
-            if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"_ls].toString() == "M_TOO_LARGE"_ls) {
+        connect(connection, &Connection::requestFailed, this, [](BaseJob *job) {
+            if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"].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
@@ -407,7 +487,7 @@ NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Om

 void Controller::createRoom(const QString &name, const QString &topic)
 {
-    auto createRoomJob = m_connection->createRoom(Connection::PublishRoom, QString(), name, topic, QStringList());
+    auto createRoomJob = m_connection->createRoom(Connection::PublishRoom, "", name, topic, QStringList());
    connect(createRoomJob, &CreateRoomJob::failure, this, [this, createRoomJob] {
        Q_EMIT errorOccured(i18n("Room creation failed: %1", createRoomJob->errorString()));
    });
@@ -443,16 +523,16 @@ bool Controller::isOnline() const
 // TODO: Remove in favor of RoomManager::joinRoom
 void Controller::joinRoom(const QString &alias)
 {
-    if (!alias.contains(":"_ls)) {
+    if (!alias.contains(":")) {
        Q_EMIT errorOccured(i18n("The room id you are trying to join is not valid"));
        return;
    }

-    const auto knownServer = alias.mid(alias.indexOf(":"_ls) + 1);
+    const auto knownServer = alias.mid(alias.indexOf(":") + 1);
    RoomManager::instance().joinRoom(m_connection, alias, QStringList{knownServer});
 }

-void Controller::openOrCreateDirectChat(User *user)
+void Controller::openOrCreateDirectChat(NeoChatUser *user)
 {
    const auto existing = activeConnection()->directChats();

@@ -502,6 +582,11 @@ bool Controller::hasWindowSystem() const
 #endif
 }

+bool Controller::encryptionSupported() const
+{
+    return Quotient::encryptionSupported();
+}
+
 void Controller::forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item)
 {
    // HACK: Workaround bug QTBUG 93281
@@ -546,6 +631,12 @@ 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
@@ -555,6 +646,41 @@ 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;
--- a/src/controller.h
+++ b/src/controller.h
@@ -9,20 +9,20 @@

 #include <KFormat>

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

 class NeoChatRoom;
+class NeoChatUser;
 class TrayIcon;
 class QWindow;
 class QQuickTextDocument;

 namespace Quotient
 {
+class Connection;
 class Room;
-class User;
 }

 namespace QKeychain
@@ -50,7 +50,7 @@ class Controller : public QObject
    /**
     * @brief The current connection for the rest of NeoChat to use.
     */
-    Q_PROPERTY(NeoChatConnection *activeConnection READ activeConnection WRITE setActiveConnection NOTIFY activeConnectionChanged)
+    Q_PROPERTY(Quotient::Connection *activeConnection READ activeConnection WRITE setActiveConnection NOTIFY activeConnectionChanged)

    /**
     * @brief The PushRuleModel that has the active connection's push rules.
@@ -62,6 +62,16 @@ 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.
     */
@@ -77,6 +87,20 @@ 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.
     *
@@ -99,28 +123,46 @@ public:

    [[nodiscard]] int accountCount() const;

-    void setActiveConnection(NeoChatConnection *connection);
-    [[nodiscard]] NeoChatConnection *activeConnection() const;
+    void setActiveConnection(Quotient::Connection *connection);
+    [[nodiscard]] Quotient::Connection *activeConnection() const;

    [[nodiscard]] PushRuleModel *pushRuleModel() const;

    /**
     * @brief Add a new connection to the account registry.
     */
-    void addConnection(NeoChatConnection *c);
+    void addConnection(Quotient::Connection *c);

    /**
     * @brief Drop a connection from the account registry.
     */
-    void dropConnection(NeoChatConnection *c);
+    void dropConnection(Quotient::Connection *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.
     */
@@ -141,7 +183,7 @@ public:
     *
     * If a direct chat with the user doesn't exist one is created and then joined.
     */
-    Q_INVOKABLE void openOrCreateDirectChat(Quotient::User *user);
+    Q_INVOKABLE void openOrCreateDirectChat(NeoChatUser *user);

    [[nodiscard]] bool supportSystemTray() const;

@@ -152,6 +194,8 @@ public:

    bool isOnline() const;

+    bool encryptionSupported() const;
+
    /**
     * @brief Sets the QNetworkProxy for the application.
     *
@@ -159,6 +203,8 @@ public:
     */
    Q_INVOKABLE void setApplicationProxy();

+    int quotientMinorVersion() const;
+
    bool isFlatpak() const;

    /**
@@ -182,12 +228,14 @@ 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<NeoChatConnection> m_connection;
+    QPointer<Quotient::Connection> m_connection;
    TrayIcon *m_trayIcon = nullptr;

    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const Quotient::AccountSettings &account);
@@ -204,7 +252,7 @@ private:

 private Q_SLOTS:
    void invokeLogin();
-    void toggleWindow();
+    void showWindow();
    void setQuitOnLastWindowClosed();

 Q_SIGNALS:
@@ -214,8 +262,8 @@ Q_SIGNALS:
    /// Error occurred because of server or bug in NeoChat
    void globalErrorOccured(QString error, QString detail);
    void syncDone();
-    void connectionAdded(NeoChatConnection *connection);
-    void connectionDropped(NeoChatConnection *connection);
+    void connectionAdded(Quotient::Connection *_t1);
+    void connectionDropped(Quotient::Connection *_t1);
    void accountCountChanged();
    void initiated();
    void notificationClicked(const QString &_t1, const QString &_t2);
@@ -226,14 +274,18 @@ Q_SIGNALS:
    void userConsentRequired(QUrl url);
    void testConnectionResult(const QString &connection, bool usable);
    void isOnlineChanged(bool isOnline);
-    void keyVerificationRequest(int timeLeft, NeoChatConnection *connection, const QString &transactionId, const QString &deviceId);
+    void keyVerificationRequest(int timeLeft, Quotient::Connection *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();
 };

@@ -249,9 +301,3 @@ 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);
-};
--- a/src/delegatesizehelper.cpp
+++ b/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::round(m * m_parentWidth + c);
+    int calcPercentWidth = std::ceil(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::round(absoluteWidth);
+        return std::ceil(absoluteWidth);
    } else {
-        return std::round(std::min(absoluteWidth, m_maxWidth));
+        return std::ceil(std::min(absoluteWidth, m_maxWidth));
    }
 }

--- a/src/emojitones_data.h
+++ b/src/emojitones_data.h
--- a/src/events/imagepackevent.cpp
+++ b/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"_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]),
+            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"]),
        };
    } else {
        pack = none;
    }

-    const auto &keys = json["images"_ls].toObject().keys();
+    const auto &keys = json["images"].toObject().keys();
    for (const auto &k : keys) {
        Omittable<EventContent::ImageInfo> info;
-        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);
+        if (json["images"][k].toObject().contains(QStringLiteral("info"))) {
+            info = EventContent::ImageInfo(QUrl(json["images"][k]["url"].toString()), json["images"][k]["info"].toObject(), k);
        } else {
            info = none;
        }
        images += ImagePackImage{
            k,
-            fromJson<QUrl>(json["images"_ls][k]["url"_ls].toString()),
-            fromJson<Omittable<QString>>(json["images"_ls][k]["body"_ls]),
+            fromJson<QUrl>(json["images"][k]["url"].toString()),
+            fromJson<Omittable<QString>>(json["images"][k]["body"]),
            info,
-            fromJson<Omittable<QStringList>>(json["images"_ls][k]["usage"_ls]),
+            fromJson<Omittable<QStringList>>(json["images"][k]["usage"]),
        };
    }
 }
@@ -42,20 +42,20 @@ void ImagePackEventContent::fillJson(QJsonObject *o) const
    if (pack) {
        QJsonObject packJson;
        if (pack->displayName) {
-            packJson["display_name"_ls] = *pack->displayName;
+            packJson["display_name"] = *pack->displayName;
        }
        if (pack->usage) {
            QJsonArray usageJson;
            for (const auto &usage : *pack->usage) {
                usageJson += usage;
            }
-            packJson["usage"_ls] = usageJson;
+            packJson["usage"] = usageJson;
        }
        if (pack->avatarUrl) {
-            packJson["avatar_url"_ls] = pack->avatarUrl->toString();
+            packJson["avatar_url"] = pack->avatarUrl->toString();
        }
        if (pack->attribution) {
-            packJson["attribution"_ls] = *pack->attribution;
+            packJson["attribution"] = *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"_ls] = image.url.toString();
+        imageJson["url"] = image.url.toString();
        if (image.body) {
-            imageJson["body"_ls] = *image.body;
+            imageJson["body"] = *image.body;
        }
        if (image.usage) {
            QJsonArray usageJson;
            for (const auto &usage : *image.usage) {
                usageJson += usage;
            }
-            imageJson["usage"_ls] = usageJson;
+            imageJson["usage"] = usageJson;
        }
        imagesJson[image.shortcode] = imageJson;
    }
--- a/src/events/pollevent.cpp
+++ b/src/events/pollevent.cpp
@@ -12,12 +12,12 @@ PollStartEvent::PollStartEvent(const QJsonObject &obj)

 int PollStartEvent::maxSelections() const
 {
-    return contentJson()["org.matrix.msc3381.poll.start"_ls]["max_selections"_ls].toInt();
+    return contentJson()["org.matrix.msc3381.poll.start"]["max_selections"].toInt();
 }

 QString PollStartEvent::question() const
 {
-    return contentJson()["org.matrix.msc3381.poll.start"_ls]["question"_ls]["body"_ls].toString();
+    return contentJson()["org.matrix.msc3381.poll.start"]["question"]["body"].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"_ls, QJsonObject{{"answers"_ls, QJsonArray::fromStringList(responses)}}},
-                           {"m.relates_to"_ls, QJsonObject{{"rel_type"_ls, "m.reference"_ls}, {"event_id"_ls, pollStartEventId}}}}))
+                          {{"org.matrix.msc3381.poll.response", QJsonObject{{"answers", QJsonArray::fromStringList(responses)}}},
+                           {"m.relates_to", QJsonObject{{"rel_type", "m.reference"}, {"event_id", pollStartEventId}}}}))
 {
 }
--- a/src/linkpreviewer.cpp
+++ b/src/linkpreviewer.cpp
@@ -8,7 +8,6 @@
 #include <Quotient/connection.h>
 #include <Quotient/csapi/content-repo.h>

-#include "neochatconfig.h"
 #include "neochatroom.h"

 using namespace Quotient;
@@ -20,10 +19,6 @@ 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
@@ -62,22 +57,19 @@ 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);
+        GetUrlPreviewJob *job = conn->callApi<GetUrlPreviewJob>(m_url.toString());

        connect(job, &BaseJob::success, this, [this, job, conn]() {
            const auto json = job->jsonData();
-            m_title = json["og:title"_ls].toString().trimmed();
-            m_description = json["og:description"_ls].toString().trimmed().replace("\n"_ls, " "_ls);
+            m_title = json["og:title"].toString().trimmed();
+            m_description = json["og:description"].toString().trimmed().replace("\n", " ");

-            auto imageUrl = QUrl(json["og:image"_ls].toString());
+            auto imageUrl = QUrl(json["og:image"].toString());
            if (imageUrl.isValid() && imageUrl.scheme() == QStringLiteral("mxc")) {
                m_imageSource = conn->makeMediaUrl(imageUrl);
            } else {
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -87,32 +87,32 @@ public:
        QMutexLocker locker(&mutex);
        QByteArray buf;
        QTextStream str(&buf);
-        str << QDateTime::currentDateTime().toString(Qt::ISODate) << QStringLiteral(" [");
+        str << QDateTime::currentDateTime().toString(Qt::ISODate) << " [";
        switch (type) {
        case QtDebugMsg:
-            str << QStringLiteral("DEBUG");
+            str << "DEBUG";
            break;
        case QtInfoMsg:
-            str << QStringLiteral("INFO ");
+            str << "INFO ";
            break;
        case QtWarningMsg:
-            str << QStringLiteral("WARN ");
+            str << "WARN ";
            break;
        case QtFatalMsg:
-            str << QStringLiteral("FATAL");
+            str << "FATAL";
            break;
        case QtCriticalMsg:
-            str << QStringLiteral("CRITICAL");
+            str << "CRITICAL";
            break;
        }
-        str << QStringLiteral("] ") << context.category << QStringLiteral(": ");
+        str << "] " << context.category << ": ";
        if (context.file && *context.file && context.line) {
-            str << context.file << QStringLiteral(":") << context.line << QStringLiteral(": ");
+            str << context.file << ":" << context.line << ": ";
        }
        if (context.function && *context.function) {
-            str << context.function << QStringLiteral(": ");
+            str << context.function << ": ";
        }
-        str << message << QStringLiteral("\n");
+        str << message << "\n";
        str.flush();
        file.write(buf.constData(), buf.size());
        file.flush();
@@ -129,18 +129,18 @@ public:
        if (file.isOpen()) {
            file.close();
        }
-        const auto &filePath = QStringLiteral("%1%2%3").arg(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation), QDir::separator(), appName);
+        auto filePath = 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(QStringLiteral(".")).last().toInt();
-            auto rightIndex = right.split(QStringLiteral(".")).last().toInt();
+            auto leftIndex = left.split(".").last().toInt();
+            auto rightIndex = right.split(".").last().toInt();
            return leftIndex > rightIndex;
        });
        for (const auto &entry : entryList) {
            bool ok = false;
-            const auto index = entry.split(QStringLiteral(".")).last().toInt(&ok);
+            const auto index = entry.split(".").last().toInt(&ok);
            if (!ok) {
                continue;
            }
@@ -151,8 +151,8 @@ public:
                    file.remove();
                    continue;
                }
-                const auto &newName = QStringLiteral("%1.%2").arg(filePath, QString::number(index + 1));
-                const auto success = file.copy(newName);
+                const QString newName = filePath + QStringLiteral(".%1").arg(index + 1);
+                const bool 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(QStringLiteral("neochat.log"));
+    sInstance->setName("neochat.log");
 }

 #include "logger.moc"
--- a/src/login.cpp
+++ b/src/login.cpp
@@ -22,7 +22,7 @@ Login::Login(QObject *parent)
 void Login::init()
 {
    m_homeserverReachable = false;
-    m_connection = new NeoChatConnection();
+    m_connection = new Connection();
    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(QStringLiteral("^\\@?[a-zA-Z0-9\\._=\\-/]+\\:[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)*(\\:[0-9]+)?$"));
+        QRegularExpression validator("^\\@?[a-zA-Z0-9\\._=\\-/]+\\:[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)*(\\:[0-9]+)?$");
        if (!validator.match(m_matrixId).hasMatch()) {
            return;
        }

-        if (m_matrixId == QLatin1Char('@')) {
+        if (m_matrixId == "@") {
            return;
        }

@@ -51,7 +51,7 @@ void Login::init()
        m_testing = true;
        Q_EMIT testingChanged();
        if (!m_connection) {
-            m_connection = new NeoChatConnection();
+            m_connection = new Connection();
        }
        m_connection->resolveServer(m_matrixId);
        connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [this]() {
@@ -87,11 +87,7 @@ void Login::init()
        Q_EMIT isLoggingInChanged();
    });
    connect(m_connection, &Connection::loginError, this, [this](QString error, const QString &) {
-        if (error == QStringLiteral("Invalid username or password")) {
-            setInvalidPassword(true);
-        } else {
-            Q_EMIT errorOccured(i18n("Login Failed: %1", error));
-        }
+        Q_EMIT errorOccured(i18n("Login Failed: %1", error));
        m_isLoggingIn = false;
        Q_EMIT isLoggingInChanged();
    });
@@ -124,8 +120,8 @@ QString Login::matrixId() const
 void Login::setMatrixId(const QString &matrixId)
 {
    m_matrixId = matrixId;
-    if (!m_matrixId.startsWith(QLatin1Char('@'))) {
-        m_matrixId.prepend(QLatin1Char('@'));
+    if (!m_matrixId.startsWith('@')) {
+        m_matrixId.prepend('@');
    }
    Q_EMIT matrixIdChanged();
 }
@@ -137,7 +133,6 @@ QString Login::password() const

 void Login::setPassword(const QString &password)
 {
-    setInvalidPassword(false);
    m_password = password;
    Q_EMIT passwordChanged();
 }
@@ -160,7 +155,7 @@ void Login::login()

    // Some servers do not have a .well_known file. So we login via the username part from the mxid,
    // rather than with the full mxid, as that would lead to an invalid user.
-    auto username = m_matrixId.mid(1, m_matrixId.indexOf(QLatin1Char(':')) - 1);
+    auto username = m_matrixId.mid(1, m_matrixId.indexOf(":") - 1);
    m_connection->loginWithPassword(username, m_password, m_deviceName, QString());
 }

@@ -204,15 +199,4 @@ 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"
--- a/src/login.h
+++ b/src/login.h
@@ -6,7 +6,10 @@
 #include <QObject>
 #include <QUrl>

-class NeoChatConnection;
+namespace Quotient
+{
+class Connection;
+}

 /**
 * @class Login
@@ -70,11 +73,6 @@ 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);

@@ -102,9 +100,6 @@ public:

    bool isLoggedIn() const;

-    bool isInvalidPassword() const;
-    void setInvalidPassword(bool invalid);
-
    Q_INVOKABLE void login();
    Q_INVOKABLE void loginWithSso();

@@ -121,7 +116,6 @@ Q_SIGNALS:
    void testingChanged();
    void isLoggingInChanged();
    void isLoggedInChanged();
-    void isInvalidPasswordChanged();

 private:
    void setHomeserverReachable(bool reachable);
@@ -132,10 +126,9 @@ private:
    QString m_deviceName;
    bool m_supportsSso = false;
    bool m_supportsPassword = false;
-    NeoChatConnection *m_connection = nullptr;
+    Quotient::Connection *m_connection = nullptr;
    QUrl m_ssoUrl;
    bool m_testing = false;
    bool m_isLoggingIn = false;
    bool m_isLoggedIn = false;
-    bool m_invalidPassword = false;
 };
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,7 +3,6 @@

 #include <QCommandLineParser>
 #include <QIcon>
-#include <QNetworkDiskCache>
 #include <QNetworkProxyFactory>
 #include <QObject>
 #include <QQmlApplicationEngine>
@@ -18,10 +17,6 @@
 #include <QApplication>
 #endif

-#ifdef HAVE_WEBVIEW
-#include <QtWebView>
-#endif
-
 #include <KAboutData>
 #ifdef HAVE_KDBUSADDONS
 #include <KDBusService>
@@ -34,11 +29,10 @@

 #include "neochat-version.h"

-#include <Quotient/accountregistry.h>
 #include <Quotient/keyverificationsession.h>
+#include <Quotient/accountregistry.h>
 #include <Quotient/networkaccessmanager.h>
 #include <Quotient/room.h>
-#include <Quotient/user.h>
 #include <Quotient/util.h>

 #include "actionshandler.h"
@@ -54,6 +48,7 @@
 #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"
@@ -80,8 +75,8 @@
 #include "models/userlistmodel.h"
 #include "models/webshortcutmodel.h"
 #include "neochatconfig.h"
-#include "neochatconnection.h"
 #include "neochatroom.h"
+#include "neochatuser.h"
 #include "notificationsmanager.h"
 #include "pollhandler.h"
 #include "roommanager.h"
@@ -94,12 +89,12 @@
 #endif
 #include "models/completionmodel.h"
 #include "models/statemodel.h"
+#include "neochatuser.h"

 #ifdef HAVE_RUNNER
 #include "runner.h"
 #include <QDBusConnection>
 #endif
-#include "registration.h"

 #ifdef Q_OS_WINDOWS
 #include <Windows.h>
@@ -111,17 +106,7 @@ class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
 {
    QNetworkAccessManager *create(QObject *) override
    {
-        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;
+        return NetworkAccessManager::instance();
    }
 };

@@ -144,15 +129,11 @@ 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"_ls);
+    QIcon::setFallbackThemeName("breeze");
    QApplication app(argc, argv);
    // Default to org.kde.desktop style unless the user forces another style
    if (qEnvironmentVariableIsEmpty("QT_QUICK_CONTROLS_STYLE")) {
@@ -174,7 +155,7 @@ int main(int argc, char *argv[])
 #endif
    KLocalizedString::setApplicationDomain("neochat");

-    QGuiApplication::setOrganizationName("KDE"_ls);
+    QGuiApplication::setOrganizationName("KDE");

    KAboutData about(QStringLiteral("neochat"),
                     i18n("NeoChat"),
@@ -211,8 +192,7 @@ int main(int argc, char *argv[])
 #ifdef NEOCHAT_FLATPAK
    // Copy over the included FontConfig configuration to the
    // app's config dir:
-    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"));
+    QFile::copy("/app/etc/fonts/conf.d/99-noto-mono-color-emoji.conf", "/var/config/fontconfig/conf.d/99-noto-mono-color-emoji.conf");
 #endif

    Clipboard clipboard;
@@ -242,7 +222,6 @@ 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");
@@ -250,6 +229,7 @@ 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");
@@ -274,32 +254,34 @@ 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"_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<RoomMessageEvent>("org.kde.neochat", 1, 0, "RoomMessageEvent", "ENUM");
+    qmlRegisterUncreatableType<PushNotificationKind>("org.kde.neochat", 1, 0, "PushNotificationKind", "ENUM");
+    qmlRegisterUncreatableType<PushNotificationSection>("org.kde.neochat", 1, 0, "PushNotificationSection", "ENUM");
+    qmlRegisterUncreatableType<PushNotificationState>("org.kde.neochat", 1, 0, "PushNotificationState", "ENUM");
+    qmlRegisterUncreatableType<PushNotificationAction>("org.kde.neochat", 1, 0, "PushNotificationAction", "ENUM");
+    qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM");
+    qmlRegisterUncreatableType<NeoChatUser>("org.kde.neochat", 1, 0, "NeoChatUser", {});
    qmlRegisterUncreatableType<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<NeoChatUser *>("NeoChatUser*");
    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"_ls), "org.kde.neochat", 1, 0, "OsmLocationPlugin");
+    qmlRegisterSingletonType(QUrl("qrc:/OsmLocationPlugin.qml"), "org.kde.neochat", 1, 0, "OsmLocationPlugin");
    qmlRegisterSingletonType("org.kde.neochat", 1, 0, "LocationHelper", [](QQmlEngine *engine, QJSEngine *) -> QJSValue {
        return engine->toScriptValue(LocationHelper());
    });
@@ -342,13 +324,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"_ls, i18n("Ignore all SSL Errors, e.g., unsigned certificates.")));
+    parser.addOption(QCommandLineOption("ignore-ssl-errors", i18n("Ignore all SSL Errors, e.g., unsigned certificates.")));

    about.setupCommandLine(&parser);
    parser.process(app);
    about.processCommandLine(&parser);

-    if (parser.isSet("ignore-ssl-errors"_ls)) {
+    if (parser.isSet("ignore-ssl-errors")) {
        QObject::connect(NetworkAccessManager::instance(), &QNetworkAccessManager::sslErrors, NetworkAccessManager::instance(), [](QNetworkReply *reply) {
            reply->ignoreSslErrors();
        });
@@ -368,7 +350,7 @@ int main(int argc, char *argv[])

 #ifdef HAVE_RUNNER
    Runner runner;
-    QDBusConnection::sessionBus().registerObject("/RoomRunner"_ls, &runner, QDBusConnection::ExportScriptableContents);
+    QDBusConnection::sessionBus().registerObject("/RoomRunner", &runner, QDBusConnection::ExportScriptableContents);
 #endif

    QWindow *window = windowFromEngine(&engine);
--- a/src/matriximageprovider.cpp
+++ b/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"_ls)
+    , errorStr("Image request hasn't started")
 {
    if (requestedSize.isEmpty()) {
        requestedSize.setHeight(100);
        requestedSize.setWidth(100);
    }
-    if (mediaId.count(QLatin1Char('/')) != 1) {
+    if (mediaId.count('/') != 1) {
        if (mediaId.startsWith(QLatin1Char('/'))) {
            mediaId = mediaId.mid(1);
        } else {
--- a/src/models/accountemoticonmodel.cpp
+++ b/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();
+    m_images->images[index].url = job->contentUri().toString();
    m_images->images[index].info = none;
    QJsonObject data;
    m_images->fillJson(&data);
--- a/src/models/actionsmodel.cpp
+++ b/src/models/actionsmodel.cpp
@@ -14,10 +14,9 @@
 using Action = ActionsModel::Action;
 using namespace Quotient;

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

 auto leaveRoomLambda = [](const QString &text, NeoChatRoom *room) {
    if (text.isEmpty()) {
@@ -261,7 +260,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(":"_ls) + 1);
+            const auto knownServer = roomName.mid(roomName.indexOf(":") + 1);
            if (parts.length() >= 2) {
                RoomManager::instance().knockRoom(connection, roomName, parts[1], QStringList{knownServer});
            } else {
@@ -451,7 +450,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(QLatin1Char(' ')) : QString());
+            room->ban(parts[0], parts.size() > 1 ? parts.mid(1).join(" ") : QString());
            Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> was banned from this room.", "%1 was banned from this room.", parts[0]));
            return QString();
        },
@@ -528,7 +527,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(QLatin1Char(' ')) : QString());
+            room->kickMember(parts[0], parts.size() > 1 ? parts.mid(1).join(" ") : QString());
            Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> was kicked from this room.", "%1 was kicked from this room.", parts[0]));
            return QString();
        },
--- a/src/models/collapsestateproxymodel.cpp
+++ b/src/models/collapsestateproxymodel.cpp
@@ -0,0 +1,177 @@
+// 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"
--- a/src/models/collapsestateproxymodel.h
+++ b/src/models/collapsestateproxymodel.h
@@ -0,0 +1,80 @@
+// 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;
+};
--- a/src/models/completionmodel.cpp
+++ b/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 QStringLiteral("%1 %2").arg(m_filterModel->data(filterIndex, ActionsModel::Prefix).toString(),
-                                               m_filterModel->data(filterIndex, ActionsModel::Parameters).toString());
+            return m_filterModel->data(filterIndex, ActionsModel::Prefix).toString() + QStringLiteral(" ")
+                + m_filterModel->data(filterIndex, ActionsModel::Parameters).toString();
        }
        if (role == SubtitleRole) {
            return m_filterModel->data(filterIndex, ActionsModel::Description);
@@ -87,8 +87,7 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
            return m_filterModel->data(filterIndex, RoomListModel::CanonicalAliasRole);
        }
        if (role == IconNameRole) {
-            return QStringLiteral("mxc://%1")
-                .arg(m_roomListModel->connection()->makeMediaUrl(m_filterModel->data(filterIndex, RoomListModel::AvatarRole).toUrl()).toString());
+            return m_filterModel->data(filterIndex, RoomListModel::AvatarRole);
        }
    }
    if (m_autoCompletionType == Emoji) {
@@ -145,7 +144,7 @@ void CompletionModel::updateCompletion()
        m_filterModel->setFullText(m_fullText);
        m_filterModel->setFilterText(m_text);
        m_filterModel->invalidate();
-    } else if (text().startsWith(QLatin1Char(':')) && text().size() > 1 && !text()[1].isUpper()
+    } else if (text().startsWith(QLatin1Char(':')) && !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);
--- a/src/models/completionmodel.h
+++ b/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:
    /**
--- a/src/models/completionproxymodel.cpp
+++ b/src/models/completionproxymodel.cpp
@@ -11,11 +11,6 @@ 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
--- a/src/models/customemojimodel.cpp
+++ b/src/models/customemojimodel.cpp
@@ -21,14 +21,14 @@ void CustomEmojiModel::fetchEmojis()
        return;
    }

-    const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes"_ls);
+    const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes");
    if (data == nullptr) {
        return;
    }
-    QJsonObject emojis = data->contentJson()["images"_ls].toObject();
+    QJsonObject emojis = data->contentJson()["images"].toObject();

    // TODO: Remove with stable migration
-    const auto legacyEmojis = data->contentJson()["emoticons"_ls].toObject();
+    const auto legacyEmojis = data->contentJson()["emoticons"].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(":"_ls) ? emoji : (QStringLiteral(":") + emoji + QStringLiteral(":"));
+        const auto e = emoji.startsWith(":") ? emoji : (QStringLiteral(":") + emoji + QStringLiteral(":"));

-        m_emojis << CustomEmoji{e, data.toObject()["url"_ls].toString(), QRegularExpression(e)};
+        m_emojis << CustomEmoji{e, data.toObject()["url"].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"_ls);
+        const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes");
        auto json = data != nullptr ? data->contentJson() : QJsonObject();
-        auto emojiData = json["images"_ls].toObject();
+        auto emojiData = json["images"].toObject();

        QString url;
        url = job->contentUri().toString();

        QImage image(location.toLocalFile());
        QJsonObject imageInfo;
-        imageInfo["w"_ls] = image.width();
-        imageInfo["h"_ls] = image.height();
-        imageInfo["mimetype"_ls] = QMimeDatabase().mimeTypeForFile(location.toLocalFile()).name();
-        imageInfo["size"_ls] = image.sizeInBytes();
+        imageInfo["w"] = image.width();
+        imageInfo["h"] = image.height();
+        imageInfo["mimetype"] = QMimeDatabase().mimeTypeForFile(location.toLocalFile()).name();
+        imageInfo["size"] = 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"_ls] = emojiData;
-        Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes"_ls, json);
+        json["images"] = emojiData;
+        Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes", 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"_ls);
+    const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes");
    Q_ASSERT(data);
    auto json = data->contentJson();
    const QString _name = name.mid(1).chopped(1);
-    auto emojiData = json["images"_ls].toObject();
+    auto emojiData = json["images"].toObject();

    if (emojiData.contains(name)) {
        emojiData.remove(name);
-        json["images"_ls] = emojiData;
+        json["images"] = emojiData;
    }
    if (emojiData.contains(_name)) {
        emojiData.remove(_name);
-        json["images"_ls] = emojiData;
+        json["images"] = emojiData;
    }
-    emojiData = json["emoticons"_ls].toObject();
+    emojiData = json["emoticons"].toObject();
    if (emojiData.contains(name)) {
        emojiData.remove(name);
-        json["emoticons"_ls] = emojiData;
+        json["emoticons"] = emojiData;
    }
    if (emojiData.contains(_name)) {
        emojiData.remove(_name);
-        json["emoticons"_ls] = emojiData;
+        json["emoticons"] = emojiData;
    }
-    Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes"_ls, json);
+    Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes", 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("```"_ls);
+    auto parts = text.split("```");
    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("```"_ls);
+    return parts.join("```");
 }

 QVariantList CustomEmojiModel::filterModel(const QString &filter)
--- a/src/models/devicesmodel.cpp
+++ b/src/models/devicesmodel.cpp
@@ -5,9 +5,6 @@

 #include "controller.h"

-#include <QDateTime>
-#include <QLocale>
-
 #include <KLocalizedString>

 #include <Quotient/csapi/device_management.h>
@@ -55,12 +52,6 @@ QVariant DevicesModel::data(const QModelIndex &index, int role) const
        } else {
            return false;
        }
-    case TimestampString:
-        if (device.lastSeenTs) {
-            return QDateTime::fromMSecsSinceEpoch(*device.lastSeenTs).toString(QLocale().dateTimeFormat(QLocale::ShortFormat));
-        } else {
-            return false;
-        }
    case Type:
        if (device.deviceId == m_connection->deviceId()) {
            return This;
@@ -90,7 +81,6 @@ QHash<int, QByteArray> DevicesModel::roleNames() const
        {DisplayName, "displayName"},
        {LastIp, "lastIp"},
        {LastTimestamp, "lastTimestamp"},
-        {TimestampString, "timestamp"},
        {Type, "type"},
    };
 }
@@ -113,11 +103,11 @@ void DevicesModel::logout(const QString &deviceId, const QString &password)
        if (job->error() != BaseJob::Success) {
            QJsonObject replyData = job->jsonData();
            QJsonObject authData;
-            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;
+            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;
            auto *innerJob = Controller::instance().activeConnection()->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId, authData);
            connect(innerJob, &BaseJob::success, this, onSuccess);
        } else {
--- a/src/models/devicesmodel.h
+++ b/src/models/devicesmodel.h
@@ -40,7 +40,6 @@ public:
        DisplayName, /**< Display name set by the user for this device. */
        LastIp, /**< The IP address where this device was last seen. */
        LastTimestamp, /**< The timestamp when this devices was last seen. */
-        TimestampString, /**< String for the timestamp when this devices was last seen. */
        Type, /**< The category to sort this device into. */
    };
    Q_ENUM(Roles)
--- a/src/models/devicesproxymodel.h
+++ b/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);
--- a/src/models/emojimodel.cpp
+++ b/src/models/emojimodel.cpp
@@ -63,7 +63,7 @@ QHash<int, QByteArray> EmojiModel::roleNames() const

 QVariantList EmojiModel::history() const
 {
-    return m_settings.value(QStringLiteral("Editor/emojis"), QVariantList()).toList();
+    return m_settings.value("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(QStringLiteral("Editor/emojis"), list);
+    m_settings.setValue("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(QStringLiteral("tone"))) {
-        return EmojiTones::_tones.values(baseEmoji.split(QStringLiteral(":"))[0]);
+    if (baseEmoji.endsWith("tone")) {
+        return EmojiTones::_tones.values(baseEmoji.split(":")[0]);
    }
    return EmojiTones::_tones.values(baseEmoji);
 }
@@ -145,54 +145,54 @@ QVariantList EmojiModel::categories() const
 {
    return QVariantList{
        {QVariantMap{
-            {QStringLiteral("category"), EmojiModel::HistoryNoCustom},
-            {QStringLiteral("name"), i18nc("Previously used emojis", "History")},
-            {QStringLiteral("emoji"), QStringLiteral("⌛️")},
+            {"category", EmojiModel::HistoryNoCustom},
+            {"name", i18nc("Previously used emojis", "History")},
+            {"emoji", QStringLiteral("⌛️")},
        }},
        {QVariantMap{
-            {QStringLiteral("category"), EmojiModel::Smileys},
-            {QStringLiteral("name"), i18nc("'Smileys' is a category of emoji", "Smileys")},
-            {QStringLiteral("emoji"), QStringLiteral("😏")},
+            {"category", EmojiModel::Smileys},
+            {"name", i18nc("'Smileys' is a category of emoji", "Smileys")},
+            {"emoji", QStringLiteral("😏")},
        }},
        {QVariantMap{
-            {QStringLiteral("category"), EmojiModel::People},
-            {QStringLiteral("name"), i18nc("'People' is a category of emoji", "People")},
-            {QStringLiteral("emoji"), QStringLiteral("🙋‍♂️")},
+            {"category", EmojiModel::People},
+            {"name", i18nc("'People' is a category of emoji", "People")},
+            {"emoji", QStringLiteral("🙋‍♂️")},
        }},
        {QVariantMap{
-            {QStringLiteral("category"), EmojiModel::Nature},
-            {QStringLiteral("name"), i18nc("'Nature' is a category of emoji", "Nature")},
-            {QStringLiteral("emoji"), QStringLiteral("🌲")},
+            {"category", EmojiModel::Nature},
+            {"name", i18nc("'Nature' is a category of emoji", "Nature")},
+            {"emoji", QStringLiteral("🌲")},
        }},
        {QVariantMap{
-            {QStringLiteral("category"), EmojiModel::Food},
-            {QStringLiteral("name"), i18nc("'Food' is a category of emoji", "Food")},
-            {QStringLiteral("emoji"), QStringLiteral("🍛")},
+            {"category", EmojiModel::Food},
+            {"name", i18nc("'Food' is a category of emoji", "Food")},
+            {"emoji", QStringLiteral("🍛")},
        }},
        {QVariantMap{
-            {QStringLiteral("category"), EmojiModel::Activities},
-            {QStringLiteral("name"), i18nc("'Activities' is a category of emoji", "Activities")},
-            {QStringLiteral("emoji"), QStringLiteral("🚁")},
+            {"category", EmojiModel::Activities},
+            {"name", i18nc("'Activities' is a category of emoji", "Activities")},
+            {"emoji", QStringLiteral("🚁")},
        }},
        {QVariantMap{
-            {QStringLiteral("category"), EmojiModel::Travel},
-            {QStringLiteral("name"), i18nc("'Travel' is  a category of emoji", "Travel")},
-            {QStringLiteral("emoji"), QStringLiteral("🚅")},
+            {"category", EmojiModel::Travel},
+            {"name", i18nc("'Travel' is  a category of emoji", "Travel")},
+            {"emoji", QStringLiteral("🚅")},
        }},
        {QVariantMap{
-            {QStringLiteral("category"), EmojiModel::Objects},
-            {QStringLiteral("name"), i18nc("'Objects' is a category of emoji", "Objects")},
-            {QStringLiteral("emoji"), QStringLiteral("💡")},
+            {"category", EmojiModel::Objects},
+            {"name", i18nc("'Objects' is a category of emoji", "Objects")},
+            {"emoji", QStringLiteral("💡")},
        }},
        {QVariantMap{
-            {QStringLiteral("category"), EmojiModel::Symbols},
-            {QStringLiteral("name"), i18nc("'Symbols' is a category of emoji", "Symbols")},
-            {QStringLiteral("emoji"), QStringLiteral("🔣")},
+            {"category", EmojiModel::Symbols},
+            {"name", i18nc("'Symbols' is a category of emoji", "Symbols")},
+            {"emoji", QStringLiteral("🔣")},
        }},
        {QVariantMap{
-            {QStringLiteral("category"), EmojiModel::Flags},
-            {QStringLiteral("name"), i18nc("'Flags' is a category of emoji", "Flags")},
-            {QStringLiteral("emoji"), QStringLiteral("🏁")},
+            {"category", EmojiModel::Flags},
+            {"name", i18nc("'Flags' is a category of emoji", "Flags")},
+            {"emoji", QStringLiteral("🏁")},
        }},
    };
 }
@@ -203,15 +203,15 @@ QVariantList EmojiModel::categoriesWithCustom() const
    cats.removeAt(0);
    cats.insert(0,
                QVariantMap{
-                    {QStringLiteral("category"), EmojiModel::History},
-                    {QStringLiteral("name"), i18nc("Previously used emojis", "History")},
-                    {QStringLiteral("emoji"), QStringLiteral("⌛️")},
+                    {"category", EmojiModel::History},
+                    {"name", i18nc("Previously used emojis", "History")},
+                    {"emoji", QStringLiteral("⌛️")},
                });
    cats.insert(1,
                QVariantMap{
-                    {QStringLiteral("category"), EmojiModel::Custom},
-                    {QStringLiteral("name"), i18nc("'Custom' is a category of emoji", "Custom")},
-                    {QStringLiteral("emoji"), QStringLiteral("🖼️")},
+                    {"category", EmojiModel::Custom},
+                    {"name", i18nc("'Custom' is a category of emoji", "Custom")},
+                    {"emoji", QStringLiteral("🖼️")},
                });
    ;
    return cats;
--- a/src/models/emojimodel.h
+++ b/src/models/emojimodel.h
@@ -33,7 +33,7 @@ struct Emoji {
    {
        arch >> object.unicode;
        arch >> object.shortName;
-        object.isCustom = object.unicode.startsWith(QStringLiteral("image://"));
+        object.isCustom = object.unicode.startsWith("image://");
        return arch;
    }

--- a/src/models/imagepacksmodel.cpp
+++ b/src/models/imagepacksmodel.cpp
@@ -82,9 +82,8 @@ 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"_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")},
+        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")},
        };
        const auto &content = ImagePackEventContent(json);
        if (!content.images.isEmpty()) {
@@ -105,8 +104,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"_ls) && showEmoticons())
-                         || (packContent.pack->usage->contains("sticker"_ls) && showStickers()))
+                    if ((!packContent.pack || !packContent.pack->usage || (packContent.pack->usage->contains("emoticon") && showEmoticons())
+                         || (packContent.pack->usage->contains("sticker") && showStickers()))
                        && !packContent.images.isEmpty()) {
                        m_events += packContent;
                    }
@@ -116,12 +115,12 @@ void ImagePacksModel::reloadImages()
    }

    // Load emoticons from the current room
-    auto events = m_room->currentState().eventsOfType("im.ponies.room_emotes"_ls);
+    auto events = m_room->currentState().eventsOfType("im.ponies.room_emotes");
    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"_ls) && showEmoticons())
-                || (packContent.pack->usage->contains("sticker"_ls) && showStickers())) {
+            if (!packContent.pack->usage || (packContent.pack->usage->contains("emoticon") && showEmoticons())
+                || (packContent.pack->usage->contains("sticker") && showStickers())) {
                m_events += packContent;
            }
        }
--- a/src/models/livelocationsmodel.cpp
+++ b/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"_ls].toString();
+        return data.beaconInfo["org.matrix.msc3488.asset"_ls].toObject()["type"].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"_ls) {
+    if (event->isStateEvent() && event->matrixType() == "org.matrix.msc3672.beacon_info") {
        LiveLocationData data;
        data.senderId = event->senderId();
        data.beaconInfo = event->contentJson();
--- a/src/models/locationsmodel.cpp
+++ b/src/models/locationsmodel.cpp
@@ -3,8 +3,6 @@

 #include "locationsmodel.h"

-#include <QGuiApplication>
-
 using namespace Quotient;

 LocationsModel::LocationsModel(QObject *parent)
@@ -15,7 +13,7 @@ LocationsModel::LocationsModel(QObject *parent)
            if (!is<RoomMessageEvent>(*event)) {
                continue;
            }
-            if (event->contentJson()["msgtype"_ls] == "m.location"_ls) {
+            if (event->contentJson()["msgtype"] == "m.location") {
                const auto &e = *event;
                addLocation(eventCast<const RoomMessageEvent>(&e));
            }
@@ -25,7 +23,7 @@ LocationsModel::LocationsModel(QObject *parent)
                if (!is<RoomMessageEvent>(*event)) {
                    continue;
                }
-                if (event->contentJson()["msgtype"_ls] == "m.location"_ls) {
+                if (event->contentJson()["msgtype"] == "m.location") {
                    const auto &e = *event;
                    addLocation(eventCast<const RoomMessageEvent>(&e));
                }
@@ -36,7 +34,7 @@ LocationsModel::LocationsModel(QObject *parent)
                if (!is<RoomMessageEvent>(*event)) {
                    continue;
                }
-                if (event->contentJson()["msgtype"_ls] == "m.location"_ls) {
+                if (event->contentJson()["msgtype"] == "m.location") {
                    const auto &e = *event;
                    addLocation(eventCast<const RoomMessageEvent>(&e));
                }
@@ -45,15 +43,11 @@ LocationsModel::LocationsModel(QObject *parent)
    });

    connect(this, &LocationsModel::rowsInserted, this, &LocationsModel::boundingBoxChanged);
-
-    connect(static_cast<QGuiApplication *>(QGuiApplication::instance()), &QGuiApplication::paletteChanged, this, [this] {
-        Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {AuthorRole});
-    });
 }

 void LocationsModel::addLocation(const RoomMessageEvent *event)
 {
-    const auto uri = event->contentJson()["org.matrix.msc3488.location"_ls]["uri"_ls].toString();
+    const auto uri = event->contentJson()["org.matrix.msc3488.location"]["uri"].toString();
    const auto parts = uri.mid(4).split(QLatin1Char(','));
    if (parts.size() < 2) {
        qWarning() << "invalid geo: URI" << uri;
@@ -67,7 +61,7 @@ void LocationsModel::addLocation(const RoomMessageEvent *event)
        .latitude = latitude,
        .longitude = longitude,
        .content = event->contentJson(),
-        .author = m_room->user(event->senderId()),
+        .author = dynamic_cast<NeoChatUser *>(m_room->user(event->senderId())),
    };
    endInsertRows();
 }
--- a/src/models/locationsmodel.h
+++ b/src/models/locationsmodel.h
@@ -10,7 +10,6 @@
 #include "neochatroom.h"

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

 class LocationsModel : public QAbstractListModel
 {
@@ -52,7 +51,7 @@ private:
        float latitude;
        float longitude;
        QJsonObject content;
-        Quotient::User *author;
+        NeoChatUser *author;
    };
    QList<LocationData> m_locations;
    void addLocation(const Quotient::RoomMessageEvent *event);
--- a/src/models/mediamessagefiltermodel.cpp
+++ b/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()[QStringLiteral("source")].toUrl();
+            return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()["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()[QStringLiteral("tempInfo")].toMap()[QStringLiteral("source")].toUrl();
+        return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()["tempInfo"].toMap()["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()[QStringLiteral("width")].toFloat();
+        return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()["width"].toFloat();
    }
    if (role == SourceHeightRole) {
-        return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QStringLiteral("height")].toFloat();
+        return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()["height"].toFloat();
    }

    return sourceModel()->data(mapToSource(index), role);
--- a/src/models/mediamessagefiltermodel.h
+++ b/src/models/mediamessagefiltermodel.h
@@ -5,7 +5,7 @@

 #include <QSortFilterProxyModel>

-#include "models/messagefiltermodel.h"
+#include "models/collapsestateproxymodel.h"

 /**
 * @class MediaMessageFilterModel
@@ -22,7 +22,7 @@ public:
     * @brief Defines the model roles.
     */
    enum Roles {
-        SourceRole = MessageFilterModel::LastRole + 1, /**< The mxc source URL for the item. */
+        SourceRole = CollapseStateProxyModel::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. */
--- a/src/models/messageeventmodel.cpp
+++ b/src/models/messageeventmodel.cpp
@@ -20,12 +20,12 @@

 #include <QDebug>
 #include <QGuiApplication>
-#include <QMovie>
 #include <QTimeZone>

 #include <KLocalizedString>

 #include "models/reactionmodel.h"
+#include "neochatuser.h"
 #include "texthandler.h"

 using namespace Quotient;
@@ -78,7 +78,7 @@ MessageEventModel::MessageEventModel(QObject *parent)
    : QAbstractListModel(parent)
 {
    connect(static_cast<QGuiApplication *>(QGuiApplication::instance()), &QGuiApplication::paletteChanged, this, [this] {
-        Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {AuthorRole, ReplyAuthor, ReadMarkersRole});
+        Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {AuthorRole, ReplyRole});
    });
 }

@@ -531,7 +531,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
    }

    if (role == AuthorRole) {
-        auto author = isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId());
+        auto author = static_cast<NeoChatUser *>(isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId()));
        return m_currentRoom->getUser(author);
    }

@@ -579,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"_ls)) {
+            if (evt.contentJson().contains("m.new_content")) {
                return EventStatus::Hidden;
            }
            return pendingIt->deliveryStatus();
@@ -668,18 +668,18 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
    }

    if (role == IsReplyRole) {
-        return !evt.contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString().isEmpty();
+        return !evt.contentJson()["m.relates_to"].toObject()["m.in_reply_to"].toObject()["event_id"].toString().isEmpty();
    }

    if (role == ReplyIdRole) {
-        return evt.contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString();
+        return evt.contentJson()["m.relates_to"].toObject()["m.in_reply_to"].toObject()["event_id"].toString();
    }

    if (role == ReplyAuthor) {
        auto replyPtr = m_currentRoom->getReplyForEvent(evt);

        if (replyPtr) {
-            auto replyUser = m_currentRoom->user(replyPtr->senderId());
+            auto replyUser = static_cast<NeoChatUser *>(m_currentRoom->user(replyPtr->senderId()));
            return m_currentRoom->getUser(replyUser);
        } else {
            return m_currentRoom->getUser(nullptr);
@@ -733,8 +733,8 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        }

        return QVariantMap{
-            {"display"_ls, m_currentRoom->eventToString(*replyPtr, Qt::RichText)},
-            {"type"_ls, type},
+            {"display", m_currentRoom->eventToString(*replyPtr, Qt::RichText)},
+            {"type", type},
        };
    }

@@ -789,7 +789,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
    }

    if (role == AssetRole) {
-        const auto assetType = evt.contentJson()["org.matrix.msc3488.asset"_ls].toObject()["type"_ls].toString();
+        const auto assetType = evt.contentJson()["org.matrix.msc3488.asset"].toObject()["type"].toString();
        if (assetType.isEmpty()) {
            return {};
        }
@@ -808,7 +808,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        QVariantList users;
        users.reserve(userIds.size());
        for (const auto &userId : userIds) {
-            auto user = m_currentRoom->user(userId);
+            auto user = static_cast<NeoChatUser *>(m_currentRoom->user(userId));
            users += m_currentRoom->getUser(user);
        }

@@ -820,7 +820,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        userIds.remove(m_currentRoom->localUser()->id());

        if (userIds.count() > 5) {
-            return QStringLiteral("+ %1").arg(userIds.count() - 5);
+            return QStringLiteral("+ ") + QString::number(userIds.count() - 5);
        } else {
            return QString();
        }
@@ -836,7 +836,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         */
        QString readMarkersString = i18np("1 user: ", "%1 users: ", userIds.size());
        for (const auto &userId : userIds) {
-            auto user = m_currentRoom->user(userId);
+            auto user = static_cast<NeoChatUser *>(m_currentRoom->user(userId));
            readMarkersString += user->displayname(m_currentRoom) + i18nc("list separator", ", ");
        }
        readMarkersString.chop(2);
@@ -866,28 +866,30 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
    }

    if (role == VerifiedRole) {
+#ifdef Quotient_E2EE_ENABLED
        if (evt.originalEvent()) {
            auto encrypted = dynamic_cast<const EncryptedEvent *>(evt.originalEvent());
            Q_ASSERT(encrypted);
            return m_currentRoom->connection()->isVerifiedSession(encrypted->sessionId().toLatin1());
        }
+#endif
        return false;
    }

    if (role == DisplayNameForInitialsRole) {
-        auto user = isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId());
+        auto user = static_cast<NeoChatUser *>(isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId()));
        return user->displayname(m_currentRoom).remove(QStringLiteral(" (%1)").arg(user->id()));
    }

    if (role == AuthorDisplayNameRole) {
-        if (is<RoomMemberEvent>(evt) && !evt.unsignedJson()["prev_content"_ls]["displayname"_ls].isNull() && evt.stateKey() == evt.senderId()) {
-            auto previousDisplayName = evt.unsignedJson()["prev_content"_ls]["displayname"_ls].toString().toHtmlEscaped();
+        if (is<RoomMemberEvent>(evt) && !evt.unsignedJson()["prev_content"]["displayname"].isNull() && evt.stateKey() == evt.senderId()) {
+            auto previousDisplayName = evt.unsignedJson()["prev_content"]["displayname"].toString().toHtmlEscaped();
            if (previousDisplayName.isEmpty()) {
                previousDisplayName = evt.senderId();
            }
            return previousDisplayName;
        } else {
-            auto author = isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId());
+            auto author = static_cast<NeoChatUser *>(isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId()));
            return m_currentRoom->htmlSafeMemberName(author->id());
        }
    }
@@ -943,79 +945,76 @@ QVariantMap MessageEventModel::getMediaInfoFromFileInfo(const EventContent::File

    // Get the mxc URL for the media.
    if (!fileInfo->url().isValid() || eventId.isEmpty()) {
-        mediaInfo["source"_ls] = QUrl();
+        mediaInfo["source"] = QUrl();
    } else {
        QUrl source = m_currentRoom->makeMediaUrl(eventId, fileInfo->url());

        if (source.isValid() && source.scheme() == QStringLiteral("mxc")) {
-            mediaInfo["source"_ls] = source;
+            mediaInfo["source"] = source;
        } else {
-            mediaInfo["source"_ls] = QUrl();
+            mediaInfo["source"] = QUrl();
        }
    }

    auto mimeType = fileInfo->mimeType;
    // Add the MIME type for the media if available.
-    mediaInfo["mimeType"_ls] = mimeType.name();
+    mediaInfo["mimeType"] = mimeType.name();

    // Add the MIME type icon if available.
-    mediaInfo["mimeIcon"_ls] = mimeType.iconName();
+    mediaInfo["mimeIcon"] = mimeType.iconName();

    // Add media size if available.
-    mediaInfo["size"_ls] = fileInfo->payloadSize;
+    mediaInfo["size"] = 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"_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());
+            mediaInfo["width"] = castInfo->imageSize.width();
+            mediaInfo["height"] = castInfo->imageSize.height();

            if (!isThumbnail) {
                QVariantMap tempInfo;
                auto thumbnailInfo = getMediaInfoFromFileInfo(castInfo->thumbnailInfo(), eventId, true);
-                if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
+                if (thumbnailInfo["source"].toUrl().scheme() == "mxc") {
                    tempInfo = thumbnailInfo;
                } else {
-                    QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"_ls].toString();
+                    QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"].toString();
                    if (blurhash.isEmpty()) {
-                        tempInfo["source"_ls] = QUrl();
+                        tempInfo["source"] = QUrl();
                    } else {
-                        tempInfo["source"_ls] = QUrl("image://blurhash/"_ls + blurhash);
+                        tempInfo["source"] = QUrl("image://blurhash/" + blurhash);
                    }
                }
-                mediaInfo["tempInfo"_ls] = tempInfo;
+                mediaInfo["tempInfo"] = tempInfo;
            }
        }
    }
    if (mimeType.name().contains(QStringLiteral("video"))) {
        if (auto castInfo = static_cast<const EventContent::VideoContent *>(fileInfo)) {
-            mediaInfo["width"_ls] = castInfo->imageSize.width();
-            mediaInfo["height"_ls] = castInfo->imageSize.height();
-            mediaInfo["duration"_ls] = castInfo->duration;
+            mediaInfo["width"] = castInfo->imageSize.width();
+            mediaInfo["height"] = castInfo->imageSize.height();
+            mediaInfo["duration"] = castInfo->duration;

            if (!isThumbnail) {
                QVariantMap tempInfo;
                auto thumbnailInfo = getMediaInfoFromFileInfo(castInfo->thumbnailInfo(), eventId, true);
-                if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
+                if (thumbnailInfo["source"].toUrl().scheme() == "mxc") {
                    tempInfo = thumbnailInfo;
                } else {
-                    QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"_ls].toString();
+                    QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"].toString();
                    if (blurhash.isEmpty()) {
-                        tempInfo["source"_ls] = QUrl();
+                        tempInfo["source"] = QUrl();
                    } else {
-                        tempInfo["source"_ls] = QUrl("image://blurhash/"_ls + blurhash);
+                        tempInfo["source"] = QUrl("image://blurhash/" + blurhash);
                    }
                }
-                mediaInfo["tempInfo"_ls] = tempInfo;
+                mediaInfo["tempInfo"] = tempInfo;
            }
        }
    }
    if (mimeType.name().contains(QStringLiteral("audio"))) {
        if (auto castInfo = static_cast<const EventContent::AudioContent *>(fileInfo)) {
-            mediaInfo["duration"_ls] = castInfo->duration;
+            mediaInfo["duration"] = castInfo->duration;
        }
    }

@@ -1063,13 +1062,13 @@ void MessageEventModel::createReactionModelForEvent(const Quotient::RoomMessageE
        return;
    };

-    QMap<QString, QList<Quotient::User *>> reactions = {};
+    QMap<QString, QList<NeoChatUser *>> reactions = {};
    for (const auto &a : annotations) {
        if (a->isRedacted()) { // Just in case?
            continue;
        }
        if (const auto &e = eventCast<const ReactionEvent>(a)) {
-            reactions[e->key()].append(m_currentRoom->user(e->senderId()));
+            reactions[e->key()].append(static_cast<NeoChatUser *>(m_currentRoom->user(e->senderId())));
        }
    }

@@ -1096,7 +1095,7 @@ void MessageEventModel::createReactionModelForEvent(const Quotient::RoomMessageE
    if (m_reactionModels.contains(eventId)) {
        m_reactionModels[eventId]->setReactions(res);
    } else if (res.size() > 0) {
-        m_reactionModels[eventId] = new ReactionModel(this, res, m_currentRoom->localUser());
+        m_reactionModels[eventId] = new ReactionModel(this, res, static_cast<NeoChatUser *>(m_currentRoom->localUser()));
    } else {
        if (m_reactionModels.contains(eventId)) {
            delete m_reactionModels[eventId];
--- a/src/models/messagefiltermodel.cpp
+++ b/src/models/messagefiltermodel.cpp
@@ -3,8 +3,6 @@

 #include "messagefiltermodel.h"

-#include <KLocalizedString>
-
 #include "messageeventmodel.h"
 #include "neochatconfig.h"

@@ -34,192 +32,22 @@ 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) {
+    if (eventType == MessageEventModel::Other) {
        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"
--- a/src/models/messagefiltermodel.h
+++ b/src/models/messagefiltermodel.h
@@ -5,79 +5,21 @@

 #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;
 };
--- a/src/models/publicroomlistmodel.cpp
+++ b/src/models/publicroomlistmodel.cpp
@@ -25,7 +25,7 @@ void PublicRoomListModel::setConnection(Connection *conn)

    beginResetModel();

-    nextBatch = QString();
+    nextBatch = "";
    attempted = false;
    rooms.clear();
    m_server.clear();
@@ -41,7 +41,6 @@ void PublicRoomListModel::setConnection(Connection *conn)
    if (job) {
        job->abandon();
        job = nullptr;
-        Q_EMIT loadingChanged();
    }

    if (m_connection) {
@@ -68,17 +67,15 @@ void PublicRoomListModel::setServer(const QString &value)

    beginResetModel();

-    nextBatch = QString();
+    nextBatch = "";
    attempted = false;
    rooms.clear();
-    Q_EMIT loadingChanged();

    endResetModel();

    if (job) {
        job->abandon();
        job = nullptr;
-        Q_EMIT loadingChanged();
    }

    if (m_connection) {
@@ -104,7 +101,7 @@ void PublicRoomListModel::setKeyword(const QString &value)

    beginResetModel();

-    nextBatch = QString();
+    nextBatch = "";
    attempted = false;
    rooms.clear();

@@ -113,7 +110,6 @@ void PublicRoomListModel::setKeyword(const QString &value)
    if (job) {
        job->abandon();
        job = nullptr;
-        Q_EMIT loadingChanged();
    }

    if (m_connection) {
@@ -137,7 +133,6 @@ 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;
@@ -155,7 +150,6 @@ void PublicRoomListModel::next(int count)
        }

        this->job = nullptr;
-        Q_EMIT loadingChanged();
    });
 }

@@ -192,7 +186,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);
    }
@@ -259,9 +253,4 @@ bool PublicRoomListModel::hasMore() const
    return !(attempted && nextBatch.isEmpty());
 }

-bool PublicRoomListModel::loading() const
-{
-    return job != nullptr;
-}
-
 #include "moc_publicroomlistmodel.cpp"
--- a/src/models/publicroomlistmodel.h
+++ b/src/models/publicroomlistmodel.h
@@ -48,11 +48,6 @@ 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.
@@ -103,8 +98,6 @@ public:

    [[nodiscard]] bool hasMore() const;

-    [[nodiscard]] bool loading() const;
-
    /**
     * @brief Load the next set of rooms.
     *
@@ -118,7 +111,6 @@ private:
    QString m_keyword;

    bool attempted = false;
-    bool m_loading = false;
    QString nextBatch;

    QVector<Quotient::PublicRoomsChunk> rooms;
@@ -130,5 +122,4 @@ Q_SIGNALS:
    void serverChanged();
    void keywordChanged();
    void hasMoreChanged();
-    void loadingChanged();
 };
--- a/src/models/pushrulemodel.cpp
+++ b/src/models/pushrulemodel.cpp
@@ -69,20 +69,18 @@ PushRuleModel::PushRuleModel(QObject *parent)

 void PushRuleModel::controllerConnectionChanged()
 {
-    if (Controller::instance().activeConnection()) {
-        connect(Controller::instance().activeConnection(), &Quotient::Connection::accountDataChanged, this, &PushRuleModel::updateNotificationRules);
-        updateNotificationRules(QStringLiteral("m.push_rules"));
-    }
+    connect(Controller::instance().activeConnection(), &Quotient::Connection::accountDataChanged, this, &PushRuleModel::updateNotificationRules);
+    updateNotificationRules("m.push_rules");
 }

 void PushRuleModel::updateNotificationRules(const QString &type)
 {
-    if (type != QStringLiteral("m.push_rules")) {
+    if (type != "m.push_rules") {
        return;
    }

-    const QJsonObject ruleDataJson = Controller::instance().activeConnection()->accountDataJson(QStringLiteral("m.push_rules"));
-    const Quotient::PushRuleset ruleData = Quotient::fromJson<Quotient::PushRuleset>(ruleDataJson[QStringLiteral("global")].toObject());
+    const QJsonObject ruleDataJson = Controller::instance().activeConnection()->accountDataJson("m.push_rules");
+    const Quotient::PushRuleset ruleData = Quotient::fromJson<Quotient::PushRuleset>(ruleDataJson["global"].toObject());

    beginResetModel();
    m_rules.clear();
@@ -203,7 +201,7 @@ bool PushRuleModel::globalNotificationsEnabled() const

 void PushRuleModel::setGlobalNotificationsEnabled(bool enabled)
 {
-    setNotificationRuleEnabled(QStringLiteral("override"), QStringLiteral(".m.rule.master"), !enabled);
+    setNotificationRuleEnabled("override", ".m.rule.master", !enabled);
 }

 bool PushRuleModel::globalNotificationsSet() const
@@ -304,26 +302,26 @@ void PushRuleModel::addKeyword(const QString &keyword, const QString &roomId)
        kind = PushNotificationKind::Override;

        Quotient::PushCondition roomCondition;
-        roomCondition.kind = QStringLiteral("event_match");
-        roomCondition.key = QStringLiteral("room_id");
+        roomCondition.kind = "event_match";
+        roomCondition.key = "room_id";
        roomCondition.pattern = roomId;
        pushConditions.append(roomCondition);

        Quotient::PushCondition keywordCondition;
-        keywordCondition.kind = QStringLiteral("event_match");
-        keywordCondition.key = QStringLiteral("content.body");
+        keywordCondition.kind = "event_match";
+        keywordCondition.key = "content.body";
        keywordCondition.pattern = keyword;
        pushConditions.append(keywordCondition);
    }

-    auto job = Controller::instance().activeConnection()->callApi<Quotient::SetPushRuleJob>(QLatin1String("global"),
+    auto job = Controller::instance().activeConnection()->callApi<Quotient::SetPushRuleJob>("global",
                                                                                            PushNotificationKind::kindString(kind),
                                                                                            keyword,
                                                                                            actions,
-                                                                                            QString(),
-                                                                                            QString(),
+                                                                                            QLatin1String(""),
+                                                                                            QLatin1String(""),
                                                                                            pushConditions,
-                                                                                            roomId.isEmpty() ? keyword : QString());
+                                                                                            roomId.isEmpty() ? keyword : QLatin1String(""));
    connect(job, &Quotient::BaseJob::failure, this, [job, keyword]() {
        qWarning() << QLatin1String("Unable to set push rule for keyword %1: ").arg(keyword) << job->errorString();
    });
@@ -342,7 +340,7 @@ void PushRuleModel::removeKeyword(const QString &keyword)
    }

    auto kind = PushNotificationKind::kindString(m_rules[index].kind);
-    auto job = Controller::instance().activeConnection()->callApi<Quotient::DeletePushRuleJob>(QStringLiteral("global"), kind, m_rules[index].id);
+    auto job = Controller::instance().activeConnection()->callApi<Quotient::DeletePushRuleJob>("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();
    });
@@ -350,10 +348,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>(QStringLiteral("global"), kind, ruleId);
+    auto job = Controller::instance().activeConnection()->callApi<Quotient::IsPushRuleEnabledJob>("global", kind, ruleId);
    connect(job, &Quotient::BaseJob::success, this, [job, kind, ruleId, enabled]() {
        if (job->enabled() != enabled) {
-            Controller::instance().activeConnection()->callApi<Quotient::SetPushRuleEnabledJob>(QStringLiteral("global"), kind, ruleId, enabled);
+            Controller::instance().activeConnection()->callApi<Quotient::SetPushRuleEnabledJob>("global", kind, ruleId, enabled);
        }
    });
 }
@@ -361,13 +359,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 == QStringLiteral(".m.rule.call")) {
-        actions = actionToVariant(action, QStringLiteral("ring"));
+    if (ruleId == ".m.rule.call") {
+        actions = actionToVariant(action, "ring");
    } else {
        actions = actionToVariant(action);
    }

-    Controller::instance().activeConnection()->callApi<Quotient::SetPushRuleActionsJob>(QStringLiteral("global"), kind, ruleId, actions);
+    Controller::instance().activeConnection()->callApi<Quotient::SetPushRuleActionsJob>("global", kind, ruleId, actions);
 }

 PushNotificationAction::Action PushRuleModel::variantToAction(const QVector<QVariant> &actions, bool enabled)
@@ -385,10 +383,10 @@ PushNotificationAction::Action PushRuleModel::variantToAction(const QVector<QVar
        }

        QJsonObject action = i.toJsonObject();
-        if (action[QStringLiteral("set_tweak")].toString() == QStringLiteral("sound")) {
+        if (action["set_tweak"].toString() == "sound") {
            isNoisy = true;
-        } else if (action[QStringLiteral("set_tweak")].toString() == QStringLiteral("highlight")) {
-            if (action[QStringLiteral("value")].toString() != QStringLiteral("false")) {
+        } else if (action["set_tweak"].toString() == "highlight") {
+            if (action["value"].toString() != "false") {
                highlightEnabled = true;
            }
        }
@@ -425,19 +423,19 @@ QVector<QVariant> PushRuleModel::actionToVariant(PushNotificationAction::Action
    QVector<QVariant> actions;

    if (action != PushNotificationAction::Off) {
-        actions.append(QStringLiteral("notify"));
+        actions.append("notify");
    } else {
-        actions.append(QStringLiteral("dont_notify"));
+        actions.append("dont_notify");
    }
    if (action == PushNotificationAction::Noisy || action == PushNotificationAction::NoisyHighlight) {
        QJsonObject soundTweak;
-        soundTweak.insert(QStringLiteral("set_tweak"), QStringLiteral("sound"));
-        soundTweak.insert(QStringLiteral("value"), sound);
+        soundTweak.insert("set_tweak", "sound");
+        soundTweak.insert("value", sound);
        actions.append(soundTweak);
    }
    if (action == PushNotificationAction::Highlight || action == PushNotificationAction::NoisyHighlight) {
        QJsonObject highlightTweak;
-        highlightTweak.insert(QStringLiteral("set_tweak"), QStringLiteral("highlight"));
+        highlightTweak.insert("set_tweak", "highlight");
        actions.append(highlightTweak);
    }

--- a/src/models/pushrulemodel.h
+++ b/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 = QStringLiteral("default"));
+    QVector<QVariant> actionToVariant(PushNotificationAction::Action action, const QString &sound = "default");
 };
 Q_DECLARE_METATYPE(PushRuleModel *)
--- a/src/models/reactionmodel.cpp
+++ b/src/models/reactionmodel.cpp
@@ -7,9 +7,9 @@

 #include <KLocalizedString>

-#include <Quotient/user.h>
+#include "neochatuser.h"

-ReactionModel::ReactionModel(QObject *parent, QList<Reaction> reactions, Quotient::User *localUser)
+ReactionModel::ReactionModel(QObject *parent, QList<Reaction> reactions, NeoChatUser *localUser)
    : QAbstractListModel(parent)
    , m_localUser(localUser)
 {
@@ -31,7 +31,7 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const

    if (role == TextRole) {
        if (reaction.authors.count() > 1) {
-            return QStringLiteral("%1  %2").arg(reaction.reaction, QString::number(reaction.authors.count()));
+            return reaction.reaction + QStringLiteral("  %1").arg(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()[QStringLiteral("displayName")].toString();
+            text += reaction.authors.at(i).toMap()["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()[QStringLiteral("id")] == m_localUser->id()) {
+            if (author.toMap()["id"] == m_localUser->id()) {
                return true;
            }
        }
--- a/src/models/reactionmodel.h
+++ b/src/models/reactionmodel.h
@@ -5,10 +5,7 @@

 #include <QAbstractListModel>

-namespace Quotient
-{
-class User;
-}
+class NeoChatUser;

 /**
 * @class ReactionModel
@@ -39,7 +36,7 @@ public:
        HasLocalUser, /**< Whether the local user is in the list of authors. */
    };

-    explicit ReactionModel(QObject *parent = nullptr, QList<Reaction> reactions = {}, Quotient::User *localUser = nullptr);
+    explicit ReactionModel(QObject *parent = nullptr, QList<Reaction> reactions = {}, NeoChatUser *localUser = nullptr);

    /**
     * @brief Get the given role value at the given index.
@@ -70,6 +67,6 @@ public:
 private:
    QList<Reaction> m_reactions;

-    Quotient::User *m_localUser;
+    NeoChatUser *m_localUser;
 };
 Q_DECLARE_METATYPE(ReactionModel *)
--- a/src/models/roomlistmodel.cpp
+++ b/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"_ls;
+        const auto launcherUrl = "application://org.kde.neochat.desktop";
        // Gnome requires that count is a 64bit integer
        const qint64 counterSlice = std::min(m_notificationCount, 9999);
        QVariantMap dbusUnityProperties;

        if (counterSlice > 0) {
-            dbusUnityProperties["count"_ls] = counterSlice;
-            dbusUnityProperties["count-visible"_ls] = true;
+            dbusUnityProperties["count"] = counterSlice;
+            dbusUnityProperties["count-visible"] = true;
        } else {
-            dbusUnityProperties["count-visible"_ls] = false;
+            dbusUnityProperties["count-visible"] = false;
        }

-        auto signal = QDBusMessage::createSignal("/com/canonical/unity/launcherentry/neochat"_ls, "com.canonical.Unity.LauncherEntry"_ls, "Update"_ls);
+        auto signal = QDBusMessage::createSignal("/com/canonical/unity/launcherentry/neochat", "com.canonical.Unity.LauncherEntry", "Update");

        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"_ls);
+        QJsonObject::const_iterator typeIter = contentJson.find("type");
        if (typeIter != contentJson.end()) {
-            if (typeIter.value().toString() == "m.space"_ls) {
+            if (typeIter.value().toString() == "m.space") {
                return NeoChatRoomType::Space;
            }
        }
@@ -400,7 +400,7 @@ QString RoomListModel::categoryName(int category)
    case NeoChatRoomType::Space:
        return i18n("Spaces");
    default:
-        return {};
+        return "Deadbeef";
    }
 }

--- a/src/models/roomlistmodel.h
+++ b/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);

--- a/src/models/searchmodel.cpp
+++ b/src/models/searchmodel.cpp
@@ -5,14 +5,13 @@

 #include "messageeventmodel.h"
 #include "neochatroom.h"
-
-#include <QGuiApplication>
-
-#include <Quotient/connection.h>
+#include "neochatuser.h"
 #include <Quotient/events/stickerevent.h>

 #include <KLocalizedString>

+#include <Quotient/connection.h>
+
 using namespace Quotient;

 // TODO search only in the current room
@@ -20,9 +19,6 @@ using namespace Quotient;
 SearchModel::SearchModel(QObject *parent)
    : QAbstractListModel(parent)
 {
-    connect(static_cast<QGuiApplication *>(QGuiApplication::instance()), &QGuiApplication::paletteChanged, this, [this] {
-        Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {AuthorRole, ReadMarkersRole});
-    });
 }

 QString SearchModel::searchText() const
@@ -57,7 +53,7 @@ void SearchModel::search()
        .searchTerm = m_searchText,
        .keys = {},
        .filter = filter,
-        .orderBy = "recent"_ls,
+        .orderBy = "recent",
        .eventContext = SearchJob::IncludeEventContext{3, 3, true},
        .includeState = false,
        .groupings = none,
@@ -113,7 +109,7 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
        return false;
    case ReplyAuthorRole:
        if (const auto &replyPtr = m_room->getReplyForEvent(event)) {
-            return m_room->getUser(m_room->user(replyPtr->senderId()));
+            return m_room->getUser(static_cast<NeoChatUser *>(m_room->user(replyPtr->senderId())));
        } else {
            return m_room->getUser(nullptr);
        }
@@ -157,8 +153,8 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
            }

            return QVariantMap{
-                {"display"_ls, m_room->eventToString(*replyPtr, Qt::RichText)},
-                {"type"_ls, type},
+                {"display", m_room->eventToString(*replyPtr, Qt::RichText)},
+                {"type", type},
            };
        }
    case IsPendingRole:
@@ -166,13 +162,13 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
    case ShowLinkPreviewRole:
        return false;
    case IsReplyRole:
-        return !event.contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString().isEmpty();
+        return !event.contentJson()["m.relates_to"].toObject()["m.in_reply_to"].toObject()["event_id"].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"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString();
+        return event.contentJson()["m.relates_to"].toObject()["m.in_reply_to"].toObject()["event_id"].toString();
    }
    return MessageEventModel::DelegateType::Message;
 }
@@ -261,7 +257,7 @@ QString renderDate(const QDateTime &timestamp)
        return i18n("The day before yesterday");
    }
    if (date > QDate::currentDate().addDays(-7)) {
-        return date.toString("dddd"_ls);
+        return date.toString("dddd");
    }

    return QLocale::system().toString(date, QLocale::ShortFormat);
--- a/src/models/serverlistmodel.cpp
+++ b/src/models/serverlistmodel.cpp
@@ -15,8 +15,8 @@
 ServerListModel::ServerListModel(QObject *parent)
    : QAbstractListModel(parent)
 {
-    KConfig dataResource(QStringLiteral("data"), KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
-    KConfigGroup serverGroup(&dataResource, QStringLiteral("Servers"));
+    KConfig dataResource("data", KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
+    KConfigGroup serverGroup(&dataResource, "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(QStringLiteral("data"), KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
-    KConfigGroup serverGroup(&dataResource, QStringLiteral("Servers"));
+    KConfig dataResource("data", KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
+    KConfigGroup serverGroup(&dataResource, "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(QStringLiteral("data"), KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
-    KConfigGroup serverGroup(&dataResource, QStringLiteral("Servers"));
+    KConfig dataResource("data", KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
+    KConfigGroup serverGroup(&dataResource, "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(QStringLiteral("data"), KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
-    KConfigGroup serverGroup(&dataResource, QStringLiteral("Servers"));
+    KConfig dataResource("data", KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
+    KConfigGroup serverGroup(&dataResource, "Servers");
    serverGroup.deleteEntry(data(index(row), UrlRole).toString());

    beginRemoveRows(QModelIndex(), row, row);
--- a/src/models/sortfilterroomlistmodel.cpp
+++ b/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() != QStringLiteral("upgraded")
+        && sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::JoinStateRole).toString() != "upgraded"
        && sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::IsSpaceRole).toBool() == false;

    if (m_activeSpaceId.isEmpty()) {
--- a/src/models/sortfilterspacelistmodel.cpp
+++ b/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() != QStringLiteral("upgraded")
+        && sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::JoinStateRole).toString() != "upgraded"
        && !sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::IsChildSpaceRole).toBool();
 }

--- a/src/models/stickermodel.cpp
+++ b/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"_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;
+        infoJson["w"] = image.info->imageSize.width();
+        infoJson["h"] = image.info->imageSize.height();
+        infoJson["mimetype"] = image.info->mimeType.name();
+        infoJson["size"] = 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"_ls, content);
+    m_room->postJson("m.sticker", content);
 }

 #include "moc_stickermodel.cpp"
--- a/src/models/userdirectorylistmodel.cpp
+++ b/src/models/userdirectorylistmodel.cpp
@@ -138,7 +138,7 @@ QVariant UserDirectoryListModel::data(const QModelIndex &index, int role) const
            return displayName;
        }

-        return QStringLiteral("Unknown User");
+        return "Unknown User";
    }
    if (role == AvatarRole) {
        auto avatarUrl = user.avatarUrl;
--- a/src/models/userlistmodel.cpp
+++ b/src/models/userlistmodel.cpp
@@ -3,8 +3,6 @@

 #include "userlistmodel.h"

-#include <QGuiApplication>
-
 #include <Quotient/connection.h>
 #include <Quotient/events/roompowerlevelsevent.h>

@@ -16,9 +14,6 @@ UserListModel::UserListModel(QObject *parent)
    : QAbstractListModel(parent)
    , m_currentRoom(nullptr)
 {
-    connect(static_cast<QGuiApplication *>(QGuiApplication::instance()), &QGuiApplication::paletteChanged, this, [this]() {
-        refreshAllUsers();
-    });
 }

 void UserListModel::setRoom(NeoChatRoom *room)
@@ -76,7 +71,8 @@ QVariant UserListModel::data(const QModelIndex &index, int role) const
        return user->id();
    }
    if (role == AvatarRole) {
-        return m_currentRoom->avatarForMember(user);
+        auto neoChatUser = static_cast<NeoChatUser *>(user);
+        return m_currentRoom->avatarForMember(neoChatUser);
    }
    if (role == ObjectRole) {
        return QVariant::fromValue(user);
@@ -163,19 +159,17 @@ void UserListModel::refreshAllUsers()
    }
    m_users.clear();

-    if (m_currentRoom != nullptr) {
-        m_users = m_currentRoom->users();
-        std::sort(m_users.begin(), m_users.end(), m_currentRoom->memberSorter());
+    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});
-            });
-        }
-        connect(m_currentRoom->connection(), &Connection::loggedOut, this, [this]() {
-            setRoom(nullptr);
+    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);
+    });
    endResetModel();
    Q_EMIT usersRefreshed();
 }
--- a/src/models/webshortcutmodel.cpp
+++ b/src/models/webshortcutmodel.cpp
@@ -62,7 +62,7 @@ void KWebShortcutModel::setSelectedText(const QString &selectedText)
    }

    QString searchText = selectedText;
-    searchText = searchText.replace(QLatin1Char('\n'), QLatin1Char(' ')).replace(QLatin1Char('\r'), QLatin1Char(' ')).simplified();
+    searchText = searchText.replace('\n', ' ').replace('\r', ' ').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());
+        Q_EMIT openUrl(filterData.uri().url());
    }
 #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(QStringLiteral("kcmshell5"), QStringList() << QStringLiteral("webshortcuts"), this);
+    auto job = new KIO::CommandLauncherJob("kcmshell5", QStringList() << "webshortcuts", this);
    job->exec();
 #endif
 }
--- a/Show More
+++ b/Show More