Port About page to FormCard

Port more MobileForm to FormCard
- DevTools - Network settings - Push notification - Permissions
2023-08-22 22:03:35 +00:00 · 2023-08-22 22:03:35 +00:00 · 2023-08-22 22:03:35 +00:00
136 changed files with 16135 additions and 24287 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,11 @@
 include:
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml
+#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml
 #  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
+#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml
 #  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
+#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -30,7 +30,36 @@ Dependencies:
  'require':
    'frameworks/kdbusaddons': '@stable'

- 'on': ['Linux/Qt5']
+- 'on': ['Linux/Qt6', 'Android/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6']
+  'require':
+    'frameworks/extra-cmake-modules': '@latest-kf6'
+    'frameworks/kcoreaddons': '@latest-kf6'
+    'frameworks/kirigami': '@latest-kf6'
+    'frameworks/ki18n': '@latest-kf6'
+    'frameworks/kconfig': '@latest-kf6'
+    'frameworks/syntax-highlighting': '@latest-kf6'
+    'frameworks/kitemmodels': '@latest-kf6'
+    'frameworks/kquickcharts': '@latest-kf6'
+    'frameworks/knotifications': '@latest-kf6'
+    'libraries/kquickimageeditor': '@latest-kf6'
+    'frameworks/sonnet': '@latest-kf6'
+    'libraries/kirigami-addons': '@latest-kf6'
+    'third-party/libquotient': '@latest'
+    'third-party/qtkeychain': '@latest'
+    'third-party/cmark': '@latest'
+    'third-party/qcoro': '@latest'
+- 'on': ['Windows/Qt6', 'Linux/Qt6', 'FreeBSD/Qt6']
+  'require':
+    'frameworks/qqc2-desktop-style': '@latest-kf6'
+    'frameworks/kio': '@latest-kf6'
+    'frameworks/kwindowsystem': '@latest-kf6'
+    'frameworks/kconfigwidgets': '@latest-kf6'
+- 'on': ['Linux/Qt6', 'FreeBSD/Qt6']
+  'require':
+    'frameworks/kdbusaddons': '@latest-kf6'
+    'frameworks/kstatusnotifieritem': '@latest-kf6'
+
+- 'on': ['Linux/Qt6', 'Linux/Qt5']
  'require':
    'sdk/selenium-webdriver-at-spi': '@latest-kf6'

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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"
--- 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/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
@@ -57,7 +57,6 @@
  <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>
@@ -268,6 +267,52 @@ 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="ar">العرض الرئيسة مع قائمة الغرف والدردشات و معلومات الغرفة</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="eo">Ĉefa vido kun ĉambra listo, babilejo kaj ĉambra informo</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="fi">Päänäkymä, jossa huoneluettelo, keskustelu ja huoneen tiedot</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ka">მთავარი ხედი სურათების სიით, ჩატით და ოთახის ინფორმაციით</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ko">대화방 목록, 채팅, 대화방 정보가 표시된 주 보기</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="nl">Hoofdweergave met lijst met rooms, chat en roominformatie</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="tr">Oda listesini, sohbet penceresini ve oda bilgisini gösteren ana görünüm</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="uk">Головна панель із списком кімнат, спілкуванням та даними щодо кімнати</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="x-test">xxMain view with room list, chat, and room informationxx</value>
+    <value key="KDE::windows_store::screenshots::2::image">https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Login.png</value>
+    <value key="KDE::windows_store::screenshots::2::caption">Login screen</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ar">شاشة الدخول</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ca">Pantalla d'inici de sessió</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ca-valencia">Pantalla d'inici de sessió</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="eo">Ensaluta ekrano</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="es">Pantalla de inicio de sesión</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="eu">Saio-hasteko pantaila</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="fi">Kirjautumisnäkymä</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="fr">Écran de connexion</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="gl">Pantalla de identificación.</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="it">Schermata di accesso</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ka">შესვლის ეკრანი</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ko">로그인 화면</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="nl">Aanmeldscherm</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="nn">Innloggingsbilete</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="pt">Ecrã de autenticação</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="sl">Prijavni zaslon</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="sv">Inloggningsfönster</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ta">நுழைவுத் திரை</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="tr">Oturum açma ekranı</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="uk">Вікно входу</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="x-test">xxLogin screenxx</value>
  </custom>
  <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
  <screenshots>
@@ -277,77 +322,16 @@ 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.08.0" date="2023-08-24"/>
    <release version="23.04.3" date="2023-07-06"/>
    <release version="23.04.2" date="2023-06-08"/>
    <release version="23.04.1" date="2023-05-11"/>
    <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/po/ar/neochat.po
