Don't erase existing reply-to relationships when editing messages

Signed-off-by: Joshua Goins <josh@redstrate.com>

.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": [

.gitignore

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

.gitlab-ci.yml

@@ -4,11 +4,9 @@
 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
+# TODO enable once we can have qt6 libQuotient on the CI
+#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml

.kde-ci.yml

@@ -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'
@@ -19,42 +19,15 @@ Dependencies:
     '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/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.
+project(NeoChat)
-set(RELEASE_SERVICE_VERSION_MAJOR "23")
+set(PROJECT_VERSION "22.11")
-set(RELEASE_SERVICE_VERSION_MINOR "03")
-set(RELEASE_SERVICE_VERSION_MICRO "70")
-set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
-project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
+set(KF5_MIN_VERSION "5.91.0")
-
-set(KF_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,16 @@ 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)
+find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels)
-set_package_properties(KF${QT_MAJOR_VERSION} PROPERTIES
+set_package_properties(KF5 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
 )
-set_package_properties(KF${QT_MAJOR_VERSION}Kirigami2 PROPERTIES
+set_package_properties(KF5Kirigami2 PROPERTIES
-        TYPE REQUIRED
+    TYPE REQUIRED
-        PURPOSE "Kirigami application UI framework"
+    PURPOSE "Kirigami application UI framework"
-        )
+)
-find_package(KF${QT_MAJOR_VERSION}KirigamiAddons 0.7.2 REQUIRED)
+find_package(KF5KirigamiAddons 0.6 REQUIRED)
 
 find_package(Qt${QT_MAJOR_VERSION}Keychain)
 set_package_properties(Qt${QT_MAJOR_VERSION}Keychain PROPERTIES
@@ -82,15 +74,15 @@ 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)
+    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem)
-    set_package_properties(KF${QT_MAJOR_VERSION}QQC2DesktopStyle PROPERTIES
+    set_package_properties(KF5QQC2DesktopStyle PROPERTIES
         TYPE RUNTIME
     )
     ecm_find_qmlmodule(org.kde.syntaxhighlighting 1.0)
 endif()
 
 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.6)
@@ -124,14 +116,12 @@ find_package(QCoro${QT_MAJOR_VERSION} 0.4 COMPONENTS Core REQUIRED)
 
 qcoro_enable_coroutines()
 
-find_package(KF${QT_MAJOR_VERSION}DocTools ${KF_MIN_VERSION})
+find_package(KF5DocTools ${KF5_MIN_VERSION})
-set_package_properties(KF${QT_MAJOR_VERSION}DocTools PROPERTIES DESCRIPTION
+set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
     "Tools to generate documentation"
     TYPE OPTIONAL
 )
 
-find_package(Sqlite3)
-
 if(NOT Quotient_VERSION_MINOR GREATER 6)
     cmake_policy(SET CMP0063 OLD)
 endif()
@@ -155,7 +145,7 @@ if (BUILD_TESTING AND Quotient_VERSION_MINOR GREATER 6)
     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:launchMode="singleTop">
-                  android:exported="true">
 
             <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]
     }
 

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>
@@ -179,7 +179,7 @@
     <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>
@@ -231,20 +231,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>

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

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,52 +1,52 @@
 # 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
+    emojimodel.cpp
     emojitones.cpp
-    models/customemojimodel.cpp
+    customemojimodel.cpp
     clipboard.cpp
     matriximageprovider.cpp
-    models/messageeventmodel.cpp
+    messageeventmodel.cpp
-    models/messagefiltermodel.cpp
+    messagefiltermodel.cpp
-    models/roomlistmodel.cpp
+    roomlistmodel.cpp
-    models/sortfilterspacelistmodel.cpp
+    sortfilterspacelistmodel.cpp
     spacehierarchycache.cpp
     roommanager.cpp
     neochatroom.cpp
     neochatuser.cpp
-    models/userlistmodel.cpp
+    userlistmodel.cpp
-    models/userfiltermodel.cpp
+    userfiltermodel.cpp
-    models/publicroomlistmodel.cpp
+    publicroomlistmodel.cpp
-    models/userdirectorylistmodel.cpp
+    userdirectorylistmodel.cpp
-    models/keywordnotificationrulemodel.cpp
+    keywordnotificationrulemodel.cpp
     utils.cpp
     notificationsmanager.cpp
-    models/sortfilterroomlistmodel.cpp
+    sortfilterroomlistmodel.cpp
     chatdocumenthandler.cpp
-    models/devicesmodel.cpp
+    devicesmodel.cpp
     filetypesingleton.cpp
     login.cpp
     stickerevent.cpp
-    models/webshortcutmodel.cpp
+    webshortcutmodel.cpp
     blurhash.cpp
     blurhashimageprovider.cpp
     joinrulesevent.cpp
-    models/collapsestateproxymodel.cpp
+    collapsestateproxymodel.cpp
     urlhelper.cpp
     windowcontroller.cpp
     linkpreviewer.cpp
-    models/completionmodel.cpp
+    completionmodel.cpp
-    models/completionproxymodel.cpp
+    completionproxymodel.cpp
-    models/actionsmodel.cpp
+    actionsmodel.cpp
-    models/serverlistmodel.cpp
+    serverlistmodel.cpp
-    models/statemodel.cpp
+    statemodel.cpp
     filetransferpseudojob.cpp
-    models/searchmodel.cpp
+    searchmodel.cpp
 )
 
 add_executable(neochat-app
@@ -79,7 +79,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()
@@ -87,14 +87,13 @@ 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} QCoro::Core)
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
 
 if(NEOCHAT_FLATPAK)
