Invalidate room list sorting when changing event visibility settings

BUG: 455030

.flatpak-manifest.json

@@ -2,7 +2,7 @@
     "id": "org.kde.neochat",
     "branch": "master",
     "runtime": "org.kde.Platform",
-    "runtime-version": "5.15-22.08",
+    "runtime-version": "5.15-21.08",
     "sdk": "org.kde.Sdk",
     "command": "neochat",
     "tags": [
@@ -136,8 +136,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/danvratil/qcoro/archive/refs/tags/v0.7.0.tar.gz",
-                    "sha256": "23ef0217926e67c8d2eb861cf91617da2f7d8d5a9ae6c62321b21448b1669210",
+                    "url": "https://github.com/danvratil/qcoro/archive/refs/tags/v0.4.0.tar.gz",
+                    "sha256": "0e68b3f0ce7bf521ffbdd731464d2d60d8d7a39a749b551ed26855a1707d86d1",
                     "x-checker-data": {
                         "type": "anitya",
                         "project-id": 236236,

.gitignore

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

.gitlab-ci.yml

@@ -4,11 +4,10 @@
 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
+# 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
+# TODO re-enable once cmark is in the CI again
+#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.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

@@ -1,8 +1,8 @@
-# SPDX-FileCopyrightText: 2021 Tobias Fella <tobias.fella@kde.org>
+# SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
 # SPDX-License-Identifier: BSD-2-Clause
 
 Dependencies:
-- 'on': ['Linux/Qt5', 'Android/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5']
+- 'on': ['@all']
   'require':
     'frameworks/extra-cmake-modules': '@stable'
     'frameworks/kcoreaddons': '@stable'
@@ -11,52 +11,18 @@ Dependencies:
     'frameworks/kconfig': '@stable'
     'frameworks/syntax-highlighting': '@stable'
     'frameworks/kitemmodels': '@stable'
-    'frameworks/kquickcharts': '@stable'
     'frameworks/knotifications': '@stable'
     '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/Qt5', 'Linux/Qt5', 'FreeBSD/Qt5']
+- 'on': ['Windows', 'Linux', 'FreeBSD']
   'require':
     'frameworks/qqc2-desktop-style': '@stable'
     'frameworks/kio': '@stable'
     'frameworks/kwindowsystem': '@stable'
     'frameworks/kconfigwidgets': '@stable'
-- 'on': ['Linux/Qt5', 'FreeBSD/Qt5']
+- 'on': ['Linux', 'FreeBSD']
   'require':
     'frameworks/kdbusaddons': '@stable'
 
-- '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'
-
 Options:
-  require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD', 'Windows' ]
+  require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ]

.reuse/dep5

@@ -7,7 +7,7 @@ Copyright: 2020 Carson Black <uhhadd@gmail.com>
 License: LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 
 Files: android/res/drawable/splash.xml
-Copyright: 2020 Tobias Fella <tobias.fella@kde.org>
+Copyright: 2020 Tobias Fella <fella@posteo.de>
 License: BSD-2-Clause
 
 Files: .gitignore
@@ -27,11 +27,11 @@ Copyright: 2021 Carl Schwan <carlschwan@kde.org>
 License: BSD-2-Clause
 
 Files: src/neochatconfig.kcfg
-Copyright: 2020-2021 Carl Schwan <carlschwan@kde.org>, Tobias Fella <tobias.fella@kde.org>
+Copyright: 2020-2021 Carl Schwan <carlschwan@kde.org>, Tobias Fella <fella@posteo.de>
 License: BSD-2-Clause
 
 Files: src/neochat.notifyrc
-Copyright: 2020 Tobias Fella <tobias.fella@kde.org>
+Copyright: 2020 Tobias Fella <fella@posteo.de>
 License: BSD-2-Clause
 
 Files: src/qml/Component/confetti.png src/qml/Component/glowdot.png
@@ -39,5 +39,5 @@ Copyright: 2021 Alexey Andreyev <aa13q@ya.ru>
 License: CC0-1.0
 
 Files: .flatpak-manifest.json
-Copyright: 2020-2022 Tobias Fella <tobias.fella@kde.org>
+Copyright: 2020-2022 Tobias Fella <fella@posteo.de>
 License: BSD-2-Clause

CMakeLists.txt

@@ -1,26 +1,18 @@
 # SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carl@carlschwan.eu>
 # SPDX-FileCopyrightText: 2020-2021 Nicolas Fella <nicolas.fella@gmx.de>
-# SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
+# SPDX-FileCopyrightText: 2020-2021 Tobias Fella <fella@posteo.de>
 # SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
 # SPDX-License-Identifier: BSD-2-Clause
 
 cmake_minimum_required(VERSION 3.16)
 
-# KDE Applications version, managed by release script.
-set(RELEASE_SERVICE_VERSION_MAJOR "23")
-set(RELEASE_SERVICE_VERSION_MINOR "07")
-set(RELEASE_SERVICE_VERSION_MICRO "70")
-set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
+project(NeoChat)
+set(PROJECT_VERSION "22.09")
 
-project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
-
-set(KF_MIN_VERSION "5.91.0")
+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 ${KF_MIN_VERSION} REQUIRED NO_MODULE)
+find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
@@ -57,16 +49,21 @@ set_package_properties(Qt${QT_MAJOR_VERSION} PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
 )
-find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels)
-set_package_properties(KF${QT_MAJOR_VERSION} PROPERTIES
+find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels)
+set_package_properties(KF5 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
 )
-set_package_properties(KF${QT_MAJOR_VERSION}Kirigami2 PROPERTIES
-        TYPE REQUIRED
-        PURPOSE "Kirigami application UI framework"
-        )
-find_package(KF${QT_MAJOR_VERSION}KirigamiAddons 0.7.2 REQUIRED)
+set_package_properties(KF5Kirigami2 PROPERTIES
+    TYPE REQUIRED
+    PURPOSE "Kirigami application UI framework"
+)
+
+find_package(Qt${QT_MAJOR_VERSION}Keychain)
+set_package_properties(Qt${QT_MAJOR_VERSION}Keychain PROPERTIES
+    TYPE REQUIRED
+    PURPOSE "Secure storage of account secrets"
+)
 
 if(ANDROID)
     find_package(OpenSSL)
@@ -76,18 +73,20 @@ if(ANDROID)
     )
 else()
     find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem)
-    set_package_properties(KF${QT_MAJOR_VERSION}QQC2DesktopStyle PROPERTIES
+    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem)
+    set_package_properties(KF5QQC2DesktopStyle PROPERTIES
         TYPE RUNTIME
     )
     ecm_find_qmlmodule(org.kde.syntaxhighlighting 1.0)
 endif()
 
+ecm_find_qmlmodule(org.kde.kirigamiaddons.labs.mobileform 0.1)
+
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
-    find_package(KF${QT_MAJOR_VERSION}DBusAddons ${KF_MIN_VERSION} REQUIRED)
+    find_package(KF5DBusAddons ${KF5_MIN_VERSION} REQUIRED)
 endif()
 
-find_package(Quotient 0.7)
+find_package(Quotient 0.6)
 set_package_properties(Quotient PROPERTIES
     TYPE REQUIRED
     DESCRIPTION "Qt wrapper around Matrix API"
@@ -105,7 +104,6 @@ set_package_properties(cmark PROPERTIES
 
 ecm_find_qmlmodule(org.kde.kquickimageeditor 1.0)
 ecm_find_qmlmodule(org.kde.kitemmodels 1.0)
-ecm_find_qmlmodule(org.kde.quickcharts 1.0)
 
 find_package(KQuickImageEditor COMPONENTS)
 set_package_properties(KQuickImageEditor PROPERTIES
@@ -115,19 +113,24 @@ set_package_properties(KQuickImageEditor PROPERTIES
     PURPOSE "Add image editing capability to image attachments"
 )
 
-find_package(QCoro${QT_MAJOR_VERSION} 0.4 COMPONENTS Core REQUIRED)
+find_package(QCoro${QT_MAJOR_VERSION} COMPONENTS Core QUIET)
+if(NOT QCoro${QT_MAJOR_VERSION}_FOUND)
+    find_package(QCoro REQUIRED)
+endif()
 
 qcoro_enable_coroutines()
 
-find_package(KF${QT_MAJOR_VERSION}DocTools ${KF_MIN_VERSION})
-set_package_properties(KF${QT_MAJOR_VERSION}DocTools PROPERTIES DESCRIPTION
+find_package(KF5DocTools ${KF5_MIN_VERSION})
+set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
     "Tools to generate documentation"
     TYPE OPTIONAL
 )
 
+if(NOT Quotient_VERSION_MINOR GREATER 6)
+    cmake_policy(SET CMP0063 OLD)
+endif()
 
 if(ANDROID)
-    find_package(Sqlite3)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/android/version.gradle.in ${CMAKE_BINARY_DIR}/version.gradle)
 endif()
 
@@ -141,12 +144,12 @@ install(FILES org.kde.neochat.tray.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/h
 add_definitions(-DQT_NO_FOREACH)
 
 add_subdirectory(src)
-if (BUILD_TESTING)
-    find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
+if (BUILD_TESTING AND Quotient_VERSION_MINOR GREATER 6)
+    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
     add_subdirectory(autotests)
 endif()
 
-if(KF${QT_MAJOR_VERSION}DocTools_FOUND)
+if(KF5DocTools_FOUND)
     kdoctools_install(po)
     add_subdirectory(doc)
 endif()

README.md

@@ -1,6 +1,6 @@
 <!--
     SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carlschwan@kde.org>
-    SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
+    SPDX-FileCopyrightText: 2020-2021 Tobias Fella <fella@posteo.de>
     SPDX-License-Identifier: CC0-1.0
 -->
 # NeoChat

android/AndroidManifest.xml

@@ -14,8 +14,7 @@
                   android:name="org.qtproject.qt5.android.bindings.QtActivity"
                   android:label="NeoChat"
                   android:windowSoftInputMode="adjustResize"
-                  android:launchMode="singleTop"
-                  android:exported="true">
+                  android:launchMode="singleTop">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -23,6 +22,7 @@
             </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,6 +38,8 @@
             <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:7.0.2'
+        classpath 'com.android.tools.build:gradle:3.6.4'
     }
 }
 
@@ -73,10 +73,6 @@ android {
     defaultConfig {
         minSdkVersion qtMinSdkVersion
         targetSdkVersion qtTargetSdkVersion
-        applicationId "org.kde.neochat"
-        namespace "org.kde.neochat"
-        versionCode timestamp
-        versionName projectVersionFull
         manifestPlaceholders = [versionName: projectVersionFull, versionCode: timestamp]
     }
 

autotests/CMakeLists.txt

@@ -8,9 +8,3 @@ ecm_add_test(
     LINK_LIBRARIES neochat Qt::Test Quotient
     TEST_NAME neochatroomtest
 )
-
-ecm_add_test(
-    texthandlertest.cpp
-    LINK_LIBRARIES neochat Qt::Test
-    TEST_NAME texthandlertest
-)

autotests/neochatroomtest.cpp

@@ -5,7 +5,9 @@
 #include <QSignalSpy>
 #include <QTest>
 
+#define protected public // please don't hate me
 #include "neochatroom.h"
+#undef protected
 
 #include <connection.h>
 #include <quotient_common.h>
@@ -13,23 +15,12 @@
 
 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;
-    TestRoom *room = nullptr;
+    NeoChatRoom *room = nullptr;
 
 private Q_SLOTS:
     void initTestCase();
@@ -40,7 +31,7 @@ private Q_SLOTS:
 void NeoChatRoomTest::initTestCase()
 {
     connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
+    room = new NeoChatRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
 
     auto json = QJsonDocument::fromJson(R"EVENT({
   "account_data": {
@@ -130,13 +121,13 @@ void NeoChatRoomTest::initTestCase()
   }
 })EVENT");
     SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, json.object());
-    room->update(std::move(roomData));
+    room->updateData(std::move(roomData));
 }
 
 void NeoChatRoomTest::subtitleTextTest()
 {
     QCOMPARE(room->timelineSize(), 1);
-    QCOMPARE(room->lastEventToString(), QStringLiteral("@example:example.org: This is an example text message"));
+    QCOMPARE(room->subtitleText(), QStringLiteral("@example:example.org: This is an example text message"));
 }
 
 void NeoChatRoomTest::eventTest()

autotests/texthandlertest.cpp

