Reenable disabled CI builds

GIT_SILENT Sync po/docbooks with svn
Allow building against KF6
2023-03-10 12:49:44 +01:00 · 2023-03-10 02:03:01 +00:00 · 2023-03-09 15:50:43 +01:00 · 2023-03-09 01:56:25 +00:00 · 2023-03-08 09:33:34 -05:00 · 2023-03-08 14:30:48 +00:00
161 changed files with 27724 additions and 14688 deletions
--- a/.flatpak-manifest.json
+++ b/.flatpak-manifest.json
@@ -2,7 +2,7 @@
    "id": "org.kde.neochat",
    "branch": "master",
    "runtime": "org.kde.Platform",
-    "runtime-version": "5.15-21.08",
+    "runtime-version": "5.15-22.08",
    "sdk": "org.kde.Sdk",
    "command": "neochat",
    "tags": [
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,9 +4,11 @@
 include:
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
-# TODO enable once we can have qt6 libQuotient on the CI
-#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -1,8 +1,8 @@
-# SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
+# SPDX-FileCopyrightText: 2021 Tobias Fella <tobias.fella@kde.org>
 # SPDX-License-Identifier: BSD-2-Clause

 Dependencies:
- 'on': ['@all']
+- 'on': ['Linux/Qt5', 'Android/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5']
  'require':
    'frameworks/extra-cmake-modules': '@stable'
    'frameworks/kcoreaddons': '@stable'
@@ -19,15 +19,42 @@ Dependencies:
    'third-party/qtkeychain': '@latest'
    'third-party/cmark': '@latest'
    'third-party/qcoro': '@latest'
- 'on': ['Windows', 'Linux', 'FreeBSD']
+- 'on': ['Windows/Qt5', 'Linux/Qt5', 'FreeBSD/Qt5']
  'require':
    'frameworks/qqc2-desktop-style': '@stable'
    'frameworks/kio': '@stable'
    'frameworks/kwindowsystem': '@stable'
    'frameworks/kconfigwidgets': '@stable'
- 'on': ['Linux', 'FreeBSD']
+- 'on': ['Linux/Qt5', 'FreeBSD/Qt5']
  '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', 'FreeBSD', 'Windows' ]
+  require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD', 'Windows' ]
--- a/.reuse/dep5
+++ b/.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 <fella@posteo.de>
+Copyright: 2020 Tobias Fella <tobias.fella@kde.org>
 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 <fella@posteo.de>
+Copyright: 2020-2021 Carl Schwan <carlschwan@kde.org>, Tobias Fella <tobias.fella@kde.org>
 License: BSD-2-Clause

 Files: src/neochat.notifyrc
-Copyright: 2020 Tobias Fella <fella@posteo.de>
+Copyright: 2020 Tobias Fella <tobias.fella@kde.org>
 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 <fella@posteo.de>
+Copyright: 2020-2022 Tobias Fella <tobias.fella@kde.org>
 License: BSD-2-Clause
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,21 +1,26 @@
 # 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 <fella@posteo.de>
+# SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
 # SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
 # SPDX-License-Identifier: BSD-2-Clause

 cmake_minimum_required(VERSION 3.16)

-set(PROJECT_VERSION "23.01")
-project(NeoChat VERSION ${PROJECT_VERSION})
+# KDE Applications version, managed by release script.
+set(RELEASE_SERVICE_VERSION_MAJOR "23")
+set(RELEASE_SERVICE_VERSION_MINOR "03")
+set(RELEASE_SERVICE_VERSION_MICRO "70")
+set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")

-set(KF5_MIN_VERSION "5.91.0")
+project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
+
+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 ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
+find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)

 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)

@@ -52,16 +57,16 @@ set_package_properties(Qt${QT_MAJOR_VERSION} PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
 )
-find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels)
-set_package_properties(KF5 PROPERTIES
+find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels)
+set_package_properties(KF${QT_MAJOR_VERSION} PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
 )
-set_package_properties(KF5Kirigami2 PROPERTIES
-    TYPE REQUIRED
-    PURPOSE "Kirigami application UI framework"
-)
-find_package(KF5KirigamiAddons 0.6 REQUIRED)
+set_package_properties(KF${QT_MAJOR_VERSION}Kirigami2 PROPERTIES
+        TYPE REQUIRED
+        PURPOSE "Kirigami application UI framework"
+        )
+find_package(KF${QT_MAJOR_VERSION}KirigamiAddons 0.7.2 REQUIRED)

 find_package(Qt${QT_MAJOR_VERSION}Keychain)
 set_package_properties(Qt${QT_MAJOR_VERSION}Keychain PROPERTIES
@@ -77,15 +82,15 @@ if(ANDROID)
    )
 else()
    find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem)
-    set_package_properties(KF5QQC2DesktopStyle PROPERTIES
+    find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem)
+    set_package_properties(KF${QT_MAJOR_VERSION}QQC2DesktopStyle PROPERTIES
        TYPE RUNTIME
    )
    ecm_find_qmlmodule(org.kde.syntaxhighlighting 1.0)
 endif()

 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
-    find_package(KF5DBusAddons ${KF5_MIN_VERSION} REQUIRED)
+    find_package(KF${QT_MAJOR_VERSION}DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()

 find_package(Quotient 0.6)
@@ -119,8 +124,8 @@ find_package(QCoro${QT_MAJOR_VERSION} 0.4 COMPONENTS Core REQUIRED)

 qcoro_enable_coroutines()

-find_package(KF5DocTools ${KF5_MIN_VERSION})
-set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
+find_package(KF${QT_MAJOR_VERSION}DocTools ${KF_MIN_VERSION})
+set_package_properties(KF${QT_MAJOR_VERSION}DocTools PROPERTIES DESCRIPTION
    "Tools to generate documentation"
    TYPE OPTIONAL
 )
@@ -150,7 +155,7 @@ if (BUILD_TESTING AND Quotient_VERSION_MINOR GREATER 6)
    add_subdirectory(autotests)
 endif()

-if(KF5DocTools_FOUND)
+if(KF${QT_MAJOR_VERSION}DocTools_FOUND)
    kdoctools_install(po)
    add_subdirectory(doc)
 endif()
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <!--
    SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carlschwan@kde.org>
-    SPDX-FileCopyrightText: 2020-2021 Tobias Fella <fella@posteo.de>
+    SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
    SPDX-License-Identifier: CC0-1.0
 -->
 # NeoChat
--- a/org.kde.neochat.appdata.xml
+++ b/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 <fella@posteo.de>
+  - SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
 -->
 <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>
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+# SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
 [Desktop Entry]
 Version=1.5
 Name=NeoChat
--- a/po/ar/neochat.po
+++ b/po/ar/neochat.po
--- a/po/az/neochat.po
+++ b/po/az/neochat.po
--- a/po/ca/neochat.po
+++ b/po/ca/neochat.po
--- a/po/ca@valencia/neochat.po
+++ b/po/ca@valencia/neochat.po
--- a/po/cs/neochat.po
+++ b/po/cs/neochat.po
--- a/po/da/neochat.po
+++ b/po/da/neochat.po
--- a/po/de/neochat.po
+++ b/po/de/neochat.po
--- a/po/el/neochat.po
+++ b/po/el/neochat.po
--- a/po/en_GB/neochat.po
+++ b/po/en_GB/neochat.po
--- a/po/es/neochat.po
+++ b/po/es/neochat.po
--- a/po/eu/neochat.po
+++ b/po/eu/neochat.po
--- a/po/fi/neochat.po
+++ b/po/fi/neochat.po
--- a/po/fr/neochat.po
+++ b/po/fr/neochat.po
--- a/po/hu/neochat.po
+++ b/po/hu/neochat.po
--- a/po/ia/neochat.po
+++ b/po/ia/neochat.po
--- a/po/id/neochat.po
+++ b/po/id/neochat.po
--- a/po/ie/neochat.po
+++ b/po/ie/neochat.po
--- a/po/it/neochat.po
+++ b/po/it/neochat.po
--- a/po/ja/neochat.po
+++ b/po/ja/neochat.po
--- a/po/ka/neochat.po
+++ b/po/ka/neochat.po
--- a/po/ko/neochat.po
+++ b/po/ko/neochat.po
--- a/po/lt/neochat.po
+++ b/po/lt/neochat.po
--- a/po/nl/neochat.po
+++ b/po/nl/neochat.po
--- a/po/nn/neochat.po
+++ b/po/nn/neochat.po
--- a/po/pa/neochat.po
+++ b/po/pa/neochat.po
--- a/po/pl/neochat.po
+++ b/po/pl/neochat.po
--- a/po/pt/neochat.po
+++ b/po/pt/neochat.po
--- a/po/pt_BR/neochat.po
+++ b/po/pt_BR/neochat.po
--- a/po/ru/neochat.po
+++ b/po/ru/neochat.po
--- a/po/sk/neochat.po
+++ b/po/sk/neochat.po
--- a/po/sl/neochat.po
+++ b/po/sl/neochat.po
--- a/po/sv/neochat.po
+++ b/po/sv/neochat.po
--- a/po/ta/neochat.po
+++ b/po/ta/neochat.po
--- a/po/tok/neochat.po
+++ b/po/tok/neochat.po
--- a/po/tr/docs/neochat/CMakeLists.txt
+++ b/po/tr/docs/neochat/CMakeLists.txt
@@ -0,0 +1,5 @@
+# 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})
--- a/po/tr/docs/neochat/man-neochat.1.docbook
+++ b/po/tr/docs/neochat/man-neochat.1.docbook
@@ -0,0 +1,122 @@
+<?xml version="1.0" ?>
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
+<!ENTITY % 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>
--- a/po/tr/neochat.po
+++ b/po/tr/neochat.po
--- a/po/uk/neochat.po
+++ b/po/uk/neochat.po
--- a/po/zh_CN/neochat.po
+++ b/po/zh_CN/neochat.po
--- a/po/zh_TW/neochat.po
+++ b/po/zh_TW/neochat.po
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 # 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 <fella@posteo.de>
+# SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
 # SPDX-License-Identifier: BSD-2-Clause

 add_library(neochat STATIC
@@ -79,7 +79,7 @@ if(NOT ANDROID)
    else()
        target_sources(neochat PRIVATE trayicon.cpp)
    endif()
-    target_link_libraries(neochat PUBLIC KF5::ConfigWidgets KF5::WindowSystem)
+    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::ConfigWidgets KF${QT_MAJOR_VERSION}::WindowSystem)
    target_compile_definitions(neochat PUBLIC -DHAVE_COLORSCHEME)
    target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM)
 endif()