@@ -104,9 +103,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
@@ -163,7 +159,7 @@ if(ANDROID)
         "zoom-out"
         "image-rotate-left-symbolic"
         "image-rotate-right-symbolic"
-        "channel-secure-symbolic"
+        "channel-insecure-symbolic"
         "download"
         "smiley"
         "tools-check-spelling"
@@ -177,7 +173,7 @@ if(ANDROID)
         "visibility"
     )
 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 +181,12 @@ if(NOT ANDROID)
     set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
 endif()
 
-if(TARGET KF${QT_MAJOR_VERSION}::DBusAddons)
+if(TARGET KF5::DBusAddons)
-    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::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,11 +13,10 @@
 #include <KLocalizedString>
 #include <QStringBuilder>
 
+#include "actionsmodel.h"
 #include "controller.h"
-#include "models/actionsmodel.h"
+#include "customemojimodel.h"
-#include "models/customemojimodel.h"
 #include "neochatconfig.h"
-#include "neochatroom.h"
 #include "neochatuser.h"
 #include "roommanager.h"
 
@@ -59,9 +58,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();
@@ -70,39 +69,13 @@ void ActionsHandler::handleNewMessage()
         m_room->setChatBoxText({});
         return;
     }
-
     QString handledText = m_room->chatBoxText();
-    handledText = handleMentions(handledText);
-    handleMessage(m_room->chatBoxText(), handledText);
-}
 
-void ActionsHandler::handleEdit()
+    std::sort(m_room->mentions()->begin(), m_room->mentions()->end(), [](const auto &a, const auto &b) -> bool {
-{
-    checkEffects(m_room->editText());
-
-    QString handledText = m_room->editText();
-    handledText = handleMentions(handledText, true);
-    handleMessage(m_room->editText(), handledText, true);
-}
-
-QString ActionsHandler::handleMentions(QString handledText, const bool &isEdit)
-{
-    if (!m_room) {
-        return QString();
-    }
-
-    QVector<Mention> *mentions;
-    if (isEdit) {
-        mentions = m_room->editMentions();
-    } else {
-        mentions = m_room->mentions();
-    }
-
-    std::sort(mentions->begin(), mentions->end(), [](const auto &a, const auto &b) -> bool {
         return a.cursor.anchor() > b.cursor.anchor();
     });
 
-    for (const auto &mention : *mentions) {
+    for (const auto &mention : *m_room->mentions()) {
         if (mention.text.isEmpty() || mention.id.isEmpty()) {
             continue;
         }
@@ -110,16 +83,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();
@@ -178,13 +146,13 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, con
     if (handledText.length() == 0) {
         return;
     }
-
+    m_room->postMessage(m_room->chatBoxText(), handledText, messageType, m_room->chatBoxReplyId(), m_room->chatBoxEditId());
-    m_room->postMessage(text, handledText, messageType, m_room->chatBoxReplyId(), isEdit ? m_room->chatBoxEditId() : "");
 }
 
-void ActionsHandler::checkEffects(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

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

src/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"
@@ -115,7 +115,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(),
@@ -158,12 +158,11 @@ QVector<ActionsModel::Action> actions{
                 return QString();
             }
 #ifdef QUOTIENT_07
-            const RoomMemberEvent *roomMemberEvent = room->currentState().get<RoomMemberEvent>(text);
+            if (room->currentState().get<RoomMemberEvent>(text)->membership() == Membership::Invite) {
-            if (roomMemberEvent && roomMemberEvent->membership() == Membership::Invite) {
                 Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is already invited to this room.", "%1 is already invited to this room.", text));
                 return QString();
             }
-            if (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();
             }
@@ -209,40 +208,6 @@ QVector<ActionsModel::Action> actions{
         kli18n("<room alias or id>"),
         kli18n("Joins the given room"),
     },
-#ifdef QUOTIENT_07
-    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"),
-    },
-#endif
     Action{
         QStringLiteral("j"),
         [](const QString &text, NeoChatRoom *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

@@ -14,9 +14,9 @@
 #include <Sonnet/BackgroundChecker>
 #include <Sonnet/Settings>
 
-#include "models/actionsmodel.h"
+#include "actionsmodel.h"
-#include "models/roomlistmodel.h"
 #include "neochatroom.h"
+#include "roomlistmodel.h"
 
 class SyntaxHighlighter : public QSyntaxHighlighter
 {
@@ -105,19 +105,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));
+            m_completionModel->setText(m_room->chatBoxText().mid(start, cursorPosition() - start), m_room->chatBoxText().mid(start));
-        });
-        connect(m_room, &NeoChatRoom::editTextChanged, this, [this]() {
-            int start = completionStartIndex();
-            m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
         });
     });
     connect(this, &ChatDocumentHandler::documentChanged, this, [this]() {
@@ -128,7 +123,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));
     });
 }
 
@@ -143,7 +138,7 @@ int ChatDocumentHandler::completionStartIndex() const
 #else
     const auto cursor = cursorPosition();
 #endif
