Since only 1 message can be edited instantiate just 1 instance of ChatDocumentHandler and update when a message is edited.

Update linkpreviewer to minimise the number of resizes.

- There is now a placeholder loading element to hold space while the data is obtained
- The component starts with a set size but can be expanded to see the whole item.
- The expand/contract button is only visible on hover
- The default size is picked to show 3 lines of text (1 heading and 2 description, 2 heading and 1 description, etc)

This is designed to help with the timeline scroll jumping CCBUG: 463235 by minimizing the amount of resizing for items in the timeline.

Before

![image](/uploads/bb46f55dc38851e640a7382aafea8640/image.png)

After when compressed

![image](/uploads/3cbc7894688721d944a5551251b12a12/image.png)

After When expanded

![image](/uploads/50ff53fe51eefe88713a2ded34530534/image.png)

After Loading

![image](/uploads/72567f805af6b08ab0c5fc1cf94bd247/image.png)

.flatpak-manifest.json

@@ -2,7 +2,7 @@
     "id": "org.kde.neochat",
     "branch": "master",
     "runtime": "org.kde.Platform",
-    "runtime-version": "5.15-21.08",
+    "runtime-version": "5.15-22.08",
     "sdk": "org.kde.Sdk",
     "command": "neochat",
     "tags": [

.gitignore

@@ -9,3 +9,4 @@ compile_commands.json
 kate.project.ctags.*
 *.user
 .flatpak-builder/
+.idea/

.gitlab-ci.yml

@@ -4,9 +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
-# TODO enable once we can have qt6 libQuotient on the CI
-#  - 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/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

.kde-ci.yml

@@ -15,6 +15,10 @@ Dependencies:
     'libraries/kquickimageeditor': '@stable'
     'frameworks/sonnet': '@stable'
     'libraries/kirigami-addons': '@latest'
+    'third-party/libquotient': '@latest'
+    'third-party/qtkeychain': '@latest'
+    'third-party/cmark': '@latest'
+    'third-party/qcoro': '@latest'
 - 'on': ['Windows', 'Linux', 'FreeBSD']
   'require':
     'frameworks/qqc2-desktop-style': '@stable'
@@ -26,4 +30,4 @@ Dependencies:
     'frameworks/kdbusaddons': '@stable'
 
 Options:
-  require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ]
+  require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD', 'Windows' ]

CMakeLists.txt

@@ -6,11 +6,19 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(NeoChat)
-set(PROJECT_VERSION "22.11")
+# KDE Applications version, managed by release script.
+set(RELEASE_SERVICE_VERSION_MAJOR "23")
+set(RELEASE_SERVICE_VERSION_MINOR "03")
+set(RELEASE_SERVICE_VERSION_MICRO "70")
+set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
+
+project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
 
 set(KF5_MIN_VERSION "5.91.0")
 set(QT_MIN_VERSION "5.15.2")
+if (ANDROID)
+    set(QT_MIN_VERSION "5.15.8")
+endif()
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 
@@ -112,10 +120,7 @@ set_package_properties(KQuickImageEditor PROPERTIES
     PURPOSE "Add image editing capability to image attachments"
 )
 
-find_package(QCoro${QT_MAJOR_VERSION} COMPONENTS Core QUIET)
-if(NOT QCoro${QT_MAJOR_VERSION}_FOUND)
-    find_package(QCoro REQUIRED)
-endif()
+find_package(QCoro${QT_MAJOR_VERSION} 0.4 COMPONENTS Core REQUIRED)
 
 qcoro_enable_coroutines()
 
@@ -125,6 +130,8 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
     TYPE OPTIONAL
 )
 
+find_package(Sqlite3)
+
 if(NOT Quotient_VERSION_MINOR GREATER 6)
     cmake_policy(SET CMP0063 OLD)
 endif()

android/AndroidManifest.xml

@@ -14,7 +14,8 @@
                   android:name="org.qtproject.qt5.android.bindings.QtActivity"
                   android:label="NeoChat"
                   android:windowSoftInputMode="adjustResize"
-                  android:launchMode="singleTop">
+                  android:launchMode="singleTop"
+                  android:exported="true">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -22,7 +23,6 @@
             </intent-filter>
 
             <meta-data android:name="android.app.lib_name" android:value="neochat-app"/>
-            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
             <meta-data android:name="android.app.repository" android:value="default"/>
             <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
             <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
@@ -38,8 +38,6 @@
             <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
             <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
             <!--  Messages maps -->
-            <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
-            <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
             <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
 
             <!-- Splash screen -->

android/build.gradle

@@ -12,7 +12,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.4'
+        classpath 'com.android.tools.build:gradle:7.0.2'
     }
 }
 
@@ -73,6 +73,10 @@ android {
     defaultConfig {
         minSdkVersion qtMinSdkVersion
         targetSdkVersion qtTargetSdkVersion
+        applicationId "org.kde.neochat"
+        namespace "org.kde.neochat"
+        versionCode timestamp
+        versionName projectVersionFull
         manifestPlaceholders = [versionName: projectVersionFull, versionCode: timestamp]
     }
 

autotests/neochatroomtest.cpp

@@ -5,9 +5,7 @@
 #include <QSignalSpy>
 #include <QTest>
 
-#define protected public // please don't hate me
 #include "neochatroom.h"
-#undef protected
 
 #include <connection.h>
 #include <quotient_common.h>
@@ -15,12 +13,23 @@
 
 using namespace Quotient;
 
+class TestRoom : public NeoChatRoom
+{
+public:
+    using NeoChatRoom::NeoChatRoom;
+
+    void update(SyncRoomData &&data, bool fromCache = false)
+    {
+        Room::updateData(std::move(data), fromCache);
+    }
+};
+
 class NeoChatRoomTest : public QObject {
     Q_OBJECT
 
 private:
     Connection *connection = nullptr;
-    NeoChatRoom *room = nullptr;
+    TestRoom *room = nullptr;
 
 private Q_SLOTS:
     void initTestCase();
@@ -31,7 +40,7 @@ private Q_SLOTS:
 void NeoChatRoomTest::initTestCase()
 {
     connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new NeoChatRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
+    room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
 
     auto json = QJsonDocument::fromJson(R"EVENT({
   "account_data": {
@@ -121,7 +130,7 @@ void NeoChatRoomTest::initTestCase()
   }
 })EVENT");
     SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, json.object());
-    room->updateData(std::move(roomData));
+    room->update(std::move(roomData));
 }
 
 void NeoChatRoomTest::subtitleTextTest()

org.kde.neochat.appdata.xml

@@ -16,6 +16,7 @@
   <name xml:lang="ca-valencia">NeoChat</name>
   <name xml:lang="cs">NeoChat</name>
   <name xml:lang="de">NeoChat</name>
+  <name xml:lang="el">NeoChat</name>
   <name xml:lang="en-GB">NeoChat</name>
   <name xml:lang="es">NeoChat</name>
   <name xml:lang="eu">NeoChat</name>
@@ -34,6 +35,7 @@
   <name xml:lang="pl">NeoChat</name>
   <name xml:lang="pt">NeoChat</name>
   <name xml:lang="pt-BR">NeoChat</name>
+  <name xml:lang="ru">NeoChat</name>
   <name xml:lang="sk">NeoChat</name>
   <name xml:lang="sl">NeoChat</name>
   <name xml:lang="sv">NeoChat</name>
@@ -49,6 +51,7 @@
   <summary xml:lang="ca-valencia">Un client per a Matrix, el protocol de comunicacions descentralitzat</summary>
   <summary xml:lang="cs">Klient pro decentralizovaný komunikační protokol matrix</summary>
   <summary xml:lang="de">Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll</summary>
+  <summary xml:lang="el">Ένας πελάτης για το Matrix, το αποκεντρωμένο πρωτόκολλο επικοινωνίας</summary>
   <summary xml:lang="en-GB">A client for matrix, the decentralised communication protocol</summary>
   <summary xml:lang="es">Un cliente para Matrix, el protocolo de comunicaciones descentralizado</summary>
   <summary xml:lang="eu">Matrix, deszentralizatutako komunikazio protokolorako bezero bat</summary>
@@ -67,6 +70,7 @@
   <summary xml:lang="pl">Program do obsługi matriksa, rozproszonego protokołu porozumiewania się</summary>
   <summary xml:lang="pt">Um cliente para o Matrix, o protocolo de comunicação descentralizado</summary>
   <summary xml:lang="pt-BR">Um cliente do Matrix, o protocolo de comunicação descentralizado</summary>
+  <summary xml:lang="ru">Клиент для Matrix — децентрализованного коммуникационного протокола</summary>
   <summary xml:lang="sk">Klient pre matrix, decentralizovaný komunikačný protokol</summary>
   <summary xml:lang="sl">Odjemalec za matrix, decentralizirani komunikacijski protokol</summary>
   <summary xml:lang="sv">En klient för Matrix, det decentraliserade kommunikationsprotokollet</summary>
@@ -81,6 +85,7 @@
     <p xml:lang="ca">El NeoChat és un client de Matrix. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics usant el protocol Matrix.</p>
     <p xml:lang="ca-valencia">NeoChat és un client de Matrix. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics utilitzant el protocol Matrix.</p>
     <p xml:lang="de">NeoChat ist ein Matrix-Client. Er ermöglicht Ihnen das Senden von Textnachrichten, Videos und Audiodateien an Ihre Familie, Kollegen und Freunde unter Verwendung des Matrix-Protokolls.</p>
+    <p xml:lang="el">Το NeoChat είναι μια εφαρμογή του Matrix. Σας επιτρέπει να στέλνετε μηνύματα κειμένου, βίντεο και ήχο στην οικογένειά σας, σε συναδέλφους και φίλους με το πρωτόκολλο Matrix.</p>
     <p xml:lang="en-GB">NeoChat is a Matrix client. It allows you to send text messages, videos and audio files to your family, colleagues and friends using the Matrix protocol.</p>
     <p xml:lang="es">NeoChat es un cliente para Matrix. Le permite enviar mensajes de texto, vídeos y archivos de sonido a su familia, compañeros de trabajo y amigos usando el protocolo Matrix.</p>
     <p xml:lang="eu">NeoChat Matrix bezero bat da. Familiari, lankideei eta lagunei testu-mezuak, bideoak eta audio-fitxategiak bidaltzeko aukera ematen du, Matrix protokoloa erabiliz.</p>