+++ b/po/ar/neochat.po
--- a/po/az/neochat.po
+++ b/po/az/neochat.po
--- a/po/ca/neochat.po
+++ b/po/ca/neochat.po
--- a/po/ca@valencia/neochat.po
+++ b/po/ca@valencia/neochat.po
--- a/po/cs/neochat.po
+++ b/po/cs/neochat.po
--- a/po/da/neochat.po
+++ b/po/da/neochat.po
--- a/po/de/neochat.po
+++ b/po/de/neochat.po
--- a/po/el/neochat.po
+++ b/po/el/neochat.po
--- a/po/en_GB/neochat.po
+++ b/po/en_GB/neochat.po
--- a/po/es/neochat.po
+++ b/po/es/neochat.po
--- a/po/eu/neochat.po
+++ b/po/eu/neochat.po
--- a/po/fi/neochat.po
+++ b/po/fi/neochat.po
--- a/po/fr/neochat.po
+++ b/po/fr/neochat.po
--- a/po/hu/neochat.po
+++ b/po/hu/neochat.po
--- a/po/ia/neochat.po
+++ b/po/ia/neochat.po
--- a/po/id/neochat.po
+++ b/po/id/neochat.po
--- a/po/ie/neochat.po
+++ b/po/ie/neochat.po
--- a/po/it/neochat.po
+++ b/po/it/neochat.po
--- a/po/ja/neochat.po
+++ b/po/ja/neochat.po
--- a/po/ka/neochat.po
+++ b/po/ka/neochat.po
--- a/po/ko/neochat.po
+++ b/po/ko/neochat.po
--- a/po/lt/neochat.po
+++ b/po/lt/neochat.po
--- a/po/nl/neochat.po
+++ b/po/nl/neochat.po
--- a/po/nn/neochat.po
+++ b/po/nn/neochat.po
--- a/po/pa/neochat.po
+++ b/po/pa/neochat.po
--- a/po/pl/neochat.po
+++ b/po/pl/neochat.po
--- a/po/pt/neochat.po
+++ b/po/pt/neochat.po
--- a/po/pt_BR/neochat.po
+++ b/po/pt_BR/neochat.po
--- a/po/ru/neochat.po
+++ b/po/ru/neochat.po
--- a/po/sk/neochat.po
+++ b/po/sk/neochat.po
--- a/po/sl/neochat.po
+++ b/po/sl/neochat.po
--- a/po/sv/neochat.po
+++ b/po/sv/neochat.po
--- a/po/ta/neochat.po
+++ b/po/ta/neochat.po
--- a/po/tok/neochat.po
+++ b/po/tok/neochat.po
--- a/po/tr/neochat.po
+++ b/po/tr/neochat.po
--- a/po/uk/neochat.po
+++ b/po/uk/neochat.po
--- a/po/zh_CN/neochat.po
+++ b/po/zh_CN/neochat.po
--- a/po/zh_TW/neochat.po
+++ b/po/zh_TW/neochat.po
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -74,6 +74,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
@@ -123,15 +125,6 @@ add_library(neochat STATIC
    events/pollevent.cpp
    pollhandler.cpp
    utils.h
-    registration.cpp
-    neochatconnection.cpp
-    neochatconnection.h
-    jobs/neochatdeactivateaccountjob.cpp
-    jobs/neochatdeactivateaccountjob.h
-    jobs/neochatdeletedevicejob.cpp
-    jobs/neochatdeletedevicejob.h
-    jobs/neochatchangepasswordjob.cpp
-    jobs/neochatchangepasswordjob.h
 )

 ecm_qt_declare_logging_category(neochat
@@ -148,11 +141,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
@@ -189,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.h
+++ b/src/actionshandler.h
@@ -9,6 +9,7 @@

 #include "neochatroom.h"

+class CustomEmojiModel;
 class NeoChatRoom;

 /**
--- a/src/chatdocumenthandler.h
+++ b/src/chatdocumenthandler.h
@@ -10,6 +10,7 @@
 #include "models/completionmodel.h"
 #include "neochatroom.h"

+class QTextDocument;
 class NeoChatRoom;
 class SyntaxHighlighter;

--- 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,8 +33,10 @@

 #include <Quotient/accountregistry.h>
 #include <Quotient/connection.h>
+#include <Quotient/csapi/content-repo.h>
 #include <Quotient/csapi/logout.h>
 #include <Quotient/csapi/notifications.h>
+#include <Quotient/csapi/profile.h>
 #include <Quotient/eventstats.h>
 #include <Quotient/jobs/downloadfilejob.h>
 #include <Quotient/qt_connection_util.h>
@@ -102,8 +105,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);
            });
        }
@@ -138,7 +141,38 @@ void Controller::toggleWindow()
    }
 }

-void Controller::addConnection(NeoChatConnection *c)
+void Controller::logout(Connection *conn, bool serverSideLogout)
+{
+    if (!conn) {
+        qCritical() << "Attempt to logout null connection";
+        return;
+    }
+
+    SettingsGroup("Accounts"_ls).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 +180,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 +202,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");

@@ -197,19 +231,19 @@ void Controller::invokeLogin()
                    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 &) {
+                connect(connection, &Connection::loginError, this, [this, connection](const QString &error, const QString &) {
                    if (error == "Unrecognised access token"_ls) {
                        Q_EMIT errorOccured(i18n("Login Failed: Access Token invalid or revoked"));
-                        connection->logout(false);
+                        logout(connection, false);
                    } else if (error == "Connection closed"_ls) {
                        Q_EMIT errorOccured(i18n("Login Failed: %1", error));
                        // Failed due to network connection issue. This might happen when the homeserver is
@@ -217,11 +251,11 @@ void Controller::invokeLogin()
                        // 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,6 +321,22 @@ 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
@@ -297,6 +347,59 @@ bool Controller::supportSystemTray() const
 #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"_ls] = replyData["session"_ls];
+            authData["password"_ls] = currentPassword;
+            authData["type"_ls] = "m.login.password"_ls;
+            authData["user"_ls] = connection->user()->id();
+            QJsonObject identifier = {{"type"_ls, "m.id.user"_ls}, {"user"_ls, connection->user()->id()}};
+            authData["identifier"_ls] = identifier;
+            NeochatChangePasswordJob *innerJob = connection->callApi<NeochatChangePasswordJob>(newPassword, false, authData);
+            connect(innerJob, &BaseJob::success, this, [this]() {
+                Q_EMIT passwordStatus(PasswordStatus::Success);
+            });
+            connect(innerJob, &BaseJob::failure, this, [innerJob, this]() {
+                if (innerJob->jsonData()["errcode"_ls] == "M_FORBIDDEN"_ls) {
+                    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")
+{
+    QJsonObject _data;
+    addParam<>(_data, QStringLiteral("new_password"), newPassword);
+    addParam<IfNotEmpty>(_data, QStringLiteral("logout_devices"), logoutDevices);
+    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
+    setRequestData(_data);
+}
+
 int Controller::accountCount() const
 {
    return m_accountRegistry.count();
@@ -322,7 +425,7 @@ void Controller::setQuitOnLastWindowClosed()
 #endif
 }

-NeoChatConnection *Controller::activeConnection() const
+Connection *Controller::activeConnection() const
 {
    if (m_connection.isNull()) {
        return nullptr;
@@ -330,43 +433,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) {
+        connect(connection, &Connection::requestFailed, this, [](BaseJob *job) {
            if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"_ls].toString() == "M_TOO_LARGE"_ls) {
                RoomManager::instance().warning(i18n("File too large to download."), i18n("Contact your matrix server administrator for support."));
            }
        });
+        connect(connection, &Connection::accountDataChanged, this, [this](const QString &type) {
+            if (type == QLatin1String("org.kde.neochat.account_label")) {
+                Q_EMIT activeAccountLabelChanged();
+            }
+        });
    } else {
        NeoChatConfig::self()->setActiveConnection(QString());
    }
    NeoChatConfig::self()->save();
    Q_EMIT activeConnectionChanged();
    Q_EMIT activeConnectionIndexChanged();
+    Q_EMIT activeAccountLabelChanged();
 }

 PushRuleModel *Controller::pushRuleModel() const
@@ -379,6 +488,14 @@ void Controller::saveWindowGeometry()
    WindowController::instance().saveGeometry();
 }

+NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth)
+    : Quotient::BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId).toLatin1())
+{
+    QJsonObject _data;
+    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
+    setRequestData(std::move(_data));
+}
+
 void Controller::createRoom(const QString &name, const QString &topic)
 {
    auto createRoomJob = m_connection->createRoom(Connection::PublishRoom, QString(), name, topic, QStringList());
@@ -529,6 +646,41 @@ bool Controller::isFlatpak() const
 #endif
 }

+void Controller::setActiveAccountLabel(const QString &label)
+{
+    if (!m_connection) {
+        return;
+    }
+    QJsonObject json{
+        {"account_label"_ls, label},
+    };
+    m_connection->setAccountData("org.kde.neochat.account_label"_ls, json);
+}
+
+QString Controller::activeAccountLabel() const
+{
+    if (!m_connection) {
+        return {};
+    }
+    return m_connection->accountDataJson("org.kde.neochat.account_label"_ls)["account_label"_ls].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"_ls, v.id);
+        roomVersionMap.insert("status"_ls, v.status);
+        roomVersionMap.insert("isStable"_ls, v.isStable());
+        supportedRoomVersions.append(roomVersionMap);
+    }
+
+    return supportedRoomVersions;
+}
+
 AccountRegistry &Controller::accounts()
 {
    return m_accountRegistry;
--- a/src/controller.h
+++ b/src/controller.h
@@ -9,17 +9,18 @@

 #include <KFormat>

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

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

 namespace Quotient
 {
+class Connection;
 class Room;
 class User;
 }
@@ -49,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.
@@ -61,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.
     */
@@ -98,28 +109,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.
     */
@@ -181,12 +210,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);
@@ -213,8 +244,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);
@@ -225,13 +256,30 @@ 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();
 };
+
+// TODO libQuotient 0.7: Drop
+class NeochatChangePasswordJob : public Quotient::BaseJob
+{
+public:
+    explicit NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
+};
+
+class NeochatDeleteDeviceJob : public Quotient::BaseJob
+{
+public:
+    explicit NeochatDeleteDeviceJob(const QString &deviceId, 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/jobs/neochatchangepasswordjob.cpp
+++ b/src/jobs/neochatchangepasswordjob.cpp
@@ -1,16 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "neochatchangepasswordjob.h"
-
-using namespace Quotient;
-
-NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Omittable<QJsonObject> &auth)
-    : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), "/_matrix/client/r0/account/password")
-{
-    QJsonObject _data;
-    addParam<>(_data, QStringLiteral("new_password"), newPassword);
-    addParam<IfNotEmpty>(_data, QStringLiteral("logout_devices"), logoutDevices);
-    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
-    setRequestData(_data);
-}
--- a/src/jobs/neochatchangepasswordjob.h
+++ b/src/jobs/neochatchangepasswordjob.h
@@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <Quotient/jobs/basejob.h>
-#include <Quotient/omittable.h>
-
-class NeochatChangePasswordJob : public Quotient::BaseJob
-{
-public:
-    explicit NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
-};
--- a/src/jobs/neochatdeactivateaccountjob.cpp
+++ b/src/jobs/neochatdeactivateaccountjob.cpp
@@ -1,14 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "neochatdeactivateaccountjob.h"
-
-using namespace Quotient;
-
-NeoChatDeactivateAccountJob::NeoChatDeactivateAccountJob(const Omittable<QJsonObject> &auth)
-    : BaseJob(HttpVerb::Post, QStringLiteral("DisableDeviceJob"), "_matrix/client/v3/account/deactivate")
-{
-    QJsonObject data;
-    addParam<IfNotEmpty>(data, QStringLiteral("auth"), auth);
-    setRequestData(data);
-}
--- a/src/jobs/neochatdeactivateaccountjob.h
+++ b/src/jobs/neochatdeactivateaccountjob.h
@@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <Quotient/jobs/basejob.h>
-#include <Quotient/omittable.h>
-
-class NeoChatDeactivateAccountJob : public Quotient::BaseJob
-{
-public:
-    explicit NeoChatDeactivateAccountJob(const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
-};
--- a/src/jobs/neochatdeletedevicejob.cpp
+++ b/src/jobs/neochatdeletedevicejob.cpp
@@ -1,14 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "neochatdeletedevicejob.h"
-
-using namespace Quotient;
-
-NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth)
-    : BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId).toLatin1())
-{
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
-    setRequestData(std::move(_data));
-}
--- a/src/jobs/neochatdeletedevicejob.h
+++ b/src/jobs/neochatdeletedevicejob.h
@@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <Quotient/jobs/basejob.h>
-#include <Quotient/omittable.h>
-
-class NeochatDeleteDeviceJob : public Quotient::BaseJob
-{
-public:
-    explicit NeochatDeleteDeviceJob(const QString &deviceId, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
-};
--- 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,9 +57,6 @@ 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();
--- 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")
@@ -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();
    });
@@ -137,7 +133,6 @@ QString Login::password() const

 void Login::setPassword(const QString &password)
 {
-    setInvalidPassword(false);
    m_password = password;
    Q_EMIT passwordChanged();
 }
@@ -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
@@ -18,10 +18,6 @@
 #include <QApplication>
 #endif

-#ifdef HAVE_WEBVIEW
-#include <QtWebView>
-#endif
-
 #include <KAboutData>
 #ifdef HAVE_KDBUSADDONS
 #include <KDBusService>
@@ -54,6 +50,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,7 +77,6 @@
 #include "models/userlistmodel.h"
 #include "models/webshortcutmodel.h"
 #include "neochatconfig.h"
-#include "neochatconnection.h"
 #include "neochatroom.h"
 #include "notificationsmanager.h"
 #include "pollhandler.h"
@@ -99,7 +95,6 @@
 #include "runner.h"
 #include <QDBusConnection>
 #endif
-#include "registration.h"

 #ifdef Q_OS_WINDOWS
 #include <Windows.h>
@@ -144,10 +139,6 @@ 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"));
@@ -242,7 +233,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 +240,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");
@@ -282,12 +273,12 @@ int main(int argc, char *argv[])
    qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM"_ls);
    qmlRegisterUncreatableType<User>("org.kde.neochat", 1, 0, "User", {});
    qmlRegisterUncreatableType<NeoChatRoom>("org.kde.neochat", 1, 0, "NeoChatRoom", {});