-    const auto &text = getText();
+    const auto &text = m_room->chatBoxText();
     auto start = std::min(cursor, text.size()) - 1;
     while (start > -1) {
         if (text.at(start) == QLatin1Char(' ')) {
@@ -155,20 +150,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;
@@ -223,7 +204,7 @@ void ChatDocumentHandler::complete(int index)
     if (m_completionModel->autoCompletionType() == CompletionModel::User) {
         auto name = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Text).toString();
         auto id = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
-        auto text = getText();
+        auto text = m_room->chatBoxText();
         auto at = text.lastIndexOf(QLatin1Char('@'), cursorPosition() - 1);
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
@@ -232,11 +213,11 @@ 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) {
         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);
@@ -244,7 +225,7 @@ void ChatDocumentHandler::complete(int index)
         cursor.insertText(QStringLiteral("/%1 ").arg(command));
     } else if (m_completionModel->autoCompletionType() == CompletionModel::Room) {
         auto alias = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
-        auto text = getText();
+        auto text = m_room->chatBoxText();
         auto at = text.lastIndexOf(QLatin1Char('#'), cursorPosition() - 1);
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
@@ -253,11 +234,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) {
         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);
@@ -300,27 +281,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);
-    }
-}

src/chatdocumenthandler.h

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

src/clipboard.cpp

@@ -33,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(QStringLiteral("%1/screenshots").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)))) {
-
+        QDir().mkdir(QStringLiteral("%1/screenshots").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)));
-    if (!QDir().exists(imageDir)) {
-        QDir().mkdir(imageDir);
     }