@@ -87,13 +87,14 @@ 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 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons KF5::SonnetCore  KF5::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 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)
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)

 if(NEOCHAT_FLATPAK)
@@ -176,7 +177,7 @@ if(ANDROID)
        "visibility"
    )
 else()
-    target_link_libraries(neochat PUBLIC Qt::Widgets KF5::KIOWidgets)
+    target_link_libraries(neochat PUBLIC Qt::Widgets KF${QT_MAJOR_VERSION}::KIOWidgets)
    install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
 endif()

@@ -184,12 +185,12 @@ if(NOT ANDROID)
    set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
 endif()

-if(TARGET KF5::DBusAddons)
-    target_link_libraries(neochat PUBLIC KF5::DBusAddons)
+if(TARGET KF${QT_MAJOR_VERSION}::DBusAddons)
+    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::DBusAddons)
    target_compile_definitions(neochat PUBLIC -DHAVE_KDBUSADDONS)
 endif()

-if (TARGET KF5::KIOWidgets)
+if (TARGET KF${QT_MAJOR_VERSION}::KIOWidgets)
    target_compile_definitions(neochat PUBLIC -DHAVE_KIO)
 endif()

--- a/src/actionshandler.cpp
+++ b/src/actionshandler.cpp
@@ -17,6 +17,7 @@
 #include "models/actionsmodel.h"
 #include "models/customemojimodel.h"
 #include "neochatconfig.h"
+#include "neochatroom.h"
 #include "neochatuser.h"
 #include "roommanager.h"

@@ -58,9 +59,9 @@ void ActionsHandler::setRoom(NeoChatRoom *room)
    Q_EMIT roomChanged();
 }