@@ -97,6 +102,7 @@
     <p xml:lang="pl">NeoChat jest programem do Matrisa. Umożliwia wysyłanie wiadomości tekstowych, filmów oraz dźwięku do twojej rodziny, znajomych oraz przyjaciół poprzez protokół Matriksa.</p>
     <p xml:lang="pt">O NeoChat é um cliente do Matrix. O mesmo permite-lhe enviar mensagens de texto, ficheiros de vídeo e áudio para a sua família, colegas e amigos com o protocolo Matrix.</p>
     <p xml:lang="pt-BR">O NeoChat é um cliente Matrix. Ele permite a você enviar mensagens de texto, arquivos de vídeo e áudio para seus familiares, colegas e amigos usando o protocolo Matrix.</p>
+    <p xml:lang="ru">NeoChat — это клиент, поддерживающий работу с протоколом Matrix. Он позволяет  отправлять текстовые сообщения, видео и аудиофайлы.</p>
     <p xml:lang="sk">NeoChat je Matrix klient. Umožňuje vám posielať textové správy, videá a zvukové súbory rodine, kolegom a priateľom pomocou protokolu Matrix.</p>
     <p xml:lang="sl">NeoChat je odjemalec Matrixa. Dovoljuje vam pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, kolegom in prijateljem z uporabo protokola Matrix.</p>
     <p xml:lang="sv">NeoChat är en Matrix-klient. Den låter dig skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner med användning av Matrix-protokollet.</p>
@@ -110,6 +116,7 @@
     <p xml:lang="ca">Matrix és un protocol de comunicacions descentralitzat, que retorna el control a l'usuari. Actualment el NeoChat implementa una gran part del protocol amb l'excepció dels xats encriptats i els xats de vídeo.</p>
     <p xml:lang="ca-valencia">Matrix és un protocol de comunicacions descentralitzat, que retorna el control a l'usuari. Actualment NeoChat implementa una gran part del protocol amb l'excepció dels xats encriptats i els xats de vídeo.</p>
     <p xml:lang="de">Matrix ist ein dezentralisiertes Kommunikationsprotokoll, das dem Benutzer wieder die Kontrolle zurückgibt. Derzeit implementiert NeoChat einen großen Teil des Protokolls mit der Ausnahme von verschlüsselten Chats und Video-Chat.</p>
+    <p xml:lang="el">Το Matrix είναι ένα αποκεντρωμένο πρωτόκολλο επικοινωνίας, δίνοντας πίσω στον χρήστη τον έλεγχο. Προς το παρόν το NeoChat υλοποιεί ένα μεγάλο μέρος του πρωτοκόλλου με εξαίρεση τις κρυπτογραφημένες συνομιλίες και τη συνομιλία με βίντεο.</p>
     <p xml:lang="en-GB">Matrix is a decentralised communication protocol, putting the user back in control. Currently NeoChat implements large part of the protocol with the exception of encrypted chats and video chat.</p>
     <p xml:lang="es">Matrix es un protocolo de comunicaciones descentralizado, que devuelve el control al usuario. En la actualidad, NeoChat implementa gran parte del protocolo con la excepción de chats cifrados y chats de vídeo.</p>
     <p xml:lang="eu">Matrix komunikazio-protokolo deszentralizatu bat da, erabiltzaileari kontrola itzultzen diona. Gaur egun, NeoChat-ek protokoloaren zati handi bat inplementatzen du, berriketa zifratuak eta bideo berriketak izan ezik.</p>
@@ -126,6 +133,7 @@
     <p xml:lang="pl">Matrix jest protokołem rozproszonego porozumiewania się oddający użytkownikowi jego władzę. Obecnie NeoChat obsługuje dużą część protokołu poza szyfrowanymi rozmowami tekstowymi i z obrazem.</p>
     <p xml:lang="pt">O Matrix é um protocolo de comunicações descentralizado, colocando de novo o utilizador no poder. De momento, o NeoChat implementa uma boa parte do protocolo, com a excepção das conversas encriptadas e as conversas de vídeo.</p>
     <p xml:lang="pt-BR">O Matrix é um protocolo de comunicação descentralizado, colocando o usuário de volta no controle. Atualmente o NeoChat implementa grande parte do protocolo com a exceção de bate-papos criptografados e bate-papo por vídeo.</p>
+    <p xml:lang="ru">Matrix — это децентрализованный коммуникационный протокол, возвращающий пользователю контроль над своими данными. В настоящее время в приложении NeoChat реализована поддержка большей части протокола, за исключением зашифрованных чатов и видеочата.</p>
     <p xml:lang="sk">Matrix je decentralizovaný komunikačný protokol, ktorý používateľovi vracia kontrolu. V súčasnosti NeoChat implementuje veľkú časť protokolu s výnimkou šifrovaných chatov a videohovorov.</p>
     <p xml:lang="sl">Matrix je decentraliziran komunikacijski protokol, kjer ima uporabnik uporabnik kontrolo rabe. Trenutno ima NeoChat izveden velik del protokola z izjemo šifriranih klepetov in video klepetov.</p>
     <p xml:lang="sv">Matrix är ett decentraliserat kommunikationsprotokoll, som ger tillbaka kontrollen till användaren. För närvarande implementerar NeoChat en stor del av protokollet, med undantag för krypterad chatt och videochatt.</p>
@@ -138,7 +146,8 @@
     <p xml:lang="az">Vahid istifadəçi interfeysi ilə təmin olunan NeoChat, həm mobil telefonda həm də kompyuterlərdə işləyir.</p>
     <p xml:lang="ca">El NeoChat funciona en els mòbils i a l'escriptori, proporcionant una experiència d'usuari coherent.</p>
     <p xml:lang="ca-valencia">NeoChat funciona en els mòbils i en l'escriptori, proporcionant una experiència d'usuari coherent.</p>
-    <p xml:lang="de">NeoChat funktioniert sowohl auf dem Mobiltelefon als auch auf dem Arbeitsfläche und bietet ein einheitliches Benutzererlebnis. </p>
+    <p xml:lang="de">NeoChat funktioniert sowohl auf Mobilgeräten als auch auf dem PC und bietet ein einheitliches Benutzererlebnis.</p>
+    <p xml:lang="el">Το NeoChat λειτουργεί και στα κινητά και στους υπολογιστές γραφείου παρέχοντας μια αδιάλειπτη εμπειρία χρήσης.</p>
     <p xml:lang="en-GB">NeoChat works both on mobile and desktop while providing a consistent user experience.</p>
     <p xml:lang="es">NeoChat funciona en móviles y en el escritorio a la vez que proporciona una experiencia de usuario consistente.</p>
     <p xml:lang="eu">NeoChat mugikorretan eta mahaigainean dabil, erabiltzaile esperientzia koherentea eskainiz.</p>
@@ -155,6 +164,7 @@
     <p xml:lang="pl">NeoChat działa zarówno na urządzeniach przenośnych jak i biurkowych, zapewniając spójne wrażenia użytkownika</p>
     <p xml:lang="pt">O NeoChat funciona tanto em dispositivos móveis como no computador, fornecendo uma experiência de utilizador consistente.</p>
     <p xml:lang="pt-BR">O NeoChat funciona tanto no celular como no computador enquanto fornece uma experiência consistente ao usuário.</p>
+    <p xml:lang="ru">NeoChat работает как на мобильных устройствах, так и на настольных компьютерах, обеспечивая единый пользовательский интерфейс.</p>
     <p xml:lang="sk">NeoChat funguje na mobilných aj stolových počítačoch a poskytuje konzistentný používateľský zážitok.</p>
     <p xml:lang="sl">NeoChat deluje tako na mobilnih kot na namiznih platformah z zagotavljanjem konsistentne uporabniške izkušnje.</p>
     <p xml:lang="sv">NeoChat fungerar både på mobil och skrivbord och tillhandahåller en konsekvent användarupplevelse.</p>
@@ -175,6 +185,7 @@
   <developer_name xml:lang="ca-valencia">La comunitat KDE</developer_name>
   <developer_name xml:lang="cs">Komunita KDE</developer_name>
   <developer_name xml:lang="de">Die KDE-Gemeinschaft</developer_name>
+  <developer_name xml:lang="el">Η Κοινότητα του KDE</developer_name>
   <developer_name xml:lang="en-GB">The KDE Community</developer_name>
   <developer_name xml:lang="es">La comunidad KDE</developer_name>
   <developer_name xml:lang="eu">KDE komunitatea</developer_name>
@@ -193,6 +204,7 @@
   <developer_name xml:lang="pl">Społeczność KDE</developer_name>
   <developer_name xml:lang="pt">A Comunidade do KDE</developer_name>
   <developer_name xml:lang="pt-BR">A comunidade KDE</developer_name>
+  <developer_name xml:lang="ru">Сообщество KDE</developer_name>
   <developer_name xml:lang="sk">KDE Komunita</developer_name>
   <developer_name xml:lang="sl">Skupnost KDE</developer_name>
   <developer_name xml:lang="sv">KDE-gemenskapen</developer_name>
@@ -204,6 +216,7 @@
   <project_license>GPL-3.0</project_license>
   <custom>
     <value key="KDE::matrix">#neochat:kde.org</value>
+    <value key="KDE::windows_store">https://www.microsoft.com/store/apps/9PNXWVNRC29H</value>
   </custom>
   <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
   <screenshots>
@@ -218,6 +231,20 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="23.01" date="2023-01-30">
+      <url>https://plasma-mobile.org/2023/01/30/january-blog-post/</url>
+      <description>
+        <p>New features and bugfixes:</p>
+        <ul>
+          <li>Notifications will now be shown for all accounts, not just the active one</li>
+          <li>There is a new "compact" mode for the room list</li>
+          <li>You can now search in the room history</li>
+          <li>Emojis and Reactions have been significantly improved</li>
+          <li>Fixed several crashes around user invitations</li>
+          <li>Room permission settings can now be configured</li>
+        </ul>
+      </description>
+    </release>
     <release version="22.11" date="2022-11-30">
       <url>https://plasma-mobile.org/2022/11/30/plasma-mobile-gear-22-11/</url>
     </release>

org.kde.neochat.desktop

@@ -9,6 +9,7 @@ Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[cs]=NeoChat
 Name[de]=NeoChat
+Name[el]=NeoChat
 Name[en_GB]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
@@ -29,6 +30,7 @@ Name[pl]=NeoChat
 Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[ro]=NeoChat
+Name[ru]=NeoChat
 Name[sk]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
@@ -44,6 +46,7 @@ GenericName[ca]=Client de Matrix
 GenericName[ca@valencia]=Client de Matrix
 GenericName[cs]=Klient protokolu Matrix
 GenericName[de]=Matrix-Programm
+GenericName[el]=Εφαρμογή του Matrix
 GenericName[en_GB]=Matrix Client
 GenericName[es]=Cliente para Matrix
 GenericName[eu]=Matrix bezeroa
@@ -64,6 +67,7 @@ GenericName[pl]=Program Matriksa
 GenericName[pt]=Cliente de Matrix
 GenericName[pt_BR]=Cliente Matrix
 GenericName[ro]=Client Matrix