-
     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())) {
+    QDir dir;
-        return localPath;
+    if (!dir.exists(localPath)) {
-    } else {
+        dir.mkpath(localPath);
-        return {};
     }
+
+    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,85 @@
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "collapsestateproxymodel.h"
+
+#include <KLocalizedString>
+
+bool CollapseStateProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
+{
+    Q_UNUSED(source_parent);
+    return sourceModel()->data(sourceModel()->index(source_row, 0), MessageEventModel::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"
@@ -16,7 +16,7 @@ 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]() {
@@ -145,7 +145,7 @@ void CompletionModel::updateCompletion()
         m_filterModel->setFullText(m_fullText);
         m_filterModel->setFilterText(m_text);
         m_filterModel->invalidate();
-    } else if (text().startsWith(QLatin1Char(':')) && !text()[1].isUpper()
+    } else if (text().startsWith(QLatin1Char(':'))
                && (m_fullText.indexOf(QLatin1Char(':'), 1) == -1
                    || (m_fullText.indexOf(QLatin1Char(' ')) != -1 && m_fullText.indexOf(QLatin1Char(':'), 1) > m_fullText.indexOf(QLatin1Char(' '), 1)))) {
         m_filterModel->setSourceModel(m_emojiModel);

src/completionmodel.h

@@ -1,11 +1,12 @@
-// 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 <KConcatenateRowsProxyModel>
+
 #include "roomlistmodel.h"
 
 class CompletionProxyModel;
@@ -74,6 +75,6 @@ private:
 
     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"

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

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>
@@ -41,7 +37,6 @@
 #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
@@ -133,7 +128,16 @@ Controller::Controller(QObject *parent)
         if (AccountRegistry::instance().size() > oldAccountCount) {
             auto connection = AccountRegistry::instance().accounts()[AccountRegistry::instance().size() - 1];
             connect(connection, &Connection::syncDone, this, [=]() {
-                handleNotifications(connection);
+                bool changes = false;
+                for (const auto &room : connection->allRooms()) {
+                    if (m_notificationCounts[room] != room->unreadStats().notableCount) {
+                        m_notificationCounts[room] = room->unreadStats().notableCount;
+                        changes = true;
+                    }
+                }
+                if (changes) {
+                    handleNotifications();
+                }
             });
         }
         oldAccountCount = AccountRegistry::instance().size();
@@ -142,16 +146,19 @@ Controller::Controller(QObject *parent)
 }
 
 #ifdef QUOTIENT_07
-void Controller::handleNotifications(QPointer<Quotient::Connection> connection)
+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())) {
+        if (initial) {
-            initial.append(connection->user()->id());
+            initial = false;
             for (const auto &n : notifications) {
                 oldNotifications += n.toObject()["event"].toObject()["event_id"].toString();
             }
@@ -167,12 +174,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
+            if (room && !(room->id() == RoomManager::instance().currentRoom()->id() && QGuiApplication::applicationState() == Qt::ApplicationActive)) {
-                && !(RoomManager::instance().currentRoom() && 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());
 
@@ -191,7 +196,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()) {
@@ -376,11 +381,6 @@ void Controller::invokeLogin()
                     if (error == "Unrecognised access token") {
                         Q_EMIT errorOccured(i18n("Login Failed: Access Token invalid or revoked"));
                         logout(connection, false);
-                    } else if (error == "Connection closed") {
-                        Q_EMIT errorOccured(i18n("Login Failed: %1", error));
-                        // Failed due to network connection issue. This might happen when the homeserver is
-                        // temporary down, or the user trying to re-launch NeoChat in a network that cannot
-                        // connect to the homeserver. In this case, we don't want to do logout().
                     } else {
                         Q_EMIT errorOccured(i18n("Login Failed: %1", error));
                         logout(connection, true);
@@ -611,11 +611,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());
     }
@@ -644,17 +639,9 @@ NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Om
 void Controller::createRoom(const QString &name, const QString &topic)
 {
     auto createRoomJob = m_connection->createRoom(Connection::PublishRoom, "", name, topic, QStringList());
-    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,
-        [this](NeoChatRoom *room) {
-            RoomManager::instance().enterRoom(room);
-        },
-        Qt::QueuedConnection);
 }
 
 bool Controller::isOnline() const

src/controller.h

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

src/customemojimodel.h

@@ -4,8 +4,8 @@
 #pragma once
 
 #include <QAbstractListModel>
-#include <QRegularExpression>
 #include <memory>
+#include <QRegularExpression>
 
 struct CustomEmoji {
     QString name; // with :semicolons:

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"
@@ -70,12 +70,7 @@ void DevicesModel::logout(int index, const QString &password)
     auto job = Controller::instance().activeConnection()->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId);
 
     connect(job, &BaseJob::result, this, [this, job, password, index] {
-        auto onSuccess = [this, index]() {
+        if (job->error() != 0) {
-            beginRemoveRows(QModelIndex(), index, index);
-            m_devices.remove(index);
-            endRemoveRows();
-        };
-        if (job->error() != BaseJob::Success) {
             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);
+            connect(innerJob, &BaseJob::success, this, [this, index]() {
-        } else {
+                beginRemoveRows(QModelIndex(), index, index);
-            onSuccess();
+                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/emojitones.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "emojitones.h"
-#include "models/emojimodel.h"
+#include "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"

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

@@ -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
 
 #include "login.h"

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

@@ -42,39 +42,39 @@
 #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 "messageeventmodel.h"
-#include "models/customemojimodel.h"
+#include "messagefiltermodel.h"
-#include "models/devicesmodel.h"
-#include "models/emojimodel.h"
-#include "models/keywordnotificationrulemodel.h"
-#include "models/messageeventmodel.h"
-#include "models/messagefiltermodel.h"
-#include "models/publicroomlistmodel.h"
-#include "models/roomlistmodel.h"
-#include "models/searchmodel.h"
-#include "models/serverlistmodel.h"
-#include "models/sortfilterroomlistmodel.h"
-#include "models/sortfilterspacelistmodel.h"
-#include "models/userdirectorylistmodel.h"
-#include "models/userfiltermodel.h"
-#include "models/userlistmodel.h"
-#include "models/webshortcutmodel.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "neochatuser.h"
 #include "notificationsmanager.h"
+#include "searchmodel.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 "userfiltermodel.h"
+#include "userlistmodel.h"
+#include "webshortcutmodel.h"
 #include "windowcontroller.h"
 #ifdef QUOTIENT_07
 #include <keyverificationsession.h>
@@ -82,19 +82,15 @@
 #ifdef HAVE_COLORSCHEME
 #include "colorschemer.h"
 #endif
-#include "models/completionmodel.h"
+#include "completionmodel.h"
-#include "models/statemodel.h"
 #include "neochatuser.h"
+#include "statemodel.h"
 
 #ifdef HAVE_RUNNER
 #include "runner.h"
 #include <QDBusConnection>
 #endif
 
-#ifdef Q_OS_WINDOWS
-#include <Windows.h>
-#endif
-
 using namespace Quotient;
 
 class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
@@ -157,7 +153,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"));

src/messageeventmodel.cpp

@@ -67,8 +67,6 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[IsNameChangeRole] = "isNameChange";
     roles[IsAvatarChangeRole] = "isAvatarChange";
     roles[IsRedactedRole] = "isRedacted";
-    roles[GenericDisplayRole] = "genericDisplay";
-    roles[IsPendingRole] = "isPending";
     return roles;
 }
 
@@ -177,7 +175,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
             }
@@ -442,7 +439,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         case EventTypeRole:
             return DelegateType::ReadMarker;
         case TimeRole: {
-            const QDateTime eventDate = data(index(m_lastReadEventIndex.row() + 1, 0), TimeRole).toDateTime().toLocalTime();
+            const QDateTime eventDate = data(index(m_lastReadEventIndex.row() + 1, 0), TimeRole).toDateTime();
             const KFormat format;
             return format.formatRelativeDateTime(eventDate, QLocale::ShortFormat);
         }
@@ -465,14 +462,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") {
@@ -571,7 +560,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) {
@@ -910,10 +899,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return evt.isRedacted();
     }
 
-    if (role == IsPendingRole) {
-        return row < m_currentRoom->pendingEvents().size();
-    }
-
     return {};
 }
 
@@ -952,12 +937,24 @@ QVariant MessageEventModel::getLastLocalUserMessageEventId()
                 if (content.contains("m.new_content")) {
                     // The message has been edited so we have to return the id of the original message instead of the replacement
                     eventId = content["m.relates_to"].toObject()["event_id"].toString();
+                    e = eventCast<const RoomMessageEvent>(m_currentRoom->findInTimeline(eventId)->event());
+                    if (!e) {
+                        return {};
+                    }
+
+                    content = e->contentJson();
                 } else {
                     // For any message that isn't an edit return the id of the current message
                     eventId = (*it)->id();
                 }
                 targetMessage.insert("event_id", eventId);
                 targetMessage.insert("formattedBody", content["formatted_body"].toString());
+
+                // keep reply relationship
+                if (content.contains("m.relates_to")) {
+                    targetMessage.insert("m.relates_to", content["m.relates_to"].toObject());
+                }
+
                 // Need to get the message from the original eventId or body will have * on the front
                 QModelIndex idx = index(eventIDToIndex(eventId), 0);
                 targetMessage.insert("message", idx.data(Qt::UserRole + 2));
@@ -981,9 +978,6 @@ QVariant MessageEventModel::getLatestMessageFromIndex(const int baseline)
     for (auto it = timelineBottom; it != limit; ++it) {
         auto evt = it->event();
         auto e = eventCast<const RoomMessageEvent>(evt);
-        if (!e) {
-            continue;
-        }
 
         auto content = (*it)->contentJson();
 

src/messageeventmodel.h

@@ -45,7 +45,6 @@ public:
         AnnotationRole,
         UserMarkerRole,
         FormattedBodyRole,
-        GenericDisplayRole,
 
         MimeTypeRole,
         FileMimetypeIcon,
@@ -73,7 +72,6 @@ public:
         IsNameChangeRole,
         IsAvatarChangeRole,
         IsRedactedRole,
-        IsPendingRole,
         LastRole, // Keep this last
     };
     Q_ENUM(EventRoles)

src/models/collapsestateproxymodel.cpp

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

src/models/collapsestateproxymodel.h

@@ -1,40 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#pragma once
-
-#include "messageeventmodel.h"
-#include <QSortFilterProxyModel>
-
-class CollapseStateProxyModel : public QSortFilterProxyModel
-{
-    Q_OBJECT
-public:
-    enum Roles {
-        AggregateDisplayRole = MessageEventModel::LastRole + 1,
-        StateEventsRole,
-        AuthorListRole,
-    };
-    [[nodiscard]] bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
-    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
-    [[nodiscard]] QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override;
-
-    /**
-     * @brief QString aggregating the text of consecutive state events starting at row.
-     *
-     * If state events happen on different days they will be split into two aggregate
-     * events.
-     */
-    [[nodiscard]] QString aggregateEventToString(int row) const;
-    /**
-     * @brief Return a list of consecutive state events starting at row.
-     *
-     * If state events happen on different days they will be split into two aggregate
-     * events.
-     */
-    [[nodiscard]] QVariantList stateEventsList(int row) const;
-    /**
-     * @brief List of unique authors for the aggregate state events starting at row.
-     */
-    [[nodiscard]] QVariantList authorList(int row) const;
-};

src/neochataccountregistry.cpp

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: Kitsune Ral <Kitsune-Ral@users.sf.net>
-// SPDX-FileCopyrightText: Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "neochataccountregistry.h"

src/neochataccountregistry.h

@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2020 Kitsune Ral <Kitsune-Ral@users.sf.net>
-// SPDX-FileCopyrightText: Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once

src/neochatconfig.kcfg

@@ -25,6 +25,10 @@
       <label>Background transparency value</label>
       <default>0.3</default>
     </entry>
+    <entry name="ShowNotifications" type="bool">
+      <label>Show notifications</label>
+      <default>true</default>
+    </entry>
     <entry name="MergeRoomList" type="bool">
       <label>Merge Room Lists</label>
       <default>false</default>
@@ -41,6 +45,9 @@
       <label>"Show your messages on the right</label>
       <default>true</default>
     </entry>
+    <entry name="RoomListPageWidth" type="int">
+      <default>-1</default>
+    </entry>
     <entry name="RoomDrawerWidth" type="int">
       <default>-1</default>
     </entry>
@@ -105,10 +112,6 @@
       <label>Show avatar in the room drawer</label>
       <default>true</default>
     </entry>
-    <entry name="Collapsed" type="bool">
-      <label>Save the collapsed state of the room list</label>
-      <default>false</default>
-    </entry>
   </group>
   <group name="NetworkProxy">
     <entry name="ProxyType" type="Enum">

src/neochatroom.cpp

@@ -658,135 +658,6 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
         i18n("Unknown event"));
 }
 