-    qmlRegisterUncreatableType<NeoChatConnection>("org.kde.neochat", 1, 0, "NeoChatConnection", {});

    qRegisterMetaType<User *>("User*");
    qRegisterMetaType<User *>("const User*");
    qRegisterMetaType<User *>("const Quotient::User*");
    qRegisterMetaType<Room *>("Room*");
+    qRegisterMetaType<Connection *>("Connection*");
    qRegisterMetaType<MessageEventType>("MessageEventType");
    qRegisterMetaType<NeoChatRoom *>("NeoChatRoom*");
    qRegisterMetaType<User *>("User*");
@@ -362,7 +353,7 @@ int main(int argc, char *argv[])
        return -1;
    }

-    if (!parser.positionalArguments().isEmpty()) {
+    if (parser.positionalArguments().length() > 0) {
        RoomManager::instance().setUrlArgument(parser.positionalArguments()[0]);
    }

--- a/src/matriximageprovider.h
+++ b/src/matriximageprovider.h
@@ -10,6 +10,11 @@

 #include <QReadWriteLock>

+namespace Quotient
+{
+class Connection;
+}
+
 /**
 * @class ThumbnailResponse
 *
--- a/src/models/accountemoticonmodel.h
+++ b/src/models/accountemoticonmodel.h
@@ -13,6 +13,8 @@

 #include <Quotient/connection.h>

+class ImagePacksModel;
+
 /**
 * @class AccountEmoticonModel
 *
--- 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 = 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 CollapseStateProxyModel::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 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/devicesmodel.cpp
+++ b/src/models/devicesmodel.cpp
@@ -4,7 +4,6 @@
 #include "devicesmodel.h"

 #include "controller.h"
-#include "jobs/neochatdeletedevicejob.h"

 #include <QDateTime>
 #include <QLocale>
--- a/src/models/livelocationsmodel.h
+++ b/src/models/livelocationsmodel.h
@@ -10,6 +10,11 @@
 #include <QPointer>
 #include <QRectF>

+namespace Quotient
+{
+class RoomMessageEvent;
+}
+
 struct LiveLocationData {
    QString eventId;
    QString senderId;
--- 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/messagefiltermodel.cpp
+++ b/src/models/messagefiltermodel.cpp
@@ -3,8 +3,6 @@

 #include "messagefiltermodel.h"

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

@@ -34,193 +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 = notLastRow
-        ? sourceModel()->data(sourceModel()->index(sourceRow + 1, 0), MessageEventModel::DelegateTypeRole) == MessageEventModel::DelegateType::State
-        : false;
-    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() ? sourceModel()->roleNames() : QHash<int, QByteArray>();
-    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/reactionmodel.cpp
+++ b/src/models/reactionmodel.cpp
@@ -31,7 +31,7 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const

    if (role == TextRole) {
        if (reaction.authors.count() > 1) {
-            return QStringLiteral("%1  %2").arg(reaction.reaction, QString::number(reaction.authors.count()));
+            return QStringLiteral("%1  %2").arg(reaction.reaction, reaction.authors.count());
        } else {
            return reaction.reaction;
        }
--- a/src/models/searchmodel.cpp
+++ b/src/models/searchmodel.cpp
@@ -118,7 +118,12 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
            return m_room->getUser(nullptr);
        }
    case ReplyRole:
-        if (auto replyPtr = m_room->getReplyForEvent(event)) {
+        if (role == ReplyRole) {
+            auto replyPtr = m_room->getReplyForEvent(event);
+            if (!replyPtr) {
+                return {};
+            }
+
            MessageEventModel::DelegateType type;
            if (auto e = eventCast<const RoomMessageEvent>(replyPtr)) {
                switch (e->msgtype()) {
@@ -150,12 +155,12 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
            } else {
                type = MessageEventModel::DelegateType::Other;
            }
+
            return QVariantMap{
                {"display"_ls, m_room->eventToString(*replyPtr, Qt::RichText)},
                {"type"_ls, type},
            };
        }
-        break;
    case IsPendingRole:
        return false;
    case ShowLinkPreviewRole:
--- a/src/models/statemodel.cpp
+++ b/src/models/statemodel.cpp
@@ -26,8 +26,7 @@ QVariant StateModel::data(const QModelIndex &index, int role) const

 int StateModel::rowCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
-    return m_room->currentState().events().size();
+    return !m_room || parent.isValid() ? 0 : m_room->currentState().events().size();
 }

 NeoChatRoom *StateModel::room() const
@@ -37,8 +36,12 @@ NeoChatRoom *StateModel::room() const

 void StateModel::setRoom(NeoChatRoom *room)
 {
+    if (m_room == room) {
+        return;
+    }
    m_room = room;
    Q_EMIT roomChanged();
+
    beginResetModel();
    m_stateEvents.clear();
    m_stateEvents = m_room->currentState().events().keys();
--- a/src/neochatconnection.cpp
+++ b/src/neochatconnection.cpp
@@ -1,159 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "neochatconnection.h"
-
-#include <QImageReader>
-
-#include "controller.h"
-#include "jobs/neochatchangepasswordjob.h"
-#include "jobs/neochatdeactivateaccountjob.h"
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#include <qt5keychain/keychain.h>
-#else
-#include <qt6keychain/keychain.h>
-#endif
-
-#include <Quotient/csapi/content-repo.h>
-#include <Quotient/csapi/profile.h>
-#include <Quotient/settings.h>
-#include <Quotient/user.h>
-
-using namespace Quotient;
-
-NeoChatConnection::NeoChatConnection(QObject *parent)
-    : Connection(parent)
-{
-    connect(this, &NeoChatConnection::accountDataChanged, this, [this](const QString &type) {
-        if (type == QLatin1String("org.kde.neochat.account_label")) {
-            Q_EMIT labelChanged();
-        }
-    });
-}
-
-NeoChatConnection::NeoChatConnection(const QUrl &server, QObject *parent)
-    : Connection(server, parent)
-{
-    connect(this, &NeoChatConnection::accountDataChanged, this, [this](const QString &type) {
-        if (type == QLatin1String("org.kde.neochat.account_label")) {
-            Q_EMIT labelChanged();
-        }
-    });
-}
-
-void NeoChatConnection::logout(bool serverSideLogout)
-{
-    SettingsGroup(QStringLiteral("Accounts")).remove(userId());
-
-    QKeychain::DeletePasswordJob job(qAppName());
-    job.setAutoDelete(true);
-    job.setKey(userId());
-    QEventLoop loop;
-    QKeychain::DeletePasswordJob::connect(&job, &QKeychain::Job::finished, &loop, &QEventLoop::quit);
-    job.start();
-    loop.exec();
-
-    if (Controller::instance().accounts().count() > 1) {
-        // Only set the connection if the the account being logged out is currently active
-        if (this == Controller::instance().activeConnection()) {
-            Controller::instance().setActiveConnection(dynamic_cast<NeoChatConnection *>(Controller::instance().accounts().accounts()[0]));
-        }
-    } else {
-        Controller::instance().setActiveConnection(nullptr);
-    }
-    if (!serverSideLogout) {
-        return;
-    }
-    Connection::logout();
-}
-
-bool NeoChatConnection::setAvatar(const QUrl &avatarSource)
-{
-    QString decoded = avatarSource.path();
-    if (decoded.isEmpty()) {
-        callApi<SetAvatarUrlJob>(user()->id(), avatarSource);
-        return true;
-    }
-    if (QImageReader(decoded).read().isNull()) {
-        return false;
-    } else {
-        return user()->setAvatar(decoded);
-    }
-}
-
-QVariantList NeoChatConnection::getSupportedRoomVersions() const
-{
-    const auto &roomVersions = availableRoomVersions();
-    QVariantList supportedRoomVersions;
-    for (const auto &v : roomVersions) {
-        QVariantMap roomVersionMap;
-        roomVersionMap.insert("id"_ls, v.id);
-        roomVersionMap.insert("status"_ls, v.status);
-        roomVersionMap.insert("isStable"_ls, v.isStable());
-        supportedRoomVersions.append(roomVersionMap);
-    }
-    return supportedRoomVersions;
-}
-
-void NeoChatConnection::changePassword(const QString &currentPassword, const QString &newPassword)
-{
-    auto job = callApi<NeochatChangePasswordJob>(newPassword, false);
-    connect(job, &BaseJob::result, this, [this, job, currentPassword, newPassword] {
-        if (job->error() == 103) {
-            QJsonObject replyData = job->jsonData();
-            QJsonObject authData;
-            authData["session"_ls] = replyData["session"_ls];
-            authData["password"_ls] = currentPassword;
-            authData["type"_ls] = "m.login.password"_ls;
-            authData["user"_ls] = user()->id();
-            QJsonObject identifier = {{"type"_ls, "m.id.user"_ls}, {"user"_ls, user()->id()}};
-            authData["identifier"_ls] = identifier;
-            NeochatChangePasswordJob *innerJob = callApi<NeochatChangePasswordJob>(newPassword, false, authData);
-            connect(innerJob, &BaseJob::success, this, []() {
-                Q_EMIT Controller::instance().passwordStatus(Controller::PasswordStatus::Success);
-            });
-            connect(innerJob, &BaseJob::failure, this, [innerJob]() {
-                Q_EMIT Controller::instance().passwordStatus(innerJob->jsonData()["errcode"_ls] == "M_FORBIDDEN"_ls ? Controller::PasswordStatus::Wrong
-                                                                                                                    : Controller::PasswordStatus::Other);
-            });
-        }
-    });
-}
-
-void NeoChatConnection::setLabel(const QString &label)
-{
-    QJsonObject json{
-        {"account_label"_ls, label},
-    };
-    setAccountData("org.kde.neochat.account_label"_ls, json);
-    Q_EMIT labelChanged();
-}
-
-QString NeoChatConnection::label() const
-{
-    return accountDataJson("org.kde.neochat.account_label"_ls)["account_label"_ls].toString();
-}
-
-void NeoChatConnection::deactivateAccount(const QString &password)
-{
-    auto job = callApi<NeoChatDeactivateAccountJob>();
-    connect(job, &BaseJob::result, this, [this, job, password] {
-        if (job->error() == 103) {
-            QJsonObject replyData = job->jsonData();
-            QJsonObject authData;
-            authData["session"_ls] = replyData["session"_ls];
-            authData["password"_ls] = password;
-            authData["type"_ls] = "m.login.password"_ls;
-            authData["user"_ls] = user()->id();
-            QJsonObject identifier = {{"type"_ls, "m.id.user"_ls}, {"user"_ls, user()->id()}};
-            authData["identifier"_ls] = identifier;
-            auto innerJob = callApi<NeoChatDeactivateAccountJob>(authData);
-            connect(innerJob, &BaseJob::success, this, [this]() {
-                logout(false);
-            });
-        }
-    });
-}
-
-#include "moc_neochatconnection.cpp"
--- a/src/neochatconnection.h
+++ b/src/neochatconnection.h
@@ -1,53 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <QObject>
-
-#include <Quotient/connection.h>
-
-class NeoChatConnection : public Quotient::Connection
-{
-    Q_OBJECT
-
-    /**
-     * @brief The account label for this account.
-     *
-     * Account labels are a concept specific to NeoChat, allowing accounts to be
-     * labelled, e.g. for "Work", "Private", etc.
-     *
-     * Set to an empty string to remove the label.
-     */
-    Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
-
-public:
-    NeoChatConnection(QObject *parent = nullptr);
-    NeoChatConnection(const QUrl &server, QObject *parent = nullptr);
-
-    Q_INVOKABLE void logout(bool serverSideLogout);
-    Q_INVOKABLE QVariantList getSupportedRoomVersions() const;
-
-    /**
-     * @brief Change the password for an account.
-     *
-     * The function emits a passwordStatus signal with a PasswordStatus value when
-     * complete.
-     *
-     * @sa PasswordStatus, passwordStatus
-     */
-    Q_INVOKABLE void changePassword(const QString &currentPassword, const QString &newPassword);
-
-    /**
-     * @brief Change the avatar for an account.
-     */
-    Q_INVOKABLE bool setAvatar(const QUrl &avatarSource);
-
-    [[nodiscard]] QString label() const;
-    void setLabel(const QString &label);
-
-    Q_INVOKABLE void deactivateAccount(const QString &password);
-
-Q_SIGNALS:
-    void labelChanged();
-};
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -111,7 +111,7 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
            qWarning() << "using this room's avatar";
            avatar_image = avatar(128);
        }