+GenericName[ru]=Клиент Matrix
 GenericName[sk]=Matrix Client
 GenericName[sl]=Odjemalec Matrix
 GenericName[sv]=Matrix-klient
@@ -78,6 +82,7 @@ Comment[az]=Matrix protokolu üçün müştəri
 Comment[ca]=Client per al protocol Matrix
 Comment[ca@valencia]=Client per al protocol Matrix
 Comment[de]=Programm für das Matrix-Protokoll
+Comment[el]=Πελάτης για το πρωτόκολλο Matrix
 Comment[en_GB]=Client for the Matrix protocol
 Comment[es]=Cliente para el protocolo Matrix
 Comment[eu]=Matrix protokolorako bezeroa
@@ -98,6 +103,7 @@ Comment[pl]=Program obsługi protokołu Matriksa
 Comment[pt]=Cliente para o protocolo Matrix
 Comment[pt_BR]=Cliente para o protocolo Matrix
 Comment[ro]=Client pentru protocolul Matrix
+Comment[ru]=Клиент для протокола Matrix
 Comment[sk]=Klient protokolu Matrix
 Comment[sl]=Odjemalec za protokol Matrix
 Comment[sv]=Klient för protokollet Matrix

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

@@ -0,0 +1,122 @@
+<?xml version="1.0" ?>
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
+<!ENTITY % Italian "INCLUDE">
+]>
+<!--
+SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
+SPDX-License-Identifier: CC-BY-SA-4.0
+-->
+
+<refentry lang="&language;">
+<refentryinfo>
+<title
+>Manuale utente di NeoChat</title>
+<author
+><firstname
+>Carl</firstname
+><surname
+>Schwan</surname
+> <contrib
+>Pagina man di NeoChat.</contrib
+> <email
+>carl@carlschwan.eu</email
+></author>
+<date
+>1/11/2022</date>
+<releaseinfo
+>22.09</releaseinfo>
+<productname
+>NeoChat</productname>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>
+    <command
+>neochat</command>
+  </refentrytitle>
+  <manvolnum
+>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+  <refname
+>neochat</refname>
+  <refpurpose
+>Client per l'interazione con il protocollo di messaggistica matrix</refpurpose>
+  </refnamediv>
+  <!-- body begins here -->
+  <refsynopsisdiv id='synopsis'>
+  <cmdsynopsis
+><command
+>neochat</command
+> <arg choice="opt"
+><replaceable
+>URI</replaceable
+></arg
+> </cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsect1 id="description">
+  <title
+>Descrizione</title>
+  <para
+><command
+>neochat</command
+> è un'applicazione di chat per il protocollo Matrix che funziona sia su desktop che su dispositivi mobili. </para>
+</refsect1>
+
+<refsect1 id="options"
+><title
+>Opzioni</title>
+<variablelist>
+  <varlistentry>
+  <term
+><option
+>URI</option
+></term>
+  <listitem>
+    <para
+>L'URI matrix per un utente o una stanza. ad esempio matrix:u/utente:esempio.org e matrix:r/stanza:esempio.org. Questo farà in modo che NeoChat provi ad aprire la stanza o la conversazione specificata. </para>
+  </listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1 id="bug">
+  <title
+>Segnalazione bug</title>
+  <para
+>Puoi segnalare bug e richiedere funzionalità su <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General"
+>https://bugs.kde.org/enter_bug.cgi? product=NeoChat&amp;component=General</ulink
+></para>
+</refsect1>
+
+<refsect1>
+  <title
+>Vedi anche</title>
+  <simplelist>
+    <member
+>Un elenco di domande frequenti su Matrix <ulink url="https://matrix.org/faq/"
+>https://matrix.org/faq/</ulink
+> </member>
+    <member
+>kf5options(7)</member>
+    <member
+>qt5options(7)</member>
+  </simplelist>
+</refsect1>
+
+<refsect1 id="copyright"
+><title
+>Copyright</title>
+<para
+>Copyright &copy; 2020-2022 Tobias Fella </para>
+<para
+>Copyright &copy; 2020-2022 Carl Schwan </para>
+<para
+>Licenza: GNU General Public Version 3 o successiva &lt;<ulink url="https://www.gnu.org/licenses/gpl-3.0.html"
+>https://www.gnu.org/licenses/gpl-3.0.html</ulink
+>&gt;</para>
+</refsect1>
+</refentry>

src/CMakeLists.txt

@@ -6,44 +6,47 @@
 add_library(neochat STATIC
     controller.cpp
     actionshandler.cpp
-    emojimodel.cpp
-    customemojimodel.cpp
+    models/emojimodel.cpp
+    emojitones.cpp
+    models/customemojimodel.cpp
     clipboard.cpp
     matriximageprovider.cpp
-    messageeventmodel.cpp
-    messagefiltermodel.cpp
-    roomlistmodel.cpp
-    sortfilterspacelistmodel.cpp
+    models/messageeventmodel.cpp
+    models/messagefiltermodel.cpp
+    models/roomlistmodel.cpp
+    models/sortfilterspacelistmodel.cpp
     spacehierarchycache.cpp
     roommanager.cpp
     neochatroom.cpp
     neochatuser.cpp
-    userlistmodel.cpp
-    publicroomlistmodel.cpp
-    userdirectorylistmodel.cpp
-    keywordnotificationrulemodel.cpp
+    models/userlistmodel.cpp
+    models/userfiltermodel.cpp
+    models/publicroomlistmodel.cpp
+    models/userdirectorylistmodel.cpp
+    models/keywordnotificationrulemodel.cpp
     utils.cpp
     notificationsmanager.cpp
-    sortfilterroomlistmodel.cpp
+    models/sortfilterroomlistmodel.cpp
     chatdocumenthandler.cpp
-    devicesmodel.cpp
+    models/devicesmodel.cpp
     filetypesingleton.cpp
     login.cpp
     stickerevent.cpp
-    webshortcutmodel.cpp
+    models/webshortcutmodel.cpp
     blurhash.cpp
     blurhashimageprovider.cpp
     joinrulesevent.cpp
-    collapsestateproxymodel.cpp
+    models/collapsestateproxymodel.cpp
     urlhelper.cpp
     windowcontroller.cpp
     linkpreviewer.cpp
-    completionmodel.cpp
-    completionproxymodel.cpp
-    actionsmodel.cpp
-    serverlistmodel.cpp
-    statemodel.cpp
+    models/completionmodel.cpp
+    models/completionproxymodel.cpp
+    models/actionsmodel.cpp
+    models/serverlistmodel.cpp
+    models/statemodel.cpp
     filetransferpseudojob.cpp
+    models/searchmodel.cpp
 )
 
 add_executable(neochat-app
@@ -67,7 +70,7 @@ endif()
 
 ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)
 
-target_sources(neochat PRIVATE ${NEOCHAT_ICON})
+target_sources(neochat-app PRIVATE ${NEOCHAT_ICON})
 
 if(NOT ANDROID)
     target_sources(neochat PRIVATE colorschemer.cpp)
@@ -90,12 +93,7 @@ else()
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR})
-target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons KF5::SonnetCore  KF5::ItemModels Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES})
-if(TARGET QCoro5::Coro)
-    target_link_libraries(neochat PUBLIC QCoro5::Coro)
-else()
-    target_link_libraries(neochat PUBLIC QCoro::QCoro)
-endif()
+target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons KF5::SonnetCore  KF5::ItemModels Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES} QCoro::Core)
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
 
 if(NEOCHAT_FLATPAK)
@@ -105,6 +103,9 @@ endif()
 if(ANDROID)
     target_sources(neochat PRIVATE notifyrc.qrc)
     target_link_libraries(neochat PRIVATE Qt::Svg OpenSSL::SSL)
+    if(SQLite3_FOUND)
+        target_link_libraries(neochat-app PRIVATE SQLite::SQLite3)
+    endif()
     target_sources(neochat-app PRIVATE notifyrc.qrc)
     target_link_libraries(neochat PUBLIC Qt::Svg OpenSSL::SSL)
     kirigami_package_breeze_icons(ICONS
@@ -161,12 +162,18 @@ if(ANDROID)
         "zoom-out"
         "image-rotate-left-symbolic"
         "image-rotate-right-symbolic"
-        "channel-insecure-symbolic"
+        "channel-secure-symbolic"
         "download"
         "smiley"
         "tools-check-spelling"
         "username-copy"
-        "edit-copy"
+        "system-switch-user"
+        "bookmark-new"
+        "bookmark-remove"
+        "favorite"
+        "window-new"
+        "globe"
+        "visibility"
     )
 else()
     target_link_libraries(neochat PUBLIC Qt::Widgets KF5::KIOWidgets)

src/actionshandler.cpp

@@ -13,13 +13,13 @@
 #include <KLocalizedString>
 #include <QStringBuilder>
 
-#include "actionsmodel.h"
 #include "controller.h"
-#include "customemojimodel.h"
+#include "models/actionsmodel.h"
+#include "models/customemojimodel.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
-#include "roommanager.h"
 #include "neochatuser.h"
+#include "roommanager.h"
 
 using namespace Quotient;
 
@@ -59,9 +59,9 @@ void ActionsHandler::setRoom(NeoChatRoom *room)
     Q_EMIT roomChanged();
 }
 