-void ActionsHandler::handleMessage()
+void ActionsHandler::handleNewMessage()
 {
-    checkEffects();
+    checkEffects(m_room->chatBoxText());
    if (!m_room->chatBoxAttachmentPath().isEmpty()) {
        QUrl url(m_room->chatBoxAttachmentPath());
        auto path = url.isLocalFile() ? url.toLocalFile() : url.toString();
@@ -69,13 +70,39 @@ void ActionsHandler::handleMessage()
        m_room->setChatBoxText({});
        return;
    }
-    QString handledText = m_room->chatBoxText();

-    std::sort(m_room->mentions()->begin(), m_room->mentions()->end(), [](const auto &a, const auto &b) -> bool {
+    QString handledText = m_room->chatBoxText();
+    handledText = handleMentions(handledText);
+    handleMessage(m_room->chatBoxText(), handledText);
+}
+
+void ActionsHandler::handleEdit()
+{
+    checkEffects(m_room->editText());
+
+    QString handledText = m_room->editText();
+    handledText = handleMentions(handledText, true);
+    handleMessage(m_room->editText(), handledText, true);
+}
+
+QString ActionsHandler::handleMentions(QString handledText, const bool &isEdit)
+{
+    if (!m_room) {
+        return QString();
+    }
+
+    QVector<Mention> *mentions;
+    if (isEdit) {
+        mentions = m_room->editMentions();
+    } else {
+        mentions = m_room->mentions();
+    }
+
+    std::sort(mentions->begin(), mentions->end(), [](const auto &a, const auto &b) -> bool {
        return a.cursor.anchor() > b.cursor.anchor();
    });

-    for (const auto &mention : *m_room->mentions()) {
+    for (const auto &mention : *mentions) {
        if (mention.text.isEmpty() || mention.id.isEmpty()) {
            continue;
        }
@@ -83,11 +110,16 @@ void ActionsHandler::handleMessage()
                                          mention.cursor.position() - mention.cursor.anchor(),
                                          QStringLiteral("[%1](https://matrix.to/#/%2)").arg(mention.text, mention.id));
    }
-    m_room->mentions()->clear();
+    mentions->clear();

+    return handledText;
+}
+
+void ActionsHandler::handleMessage(const QString &text, QString handledText, const bool &isEdit)
+{
    if (NeoChatConfig::allowQuickEdit()) {
        QRegularExpression sed("^s/([^/]*)/([^/]*)(/g)?$");
-        auto match = sed.match(m_room->chatBoxText());
+        auto match = sed.match(text);
        if (match.hasMatch()) {
            const QString regex = match.captured(1);
            const QString replacement = match.captured(2).toHtmlEscaped();
@@ -146,13 +178,13 @@ void ActionsHandler::handleMessage()
    if (handledText.length() == 0) {
        return;
    }
-    m_room->postMessage(m_room->chatBoxText(), handledText, messageType, m_room->chatBoxReplyId(), m_room->chatBoxEditId());
+
+    m_room->postMessage(text, handledText, messageType, m_room->chatBoxReplyId(), isEdit ? m_room->chatBoxEditId() : "");
 }

-void ActionsHandler::checkEffects()
+void ActionsHandler::checkEffects(const QString &text)
 {
    std::optional<QString> effect = std::nullopt;
-    const auto &text = m_room->chatBoxText();
    if (text.contains("\u2744")) {
        effect = QLatin1String("snowflake");
    } else if (text.contains("\u1F386")) {
--- a/src/actionshandler.h
+++ b/src/actionshandler.h
@@ -33,14 +33,22 @@ Q_SIGNALS:

 public Q_SLOTS:

-    /// \brief Post a message.
-    ///
-    /// This also interprets commands if any.
-    void handleMessage();
+    /**
+     * @brief Pre-process text and send message.
+     */
+    void handleNewMessage();
+
+    /**
+     * @brief Pre-process text and send edit.
+     */
+    void handleEdit();

 private:
    NeoChatRoom *m_room = nullptr;
-    void checkEffects();
+    void checkEffects(const QString &text);
+
+    QString handleMentions(QString handledText, const bool &isEdit = false);
+    void handleMessage(const QString &text, QString handledText, const bool &isEdit = false);
 };

 QString markdownToHTML(const QString &markdown);
--- a/src/blurhashimageprovider.cpp
+++ b/src/blurhashimageprovider.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2021 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: LGPL-2.0-or-later

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

 #pragma once
--- a/src/chatdocumenthandler.cpp
+++ b/src/chatdocumenthandler.cpp
@@ -108,11 +108,16 @@ ChatDocumentHandler::ChatDocumentHandler(QObject *parent)
        static QPointer<NeoChatRoom> previousRoom = nullptr;
        if (previousRoom) {
            disconnect(previousRoom, &NeoChatRoom::chatBoxTextChanged, this, nullptr);
+            disconnect(previousRoom, &NeoChatRoom::editTextChanged, this, nullptr);
        }
        previousRoom = m_room;
        connect(m_room, &NeoChatRoom::chatBoxTextChanged, this, [this]() {
            int start = completionStartIndex();
-            m_completionModel->setText(m_room->chatBoxText().mid(start, cursorPosition() - start), m_room->chatBoxText().mid(start));
+            m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
+        });
+        connect(m_room, &NeoChatRoom::editTextChanged, this, [this]() {
+            int start = completionStartIndex();
+            m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
        });
    });
    connect(this, &ChatDocumentHandler::documentChanged, this, [this]() {
@@ -123,7 +128,7 @@ ChatDocumentHandler::ChatDocumentHandler(QObject *parent)
            return;
        }
        int start = completionStartIndex();
-        m_completionModel->setText(m_room->chatBoxText().mid(start, cursorPosition() - start), m_room->chatBoxText().mid(start));
+        m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
    });
 }

@@ -138,7 +143,7 @@ int ChatDocumentHandler::completionStartIndex() const
 #else
    const auto cursor = cursorPosition();
 #endif
-    const auto &text = m_room->chatBoxText();
+    const auto &text = getText();
    auto start = std::min(cursor, text.size()) - 1;
    while (start > -1) {
        if (text.at(start) == QLatin1Char(' ')) {
@@ -150,6 +155,20 @@ int ChatDocumentHandler::completionStartIndex() const
    return start;
 }

+bool ChatDocumentHandler::isEdit() const
+{
+    return m_isEdit;
+}
+
+void ChatDocumentHandler::setIsEdit(bool edit)
+{
+    if (edit == m_isEdit) {
+        return;
+    }
+    m_isEdit = edit;
+    Q_EMIT isEditChanged();
+}
+
 QQuickTextDocument *ChatDocumentHandler::document() const
 {
    return m_document;
@@ -204,7 +223,7 @@ void ChatDocumentHandler::complete(int index)
    if (m_completionModel->autoCompletionType() == CompletionModel::User) {
        auto name = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Text).toString();
        auto id = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
-        auto text = m_room->chatBoxText();
+        auto text = getText();
        auto at = text.lastIndexOf(QLatin1Char('@'), cursorPosition() - 1);
        QTextCursor cursor(document()->textDocument());
        cursor.setPosition(at);
@@ -213,11 +232,11 @@ void ChatDocumentHandler::complete(int index)
        cursor.setPosition(at);
        cursor.setPosition(cursor.position() + name.size(), QTextCursor::KeepAnchor);
        cursor.setKeepPositionOnInsert(true);
-        m_room->mentions()->push_back({cursor, name, 0, 0, id});
+        pushMention({cursor, name, 0, 0, id});
        m_highlighter->rehighlight();
    } else if (m_completionModel->autoCompletionType() == CompletionModel::Command) {
        auto command = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
-        auto text = m_room->chatBoxText();
+        auto text = getText();
        auto at = text.lastIndexOf(QLatin1Char('/'));
        QTextCursor cursor(document()->textDocument());
        cursor.setPosition(at);
@@ -225,7 +244,7 @@ void ChatDocumentHandler::complete(int index)
        cursor.insertText(QStringLiteral("/%1 ").arg(command));
    } else if (m_completionModel->autoCompletionType() == CompletionModel::Room) {
        auto alias = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
-        auto text = m_room->chatBoxText();
+        auto text = getText();
        auto at = text.lastIndexOf(QLatin1Char('#'), cursorPosition() - 1);
        QTextCursor cursor(document()->textDocument());
        cursor.setPosition(at);
@@ -234,11 +253,11 @@ void ChatDocumentHandler::complete(int index)
        cursor.setPosition(at);
        cursor.setPosition(cursor.position() + alias.size(), QTextCursor::KeepAnchor);
        cursor.setKeepPositionOnInsert(true);
-        m_room->mentions()->push_back({cursor, alias, 0, 0, alias});
+        pushMention({cursor, alias, 0, 0, alias});
        m_highlighter->rehighlight();
    } else if (m_completionModel->autoCompletionType() == CompletionModel::Emoji) {
        auto shortcode = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
-        auto text = m_room->chatBoxText();
+        auto text = getText();
        auto at = text.lastIndexOf(QLatin1Char(':'));
        QTextCursor cursor(document()->textDocument());
        cursor.setPosition(at);
@@ -281,3 +300,27 @@ void ChatDocumentHandler::setSelectionEnd(int position)
    m_selectionEnd = position;
    Q_EMIT selectionEndChanged();
 }
+
+QString ChatDocumentHandler::getText() const
+{
+    if (!m_room) {
+        return QString();
+    }
+    if (m_isEdit) {
+        return m_room->editText();
+    } else {
+        return m_room->chatBoxText();
+    }
+}
+
+void ChatDocumentHandler::pushMention(const Mention mention) const
+{
+    if (!m_room) {
+        return;
+    }
+    if (m_isEdit) {
+        m_room->editMentions()->push_back(mention);
+    } else {
+        m_room->mentions()->push_back(mention);
+    }
+}
--- a/src/chatdocumenthandler.h
+++ b/src/chatdocumenthandler.h
@@ -9,6 +9,7 @@

 #include "models/completionmodel.h"
 #include "models/userlistmodel.h"
+#include "neochatroom.h"

 class QTextDocument;
 class NeoChatRoom;
@@ -17,6 +18,14 @@ class SyntaxHighlighter;
 class ChatDocumentHandler : public QObject
 {
    Q_OBJECT
+
+    /**
+     * @brief Is the instance being used to handle an edit message.
+     *
+     * This is needed to ensure that the text and mentions are saved and retrieved
+     * from the correct parameters in the assigned room.
+     */
+    Q_PROPERTY(bool isEdit READ isEdit WRITE setIsEdit NOTIFY isEditChanged)
    Q_PROPERTY(QQuickTextDocument *document READ document WRITE setDocument NOTIFY documentChanged)
    Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged)
    Q_PROPERTY(int selectionStart READ selectionStart WRITE setSelectionStart NOTIFY selectionStartChanged)
@@ -24,11 +33,14 @@ class ChatDocumentHandler : public QObject

    Q_PROPERTY(CompletionModel *completionModel READ completionModel NOTIFY completionModelChanged)

-    Q_PROPERTY(NeoChatRoom *room READ room NOTIFY roomChanged)
+    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)

 public:
    explicit ChatDocumentHandler(QObject *parent = nullptr);

+    [[nodiscard]] bool isEdit() const;
+    void setIsEdit(bool edit);
+
    [[nodiscard]] QQuickTextDocument *document() const;
    void setDocument(QQuickTextDocument *document);

@@ -49,6 +61,7 @@ public:
    void updateCompletions();
    CompletionModel *completionModel() const;
 Q_SIGNALS:
+    void isEditChanged();
    void documentChanged();
    void cursorPositionChanged();
    void roomChanged();
@@ -59,6 +72,8 @@ Q_SIGNALS:
 private:
    int completionStartIndex() const;

+    bool m_isEdit;
+
    QQuickTextDocument *m_document;

    NeoChatRoom *m_room = nullptr;
@@ -68,6 +83,9 @@ private:
    int m_selectionStart;
    int m_selectionEnd;

+    QString getText() const;
+    void pushMention(const Mention mention) const;
+
    SyntaxHighlighter *m_highlighter = nullptr;

    CompletionModel::AutoCompletionType m_completionType = CompletionModel::None;
--- a/src/clipboard.cpp
+++ b/src/clipboard.cpp
@@ -61,9 +61,21 @@ QString Clipboard::saveImage(QString localPath) const

 void Clipboard::saveText(QString message)
 {
-    QRegularExpression re("<[^>]*>");
+    static QRegularExpression re(QStringLiteral("<[^>]*>"));
    auto *mineData = new QMimeData; // ownership is transferred to clipboard
    mineData->setHtml(message);
-    mineData->setText(message.replace(re, ""));
+    mineData->setText(message.replace(re, QString()));
    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);
+        }
+    }
+}
--- a/src/clipboard.h
+++ b/src/clipboard.h
@@ -26,6 +26,7 @@ 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;
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -1,10 +1,14 @@
 // SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
 // 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>