@@ -1,587 +0,0 @@
-// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include <QObject>
-#include <QTest>
-
-#include "texthandler.h"
-
-#include <qnamespace.h>
-#include <quotient_common.h>
-#include <syncdata.h>
-
-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 TextHandlerTest : public QObject
-{
-    Q_OBJECT
-
-private:
-    Connection *connection = nullptr;
-    TestRoom *room = nullptr;
-
-private Q_SLOTS:
-    void initTestCase();
-
-    void allowedAttributes();
-    void stripDisallowedTags();
-    void stripDisallowedAttributes();
-    void emptyCodeTags();
-
-    void sendSimpleStringCase();
-    void sendSingleParaMarkup();
-    void sendMultipleSectionMarkup();
-    void sendBadLinks();
-    void sendEscapeCode();
-    void sendCodeClass();
-
-    void receiveStripReply();
-    void receivePlainTextIn();
-
-    void receiveRichInPlainOut_data();
-    void receiveRichInPlainOut();
-    void receivePlainStripHtml();
-    void receivePlainStripMarkup();
-    void receiveStripNewlines();
-
-    void receiveRichUserPill();
-    void receiveRichStrikethrough();
-    void receiveRichtextIn();
-    void receiveRichMxcUrl();
-    void receiveRichPlainUrl();
-    void receiveRichEmote();
-    void receiveRichEdited_data();
-    void receiveRichEdited();
-};
-
-void TextHandlerTest::initTestCase()
-{
-    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
-
-    const auto json = QJsonDocument::fromJson(R"EVENT({
-  "account_data": {
-    "events": [
-      {
-        "content": {
-          "tags": {
-            "u.work": {
-              "order": 0.9
-            }
-          }
-        },
-        "type": "m.tag"
-      },
-      {
-        "content": {
-          "custom_config_key": "custom_config_value"
-        },
-        "type": "org.example.custom.room.config"
-      }
-    ]
-  },
-  "ephemeral": {
-    "events": [
-      {
-        "content": {
-          "user_ids": [
-            "@alice:matrix.org",
-            "@bob:example.com"
-          ]
-        },
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "type": "m.typing"
-      }
-    ]
-  },
-  "state": {
-    "events": [
-      {
-        "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Alice Margatroid",
-          "membership": "join",
-          "reason": "Looking for support"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1432735824653,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "state_key": "@alice:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      }
-    ]
-  },
-  "summary": {
-    "m.heroes": [
-      "@alice:example.com",
-      "@bob:example.com"
-    ],
-    "m.invited_member_count": 0,
-    "m.joined_member_count": 2
-  },
-  "timeline": {
-    "events": [
-      {
-        "content": {
-          "body": "This is an **example** text message",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "<b>This is an example text message</b>",
-          "msgtype": "m.text"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1432735824654,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "body": "/me This is an emote.",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "This is an emote.",
-          "msgtype": "m.emote"
-        },
-        "event_id": "$153273582443PhrSn:example.org",
-        "origin_server_ts": 1532735824654,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1231
-        }
-      },
-      {
-        "content": {
-            "body": "tested",
-            "msgtype": "m.text"
-        },
-        "event_id": "$zrCiBxBnqqTn0Z5FY78qSZAszno_w8nJJXzfBULG-3E",
-        "origin_server_ts": 1680948575928,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 1747776,
-            "m.relations": {
-                "m.replace": {
-                    "event_id": "$UX0PlpyI7vYO32iHMuuYEP7ECMh4sX3XLGiB2SwM4mQ",
-                    "origin_server_ts": 1680948580992,
-                    "sender": "@example:example.org"
-                }
-            }
-        }
-      }
-    ],
-    "limited": true,
-    "prev_batch": "t34-23535_0_0"
-  }
-})EVENT");
-    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, json.object());
-    room->update(std::move(roomData));
-}
-
-void TextHandlerTest::allowedAttributes()
-{
-    const QString testInputString1 = QStringLiteral("<p><span data-mx-spoiler><font color=#FFFFFF>Test</font><span></p>");
-    const QString testOutputString1 = QStringLiteral("<p><span data-mx-spoiler><font color=#FFFFFF>Test</font><span></p>");
-    // Handle urls where the href has either single (') or double (") quotes.
-    const QString testInputString2 = QStringLiteral("<p><a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a></p>");
-    const QString testOutputString2 = QStringLiteral("<p><a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a></p>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString1);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString1);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString1);
-
-    testTextHandler.setData(testInputString2);
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString2);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString2);
-}
-
-void TextHandlerTest::stripDisallowedTags()
-{
-    const QString testInputString = QStringLiteral("<p>Allowed</p> <span>Allowed</span> <body>Disallowed</body>");
-    const QString testOutputString = QStringLiteral("<p>Allowed</p> <span>Allowed</span> Disallowed");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-}
-
-void TextHandlerTest::stripDisallowedAttributes()
-{
-    const QString testInputString = QStringLiteral("<p style=\"font-size:50px;\" color=#FFFFFF>Test</p>");
-    const QString testOutputString = QStringLiteral("<p>Test</p>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-}
-
-/**
- * Make sure that empty code tags are handled.
- * (this was a bug during development hence the test)
- */
-void TextHandlerTest::emptyCodeTags()
-{
-    const QString testInputString = QStringLiteral("<pre><code></code></pre>");
-    const QString testOutputString = QStringLiteral("<pre><code></code></pre>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-}
-
-void TextHandlerTest::sendSimpleStringCase()
-{
-    const QString testInputString = QStringLiteral("This data should just be put in a paragraph.");
-    const QString testOutputString = QStringLiteral("<p>This data should just be put in a paragraph.</p>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-}
-
-void TextHandlerTest::sendSingleParaMarkup()
-{
-    const QString testInputString = QStringLiteral(
-        "Text para with **bold**, *italic*, [link](https://kde.org), ![image](mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e), `inline code`.");
-    const QString testOutputString = QStringLiteral(
-        "<p>Text para with <strong>bold</strong>, <em>italic</em>, <a href=\"https://kde.org\">link</a>, <img "
-        "src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e\" alt=\"image\">, <code>inline code</code>.</p>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-}
-
-void TextHandlerTest::sendMultipleSectionMarkup()
-{
-    const QString testInputString =
-        QStringLiteral("Text para\n> blockquote\n* List 1\n* List 2\n1. one\n2. two\n# Heading 1\n## Heading 2\nhorizontal rule\n\n---\n```\ncodeblock\n```");
-    const QString testOutputString = QStringLiteral(
-        "<p>Text para</p>\n<blockquote>\n<p>blockquote</p>\n</blockquote>\n<ul>\n<li>List 1</li>\n<li>List "
-        "2</li>\n</ul>\n<ol>\n<li>one</li>\n<li>two</li>\n</ol>\n<h1>Heading 1</h1>\n<h2>Heading 2</h2>\n<p>horizontal "
-        "rule</p>\n<hr>\n<pre><code>codeblock\n</code></pre>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-}
-
-void TextHandlerTest::sendBadLinks()
-{
-    const QString testInputString = QStringLiteral("[link](kde.org), ![image](https://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e)");
-    const QString testOutputString = QStringLiteral("<p><a>link</a>, <img alt=\"image\"></p>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-}
-
-/**
- * All text between code tags is treated as plain so it should get escaped.
- */
-void TextHandlerTest::sendEscapeCode()
-{
-    const QString testInputString = QStringLiteral("```\n<p>Test <span style=\"font-size:50px;\">some</span> code</p>\n```");
-    const QString testOutputString =
-        QStringLiteral("<pre><code>&lt;p&gt;Test &lt;span style=&quot;font-size:50px;&quot;&gt;some&lt;/span&gt; code&lt;/p&gt;\n</code></pre>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-}
-
-void TextHandlerTest::sendCodeClass()
-{
-    const QString testInputString = QStringLiteral("```html\nsome code\n```\n<pre><code class=\"code-underline\">some more code</code></pre>");
-    const QString testOutputString = QStringLiteral("<pre><code class=\"language-html\">some code\n</code></pre>\n<pre><code>some more code</code></pre>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-}
-
-void TextHandlerTest::receiveStripReply()
-{
-    const QString testInputString = QStringLiteral(
-        "<mx-reply><blockquote><a href=\"https://matrix.to/#/!somewhere:example.org/$event:example.org\">In reply to</a><a "
-        "href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a><br />Message replied to.</blockquote></mx-reply>Reply message.");
-    const QString testOutputString = QStringLiteral("Reply message.");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-    QCOMPARE(testTextHandler.handleRecievePlainText(), testOutputString);
-}
-
-void TextHandlerTest::receiveRichInPlainOut_data()
-{
-    QTest::addColumn<QString>("testInputString");
-    QTest::addColumn<QString>("testOutputString");
-
-    QTest::newRow("ampersand") << QStringLiteral("a &amp; b") << QStringLiteral("a & b");
-    QTest::newRow("quote") << QStringLiteral("&quot;a and b&quot;") << QStringLiteral("\"a and b\"");
-}
-
-void TextHandlerTest::receiveRichInPlainOut()
-{
-    QFETCH(QString, testInputString);
-    QFETCH(QString, testOutputString);
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecievePlainText(Qt::RichText), testOutputString);
-}
-
-void TextHandlerTest::receivePlainTextIn()
-{
-    const QString testInputString = QStringLiteral("<plain text in tag bracket>\nTest link https://kde.org.");
-    const QString testOutputStringRich = QStringLiteral("&lt;plain text in tag bracket&gt;<br>Test link <a href=\"https://kde.org\">https://kde.org</a>.");
-    QString testOutputStringPlain = QStringLiteral("<plain text in tag bracket>\nTest link https://kde.org.");
-
-    // Make sure quotes are maintained in a plain string.
-    const QString testInputString2 = QStringLiteral("last line is \"Time to switch to a new topic.\"");
-    const QString testOutputString2 = QStringLiteral("last line is \"Time to switch to a new topic.\"");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::PlainText), testOutputStringRich);
-    QCOMPARE(testTextHandler.handleRecievePlainText(), testOutputStringPlain);
-
-    testTextHandler.setData(testInputString2);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::PlainText), testOutputString2);
-    QCOMPARE(testTextHandler.handleRecievePlainText(), testOutputString2);
-}
-
-void TextHandlerTest::receiveStripNewlines()
-{
-    const QString testInputStringPlain = QStringLiteral("Test\nmany\nnew\nlines.");
-    const QString testInputStringRich = QStringLiteral("Test<br>many<br />new<br>lines.");
-    const QString testOutputString = QStringLiteral("Test many new lines.");
-
-    const QString testInputStringPlain2 = QStringLiteral("* List\n* Items");
-    const QString testOutputString2 = QStringLiteral("List Items");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputStringPlain);
-
-    QCOMPARE(testTextHandler.handleRecievePlainText(Qt::PlainText, true), testOutputString);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::PlainText, nullptr, nullptr, true), testOutputString);
-
-    testTextHandler.setData(testInputStringRich);
-    QCOMPARE(testTextHandler.handleRecievePlainText(Qt::RichText, true), testOutputString);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, nullptr, nullptr, true), testOutputString);
-
-    testTextHandler.setData(testInputStringPlain2);
-    QCOMPARE(testTextHandler.handleRecievePlainText(Qt::RichText, true), testOutputString2);
-}
-
-/**
- * For a plain text output of a received string all html is stripped except for
- * code which is unescaped if it's html.
- */
-void TextHandlerTest::receivePlainStripHtml()
-{
-    const QString testInputString = QStringLiteral("<p>Test</p> <pre><code>Some code <strong>with tags</strong></code></pre>");
-    const QString testOutputString = QStringLiteral("Test Some code <strong>with tags</strong>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecievePlainText(Qt::RichText), testOutputString);
-}
-
-void TextHandlerTest::receivePlainStripMarkup()
-{
-    const QString testInputString = QStringLiteral("**bold** `<p>inline code</p>` *italic*");
-    const QString testOutputString = QStringLiteral("bold <p>inline code</p> italic");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecievePlainText(), testOutputString);
-}
-
-void TextHandlerTest::receiveRichUserPill()
-{
-    const QString testInputString = QStringLiteral("<p><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></p>");
-    const QString testOutputString = QStringLiteral("<p><b><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></b></p>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-}
-
-void TextHandlerTest::receiveRichStrikethrough()
-{
-    const QString testInputString = QStringLiteral("<p><del>Test</del></p>");
-    const QString testOutputString = QStringLiteral("<p><s>Test</s></p>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-}
-
-void TextHandlerTest::receiveRichtextIn()
-{
-    const QString testInputString = QStringLiteral("<p>Test</p> <pre><code>Some code <strong>with tags</strong></code></pre>");
-    const QString testOutputString = QStringLiteral("<p>Test</p> <pre><code>Some code &lt;strong&gt;with tags&lt;/strong&gt;</code></pre>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-}
-
-void TextHandlerTest::receiveRichMxcUrl()
-{
-    const QString testInputString = QStringLiteral(
-        "<img src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e\" alt=\"image\"><img src=\"mxc://kde.org/34c3464b3a1bd7f55af2d559e07d2c773c430e73\" "
-        "alt=\"image\">");
-    const QString testOutputString = QStringLiteral(
-        "<img "
-        "src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e?user_id=@bob:kde.org&room_id=%23myroom:kde.org&event_id=$143273582443PhrSn:example.org\" "
-        "alt=\"image\"><img "
-        "src=\"mxc://kde.org/34c3464b3a1bd7f55af2d559e07d2c773c430e73?user_id=@bob:kde.org&room_id=%23myroom:kde.org&event_id=$143273582443PhrSn:example.org\" "
-        "alt=\"image\">");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, room->messageEvents().at(0).get()), testOutputString);
-}
-
-/**
- * For when your rich input string has a plain text url left in.
- *
- * This test is to show that a url that is already rich will be left alone but a
- * plain one will be linkified.
- */
-void TextHandlerTest::receiveRichPlainUrl()
-{
-    // This is an actual link that caused trouble which is why it's so long. Keeping
-    // so we can confirm consistent behaviour for complex urls.
-    const QString testInputStringLink1 = QStringLiteral(
-        "https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im "
-        "<a "
-        "href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/"
-        "$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>");
-    const QString testOutputStringLink1 = QStringLiteral(
-        "<a "
-        "href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/"
-        "$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">https://matrix.to/#/"
-        "!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im</a> <a "
-        "href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/"
-        "$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>");
-
-    // Another real case. The linkification wasn't handling it when a single link
-    // contains what looks like and email. It was been broken into 3 but needs to
-    // be just single link.
-    const QString testInputStringLink2 = QStringLiteral("https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/");
-    const QString testOutputStringLink2 = QStringLiteral(
-        "<a "
-        "href=\"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/\">https://lore.kernel.org/lkml/"
-        "CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/</a>");
-
-    QString testInputStringEmail = QStringLiteral(R"(email@example.com <a href="mailto:email@example.com">Link already rich</a>)");
-    QString testOutputStringEmail =
-        QStringLiteral(R"(<a href="mailto:email@example.com">email@example.com</a> <a href="mailto:email@example.com">Link already rich</a>)");
-
-    QString testInputStringMxId = QStringLiteral("@user:kde.org <a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a>");
-    QString testOutputStringMxId = QStringLiteral(
-        "<b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> <b><a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a></b>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputStringLink1);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringLink1);
-
-    testTextHandler.setData(testInputStringLink2);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringLink2);
-
-    testTextHandler.setData(testInputStringEmail);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringEmail);
-
-    testTextHandler.setData(testInputStringMxId);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxId);
-}
-
-// Test that user pill is add to an emote message.
-// N.B. The second message in the test timeline is marked as an emote.
-void TextHandlerTest::receiveRichEmote()
-{
-    auto event = room->messageEvents().at(1).get();
-    auto author = static_cast<NeoChatUser *>(room->user(event->senderId()));
-    const QString testInputString = QStringLiteral("This is an emote.");
-    const QString testOutputString = QStringLiteral("* <a href=\"https://matrix.to/#/@example:example.org\" style=\"color:") + author->color().name()
-        + QStringLiteral("\">@example:example.org</a> This is an emote.");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, event), testOutputString);
-}
-
-void TextHandlerTest::receiveRichEdited_data()
-{
-    QTest::addColumn<QString>("testInputString");
-    QTest::addColumn<QString>("testOutputString");
-
-    QTest::newRow("basic") << QStringLiteral("Edited") << QStringLiteral("Edited <span style=\"color:#000000\">(edited)</span>");
-    QTest::newRow("multiple paragraphs") << QStringLiteral("<p>Edited</p>\n<p>Edited</p>")
-                                         << QStringLiteral("<p>Edited</p>\n<p>Edited <span style=\"color:#000000\">(edited)</span></p>");
-    QTest::newRow("blockquote") << QStringLiteral("<blockquote>Edited</blockquote>")
-                                << QStringLiteral("<blockquote>Edited</blockquote><p> <span style=\"color:#000000\">(edited)</span></p>");
-}
-
-void TextHandlerTest::receiveRichEdited()
-{
-    QFETCH(QString, testInputString);
-    QFETCH(QString, testOutputString);
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, room->messageEvents().at(2).get()), testOutputString);
-}
-
-QTEST_MAIN(TextHandlerTest)
-#include "texthandlertest.moc"

org.kde.neochat.appdata.xml

@@ -2,7 +2,7 @@
 <!--
   - SPDX-License-Identifier: CC0-1.0
   - SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carlschwan@kde.org>
-  - SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
+  - SPDX-FileCopyrightText: 2020-2021 Tobias Fella <fella@posteo.de>
  -->
 <component type="desktop">
   <id>org.kde.neochat</id>
@@ -16,7 +16,6 @@
   <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>
@@ -35,7 +34,6 @@
   <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>
@@ -51,7 +49,6 @@
   <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>
@@ -70,7 +67,6 @@
   <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>
@@ -85,7 +81,6 @@
     <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>
@@ -102,7 +97,6 @@
     <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>
@@ -116,7 +110,6 @@
     <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>
@@ -133,7 +126,6 @@
     <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>
@@ -146,8 +138,7 @@
     <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 Mobilgeräten als auch auf dem PC und bietet ein einheitliches Benutzererlebnis.</p>
-    <p xml:lang="el">Το NeoChat λειτουργεί και στα κινητά και στους υπολογιστές γραφείου παρέχοντας μια αδιάλειπτη εμπειρία χρήσης.</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="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>
@@ -164,7 +155,6 @@
     <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>
@@ -179,13 +169,12 @@
     <category>Network</category>
   </categories>
   <developer_name>The KDE Community</developer_name>
-  <developer_name xml:lang="ar">مجتمع كِيدِي</developer_name>
+  <developer_name xml:lang="ar">مجتمع كدي</developer_name>
   <developer_name xml:lang="az">KDE Cəmiyyəti</developer_name>
   <developer_name xml:lang="ca">La comunitat KDE</developer_name>
   <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>
@@ -204,7 +193,6 @@
   <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>
@@ -216,7 +204,6 @@
   <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>
@@ -231,23 +218,6 @@
     <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>
     <release version="22.09" date="2022-09-27">
       <url>https://www.plasma-mobile.org/2022/09/27/plasma-mobile-gear-22-09/</url>
     </release>

org.kde.neochat.desktop

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
+# SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
 [Desktop Entry]
 Version=1.5
 Name=NeoChat
@@ -9,7 +9,6 @@ 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
@@ -30,7 +29,6 @@ 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
@@ -46,7 +44,6 @@ 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
@@ -67,7 +64,6 @@ 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
@@ -82,7 +78,6 @@ 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
@@ -103,7 +98,6 @@ 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

@@ -1,122 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
-<!ENTITY % 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>

po/tr/docs/neochat/CMakeLists.txt

@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-kdoctools_create_manpage(man-neochat.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})

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

@@ -1,122 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
-<!ENTITY % Turkish "INCLUDE">
-]>
-<!--
-SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
-SPDX-License-Identifier: CC-BY-SA-4.0
--->
-
-<refentry lang="&language;">
-<refentryinfo>
-<title
->NeoChat Kullanıcı Kılavuzu</title>
-<author
-><firstname
->Carl</firstname
-><surname
->Schwan</surname
-> <contrib
->NeoChat man page.</contrib
-> <email
->carl@carlschwan.eu</email
-></author>
-<date
->2022-11-01</date>
-<releaseinfo
->22.09</releaseinfo>
-<productname
->NeoChat</productname>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>
-    <command
->neochat</command>
-  </refentrytitle>
-  <manvolnum
->1</manvolnum>
-</refmeta>
-
-<refnamediv>
-  <refname
->neochat</refname>
-  <refpurpose
->Matrix iletileşme protokolü ile etkileşim için istemci</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
->Açıklama</title>
-  <para
-><command
->neochat</command
->, Matrix protokolü için hem masaüstünde hem de taşınabilir aygıtlarda çalışan bir sohbet uygulamasıdır. </para>
-</refsect1>
-
-<refsect1 id="options"
-><title
->Seçenekler</title>
-<variablelist>
-  <varlistentry>
-  <term
-><option
->URI</option
-></term>
-  <listitem>
-    <para
->Bir kullanıcı veya oda için matrix URI'si; örneğin, matrix:u/kullanıcı:örnek.org ve matrix:r/kök:örnek.org. Bu, NeoChat'in verilen odayı veya konuşmayı açmayı denemesini sağlar. </para>
-  </listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1 id="bug">
-  <title
->Hata Bildirme</title>
-  <para
->Hataları veya özellik isteklerini <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
-> bağlantısından bildirebilirsiniz</para>
-</refsect1>
-
-<refsect1>
-  <title
->Ayrıca</title>
-  <simplelist>
-    <member
->Matrix üzerine sıkça sorulan soruların bir listesi: <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
->Telif Hakkı</title>
-<para
->Telif hakkı &copy; 2020-2022 Tobias Fella </para>
-<para
->Telif hakkı &copy; 2020-2022 Carl Schwan </para>
-<para
->Lisans: GNU Genel Kamu Lisansa, 3. sürüm veya sonrası &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

@@ -1,57 +1,51 @@
 # SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carl@carlschwan.eu>
 # SPDX-FileCopyrightText: 2020-2021 Nicolas Fella <nicolas.fella@gmx.de>
-# SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
+# SPDX-FileCopyrightText: 2020-2021 Tobias Fella <fella@posteo.de>
 # SPDX-License-Identifier: BSD-2-Clause
 
 add_library(neochat STATIC
     controller.cpp
     actionshandler.cpp
-    models/emojimodel.cpp
-    emojitones.cpp
-    models/customemojimodel.cpp
+    emojimodel.cpp
+    customemojimodel.cpp
     clipboard.cpp
     matriximageprovider.cpp
-    models/messageeventmodel.cpp
-    models/messagefiltermodel.cpp
-    models/roomlistmodel.cpp
-    models/sortfilterspacelistmodel.cpp
+    messageeventmodel.cpp
+    messagefiltermodel.cpp
+    roomlistmodel.cpp
+    sortfilterspacelistmodel.cpp
     spacehierarchycache.cpp
     roommanager.cpp
     neochatroom.cpp
     neochatuser.cpp
-    models/userlistmodel.cpp
-    models/userfiltermodel.cpp
-    models/publicroomlistmodel.cpp
-    models/userdirectorylistmodel.cpp
-    models/keywordnotificationrulemodel.cpp
+    userlistmodel.cpp
+    publicroomlistmodel.cpp
+    userdirectorylistmodel.cpp
+    keywordnotificationrulemodel.cpp
+    utils.cpp
     notificationsmanager.cpp
-    models/sortfilterroomlistmodel.cpp
+    sortfilterroomlistmodel.cpp
     chatdocumenthandler.cpp
-    models/devicesmodel.cpp
+    devicesmodel.cpp
     filetypesingleton.cpp
     login.cpp
-    models/webshortcutmodel.cpp
+    stickerevent.cpp
+    webshortcutmodel.cpp
     blurhash.cpp
     blurhashimageprovider.cpp
     joinrulesevent.cpp
-    models/collapsestateproxymodel.cpp
+    collapsestateproxymodel.cpp
     urlhelper.cpp
     windowcontroller.cpp
     linkpreviewer.cpp
-    models/completionmodel.cpp
-    models/completionproxymodel.cpp
-    models/actionsmodel.cpp
-    models/serverlistmodel.cpp
-    models/statemodel.cpp
+    completionmodel.cpp
+    completionproxymodel.cpp
+    actionsmodel.cpp
+    serverlistmodel.cpp
+    statemodel.cpp
     filetransferpseudojob.cpp
-    models/searchmodel.cpp
-    texthandler.cpp
-    pollevent.cpp
-    pollhandler.cpp
 )
 
-target_compile_definitions(neochat PUBLIC "-DQT_NO_KEYWORDS")
-
 add_executable(neochat-app
     main.cpp
     res.qrc
@@ -63,9 +57,17 @@ target_link_libraries(neochat-app PRIVATE
     neochat
 )
 
+if(Quotient_VERSION_MINOR GREATER 6)
+    target_compile_definitions(neochat PUBLIC QUOTIENT_07)
+    target_sources(neochat PRIVATE pollevent.cpp pollhandler.cpp)
+else()
+    target_compile_definitions(neochat PUBLIC QUOTIENT_VERSION=\"${Quotient_VERSION}\")
+    target_sources(neochat PRIVATE neochataccountregistry.cpp)
+endif()
+
 ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)
 
-target_sources(neochat-app PRIVATE ${NEOCHAT_ICON})
+target_sources(neochat PRIVATE ${NEOCHAT_ICON})
 
 if(NOT ANDROID)
     target_sources(neochat PRIVATE colorschemer.cpp)
@@ -74,7 +76,7 @@ if(NOT ANDROID)
     else()
         target_sources(neochat PRIVATE trayicon.cpp)
     endif()
-    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::ConfigWidgets KF${QT_MAJOR_VERSION}::WindowSystem)
+    target_link_libraries(neochat PUBLIC KF5::ConfigWidgets KF5::WindowSystem)
     target_compile_definitions(neochat PUBLIC -DHAVE_COLORSCHEME)
     target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM)
 endif()
@@ -82,15 +84,18 @@ endif()
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     target_sources(neochat-app PRIVATE res_desktop.qrc)
     target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
-    target_compile_definitions(neochat PUBLIC -DHAVE_X11)
     target_sources(neochat PRIVATE runner.cpp)
 else()
     target_sources(neochat-app PRIVATE res_android.qrc)
 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 cmark::cmark ${QTKEYCHAIN_LIBRARIES} QCoro::Core)