-void ActionsHandler::handleMessage()
+void ActionsHandler::handleNewMessage()
 {
-    checkEffects();
+    checkEffects(m_room->chatBoxText());
     if (!m_room->chatBoxAttachmentPath().isEmpty()) {
         QUrl url(m_room->chatBoxAttachmentPath());
         auto path = url.isLocalFile() ? url.toLocalFile() : url.toString();
@@ -70,13 +70,39 @@ void ActionsHandler::handleMessage()
         m_room->setChatBoxText({});
         return;
     }
-    QString handledText = m_room->chatBoxText();
 
-    std::sort(m_room->mentions()->begin(), m_room->mentions()->end(), [](const auto &a, const auto &b) -> bool {
+    QString handledText = m_room->chatBoxText();
+    handledText = handleMentions(handledText);
+    handleMessage(m_room->chatBoxText(), handledText);
+}
+
+void ActionsHandler::handleEdit()
+{
+    checkEffects(m_room->editText());
+
+    QString handledText = m_room->editText();
+    handledText = handleMentions(handledText, true);
+    handleMessage(m_room->editText(), handledText, true);
+}
+
+QString ActionsHandler::handleMentions(QString handledText, const bool &isEdit)
+{
+    if (!m_room) {
+        return QString();
+    }
+
+    QVector<Mention> *mentions;
+    if (isEdit) {
+        mentions = m_room->editMentions();
+    } else {
+        mentions = m_room->mentions();
+    }
+
+    std::sort(mentions->begin(), mentions->end(), [](const auto &a, const auto &b) -> bool {
         return a.cursor.anchor() > b.cursor.anchor();
     });
 
-    for (const auto &mention : *m_room->mentions()) {
+    for (const auto &mention : *mentions) {
         if (mention.text.isEmpty() || mention.id.isEmpty()) {
             continue;
         }
@@ -84,11 +110,16 @@ void ActionsHandler::handleMessage()
                                           mention.cursor.position() - mention.cursor.anchor(),
                                           QStringLiteral("[%1](https://matrix.to/#/%2)").arg(mention.text, mention.id));
     }
-    m_room->mentions()->clear();
+    mentions->clear();
 
+    return handledText;
+}
+
+void ActionsHandler::handleMessage(const QString &text, QString handledText, const bool &isEdit)
+{
     if (NeoChatConfig::allowQuickEdit()) {
         QRegularExpression sed("^s/([^/]*)/([^/]*)(/g)?$");
-        auto match = sed.match(m_room->chatBoxText());
+        auto match = sed.match(text);
         if (match.hasMatch()) {
             const QString regex = match.captured(1);
             const QString replacement = match.captured(2).toHtmlEscaped();
@@ -147,13 +178,13 @@ void ActionsHandler::handleMessage()
     if (handledText.length() == 0) {
         return;
     }
-    m_room->postMessage(m_room->chatBoxText(), handledText, messageType, m_room->chatBoxReplyId(), m_room->chatBoxEditId());
+
+    m_room->postMessage(text, handledText, messageType, m_room->chatBoxReplyId(), isEdit ? m_room->chatBoxEditId() : "");
 }
 
-void ActionsHandler::checkEffects()
+void ActionsHandler::checkEffects(const QString &text)
 {
     std::optional<QString> effect = std::nullopt;
-    const auto &text = m_room->chatBoxText();
     if (text.contains("\u2744")) {
         effect = QLatin1String("snowflake");
     } else if (text.contains("\u1F386")) {

src/actionshandler.h

@@ -33,14 +33,22 @@ Q_SIGNALS:
 
 public Q_SLOTS:
 
-    /// \brief Post a message.
-    ///
-    /// This also interprets commands if any.
-    void handleMessage();
+    /**
+     * @brief Pre-process text and send message.
+     */
+    void handleNewMessage();
+
+    /**
+     * @brief Pre-process text and send edit.
+     */
+    void handleEdit();
 
 private:
     NeoChatRoom *m_room = nullptr;
-    void checkEffects();
+    void checkEffects(const QString &text);
+
+    QString handleMentions(QString handledText, const bool &isEdit = false);
+    void handleMessage(const QString &text, QString handledText, const bool &isEdit = false);
 };
 
 QString markdownToHTML(const QString &markdown);

src/chatdocumenthandler.cpp

@@ -5,7 +5,6 @@
 
 #include <QQmlFile>
 #include <QQmlFileSelector>
-#include <QQuickTextDocument>
 #include <QStringBuilder>
 #include <QSyntaxHighlighter>
 #include <QTextBlock>
@@ -15,10 +14,9 @@
 #include <Sonnet/BackgroundChecker>
 #include <Sonnet/Settings>
 
-#include "actionsmodel.h"
-#include "completionmodel.h"
+#include "models/actionsmodel.h"
+#include "models/roomlistmodel.h"
 #include "neochatroom.h"
-#include "roomlistmodel.h"
 
 class SyntaxHighlighter : public QSyntaxHighlighter
 {
@@ -107,14 +105,19 @@ ChatDocumentHandler::ChatDocumentHandler(QObject *parent)
 {
     connect(this, &ChatDocumentHandler::roomChanged, this, [this]() {
         m_completionModel->setRoom(m_room);
-        static NeoChatRoom *previousRoom = nullptr;
+        static QPointer<NeoChatRoom> previousRoom = nullptr;
         if (previousRoom) {
             disconnect(previousRoom, &NeoChatRoom::chatBoxTextChanged, this, nullptr);
+            disconnect(previousRoom, &NeoChatRoom::editTextChanged, this, nullptr);
         }
         previousRoom = m_room;
         connect(m_room, &NeoChatRoom::chatBoxTextChanged, this, [this]() {
             int start = completionStartIndex();
-            m_completionModel->setText(m_room->chatBoxText().mid(start, cursorPosition() - start), m_room->chatBoxText().mid(start));
+            m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
+        });
+        connect(m_room, &NeoChatRoom::editTextChanged, this, [this]() {
+            int start = completionStartIndex();
+            m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
         });
     });
     connect(this, &ChatDocumentHandler::documentChanged, this, [this]() {
@@ -125,7 +128,7 @@ ChatDocumentHandler::ChatDocumentHandler(QObject *parent)
             return;
         }
         int start = completionStartIndex();
-        m_completionModel->setText(m_room->chatBoxText().mid(start, cursorPosition() - start), m_room->chatBoxText().mid(start));
+        m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
     });
 }
 
@@ -140,7 +143,7 @@ int ChatDocumentHandler::completionStartIndex() const
 #else
     const auto cursor = cursorPosition();
 #endif
-    const auto &text = m_room->chatBoxText();
+    const auto &text = getText();
     auto start = std::min(cursor, text.size()) - 1;
     while (start > -1) {
         if (text.at(start) == QLatin1Char(' ')) {
@@ -152,6 +155,20 @@ int ChatDocumentHandler::completionStartIndex() const
     return start;
 }
 
+bool ChatDocumentHandler::isEdit() const
+{
+    return m_isEdit;
+}
+
+void ChatDocumentHandler::setIsEdit(bool edit)
+{
+    if (edit == m_isEdit) {
+        return;
+    }
+    m_isEdit = edit;
+    Q_EMIT isEditChanged();
+}
+
 QQuickTextDocument *ChatDocumentHandler::document() const
 {
     return m_document;
@@ -206,7 +223,7 @@ void ChatDocumentHandler::complete(int index)
     if (m_completionModel->autoCompletionType() == CompletionModel::User) {
         auto name = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Text).toString();
         auto id = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
-        auto text = m_room->chatBoxText();
+        auto text = getText();
         auto at = text.lastIndexOf(QLatin1Char('@'), cursorPosition() - 1);
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
@@ -215,11 +232,11 @@ void ChatDocumentHandler::complete(int index)
         cursor.setPosition(at);
         cursor.setPosition(cursor.position() + name.size(), QTextCursor::KeepAnchor);
         cursor.setKeepPositionOnInsert(true);
-        m_room->mentions()->push_back({cursor, name, 0, 0, id});
+        pushMention({cursor, name, 0, 0, id});
         m_highlighter->rehighlight();
     } else if (m_completionModel->autoCompletionType() == CompletionModel::Command) {
         auto command = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
-        auto text = m_room->chatBoxText();
+        auto text = getText();
         auto at = text.lastIndexOf(QLatin1Char('/'));
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
@@ -227,7 +244,7 @@ void ChatDocumentHandler::complete(int index)
         cursor.insertText(QStringLiteral("/%1 ").arg(command));
     } else if (m_completionModel->autoCompletionType() == CompletionModel::Room) {
         auto alias = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
-        auto text = m_room->chatBoxText();
+        auto text = getText();
         auto at = text.lastIndexOf(QLatin1Char('#'), cursorPosition() - 1);
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
@@ -236,11 +253,11 @@ void ChatDocumentHandler::complete(int index)
         cursor.setPosition(at);
         cursor.setPosition(cursor.position() + alias.size(), QTextCursor::KeepAnchor);
         cursor.setKeepPositionOnInsert(true);
-        m_room->mentions()->push_back({cursor, alias, 0, 0, alias});
+        pushMention({cursor, alias, 0, 0, alias});
         m_highlighter->rehighlight();
     } else if (m_completionModel->autoCompletionType() == CompletionModel::Emoji) {
         auto shortcode = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
-        auto text = m_room->chatBoxText();
+        auto text = getText();
         auto at = text.lastIndexOf(QLatin1Char(':'));
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
@@ -283,3 +300,27 @@ void ChatDocumentHandler::setSelectionEnd(int position)
     m_selectionEnd = position;
     Q_EMIT selectionEndChanged();
 }
+
+QString ChatDocumentHandler::getText() const
+{
+    if (!m_room) {
+        return QString();
+    }
+    if (m_isEdit) {
+        return m_room->editText();
+    } else {
+        return m_room->chatBoxText();
+    }
+}
+
+void ChatDocumentHandler::pushMention(const Mention mention) const
+{
+    if (!m_room) {
+        return;
+    }
+    if (m_isEdit) {
+        m_room->editMentions()->push_back(mention);
+    } else {
+        m_room->mentions()->push_back(mention);
+    }
+}

src/chatdocumenthandler.h

@@ -7,8 +7,9 @@
 #include <QQuickTextDocument>
 #include <QTextCursor>
 
-#include "completionmodel.h"
-#include "userlistmodel.h"
+#include "models/completionmodel.h"
+#include "models/userlistmodel.h"
+#include "neochatroom.h"
 
 class QTextDocument;
 class NeoChatRoom;
@@ -17,6 +18,14 @@ class SyntaxHighlighter;
 class ChatDocumentHandler : public QObject
 {
     Q_OBJECT
+
+    /**
+     * @brief Is the instance being used to handle an edit message.
+     *
+     * This is needed to ensure that the text and mentions are saved and retrieved
+     * from the correct parameters in the assigned room.
+     */
+    Q_PROPERTY(bool isEdit READ isEdit WRITE setIsEdit NOTIFY isEditChanged)
     Q_PROPERTY(QQuickTextDocument *document READ document WRITE setDocument NOTIFY documentChanged)
     Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged)
     Q_PROPERTY(int selectionStart READ selectionStart WRITE setSelectionStart NOTIFY selectionStartChanged)
@@ -24,11 +33,14 @@ class ChatDocumentHandler : public QObject
 
     Q_PROPERTY(CompletionModel *completionModel READ completionModel NOTIFY completionModelChanged)
 
-    Q_PROPERTY(NeoChatRoom *room READ room NOTIFY roomChanged)
+    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
 
 public:
     explicit ChatDocumentHandler(QObject *parent = nullptr);
 
+    [[nodiscard]] bool isEdit() const;
+    void setIsEdit(bool edit);
+
     [[nodiscard]] QQuickTextDocument *document() const;
     void setDocument(QQuickTextDocument *document);
 
@@ -49,6 +61,7 @@ public:
     void updateCompletions();
     CompletionModel *completionModel() const;
 Q_SIGNALS:
+    void isEditChanged();
     void documentChanged();
     void cursorPositionChanged();
     void roomChanged();
@@ -59,6 +72,8 @@ Q_SIGNALS:
 private:
     int completionStartIndex() const;
 
+    bool m_isEdit;
+
     QQuickTextDocument *m_document;
 
     NeoChatRoom *m_room = nullptr;
@@ -68,6 +83,9 @@ private:
     int m_selectionStart;
     int m_selectionEnd;
 
+    QString getText() const;
+    void pushMention(const Mention mention) const;
+
     SyntaxHighlighter *m_highlighter = nullptr;
 
     CompletionModel::AutoCompletionType m_completionType = CompletionModel::None;

src/clipboard.cpp

@@ -33,13 +33,14 @@ QImage Clipboard::image() const
 
 QString Clipboard::saveImage(QString localPath) const
 {
-    if (!QDir().exists(QStringLiteral("%1/screenshots").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)))) {
-        QDir().mkdir(QStringLiteral("%1/screenshots").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)));
+    QString imageDir(QStringLiteral("%1/screenshots").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)));
+
+    if (!QDir().exists(imageDir)) {
+        QDir().mkdir(imageDir);
     }
+
     if (localPath.isEmpty()) {
-        localPath = QStringLiteral("file://%1/screenshots/%2.png")
-                        .arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation),
-                             QDateTime::currentDateTime().toString(QStringLiteral("yyyy-MM-dd-hh-mm-ss")));
+        localPath = QStringLiteral("file://%1/%2.png").arg(imageDir, QDateTime::currentDateTime().toString(QStringLiteral("yyyy-MM-dd-hh-mm-ss")));
     }
     QUrl url(localPath);
     if (!url.isLocalFile()) {
@@ -51,14 +52,11 @@ QString Clipboard::saveImage(QString localPath) const
         return {};
     }
 