@@ -37,6 +41,7 @@
 #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
@@ -165,7 +170,9 @@ void Controller::handleNotifications(QPointer<Quotient::Connection> connection)
            auto room = connection->room(notification["room_id"].toString());

            // If room exists, room is NOT active OR the application is NOT active, show notification
-            if (room && !(room->id() == RoomManager::instance().currentRoom()->id() && QGuiApplication::applicationState() == Qt::ApplicationActive)) {
+            if (room
+                && !(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());

@@ -604,6 +611,11 @@ 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());
    }
@@ -632,9 +644,17 @@ 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());
-    Quotient::CreateRoomJob::connect(createRoomJob, &CreateRoomJob::failure, [this, createRoomJob] {
+    connect(createRoomJob, &CreateRoomJob::failure, this, [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
--- a/src/controller.h
+++ b/src/controller.h
@@ -151,6 +151,7 @@ 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);
--- a/src/filetransferpseudojob.cpp
+++ b/src/filetransferpseudojob.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include "filetransferpseudojob.h"
--- a/src/filetransferpseudojob.h
+++ b/src/filetransferpseudojob.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later

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

 #include "login.h"
--- a/src/login.h
+++ b/src/login.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later

 #pragma once
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -91,6 +91,10 @@
 #include <QDBusConnection>
 #endif

+#ifdef Q_OS_WINDOWS
+#include <Windows.h>
+#endif
+
 using namespace Quotient;

 class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
@@ -153,7 +157,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("fella@posteo.de"), QStringLiteral("https://tobiasfella.de"));
+    about.addAuthor(i18n("Tobias Fella"), i18n("Maintainer"), QStringLiteral("tobias.fella@kde.org"), 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"));
--- a/src/models/actionsmodel.cpp
+++ b/src/models/actionsmodel.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // 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("/rainbow %1").arg(text),
+            room->postMessage(QStringLiteral("/spoiler %1").arg(text),
                              QStringLiteral("<span data-mx-spoiler>%1</span>").arg(text),
                              RoomMessageEvent::MsgType::Text,
                              room->chatBoxReplyId(),
@@ -209,6 +209,40 @@ 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) {
--- a/src/models/actionsmodel.h
+++ b/src/models/actionsmodel.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #pragma once
--- a/src/models/collapsestateproxymodel.cpp
+++ b/src/models/collapsestateproxymodel.cpp
@@ -1,7 +1,8 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// 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>

@@ -12,18 +13,17 @@ bool CollapseStateProxyModel::filterAcceptsRow(int source_row, const QModelIndex
        != 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
+        || 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);
 }
@@ -32,27 +32,29 @@ 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), Qt::DisplayRole).toString();
-        if (sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::EventTypeRole)
+        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
-            || (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;
        }
    }
+    parts.sort(); // Sort them so that all identical events can be collected.
    if (!parts.isEmpty()) {
        QStringList chunks;
        while (!parts.isEmpty()) {
@@ -64,18 +66,27 @@ QString CollapseStateProxyModel::aggregateEventToString(int sourceRow) const
                parts.removeFirst();
                count++;
            }
-            if (count > 1) {
-                chunks.last() += i18ncp("[user did something] n times", " %1 time", " %1 times", count);
+            if (count > 1 && uniqueAuthors.length() == 1) {
+                chunks.last() += i18ncp("n times", " %1 time ", " %1 times ", count);
            }
        }
-        QString text = chunks.takeFirst();
+        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 action 3]", ", ");
+                text += i18nc("[action 1], [action 2 and/or action 3]", ", ");
                text += chunks.takeFirst();
            }
-            text += i18nc("[action 1, action 2] and [action 3]", " and ");
+            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;
@@ -83,3 +94,41 @@ QString CollapseStateProxyModel::aggregateEventToString(int sourceRow) const
        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;
+}
--- a/src/models/collapsestateproxymodel.h
+++ b/src/models/collapsestateproxymodel.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #pragma once
@@ -12,10 +12,29 @@ class CollapseStateProxyModel : public QSortFilterProxyModel
 public:
    enum Roles {
        AggregateDisplayRole = MessageEventModel::LastRole + 1,
+        StateEventsRole,
+        AuthorListRole,
    };
    [[nodiscard]] bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
    [[nodiscard]] QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override;

+    /**
+     * @brief QString aggregating the text of consecutive state events starting at row.
+     *
+     * If state events happen on different days they will be split into two aggregate
+     * events.
+     */
    [[nodiscard]] QString aggregateEventToString(int row) const;
+    /**
+     * @brief Return a list of consecutive state events starting at row.
+     *
+     * If state events happen on different days they will be split into two aggregate
+     * events.
+     */
+    [[nodiscard]] QVariantList stateEventsList(int row) const;
+    /**
+     * @brief List of unique authors for the aggregate state events starting at row.
+     */
+    [[nodiscard]] QVariantList authorList(int row) const;
 };
--- a/src/models/completionmodel.cpp
+++ b/src/models/completionmodel.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // 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 KConcatenateRowsProxyModel(this))
+    , m_emojiModel(new QConcatenateTablesProxyModel(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(':'))
+    } else if (text().startsWith(QLatin1Char(':')) && !text()[1].isUpper()
               && (m_fullText.indexOf(QLatin1Char(':'), 1) == -1
                   || (m_fullText.indexOf(QLatin1Char(' ')) != -1 && m_fullText.indexOf(QLatin1Char(':'), 1) > m_fullText.indexOf(QLatin1Char(' '), 1)))) {
        m_filterModel->setSourceModel(m_emojiModel);
--- a/src/models/completionmodel.h
+++ b/src/models/completionmodel.h
@@ -1,12 +1,11 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #pragma once

+#include <QConcatenateTablesProxyModel>
 #include <QSortFilterProxyModel>

-#include <KConcatenateRowsProxyModel>
-
 #include "roomlistmodel.h"

 class CompletionProxyModel;
@@ -75,6 +74,6 @@ private:

    UserListModel *m_userListModel;
    RoomListModel *m_roomListModel;
-    KConcatenateRowsProxyModel *m_emojiModel;
+    QConcatenateTablesProxyModel *m_emojiModel;
 };
 Q_DECLARE_METATYPE(CompletionModel::AutoCompletionType);
--- a/src/models/completionproxymodel.cpp
+++ b/src/models/completionproxymodel.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #include "completionproxymodel.h"
--- a/src/models/completionproxymodel.h
+++ b/src/models/completionproxymodel.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: LGPL-2.0-or-later

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

 #include "devicesmodel.h"
@@ -70,7 +70,12 @@ void DevicesModel::logout(int index, const QString &password)
    auto job = Controller::instance().activeConnection()->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId);

    connect(job, &BaseJob::result, this, [this, job, password, index] {
-        if (job->error() != 0) {
+        auto onSuccess = [this, index]() {
+            beginRemoveRows(QModelIndex(), index, index);
+            m_devices.remove(index);
+            endRemoveRows();
+        };
+        if (job->error() != BaseJob::Success) {
            QJsonObject replyData = job->jsonData();
            QJsonObject authData;
            authData["session"] = replyData["session"];
@@ -79,11 +84,9 @@ void DevicesModel::logout(int index, const QString &password)
            QJsonObject identifier = {{"type", "m.id.user"}, {"user", Controller::instance().activeConnection()->user()->id()}};
            authData["identifier"] = identifier;
            auto *innerJob = Controller::instance().activeConnection()->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId, authData);
-            connect(innerJob, &BaseJob::success, this, [this, index]() {
-                beginRemoveRows(QModelIndex(), index, index);
-                m_devices.remove(index);
-                endRemoveRows();
-            });
+            connect(innerJob, &BaseJob::success, this, onSuccess);
+        } else {
+            onSuccess();
        }
    });
 }