-
+target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 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()
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
 
 if(NEOCHAT_FLATPAK)
@@ -100,9 +105,6 @@ 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
@@ -159,25 +161,13 @@ if(ANDROID)
         "zoom-out"
         "image-rotate-left-symbolic"
         "image-rotate-right-symbolic"
-        "channel-secure-symbolic"
+        "channel-insecure-symbolic"
         "download"
         "smiley"
         "tools-check-spelling"
-        "username-copy"
-        "system-switch-user"
-        "bookmark-new"
-        "bookmark-remove"
-        "favorite"
-        "window-new"
-        "globe"
-        "visibility"
-        "home"
-        "preferences-desktop-notification"
-        "computer-symbolic"
-        "gps"
     )
 else()
-    target_link_libraries(neochat PUBLIC Qt::Widgets KF${QT_MAJOR_VERSION}::KIOWidgets)
+    target_link_libraries(neochat PUBLIC Qt::Widgets KF5::KIOWidgets)
     install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
 endif()
 
@@ -185,12 +175,12 @@ if(NOT ANDROID)
     set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
 endif()
 
-if(TARGET KF${QT_MAJOR_VERSION}::DBusAddons)
-    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::DBusAddons)
+if(TARGET KF5::DBusAddons)
+    target_link_libraries(neochat PUBLIC KF5::DBusAddons)
     target_compile_definitions(neochat PUBLIC -DHAVE_KDBUSADDONS)
 endif()
 
-if (TARGET KF${QT_MAJOR_VERSION}::KIOWidgets)
+if (TARGET KF5::KIOWidgets)
     target_compile_definitions(neochat PUBLIC -DHAVE_KIO)
 endif()
 

src/actionshandler.cpp

@@ -13,17 +13,32 @@
 #include <KLocalizedString>
 #include <QStringBuilder>
 
+#include "actionsmodel.h"
 #include "controller.h"
-#include "models/actionsmodel.h"
-#include "models/customemojimodel.h"
+#include "customemojimodel.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
-#include "neochatuser.h"
 #include "roommanager.h"
-#include "texthandler.h"
+#include "neochatuser.h"
 
 using namespace Quotient;
 
+QString markdownToHTML(const QString &markdown)
+{
+    const auto str = markdown.toUtf8();
+    char *tmp_buf = cmark_markdown_to_html(str.constData(), str.size(), CMARK_OPT_HARDBREAKS | CMARK_OPT_UNSAFE);
+
+    const std::string html(tmp_buf);
+
+    free(tmp_buf);
+
+    auto result = QString::fromStdString(html).trimmed();
+
+    result.replace("<!-- raw HTML omitted -->", "");
+
+    return result;
+}
+
 ActionsHandler::ActionsHandler(QObject *parent)
     : QObject(parent)
 {
@@ -44,9 +59,9 @@ void ActionsHandler::setRoom(NeoChatRoom *room)
     Q_EMIT roomChanged();
 }
 