-    QDir dir;
-    if (!dir.exists(localPath)) {
-        dir.mkpath(localPath);
+    if (image.save(url.toLocalFile())) {
+        return localPath;
+    } else {
+        return {};
     }
-
-    image.save(url.toLocalFile());
-
-    return localPath;
 }
 
 void Clipboard::saveText(QString message)

src/collapsestateproxymodel.cpp

@@ -1,86 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#include "collapsestateproxymodel.h"
-#include "messageeventmodel.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::EventTypeRole)
-        != MessageEventModel::DelegateType::State // If this is not a state, show it
-        || sourceModel()->data(sourceModel()->index(source_row + 1, 0), MessageEventModel::EventTypeRole)
-        != 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
-        || sourceModel()->data(sourceModel()->index(source_row, 0), MessageEventModel::EventResolvedTypeRole)
-        != sourceModel()->data(sourceModel()->index(source_row + 1, 0),
-                               MessageEventModel::EventResolvedTypeRole) // Also show it if it's of a different type than the one before TODO improve in
-        || sourceModel()->data(sourceModel()->index(source_row, 0), MessageEventModel::AuthorIdRole)
-        != sourceModel()->data(sourceModel()->index(source_row + 1, 0), MessageEventModel::AuthorIdRole); // Also show it if it's a different author
-}
-
-QVariant CollapseStateProxyModel::data(const QModelIndex &index, int role) const
-{
-    if (role == AggregateDisplayRole) {
-        return aggregateEventToString(mapToSource(index).row());
-    }
-    return sourceModel()->data(mapToSource(index), role);
-}
-
-QHash<int, QByteArray> CollapseStateProxyModel::roleNames() const
-{
-    auto roles = sourceModel()->roleNames();
-    roles[AggregateDisplayRole] = "aggregateDisplay";
-    return roles;
-}
-
-QString CollapseStateProxyModel::aggregateEventToString(int sourceRow) const
-{
-    QStringList parts;
-    for (int i = sourceRow; i >= 0; i--) {
-        parts += sourceModel()->data(sourceModel()->index(i, 0), Qt::DisplayRole).toString();
-        if (sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::EventTypeRole)
-                != MessageEventModel::DelegateType::State // If it's not a state event
-            || (i > 0
-                && sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::EventResolvedTypeRole)
-                    != sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::EventResolvedTypeRole)) // or of a different type
-            || (i > 0
-                && sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorIdRole)
-                    != sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::AuthorIdRole)) // or by a different author
-            || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
-        ) {
-            break;
-        }
-    }
-    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) {
-                chunks.last() += i18ncp("[user did something] n times", " %1 time", " %1 times", count);
-            }
-        }
-        QString text = chunks.takeFirst();
-
-        if (chunks.size() > 0) {
-            while (chunks.size() > 1) {
-                text += i18nc("[action 1], [action 2 and action 3]", ", ");
-                text += chunks.takeFirst();
-            }
-            text += i18nc("[action 1, action 2] and [action 3]", " and ");
-            text += chunks.takeFirst();
-        }
-        return text;
-    } else {
-        return {};
-    }
-}

src/controller.cpp

@@ -4,7 +4,11 @@
 
 #include "controller.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <qt5keychain/keychain.h>
+#else
+#include <qt6keychain/keychain.h>
+#endif
 
 #include <KConfig>
 #include <KConfigGroup>
@@ -19,7 +23,6 @@
 #include <QGuiApplication>
 #include <QImageReader>
 #include <QNetworkProxy>
-#include <QQuickItem>
 #include <QQuickTextDocument>
 #include <QQuickWindow>
 #include <QStandardPaths>
@@ -129,16 +132,7 @@ Controller::Controller(QObject *parent)
         if (AccountRegistry::instance().size() > oldAccountCount) {
             auto connection = AccountRegistry::instance().accounts()[AccountRegistry::instance().size() - 1];
             connect(connection, &Connection::syncDone, this, [=]() {
-                bool changes = false;
-                for (const auto &room : connection->allRooms()) {
-                    if (m_notificationCounts[room] != room->unreadStats().notableCount) {
-                        m_notificationCounts[room] = room->unreadStats().notableCount;
-                        changes = true;
-                    }
-                }
-                if (changes) {
-                    handleNotifications();
-                }
+                handleNotifications(connection);
             });
         }
         oldAccountCount = AccountRegistry::instance().size();
@@ -147,19 +141,16 @@ Controller::Controller(QObject *parent)
 }
 
 #ifdef QUOTIENT_07