--- a/src/models/devicesmodel.h
+++ b/src/models/devicesmodel.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later

 #pragma once
--- a/src/models/messageeventmodel.cpp
+++ b/src/models/messageeventmodel.cpp
@@ -67,6 +67,8 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
    roles[IsNameChangeRole] = "isNameChange";
    roles[IsAvatarChangeRole] = "isAvatarChange";
    roles[IsRedactedRole] = "isRedacted";
+    roles[GenericDisplayRole] = "genericDisplay";
+    roles[IsPendingRole] = "isPending";
    return roles;
 }

@@ -175,6 +177,7 @@ 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
            }
@@ -462,6 +465,14 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        return m_currentRoom->eventToString(evt, Qt::RichText);
    }

+    if (role == GenericDisplayRole) {
+        if (evt.isRedacted()) {
+            return i18n("<i>[This message was deleted]</i>");
+        }
+
+        return m_currentRoom->eventToGenericString(evt);
+    }
+
    if (role == FormattedBodyRole) {
        if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
            if (e->hasTextContent() && e->mimeType().name() != "text/plain") {
@@ -560,7 +571,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
    }

    if (role == HighlightRole) {
-        return m_currentRoom->isEventHighlighted(&evt);
+        return !m_currentRoom->isDirectChat() && m_currentRoom->isEventHighlighted(&evt);
    }

    if (role == FileMimetypeIcon) {
@@ -899,6 +910,10 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        return evt.isRedacted();
    }

+    if (role == IsPendingRole) {
+        return row < m_currentRoom->pendingEvents().size();
+    }
+
    return {};
 }

@@ -966,6 +981,9 @@ 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();

--- a/src/models/messageeventmodel.h
+++ b/src/models/messageeventmodel.h
@@ -45,6 +45,7 @@ public:
        AnnotationRole,
        UserMarkerRole,
        FormattedBodyRole,
+        GenericDisplayRole,

        MimeTypeRole,
        FileMimetypeIcon,
@@ -72,6 +73,7 @@ public:
        IsNameChangeRole,
        IsAvatarChangeRole,
        IsRedactedRole,
+        IsPendingRole,
        LastRole, // Keep this last
    };
    Q_ENUM(EventRoles)
--- a/src/models/roomlistmodel.cpp
+++ b/src/models/roomlistmodel.cpp
@@ -3,6 +3,7 @@

 #include "roomlistmodel.h"

+#include "controller.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "roommanager.h"
@@ -143,6 +144,7 @@ void RoomListModel::doAddRoom(Room *r)
        m_rooms.append(room);
        connectRoomSignals(room);
        Q_EMIT roomAdded(room);
+        Q_EMIT Controller::instance().roomAdded(room);
    } else {
        qCritical() << "Attempt to add nullptr to the room list";
        Q_ASSERT(false);
@@ -200,7 +202,11 @@ void RoomListModel::connectRoomSignals(NeoChatRoom *room)
        }
        Q_EMIT newHighlight(room->id(), lastEvent->id(), room->displayName(), sender->displayname(), room->eventToString(*lastEvent), room->avatar(128));
    });
+#ifndef QUOTIENT_07
    connect(room, &Room::notificationCountChanged, this, &RoomListModel::refreshNotificationCount);
+#else
+    connect(room, &Room::unreadStatsChanged, this, &RoomListModel::refreshNotificationCount);
+#endif
 }

 #ifndef QUOTIENT_07
@@ -229,10 +235,13 @@ void RoomListModel::handleNotifications()
                continue;
            }
            oldNotifications += notification["event"].toObject()["event_id"].toString();
+
            auto room = m_connection->room(notification["room_id"].toString());
+            auto currentRoom = RoomManager::instance().currentRoom();
+            bool roomIsActive = currentRoom && room->id() == currentRoom->id();

            // If room exists, room is NOT active OR the application is NOT active, show notification
-            if (room && !(room->id() == RoomManager::instance().currentRoom()->id() && QGuiApplication::applicationState() == Qt::ApplicationActive)) {
+            if (room && !(roomIsActive && QGuiApplication::applicationState() == Qt::ApplicationActive)) {
                // The room might have been deleted (for example rejected invitation).
                auto sender = room->user(notification["event"].toObject()["sender"].toString());

--- a/src/models/searchmodel.cpp
+++ b/src/models/searchmodel.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #include "searchmodel.h"
--- a/src/models/searchmodel.h
+++ b/src/models/searchmodel.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: LGPL-2.0-or-later

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

 #include "sortfilterroomlistmodel.h"
--- a/src/models/sortfilterroomlistmodel.h
+++ b/src/models/sortfilterroomlistmodel.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later

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

 #include "statemodel.h"
--- a/src/models/statemodel.h
+++ b/src/models/statemodel.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: LGPL-2.0-or-later

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

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

 #pragma once
--- a/src/neochatconfig.kcfg
+++ b/src/neochatconfig.kcfg
@@ -41,9 +41,6 @@
      <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>
@@ -108,6 +105,10 @@
      <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">
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -658,6 +658,135 @@ 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());
@@ -946,6 +1075,12 @@ 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) {
@@ -1497,6 +1632,17 @@ 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;
@@ -1573,6 +1719,11 @@ QVector<Mention> *NeoChatRoom::mentions()
    return &m_mentions;
 }

+QVector<Mention> *NeoChatRoom::editMentions()
+{
+    return &m_editMentions;
+}
+
 QString NeoChatRoom::savedText() const
 {
    return m_savedText;
@@ -1684,3 +1835,7 @@ int NeoChatRoom::maxRoomVersion() const
    }
    return maxVersion;
 }
+NeoChatUser *NeoChatRoom::directChatRemoteUser() const
+{
+    return dynamic_cast<NeoChatUser *>(connection()->directChatUsers(this)[0]);
+}
--- a/src/neochatroom.h
+++ b/src/neochatroom.h
@@ -12,8 +12,8 @@

 #include <qcoro/task.h>

-class PollHandler;
-class NeoChatUser;
+#include "neochatuser.h"
+#include "pollhandler.h"

 class PushNotificationState : public QObject
 {
@@ -79,6 +79,11 @@ 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)
@@ -94,6 +99,7 @@ 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 {
@@ -147,6 +153,14 @@ 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;
@@ -249,6 +263,7 @@ 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;
@@ -270,6 +285,9 @@ 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);

@@ -287,6 +305,11 @@ public:

    QVector<Mention> *mentions();

+    /**
+     * @brief Vector of mentions in the current edit text.
+     */
+    QVector<Mention> *editMentions();
+
    QString savedText() const;
    void setSavedText(const QString &savedText);

@@ -316,6 +339,7 @@ public:
 #endif

    int maxRoomVersion() const;
+    NeoChatUser *directChatRemoteUser() const;

 private:
    QSet<const Quotient::RoomEvent *> highlights;
@@ -336,10 +360,12 @@ 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;
@@ -362,6 +388,7 @@ Q_SIGNALS:
    void pushNotificationStateChanged(PushNotificationState::State state);
    void showMessage(MessageType messageType, const QString &message);
    void chatBoxTextChanged();
+    void editTextChanged();
    void chatBoxReplyIdChanged();
    void chatBoxEditIdChanged();
    void chatBoxAttachmentPathChanged();
--- a/src/notificationsmanager.cpp
+++ b/src/notificationsmanager.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include "notificationsmanager.h"
@@ -268,6 +268,10 @@ 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
--- a/src/notificationsmanager.h
+++ b/src/notificationsmanager.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later

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

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

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

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

 #pragma once