-void ActionsHandler::handleNewMessage()
+void ActionsHandler::handleMessage()
 {
-    checkEffects(m_room->chatBoxText());
+    checkEffects();
     if (!m_room->chatBoxAttachmentPath().isEmpty()) {
         QUrl url(m_room->chatBoxAttachmentPath());
         auto path = url.isLocalFile() ? url.toLocalFile() : url.toString();
@@ -55,39 +70,13 @@ void ActionsHandler::handleNewMessage()
         m_room->setChatBoxText({});
         return;
     }
-
     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 {
+    std::sort(m_room->mentions()->begin(), m_room->mentions()->end(), [](const auto &a, const auto &b) -> bool {
         return a.cursor.anchor() > b.cursor.anchor();
     });
 
-    for (const auto &mention : *mentions) {
+    for (const auto &mention : *m_room->mentions()) {
         if (mention.text.isEmpty() || mention.id.isEmpty()) {
             continue;
         }
@@ -95,16 +84,11 @@ QString ActionsHandler::handleMentions(QString handledText, const bool &isEdit)
                                           mention.cursor.position() - mention.cursor.anchor(),
                                           QStringLiteral("[%1](https://matrix.to/#/%2)").arg(mention.text, mention.id));
     }
-    mentions->clear();
+    m_room->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(text);
+        auto match = sed.match(m_room->chatBoxText());
         if (match.hasMatch()) {
             const QString regex = match.captured(1);
             const QString replacement = match.captured(2).toHtmlEscaped();
@@ -154,25 +138,18 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, con
     }
 
     handledText = CustomEmojiModel::instance().preprocessText(handledText);
-    TextHandler textHandler;
-    textHandler.setData(handledText);
-    handledText = textHandler.handleSendText();
-
-    if (handledText.count("<p>") == 1 && handledText.count("</p>") == 1) {
-        handledText.remove("<p>");
-        handledText.remove("</p>");
-    }
+    handledText = markdownToHTML(handledText);
 
     if (handledText.length() == 0) {
         return;
     }
-
-    m_room->postMessage(text, handledText, messageType, m_room->chatBoxReplyId(), isEdit ? m_room->chatBoxEditId() : "");
+    m_room->postMessage(m_room->chatBoxText(), handledText, messageType, m_room->chatBoxReplyId(), m_room->chatBoxEditId());
 }
 
-void ActionsHandler::checkEffects(const QString &text)
+void ActionsHandler::checkEffects()
 {
     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

@@ -7,8 +7,7 @@
 
 #include <events/roommessageevent.h>
 
-#include "neochatroom.h"
-
+class NeoChatRoom;
 class CustomEmojiModel;
 class NeoChatRoom;
 
@@ -33,20 +32,14 @@ Q_SIGNALS:
 
 public Q_SLOTS:
 
-    /**
-     * @brief Pre-process text and send message.
-     */
-    void handleNewMessage();
-
-    /**
-     * @brief Pre-process text and send edit.
-     */
-    void handleEdit();
+    /// \brief Post a message.
+    ///
+    /// This also interprets commands if any.
+    void handleMessage();
 
 private:
     NeoChatRoom *m_room = nullptr;
-    void checkEffects(const QString &text);
-
-    QString handleMentions(QString handledText, const bool &isEdit = false);
-    void handleMessage(const QString &text, QString handledText, const bool &isEdit = false);
+    void checkEffects();
 };
+
+QString markdownToHTML(const QString &markdown);

src/actionsmodel.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "actionsmodel.h"
@@ -6,7 +6,6 @@
 #include "controller.h"
 #include "neochatroom.h"
 #include "neochatuser.h"
-#include "roommanager.h"
 #include <events/roommemberevent.h>
 #include <events/roompowerlevelsevent.h>
 
@@ -19,41 +18,6 @@ QStringList rainbowColors{"#ff2b00", "#ff5500", "#ff8000", "#ffaa00", "#ffd500",
                           "#00ff2b", "#00ff55", "#00ff80", "#00ffaa", "#00ffd5", "#00ffff", "#00d4ff", "#00aaff", "#007fff", "#0055ff", "#002bff", "#0000ff",
                           "#2a00ff", "#5500ff", "#7f00ff", "#aa00ff", "#d400ff", "#ff00ff", "#ff00d4", "#ff00aa", "#ff0080", "#ff0055", "#ff002b", "#ff0000"};
 
-auto leaveRoomLambda = [](const QString &text, NeoChatRoom *room) {
-    if (text.isEmpty()) {
-        Q_EMIT room->showMessage(NeoChatRoom::Info, i18n("Leaving this room."));
-        room->connection()->leaveRoom(room);
-    } else {
-        QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
-        auto regexMatch = roomRegex.match(text);
-        if (!regexMatch.hasMatch()) {
-            Q_EMIT room->showMessage(NeoChatRoom::Error,
-                                     i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
-            return QString();
-        }
-        auto leaving = room->connection()->room(text);
-        if (!leaving) {
-            leaving = room->connection()->roomByAlias(text);
-        }
-        if (leaving) {
-            Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Leaving room <roomname>.", "Leaving room %1.", text));
-            room->connection()->leaveRoom(leaving);
-        } else {
-            Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Room <roomname> not found", "Room %1 not found.", text));
-        }
-    }
-    return QString();
-};
-
-auto roomNickLambda = [](const QString &text, NeoChatRoom *room) {
-    if (text.isEmpty()) {
-        Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("No new nickname provided, no changes will happen."));
-    } else {
-        room->connection()->user()->rename(text, room);
-    }
-    return QString();
-};
-
 QVector<ActionsModel::Action> actions{
     Action{
         QStringLiteral("shrug"),
@@ -150,7 +114,7 @@ QVector<ActionsModel::Action> actions{
         QStringLiteral("spoiler"),
         [](const QString &text, NeoChatRoom *room) {
             // Ideally, we would just return rainbowText and let that do the rest, but the colors don't survive markdownToHTML.
-            room->postMessage(QStringLiteral("/spoiler %1").arg(text),
+            room->postMessage(QStringLiteral("/rainbow %1").arg(text),
                               QStringLiteral("<span data-mx-spoiler>%1</span>").arg(text),
                               RoomMessageEvent::MsgType::Text,
                               room->chatBoxReplyId(),
@@ -192,15 +156,16 @@ QVector<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
-            const RoomMemberEvent *roomMemberEvent = room->currentState().get<RoomMemberEvent>(text);
-            if (roomMemberEvent && roomMemberEvent->membership() == Membership::Invite) {
+#ifdef QUOTIENT_07
+            if (room->currentState().get<RoomMemberEvent>(text)->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 (roomMemberEvent && roomMemberEvent->membership() == Membership::Ban) {
+            if (room->currentState().get<RoomMemberEvent>(text)->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();
             }
+#endif
             if (room->localUser()->id() == text) {
                 Q_EMIT room->showMessage(NeoChatRoom::Positive, i18n("You are already in this room."));
                 return QString();
@@ -228,9 +193,8 @@ QVector<ActionsModel::Action> actions{
                                          i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
                 return QString();
             }
-            auto targetRoom = text.startsWith(QLatin1Char('!')) ? room->connection()->room(text) : room->connection()->roomByAlias(text);
-            if (targetRoom) {
-                RoomManager::instance().enterRoom(dynamic_cast<NeoChatRoom *>(targetRoom));
+            if (Controller::instance().activeConnection()->room(text) || Controller::instance().activeConnection()->roomByAlias(text)) {
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("You are already in room <roomname>.", "You are already in room %1.", text));
                 return QString();
             }
             Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Joining room <roomname>.", "Joining room %1.", text));
@@ -242,38 +206,6 @@ QVector<ActionsModel::Action> actions{
         kli18n("<room alias or id>"),
         kli18n("Joins the given room"),
     },
-    Action{
-        QStringLiteral("knock"),
-        [](const QString &text, NeoChatRoom *room) {
-            auto parts = text.split(QLatin1String(" "));
-            QString roomName = parts[0];
-            QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
-            auto regexMatch = roomRegex.match(roomName);
-            if (!regexMatch.hasMatch()) {
-                Q_EMIT room->showMessage(NeoChatRoom::Error,
-                                         i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
-                return QString();
-            }
-            auto targetRoom = text.startsWith(QLatin1Char('!')) ? room->connection()->room(text) : room->connection()->roomByAlias(text);
-            if (targetRoom) {
-                RoomManager::instance().enterRoom(dynamic_cast<NeoChatRoom *>(targetRoom));
-                return QString();
-            }
-            Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Knocking room <roomname>.", "Knocking room %1.", text));
-            auto connection = Controller::instance().activeConnection();
-            const auto knownServer = roomName.mid(roomName.indexOf(":") + 1);
-            if (parts.length() >= 2) {
-                RoomManager::instance().knockRoom(connection, roomName, parts[1], QStringList{knownServer});
-            } else {
-                RoomManager::instance().knockRoom(connection, roomName, QString(), QStringList{knownServer});
-            }
-            return QString();
-        },
-        false,
-        std::nullopt,
-        kli18n("<room alias or id> [<reason>]"),
-        kli18n("Requests to join the given room"),
-    },
     Action{
         QStringLiteral("j"),
         [](const QString &text, NeoChatRoom *room) {
@@ -299,7 +231,31 @@ QVector<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("part"),
-        leaveRoomLambda,
+        [](const QString &text, NeoChatRoom *room) {
+            if (text.isEmpty()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18n("Leaving this room."));
+                room->connection()->leaveRoom(room);
+            } else {
+                QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
+                auto regexMatch = roomRegex.match(text);
+                if (!regexMatch.hasMatch()) {
+                    Q_EMIT room->showMessage(NeoChatRoom::Error,
+                                             i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
+                    return QString();
+                }
+                auto leaving = room->connection()->room(text);
+                if (!leaving) {
+                    leaving = room->connection()->roomByAlias(text);
+                }
+                if (leaving) {
+                    Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Leaving room <roomname>.", "Leaving room %1.", text));
+                    room->connection()->leaveRoom(leaving);
+                } else {
+                    Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Room <roomname> not found", "Room %1 not found.", text));
+                }
+            }
+            return QString();
+        },
         false,
         std::nullopt,
         kli18n("[<room alias or id>]"),
@@ -307,7 +263,31 @@ QVector<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("leave"),
-        leaveRoomLambda,
+        [](const QString &text, NeoChatRoom *room) {
+            if (text.isEmpty()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18n("Leaving this room."));
+                room->connection()->leaveRoom(room);
+            } else {
+                QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
+                auto regexMatch = roomRegex.match(text);
+                if (!regexMatch.hasMatch()) {
+                    Q_EMIT room->showMessage(NeoChatRoom::Error,
+                                             i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
+                    return QString();
+                }
+                auto leaving = room->connection()->room(text);
+                if (!leaving) {
+                    leaving = room->connection()->roomByAlias(text);
+                }
+                if (leaving) {
+                    Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Leaving room <roomname>.", "Leaving room %1.", text));
+                    room->connection()->leaveRoom(leaving);
+                } else {
+                    Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Room <roomname> not found", "Room %1 not found.", text));
+                }
+            }
+            return QString();
+        },
         false,
         std::nullopt,
         kli18n("[<room alias or id>]"),
@@ -330,15 +310,14 @@ QVector<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("roomnick"),
-        roomNickLambda,
-        false,
-        std::nullopt,
-        kli18n("<display name>"),
-        kli18n("Changes your display name in this room"),
-    },
-    Action{
-        QStringLiteral("myroomnick"),
-        roomNickLambda,
+        [](const QString &text, NeoChatRoom *room) {
+            if (text.isEmpty()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("No new nickname provided, no changes will happen."));
+            } else {
+                room->connection()->user()->rename(text, room);
+            }
+            return QString();
+        },
         false,
         std::nullopt,
         kli18n("<display name>"),
@@ -432,12 +411,14 @@ QVector<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
+#ifdef QUOTIENT_07
             auto state = room->currentState().get<RoomMemberEvent>(parts[0]);
             if (state && state->membership() == Membership::Ban) {
                 Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is already banned from this room.", "%1 is already banned from this room.", text));
                 return QString();
             }
-            auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
+#endif
+            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
             if (plEvent->ban() > plEvent->powerLevelForUser(room->localUser()->id())) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to ban users from this room."));
                 return QString();
@@ -467,16 +448,18 @@ QVector<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
-            auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
+            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
             if (plEvent->ban() > plEvent->powerLevelForUser(room->localUser()->id())) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to unban users from this room."));
                 return QString();
             }
+#ifdef QUOTIENT_07
             auto state = room->currentState().get<RoomMemberEvent>(text);
             if (state && state->membership() != Membership::Ban) {
                 Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is not banned from this room.", "%1 is not banned from this room.", text));
                 return QString();
             }
+#endif
             room->unban(text);
             Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> was unbanned from this room.", "%1 was unbanned from this room.", text));
 
@@ -503,11 +486,13 @@ QVector<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You cannot kick yourself from the room."));
                 return QString();
             }
+#ifdef QUOTIENT_07
             if (!room->isMember(parts[0])) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("<username> is not in this room", "%1 is not in this room.", parts[0]));
                 return QString();
             }
-            auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
+#endif
+            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
             auto kick = plEvent->kick();
             if (plEvent->powerLevelForUser(room->localUser()->id()) < kick) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to kick users from this room."));

src/actionsmodel.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #pragma once

src/blurhashimageprovider.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2021 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "blurhashimageprovider.h"

src/blurhashimageprovider.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2021 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #pragma once

src/chatdocumenthandler.cpp

@@ -5,6 +5,7 @@
 
 #include <QQmlFile>
 #include <QQmlFileSelector>
+#include <QQuickTextDocument>
 #include <QStringBuilder>
 #include <QSyntaxHighlighter>
 #include <QTextBlock>
@@ -14,9 +15,10 @@
 #include <Sonnet/BackgroundChecker>
 #include <Sonnet/Settings>
 
-#include "models/actionsmodel.h"
-#include "models/roomlistmodel.h"
+#include "actionsmodel.h"
+#include "completionmodel.h"
 #include "neochatroom.h"
+#include "roomlistmodel.h"
 
 class SyntaxHighlighter : public QSyntaxHighlighter
 {
@@ -105,19 +107,14 @@ ChatDocumentHandler::ChatDocumentHandler(QObject *parent)
 {
     connect(this, &ChatDocumentHandler::roomChanged, this, [this]() {
         m_completionModel->setRoom(m_room);
-        static QPointer<NeoChatRoom> previousRoom = nullptr;
+        static 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(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));
+            m_completionModel->setText(m_room->chatBoxText().mid(start, cursorPosition() - start), m_room->chatBoxText().mid(start));
         });
     });
     connect(this, &ChatDocumentHandler::documentChanged, this, [this]() {
@@ -128,7 +125,7 @@ ChatDocumentHandler::ChatDocumentHandler(QObject *parent)
             return;
         }
         int start = completionStartIndex();
-        m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
+        m_completionModel->setText(m_room->chatBoxText().mid(start, cursorPosition() - start), m_room->chatBoxText().mid(start));
     });
 }
 
@@ -138,13 +135,8 @@ int ChatDocumentHandler::completionStartIndex() const
         return 0;
     }
 
-#if !defined(Q_OS_ANDROID) && QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
-    const long long cursor = cursorPosition();
-#else
-    const auto cursor = cursorPosition();
-#endif
-    const auto &text = getText();
-
+    const auto &cursor = cursorPosition();
+    const auto &text = m_room->chatBoxText();
     auto start = std::min(cursor, text.size()) - 1;
     while (start > -1) {
         if (text.at(start) == QLatin1Char(' ')) {
@@ -156,20 +148,6 @@ 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;
@@ -221,10 +199,10 @@ void ChatDocumentHandler::setRoom(NeoChatRoom *room)
 
 void ChatDocumentHandler::complete(int index)
 {
-    if (m_completionModel->autoCompletionType() == CompletionModel::User) {
+    if (m_completionModel->autoCompletionType() == ChatDocumentHandler::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 = getText();
+        auto text = m_room->chatBoxText();
         auto at = text.lastIndexOf(QLatin1Char('@'), cursorPosition() - 1);
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
@@ -233,19 +211,19 @@ void ChatDocumentHandler::complete(int index)
         cursor.setPosition(at);
         cursor.setPosition(cursor.position() + name.size(), QTextCursor::KeepAnchor);
         cursor.setKeepPositionOnInsert(true);
-        pushMention({cursor, name, 0, 0, id});
+        m_room->mentions()->push_back({cursor, name, 0, 0, id});
         m_highlighter->rehighlight();
-    } else if (m_completionModel->autoCompletionType() == CompletionModel::Command) {
+    } else if (m_completionModel->autoCompletionType() == ChatDocumentHandler::Command) {
         auto command = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
-        auto text = getText();
+        auto text = m_room->chatBoxText();
         auto at = text.lastIndexOf(QLatin1Char('/'));
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
         cursor.setPosition(cursorPosition(), QTextCursor::KeepAnchor);
         cursor.insertText(QStringLiteral("/%1 ").arg(command));
-    } else if (m_completionModel->autoCompletionType() == CompletionModel::Room) {
+    } else if (m_completionModel->autoCompletionType() == ChatDocumentHandler::Room) {
         auto alias = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
-        auto text = getText();
+        auto text = m_room->chatBoxText();
         auto at = text.lastIndexOf(QLatin1Char('#'), cursorPosition() - 1);
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
@@ -254,11 +232,11 @@ void ChatDocumentHandler::complete(int index)
         cursor.setPosition(at);
         cursor.setPosition(cursor.position() + alias.size(), QTextCursor::KeepAnchor);
         cursor.setKeepPositionOnInsert(true);
-        pushMention({cursor, alias, 0, 0, alias});
+        m_room->mentions()->push_back({cursor, alias, 0, 0, alias});
         m_highlighter->rehighlight();
-    } else if (m_completionModel->autoCompletionType() == CompletionModel::Emoji) {
+    } else if (m_completionModel->autoCompletionType() == ChatDocumentHandler::Emoji) {
         auto shortcode = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
-        auto text = getText();
+        auto text = m_room->chatBoxText();
         auto at = text.lastIndexOf(QLatin1Char(':'));
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
@@ -301,59 +279,3 @@ 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);
-    }
-}
-
-QColor ChatDocumentHandler::mentionColor() const
-{
-    return m_mentionColor;
-}
-
-void ChatDocumentHandler::setMentionColor(const QColor &color)
-{
-    if (m_mentionColor == color) {
-        return;
-    }
-    m_mentionColor = color;
-    m_highlighter->mentionFormat.setForeground(m_mentionColor);
-    m_highlighter->rehighlight();
-    Q_EMIT mentionColorChanged();
-}
-
-QColor ChatDocumentHandler::errorColor() const
-{
-    return m_errorColor;
-}
-
-void ChatDocumentHandler::setErrorColor(const QColor &color)
-{
-    if (m_errorColor == color) {
-        return;
-    }
-    m_errorColor = color;
-    m_highlighter->errorFormat.setForeground(m_errorColor);
-    m_highlighter->rehighlight();
-    Q_EMIT errorColorChanged();
-}

src/chatdocumenthandler.h

@@ -4,28 +4,20 @@
 #pragma once
 
 #include <QObject>
-#include <QQuickTextDocument>
+
 #include <QTextCursor>
 
-#include "models/completionmodel.h"
-#include "models/userlistmodel.h"
-#include "neochatroom.h"
+#include "userlistmodel.h"
 
 class QTextDocument;
+class QQuickTextDocument;
 class NeoChatRoom;
 class SyntaxHighlighter;
+class CompletionModel;
 
 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)
@@ -33,16 +25,19 @@ class ChatDocumentHandler : public QObject
 
     Q_PROPERTY(CompletionModel *completionModel READ completionModel NOTIFY completionModelChanged)
 
-    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
-
-    Q_PROPERTY(QColor mentionColor READ mentionColor WRITE setMentionColor NOTIFY mentionColorChanged);
-    Q_PROPERTY(QColor errorColor READ errorColor WRITE setErrorColor NOTIFY errorColorChanged);
+    Q_PROPERTY(NeoChatRoom *room READ room NOTIFY roomChanged)
 
 public:
-    explicit ChatDocumentHandler(QObject *parent = nullptr);
+    enum AutoCompletionType {
+        User,
+        Room,
+        Emoji,
+        Command,
+        None,
+    };
+    Q_ENUM(AutoCompletionType)
 
-    [[nodiscard]] bool isEdit() const;
-    void setIsEdit(bool edit);
+    explicit ChatDocumentHandler(QObject *parent = nullptr);
 
     [[nodiscard]] QQuickTextDocument *document() const;
     void setDocument(QQuickTextDocument *document);
@@ -63,47 +58,31 @@ public:
 
     void updateCompletions();
     CompletionModel *completionModel() const;
-
-    [[nodiscard]] QColor mentionColor() const;
-    void setMentionColor(const QColor &color);
-
-    [[nodiscard]] QColor errorColor() const;
-    void setErrorColor(const QColor &color);
-
 Q_SIGNALS:
-    void isEditChanged();
     void documentChanged();
     void cursorPositionChanged();
     void roomChanged();
     void completionModelChanged();
     void selectionStartChanged();
     void selectionEndChanged();
-    void errorColorChanged();
-    void mentionColorChanged();
 
 private:
     int completionStartIndex() const;
 
-    bool m_isEdit;
-
     QQuickTextDocument *m_document;
 
     NeoChatRoom *m_room = nullptr;
     bool completionVisible = false;
 
-    QColor m_mentionColor;
-    QColor m_errorColor;
-
     int m_cursorPosition;
     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;
+    AutoCompletionType m_completionType = None;
 
     CompletionModel *m_completionModel = nullptr;
 };
+
+Q_DECLARE_METATYPE(ChatDocumentHandler::AutoCompletionType);

src/clipboard.cpp

@@ -33,14 +33,13 @@ QImage Clipboard::image() const
 
 QString Clipboard::saveImage(QString localPath) const
 {
-    QString imageDir(QStringLiteral("%1/screenshots").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)));
-
-    if (!QDir().exists(imageDir)) {
-        QDir().mkdir(imageDir);
+    if (!QDir().exists(QStringLiteral("%1/screenshots").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)))) {
+        QDir().mkdir(QStringLiteral("%1/screenshots").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)));
     }
-
     if (localPath.isEmpty()) {
-        localPath = QStringLiteral("file://%1/%2.png").arg(imageDir, QDateTime::currentDateTime().toString(QStringLiteral("yyyy-MM-dd-hh-mm-ss")));
+        localPath = QStringLiteral("file://%1/screenshots/%2.png")
+                        .arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation),
+                             QDateTime::currentDateTime().toString(QStringLiteral("yyyy-MM-dd-hh-mm-ss")));
     }
     QUrl url(localPath);
     if (!url.isLocalFile()) {
@@ -52,30 +51,21 @@ QString Clipboard::saveImage(QString localPath) const
         return {};
     }
 
-    if (image.save(url.toLocalFile())) {
-        return localPath;
-    } else {
-        return {};
+    QDir dir;
+    if (!dir.exists(localPath)) {
+        dir.mkpath(localPath);
     }
+
+    image.save(url.toLocalFile());
+
+    return localPath;
 }
 
 void Clipboard::saveText(QString message)
 {
-    static QRegularExpression re(QStringLiteral("<[^>]*>"));
+    QRegularExpression re("<[^>]*>");
     auto *mineData = new QMimeData; // ownership is transferred to clipboard
     mineData->setHtml(message);
-    mineData->setText(message.replace(re, QString()));
+    mineData->setText(message.replace(re, ""));
     m_clipboard->setMimeData(mineData);
 }
-
-void Clipboard::setImage(const QUrl &url)
-{
-    if (url.isLocalFile()) {
-        QImage img(url.path());
-        auto *mimeData = new QMimeData;
-        mimeData->setImageData(img);
-        if (!img.isNull()) {
-            m_clipboard->setMimeData(mimeData);
-        }
-    }
-}

src/clipboard.h

@@ -26,7 +26,6 @@ public:
     Q_INVOKABLE QString saveImage(QString localPath = {}) const;
 
     Q_INVOKABLE void saveText(QString message);
-    Q_INVOKABLE void setImage(const QUrl &image);
 
 private:
     QClipboard *m_clipboard;

src/collapsestateproxymodel.cpp

@@ -0,0 +1,86 @@
+// 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/collapsestateproxymodel.h