-void Controller::handleNotifications()
+void Controller::handleNotifications(QPointer<Quotient::Connection> connection)
 {
-    static bool initial = true;
+    static QStringList initial;
     static QStringList oldNotifications;
-    if (!m_connection) {
-        return;
-    }
-    auto job = m_connection->callApi<GetNotificationsJob>();
+    auto job = connection->callApi<GetNotificationsJob>();
 
-    connect(job, &BaseJob::success, this, [this, job]() {
+    connect(job, &BaseJob::success, this, [job, connection]() {
         const auto notifications = job->jsonData()["notifications"].toArray();
-        if (initial) {
-            initial = false;
+        if (!initial.contains(connection->user()->id())) {
+            initial.append(connection->user()->id());
             for (const auto &n : notifications) {
                 oldNotifications += n.toObject()["event"].toObject()["event_id"].toString();
             }
@@ -175,7 +166,7 @@ void Controller::handleNotifications()
                 continue;
             }
             oldNotifications += notification["event"].toObject()["event_id"].toString();
-            auto room = m_connection->room(notification["room_id"].toString());
+            auto room = connection->room(notification["room_id"].toString());
 
             // If room exists, room is NOT active OR the application is NOT active, show notification
             if (room && !(room->id() == RoomManager::instance().currentRoom()->id() && QGuiApplication::applicationState() == Qt::ApplicationActive)) {
@@ -197,7 +188,7 @@ void Controller::handleNotifications()
 
                 if (notification["event"]["type"] == "m.room.encrypted") {
 #ifdef Quotient_E2EE_ENABLED
-                    auto decrypted = m_connection->decryptNotification(notification);
+                    auto decrypted = connection->decryptNotification(notification);
                     body = decrypted["content"].toObject()["body"].toString();
 #endif
                     if (body.isEmpty()) {
@@ -382,6 +373,11 @@ void Controller::invokeLogin()
                     if (error == "Unrecognised access token") {
                         Q_EMIT errorOccured(i18n("Login Failed: Access Token invalid or revoked"));
                         logout(connection, false);
+                    } else if (error == "Connection closed") {
+                        Q_EMIT errorOccured(i18n("Login Failed: %1", error));
+                        // Failed due to network connection issue. This might happen when the homeserver is
+                        // temporary down, or the user trying to re-launch NeoChat in a network that cannot
+                        // connect to the homeserver. In this case, we don't want to do logout().
                     } else {
                         Q_EMIT errorOccured(i18n("Login Failed: %1", error));
                         logout(connection, true);
@@ -743,11 +739,15 @@ void Controller::setApplicationProxy()
         proxy.setType(QNetworkProxy::HttpProxy);
         proxy.setHostName(cfg->proxyHost());
         proxy.setPort(cfg->proxyPort());
+        proxy.setUser(cfg->proxyUser());
+        proxy.setPassword(cfg->proxyPassword());
         break;
     case 2: // SOCKS 5
         proxy.setType(QNetworkProxy::Socks5Proxy);
         proxy.setHostName(cfg->proxyHost());
         proxy.setPort(cfg->proxyPort());
+        proxy.setUser(cfg->proxyUser());
+        proxy.setPassword(cfg->proxyPassword());
         break;
     case 0: // System Default
     default:

src/controller.h

@@ -119,7 +119,7 @@ private:
 
     bool hasWindowSystem() const;
 #ifdef QUOTIENT_07
-    void handleNotifications();
+    void handleNotifications(QPointer<Quotient::Connection> connection);
 #endif
 
 private Q_SLOTS:

src/emojitones.cpp

@@ -0,0 +1,9 @@
+// SPDX-FileCopyrightText: None
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "emojitones.h"
+#include "models/emojimodel.h"
+
+QMultiHash<QString, QVariant> EmojiTones::_tones = {
+#include "emojitones_data.h"
+};

src/login.cpp

@@ -14,8 +14,6 @@
 
 #include "controller.h"
 
-#include <QUrl>
-
 #include <KLocalizedString>
 
 using namespace Quotient;
@@ -183,8 +181,8 @@ void Login::loginWithSso()
     connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [this]() {
         SsoSession *session = m_connection->prepareForSso(m_deviceName);
         m_ssoUrl = session->ssoUrl();
+        Q_EMIT ssoUrlChanged();
     });
-    Q_EMIT ssoUrlChanged();
 }
 
 bool Login::testing() const

src/main.cpp

@@ -42,19 +42,29 @@
 #include "blurhashimageprovider.h"
 #include "chatdocumenthandler.h"
 #include "clipboard.h"
-#include "collapsestateproxymodel.h"
 #include "controller.h"
-#include "customemojimodel.h"
-#include "devicesmodel.h"
-#include "emojimodel.h"
 #include "filetypesingleton.h"
 #include "joinrulesevent.h"
 #include "linkpreviewer.h"
-#include "keywordnotificationrulemodel.h"
 #include "login.h"
 #include "matriximageprovider.h"
-#include "messageeventmodel.h"
-#include "messagefiltermodel.h"
+#include "models/collapsestateproxymodel.h"
+#include "models/customemojimodel.h"
+#include "models/devicesmodel.h"
+#include "models/emojimodel.h"
+#include "models/keywordnotificationrulemodel.h"
+#include "models/messageeventmodel.h"
+#include "models/messagefiltermodel.h"
+#include "models/publicroomlistmodel.h"
+#include "models/roomlistmodel.h"
+#include "models/searchmodel.h"
+#include "models/serverlistmodel.h"
+#include "models/sortfilterroomlistmodel.h"
+#include "models/sortfilterspacelistmodel.h"
+#include "models/userdirectorylistmodel.h"
+#include "models/userfiltermodel.h"
+#include "models/userlistmodel.h"
+#include "models/webshortcutmodel.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "neochatuser.h"
@@ -62,17 +72,9 @@
 #ifdef QUOTIENT_07
 #include "pollhandler.h"
 #endif
-#include "publicroomlistmodel.h"
-#include "roomlistmodel.h"
 #include "roommanager.h"
-#include "serverlistmodel.h"
-#include "sortfilterroomlistmodel.h"
-#include "sortfilterspacelistmodel.h"
 #include "spacehierarchycache.h"
 #include "urlhelper.h"
-#include "userdirectorylistmodel.h"
-#include "userlistmodel.h"
-#include "webshortcutmodel.h"
 #include "windowcontroller.h"
 #ifdef QUOTIENT_07
 #include <keyverificationsession.h>
@@ -80,15 +82,19 @@
 #ifdef HAVE_COLORSCHEME
 #include "colorschemer.h"
 #endif
-#include "completionmodel.h"
+#include "models/completionmodel.h"
+#include "models/statemodel.h"
 #include "neochatuser.h"
-#include "statemodel.h"
 
 #ifdef HAVE_RUNNER
 #include "runner.h"
 #include <QDBusConnection>
 #endif
 
+#ifdef Q_OS_WINDOWS
+#include <Windows.h>
+#endif
+
 using namespace Quotient;
 
 class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
@@ -219,6 +225,7 @@ int main(int argc, char *argv[])
     qmlRegisterType<MessageEventModel>("org.kde.neochat", 1, 0, "MessageEventModel");
     qmlRegisterType<CollapseStateProxyModel>("org.kde.neochat", 1, 0, "CollapseStateProxyModel");
     qmlRegisterType<MessageFilterModel>("org.kde.neochat", 1, 0, "MessageFilterModel");
+    qmlRegisterType<UserFilterModel>("org.kde.neochat", 1, 0, "UserFilterModel");
     qmlRegisterType<PublicRoomListModel>("org.kde.neochat", 1, 0, "PublicRoomListModel");
     qmlRegisterType<UserDirectoryListModel>("org.kde.neochat", 1, 0, "UserDirectoryListModel");
     qmlRegisterType<ServerListModel>("org.kde.neochat", 1, 0, "ServerListModel");
@@ -228,6 +235,7 @@ int main(int argc, char *argv[])
     qmlRegisterType<LinkPreviewer>("org.kde.neochat", 1, 0, "LinkPreviewer");
     qmlRegisterType<CompletionModel>("org.kde.neochat", 1, 0, "CompletionModel");
     qmlRegisterType<StateModel>("org.kde.neochat", 1, 0, "StateModel");
+    qmlRegisterType<SearchModel>("org.kde.neochat", 1, 0, "SearchModel");
 #ifdef QUOTIENT_07
     qmlRegisterType<PollHandler>("org.kde.neochat", 1, 0, "PollHandler");
 #endif
@@ -265,6 +273,32 @@ int main(int argc, char *argv[])
 #endif
 
     QQmlApplicationEngine engine;
+
+#ifdef HAVE_KDBUSADDONS
+    KDBusService service(KDBusService::Unique);
+    service.connect(&service,
+                    &KDBusService::activateRequested,
+                    &RoomManager::instance(),
+                    [&engine](const QStringList &arguments, const QString &workingDirectory) {
+                        Q_UNUSED(workingDirectory);
+
+                        QWindow *window = windowFromEngine(&engine);
+                        KWindowSystem::updateStartupId(window);
+
+                        WindowController::instance().showAndRaiseWindow(QString());
+
+                        // Open matrix uri
+                        if (arguments.isEmpty()) {
+                            return;
+                        }
+                        auto args = arguments;
+                        args.removeFirst();
+                        for (const auto &arg : args) {
+                            RoomManager::instance().openResource(arg);
+                        }
+                    });
+#endif
+
     engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
     QObject::connect(&engine, &QQmlApplicationEngine::quit, &app, &QCoreApplication::quit);
     engine.setNetworkAccessManagerFactory(new NetworkAccessManagerFactory());
@@ -294,31 +328,6 @@ int main(int argc, char *argv[])
     QDBusConnection::sessionBus().registerObject("/RoomRunner", &runner, QDBusConnection::ExportScriptableContents);
 #endif
 
-#ifdef HAVE_KDBUSADDONS
-    KDBusService service(KDBusService::Unique);
-    service.connect(&service,
-                    &KDBusService::activateRequested,
-                    &RoomManager::instance(),
-                    [&engine](const QStringList &arguments, const QString &workingDirectory) {
-                        Q_UNUSED(workingDirectory);
-
-                        QWindow *window = windowFromEngine(&engine);
-                        KWindowSystem::updateStartupId(window);
-
-                        WindowController::instance().showAndRaiseWindow(QString());
-
-                        // Open matrix uri
-                        if (arguments.isEmpty()) {
-                            return;
-                        }
-                        auto args = arguments;
-                        args.removeFirst();
-                        for (const auto &arg : args) {
-                            RoomManager::instance().openResource(arg);
-                        }
-                    });
-#endif
-
     QWindow *window = windowFromEngine(&engine);
 
     WindowController::instance().setWindow(window);

src/models/actionsmodel.cpp

@@ -158,11 +158,12 @@ QVector<ActionsModel::Action> actions{
                 return QString();
             }
 #ifdef QUOTIENT_07
-            if (room->currentState().get<RoomMemberEvent>(text)->membership() == Membership::Invite) {
+            const RoomMemberEvent *roomMemberEvent = room->currentState().get<RoomMemberEvent>(text);
+            if (roomMemberEvent && roomMemberEvent->membership() == Membership::Invite) {
                 Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is already invited to this room.", "%1 is already invited to this room.", text));
                 return QString();
             }
-            if (room->currentState().get<RoomMemberEvent>(text)->membership() == Membership::Ban) {
+            if (roomMemberEvent && roomMemberEvent->membership() == Membership::Ban) {
                 Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is banned from this room.", "%1 is banned from this room.", text));
                 return QString();
             }

src/models/collapsestateproxymodel.cpp

@@ -0,0 +1,134 @@
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "collapsestateproxymodel.h"
+#include "messageeventmodel.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::EventTypeRole)
+        != MessageEventModel::DelegateType::State // If this is not a state, show it
+        || sourceModel()->data(sourceModel()->index(source_row + 1, 0), MessageEventModel::EventTypeRole)
+        != 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());
+    }
+    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";
+    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 (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::EventTypeRole)
+                != MessageEventModel::DelegateType::State // If it's not a state event
+            || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
+        ) {
+            break;
+        }
+    }
+    parts.sort(); // Sort them so that all identical events can be collected.
+    if (!parts.isEmpty()) {
+        QStringList chunks;
+        while (!parts.isEmpty()) {
+            chunks += QString();
+            int count = 1;
+            auto part = parts.takeFirst();
+            chunks.last() += part;
+            while (!parts.isEmpty() && parts.first() == part) {
+                parts.removeFirst();
+                count++;
+            }
+            if (count > 1 && uniqueAuthors.length() == 1) {
+                chunks.last() += i18ncp("n times", " %1 time ", " %1 times ", count);
+            }
+        }
+        chunks.removeDuplicates();
+        QString text = "<style>a {text-decoration: none;}</style>"; // There can be links in the event text so make sure all are styled.
+        // The author text is either "n users" if > 1 user or the matrix.to link to a single user.
+        QString userText = uniqueAuthors.length() > 1 ? i18ncp("n users", " %1 user ", " %1 users ", uniqueAuthors.length())
+                                                      : QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a> ")
+                                                            .arg(uniqueAuthors[0].toMap()["id"].toString(),
+                                                                 uniqueAuthors[0].toMap()["color"].toString(),
+                                                                 uniqueAuthors[0].toMap()["displayName"].toString());
+        text += userText;
+        text += chunks.takeFirst();
+
+        if (chunks.size() > 0) {
+            while (chunks.size() > 1) {
+                text += i18nc("[action 1], [action 2 and/or action 3]", ", ");
+                text += chunks.takeFirst();
+            }
+            text += uniqueAuthors.length() > 1 ? i18nc("[action 1, action 2] or [action 3]", " or ") : i18nc("[action 1, action 2] and [action 3]", " and ");
+            text += chunks.takeFirst();
+        }
+        return text;
+    } else {
+        return {};
+    }
+}
+
+QVariantList CollapseStateProxyModel::stateEventsList(int sourceRow) const
+{
+    QVariantList stateEvents;
+    for (int i = sourceRow; i >= 0; i--) {
+        auto nextState = QVariantMap{
+            {"author", sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorRole)},
+            {"authorDisplayName", sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorDisplayNameRole).toString()},
+            {"text", sourceModel()->data(sourceModel()->index(i, 0), Qt::DisplayRole).toString()},
+        };
+        stateEvents.append(nextState);
+        if (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::EventTypeRole)
+                != 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 (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::EventTypeRole)
+                != 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 uniqueAuthors;
+}

src/models/collapsestateproxymodel.h

@@ -12,10 +12,29 @@ class CollapseStateProxyModel : public QSortFilterProxyModel
 public:
     enum Roles {
         AggregateDisplayRole = MessageEventModel::LastRole + 1,
+        StateEventsRole,
+        AuthorListRole,
     };
     [[nodiscard]] bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
     [[nodiscard]] QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override;
 
+    /**
+     * @brief QString aggregating 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 unique authors for the aggregate state events starting at row.
+     */
+    [[nodiscard]] QVariantList authorList(int row) const;
 };

src/models/completionmodel.cpp

@@ -10,14 +10,13 @@
 #include "customemojimodel.h"
 #include "emojimodel.h"
 #include "neochatroom.h"
-#include "roomlistmodel.h"
 #include "userlistmodel.h"
 
 CompletionModel::CompletionModel(QObject *parent)
     : QAbstractListModel(parent)
     , m_filterModel(new CompletionProxyModel())
     , m_userListModel(new UserListModel(this))
-    , m_emojiModel(new KConcatenateRowsProxyModel(this))
+    , m_emojiModel(new QConcatenateTablesProxyModel(this))
 {
     connect(this, &CompletionModel::textChanged, this, &CompletionModel::updateCompletion);
     connect(this, &CompletionModel::roomChanged, this, [this]() {
@@ -102,6 +101,9 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
         if (role == ReplacedText) {
             return m_filterModel->data(filterIndex, CustomEmojiModel::ReplacedTextRole);
         }
+        if (role == Subtitle) {
+            return m_filterModel->data(filterIndex, EmojiModel::DescriptionRole);
+        }
     }
 
     return {};
@@ -149,7 +151,7 @@ void CompletionModel::updateCompletion()
         m_filterModel->setSourceModel(m_emojiModel);
         m_autoCompletionType = Emoji;
         m_filterModel->setFilterRole(CustomEmojiModel::Name);
-        m_filterModel->setSecondaryFilterRole(-1);
+        m_filterModel->setSecondaryFilterRole(EmojiModel::DescriptionRole);
         m_filterModel->setFullText(m_fullText);
         m_filterModel->setFilterText(m_text);
         m_filterModel->invalidate();

src/models/completionmodel.h

@@ -3,10 +3,9 @@
 
 #pragma once
 
+#include <QConcatenateTablesProxyModel>
 #include <QSortFilterProxyModel>
 
-#include <KConcatenateRowsProxyModel>
-
 #include "roomlistmodel.h"
 
 class CompletionProxyModel;
@@ -75,6 +74,6 @@ private:
 
     UserListModel *m_userListModel;
     RoomListModel *m_roomListModel;
-    KConcatenateRowsProxyModel *m_emojiModel;
+    QConcatenateTablesProxyModel *m_emojiModel;
 };
 Q_DECLARE_METATYPE(CompletionModel::AutoCompletionType);

src/models/completionproxymodel.cpp

@@ -25,6 +25,17 @@ bool CompletionProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &so
 #endif
 }
 
+bool CompletionProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
+{
+    if (m_secondaryFilterRole == -1)
+        return QSortFilterProxyModel::lessThan(source_left, source_right);
+    bool left_primary = sourceModel()->data(source_left, filterRole()).toString().startsWith(m_filterText, Qt::CaseInsensitive);
+    bool right_primary = sourceModel()->data(source_right, filterRole()).toString().startsWith(m_filterText, Qt::CaseInsensitive);
+    if (left_primary != right_primary)
+        return left_primary;
+    return QSortFilterProxyModel::lessThan(source_left, source_right);
+}
+
 int CompletionProxyModel::secondaryFilterRole() const
 {
     return m_secondaryFilterRole;

src/models/completionproxymodel.h

@@ -13,6 +13,7 @@ class CompletionProxyModel : public QSortFilterProxyModel
 
 public:
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;
 
     int secondaryFilterRole() const;
     void setSecondaryFilterRole(int role);

src/models/customemojimodel.h

@@ -4,13 +4,17 @@
 #pragma once
 
 #include <QAbstractListModel>
-#include <memory>
 #include <QRegularExpression>
+#include <memory>
 
 struct CustomEmoji {
     QString name; // with :semicolons:
     QString url; // mxc://
     QRegularExpression regexp;
+
+    Q_GADGET
+    Q_PROPERTY(QString unicode MEMBER url)
+    Q_PROPERTY(QString name MEMBER name)
 };
 
 class CustomEmojiModel : public QAbstractListModel
@@ -25,6 +29,7 @@ public:
         MxcUrl = 50,
         DisplayRole = 51,
         ReplacedTextRole = 52,
+        DescriptionRole = 53, // also invalid, reserved
     };
     Q_ENUM(Roles);
 

src/models/devicesmodel.cpp

@@ -70,7 +70,12 @@ void DevicesModel::logout(int index, const QString &password)
     auto job = Controller::instance().activeConnection()->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId);
 
     connect(job, &BaseJob::result, this, [this, job, password, index] {
-        if (job->error() != 0) {
+        auto onSuccess = [this, index]() {
+            beginRemoveRows(QModelIndex(), index, index);
+            m_devices.remove(index);
+            endRemoveRows();
+        };
+        if (job->error() != BaseJob::Success) {
             QJsonObject replyData = job->jsonData();
             QJsonObject authData;
             authData["session"] = replyData["session"];
@@ -79,11 +84,9 @@ void DevicesModel::logout(int index, const QString &password)
             QJsonObject identifier = {{"type", "m.id.user"}, {"user", Controller::instance().activeConnection()->user()->id()}};
             authData["identifier"] = identifier;
             auto *innerJob = Controller::instance().activeConnection()->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId, authData);
-            connect(innerJob, &BaseJob::success, this, [this, index]() {
-                beginRemoveRows(QModelIndex(), index, index);
-                m_devices.remove(index);
-                endRemoveRows();
-            });
+            connect(innerJob, &BaseJob::success, this, onSuccess);
+        } else {
+            onSuccess();
         }
     });
 }

src/models/emojimodel.cpp

@@ -4,12 +4,13 @@
 #include <QVariant>
 
 #include "emojimodel.h"
+#include "emojitones.h"
 #include <QDebug>
 
 #include <algorithm>
 
+#include "customemojimodel.h"
 #include <KLocalizedString>
-#include <qnamespace.h>
 
 EmojiModel::EmojiModel(QObject *parent)
     : QAbstractListModel(parent)
@@ -48,6 +49,8 @@ QVariant EmojiModel::data(const QModelIndex &index, int role) const
             return QStringLiteral("invalid");
         case DisplayRole:
             return QStringLiteral("%2   :%1:").arg(emoji.shortName, emoji.unicode);
+        case DescriptionRole:
+            return emoji.description;
         }
     }
     return {};