-        NotificationsManager::instance().postInviteNotification(this, displayNameForHtml(), htmlSafeMemberName(senderId), avatar_image);
+        NotificationsManager::instance().postInviteNotification(this, htmlSafeDisplayName(), htmlSafeMemberName(senderId), avatar_image);
    });
    connect(this, &Room::changed, this, [this] {
        Q_EMIT canEncryptRoomChanged();
@@ -978,6 +978,11 @@ bool NeoChatRoom::isUserBanned(const QString &user) const
    return roomMemberEvent->membership() == Membership::Ban;
 }

+QString NeoChatRoom::htmlSafeDisplayName() const
+{
+    return displayName().toHtmlEscaped();
+}
+
 void NeoChatRoom::deleteMessagesByUser(const QString &user, const QString &reason)
 {
    doDeleteMessagesByUser(user, reason);
--- a/src/neochatroom.h
+++ b/src/neochatroom.h
@@ -111,6 +111,11 @@ class NeoChatRoom : public Quotient::Room
     */
    Q_PROPERTY(bool readMarkerLoaded READ readMarkerLoaded NOTIFY readMarkerLoadedChanged)

+    /**
+     * @brief Display name with any html special characters escaped.
+     */
+    Q_PROPERTY(QString htmlSafeDisplayName READ htmlSafeDisplayName NOTIFY displayNameChanged)
+
    /**
     * @brief The avatar image to be used for the room.
     */
@@ -586,6 +591,8 @@ public:

    [[nodiscard]] bool readMarkerLoaded() const;

+    QString htmlSafeDisplayName() const;
+
    /**
     * @brief Get subtitle text for room
     *
--- a/src/notificationsmanager.cpp
+++ b/src/notificationsmanager.cpp
@@ -13,12 +13,12 @@

 #include <QPainter>
 #include <Quotient/accountregistry.h>
+#include <Quotient/connection.h>
 #include <Quotient/csapi/pushrules.h>
 #include <Quotient/user.h>

 #include "controller.h"
 #include "neochatconfig.h"
-#include "neochatconnection.h"
 #include "neochatroom.h"
 #include "roommanager.h"
 #include "texthandler.h"
@@ -37,7 +37,7 @@ NotificationsManager::NotificationsManager(QObject *parent)
 {
 }

-void NotificationsManager::handleNotifications(QPointer<NeoChatConnection> connection)
+void NotificationsManager::handleNotifications(QPointer<Connection> connection)
 {
    if (!m_connActiveJob.contains(connection->user()->id())) {
        auto job = connection->callApi<GetNotificationsJob>();
@@ -49,7 +49,7 @@ void NotificationsManager::handleNotifications(QPointer<NeoChatConnection> conne
    }
 }

-void NotificationsManager::processNotificationJob(QPointer<NeoChatConnection> connection, Quotient::GetNotificationsJob *job, bool initialization)
+void NotificationsManager::processNotificationJob(QPointer<Quotient::Connection> connection, Quotient::GetNotificationsJob *job, bool initialization)
 {
    if (job == nullptr) {
        return;
@@ -145,7 +145,7 @@ void NotificationsManager::processNotificationJob(QPointer<NeoChatConnection> co
    }
 }

-bool NotificationsManager::shouldPostNotification(QPointer<NeoChatConnection> connection, const QJsonValue &notification)
+bool NotificationsManager::shouldPostNotification(QPointer<Quotient::Connection> connection, const QJsonValue &notification)
 {
    if (connection == nullptr) {
        return false;
@@ -211,7 +211,7 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
            return;
        }
        if (room->localUser()->id() != Controller::instance().activeConnection()->userId()) {
-            Controller::instance().setActiveConnection(dynamic_cast<NeoChatConnection *>(Controller::instance().accounts().get(room->localUser()->id())));
+            Controller::instance().setActiveConnection(Controller::instance().accounts().get(room->localUser()->id()));
        }
        RoomManager::instance().enterRoom(room);
    });
--- a/src/notificationsmanager.h
+++ b/src/notificationsmanager.h
@@ -12,7 +12,11 @@
 #include <Quotient/csapi/notifications.h>
 #include <Quotient/jobs/basejob.h>

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

@@ -76,7 +80,7 @@ public:
    /**
     * @brief Handle the notifications for the given connection.
     */
-    void handleNotifications(QPointer<NeoChatConnection> connection);
+    void handleNotifications(QPointer<Quotient::Connection> connection);

 private:
    explicit NotificationsManager(QObject *parent = nullptr);
@@ -86,13 +90,13 @@ private:

    QStringList m_connActiveJob;

-    bool shouldPostNotification(QPointer<NeoChatConnection> connection, const QJsonValue &notification);
+    bool shouldPostNotification(QPointer<Quotient::Connection> connection, const QJsonValue &notification);

    QHash<QString, KNotification *> m_notifications;
    QHash<QString, QPointer<KNotification>> m_invitations;

 private Q_SLOTS:
-    void processNotificationJob(QPointer<NeoChatConnection> connection, Quotient::GetNotificationsJob *job, bool initialization);
+    void processNotificationJob(QPointer<Quotient::Connection> connection, Quotient::GetNotificationsJob *job, bool initialization);

 private:
    QPixmap createNotificationImage(const QImage &icon, NeoChatRoom *room);
--- a/src/qml/Component/ChatBox/ChatBar.qml
+++ b/src/qml/Component/ChatBox/ChatBar.qml
@@ -411,7 +411,7 @@ QQC2.Control {

            currentRoom: root.currentRoom

-            onChosen: emoji => insertText(emoji)
+            onChosen: insertText(emoji)
            onClosed: if (emojiAction.checked) emojiAction.checked = false
        }
    }
--- a/src/qml/Component/Devtools/RoomData.qml
+++ b/src/qml/Component/Devtools/RoomData.qml
@@ -6,107 +6,122 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm
+import org.kde.kirigamiaddons.formcard 1.0 as FormCard
 import org.kde.kitemmodels 1.0

 import org.kde.neochat 1.0

-ColumnLayout {
-    MobileForm.FormCard {
-        Layout.fillWidth: true
-        contentItem: ColumnLayout {
-            spacing: 0
-            MobileForm.FormComboBoxDelegate {
-                text: i18n("Room")
-                textRole: "displayName"
-                valueRole: "id"
-                model: RoomListModel {
-                    id: roomListModel
-                    connection: Controller.activeConnection
-                }
-                Component.onCompleted: currentIndex = indexOfValue(room.id)
-                onCurrentValueChanged: room = roomListModel.roomByAliasOrId(currentValue)
+FormCard.FormCardPage {
+    id: root
+
+    required property var room
+
+    FormCard.FormCard {
+        Layout.topMargin: Kirigami.Units.gridUnit
+
+        FormCard.FormComboBoxDelegate {
+            id: roomChooser
+            text: i18n("Room")
+            textRole: "displayName"
+            valueRole: "roomId"
+            model: RoomListModel {
+                id: roomListModel
+                connection: Controller.activeConnection
            }
-            MobileForm.FormCheckDelegate {
-                text: i18n("Show m.room.member events")
-                checked: true
-                onToggled: {
-                    if (checked) {
-                        stateEventFilterModel.removeStateEventTypeFiltered("m.room.member");
-                    } else {
-                        stateEventFilterModel.addStateEventTypeFiltered("m.room.member");
-                    }
+            onCurrentValueChanged: room = roomListModel.roomByAliasOrId(currentValue)
+            Component.onCompleted: currentIndex = indexOfValue(room.id)
+        }
+
+        FormCard.FormDelegateSeparator { above: showRoomMember }
+
+        FormCard.FormCheckDelegate {
+            id: showRoomMember
+            text: i18n("Show m.room.member events")
+            checked: true
+            onToggled: {
+                if (checked) {
+                    stateEventFilterModel.removeStateEventTypeFiltered("m.room.member");
+                } else {
+                    stateEventFilterModel.addStateEventTypeFiltered("m.room.member");
                }
            }
-            MobileForm.FormCheckDelegate {
-                id: roomAccoutnDataVisibleCheck
-                text: i18n("Show room account data")
-                checked: false
-            }
+        }
+
+        FormCard.FormDelegateSeparator { above: roomAccoutnDataVisibleCheck; below: showRoomMember }
+
+        FormCard.FormCheckDelegate {
+            id: roomAccoutnDataVisibleCheck
+            text: i18n("Show room account data")
+            checked: false
+        }
+
+        FormCard.FormDelegateSeparator { below: roomAccoutnDataVisibleCheck }
+
+        FormCard.FormTextDelegate {
+            text: i18n("Room id")
+            description: room.id
        }
    }
-    MobileForm.FormCard {
-        Layout.fillWidth: true
+
+    FormCard.FormHeader {
+        title: i18n("Room Account Data for %1", room.displayName)
        visible: roomAccoutnDataVisibleCheck.checked
-        contentItem: ColumnLayout {
-            spacing: 0
-            MobileForm.FormCardHeader {
-                title: i18n("Room Account Data for %1 - %2", room.displayName, room.id)
-            }
+    }

-            Repeater {
-                model: room.accountDataEventTypes
-                delegate: MobileForm.FormTextDelegate {
-                    text: modelData
-                    onClicked: applicationWindow().pageStack.pushDialogLayer("qrc:/MessageSourceSheet.qml", {
-                        "sourceText": room.roomAcountDataJson(text)
-                    }, {
-                        "title": i18n("Event Source"),
-                        "width": Kirigami.Units.gridUnit * 25
-                    })
-                }
+    FormCard.FormCard {
+        visible: roomAccoutnDataVisibleCheck.checked
+
+        Repeater {
+            model: room.accountDataEventTypes
+            delegate: FormCard.FormTextDelegate {
+                text: modelData
+                onClicked: applicationWindow().pageStack.pushDialogLayer("qrc:/MessageSourceSheet.qml", {
+                    "sourceText": room.roomAcountDataJson(text)
+                }, {
+                    "title": i18n("Event Source"),
+                    "width": Kirigami.Units.gridUnit * 25
+                })
            }
        }
    }
-    MobileForm.FormCard {
-        Layout.fillWidth: true
+
+    FormCard.FormHeader {
+        id: stateEventListHeader
+        title: i18n("Room State for %1", room.displayName)
+    }
+
+    FormCard.FormCard {
        Layout.fillHeight: true
-        contentItem: ColumnLayout {
-            spacing: 0
-            MobileForm.FormCardHeader {
-                id: stateEventListHeader
-                title: i18n("Room State for %1", room.displayName)
-                subtitle: room.id
-            }
-            QQC2.ScrollView {
-                Layout.fillWidth: true
-                Layout.fillHeight: true

-                // HACK: Hide unnecessary horizontal scrollbar (https://bugreports.qt.io/browse/QTBUG-83890)
-                QQC2.ScrollBar.horizontal.policy: QQC2.ScrollBar.AlwaysOff
+        QQC2.ScrollView {
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            Layout.maximumHeight: Kirigami.Units.gridUnit * 20

-                ListView {
-                    id: stateEventListView
-                    clip: true
+            // HACK: Hide unnecessary horizontal scrollbar (https://bugreports.qt.io/browse/QTBUG-83890)
+            QQC2.ScrollBar.horizontal.policy: QQC2.ScrollBar.AlwaysOff

-                    model: StateFilterModel {
-                        id: stateEventFilterModel
-                        sourceModel: StateModel {
-                            id: stateModel
-                            room: devtoolsPage.room
-                        }
+            ListView {
+                id: stateEventListView
+                clip: true
+
+                model: StateFilterModel {
+                    id: stateEventFilterModel
+                    sourceModel: StateModel {
+                        id: stateModel
+                        room: root.room
                    }
+                }

-                    delegate: MobileForm.FormTextDelegate {
-                        text: model.type
-                        description: model.stateKey
-                        onClicked: applicationWindow().pageStack.pushDialogLayer('qrc:/MessageSourceSheet.qml', {
-                            sourceText: stateModel.stateEventJson(stateEventFilterModel.mapToSource(stateEventFilterModel.index(model.index, 0)))
-                        }, {
-                            title: i18n("Event Source"),
-                            width: Kirigami.Units.gridUnit * 25
-                        });
-                    }
+                delegate: FormCard.FormTextDelegate {
+                    text: model.type
+                    description: model.stateKey
+                    onClicked: applicationWindow().pageStack.pushDialogLayer('qrc:/MessageSourceSheet.qml', {
+                        sourceText: stateModel.stateEventJson(stateEventFilterModel.mapToSource(stateEventFilterModel.index(model.index, 0)))
+                    }, {
+                        title: i18n("Event Source"),
+                        width: Kirigami.Units.gridUnit * 25
+                    });
                }
            }
        }
--- a/src/qml/Component/Devtools/ServerData.qml
+++ b/src/qml/Component/Devtools/ServerData.qml
@@ -6,58 +6,50 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm
+import org.kde.kirigamiaddons.formcard 1.0 as FormCard
 import org.kde.kitemmodels 1.0

 import org.kde.neochat 1.0

-ColumnLayout {
-    MobileForm.FormCard {
-        Layout.fillWidth: true
-        contentItem: ColumnLayout {
-            spacing: 0
-            MobileForm.FormCardHeader {
-                title: i18n("Server Capabilities")
-            }
-            MobileForm.FormTextDelegate {
-                text: i18n("Can change password")
-                description: Controller.activeConnection.canChangePassword
-            }
-        }
-    }
-    MobileForm.FormCard {
-        Layout.fillWidth: true
-        contentItem: ColumnLayout {
-            spacing: 0
-            MobileForm.FormCardHeader {
-                title: i18n("Default Room Version")
-            }
-            MobileForm.FormTextDelegate {
-                text: Controller.activeConnection.defaultRoomVersion
-            }
-        }
-    }
-    MobileForm.FormCard {
-        Layout.fillWidth: true
-        contentItem: ColumnLayout {
-            spacing: 0
-            MobileForm.FormCardHeader {
-                title: i18n("Available Room Versions")
-            }
-            Repeater {
-                model: Controller.getSupportedRoomVersions(room.connection)
+FormCard.FormCardPage {
+    id: root

-                delegate: MobileForm.FormTextDelegate {
-                    text: modelData.id
-                    contentItem.children: QQC2.Label {
-                        text: modelData.status
-                        color: Kirigami.Theme.disabledTextColor
-                    }
+    FormCard.FormHeader {
+        title: i18n("Server Capabilities")
+    }
+
+    FormCard.FormCard {
+        FormCard.FormTextDelegate {
+            text: i18n("Can change password")
+            description: Controller.activeConnection.canChangePassword
+        }
+    }
+
+    FormCard.FormHeader {
+        title: i18n("Default Room Version")
+    }
+
+    FormCard.FormCard {
+        FormCard.FormTextDelegate {
+            text: Controller.activeConnection.defaultRoomVersion
+        }
+    }
+
+    FormCard.FormHeader {
+        title: i18n("Available Room Versions")
+    }
+
+    FormCard.FormCard {
+        Repeater {
+            model: Controller.getSupportedRoomVersions(room.connection)
+
+            delegate: FormCard.FormTextDelegate {
+                text: modelData.id
+                contentItem.children: QQC2.Label {
+                    text: modelData.status
+                    color: Kirigami.Theme.disabledTextColor
                }
            }
        }
    }
-    Item {
-        Layout.fillHeight: true
-    }
 }
--- a/src/qml/Component/Emoji/EmojiPicker.qml
+++ b/src/qml/Component/Emoji/EmojiPicker.qml
@@ -116,7 +116,7 @@ ColumnLayout {
        Layout.fillWidth: true
        Layout.fillHeight: true
        withCustom: root.includeCustom
-        onChosen: unicode => root.chosen(unicode)
+        onChosen: root.chosen(unicode)
        header: categories
        Keys.forwardTo: searchField
        stickers: root.selectedType === 1
--- a/src/qml/Component/Login/Captcha.qml
+++ b/src/qml/Component/Login/Captcha.qml
@@ -1,49 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.14
-import QtQuick.Controls 2.14 as Controls
-import QtQuick.Layouts 1.14
-import QtWebView 1.15
-
-import org.kde.kirigami 2.12 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
-
-import org.kde.neochat 1.0
-
-LoginStep {
-    id: root
-
-    FormCard.AbstractFormDelegate {
-        background: null
-        contentItem: WebView {
-            id: webview
-            url: "http://localhost:20847"
-            implicitHeight: 500
-            onLoadingChanged: {
-                webview.runJavaScript("document.body.style.background = '" + Kirigami.Theme.backgroundColor + "'")
-            }
-
-            Timer {
-                id: timer
-                repeat: true
-                running: true
-                interval: 300
-                onTriggered: {
-                    if(!webview.visible) {
-                        return
-                    }
-                    webview.runJavaScript("!!grecaptcha ? grecaptcha.getResponse() : \"\"", function(response){
-                        if(!webview.visible || !response)
-                            return
-                        timer.running = false;
-                        Registration.recaptchaResponse = response;
-                    })
-                }
-            }
-        }
-    }
-    previousAction: Kirigami.Action {
-        onTriggered: root.processed("qrc:/Username.qml")
-    }
-}
--- a/src/qml/Component/Login/Email.qml
+++ b/src/qml/Component/Login/Email.qml
@@ -1,59 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.12 as QQC2
-import QtQuick.Layouts 1.12
-
-import org.kde.kirigami 2.12 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
-
-import org.kde.neochat 1.0
-
-LoginStep {
-    id: root
-
-    onActiveFocusChanged: if (activeFocus) emailField.forceActiveFocus()
-
-    FormCard.FormTextFieldDelegate {
-        id: emailField
-        label: i18n("Add an e-mail address:")
-        placeholderText: "user@example.com"
-        onTextChanged: Registration.email = text
-        Keys.onReturnPressed: {
-            if (root.nextAction.enabled) {
-                root.nextAction.trigger()
-            }
-        }
-    }
-
-    FormCard.FormTextDelegate {
-        id: confirmMessage
-        text: i18n("Confirm e-mail address")
-        visible: false
-        description: i18n("A confirmation e-mail has been sent to your address. Please continue here <b>after</b> clicking on the confirmation link in the e-mail")
-    }
-
-    FormCard.FormButtonDelegate {
-        id: resendButton
-        text: i18nc("@button", "Re-send confirmation e-mail")
-        onClicked: Registration.registerEmail()
-        visible: false
-    }
-
-    nextAction: Kirigami.Action {
-        enabled: emailField.text.length > 0
-        onTriggered: {
-            if (confirmMessage.visible) {
-                Registration.registerAccount()
-            } else {
-                Registration.registerEmail()
-                confirmMessage.visible = true
-                resendButton.visible = true
-            }
-        }
-    }
-    previousAction: Kirigami.Action {
-        onTriggered: root.processed("qrc:/Username.qml")
-    }
-}
--- a/src/qml/Component/Login/Homeserver.qml
+++ b/src/qml/Component/Login/Homeserver.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later

 import QtQuick 2.15
@@ -6,42 +6,56 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard

 import org.kde.neochat 1.0

 LoginStep {
    id: root

-    onActiveFocusChanged: if (activeFocus) urlField.forceActiveFocus()
+    readonly property var homeserver: customHomeserver.visible ? customHomeserver.text : serverCombo.currentText
+    property bool loading: false

-    FormCard.FormTextFieldDelegate {
-        id: urlField
-        label: i18n("Server Url:")
-        validator: RegularExpressionValidator {
-            regularExpression: /([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9]+(:[0-9]+)?/
+    title: i18nc("@title", "Select a Homeserver")
+
+    action: Kirigami.Action {
+        enabled: LoginHelper.homeserverReachable && !customHomeserver.visible || customHomeserver.acceptableInput
+        onTriggered: {
+            // TODO
+            console.log("register todo")
        }
-        onTextChanged: timer.restart()
-        statusMessage: Registration.status === Registration.ServerNoRegistration ? i18n("Registration is disabled on this server.") : ""
-        Keys.onReturnPressed: {
-            if (root.nextAction.enabled) {
-                root.nextAction.trigger()
+    }
+
+    onHomeserverChanged: {
+        LoginHelper.testHomeserver("@user:" + homeserver)
+    }
+
+    Kirigami.FormLayout {
+        Component.onCompleted: Controller.testHomeserver(homeserver)
+
+        QQC2.ComboBox {
+            id: serverCombo
+
+            Kirigami.FormData.label: i18n("Homeserver:")
+            model: ["matrix.org", "kde.org", "tchncs.de", i18n("Other...")]
+        }
+
+        QQC2.TextField {
+            id: customHomeserver
+
+            Kirigami.FormData.label: i18n("Url:")
+            visible: serverCombo.currentIndex === 3
+            onTextChanged: {
+                Controller.testHomeserver(text)
+            }
+            validator: RegularExpressionValidator {
+                regularExpression: /([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9]+(:[0-9]+)?/
            }
        }
-    }

-    Timer {
-        id: timer
-        interval: 500
-        onTriggered: Registration.homeserver = urlField.text
-    }
-
-    nextAction: Kirigami.Action {
-        text: Registration.testing ? i18n("Loading") : null
-        enabled: Registration.status > Registration.ServerNoRegistration
-        onTriggered: root.processed("qrc:/Username.qml");
-    }
-    previousAction: Kirigami.Action {
-        onTriggered: root.processed("qrc:/LoginRegister.qml")
+        QQC2.Button {
+            id: continueButton
+            text: i18nc("@action:button", "Continue")
+            action: root.action
+        }
    }
 }
--- a/src/qml/Component/Login/Loading.qml
+++ b/src/qml/Component/Login/Loading.qml
@@ -6,19 +6,16 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.20 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard

 import org.kde.neochat 1.0

-LoginStep {
-    id: root
-    FormCard.FormTextDelegate {
+Kirigami.LoadingPlaceholder {
+    property var showContinueButton: false
+    property var showBackButton: false
+
+    QQC2.Label {
        text: i18n("Please wait. This might take a little while.")
    }
-    FormCard.AbstractFormDelegate {
-        contentItem: QQC2.BusyIndicator {}
-        background: null
-    }

    Connections {
        target: Controller
--- a/src/qml/Component/Login/Login.qml
+++ b/src/qml/Component/Login/Login.qml
@@ -7,34 +7,43 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard

 import org.kde.neochat 1.0

 LoginStep {
-    id: root
+    id: login

-    onActiveFocusChanged: if (activeFocus) matrixIdField.forceActiveFocus()
+    showContinueButton: true
+    showBackButton: false
+
+    title: i18nc("@title", "Login")
+    message: i18n("Enter your Matrix ID")

    Component.onCompleted: {
        LoginHelper.matrixId = ""
    }

-    FormCard.FormTextFieldDelegate {
-        id: matrixIdField
-        label: i18n("Matrix ID:")
-        placeholderText: "@user:example.org"
-        Accessible.name: i18n("Matrix ID")
-        onTextChanged: {
-            LoginHelper.matrixId = text
-        }
+    Kirigami.FormLayout {
+        QQC2.TextField {
+            id: matrixIdField
+            Kirigami.FormData.label: i18n("Matrix ID:")
+            placeholderText: "@user:matrix.org"
+            Accessible.name: i18n("Matrix ID")
+            onTextChanged: {
+                LoginHelper.matrixId = text
+            }

-        Keys.onReturnPressed: {
-            root.nextAction.trigger()
+            Component.onCompleted: {
+                matrixIdField.forceActiveFocus()
+            }
+
+            Keys.onReturnPressed: {
+                login.action.trigger()
+            }
        }
    }

-    nextAction: Kirigami.Action {
+    action: Kirigami.Action {
        text: LoginHelper.isLoggedIn ? i18n("Already logged in") : (LoginHelper.testing && matrixIdField.acceptableInput) ?  i18n("Loading…") : i18nc("@action:button", "Continue")
        onTriggered: {
            if (LoginHelper.supportsSso && LoginHelper.supportsPassword) {
@@ -47,9 +56,4 @@ LoginStep {
        }
        enabled: LoginHelper.homeserverReachable
    }
-    previousAction: Kirigami.Action {
-        onTriggered: {
-            root.processed("qrc:/LoginRegister.qml")
-        }
-    }
 }
--- a/src/qml/Component/Login/LoginMethod.qml
+++ b/src/qml/Component/Login/LoginMethod.qml
@@ -4,26 +4,28 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
-
 import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard

 import org.kde.neochat 1.0

 LoginStep {
-    id: root
+    id: loginMethod

-    onActiveFocusChanged: if (activeFocus) loginPasswordButton.forceActiveFocus()
+    title: i18n("Login Methods")

-    FormCard.FormButtonDelegate {
-        id: loginPasswordButton
-        text: i18nc("@action:button", "Login with password")
+    Layout.alignment: Qt.AlignHCenter
+
+    QQC2.Button {
+        Layout.alignment: Qt.AlignHCenter
+        text: i18n("Login with password")
+        Layout.preferredWidth: Kirigami.Units.gridUnit * 12
        onClicked: processed("qrc:/Password.qml")
    }

-    FormCard.FormButtonDelegate {
-        id: loginSsoButton
-        text: i18nc("@action:button", "Login with single sign-on")
+    QQC2.Button {
+        Layout.alignment: Qt.AlignHCenter
+        text: i18n("Login with single sign-on")
+        Layout.preferredWidth: Kirigami.Units.gridUnit * 12
        onClicked: processed("qrc:/Sso.qml")
    }
 }
--- a/src/qml/Component/Login/LoginRegister.qml
+++ b/src/qml/Component/Login/LoginRegister.qml
@@ -6,25 +6,25 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard

 import org.kde.neochat 1.0

 LoginStep {
-    id: root
+    id: loginRegister

-    onActiveFocusChanged: if (activeFocus) loginButton.forceActiveFocus()
+    Layout.alignment: Qt.AlignHCenter

-    Layout.fillWidth: true
-
-    FormCard.FormButtonDelegate {
-        id: loginButton
-        text: i18nc("@action:button", "Login")
-        onClicked: root.processed("qrc:/Login.qml")
+    QQC2.Button {
+        Layout.alignment: Qt.AlignHCenter
+        text: i18n("Login")
+        Layout.preferredWidth: Kirigami.Units.gridUnit * 12
+        onClicked: processed("qrc:/Login.qml")
    }

-    FormCard.FormButtonDelegate {
-        text: i18nc("@action:button", "Register")
-        onClicked: root.processed("qrc:/Homeserver.qml")
+    QQC2.Button {
+        Layout.alignment: Qt.AlignHCenter
+        text: i18n("Register")
+        Layout.preferredWidth: Kirigami.Units.gridUnit * 12
+        onClicked: processed("qrc:/Homeserver.qml")
    }
 }
--- a/src/qml/Component/Login/LoginStep.qml
+++ b/src/qml/Component/Login/LoginStep.qml
@@ -7,25 +7,21 @@ import QtQuick.Layouts 1.14

 /// Step for the login/registration flow
 ColumnLayout {
-    id: root

-    /// Set to true if the login step does not have any controls. This will ensure that the focus remains on the "continue" button
-    property bool noControls: false
+    property string title: i18n("Welcome")
+    property string message: i18n("Welcome")
+    property bool showContinueButton: false
+    property bool showBackButton: false
+    property bool acceptable: false
+    property string previousUrl: ""

    /// Process this module, this is called by the continue button.
    /// Should call \sa processed when it finish successfully.
-    property QQC2.Action nextAction: null
-
-    /// Go to the previous module. This is called by the "go back" button.
-    /// If no "go back" button should be shown, this should be null.
-    property QQC2.Action previousAction: null
+    property QQC2.Action action: null

    /// Called when switching to the next step.
    signal processed(url nextUrl)

-    /// Show a message in a banner at the top of the page.
    signal showMessage(string message)

-    /// Clears any error messages currently being shown
-    signal clearError()
 }
--- a/src/qml/Component/Login/Password.qml
+++ b/src/qml/Component/Login/Password.qml
@@ -6,12 +6,25 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard

 import org.kde.neochat 1.0

 LoginStep {
-    id: root
+    id: password
+
+    title: i18nc("@title", "Password")
+    message: i18n("Enter your password")
+    showContinueButton: true
+    showBackButton: true
+    previousUrl: LoginHelper.isLoggingIn ? "" : LoginHelper.supportsSso ? "qrc:/LoginMethod.qml" : "qrc:/Login.qml"
+
+    action: Kirigami.Action {
+        text: i18nc("@action:button", "Login")
+        enabled: passwordField.text.length > 0 && !LoginHelper.isLoggingIn
+        onTriggered: {
+            LoginHelper.login();
+        }
+    }

    Connections {
        target: LoginHelper
@@ -20,32 +33,20 @@ LoginStep {
        }
    }

-    onActiveFocusChanged: if(activeFocus) passwordField.forceActiveFocus()
+    Kirigami.FormLayout {
+        Kirigami.PasswordField {
+            id: passwordField
+            onTextChanged: LoginHelper.password = text
+            enabled: !LoginHelper.isLoggingIn
+            Accessible.name: i18n("Password")

-    FormCard.FormTextFieldDelegate {
-        id: passwordField
+            Component.onCompleted: {
+                passwordField.forceActiveFocus()
+            }

-        label: i18n("Password:")
-        onTextChanged: LoginHelper.password = text
-        enabled: !LoginHelper.isLoggingIn
-        echoMode: TextInput.Password
-        Accessible.name: i18n("Password")
-        statusMessage: LoginHelper.isInvalidPassword ? i18n("Invalid username or password") : ""
-
-        Keys.onReturnPressed: {
-            root.nextAction.trigger()
+            Keys.onReturnPressed: {
+                password.action.trigger()
+            }
        }
    }
-
-    nextAction: Kirigami.Action {
-        text: i18nc("@action:button", "Login")
-        enabled: passwordField.text.length > 0 && !LoginHelper.isLoggingIn
-        onTriggered: {
-            root.clearError()
-            LoginHelper.login();
-        }
-    }
-    previousAction: Kirigami.Action {
-        onTriggered: processed("qrc:/Login.qml")
-    }
 }
--- a/src/qml/Component/Login/RegisterPassword.qml
+++ b/src/qml/Component/Login/RegisterPassword.qml
@@ -1,51 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.12 as QQC2
-
-import org.kde.kirigami 2.12 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
-
-import org.kde.neochat 1.0
-
-LoginStep {
-    id: root
-
-    onActiveFocusChanged: if (activeFocus) passwordField.forceActiveFocus()
-
-    FormCard.FormTextFieldDelegate {
-        id: passwordField
-        label: i18n("Password:")
-        echoMode: TextInput.Password
-        onTextChanged: Registration.password = text
-        Keys.onReturnPressed: {
-            confirmPasswordField.forceActiveFocus()
-        }
-    }
-
-    FormCard.FormTextFieldDelegate {
-        id: confirmPasswordField
-        label: i18n("Confirm Password:")
-        enabled: passwordField.enabled
-        echoMode: TextInput.Password
-        statusMessage: passwordField.text.length === confirmPasswordField.text.length && passwordField.text !== confirmPasswordField.text ? i18n("The passwords do not match.") : ""
-        Keys.onReturnPressed: {
-            if (root.nextAction.enabled) {
-                root.nextAction.trigger()
-            }
-        }
-    }
-
-    nextAction: Kirigami.Action {
-        onTriggered: {
-            passwordField.enabled = false
-            Registration.registerAccount()
-        }
-        enabled: passwordField.text === confirmPasswordField.text
-    }
-
-    previousAction: Kirigami.Action {
-        onTriggered: root.processed("qrc:/Username.qml")
-    }
-}
--- a/src/qml/Component/Login/Sso.qml
+++ b/src/qml/Component/Login/Sso.qml
@@ -6,38 +6,47 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.12 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard

 import org.kde.neochat 1.0

 LoginStep {
    id: root

-    noControls: true
+    title: i18nc("@title", "Login")
+    message: i18n("Login with single sign-on")

-    Component.onCompleted: LoginHelper.loginWithSso()
-
-    Connections {
-        target: LoginHelper
-        function onSsoUrlChanged() {
-            UrlHelper.openUrl(LoginHelper.ssoUrl)
+    Kirigami.FormLayout {
+        Connections {
+            target: LoginHelper
+            function onSsoUrlChanged() {
+                UrlHelper.openUrl(LoginHelper.ssoUrl)
+                root.showMessage(i18n("Complete the authentication steps in your browser"))
+                loginButton.enabled = true
+                loginButton.text = i18n("Login")
+            }
+            function onConnected() {
+                processed("qrc:/Loading.qml")
+            }
        }
-        function onConnected() {
-            processed("qrc:/Loading.qml")
+        RowLayout {
+            QQC2.Button {
+                text: i18nc("@action:button", "Back")
+
+                onClicked: {
+                    module.source = "qrc:/Login.qml"
+                }
+            }
+            QQC2.Button {
+                id: loginButton
+                text: i18n("Login")
+                onClicked: {
+                    LoginHelper.loginWithSso()
+                    loginButton.enabled = false
+                    loginButton.text = i18n("Loading…")
+                }
+                Component.onCompleted: forceActiveFocus()
+                Keys.onReturnPressed: clicked()
+            }
        }
    }
-
-    FormCard.FormTextDelegate {
-        text: i18n("Continue the login process in your browser.")
-    }
-
-    previousAction: Kirigami.Action {
-        onTriggered: processed("qrc:/Login.qml")
-    }
-
-    nextAction: Kirigami.Action {
-        text: i18nc("@action:button", "Re-open SSO URL")
-        onTriggered: UrlHelper.openUrl(LoginHelper.ssoUrl)
-    }
 }
-
--- a/src/qml/Component/Login/Terms.qml
+++ b/src/qml/Component/Login/Terms.qml
@@ -1,39 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.12 as QQC2
-import QtQuick.Layouts 1.12
-
-import org.kde.kirigami 2.12 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
-
-import org.kde.neochat 1.0
-
-LoginStep {
-    id: root
-
-    noControls: true
-
-    FormCard.FormTextDelegate {
-        text: i18n("Terms & Conditions")
-        description: i18n("By continuing with the registration, you agree to the following terms and conditions:")
-    }
-
-    Repeater {
-        model: Registration.terms
-        delegate: FormCard.FormTextDelegate {
-            text: "<a href=\"" + modelData.url + "\">" + modelData.title + "</a>"
-            onLinkActivated: Qt.openUrlExternally(modelData.url)
-        }
-    }
-
-    nextAction: Kirigami.Action {
-        onTriggered: {
-            Registration.registerAccount()
-        }
-    }
-    previousAction: Kirigami.Action {
-        onTriggered: root.processed("qrc:/Username.qml")
-    }
-}
--- a/src/qml/Component/Login/Username.qml
+++ b/src/qml/Component/Login/Username.qml
@@ -1,46 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.12 as QQC2
-
-import org.kde.kirigami 2.12 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
-
-import org.kde.neochat 1.0
-
-LoginStep {
-    id: root
-
-    onActiveFocusChanged: if (activeFocus) usernameField.forceActiveFocus()
-
-    FormCard.FormTextFieldDelegate {
-        id: usernameField
-        label: i18n("Username:")
-        placeholderText: "user"
-        onTextChanged: timer.restart()
-        statusMessage: Registration.status === Registration.UsernameTaken ? i18n("Username unavailable") : ""
-        Keys.onReturnPressed: {
-            if (root.nextAction.enabled) {
-                root.nextAction.trigger()
-            }
-        }
-    }
-
-    Timer {
-        id: timer
-        interval: 500
-        onTriggered: Registration.username = usernameField.text
-    }
-
-    nextAction: Kirigami.Action {
-        text: Registration.status === Registration.TestingUsername ? i18n("Loading") : null
-
-        onTriggered: root.processed("qrc:/RegisterPassword.qml")
-        enabled: Registration.status === Registration.Ready
-    }
-
-    previousAction: Kirigami.Action {
-        onTriggered: root.processed("qrc:/Homeserver.qml")
-    }
-}
--- a/src/qml/Component/NeochatMaximizeComponent.qml
+++ b/src/qml/Component/NeochatMaximizeComponent.qml
@@ -28,6 +28,8 @@ Components.AlbumMaximizeComponent {

    readonly property var currentJsonSource: model.data(model.index(content.currentIndex, 0), MessageEventModel.SourceRole)

+    autoLoad: false
+
    downloadAction: Components.DownloadAction {
        id: downloadAction
        onTriggered: {
@@ -89,7 +91,7 @@ Components.AlbumMaximizeComponent {
            file: parent,
            mimeType: root.currentMimeType,
            progressInfo: root.currentProgressInfo,
-            plainText: root.currentPlainText
+            plainMessage: root.currentPlainText
        });
        contextMenu.closeFullscreen.connect(root.close)
        contextMenu.open();
--- a/src/qml/Component/Timeline/TimelineContainer.qml
+++ b/src/qml/Component/Timeline/TimelineContainer.qml
@@ -375,7 +375,10 @@ ColumnLayout {
            MouseArea {
                anchors.fill: parent
                onClicked: {
-                    RoomManager.visitUser(root.author.object, "mention")
+                    userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
+                        room: currentRoom,
+                        user: root.author
+                    }).open();
                }
                cursorShape: Qt.PointingHandCursor
            }
@@ -456,7 +459,10 @@ ColumnLayout {
                                anchors.fill: parent
                                cursorShape: Qt.PointingHandCursor
                                onClicked: {
-                                    RoomManager.visitUser(root.author.object, "mention")
+                                    userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
+                                        room: currentRoom,
+                                        user: root.author
+                                    }).open();
                                }
                            }
                        }
@@ -599,7 +605,6 @@ ColumnLayout {
            source: root.jsonSource,
            eventType: root.delegateType,
            plainText: root.plainText,
-            htmlText: root.display,
        });
        contextMenu.open();
    }
--- a/src/qml/Component/Timeline/VideoDelegate.qml
+++ b/src/qml/Component/Timeline/VideoDelegate.qml
@@ -177,13 +177,13 @@ TimelineContainer {

        onDurationChanged: {
            if (!duration) {
-                root.supportStreaming = false;
+                vid.supportStreaming = false;
            }
        }

        onErrorChanged: {
            if (error != MediaPlayer.NoError) {
-                root.supportStreaming = false;
+                vid.supportStreaming = false;
            }
        }

@@ -391,7 +391,7 @@ TimelineContainer {

        TapHandler {
            acceptedButtons: Qt.LeftButton
-            onTapped: if (root.supportStreaming || root.progressInfo.completed) {
+            onTapped: if (vid.supportStreaming || root.progressInfo.completed) {
                if (vid.playbackState == MediaPlayer.PlayingState) {
                    vid.pause()
                } else {
--- a/src/qml/Component/TimelineView.qml
+++ b/src/qml/Component/TimelineView.qml
@@ -17,10 +17,10 @@ QQC2.ScrollView {
    required property NeoChatRoom currentRoom
    onCurrentRoomChanged: {
        roomChanging = true;
-        roomChangingTimer.restart()
        applicationWindow().hoverLinkIndicator.text = "";
        messageListView.positionViewAtBeginning();
        hasScrolledUpBefore = false;
+        roomChanging = true;
    }
    property bool roomChanging: false
    readonly property bool atYEnd: messageListView.atYEnd
@@ -47,16 +47,19 @@ QQC2.ScrollView {
        interactive: Kirigami.Settings.isMobile
        bottomMargin: Kirigami.Units.largeSpacing + Math.round(Kirigami.Theme.defaultFont.pointSize * 2)

-        model: sortedMessageEventModel
+        model: collapseStateProxyModel

        MessageEventModel {
            id: messageEventModel
            room: root.currentRoom
        }

-        MessageFilterModel {
-            id: sortedMessageEventModel
-            sourceModel: messageEventModel
+        CollapseStateProxyModel {
+            id: collapseStateProxyModel
+            sourceModel: MessageFilterModel {
+                id: sortedMessageEventModel
+                sourceModel: messageEventModel
+            }
        }

        Timer {
@@ -76,13 +79,6 @@ QQC2.ScrollView {
            messageEventModel.fetchMore(messageEventModel.index(0, 0));
        }

-        Timer {
-            id: roomChangingTimer
-            interval: 1000
-            onTriggered: {
-                root.roomChanging = false
-            }
-        }
        onAtYEndChanged: if (!root.roomChanging) {
            if (atYEnd && root.hasScrolledUpBefore) {
                if (QQC2.ApplicationWindow.window && (QQC2.ApplicationWindow.window.visibility !== QQC2.ApplicationWindow.Hidden)) {
@@ -219,6 +215,12 @@ QQC2.ScrollView {
            FileDelegateContextMenu {}
        }

+        Component {
+            id: userDetailDialog
+
+            UserDetailDialog {}
+        }
+
        TypingPane {
            id: typingPane
            visible: root.currentRoom && root.currentRoom.usersTyping.length > 0
@@ -346,7 +348,7 @@ QQC2.ScrollView {

        MediaMessageFilterModel {
            id: mediaMessageFilterModel
-            sourceModel: sortedMessageEventModel
+            sourceModel: collapseStateProxyModel
        }

        Component {
@@ -436,4 +438,11 @@ QQC2.ScrollView {
    function positionViewAtBeginning() {
        messageListView.positionViewAtBeginning()
    }
+
+    function showUserDetail(user) {
+        userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
+            room: root.currentRoom,
+            user: root.currentRoom.getUser(user.id),
+        }).open();
+    }
 }
--- a/src/qml/Dialog/ConfirmDeactivateAccountDialog.qml
+++ b/src/qml/Dialog/ConfirmDeactivateAccountDialog.qml
@@ -1,46 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.20 as Kirigami
-import org.kde.kirigamiaddons.formcard 1.0 as FormCard
-
-import org.kde.neochat 1.0
-
-FormCard.FormCardPage {
-    id: root
-
-    required property NeoChatConnection connection
-
-    title: i18nc("@title", "Deactivate Account")
-
-    FormCard.FormHeader {
-        title: i18nc("@title", "Deactivate Account")
-    }
-    FormCard.FormCard {
-        FormCard.FormTextDelegate {
-            text: i18nc("@title", "Warning")
-            description: i18n("Your account will be permanently disabled.\nThis cannot be undone.\nYour Matrix ID will not be available for new accounts.\nYour messages will stay available.")
-        }
-
-        FormCard.FormTextFieldDelegate {
-            id: passwordField
-            label: i18n("Password")
-            echoMode: TextInput.Password
-        }
-
-        FormCard.FormButtonDelegate {
-            text: i18n("Deactivate account")
-            icon.name: "emblem-warning"
-            enabled: passwordField.text.length > 0
-            onClicked: {
-                root.connection.deactivateAccount(passwordField.text)
-                root.closeDialog()
-            }
-        }
-    }
-}
--- a/src/qml/Dialog/ConfirmLogout.qml
+++ b/src/qml/Dialog/ConfirmLogout.qml
@@ -11,7 +11,7 @@ import org.kde.neochat 1.0
 QQC2.Dialog {
    id: root

-    required property NeoChatConnection connection
+    property var connection

    ColumnLayout {
        Kirigami.Heading {
@@ -37,7 +37,7 @@ QQC2.Dialog {
            text: i18n("Sign out")
            QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
            onClicked: {
-                root.connection.logout(true);
+                Controller.logout(root.connection, true);
                root.close();
                root.accepted();
            }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Carl Schwan	8177c1f1bc	Port About page to FormCard	2023-08-22 22:03:35 +00:00
Carl Schwan	80171748d8	Port more MobileForm to FormCard - DevTools - Network settings - Push notification - Permissions	2023-08-22 22:03:35 +00:00
Carl Schwan	6aa2e586de	Port to form card	2023-08-22 22:03:35 +00:00