-QString NeoChatRoom::eventToGenericString(const RoomEvent &evt) const
-{
-#ifdef QUOTIENT_07
-    return switchOnType(
-#else
-    return visit(
-#endif
-        evt,
-        [](const RoomMessageEvent &e) {
-            Q_UNUSED(e)
-            return i18n("sent a message");
-        },
-        [](const StickerEvent &e) {
-            Q_UNUSED(e)
-            return i18n("sent a sticker");
-        },
-        [](const RoomMemberEvent &e) {
-            switch (e.membership()) {
-            case MembershipType::Invite:
-                if (e.repeatsState()) {
-                    return i18n("reinvited someone to the room");
-                }
-                Q_FALLTHROUGH();
-            case MembershipType::Join: {
-                QString text{};
-                // Part 1: invites and joins
-                if (e.repeatsState()) {
-                    text = i18n("joined the room (repeated)");
-                } else if (e.changesMembership()) {
-                    text = e.membership() == MembershipType::Invite ? i18n("invited someone to the room") : i18n("joined the room");
-                }
-                if (!text.isEmpty()) {
-                    return text;
-                }
-                // Part 2: profile changes of joined members
-                if (e.isRename()) {
-                    if (e.displayName().isEmpty()) {
-                        text = i18nc("their refers to a singular user", "cleared their display name");
-                    } else {
-                        text = i18nc("their refers to a singular user", "changed their display name");
-                    }
-                }
-                if (e.isAvatarUpdate()) {
-                    if (!text.isEmpty()) {
-                        text += i18n(" and ");
-                    }
-                    if (e.avatarUrl().isEmpty()) {
-                        text += i18nc("their refers to a singular user", "cleared their avatar");
-#ifdef QUOTIENT_07
-                    } else if (!e.prevContent()->avatarUrl) {
-#else
-                    } else if (e.prevContent()->avatarUrl.isEmpty()) {
-#endif
-                        text += i18n("set an avatar");
-                    } else {
-                        text += i18nc("their refers to a singular user", "updated their avatar");
-                    }
-                }
-                if (text.isEmpty()) {
-                    text = i18nc("<user> changed nothing", "changed nothing");
-                }
-                return text;
-            }
-            case MembershipType::Leave:
-                if (e.prevContent() && e.prevContent()->membership == MembershipType::Invite) {
-                    return (e.senderId() != e.userId()) ? i18n("withdrew a user's invitation") : i18n("rejected the invitation");
-                }
-
-                if (e.prevContent() && e.prevContent()->membership == MembershipType::Ban) {
-                    return (e.senderId() != e.userId()) ? i18n("unbanned a user") : i18n("self-unbanned");
-                }
-                return (e.senderId() != e.userId()) ? i18n("put a user out of the room") : i18n("left the room");
-            case MembershipType::Ban:
-                if (e.senderId() != e.userId()) {
-                    return i18n("banned a user from the room");
-                } else {
-                    return i18n("self-banned from the room");
-                }
-            case MembershipType::Knock: {
-                return i18n("requested an invite");
-            }
-            default:;
-            }
-            return i18n("made something unknown");
-        },
-        [](const RoomCanonicalAliasEvent &e) {
-            return (e.alias().isEmpty()) ? i18n("cleared the room main alias") : i18n("set the room main alias");
-        },
-        [](const RoomNameEvent &e) {
-            return (e.name().isEmpty()) ? i18n("cleared the room name") : i18n("set the room name");
-        },
-        [](const RoomTopicEvent &e) {
-            return (e.topic().isEmpty()) ? i18n("cleared the topic") : i18n("set the topic");
-        },
-        [](const RoomAvatarEvent &) {
-            return i18n("changed the room avatar");
-        },
-        [](const EncryptionEvent &) {
-            return i18n("activated End-to-End Encryption");
-        },
-        [](const RoomCreateEvent &e) {
-            return e.isUpgrade() ? i18n("upgraded the room version") : i18n("created the room");
-        },
-        [](const RoomPowerLevelsEvent &) {
-            return i18nc("'power level' means permission level", "changed the power levels for this room");
-        },
-        [](const StateEventBase &e) {
-            if (e.matrixType() == QLatin1String("m.room.server_acl")) {
-                return i18n("changed the server access control lists for this room");
-            }
-            if (e.matrixType() == QLatin1String("im.vector.modular.widgets")) {
-                if (e.fullJson()["unsigned"]["prev_content"].toObject().isEmpty()) {
-                    return i18n("added a widget");
-                }
-                if (e.contentJson().isEmpty()) {
-                    return i18n("removed a widget");
-                }
-                return i18n("configured a widget");
-            }
-            return i18n("updated the state");
-        },
-#ifdef QUOTIENT_07
-        [](const PollStartEvent &e) {
-            return i18n("started a poll");
-        },
-#endif
-        i18n("Unknown event"));
-}
-
 void NeoChatRoom::changeAvatar(const QUrl &localFile)
 {
     const auto job = connection()->uploadFile(localFile.toLocalFile());
@@ -868,13 +739,25 @@ void NeoChatRoom::postHtmlMessage(const QString &text, const QString &html, Mess
     }
 
     if (isEdit) {
+        QJsonObject content{{"body", text}, {"msgtype", msgTypeToString(type)}, {"format", "org.matrix.custom.html"}, {"formatted_body", html}};
+        if (isReply) {
+            content["m.relates_to"] =
+                        QJsonObject {
+                                {"m.in_reply_to",
+                                 QJsonObject {
+                                         {"event_id", replyEventId}
+                                 }
+                                }
+                        };
+        }
+
         QJsonObject json{
             {"type", "m.room.message"},
             {"msgtype", msgTypeToString(type)},
             {"body", "* " + text},
             {"format", "org.matrix.custom.html"},
             {"formatted_body", html},
-            {"m.new_content", QJsonObject{{"body", text}, {"msgtype", msgTypeToString(type)}, {"format", "org.matrix.custom.html"}, {"formatted_body", html}}},
+            {"m.new_content", content},
             {"m.relates_to", QJsonObject{{"rel_type", "m.replace"}, {"event_id", relateToEventId}}}};
 
         postJson("m.room.message", json);
@@ -1075,12 +958,6 @@ void NeoChatRoom::setHistoryVisibility(const QString &historyVisibilityRule)
     // Not emitting historyVisibilityChanged() here, since that would override the change in the UI with the *current* value, which is not the *new* value.
 }
 
-int NeoChatRoom::getUserPowerLevel(const QString &userId) const
-{
-    auto powerLevelEvent = getCurrentState<RoomPowerLevelsEvent>();
-    return powerLevelEvent->powerLevelForUser(userId);
-}
-
 void NeoChatRoom::setUserPowerLevel(const QString &userID, const int &powerLevel)
 {
     if (joinedCount() <= 1) {
@@ -1632,17 +1509,6 @@ void NeoChatRoom::setChatBoxText(const QString &text)
     Q_EMIT chatBoxTextChanged();
 }
 
-QString NeoChatRoom::editText() const
-{
-    return m_editText;
-}
-
-void NeoChatRoom::setEditText(const QString &text)
-{
-    m_editText = text;
-    Q_EMIT editTextChanged();
-}
-
 QString NeoChatRoom::chatBoxReplyId() const
 {
     return m_chatBoxReplyId;
@@ -1719,11 +1585,6 @@ QVector<Mention> *NeoChatRoom::mentions()
     return &m_mentions;
 }
 
-QVector<Mention> *NeoChatRoom::editMentions()
-{
-    return &m_editMentions;
-}
-
 QString NeoChatRoom::savedText() const
 {
     return m_savedText;
@@ -1835,7 +1696,3 @@ int NeoChatRoom::maxRoomVersion() const
     }
     return maxVersion;
 }
-NeoChatUser *NeoChatRoom::directChatRemoteUser() const
-{
-    return dynamic_cast<NeoChatUser *>(connection()->directChatUsers(this)[0]);
-}

src/neochatroom.h

@@ -12,8 +12,8 @@
 
 #include <qcoro/task.h>
 
-#include "neochatuser.h"
+class PollHandler;
-#include "pollhandler.h"
+class NeoChatUser;
 
 class PushNotificationState : public QObject
 {
@@ -79,11 +79,6 @@ class NeoChatRoom : public Quotient::Room
 
     // Due to problems with QTextDocument, unlike the other properties here, chatBoxText is *not* used to store the text when switching rooms
     Q_PROPERTY(QString chatBoxText READ chatBoxText WRITE setChatBoxText NOTIFY chatBoxTextChanged)
-
-    /**
-     * @brief The text for any message currently being edited in the room.
-     */
-    Q_PROPERTY(QString editText READ editText WRITE setEditText NOTIFY editTextChanged)
     Q_PROPERTY(QString chatBoxReplyId READ chatBoxReplyId WRITE setChatBoxReplyId NOTIFY chatBoxReplyIdChanged)
     Q_PROPERTY(QString chatBoxEditId READ chatBoxEditId WRITE setChatBoxEditId NOTIFY chatBoxEditIdChanged)
     Q_PROPERTY(NeoChatUser *chatBoxReplyUser READ chatBoxReplyUser NOTIFY chatBoxReplyIdChanged)
@@ -99,7 +94,6 @@ class NeoChatRoom : public Quotient::Room
      * Only returns main integer room versions (i.e. no msc room versions).
      */
     Q_PROPERTY(int maxRoomVersion READ maxRoomVersion NOTIFY maxRoomVersionChanged)
-    Q_PROPERTY(NeoChatUser *directChatRemoteUser READ directChatRemoteUser CONSTANT)
 
 public:
     enum MessageType {
@@ -153,14 +147,6 @@ public:
     [[nodiscard]] QString historyVisibility() const;
     void setHistoryVisibility(const QString &historyVisibilityRule);
 
-    /**
-     * @brief Get the power level for the given user ID in the room.
-     *
-     * Returns the default value for a user in the room if they have no escalated
-     * privileges or if they are not a member so membership should be known before using.
-     */
-    Q_INVOKABLE [[nodiscard]] int getUserPowerLevel(const QString &userId) const;
-
     Q_INVOKABLE void setUserPowerLevel(const QString &userID, const int &powerLevel);
 
     [[nodiscard]] int powerLevel(const QString &eventName, const bool &isStateEvent = false) const;
@@ -263,7 +249,6 @@ public:
     [[nodiscard]] QString avatarMediaId() const;
 
     [[nodiscard]] QString eventToString(const Quotient::RoomEvent &evt, Qt::TextFormat format = Qt::PlainText, bool removeReply = true) const;
-    [[nodiscard]] QString eventToGenericString(const Quotient::RoomEvent &evt) const;
 
     Q_INVOKABLE [[nodiscard]] bool containsUser(const QString &userID) const;
     Q_INVOKABLE [[nodiscard]] bool isUserBanned(const QString &user) const;
@@ -285,9 +270,6 @@ public:
     QString chatBoxText() const;
     void setChatBoxText(const QString &text);
 
-    QString editText() const;
-    void setEditText(const QString &text);
-
     QString chatBoxReplyId() const;
     void setChatBoxReplyId(const QString &replyId);
 
@@ -305,11 +287,6 @@ public:
 
     QVector<Mention> *mentions();
 
-    /**
-     * @brief Vector of mentions in the current edit text.
-     */
-    QVector<Mention> *editMentions();
-
     QString savedText() const;
     void setSavedText(const QString &savedText);
 
@@ -339,7 +316,6 @@ public:
 #endif
 
     int maxRoomVersion() const;
-    NeoChatUser *directChatRemoteUser() const;
 
 private:
     QSet<const Quotient::RoomEvent *> highlights;
@@ -360,12 +336,10 @@ private:
     QCoro::Task<void> doUploadFile(QUrl url, QString body = QString());
 
     QString m_chatBoxText;
-    QString m_editText;
     QString m_chatBoxReplyId;
     QString m_chatBoxEditId;
     QString m_chatBoxAttachmentPath;
     QVector<Mention> m_mentions;
-    QVector<Mention> m_editMentions;
     QString m_savedText;
 #ifdef QUOTIENT_07
     QCache<QString, PollHandler> m_polls;
@@ -388,7 +362,6 @@ Q_SIGNALS:
     void pushNotificationStateChanged(PushNotificationState::State state);
     void showMessage(MessageType messageType, const QString &message);
     void chatBoxTextChanged();
-    void editTextChanged();
     void chatBoxReplyIdChanged();
     void chatBoxEditIdChanged();
     void chatBoxAttachmentPathChanged();

src/notificationsmanager.cpp

@@ -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
 
 #include "notificationsmanager.h"
@@ -11,12 +11,6 @@
 #include <KNotification>
 #include <KNotificationReplyAction>
 
-#ifdef QUOTIENT_07
-#include <accountregistry.h>
-#else
-#include "neochataccountregistry.h"
-#endif
-
 #include <connection.h>
 #include <csapi/pushrules.h>
 #include <jobs/basejob.h>
@@ -55,6 +49,10 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
                                             const QString &replyEventId,
                                             bool canReply)
 {
+    if (!NeoChatConfig::self()->showNotifications()) {
+        return;
+    }
+
     QPixmap img;
     img.convertFromImage(icon);
     KNotification *notification = new KNotification("message");
@@ -70,15 +68,8 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
 
     notification->setDefaultAction(i18n("Open NeoChat in this room"));
     connect(notification, &KNotification::defaultActivated, this, [=]() {
-        WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
-        if (room->localUser()->id() != Controller::instance().activeConnection()->userId()) {
-#ifdef QUOTIENT_07
-            Controller::instance().setActiveConnection(Accounts.get(room->localUser()->id()));
-#else
-            Controller::instance().setActiveConnection(AccountRegistry::instance().get(room->localUser()->id()));
-#endif
-        }
         RoomManager::instance().enterRoom(room);
+        WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
     });
 
     if (canReply) {
@@ -99,6 +90,9 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
 
 void NotificationsManager::postInviteNotification(NeoChatRoom *room, const QString &title, const QString &sender, const QImage &icon)
 {
+    if (!NeoChatConfig::self()->showNotifications()) {
+        return;
+    }
     QPixmap img;
     img.convertFromImage(icon);
     KNotification *notification = new KNotification("invite");
@@ -108,9 +102,9 @@ void NotificationsManager::postInviteNotification(NeoChatRoom *room, const QStri
     notification->setFlags(KNotification::Persistent);
     notification->setDefaultAction(i18n("Open this invitation in NeoChat"));
     connect(notification, &KNotification::defaultActivated, this, [=]() {
-        WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
         notification->close();
         RoomManager::instance().enterRoom(room);
+        WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
     });
     notification->setActions({i18n("Accept Invitation"), i18n("Reject Invitation")});
     connect(notification, &KNotification::action1Activated, this, [room, notification]() {
@@ -268,10 +262,6 @@ void NotificationsManager::updateNotificationRules(const QString &type)
         return;
     }
 
-    if (!Controller::instance().activeConnection()) {
-        return;
-    }
-
     const QJsonObject accountData = Controller::instance().activeConnection()->accountDataJson("m.push_rules");
 
     // Update override rules
@@ -281,9 +271,7 @@ void NotificationsManager::updateNotificationRules(const QString &type)
         if (overrideRule["rule_id"] == ".m.rule.master") {
             bool ruleEnabled = overrideRule["enabled"].toBool();
             m_globalNotificationsEnabled = !ruleEnabled;
-            if (!m_globalNotificationsSet) {
+            NeoChatConfig::self()->setShowNotifications(m_globalNotificationsEnabled);
-                m_globalNotificationsSet = true;
-            }
             Q_EMIT globalNotificationsEnabledChanged(m_globalNotificationsEnabled);
         }
 

src/notificationsmanager.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
@@ -33,7 +33,6 @@ class NotificationsManager : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool globalNotificationsEnabled MEMBER m_globalNotificationsEnabled WRITE setGlobalNotificationsEnabled NOTIFY globalNotificationsEnabledChanged)
-    Q_PROPERTY(bool globalNotificationsSet MEMBER m_globalNotificationsSet NOTIFY globalNotificationsSetChanged)
     Q_PROPERTY(PushNotificationAction::Action oneToOneNotificationAction MEMBER m_oneToOneNotificationAction WRITE setOneToOneNotificationAction NOTIFY
                    oneToOneNotificationActionChanged)
     Q_PROPERTY(PushNotificationAction::Action encryptedOneToOneNotificationAction MEMBER m_encryptedOneToOneNotificationAction WRITE
@@ -74,8 +73,7 @@ private:
     QMultiMap<QString, KNotification *> m_notifications;
     QHash<QString, QPointer<KNotification>> m_invitations;
 
-    bool m_globalNotificationsEnabled = false;
+    bool m_globalNotificationsEnabled;
-    bool m_globalNotificationsSet = false;
     PushNotificationAction::Action m_oneToOneNotificationAction = PushNotificationAction::Unknown;
     PushNotificationAction::Action m_encryptedOneToOneNotificationAction = PushNotificationAction::Unknown;
     PushNotificationAction::Action m_groupChatNotificationAction = PushNotificationAction::Unknown;
@@ -109,7 +107,6 @@ private Q_SLOTS:
 
 Q_SIGNALS:
     void globalNotificationsEnabledChanged(bool newState);
-    void globalNotificationsSetChanged(bool newState);
     void oneToOneNotificationActionChanged(PushNotificationAction::Action action);
     void encryptedOneToOneNotificationActionChanged(PushNotificationAction::Action action);
     void groupChatNotificationActionChanged(PushNotificationAction::Action action);

src/plasma-runner-neochat.desktop

@@ -60,7 +60,7 @@ Comment[nl]=Rooms zoeken in NeoChat
 Comment[pl]=Znajdź pokoje w NeoChat
 Comment[pt]=Procurar salas no NeoChat
 Comment[pt_BR]=Encontrar salas no NeoChat
-Comment[ru]=Поиск комнат NeoChat
+Comment[ru]=Поиск комнаты NeoChat
 Comment[sl]=Najdi sobe v NeoChatu
 Comment[sv]=Sök efter rum i NeoChat
 Comment[ta]=நியோச்சாட்டில் அரங்குகளை கண்டுபிடிக்கும்