@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#pragma once
+
+#include "messageeventmodel.h"
+#include <QSortFilterProxyModel>
+
+class CollapseStateProxyModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+public:
+    enum Roles {
+        AggregateDisplayRole = MessageEventModel::LastRole + 1,
+    };
+    [[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;
+
+    [[nodiscard]] QString aggregateEventToString(int row) const;
+};

src/completionmodel.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "completionmodel.h"
@@ -10,13 +10,14 @@
 #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 QConcatenateTablesProxyModel(this))
+    , m_emojiModel(new KConcatenateRowsProxyModel(this))
 {
     connect(this, &CompletionModel::textChanged, this, &CompletionModel::updateCompletion);
     connect(this, &CompletionModel::roomChanged, this, [this]() {
@@ -41,7 +42,7 @@ void CompletionModel::setText(const QString &text, const QString &fullText)
 int CompletionModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
-    if (m_autoCompletionType == None) {
+    if (m_autoCompletionType == ChatDocumentHandler::None) {
         return 0;
     }
     return m_filterModel->rowCount();
@@ -53,7 +54,7 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
         return {};
     }
     auto filterIndex = m_filterModel->index(index.row(), 0);
-    if (m_autoCompletionType == User) {
+    if (m_autoCompletionType == ChatDocumentHandler::User) {
         if (role == Text) {
             return m_filterModel->data(filterIndex, UserListModel::NameRole);
         }
@@ -65,7 +66,7 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
         }
     }
 
-    if (m_autoCompletionType == Command) {
+    if (m_autoCompletionType == ChatDocumentHandler::Command) {
         if (role == Text) {
             return m_filterModel->data(filterIndex, ActionsModel::Prefix).toString() + QStringLiteral(" ")
                 + m_filterModel->data(filterIndex, ActionsModel::Parameters).toString();
@@ -80,7 +81,7 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
             return m_filterModel->data(filterIndex, ActionsModel::Prefix);
         }
     }
-    if (m_autoCompletionType == Room) {
+    if (m_autoCompletionType == ChatDocumentHandler::Room) {
         if (role == Text) {
             return m_filterModel->data(filterIndex, RoomListModel::DisplayNameRole);
         }
@@ -91,7 +92,7 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
             return m_filterModel->data(filterIndex, RoomListModel::AvatarRole);
         }
     }
-    if (m_autoCompletionType == Emoji) {
+    if (m_autoCompletionType == ChatDocumentHandler::Emoji) {
         if (role == Text) {
             return m_filterModel->data(filterIndex, CustomEmojiModel::DisplayRole);
         }
@@ -101,9 +102,6 @@ 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 {};
@@ -127,7 +125,7 @@ void CompletionModel::updateCompletion()
         m_filterModel->setSecondaryFilterRole(UserListModel::NameRole);
         m_filterModel->setFullText(m_fullText);
         m_filterModel->setFilterText(m_text);
-        m_autoCompletionType = User;
+        m_autoCompletionType = ChatDocumentHandler::User;
         m_filterModel->invalidate();
     } else if (text().startsWith(QLatin1Char('/'))) {
         m_filterModel->setSourceModel(&ActionsModel::instance());
@@ -135,28 +133,28 @@ void CompletionModel::updateCompletion()
         m_filterModel->setSecondaryFilterRole(-1);
         m_filterModel->setFullText(m_fullText);
         m_filterModel->setFilterText(m_text.mid(1));
-        m_autoCompletionType = Command;
+        m_autoCompletionType = ChatDocumentHandler::Command;
         m_filterModel->invalidate();
     } else if (text().startsWith(QLatin1Char('#'))) {
-        m_autoCompletionType = Room;
+        m_autoCompletionType = ChatDocumentHandler::Room;
         m_filterModel->setSourceModel(m_roomListModel);
         m_filterModel->setFilterRole(RoomListModel::CanonicalAliasRole);
         m_filterModel->setSecondaryFilterRole(RoomListModel::DisplayNameRole);
         m_filterModel->setFullText(m_fullText);
         m_filterModel->setFilterText(m_text);
         m_filterModel->invalidate();
-    } else if (text().startsWith(QLatin1Char(':')) && !text()[1].isUpper()
+    } else if (text().startsWith(QLatin1Char(':'))
                && (m_fullText.indexOf(QLatin1Char(':'), 1) == -1
                    || (m_fullText.indexOf(QLatin1Char(' ')) != -1 && m_fullText.indexOf(QLatin1Char(':'), 1) > m_fullText.indexOf(QLatin1Char(' '), 1)))) {
+        m_autoCompletionType = ChatDocumentHandler::Emoji;
         m_filterModel->setSourceModel(m_emojiModel);
-        m_autoCompletionType = Emoji;
         m_filterModel->setFilterRole(CustomEmojiModel::Name);
-        m_filterModel->setSecondaryFilterRole(EmojiModel::DescriptionRole);
+        m_filterModel->setSecondaryFilterRole(-1);
         m_filterModel->setFullText(m_fullText);
         m_filterModel->setFilterText(m_text);
         m_filterModel->invalidate();
     } else {
-        m_autoCompletionType = None;
+        m_autoCompletionType = ChatDocumentHandler::None;
     }
     beginResetModel();
     endResetModel();
@@ -173,12 +171,12 @@ void CompletionModel::setRoom(NeoChatRoom *room)
     Q_EMIT roomChanged();
 }
 
-CompletionModel::AutoCompletionType CompletionModel::autoCompletionType() const
+ChatDocumentHandler::AutoCompletionType CompletionModel::autoCompletionType() const
 {
     return m_autoCompletionType;
 }
 
-void CompletionModel::setAutoCompletionType(AutoCompletionType autoCompletionType)
+void CompletionModel::setAutoCompletionType(ChatDocumentHandler::AutoCompletionType autoCompletionType)
 {
     m_autoCompletionType = autoCompletionType;
     Q_EMIT autoCompletionTypeChanged();

src/completionmodel.h

@@ -1,12 +1,13 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #pragma once
 
-#include <QConcatenateTablesProxyModel>
 #include <QSortFilterProxyModel>
 
-#include "roomlistmodel.h"
+#include <KConcatenateRowsProxyModel>
+
+#include "chatdocumenthandler.h"
 
 class CompletionProxyModel;
 class UserListModel;
@@ -18,19 +19,10 @@ class CompletionModel : public QAbstractListModel
     Q_OBJECT
     Q_PROPERTY(QString text READ text NOTIFY textChanged)
     Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
-    Q_PROPERTY(AutoCompletionType autoCompletionType READ autoCompletionType NOTIFY autoCompletionTypeChanged);
+    Q_PROPERTY(ChatDocumentHandler::AutoCompletionType autoCompletionType READ autoCompletionType NOTIFY autoCompletionTypeChanged);
     Q_PROPERTY(RoomListModel *roomListModel READ roomListModel WRITE setRoomListModel NOTIFY roomListModelChanged);
 
 public:
-    enum AutoCompletionType {
-        User,
-        Room,
-        Emoji,
-        Command,
-        None,
-    };
-    Q_ENUM(AutoCompletionType)
-
     enum Roles {
         Text = Qt::DisplayRole,
         Subtitle,
@@ -55,7 +47,7 @@ public:
     RoomListModel *roomListModel() const;
     void setRoomListModel(RoomListModel *roomListModel);
 
-    AutoCompletionType autoCompletionType() const;
+    ChatDocumentHandler::AutoCompletionType autoCompletionType() const;
 
 Q_SIGNALS:
     void textChanged();
@@ -68,12 +60,11 @@ private:
     QString m_fullText;
     CompletionProxyModel *m_filterModel;
     NeoChatRoom *m_room = nullptr;
-    AutoCompletionType m_autoCompletionType = None;
+    ChatDocumentHandler::AutoCompletionType m_autoCompletionType = ChatDocumentHandler::None;
 
-    void setAutoCompletionType(AutoCompletionType autoCompletionType);
+    void setAutoCompletionType(ChatDocumentHandler::AutoCompletionType autoCompletionType);
 
     UserListModel *m_userListModel;
     RoomListModel *m_roomListModel;
-    QConcatenateTablesProxyModel *m_emojiModel;
+    KConcatenateRowsProxyModel *m_emojiModel;
 };
-Q_DECLARE_METATYPE(CompletionModel::AutoCompletionType);

src/completionproxymodel.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "completionproxymodel.h"
@@ -18,22 +18,7 @@ bool CompletionProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &so
             && sourceModel()
                    ->data(sourceModel()->index(sourceRow, 0), secondaryFilterRole())
                    .toString()
-#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
-                   .startsWith(QStringView(m_filterText).sliced(1), Qt::CaseInsensitive));
-#else
                    .startsWith(m_filterText.midRef(1), Qt::CaseInsensitive));
-#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

src/completionproxymodel.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #pragma once
@@ -13,7 +13,6 @@ 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/controller.cpp

@@ -1,14 +1,10 @@
 // SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-3.0-only
 
 #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>
@@ -23,6 +19,7 @@
 #include <QGuiApplication>
 #include <QImageReader>
 #include <QNetworkProxy>
+#include <QQuickItem>
 #include <QQuickTextDocument>
 #include <QQuickWindow>
 #include <QStandardPaths>
@@ -31,16 +28,22 @@
 
 #include <signal.h>
 
-#include <accountregistry.h>
+#ifdef QUOTIENT_07
+#include "accountregistry.h"
+#else
+#include "neochataccountregistry.h"
+#endif
 
 #include <connection.h>
 #include <csapi/content-repo.h>
 #include <csapi/logout.h>
 #include <csapi/profile.h>
-#include <jobs/downloadfilejob.h>
 #include <qt_connection_util.h>
+
+#ifdef QUOTIENT_07
 #include <csapi/notifications.h>
 #include <eventstats.h>
+#endif
 
 #include "neochatconfig.h"
 #include "neochatroom.h"
@@ -49,8 +52,6 @@
 #include "roommanager.h"
 #include "windowcontroller.h"
 
-#include <accountregistry.h>
-
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
 #include "trayicon.h"
 #elif !defined(Q_OS_ANDROID)
@@ -88,28 +89,10 @@ Controller::Controller(QObject *parent)
     });
 #endif
 
-    connectUntil(&Accounts, &AccountRegistry::rowsInserted, this, [this]() {
-        if (auto *connection = Accounts.get(NeoChatConfig::self()->activeConnection())) {
-            connectSingleShot(connection, &Connection::loadedRoomState, this, [this, connection]() {
-                setActiveConnection(connection);
-            });
-            return true;
-        }
-        return false;
+    QTimer::singleShot(0, this, [this] {
+        invokeLogin();
     });
 
-    connect(&Accounts, &AccountRegistry::rowsRemoved, this, [this]() {
-        if (!Accounts.isLoggedIn(NeoChatConfig::self()->activeConnection())) {
-            if (Accounts.size() > 0) {
-                setActiveConnection(Accounts.accounts().at(0));
-            } else {
-                setActiveConnection(nullptr);
-            }
-        }
-    });
-
-    QMetaObject::invokeMethod(&Accounts, &AccountRegistry::invokeLogin);
-
     QObject::connect(QGuiApplication::instance(), &QCoreApplication::aboutToQuit, QGuiApplication::instance(), [] {
         NeoChatConfig::self()->save();
     });
@@ -138,13 +121,14 @@ Controller::Controller(QObject *parent)
     }
 #endif
 
-    connect(&Accounts, &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
+    connect(&AccountRegistry::instance(), &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
 
+#ifdef QUOTIENT_07
     static int oldAccountCount = 0;
-    connect(&Accounts, &AccountRegistry::accountCountChanged, this, [this]() {
-        if (Accounts.size() > oldAccountCount) {
-            auto connection = Accounts.accounts()[Accounts.size() - 1];
-            connect(connection, &Connection::syncDone, this, [this, connection]() {
+    connect(&AccountRegistry::instance(), &AccountRegistry::accountCountChanged, this, [=]() {
+        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) {
@@ -153,24 +137,29 @@ Controller::Controller(QObject *parent)
                     }
                 }
                 if (changes) {
-                    handleNotifications(connection);
+                    handleNotifications();
                 }
             });
         }
-        oldAccountCount = Accounts.size();
+        oldAccountCount = AccountRegistry::instance().size();
     });
+#endif
 }
 
-void Controller::handleNotifications(QPointer<Quotient::Connection> connection)
+#ifdef QUOTIENT_07
+void Controller::handleNotifications()
 {
-    static QStringList initial;
+    static bool initial = true;
     static QStringList oldNotifications;
-    auto job = connection->callApi<GetNotificationsJob>();
+    if (!m_connection) {
+        return;
+    }
+    auto job = m_connection->callApi<GetNotificationsJob>();
 
-    connect(job, &BaseJob::success, this, [job, connection]() {
+    connect(job, &BaseJob::success, this, [this, job]() {
         const auto notifications = job->jsonData()["notifications"].toArray();
-        if (!initial.contains(connection->user()->id())) {
-            initial.append(connection->user()->id());
+        if (initial) {
+            initial = false;
             for (const auto &n : notifications) {
                 oldNotifications += n.toObject()["event"].toObject()["event_id"].toString();
             }
@@ -186,12 +175,10 @@ void Controller::handleNotifications(QPointer<Quotient::Connection> connection)
                 continue;
             }
             oldNotifications += notification["event"].toObject()["event_id"].toString();
-            auto room = connection->room(notification["room_id"].toString());
+            auto room = m_connection->room(notification["room_id"].toString());
 
             // If room exists, room is NOT active OR the application is NOT active, show notification
-            if (room
-                && !(RoomManager::instance().currentRoom() && room->id() == RoomManager::instance().currentRoom()->id()
-                     && QGuiApplication::applicationState() == Qt::ApplicationActive)) {
+            if (room && !(room->id() == RoomManager::instance().currentRoom()->id() && QGuiApplication::applicationState() == Qt::ApplicationActive)) {
                 // The room might have been deleted (for example rejected invitation).
                 auto sender = room->user(notification["event"].toObject()["sender"].toString());
 
@@ -210,7 +197,7 @@ void Controller::handleNotifications(QPointer<Quotient::Connection> connection)
 
                 if (notification["event"]["type"] == "m.room.encrypted") {
 #ifdef Quotient_E2EE_ENABLED
-                    auto decrypted = connection->decryptNotification(notification);
+                    auto decrypted = m_connection->decryptNotification(notification);
                     body = decrypted["content"].toObject()["body"].toString();
 #endif
                     if (body.isEmpty()) {
@@ -234,6 +221,7 @@ void Controller::handleNotifications(QPointer<Quotient::Connection> connection)
         }
     });
 }
+#endif
 
 Controller &Controller::instance()
 {
@@ -246,10 +234,299 @@ void Controller::showWindow()
     WindowController::instance().showAndRaiseWindow(QString());
 }
 
+inline QString accessTokenFileName(const AccountSettings &account)
+{
+    QString fileName = account.userId();
+    fileName.replace(':', '_');
+    return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + '/' + fileName;
+}
+
+void Controller::loginWithAccessToken(const QString &serverAddr, const QString &user, const QString &token, const QString &deviceName)
+{
+    if (user.isEmpty() || token.isEmpty()) {
+        return;
+    }
+
+    QUrl serverUrl(serverAddr);
+
+    auto conn = new Connection();
+    if (serverUrl.isValid()) {
+        conn->setHomeserver(serverUrl);
+    }
+
+    connect(conn, &Connection::connected, this, [this, conn, deviceName] {
+        AccountSettings account(conn->userId());
+        account.setKeepLoggedIn(true);
+        account.setHomeserver(conn->homeserver());
+        account.setDeviceId(conn->deviceId());
+        account.setDeviceName(deviceName);
+        if (!saveAccessTokenToKeyChain(account, conn->accessToken())) {
+            qWarning() << "Couldn't save access token";
+        }
+        account.sync();
+        addConnection(conn);
+        setActiveConnection(conn);
+    });
+    connect(conn, &Connection::networkError, this, [this](QString error, const QString &, int, int) {
+        Q_EMIT errorOccured(i18n("Network Error: %1", error));
+    });
+    conn->assumeIdentity(user, token, deviceName);
+}
+
+void Controller::logout(Connection *conn, bool serverSideLogout)
+{
+    if (!conn) {
+        qCritical() << "Attempt to logout null connection";
+        return;
+    }
+
+    SettingsGroup("Accounts").remove(conn->userId());
+    QFile(accessTokenFileName(AccountSettings(conn->userId()))).remove();
+
+    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 (AccountRegistry::instance().count() > 1) {
+        // Only set the connection if the the account being logged out is currently active
+        if (conn == activeConnection()) {
+            setActiveConnection(AccountRegistry::instance().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");
+
+#ifndef QUOTIENT_07
+    AccountRegistry::instance().add(c);
+#endif
+
+    c->setLazyLoading(true);
+
+    connect(c, &Connection::syncDone, this, [this, c] {
+        setBusy(false);
+
+        Q_EMIT syncDone();
+
+        c->sync(30000);
+        c->saveState();
+    });
+    connect(c, &Connection::loggedOut, this, [this, c] {
+        dropConnection(c);
+    });
+
+    connect(c, &Connection::requestFailed, this, [this](BaseJob *job) {
+        if (job->error() == BaseJob::UserConsentRequiredError) {
+            Q_EMIT userConsentRequired(job->errorUrl());
+        }
+    });
+
+    setBusy(true);
+
+    c->sync();
+
+    Q_EMIT connectionAdded(c);
+    Q_EMIT accountCountChanged();
+}
+
+void Controller::dropConnection(Connection *c)
+{
+    Q_ASSERT_X(c, __FUNCTION__, "Attempt to drop a null connection");
+
+#ifndef QUOTIENT_07
+    AccountRegistry::instance().drop(c);
+#endif
+
+    Q_EMIT connectionDropped(c);
+    Q_EMIT accountCountChanged();
+#ifndef QUOTIENT_07
+    c->deleteLater();
+#endif
+}
+
+void Controller::invokeLogin()
+{
+    const auto accounts = SettingsGroup("Accounts").childGroups();
+    QString id = NeoChatConfig::self()->activeConnection();
+    for (const auto &accountId : accounts) {
+        AccountSettings account{accountId};
+        if (id.isEmpty()) {
+            // handle case where the account config is empty
+            id = accountId;
+        }
+        if (!account.homeserver().isEmpty()) {
+            auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account);
+            connect(accessTokenLoadingJob, &QKeychain::Job::finished, this, [accountId, id, this, accessTokenLoadingJob](QKeychain::Job *) {
+                AccountSettings account{accountId};
+                QString accessToken;
+                if (accessTokenLoadingJob->error() == QKeychain::Error::NoError) {
+                    accessToken = accessTokenLoadingJob->binaryData();
+                } else {
+                    // No access token from the keychain, try token file
+                    // TODO FIXME this code is racy since the file might have
+                    // already been removed. But since the other code do a blocking
+                    // dbus call, the probability are not high that it will happen.
+                    // loadAccessTokenFromFile is also mostly legacy nowadays
+                    accessToken = loadAccessTokenFromFile(account);
+                    if (accessToken.isEmpty()) {
+                        return;
+                    }
+                }
+
+                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, &Connection::syncDone, this, &Controller::initiated);
+                    }
+                });
+                connect(connection, &Connection::loginError, this, [this, connection](const QString &error, const QString &) {
+                    if (error == "Unrecognised access token") {
+                        Q_EMIT errorOccured(i18n("Login Failed: Access Token invalid or revoked"));
+                        logout(connection, false);
+                    } else {
+                        Q_EMIT errorOccured(i18n("Login Failed: %1", error));
+                        logout(connection, true);
+                    }
+                    Q_EMIT initiated();
+                });
+                connect(connection, &Connection::networkError, this, [this](const QString &error, const QString &, int, int) {
+                    Q_EMIT errorOccured(i18n("Network Error: %1", error));
+                });
+                connection->assumeIdentity(account.userId(), accessToken, account.deviceId());
+            });
+        }
+    }
+    if (accounts.isEmpty()) {
+        Q_EMIT initiated();
+    }
+}
+
+QByteArray Controller::loadAccessTokenFromFile(const AccountSettings &account)
+{
+    QFile accountTokenFile{accessTokenFileName(account)};
+    if (accountTokenFile.open(QFile::ReadOnly)) {
+        if (accountTokenFile.size() < 1024) {
+            return accountTokenFile.readAll();
+        }
+
+        qWarning() << "File" << accountTokenFile.fileName() << "is" << accountTokenFile.size() << "bytes long - too long for a token, ignoring it.";
+    }
+    qWarning() << "Could not open access token file" << accountTokenFile.fileName();
+
+    return {};
+}
+
+QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const AccountSettings &account)
+{
+    qDebug() << "Reading access token from the keychain for" << account.userId();
+    auto job = new QKeychain::ReadPasswordJob(qAppName(), this);
+    job->setKey(account.userId());
+
+    // Handling of errors
+    connect(job, &QKeychain::Job::finished, this, [this, &account, job]() {
+        if (job->error() == QKeychain::Error::NoError) {
+            return;
+        }
+        if (job->error() == QKeychain::Error::EntryNotFound) {
+            // no access token from the keychain, try token file
+            auto accessToken = loadAccessTokenFromFile(account);
+            if (!accessToken.isEmpty()) {
+                qDebug() << "Migrating the access token from file to the keychain for " << account.userId();
+                bool removed = false;
+                bool saved = saveAccessTokenToKeyChain(account, accessToken);
+                if (saved) {
+                    QFile accountTokenFile{accessTokenFileName(account)};
+                    removed = accountTokenFile.remove();
+                }
+                if (!(saved && removed)) {
+                    qDebug() << "Migrating the access token from the file to the keychain "
+                                "failed";
+                }
+                return;
+            }
+        }
+
+        switch (job->error()) {
+        case QKeychain::EntryNotFound:
+            Q_EMIT globalErrorOccured(i18n("Access token wasn't found"), i18n("Maybe it was deleted?"));
+            break;
+        case QKeychain::AccessDeniedByUser:
+        case QKeychain::AccessDenied:
+            Q_EMIT globalErrorOccured(i18n("Access to keychain was denied."), i18n("Please allow NeoChat to read the access token"));
+            break;
+        case QKeychain::NoBackendAvailable:
+            Q_EMIT globalErrorOccured(i18n("No keychain available."), i18n("Please install a keychain, e.g. KWallet or GNOME keyring on Linux"));
+            break;
+        case QKeychain::OtherError:
+            Q_EMIT globalErrorOccured(i18n("Unable to read access token"), job->errorString());
+            break;
+        default:
+            break;
+        }
+    });
+    job->start();
+
+    return job;
+}
+
+bool Controller::saveAccessTokenToFile(const AccountSettings &account, const QByteArray &accessToken)
+{
+    // (Re-)Make a dedicated file for access_token.
+    QFile accountTokenFile{accessTokenFileName(account)};
+    accountTokenFile.remove(); // Just in case
+
+    auto fileDir = QFileInfo(accountTokenFile).dir();
+    if (!((fileDir.exists() || fileDir.mkpath(".")) && accountTokenFile.open(QFile::WriteOnly))) {
+        Q_EMIT errorOccured("I/O Denied: Cannot save access token.");
+    } else {
+        accountTokenFile.write(accessToken);
+        return true;
+    }
+    return false;
+}
+
+bool Controller::saveAccessTokenToKeyChain(const AccountSettings &account, const QByteArray &accessToken)
+{
+    qDebug() << "Save the access token to the keychain for " << account.userId();
+    QKeychain::WritePasswordJob job(qAppName());
+    job.setAutoDelete(false);
+    job.setKey(account.userId());
+    job.setBinaryData(accessToken);
+    QEventLoop loop;
+    QKeychain::WritePasswordJob::connect(&job, &QKeychain::Job::finished, &loop, &QEventLoop::quit);
+    job.start();
+    loop.exec();
+
+    if (job.error()) {
+        qWarning() << "Could not save access token to the keychain: " << qPrintable(job.errorString());
+        return saveAccessTokenToFile(account, accessToken);
+    }
+    return true;
+}
+
 void Controller::changeAvatar(Connection *conn, const QUrl &localFile)
 {
     auto job = conn->uploadFile(localFile.toLocalFile());
+#ifdef QUOTIENT_07
     if (isJobPending(job)) {
+#else
+    if (isJobRunning(job)) {
+#endif
         connect(job, &BaseJob::success, this, [conn, job] {
             conn->callApi<SetAvatarUrlJob>(conn->userId(), job->contentUri());
         });
@@ -276,7 +553,7 @@ bool Controller::supportSystemTray() const
 
 void Controller::changePassword(Connection *connection, const QString &currentPassword, const QString &newPassword)
 {
-    auto *job = connection->callApi<NeochatChangePasswordJob>(newPassword, false);
+    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();
@@ -287,7 +564,7 @@ void Controller::changePassword(Connection *connection, const QString &currentPa
             authData["user"] = connection->user()->id();
             QJsonObject identifier = {{"type", "m.id.user"}, {"user", connection->user()->id()}};
             authData["identifier"] = identifier;
-            auto *innerJob = connection->callApi<NeochatChangePasswordJob>(newPassword, false, authData);
+            NeochatChangePasswordJob *innerJob = connection->callApi<NeochatChangePasswordJob>(newPassword, false, authData);
             connect(innerJob, &BaseJob::success, this, [this]() {
                 Q_EMIT passwordStatus(PasswordStatus::Success);
             });
@@ -307,7 +584,11 @@ bool Controller::setAvatar(Connection *connection, const QUrl &avatarSource)
     User *localUser = connection->user();
     QString decoded = avatarSource.path();
     if (decoded.isEmpty()) {
+#ifdef QUOTIENT_07
         connection->callApi<SetAvatarUrlJob>(localUser->id(), avatarSource);
+#else
+        connection->callApi<SetAvatarUrlJob>(localUser->id(), QString());
+#endif
         return true;
     }
     if (QImageReader(decoded).read().isNull()) {
@@ -318,7 +599,11 @@ bool Controller::setAvatar(Connection *connection, const QUrl &avatarSource)
 }
 
 NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Omittable<QJsonObject> &auth)
+#ifdef QUOTIENT_07
     : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), "/_matrix/client/r0/account/password")
+#else
+    : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), QStringLiteral("/_matrix/client/r0/account/password"))
+#endif
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("new_password"), newPassword);
@@ -327,12 +612,9 @@ NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, b
     setRequestData(_data);
 }
 
-NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth)
-    : Quotient::BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/matrix/client/r0/devices/%1").arg(deviceId).toLatin1())
+int Controller::accountCount() const
 {
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
-    setRequestData(std::move(_data));
+    return AccountRegistry::instance().count();
 }
 
 bool Controller::quitOnLastWindowClosed()
@@ -395,11 +677,6 @@ void Controller::setActiveConnection(Connection *connection)
             m_isOnline = true;
             Q_EMIT isOnlineChanged(true);
         });
-        connect(connection, &Connection::requestFailed, this, [=](BaseJob *job) {
-            if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"].toString() == "M_TOO_LARGE"_ls) {
-                RoomManager::instance().warning(i18n("File too large to download."), i18n("Contact your matrix server administrator for support."));
-            }
-        });
     } else {
         NeoChatConfig::self()->setActiveConnection(QString());
     }