--- a/src/qml/Component/ChatBox/ChatBar.qml
+++ b/src/qml/Component/ChatBox/ChatBar.qml
@@ -14,9 +14,7 @@ QQC2.Control {

    property alias textField: textField
    property bool isReplying: currentRoom.chatBoxReplyId.length > 0
-    property bool isEditing: currentRoom.chatBoxEditId.length > 0
-    property bool replyPaneVisible: isReplying || isEditing
-    property NeoChatUser replyUser: currentRoom.chatBoxReplyUser ?? currentRoom.chatBoxEditUser
+    property NeoChatUser replyUser: currentRoom.chatBoxReplyUser
    property bool attachmentPaneVisible: currentRoom.chatBoxAttachmentPath.length > 0

    signal messageSent()
@@ -122,7 +120,7 @@ QQC2.Control {
            leftPadding: LayoutMirroring.enabled ? actionsRow.width : (root.width > chatBoxMaxWidth ? 0 : Kirigami.Units.largeSpacing)
            rightPadding: LayoutMirroring.enabled ? (root.width > chatBoxMaxWidth ? 0 : Kirigami.Units.largeSpacing) : actionsRow.width

-            placeholderText: readOnly ? i18n("This room is encrypted. Build libQuotient with encryption enabled to send encrypted messages.") : currentRoom.chatBoxEditId.length > 0 ? i18n("Edit Message") : currentRoom.usesEncryption ? i18n("Send an encrypted message…") : currentRoom.chatBoxAttachmentPath.length > 0 ? i18n("Set an attachment caption...") : i18n("Send a message…")
+            placeholderText: readOnly ? i18n("This room is encrypted. Build libQuotient with encryption enabled to send encrypted messages.") : currentRoom.usesEncryption ? i18n("Send an encrypted message…") : currentRoom.chatBoxAttachmentPath.length > 0 ? i18n("Set an attachment caption...") : i18n("Send a message…")
            verticalAlignment: TextEdit.AlignVCenter
            wrapMode: Text.Wrap
            readOnly: (currentRoom.usesEncryption && !Controller.encryptionSupported)
@@ -187,6 +185,13 @@ QQC2.Control {
                    repeatTimer.stop()
                }
            }
+            Keys.onShortcutOverride: {
+                // Accept the event only when there was something to cancel. Otherwise, let the event go to the RoomPage.
+                if (cancelButton.visible && event.key === Qt.Key_Escape) {
+                    cancelButton.action.trigger();
+                    event.accepted = true;
+                }
+            }

            Loader {
                id: paneLoader
@@ -198,8 +203,8 @@ QQC2.Control {
                anchors.rightMargin: root.width > chatBoxMaxWidth ? 0 : (chatBarScrollView.QQC2.ScrollBar.vertical.visible ? Kirigami.Units.largeSpacing * 3.5 : Kirigami.Units.largeSpacing)

                active: visible
-                visible: root.replyPaneVisible || root.attachmentPaneVisible
-                sourceComponent: root.replyPaneVisible ? replyPane : attachmentPane
+                visible: root.isReplying || root.attachmentPaneVisible
+                sourceComponent: root.isReplying ? replyPane : attachmentPane
            }
            Component {
                id: replyPane
@@ -207,8 +212,7 @@ QQC2.Control {
                    userName: root.replyUser ? root.replyUser.displayName : ""
                    userColor: root.replyUser ? root.replyUser.color : ""
                    userAvatar: root.replyUser ? "image://mxc/" + currentRoom.getUser(root.replyUser.id).avatarMediaId : ""
-                    isReply: root.isReplying
-                    text: isEditing ? currentRoom.chatBoxEditMessage : currentRoom.chatBoxReplyMessage
+                    text: currentRoom.chatBoxReplyMessage
                }
            }
            Component {
@@ -263,18 +267,16 @@ QQC2.Control {
        anchors.right: parent.right
        anchors.rightMargin: (root.width - chatBoxMaxWidth) / 2 + Kirigami.Units.largeSpacing + (chatBarScrollView.QQC2.ScrollBar.vertical.visible && !(root.width > chatBoxMaxWidth) ? Kirigami.Units.largeSpacing * 2.5 : 0)

-        visible: root.replyPaneVisible
+        visible: root.isReplying
        display: QQC2.AbstractButton.IconOnly
        action: Kirigami.Action {
-            text: root.isReplying ? i18nc("@action:button", "Cancel reply") : i18nc("@action:button", "Cancel edit")
+            text: i18nc("@action:button", "Cancel reply")
            icon.name: "dialog-close"
            onTriggered: {
                currentRoom.chatBoxReplyId = "";
-                currentRoom.chatBoxEditId = "";
                currentRoom.chatBoxAttachmentPath = "";
                root.forceActiveFocus()
            }
-            shortcut: "Escape"
        }
        QQC2.ToolTip.text: text
        QQC2.ToolTip.visible: hovered
@@ -356,15 +358,6 @@ QQC2.Control {
        }
    }

-    Connections {
-        target: currentRoom
-        function onChatBoxEditIdChanged() {
-            if (currentRoom.chatBoxEditMessage.length > 0) {
-                textField.text = currentRoom.chatBoxEditMessage
-            }
-        }
-    }
-
    ChatDocumentHandler {
        id: documentHandler
        document: textField.textDocument
@@ -398,12 +391,11 @@ QQC2.Control {
    }

    function postMessage() {
-        actionsHandler.handleMessage();
+        actionsHandler.handleNewMessage();
        repeatTimer.stop()
        currentRoom.markAllMessagesAsRead();
        textField.clear();
        currentRoom.chatBoxReplyId = "";
-        currentRoom.chatBoxEditId = "";
        messageSent()
    }
 }
--- a/src/qml/Component/ChatBox/CompletionMenu.qml
+++ b/src/qml/Component/ChatBox/CompletionMenu.qml
@@ -22,7 +22,7 @@ QQC2.Popup {
        connection: Controller.activeConnection
    }

-    required property var chatDocumentHandler
+    property var chatDocumentHandler
    Component.onCompleted: {
        chatDocumentHandler.completionModel.roomListModel = roomListModel;
    }
--- a/src/qml/Component/ChatBox/ReplyPane.qml
+++ b/src/qml/Component/ChatBox/ReplyPane.qml
@@ -15,7 +15,6 @@ GridLayout {
    property string userName
    property color userColor: Kirigami.Theme.highlightColor
    property var userAvatar: ""
-    property bool isReply
    property var text

    rows: 3
@@ -30,7 +29,7 @@ GridLayout {
        Layout.columnSpan: 3
        topPadding: Kirigami.Units.smallSpacing

-        text: isReply ? i18n("Replying to:") : i18n("Editing message:")
+        text: i18n("Replying to:")
    }
    Rectangle {
        id: verticalBorder
--- a/src/qml/Component/Emoji/EmojiDelegate.qml
+++ b/src/qml/Component/Emoji/EmojiDelegate.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later

 import QtQuick 2.15
--- a/src/qml/Component/Emoji/EmojiPicker.qml
+++ b/src/qml/Component/Emoji/EmojiPicker.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later

 import QtQuick 2.15
--- a/src/qml/Component/Emoji/EmojiTonesPicker.qml
+++ b/src/qml/Component/Emoji/EmojiTonesPicker.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later

 import QtQuick 2.15
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Nicolas Fella	94210a7ce7	Reenable disabled CI builds	2023-03-10 12:49:44 +01:00
l10n daemon script	280d90e191	GIT_SILENT Sync po/docbooks with svn	2023-03-10 02:03:01 +00:00
Nicolas Fella	b4b24430a1	Allow building against KF6	2023-03-09 15:50:43 +01:00
l10n daemon script	b7b7f1817a	GIT_SILENT Sync po/docbooks with svn	2023-03-09 01:56:25 +00:00
Joshua Goins	3d67a682f4	Bump kirigami-addons to 0.7.2	2023-03-08 09:33:34 -05:00
Joshua Goins	da6df18367	Add separate "About KDE" page to settings	2023-03-08 14:30:48 +00:00
l10n daemon script	0b1b1b8c8c	GIT_SILENT Sync po/docbooks with svn	2023-03-08 02:02:32 +00:00
l10n daemon script	2493a00ba4	GIT_SILENT Sync po/docbooks with svn	2023-03-07 02:01:54 +00:00
Tobias Fella	d6ebb1308c	Temporarily disable android Qt6 CI	2023-03-07 00:11:26 +01:00
l10n daemon script	332c311023	GIT_SILENT Sync po/docbooks with svn	2023-03-06 01:56:17 +00:00
Carl Schwan	27d33d121a	Small improvement to clipbard Signed-off-by: Carl Schwan <carl@carlschwan.eu>	2023-03-06 00:31:17 +01:00
Tobias Fella	e954fc204f	Don't open context menu when tapping on an image BUG: 466381	2023-03-05 23:19:13 +00:00
Alessio Mattiazzi	d1f7e7091e	Copy image to the clipboard Add a context menu option to save an image in the timeline to the clipboard BUG: 466478	2023-03-05 23:19:02 +00:00
James Graham	bd4eeb405b	Set power level from userdetaildialog Add the option to set powerlevel to userdetaildialog. This is done by making the powerleveldialog into it's own file and using that. implements network/neochat#570	2023-03-05 22:44:04 +00:00
Tobias Fella	e6a060c192	Don't show highlights in DMs It's a DM, the messages are all meant for us anyway CCBUG: 466895	2023-03-05 17:21:07 +01:00
l10n daemon script	f53a7a27f6	GIT_SILENT Sync po/docbooks with svn	2023-03-05 02:36:21 +00:00
l10n daemon script	34384dced4	GIT_SILENT made messages (after extraction)	2023-03-05 00:51:47 +00:00
l10n daemon script	b68cfafab2	GIT_SILENT Sync po/docbooks with svn	2023-03-04 01:57:30 +00:00
l10n daemon script	58b836fd1e	GIT_SILENT Sync po/docbooks with svn	2023-03-03 01:58:44 +00:00
Alessio Mattiazzi	90cad05bae	Fix save-as button in FullScreenImage view Save-as button in the fullscreenimage view did not work because it could not access the Config object; adding the import statement to access it.	2023-03-02 18:16:08 +00:00
l10n daemon script	072f7cec37	GIT_SILENT Sync po/docbooks with svn	2023-03-02 02:48:28 +00:00
James Graham	39388e204e	Roomlist Drag Improvements - Move the room list drag handler and logic to RoomList.qml. - Make the compact mode logic not rely on a saved width value from Config as this was causing the room list to have large icons the first launch after a recent update. - Instead save the compact mode state and initialise the width based upon that.	2023-02-28 19:30:20 +00:00
l10n daemon script	6ccb201110	GIT_SILENT Sync po/docbooks with svn	2023-02-28 02:31:10 +00:00
James Graham	178b516c7c	Replace Global Menu Remove the global menu and move explore and new chat/room buttons to new `ExploreComponent.qml`. This is designed to sit in the header of the `RoomListPage` and will only be visible when the room list is. The other settings have just been removed as they are covered by the `UserInfo` component and quick can be done form the decoration or system tray. When wide\ ![image](/uploads/ae652b4beeae8cbde0def427fbc65112/image.png) Collapsed mode\ ![image](/uploads/0aac45d8fa1dd718afd764656dded76b/image.png)	2023-02-27 20:11:50 +00:00
Tobias Fella	ac88e13e58	Update Tobias' email address	2023-02-27 19:13:48 +01:00
Kevin Wolf	8d3e145e0b	Jump to first unread message with Shift+PgUp This feature doesn't work very well at the moment, but that's not an excuse not to have a keyboard shortcut for it. As usual, it's the same shortcut as many other chat clients use.	2023-02-27 12:05:18 +00:00
Kevin Wolf	f40d1b9f4e	Jump to bottom and mark messages read with Escape Pressing the Escape key again when you're already at the bottom and there are no unread messages takes you back to the room list like before.	2023-02-27 12:05:18 +00:00
Kevin Wolf	e9cd165457	Fix Escape shortcut in RoomPage Since commit `eee93e0f1`, the ChatBar has a conflicting shortcut that takes precedence even when it doesn't do anything, so that the Escape shortcut of RoomPage is never actually invoked any more. Fix this by using Keys.onShortcutOverride() instead in ChatBar and accepting the event only when it actually cancelled something. So if you're writing a reply, the first time pressing Escape cancels the reply and the second one calls the RoomPage shortcut that goes to the RoomListPage.	2023-02-27 12:05:18 +00:00
Kevin Wolf	c0c86c67b6	Alt+Shift+Up/Down to switch to previous/next unread room This is the same key combination as commonly used by other chat clients such as Element, Slack and Discord. For consistency, also add the same Alt+Up/Down shortcut as used in thes other clients as aliases for switching rooms without considering the unread status.	2023-02-27 12:05:18 +00:00
Kevin Wolf	12afa43d23	Scroll the room content with PgUp/PgDown This is pretty much standard behaviour in any chat client. We should do the same.	2023-02-27 12:05:18 +00:00
Kevin Wolf	386f637b94	Add Ctrl+U shortcut for switching user This is a key combination that doesn't seem to be used either in NeoChat nor with a common meaning in other chat clients, so let's use it for switching the user.	2023-02-27 12:05:18 +00:00
Kevin Wolf	d7bd9f4609	Use Shortcut for keyboard room switching This allows to use the room switching shortcuts like Ctrl+PgUp/PgDn even when the RoomPage doesn't currently have the focus. It's also a nice code simplification.	2023-02-27 12:05:18 +00:00
Kevin Wolf	33c9edc9a3	Don't switch to invisible first/last room on Ctrl+PgUp/PgDn If you're on the first visible room and try to switch to the previous one (or on the last visible room switching to the next one), the first (or last) room in the list is incorrectly selected even if it's not currently visible. Fix this by not first entering each room and then checking whether it is the one we really wanted, but iterating until we find a room that we want and only entering it then.	2023-02-27 12:05:18 +00:00
Kevin Wolf	3b2dbc731e	RoomListPage: Fix skipping invisible items in goToNextRoom() We don't want to skip over invisible items if they are one element after the end of the ListView, but if they aren't the last item.	2023-02-27 12:05:18 +00:00
l10n daemon script	51a29ac528	GIT_SILENT Sync po/docbooks with svn	2023-02-27 02:37:04 +00:00
James Graham	cc8bf79a9b	Allow read marker to be cleared when at 0 in Timeline The read marker can be at posiiton 0 in the timeline so make sure that can be cleared by checking >=0 in markReadIfVisible	2023-02-26 09:20:15 +00:00
l10n daemon script	8d47e58861	GIT_SILENT Sync po/docbooks with svn	2023-02-26 02:23:15 +00:00
James Graham	47ce8a4846	Add button to copy the room Id to clipboard	2023-02-25 22:09:13 +00:00
James Graham	71c9537c61	Fix Inline Edit Focus Make sure that the inline edit component get focus when an edit is started and the cursor is at the end	2023-02-25 16:30:17 +00:00
Nicolas Fella	8825e6ec83	Add parent windows to file dialogs This makes sure they are properly placed and modal to the main window	2023-02-25 12:14:58 +00:00
James Graham	44ec93f0a0	Change plain text for a spolier from /rainbow to /spoiler.	2023-02-25 10:34:53 +00:00
l10n daemon script	ed7688e66f	GIT_SILENT Sync po/docbooks with svn	2023-02-25 03:06:51 +00:00
Tobias Fella	6b49854b12	Automatically open room after creation	2023-02-24 18:15:50 +00:00
l10n daemon script	e8484ebc7a	GIT_SILENT Sync po/docbooks with svn	2023-02-24 02:19:24 +00:00
Tobias Fella	17d01c68c4	Prefer password login over sso login when failing to query flows Password login is more likely to be correct, maybe this can help in some cases Fixes #513	2023-02-23 20:06:30 +00:00
Joshua Goins	dae2cbab90	Refresh the notification count when unread stats change libquotient doesn't update the notification count properly, so let's listen on the unread stats changing instead.	2023-02-23 19:36:13 +00:00
l10n daemon script	b8e8fa3ee5	GIT_SILENT Sync po/docbooks with svn	2023-02-23 02:21:10 +00:00
Tobias Fella	9c4a925171	Indicate messages that are not sent yet	2023-02-22 23:21:03 +00:00
Tobias Fella	8996806b05	Copy other user's matrix ID instead of room id for direct messages Implements #469	2023-02-22 19:56:37 +00:00
l10n daemon script	2bd4579c10	GIT_SILENT Sync po/docbooks with svn	2023-02-22 02:11:15 +00:00
l10n daemon script	0891f32c08	GIT_SILENT Sync po/docbooks with svn	2023-02-21 02:19:57 +00:00
Tobias Fella	5287c2d529	Focus member search field when opening it	2023-02-20 23:27:05 +01:00
Kevin Wolf	084b89f3dc	Fix two null pointer dereferences	2023-02-20 19:00:54 +00:00
James Graham	2dd3197beb	Inline Edit Fixes - Make sure the connection to the room's chatBoxEditIdChanged signal is made so that the edit box gets filled. - Make sure the minimum height and preferred width are available to the loader so they can be set and dynamically updated. BUG: 465934	2023-02-20 18:24:00 +00:00
Tobias Fella	6d9dca7da8	Show a warning when a file is too large to download BUG: 465527	2023-02-20 17:19:19 +00:00
Kevin Wolf	e0f16054fc	Fix Ctrl+PgUp/PgDn shortcut for room switching Before this change, Ctrl+PgUp/PgDown didn't select the next room, but actually moved two rooms at once because the signal handler was called twice. I'm not entirely sure why this happens (it might be a bug in a lower layer?), but as we don't want to handle the same event elsewhere, accepting the event doesn't feel wrong and it appears to fix the issue. So let's just do that. BUG: 459997	2023-02-20 17:07:35 +00:00
l10n daemon script	fa70679439	GIT_SILENT Sync po/docbooks with svn	2023-02-20 02:21:40 +00:00
l10n daemon script	949bd20873	GIT_SILENT Sync po/docbooks with svn	2023-02-19 02:24:50 +00:00
l10n daemon script	79a9eb0de0	GIT_SILENT Sync po/docbooks with svn	2023-02-18 02:21:24 +00:00
Shooting Star	e1b9bc7d0e	Add knock command	2023-02-17 13:29:02 +00:00
l10n daemon script	a1abf22174	GIT_SILENT Sync po/docbooks with svn	2023-02-17 02:15:57 +00:00
Tobias Fella	fa27d993e2	Don't complete emojis when typing uppercase letters BUG: 463049	2023-02-16 15:06:52 +00:00
l10n daemon script	d4b750433e	GIT_SILENT Sync po/docbooks with svn	2023-02-16 03:09:51 +00:00
Tobias Fella	9df534c72c	Check if connection is null when handling notifications BUG: 465143	2023-02-16 00:30:27 +01:00
James Graham	f785e4d5b0	Inline Edit Loader Put the edit component in a loader to that it doesn't use resources when not in use. CCBUG: 465715	2023-02-15 19:30:23 +00:00
James Graham	f186be7314	Disable link loading animation when offscreen Stop the link preview loading indicator animation running when the delegate isn't visible. CCBUG: 465715	2023-02-15 18:22:51 +00:00
l10n daemon script	3cbcc2b597	GIT_SILENT Sync po/docbooks with svn	2023-02-15 02:19:47 +00:00
l10n daemon script	61f3d6c9ae	GIT_SILENT Sync po/docbooks with svn	2023-02-14 02:18:22 +00:00
l10n daemon script	d8b2436f0d	GIT_SILENT Sync po/docbooks with svn	2023-02-13 02:14:05 +00:00
James Graham	ea76edce74	Improve Link Preview Sizing Update linkpreviewer to minimise the number of resizes. - There is now a placeholder loading element to hold space while the data is obtained - The component starts with a set size but can be expanded to see the whole item. - The expand/contract button is only visible on hover - The default size is picked to show 3 lines of text (1 heading and 2 description, 2 heading and 1 description, etc) This is designed to help with the timeline scroll jumping CCBUG: 463235 by minimizing the amount of resizing for items in the timeline. Before ![image](/uploads/bb46f55dc38851e640a7382aafea8640/image.png) After when compressed ![image](/uploads/3cbc7894688721d944a5551251b12a12/image.png) After When expanded ![image](/uploads/50ff53fe51eefe88713a2ded34530534/image.png) After Loading ![image](/uploads/72567f805af6b08ab0c5fc1cf94bd247/image.png)	2023-02-12 21:10:52 +00:00
James Graham	5482aad7ba	Inline Edits Edit text messages inline instead of in the chatbar	2023-02-12 13:46:23 +00:00
James Graham	aaa26571d1	Foldable State Events Implement folding sections for multiple consecutive state events. This also reworks some of the aggregated text output: - Only new days cause a new section - The aggregated text starts with either a single username or n users - If the same user did the same action mutltiple times it will be in the aggregated text a user did x n times - When there are multiple authors in a block with multiple state event types it will use or rather than and before the last event. e.g 3 user left the room or joined the room. Folded ![image](/uploads/17141ed5e1f2e0e3539523a082275976/image.png) Unfolded ![image](/uploads/1d5db5804da457b921544cc81099997d/image.png) Implements network/neochat#90	2023-02-12 11:43:39 +00:00
l10n daemon script	554e3576fd	GIT_SILENT Sync po/docbooks with svn	2023-02-11 02:13:55 +00:00
l10n daemon script	8d2c7ff8c2	GIT_SILENT Sync po/docbooks with svn	2023-02-10 02:19:19 +00:00
l10n daemon script	92261eb94f	GIT_SILENT Sync po/docbooks with svn	2023-02-09 02:31:12 +00:00
Tobias Fella	4dfb7fc3e2	Use 22.08 flatpak runtime for CI	2023-02-08 18:19:22 +01:00
l10n daemon script	2728446692	GIT_SILENT Sync po/docbooks with svn	2023-02-08 03:07:40 +00:00
Devin Lin	dfb32fe687	Fix project name	2023-02-07 20:15:48 +00:00
Devin Lin	55507112a9	Move neochat to the release service	2023-02-07 20:15:48 +00:00
Nikita Karpei	d9aa77a9f4	Fix crash after logout	2023-02-07 19:54:27 +00:00
Nikita Karpei	c0ea52c331	Fix crash after login	2023-02-07 18:53:49 +00:00
Nikita Karpei	f1b9d2329f	Don't play GIF images while Neochat isn't focused BUG: 465019	2023-02-07 17:33:10 +00:00
l10n daemon script	0707fd8189	GIT_SILENT Sync po/docbooks with svn	2023-02-07 02:21:31 +00:00
Nikita Karpei	6bef2205db	Delete a device from the list if the job succeed	2023-02-06 20:51:26 +00:00
Wang Zichong	ace62b4df1	Use SelectableLabel for selectable labels	2023-02-06 11:16:08 +08:00
l10n daemon script	d76e512785	GIT_SILENT Sync po/docbooks with svn	2023-02-06 02:25:46 +00:00
l10n daemon script	db2692c411	GIT_SILENT Sync po/docbooks with svn	2023-02-05 02:15:49 +00:00
l10n daemon script	4c9bdd03ce	GIT_SILENT Sync po/docbooks with svn	2023-02-04 02:37:23 +00:00
l10n daemon script	efa2c012a7	GIT_SILENT Sync po/docbooks with svn	2023-02-03 02:27:55 +00:00
Shooting Star	072dc1b6a3	Show error if room join failed	2023-02-02 21:31:15 +00:00
James Graham	4066427168	Fix Account Switcher Missing Clicks Use a state machine to open and close the account switcher so clicks aren't missed. BUG: 462549	2023-02-02 21:19:04 +00:00
James Graham	b901c1bdf2	Pull in the updates from video delegate to image delegate to improve sizing behaviour.	2023-02-02 19:28:49 +00:00
l10n daemon script	532310d739	GIT_SILENT Sync po/docbooks with svn	2023-02-02 02:22:20 +00:00
Tobias Fella	4f7d32df2b	Fix compilation against Qt6 and add CI	2023-02-01 16:34:39 +00:00
l10n daemon script	833d2159e7	GIT_SILENT Sync po/docbooks with svn	2023-02-01 02:14:48 +00:00
l10n daemon script	ccf8701395	GIT_SILENT Sync po/docbooks with svn	2023-01-31 02:17:09 +00:00
l10n daemon script	5d696aabc4	GIT_SILENT Sync po/docbooks with svn	2023-01-30 02:33:24 +00:00