@@ -58,16 +61,19 @@ QHash<int, QByteArray> EmojiModel::roleNames() const
     return {{ShortNameRole, "shortName"}, {UnicodeRole, "unicode"}};
 }
 
-QMultiHash<QString, QVariant> EmojiModel::_tones = {
-#include "emojitones.h"
-};
-
 QVariantList EmojiModel::history() const
 {
     return m_settings.value("Editor/emojis", QVariantList()).toList();
 }
 
 QVariantList EmojiModel::filterModel(const QString &filter, bool limit)
+{
+    auto emojis = CustomEmojiModel::instance().filterModel(filter);
+    emojis += filterModelNoCustom(filter, limit);
+    return emojis;
+}
+
+QVariantList EmojiModel::filterModelNoCustom(const QString &filter, bool limit)
 {
     QVariantList result;
 
@@ -82,7 +88,6 @@ QVariantList EmojiModel::filterModel(const QString &filter, bool limit)
             }
         }
     }
-
     return result;
 }
 
@@ -110,12 +115,28 @@ QVariantList EmojiModel::emojis(Category category) const
     if (category == History) {
         return history();
     }
+    if (category == HistoryNoCustom) {
+        QVariantList list;
+        for (const auto &e : history()) {
+            auto emoji = qvariant_cast<Emoji>(e);
+            if (!emoji.isCustom) {
+                list.append(e);
+            }
+        }
+        return list;
+    }
+    if (category == Custom) {
+        return CustomEmojiModel::instance().filterModel({});
+    }
     return _emojis[category];
 }
 
 QVariantList EmojiModel::tones(const QString &baseEmoji) const
 {
-    return _tones.values(baseEmoji);
+    if (baseEmoji.endsWith("tone")) {
+        return EmojiTones::_tones.values(baseEmoji.split(":")[0]);
+    }
+    return EmojiTones::_tones.values(baseEmoji);
 }
 
 QHash<EmojiModel::Category, QVariantList> EmojiModel::_emojis;
@@ -123,21 +144,11 @@ QHash<EmojiModel::Category, QVariantList> EmojiModel::_emojis;
 QVariantList EmojiModel::categories() const
 {
     return QVariantList{
-        // {QVariantMap{
-        //     {"category", EmojiModel::Search},
-        //     {"name", i18nc("Search for emojis", "Search")},
-        //     {"emoji", QStringLiteral("🔎")},
-        // }},
         {QVariantMap{
-            {"category", EmojiModel::History},
+            {"category", EmojiModel::HistoryNoCustom},
             {"name", i18nc("Previously used emojis", "History")},
             {"emoji", QStringLiteral("⌛️")},
         }},
-        {QVariantMap{
-            {"category", EmojiModel::Custom},
-            {"name", i18nc("'Custom' is a category of emoji", "Custom")},
-            {"emoji", QStringLiteral("😏")},
-        }},
         {QVariantMap{
             {"category", EmojiModel::Smileys},
             {"name", i18nc("'Smileys' is a category of emoji", "Smileys")},
@@ -185,3 +196,23 @@ QVariantList EmojiModel::categories() const
         }},
     };
 }
+
+QVariantList EmojiModel::categoriesWithCustom() const
+{
+    auto cats = categories();
+    cats.removeAt(0);
+    cats.insert(0,
+                QVariantMap{
+                    {"category", EmojiModel::History},
+                    {"name", i18nc("Previously used emojis", "History")},
+                    {"emoji", QStringLiteral("⌛️")},
+                });
+    cats.insert(1,
+                QVariantMap{
+                    {"category", EmojiModel::Custom},
+                    {"name", i18nc("'Custom' is a category of emoji", "Custom")},
+                    {"emoji", QStringLiteral("🖼️")},
+                });
+    ;
+    return cats;
+}

src/models/emojimodel.h