@@ -413,20 +690,24 @@ void Controller::saveWindowGeometry()
     WindowController::instance().saveGeometry();
 }
 
+NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth)
+#ifdef QUOTIENT_07
+    : Quotient::BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId).toLatin1())
+#else
+    : Quotient::BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId))
+#endif
+{
+    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, "", name, topic, QStringList());
-    connect(createRoomJob, &CreateRoomJob::failure, this, [this, createRoomJob] {
+    Quotient::CreateRoomJob::connect(createRoomJob, &CreateRoomJob::failure, [this, createRoomJob] {
         Q_EMIT errorOccured(i18n("Room creation failed: \"%1\"", createRoomJob->errorString()));
     });
-    connectSingleShot(
-        this,
-        &Controller::roomAdded,
-        this,
-        [](NeoChatRoom *room) {
-            RoomManager::instance().enterRoom(room);
-        },
-        Qt::QueuedConnection);
 }
 
 bool Controller::isOnline() const
@@ -503,7 +784,11 @@ QString Controller::plainText(QQuickTextDocument *document) const
 
 bool Controller::encryptionSupported() const
 {
+#ifdef QUOTIENT_07
     return Quotient::encryptionSupported();
+#else
+    return false;
+#endif
 }
 
 void Controller::forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item)
@@ -523,15 +808,11 @@ 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:
@@ -544,10 +825,29 @@ void Controller::setApplicationProxy()
 
 int Controller::activeConnectionIndex() const
 {
+#ifdef QUOTIENT_07
     auto result = std::find_if(Accounts.accounts().begin(), Accounts.accounts().end(), [this](const auto &it) {
         return it == m_connection;
     });
     return result - Accounts.accounts().begin();
+#else
+    for (int i = 0; i < AccountRegistry::instance().rowCount(); i++) {
+        if (AccountRegistry::instance().data(AccountRegistry::instance().index(i, 0), AccountRegistry::UserIdRole).toString() == m_connection->userId()) {
+            return i;
+        }
+    }
+    return 0;
+#endif
+}
+
+int Controller::quotientMinorVersion() const
+{
+// TODO libQuotient 0.7: Replace with version function from libQuotient
+#ifdef QUOTIENT_07
+    return 7;
+#else
+    return 6;
+#endif
 }
 
 bool Controller::isFlatpak() const

src/controller.h

@@ -23,9 +23,15 @@ class Connection;
 class Room;
 }
 
+namespace QKeychain
+{
+class ReadPasswordJob;
+}
+
 class Controller : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(int accountCount READ accountCount NOTIFY accountCountChanged)
     Q_PROPERTY(bool quitOnLastWindowClosed READ quitOnLastWindowClosed WRITE setQuitOnLastWindowClosed NOTIFY quitOnLastWindowClosedChanged)
     Q_PROPERTY(Quotient::Connection *activeConnection READ activeConnection WRITE setActiveConnection NOTIFY activeConnectionChanged)
     Q_PROPERTY(bool busy READ busy WRITE setBusy NOTIFY busyChanged)
@@ -34,6 +40,7 @@ class Controller : public QObject
     Q_PROPERTY(bool isOnline READ isOnline NOTIFY isOnlineChanged)
     Q_PROPERTY(bool encryptionSupported READ encryptionSupported CONSTANT)
     Q_PROPERTY(int activeConnectionIndex READ activeConnectionIndex NOTIFY activeConnectionIndexChanged)
+    Q_PROPERTY(int quotientMinorVersion READ quotientMinorVersion CONSTANT)
     Q_PROPERTY(bool isFlatpak READ isFlatpak CONSTANT)
 
 public:
@@ -42,10 +49,17 @@ public:
     void setActiveConnection(Quotient::Connection *connection);
     [[nodiscard]] Quotient::Connection *activeConnection() const;
 
+    void addConnection(Quotient::Connection *c);
+    void dropConnection(Quotient::Connection *c);
+
+    Q_INVOKABLE void loginWithAccessToken(const QString &, const QString &, const QString &, const QString &);
+
     Q_INVOKABLE void changePassword(Quotient::Connection *connection, const QString &currentPassword, const QString &newPassword);
 
     Q_INVOKABLE bool setAvatar(Quotient::Connection *connection, const QUrl &avatarSource);
 
+    [[nodiscard]] int accountCount() const;
+
     [[nodiscard]] static bool quitOnLastWindowClosed();
     void setQuitOnLastWindowClosed(bool value);
 
@@ -54,6 +68,9 @@ public:
 
     [[nodiscard]] bool supportSystemTray() const;
 
+    bool saveAccessTokenToFile(const Quotient::AccountSettings &account, const QByteArray &accessToken);
+    bool saveAccessTokenToKeyChain(const Quotient::AccountSettings &account, const QByteArray &accessToken);
+
     int activeConnectionIndex() const;
 
     enum PasswordStatus {
@@ -84,6 +101,7 @@ public:
 
     Q_INVOKABLE void setApplicationProxy();
 
+    int quotientMinorVersion() const;
     bool isFlatpak() const;
 
 private:
@@ -93,15 +111,21 @@ private:
     bool m_busy = false;
     TrayIcon *m_trayIcon = nullptr;
 
+    static QByteArray loadAccessTokenFromFile(const Quotient::AccountSettings &account);
+    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const Quotient::AccountSettings &account);
+
     void loadSettings();
     void saveSettings() const;
     bool m_isOnline = true;
     QMap<Quotient::Room *, int> m_notificationCounts;
 
     bool hasWindowSystem() const;
-    void handleNotifications(QPointer<Quotient::Connection> connection);
+#ifdef QUOTIENT_07
+    void handleNotifications();
+#endif
 
 private Q_SLOTS:
+    void invokeLogin();
     void showWindow();
 
 Q_SIGNALS:
@@ -114,6 +138,7 @@ Q_SIGNALS:
     void syncDone();
     void connectionAdded(Quotient::Connection *_t1);
     void connectionDropped(Quotient::Connection *_t1);
+    void accountCountChanged();
     void initiated();
     void notificationClicked(const QString &_t1, const QString &_t2);
     void quitOnLastWindowClosedChanged();
@@ -128,15 +153,15 @@ Q_SIGNALS:
     void keyVerificationAccept(const QString &commitment);
     void keyVerificationKey(const QString &sas);
     void activeConnectionIndexChanged();
-    void roomAdded(NeoChatRoom *room);
 
 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.?: Drop
+// TODO libQuotient 0.7: Drop
 class NeochatChangePasswordJob : public Quotient::BaseJob
 {
 public:

src/customemojimodel.cpp

@@ -11,6 +11,12 @@
 
 using namespace Quotient;
 
+#ifdef QUOTIENT_07
+#define running isJobPending
+#else
+#define running isJobRunning
+#endif
+
 void CustomEmojiModel::fetchEmojis()
 {
     if (!Controller::instance().activeConnection()) {
@@ -51,12 +57,18 @@ void CustomEmojiModel::addEmoji(const QString &name, const QUrl &location)
 
     auto job = Controller::instance().activeConnection()->uploadFile(location.toLocalFile());
 
-    if (isJobPending(job)) {
-        connect(job, &BaseJob::success, this, [name, job] {
+    if (running(job)) {
+        connect(job, &BaseJob::success, this, [this, name, job] {
             const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes");
             auto json = data != nullptr ? data->contentJson() : QJsonObject();
             auto emojiData = json["images"].toObject();
-            emojiData[QStringLiteral("%1").arg(name)] = QJsonObject({{QStringLiteral("url"), job->contentUri().toString()}});
+            emojiData[QStringLiteral("%1").arg(name)] = QJsonObject({
+#ifdef QUOTIENT_07
+                {QStringLiteral("url"), job->contentUri().toString()}
+#else
+          {QStringLiteral("url"), job->contentUri()}
+#endif
+            });
             json["images"] = emojiData;
             Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes", json);
         });
@@ -129,9 +141,8 @@ QVariant CustomEmojiModel::data(const QModelIndex &idx, int role) const
         return QUrl(QStringLiteral("image://mxc/") + data.url.mid(6));
     case Roles::MxcUrl:
         return data.url.mid(6);
-    default:
-        return {};
     }
+
     return QVariant();
 }
 

src/customemojimodel.h

@@ -4,17 +4,13 @@
 #pragma once
 
 #include <QAbstractListModel>
-#include <QRegularExpression>
 #include <memory>
+#include <QRegularExpression>
 
 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
@@ -29,7 +25,6 @@ public:
         MxcUrl = 50,
         DisplayRole = 51,
         ReplacedTextRole = 52,
-        DescriptionRole = 53, // also invalid, reserved
     };
     Q_ENUM(Roles);
 

src/devicesmodel.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "devicesmodel.h"
@@ -67,15 +67,10 @@ QHash<int, QByteArray> DevicesModel::roleNames() const
 
 void DevicesModel::logout(int index, const QString &password)
 {
-    auto job = Controller::instance().activeConnection()->callApi<DeleteDeviceJob>(m_devices[index].deviceId);
+    auto job = Controller::instance().activeConnection()->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId);
 
     connect(job, &BaseJob::result, this, [this, job, password, index] {
-        auto onSuccess = [this, index]() {
-            beginRemoveRows(QModelIndex(), index, index);
-            m_devices.remove(index);
-            endRemoveRows();
-        };
-        if (job->error() != BaseJob::Success) {
+        if (job->error() != 0) {
             QJsonObject replyData = job->jsonData();
             QJsonObject authData;
             authData["session"] = replyData["session"];
@@ -84,9 +79,11 @@ 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, onSuccess);
-        } else {
-            onSuccess();
+            connect(innerJob, &BaseJob::success, this, [this, index]() {
+                beginRemoveRows(QModelIndex(), index, index);
+                m_devices.remove(index);
+                endRemoveRows();
+            });
         }
     });
 }

src/devicesmodel.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once

src/emojimodel.cpp

@@ -4,13 +4,12 @@
 #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)
@@ -49,8 +48,6 @@ 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 {};
@@ -61,19 +58,16 @@ 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;
 
@@ -88,6 +82,7 @@ QVariantList EmojiModel::filterModelNoCustom(const QString &filter, bool limit)
             }
         }
     }
+
     return result;
 }
 
@@ -115,28 +110,12 @@ 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
 {
-    if (baseEmoji.endsWith("tone")) {
-        return EmojiTones::_tones.values(baseEmoji.split(":")[0]);
-    }
-    return EmojiTones::_tones.values(baseEmoji);
+    return _tones.values(baseEmoji);
 }
 
 QHash<EmojiModel::Category, QVariantList> EmojiModel::_emojis;
@@ -144,11 +123,21 @@ 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::HistoryNoCustom},
+            {"category", EmojiModel::History},
             {"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")},
@@ -196,23 +185,3 @@ 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/emojimodel.h

@@ -8,18 +8,12 @@
 #include <QSettings>
 
 struct Emoji {
-    Emoji(QString unicode, QString shortname, bool isCustom = false)
-        : unicode(std::move(unicode))
-        , shortName(std::move(shortname))
+    Emoji(QString u, QString s, bool isCustom = false)
+        : unicode(std::move(std::move(u)))
+        , shortName(std::move(std::move(s)))
         , 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)
@@ -39,13 +33,11 @@ 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)
 };
 
@@ -57,7 +49,6 @@ 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()
@@ -72,16 +63,13 @@ public:
         InvalidRole = 50,
         DisplayRole = 51,
         ReplacedTextRole = 52,