@@ -8,12 +8,18 @@
 #include <QSettings>
 
 struct Emoji {
-    Emoji(QString u, QString s, bool isCustom = false)
-        : unicode(std::move(std::move(u)))
-        , shortName(std::move(std::move(s)))
+    Emoji(QString unicode, QString shortname, bool isCustom = false)
+        : unicode(std::move(unicode))
+        , shortName(std::move(shortname))
         , isCustom(isCustom)
     {
     }
+    Emoji(QString unicode, QString shortname, QString description)
+        : unicode(std::move(unicode))
+        , shortName(std::move(shortname))
+        , description(std::move(description))
+    {
+    }
     Emoji() = default;
 
     friend QDataStream &operator<<(QDataStream &arch, const Emoji &object)
@@ -33,11 +39,13 @@ struct Emoji {
 
     QString unicode;
     QString shortName;
+    QString description;
     bool isCustom = false;
 
     Q_GADGET
     Q_PROPERTY(QString unicode MEMBER unicode)
     Q_PROPERTY(QString shortName MEMBER shortName)
+    Q_PROPERTY(QString description MEMBER description)
     Q_PROPERTY(bool isCustom MEMBER isCustom)
 };
 
@@ -49,6 +57,7 @@ class EmojiModel : public QAbstractListModel
 
     Q_PROPERTY(QVariantList history READ history NOTIFY historyChanged)
     Q_PROPERTY(QVariantList categories READ categories CONSTANT)
+    Q_PROPERTY(QVariantList categoriesWithCustom READ categoriesWithCustom CONSTANT)
 
 public:
     static EmojiModel &instance()
@@ -63,13 +72,16 @@ public:
         InvalidRole = 50,
         DisplayRole = 51,
         ReplacedTextRole = 52,
+        DescriptionRole = 53,
     };
     Q_ENUM(RoleNames);
 
     enum Category {
         Custom,
         Search,
+        SearchNoCustom,
         History,
+        HistoryNoCustom,
         Smileys,
         People,
         Nature,
@@ -89,11 +101,14 @@ public:
 
     Q_INVOKABLE QVariantList history() const;
     Q_INVOKABLE static QVariantList filterModel(const QString &filter, bool limit = true);
+    Q_INVOKABLE static QVariantList filterModelNoCustom(const QString &filter, bool limit = true);
+
     Q_INVOKABLE QVariantList emojis(Category category) const;
 
     Q_INVOKABLE QVariantList tones(const QString &baseEmoji) const;
 
     QVariantList categories() const;
+    QVariantList categoriesWithCustom() const;
 
 Q_SIGNALS:
     void historyChanged();
@@ -103,7 +118,6 @@ public Q_SLOTS:
 
 private:
     static QHash<Category, QVariantList> _emojis;
-    static QMultiHash<QString, QVariant> _tones;
 
     // TODO: Port away from QSettings
     QSettings m_settings;

src/models/keywordnotificationrulemodel.cpp

@@ -15,7 +15,9 @@
 KeywordNotificationRuleModel::KeywordNotificationRuleModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    controllerConnectionChanged();
+    if (Controller::instance().activeConnection()) {
+        controllerConnectionChanged();
+    }
     connect(&Controller::instance(), &Controller::activeConnectionChanged, this, &KeywordNotificationRuleModel::controllerConnectionChanged);
 }
 

src/models/messageeventmodel.cpp

@@ -67,6 +67,7 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[IsNameChangeRole] = "isNameChange";
     roles[IsAvatarChangeRole] = "isAvatarChange";
     roles[IsRedactedRole] = "isRedacted";
+    roles[GenericDisplayRole] = "genericDisplay";
     return roles;
 }
 
@@ -439,7 +440,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         case EventTypeRole:
             return DelegateType::ReadMarker;
         case TimeRole: {
-            const QDateTime eventDate = data(index(m_lastReadEventIndex.row() + 1, 0), TimeRole).toDateTime();
+            const QDateTime eventDate = data(index(m_lastReadEventIndex.row() + 1, 0), TimeRole).toDateTime().toLocalTime();
             const KFormat format;
             return format.formatRelativeDateTime(eventDate, QLocale::ShortFormat);
         }
@@ -462,6 +463,14 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return m_currentRoom->eventToString(evt, Qt::RichText);
     }
 
+    if (role == GenericDisplayRole) {
+        if (evt.isRedacted()) {
+            return i18n("<i>[This message was deleted]</i>");
+        }
+
+        return m_currentRoom->eventToGenericString(evt);
+    }
+
     if (role == FormattedBodyRole) {
         if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
             if (e->hasTextContent() && e->mimeType().name() != "text/plain") {

src/models/messageeventmodel.h

@@ -45,6 +45,7 @@ public:
         AnnotationRole,
         UserMarkerRole,
         FormattedBodyRole,
+        GenericDisplayRole,
 
         MimeTypeRole,
         FileMimetypeIcon,

src/models/searchmodel.cpp

@@ -0,0 +1,180 @@
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "searchmodel.h"
+#include "messageeventmodel.h"
+#include "neochatroom.h"
+#include "neochatuser.h"
+#include <KLocalizedString>
+#include <connection.h>
+
+#ifdef QUOTIENT_07
+#include <csapi/search.h>
+#endif
+
+using namespace Quotient;
+
+// TODO search only in the current room
+
+SearchModel::SearchModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+}
+
+QString SearchModel::searchText() const
+{
+    return m_searchText;
+}
+
+void SearchModel::setSearchText(const QString &searchText)
+{
+    m_searchText = searchText;
+    Q_EMIT searchTextChanged();
+}
+
+void SearchModel::search()
+{
+#ifdef QUOTIENT_07
+    Q_ASSERT(m_connection);
+    setSearching(true);
+    if (m_job) {
+        m_job->abandon();
+        m_job = nullptr;
+    }
+
+    SearchJob::RoomEventsCriteria criteria{
+        m_searchText,
+        {},
+        RoomEventFilter{
+            .rooms = {m_room->id()},
+        },
+        "recent",
+        SearchJob::IncludeEventContext{3, 3, true},
+        false,
+        none,
+    };
+
+    auto job = m_connection->callApi<SearchJob>(SearchJob::Categories{criteria});
+    m_job = job;
+    connect(job, &BaseJob::finished, this, [=] {
+        beginResetModel();
+        m_result = job->searchCategories().roomEvents;
+        endResetModel();
+        setSearching(false);
+        m_job = nullptr;
+        // TODO error handling
+    });
+#endif
+}
+
+Connection *SearchModel::connection() const
+{
+    return m_connection;
+}
+
+void SearchModel::setConnection(Connection *connection)
+{
+    m_connection = connection;
+    Q_EMIT connectionChanged();
+}
+
+QVariant SearchModel::data(const QModelIndex &index, int role) const
+{
+#ifdef QUOTIENT_07
+    auto row = index.row();
+    const auto &event = *m_result->results[row].result;
+    switch (role) {
+    case DisplayRole:
+        return m_room->eventToString(*m_result->results[row].result);
+    case ShowAuthorRole:
+        return true;
+    case AuthorRole:
+        return QVariantMap{
+            {"isLocalUser", event.senderId() == m_room->localUser()->id()},
+            {"id", event.senderId()},
+            {"avatarMediaId", m_connection->user(event.senderId())->avatarMediaId(m_room)},
+            {"avatarUrl", m_connection->user(event.senderId())->avatarUrl(m_room)},
+            {"displayName", m_connection->user(event.senderId())->displayname(m_room)},
+            {"display", m_connection->user(event.senderId())->name()},
+            {"color", dynamic_cast<NeoChatUser *>(m_connection->user(event.senderId()))->color()},
+            {"object", QVariant::fromValue(m_connection->user(event.senderId()))},
+        };
+    case ShowSectionRole:
+        if (row == 0) {
+            return true;
+        }
+        return event.originTimestamp().date() != m_result->results[row - 1].result->originTimestamp().date();
+    case SectionRole:
+        return renderDate(event.originTimestamp());
+    case TimeRole:
+        return event.originTimestamp();
+    }
+    return MessageEventModel::DelegateType::Message;
+#endif
+    return {};
+}
+
+int SearchModel::rowCount(const QModelIndex &parent) const
+{
+#ifdef QUOTIENT_07
+    if (m_result.has_value()) {
+        return m_result->results.size();
+    }
+#endif
+    return 0;
+}
+
+QHash<int, QByteArray> SearchModel::roleNames() const
+{
+    return {
+        {EventTypeRole, "eventType"},
+        {DisplayRole, "display"},
+        {AuthorRole, "author"},
+        {ShowSectionRole, "showSection"},
+        {SectionRole, "section"},
+        {TimeRole, "time"},
+        {ShowAuthorRole, "showAuthor"},
+    };
+}
+
+NeoChatRoom *SearchModel::room() const
+{
+    return m_room;
+}
+
+void SearchModel::setRoom(NeoChatRoom *room)
+{
+    m_room = room;
+    Q_EMIT roomChanged();
+}
+
+// TODO deduplicate with messageeventmodel
+QString renderDate(const QDateTime &timestamp)
+{
+    auto date = timestamp.toLocalTime().date();
+    if (date == QDate::currentDate()) {
+        return i18n("Today");
+    }
+    if (date == QDate::currentDate().addDays(-1)) {
+        return i18n("Yesterday");
+    }
+    if (date == QDate::currentDate().addDays(-2)) {
+        return i18n("The day before yesterday");
+    }
+    if (date > QDate::currentDate().addDays(-7)) {
+        return date.toString("dddd");
+    }
+
+    return QLocale::system().toString(date, QLocale::ShortFormat);
+}
+
+bool SearchModel::searching() const
+{
+    return m_searching;
+}
+
+void SearchModel::setSearching(bool searching)
+{
+    m_searching = searching;
+    Q_EMIT searchingChanged();
+}

src/models/searchmodel.h

@@ -0,0 +1,78 @@
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#pragma once
+
+#include <QAbstractListModel>
+#include <QString>
+
+#ifdef QUOTIENT_07
+#include <csapi/search.h>
+#endif
+
+namespace Quotient
+{
+class Connection;
+}
+
+class NeoChatRoom;
+
+class SearchModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString searchText READ searchText WRITE setSearchText NOTIFY searchTextChanged)
+    Q_PROPERTY(Quotient::Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
+    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
+    Q_PROPERTY(bool searching READ searching NOTIFY searchingChanged)
+
+public:
+    enum Roles {
+        DisplayRole = Qt::DisplayRole,
+        EventTypeRole,
+        ShowAuthorRole,
+        AuthorRole,
+        ShowSectionRole,
+        SectionRole,
+        TimeRole,
+    };
+    Q_ENUM(Roles);
+    SearchModel(QObject *parent = nullptr);
+
+    QString searchText() const;
+    void setSearchText(const QString &searchText);
+
+    Quotient::Connection *connection() const;
+    void setConnection(Quotient::Connection *connection);
+
+    NeoChatRoom *room() const;
+    void setRoom(NeoChatRoom *room);
+
+    Q_INVOKABLE void search();
+
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QHash<int, QByteArray> roleNames() const override;
+
+    bool searching() const;
+
+Q_SIGNALS:
+    void searchTextChanged();
+    void connectionChanged();
+    void roomChanged();
+    void searchingChanged();
+
+private:
+    void setSearching(bool searching);
+
+    QString m_searchText;
+    Quotient::Connection *m_connection = nullptr;
+    NeoChatRoom *m_room = nullptr;
+#ifdef QUOTIENT_07
+    Quotient::Omittable<Quotient::SearchJob::ResultRoomEvents> m_result = Quotient::none;
+    Quotient::SearchJob *m_job = nullptr;
+#endif
+    bool m_searching = false;
+};
+
+QString renderDate(const QDateTime &dateTime);