-        DescriptionRole = 53,
     };
     Q_ENUM(RoleNames);
 
     enum Category {
         Custom,
         Search,
-        SearchNoCustom,
         History,
-        HistoryNoCustom,
         Smileys,
         People,
         Nature,
@@ -101,14 +89,11 @@ 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();
@@ -118,6 +103,7 @@ public Q_SLOTS:
 
 private:
     static QHash<Category, QVariantList> _emojis;
+    static QMultiHash<QString, QVariant> _tones;
 
     // TODO: Port away from QSettings
     QSettings m_settings;

src/emojitones.cpp

@@ -1,9 +0,0 @@
-// 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/filetransferpseudojob.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "filetransferpseudojob.h"
@@ -25,7 +25,6 @@ void FileTransferPseudoJob::fileTransferProgress(QString id, qint64 progress, qi
 
 void FileTransferPseudoJob::fileTransferCompleted(QString id, QUrl localFile)
 {
-    Q_UNUSED(localFile);
     if (id != m_eventId) {
         return;
     }

src/filetransferpseudojob.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once

src/joinrulesevent.h

@@ -7,17 +7,30 @@
 
 namespace Quotient
 {
+#ifdef QUOTIENT_07
 class JoinRulesEvent : public StateEvent
+#else
+class JoinRulesEvent : public StateEventBase
+#endif
 {
 public:
+#ifdef QUOTIENT_07
     QUO_EVENT(JoinRulesEvent, "m.room.join_rules")
+#else
+    DEFINE_EVENT_TYPEID("m.room.join_rules", JoinRulesEvent)
+#endif
 
     explicit JoinRulesEvent(const QJsonObject &obj)
+#ifdef QUOTIENT_07
         : StateEvent(obj)
+#else
+        : StateEventBase(typeId(), obj)
+#endif
     {
     }
 
     QString joinRule() const;
     QJsonArray allow() const;
 };
+REGISTER_EVENT_TYPE(JoinRulesEvent)
 }

src/keywordnotificationrulemodel.cpp

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

src/login.cpp

@@ -1,15 +1,20 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "login.h"
 
+#ifdef QUOTIENT_07
 #include <accountregistry.h>
+#else
+#include "neochataccountregistry.h"
+#endif
 
 #include <connection.h>
 #include <qt_connection_util.h>
 
 #include "controller.h"
-#include "neochatroom.h"
+
+#include <QUrl>
 
 #include <KLocalizedString>
 
@@ -40,7 +45,7 @@ void Login::init()
             return;
         }
 
-        m_isLoggedIn = Accounts.isLoggedIn(m_matrixId);
+        m_isLoggedIn = AccountRegistry::instance().isLoggedIn(m_matrixId);
         Q_EMIT isLoggedInChanged();
         if (m_isLoggedIn) {
             return;
@@ -71,7 +76,11 @@ void Login::init()
         account.setHomeserver(m_connection->homeserver());
         account.setDeviceId(m_connection->deviceId());
         account.setDeviceName(m_deviceName);
+        if (!Controller::instance().saveAccessTokenToKeyChain(account, m_connection->accessToken())) {
+            qWarning() << "Couldn't save access token";
+        }
         account.sync();
+        Controller::instance().addConnection(m_connection);
         Controller::instance().setActiveConnection(m_connection);
         m_connection = nullptr;
     });
@@ -90,9 +99,8 @@ void Login::init()
         Q_EMIT Controller::instance().globalErrorOccured(i18n("Network Error"), std::move(error));
     });
 
-    connectSingleShot(m_connection, &Connection::loadedRoomState, this, [this]() {
-        Controller::instance().setActiveConnection(m_connection);
-        // TODO close settings window
+    connectSingleShot(m_connection, &Connection::syncDone, this, [this]() {
+        Q_EMIT Controller::instance().initiated();
     });
 }
 
@@ -150,8 +158,8 @@ void Login::login()
 
     // Some servers do not have a .well_known file. So we login via the username part from the mxid,
     // rather than with the full mxid, as that would lead to an invalid user.
-    auto username = m_matrixId.mid(1, m_matrixId.indexOf(":") - 1);
-    m_connection->loginWithPassword(username, m_password, m_deviceName, QString());
+    QStringRef username(&m_matrixId, 1, m_matrixId.indexOf(":") - 1);
+    m_connection->loginWithPassword(username.toString(), m_password, m_deviceName, QString());
 }
 
 bool Login::supportsPassword() const
@@ -175,8 +183,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/login.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once

src/main.cpp

@@ -28,67 +28,67 @@
 
 #include "neochat-version.h"
 
+#ifdef QUOTIENT_07
 #include <accountregistry.h>
+#else
+#include "neochataccountregistry.h"
+#endif
+
 #include <networkaccessmanager.h>
 #include <room.h>
 #include <util.h>
-#include <keyverificationsession.h>
-#include <accountregistry.h>
-#include <room.h>
-#include <networkaccessmanager.h>
 
 #include "actionshandler.h"
 #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 "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 "messageeventmodel.h"
+#include "messagefiltermodel.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "neochatuser.h"
 #include "notificationsmanager.h"
+#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>
+#endif
 #ifdef HAVE_COLORSCHEME
 #include "colorschemer.h"
 #endif
-#include "models/completionmodel.h"
-#include "models/statemodel.h"
+#include "completionmodel.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
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
                      KAboutLicense::GPL_V3,
                      i18n("© 2018-2020 Black Hat, 2020-2022 KDE Community"));
     about.addAuthor(i18n("Carl Schwan"), i18n("Maintainer"), QStringLiteral("carl@carlschwan.eu"), QStringLiteral("https://carlschwan.eu"));
-    about.addAuthor(i18n("Tobias Fella"), i18n("Maintainer"), QStringLiteral("tobias.fella@kde.org"), QStringLiteral("https://tobiasfella.de"));
+    about.addAuthor(i18n("Tobias Fella"), i18n("Maintainer"), QStringLiteral("fella@posteo.de"), QStringLiteral("https://tobiasfella.de"));
     about.addAuthor(i18n("James Graham"), i18n("Maintainer"), QStringLiteral("james.h.graham@protonmail.com"));
     about.addCredit(i18n("Black Hat"), i18n("Original author of Spectral"), QStringLiteral("bhat@encom.eu.org"));
     about.addCredit(i18n("Alexey Rusakov"), i18n("Maintainer of Quotient"), QStringLiteral("Kitsune-Ral@users.sf.net"));
@@ -160,10 +160,14 @@ int main(int argc, char *argv[])
 
     about.addComponent(QStringLiteral("libQuotient"),
                        i18n("A Qt5 library to write cross-platform clients for Matrix"),
+#ifdef QUOTIENT_07
                        i18nc("<version number> (built against <possibly different version number>)",
                              "%1 (built against %2)",
                              Quotient::versionString(),
                              QStringLiteral(Quotient_VERSION_STRING)),
+#else
+                       QStringLiteral(QUOTIENT_VERSION),
+#endif
                        QStringLiteral("https://github.com/quotient-im/libquotient"),
                        KAboutLicense::LGPL_V2_1);
 
@@ -200,8 +204,11 @@ int main(int argc, char *argv[])
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "LoginHelper", login);
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "UrlHelper", &urlHelper);
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "EmojiModel", &EmojiModel::instance());
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Accounts", &Quotient::Accounts);
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Accounts", &Quotient::Accounts);
+#ifdef QUOTIENT_07
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "AccountRegistry", &Quotient::Accounts);
+#else
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "AccountRegistry", &Quotient::AccountRegistry::instance());
+#endif
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "SpaceHierarchyCache", &SpaceHierarchyCache::instance());
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "CustomEmojiModel", &CustomEmojiModel::instance());
     qmlRegisterType<ActionsHandler>("org.kde.neochat", 1, 0, "ActionsHandler");
@@ -212,7 +219,6 @@ 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");
@@ -222,8 +228,9 @@ 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
     qmlRegisterType<KeywordNotificationRuleModel>("org.kde.neochat", 1, 0, "KeywordNotificationRuleModel");
     qmlRegisterUncreatableType<RoomMessageEvent>("org.kde.neochat", 1, 0, "RoomMessageEvent", "ENUM");
     qmlRegisterUncreatableType<PushNotificationState>("org.kde.neochat", 1, 0, "PushNotificationState", "ENUM");
@@ -242,10 +249,12 @@ int main(int argc, char *argv[])
     qRegisterMetaType<NeoChatUser *>("NeoChatUser*");
     qRegisterMetaType<GetRoomEventsJob *>("GetRoomEventsJob*");
     qRegisterMetaType<QMimeType>("QMimeType");
+#ifdef QUOTIENT_07
 #ifdef Quotient_E2EE_ENABLED
     qRegisterMetaType<KeyVerificationSession *>("KeyVerificationSession*");
     qmlRegisterUncreatableType<KeyVerificationSession>("org.kde.neochat", 1, 0, "KeyVerificationSession", {});
     qRegisterMetaType<QVector<EmojiEntry>>("QVector<EmojiEntry>");
+#endif
 #endif
     qmlRegisterSingletonType("org.kde.neochat", 1, 0, "About", [](QQmlEngine *engine, QJSEngine *) -> QJSValue {
         return engine->toScriptValue(KAboutData::applicationData());
@@ -256,32 +265,6 @@ 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());
@@ -311,6 +294,31 @@ 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/messageeventmodel.cpp

@@ -11,10 +11,12 @@
 #include <events/roomavatarevent.h>
 #include <events/roommemberevent.h>
 #include <events/simplestateevents.h>
-#include <events/stickerevent.h>
 #include <user.h>
 
+#ifdef QUOTIENT_07
 #include "pollevent.h"
+#endif
+#include "stickerevent.h"
 
 #include <QDebug>
 #include <QGuiApplication>
@@ -25,13 +27,14 @@
 #include <KLocalizedString>
 
 #include "neochatuser.h"
+#include "utils.h"
 
 using namespace Quotient;
 
 QHash<int, QByteArray> MessageEventModel::roleNames() const
 {
     QHash<int, QByteArray> roles = QAbstractItemModel::roleNames();
-    roles[DelegateTypeRole] = "delegateType";
+    roles[EventTypeRole] = "eventType";
     roles[MessageRole] = "message";
     roles[EventIdRole] = "eventId";
     roles[TimeRole] = "time";
@@ -43,16 +46,16 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[SpecialMarksRole] = "marks";
     roles[LongOperationRole] = "progressInfo";
     roles[FileMimetypeIcon] = "fileMimetypeIcon";
+    roles[AnnotationRole] = "annotation";
     roles[EventResolvedTypeRole] = "eventResolvedType";
     roles[IsReplyRole] = "isReply";
     roles[ReplyRole] = "reply";
     roles[ReplyIdRole] = "replyId";
+    roles[UserMarkerRole] = "userMarker";
     roles[ShowAuthorRole] = "showAuthor";
     roles[ShowSectionRole] = "showSection";
-    roles[ReadMarkersRole] = "readMarkers";
-    roles[ReadMarkersStringRole] = "readMarkersString";
-    roles[ShowReadMarkersRole] = "showReadMarkers";
     roles[ReactionRole] = "reaction";
+    roles[IsEditedRole] = "isEdited";
     roles[SourceRole] = "source";
     roles[MimeTypeRole] = "mimeType";
     roles[FormattedBodyRole] = "formattedBody";
@@ -61,17 +64,14 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[VerifiedRole] = "verified";
     roles[DisplayNameForInitialsRole] = "displayNameForInitials";
     roles[AuthorDisplayNameRole] = "authorDisplayName";
-    roles[IsRedactedRole] = "isRedacted";
-    roles[GenericDisplayRole] = "genericDisplay";
-    roles[IsPendingRole] = "isPending";
-    roles[LatitudeRole] = "latitude";
-    roles[LongitudeRole] = "longitude";
-    roles[AssetRole] = "asset";
+    roles[IsNameChangeRole] = "isNameChange";
+    roles[IsAvatarChangeRole] = "isAvatarChange";
     return roles;
 }
 
 MessageEventModel::MessageEventModel(QObject *parent)
     : QAbstractListModel(parent)
+    , m_currentRoom(nullptr)
 {
     using namespace Quotient;
     qmlRegisterAnonymousType<FileTransferInfo>("org.kde.neochat", 1);
@@ -84,11 +84,6 @@ MessageEventModel::MessageEventModel(QObject *parent)
 
 MessageEventModel::~MessageEventModel() = default;
 
-NeoChatRoom *MessageEventModel::room() const
-{
-    return m_currentRoom;
-}
-
 void MessageEventModel::setRoom(NeoChatRoom *room)
 {
     if (room == m_currentRoom) {
@@ -107,7 +102,11 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
         if (m_currentRoom->timelineSize() < 10 && !room->allHistoryLoaded()) {
             room->getPreviousContent(50);
         }
+#ifdef QUOTIENT_07
         lastReadEventId = room->lastFullyReadEventId();
+#else
+        lastReadEventId = room->readMarkerEventId();
+#endif
 
         using namespace Quotient;
         connect(m_currentRoom, &Room::aboutToAddNewMessages, this, [this](RoomEventsRange events) {
@@ -156,7 +155,11 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             endInsertRows();
             if (!m_lastReadEventIndex.isValid()) {
                 // no read marker, so see if we need to create one.
+#ifdef QUOTIENT_07
                 moveReadMarker(m_currentRoom->lastFullyReadEventId());
+#else
+                moveReadMarker(m_currentRoom->readMarkerEventId());
+#endif
             }
             if (biggest < m_currentRoom->maxTimelineIndex()) {
                 auto rowBelowInserted = m_currentRoom->maxTimelineIndex() - biggest + timelineBaseIndex() - 1;
@@ -171,7 +174,6 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
         });
         connect(m_currentRoom, &Room::pendingEventAdded, this, &MessageEventModel::endInsertRows);
         connect(m_currentRoom, &Room::pendingEventAboutToMerge, this, [this](RoomEvent *, int i) {
-            Q_EMIT dataChanged(index(i, 0), index(i, 0), {IsPendingRole});
             if (i == 0) {
                 return; // No need to move anything, just refresh
             }
@@ -197,7 +199,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             beginRemoveRows({}, i, i);
         });
         connect(m_currentRoom, &Room::pendingEventDiscarded, this, &MessageEventModel::endRemoveRows);
-        connect(m_currentRoom, &Room::fullyReadMarkerMoved, this, [this](const QString &fromEventId, const QString &toEventId) {
+        connect(m_currentRoom, &Room::readMarkerMoved, this, [this](const QString &fromEventId, const QString &toEventId) {
             Q_UNUSED(fromEventId);
             moveReadMarker(toEventId);
         });
@@ -210,16 +212,13 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             }
             refreshEventRoles(eventId, {ReactionRole, Qt::DisplayRole});
         });
-        connect(m_currentRoom, &Room::changed, this, [this]() {
-            for (auto it = m_currentRoom->messageEvents().rbegin(); it != m_currentRoom->messageEvents().rend(); ++it) {
-                auto event = it->event();
-                refreshEventRoles(event->id(), {ReadMarkersRole, ReadMarkersStringRole});
-            }
-        });
         connect(m_currentRoom, &Room::newFileTransfer, this, &MessageEventModel::refreshEvent);
         connect(m_currentRoom, &Room::fileTransferProgress, this, &MessageEventModel::refreshEvent);
         connect(m_currentRoom, &Room::fileTransferCompleted, this, &MessageEventModel::refreshEvent);
         connect(m_currentRoom, &Room::fileTransferFailed, this, &MessageEventModel::refreshEvent);
+#ifndef QUOTIENT_07
+        connect(m_currentRoom, &Room::fileTransferCancelled, this, &MessageEventModel::refreshEvent);
+#endif
         connect(m_currentRoom->connection(), &Connection::ignoredUsersListChanged, this, [this] {
             beginResetModel();
             endResetModel();
@@ -305,7 +304,7 @@ int MessageEventModel::refreshEventRoles(const QString &id, const QVector<int> &
             return -1;
         }
         row = int(timelineIt - m_currentRoom->messageEvents().rbegin()) + timelineBaseIndex();
-        if (data(index(row, 0), DelegateTypeRole).toInt() == ReadMarker || data(index(row, 0), DelegateTypeRole).toInt() == Other) {
+        if (data(index(row, 0), EventTypeRole).toInt() == ReadMarker || data(index(row, 0), EventTypeRole).toInt() == Other) {
             row++;
         }
     }
@@ -436,10 +435,10 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
 
     if (m_lastReadEventIndex.row() == row) {
         switch (role) {
-        case DelegateTypeRole:
+        case EventTypeRole:
             return DelegateType::ReadMarker;
         case TimeRole: {
-            const QDateTime eventDate = data(index(m_lastReadEventIndex.row() + 1, 0), TimeRole).toDateTime().toLocalTime();
+            const QDateTime eventDate = data(index(m_lastReadEventIndex.row() + 1, 0), TimeRole).toDateTime();
             const KFormat format;
             return format.formatRelativeDateTime(eventDate, QLocale::ShortFormat);
         }
@@ -462,14 +461,6 @@ 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") {
@@ -485,10 +476,10 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == SourceRole) {
-        return QJsonDocument(evt.fullJson()).toJson();
+        return evt.originalJson();
     }
 
-    if (role == DelegateTypeRole) {
+    if (role == EventTypeRole) {
         if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
             switch (e->msgtype()) {
             case MessageEventType::Emote:
@@ -501,8 +492,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
                 return DelegateType::Audio;
             case MessageEventType::Video:
                 return DelegateType::Video;
-            case MessageEventType::Location:
-                return DelegateType::Location;
             default:
                 break;
             }
@@ -521,18 +510,20 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         if (is<const EncryptedEvent>(evt)) {
             return DelegateType::Encrypted;
         }
+#ifdef QUOTIENT_07
         if (is<PollStartEvent>(evt)) {
             if (evt.isRedacted()) {
                 return DelegateType::Message;
             }
             return DelegateType::Poll;
         }
+#endif
 
         return DelegateType::Other;
     }
 
     if (role == EventResolvedTypeRole) {
-        return evt.type();
+        return EventTypeRegistry::getMatrixType(evt.type());
     }
 
     if (role == AuthorRole) {
@@ -555,9 +546,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         }
 
         if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
-            if (e->msgtype() == Quotient::MessageEventType::Location) {
-                return e->contentJson();
-            }
             // Cannot use e.contentJson() here because some
             // EventContent classes inject values into the copy of the
             // content JSON stored in EventContent::Base
@@ -571,7 +559,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == HighlightRole) {
-        return !m_currentRoom->isDirectChat() && m_currentRoom->isEventHighlighted(&evt);
+        return m_currentRoom->isEventHighlighted(&evt);
     }
 
     if (role == FileMimetypeIcon) {
@@ -599,25 +587,12 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
 
     if (role == SpecialMarksRole) {
         if (isPending) {
-            // A pending event with an m.new_content key will be merged into the
-            // original event so don't show.
-            if (evt.contentJson().contains("m.new_content")) {
-                return EventStatus::Hidden;
-            }
             return pendingIt->deliveryStatus();
         }
 
-        if (evt.isStateEvent() && !NeoChatConfig::self()->showStateEvent()) {
-            return EventStatus::Hidden;
-        }
-
-        if (auto roomMemberEvent = eventCast<const RoomMemberEvent>(&evt)) {
-            if ((roomMemberEvent->isJoin() || roomMemberEvent->isLeave()) && !NeoChatConfig::self()->showLeaveJoinEvent()) {
-                return EventStatus::Hidden;
-            } else if (roomMemberEvent->isRename() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave() && !NeoChatConfig::self()->showRename()) {
-                return EventStatus::Hidden;
-            } else if (roomMemberEvent->isAvatarUpdate() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave()
-                       && !NeoChatConfig::self()->showAvatarUpdate()) {
+        auto *memberEvent = timelineIt->viewAs<RoomMemberEvent>();
+        if (memberEvent) {
+            if ((memberEvent->isJoin() || memberEvent->isLeave()) && !NeoChatConfig::self()->showLeaveJoinEvent()) {
                 return EventStatus::Hidden;
             }
         }
@@ -631,7 +606,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
             return EventStatus::Hidden;
         }
 
-        if (evt.isStateEvent() && static_cast<const StateEvent &>(evt).repeatsState()) {
+        if (evt.isStateEvent() && static_cast<const StateEventBase &>(evt).repeatsState()) {
             return EventStatus::Hidden;
         }
 
@@ -648,6 +623,14 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return EventStatus::Normal;
     }
 
+    if (role == IsEditedRole) {
+        if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
+            return !e->unsignedJson().isEmpty() && e->unsignedJson().contains("m.relations")
+                && e->unsignedJson()["m.relations"].toObject().contains("m.replace");
+        }
+        return false;
+    }
+
     if (role == EventIdRole) {
         return !evt.id().isEmpty() ? evt.id() : evt.transactionId();
     }
@@ -663,11 +646,29 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         }
     }
 
+    if (role == AnnotationRole) {
+        if (isPending) {
+            return pendingIt->annotation();
+        }
+    }
+
     if (role == TimeRole || role == SectionRole) {
         auto ts = isPending ? pendingIt->lastUpdated() : makeMessageTimestamp(timelineIt);
         return role == TimeRole ? QVariant(ts) : renderDate(ts);
     }
 
+    if (role == UserMarkerRole) {
+        QVariantList variantList;
+        const auto users = m_currentRoom->usersAtEventId(evt.id());
+        for (User *user : users) {
+            if (user == m_currentRoom->localUser()) {
+                continue;
+            }
+            variantList.append(QVariant::fromValue(user));
+        }
+        return variantList;
+    }
+
     if (role == IsReplyRole) {
         return !evt.contentJson()["m.relates_to"].toObject()["m.in_reply_to"].toObject()["event_id"].toString().isEmpty();
     }
@@ -753,7 +754,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
             // While the row is removed the subsequent row indexes are not changed so we need to skip over the removed index.
             // See - https://doc.qt.io/qt-5/qabstractitemmodel.html#beginRemoveRows
             if (data(i, SpecialMarksRole) != EventStatus::Hidden && !itemData(i).empty()) {
-                return data(i, AuthorRole) != data(idx, AuthorRole) || data(i, DelegateTypeRole) == MessageEventModel::State
+                return data(i, AuthorRole) != data(idx, AuthorRole) || data(i, EventTypeRole) == MessageEventModel::State
                     || data(i, TimeRole).toDateTime().msecsTo(data(idx, TimeRole).toDateTime()) > 600000
                     || data(i, TimeRole).toDateTime().toLocalTime().date().day() != data(idx, TimeRole).toDateTime().toLocalTime().date().day();
             }
@@ -778,70 +779,8 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return false;
     }
 
-    if (role == LatitudeRole) {
-        const auto geoUri = evt.contentJson()["geo_uri"_ls].toString();
-        if (geoUri.isEmpty()) {
-            return {};
-        }
-        const auto latitude = geoUri.split(u';')[0].split(u':')[1].split(u',')[0];
-        return latitude.toFloat();
-    }
-
-    if (role == LongitudeRole) {
-        const auto geoUri = evt.contentJson()["geo_uri"_ls].toString();
-        if (geoUri.isEmpty()) {
-            return {};
-        }
-        const auto latitude = geoUri.split(u';')[0].split(u':')[1].split(u',')[1];
-        return latitude.toFloat();
-    }
-
-    if (role == AssetRole) {
-        const auto assetType = evt.contentJson()["org.matrix.msc3488.asset"].toObject()["type"].toString();
-        if (assetType.isEmpty()) {
-            return {};
-        }
-        return assetType;
-    }
-
-    if (role == ReadMarkersRole) {
-        auto userIds = room()->userIdsAtEvent(evt.id());
-        userIds.remove(m_currentRoom->localUser()->id());
-
-        QVariantList users;
-        users.reserve(userIds.size());
-        for (const auto &userId : userIds) {
-            auto user = static_cast<NeoChatUser *>(m_currentRoom->user(userId));
-            users += userAtEvent(user, m_currentRoom, evt);
-        }
-
-        return users;
-    }
-
-    if (role == ReadMarkersStringRole) {
-        auto userIds = room()->userIdsAtEvent(evt.id());
-        userIds.remove(m_currentRoom->localUser()->id());
-        /**
-         * The string ends up in the form
-         * "x users: user1DisplayName, user2DisplayName, etc."
-         */
-        QString readMarkersString = i18np("1 user: ", "%1 users: ", userIds.size());
-        for (const auto &userId : userIds) {
-            auto user = static_cast<NeoChatUser *>(m_currentRoom->user(userId));
-            readMarkersString += user->displayname(m_currentRoom) + i18nc("list separator", ", ");
-        }
-        readMarkersString.chop(2);
-        return readMarkersString;
-    }
-
-    if (role == ShowReadMarkersRole) {
-        auto userIds = room()->userIdsAtEvent(evt.id());
-        userIds.remove(m_currentRoom->localUser()->id());
-        return userIds.size() > 0;
-    }
-
     if (role == ReactionRole) {
-        const auto &annotations = m_currentRoom->relatedEvents(evt, EventRelation::AnnotationType);
+        const auto &annotations = m_currentRoom->relatedEvents(evt, EventRelation::Annotation());
         if (annotations.isEmpty()) {
             return {};
         };
@@ -851,7 +790,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
                 continue;
             }
             if (auto e = eventCast<const ReactionEvent>(a)) {
-                reactions[e->eventId()].append(static_cast<NeoChatUser *>(m_currentRoom->user(e->senderId())));
+                reactions[e->relation().key].append(static_cast<NeoChatUser *>(m_currentRoom->user(e->senderId())));
             }
         }
 
@@ -878,6 +817,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == MediaUrlRole) {
+#ifdef QUOTIENT_07
         if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
             if (!e->hasFileContent()) {
                 return QVariant();
@@ -894,6 +834,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         // if (auto e = eventCast<const StickerEvent>(&evt)) {
         //     return m_currentRoom->makeMediaUrl(e->id(), e->url());
         // }
+#endif
 
         // Construct link in the same form as urlToDownload as that function doesn't work for stickers
         if (auto e = eventCast<const StickerEvent>(&evt)) {
@@ -908,12 +849,14 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == VerifiedRole) {
+#ifdef QUOTIENT_07
 #ifdef Quotient_E2EE_ENABLED
         if (evt.originalEvent()) {
             auto encrypted = dynamic_cast<const EncryptedEvent *>(evt.originalEvent());
             Q_ASSERT(encrypted);
             return m_currentRoom->connection()->isVerifiedSession(encrypted->sessionId().toLatin1());
         }
+#endif
 #endif
         return false;
     }
@@ -936,18 +879,26 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         }
     }
 
-    if (role == IsRedactedRole) {
-        return evt.isRedacted();
+    if (role == IsNameChangeRole) {
+        auto roomMemberEvent = eventCast<const RoomMemberEvent>(&evt);
+        if (roomMemberEvent) {
+            return roomMemberEvent->isRename();
+        }
+        return false;
     }
 
-    if (role == IsPendingRole) {
-        return row < static_cast<int>(m_currentRoom->pendingEvents().size());
+    if (role == IsAvatarChangeRole) {
+        auto roomMemberEvent = eventCast<const RoomMemberEvent>(&evt);
+        if (roomMemberEvent) {
+            return roomMemberEvent->isAvatarUpdate();
+        }
+        return false;
     }
 
     return {};
 }
 
-int MessageEventModel::eventIdToRow(const QString &eventID) const
+int MessageEventModel::eventIDToIndex(const QString &eventID) const
 {
     const auto it = m_currentRoom->findInTimeline(eventID);
     if (it == m_currentRoom->historyEdge()) {
@@ -989,7 +940,7 @@ QVariant MessageEventModel::getLastLocalUserMessageEventId()
                 targetMessage.insert("event_id", eventId);
                 targetMessage.insert("formattedBody", content["formatted_body"].toString());
                 // Need to get the message from the original eventId or body will have * on the front
-                QModelIndex idx = index(eventIdToRow(eventId), 0);
+                QModelIndex idx = index(eventIDToIndex(eventId), 0);
                 targetMessage.insert("message", idx.data(Qt::UserRole + 2));
 
                 return targetMessage;
@@ -999,21 +950,18 @@ QVariant MessageEventModel::getLastLocalUserMessageEventId()
     return targetMessage;
 }
 
-QVariant MessageEventModel::getLatestMessageFromRow(const int startRow)
+QVariant MessageEventModel::getLatestMessageFromIndex(const int baseline)
 {
     QVariantMap replyResponse;
-    const auto &timelineBottom = m_currentRoom->messageEvents().rbegin() + startRow;
+    const auto &timelineBottom = m_currentRoom->messageEvents().rbegin() + baseline;
 
-    // set a cap limit of startRow + 35 messages, to prevent loading a lot of messages
+    // set a cap limit of baseline + 35 messages, to prevent loading a lot of messages
     // in rooms where the user has not sent many messages
-    const auto limit = timelineBottom + std::min(startRow + 35, m_currentRoom->timelineSize());
+    const auto limit = timelineBottom + std::min(baseline + 35, m_currentRoom->timelineSize());
 
     for (auto it = timelineBottom; it != limit; ++it) {
         auto evt = it->event();
         auto e = eventCast<const RoomMessageEvent>(evt);
-        if (!e) {
-            continue;
-        }
 
         auto content = (*it)->contentJson();
 
@@ -1028,7 +976,7 @@ QVariant MessageEventModel::getLatestMessageFromRow(const int startRow)
             }
             replyResponse.insert("event_id", eventId);
             // Need to get the message from the original eventId or body will have * on the front
-            QModelIndex idx = index(eventIdToRow(eventId), 0);
+            QModelIndex idx = index(eventIDToIndex(eventId), 0);
             replyResponse.insert("message", idx.data(Qt::UserRole + 2));
             replyResponse.insert("sender_id", QVariant::fromValue(m_currentRoom->getUser((*it)->senderId())));
             replyResponse.insert("at", -it->index());

src/messageeventmodel.h

@@ -0,0 +1,124 @@
+// SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#pragma once
+
+#include <QAbstractListModel>
+
+#include "neochatroom.h"
+
+class MessageEventModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
+
+public:
+    enum DelegateType {
+        Emote,
+        Notice,
+        Image,
+        Audio,
+        Video,
+        File,
+        Message,
+        Sticker,
+        State,
+        Encrypted,
+        ReadMarker,
+        Poll,
+        Other,
+    };
+    Q_ENUM(DelegateType);
+
+    enum EventRoles {
+        EventTypeRole = Qt::UserRole + 1,
+        MessageRole,
+        EventIdRole,
+        TimeRole,
+        SectionRole,
+        AuthorRole,
+        ContentRole,
+        ContentTypeRole,
+        HighlightRole,
+        SpecialMarksRole,
+        LongOperationRole,
+        AnnotationRole,
+        UserMarkerRole,
+        FormattedBodyRole,
+
+        MimeTypeRole,
+        FileMimetypeIcon,
+
+        IsReplyRole,
+        ReplyRole,
+        ReplyIdRole,
+
+        ShowAuthorRole,
+        ShowSectionRole,
+
+        ReactionRole,
+
+        IsEditedRole,
+        SourceRole,
+        MediaUrlRole,
+        // For debugging
+        EventResolvedTypeRole,
+        AuthorIdRole,
+        VerifiedRole,
+        // Sender's displayname, always without the matrix id
+        DisplayNameForInitialsRole,
+        // The displayname for the event's sender; for name change events, the old displayname
+        AuthorDisplayNameRole,
+        IsNameChangeRole,
+        IsAvatarChangeRole,
+        LastRole, // Keep this last
+    };
+    Q_ENUM(EventRoles)
+
+    explicit MessageEventModel(QObject *parent = nullptr);
+    ~MessageEventModel() override;
+
+    [[nodiscard]] NeoChatRoom *room() const
+    {
+        return m_currentRoom;
+    }
+    void setRoom(NeoChatRoom *room);
+
+    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    [[nodiscard]] QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override;
+    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
+
+    Q_INVOKABLE [[nodiscard]] int eventIDToIndex(const QString &eventID) const;
+    Q_INVOKABLE [[nodiscard]] QVariant getLastLocalUserMessageEventId();
+    Q_INVOKABLE [[nodiscard]] QVariant getLatestMessageFromIndex(const int baseline);
+    Q_INVOKABLE void loadReply(const QModelIndex &row);
+
+private Q_SLOTS:
+    int refreshEvent(const QString &eventId);
+    void refreshRow(int row);
+
+private:
+    NeoChatRoom *m_currentRoom = nullptr;
+    QString lastReadEventId;
+    QPersistentModelIndex m_lastReadEventIndex;
+    int rowBelowInserted = -1;
+    bool movingEvent = false;
+
+    [[nodiscard]] int timelineBaseIndex() const;
+    [[nodiscard]] QDateTime makeMessageTimestamp(const Quotient::Room::rev_iter_t &baseIt) const;
+    [[nodiscard]] static QString renderDate(const QDateTime &timestamp);
+
+    bool canFetchMore(const QModelIndex &parent) const override;
+    void fetchMore(const QModelIndex &parent) override;
+
+    void refreshLastUserEvents(int baseTimelineRow);
+    void refreshEventRoles(int row, const QVector<int> &roles = {});
+    int refreshEventRoles(const QString &eventId, const QVector<int> &roles = {});
+    void moveReadMarker(const QString &toEventId);
+
+    std::vector<Quotient::event_ptr_tt<Quotient::RoomEvent>> m_extraEvents;
+
+Q_SIGNALS:
+    void roomChanged();
+    void fancyEffectsReasonFound(const QString &fancyEffect);
+};

src/messagefiltermodel.cpp

@@ -11,20 +11,19 @@ using namespace Quotient;
 MessageFilterModel::MessageFilterModel(QObject *parent)
     : QSortFilterProxyModel(parent)
 {
-    connect(NeoChatConfig::self(), &NeoChatConfig::ShowStateEventChanged, this, [this] {
-        invalidateFilter();
-    });
     connect(NeoChatConfig::self(), &NeoChatConfig::ShowLeaveJoinEventChanged, this, [this] {
-        invalidateFilter();
+        beginResetModel();
+        endResetModel();
     });
+
     connect(NeoChatConfig::self(), &NeoChatConfig::ShowRenameChanged, this, [this] {
-        invalidateFilter();
+        beginResetModel();
+        endResetModel();
     });
+
     connect(NeoChatConfig::self(), &NeoChatConfig::ShowAvatarUpdateChanged, this, [this] {
-        invalidateFilter();
-    });
-    connect(NeoChatConfig::self(), &NeoChatConfig::ShowDeletedMessagesChanged, this, [this] {
-        invalidateFilter();
+        beginResetModel();
+        endResetModel();
     });
 }
 
@@ -32,20 +31,28 @@ bool MessageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sour
 {
     const QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
 
-    if (index.data(MessageEventModel::IsRedactedRole).toBool() && !NeoChatConfig::self()->showDeletedMessages()) {
+    const int specialMarks = index.data(MessageEventModel::SpecialMarksRole).toInt();
+    if (index.data(MessageEventModel::IsNameChangeRole).toBool() && !NeoChatConfig::self()->showRename()) {
+        return false;
+    }
+
+    if (index.data(MessageEventModel::IsAvatarChangeRole).toBool() && !NeoChatConfig::self()->showAvatarUpdate()) {
         return false;
     }
 
-    const int specialMarks = index.data(MessageEventModel::SpecialMarksRole).toInt();
     if (specialMarks == EventStatus::Hidden || specialMarks == EventStatus::Replaced) {
         return false;
     }
 
-    const auto eventType = index.data(MessageEventModel::DelegateTypeRole).toInt();
+    const QString eventType = index.data(MessageEventModel::EventTypeRole).toString();
 
     if (eventType == MessageEventModel::Other) {
         return false;
     }
 
+    if (!NeoChatConfig::self()->showLeaveJoinEvent() && eventType == MessageEventModel::State) {
+        return false;
+    }
+
     return true;
 }