Update version number for 22.11

GIT_SILENT

.flatpak-manifest.json

@@ -0,0 +1,164 @@
+{
+    "id": "org.kde.neochat",
+    "branch": "master",
+    "runtime": "org.kde.Platform",
+    "runtime-version": "5.15-21.08",
+    "sdk": "org.kde.Sdk",
+    "command": "neochat",
+    "tags": [
+        "nightly"
+    ],
+    "desktop-file-name-suffix": " (Nightly)",
+    "finish-args": [
+        "--share=network",
+        "--share=ipc",
+        "--socket=x11",
+        "--socket=wayland",
+        "--device=dri",
+        "--filesystem=xdg-download",
+        "--talk-name=org.freedesktop.Notifications",
+        "--talk-name=org.kde.kwalletd5",
+        "--talk-name=org.kde.StatusNotifierWatcher",
+        "--own-name=org.kde.StatusNotifierItem-2-2"
+    ],
+    "modules": [
+        {
+            "name": "kirigamiaddons",
+            "config-opts": [ "-DBUILD_TESTING=OFF" ],
+            "buildsystem": "cmake-ninja",
+            "sources": [ { "type": "git", "url": "https://invent.kde.org/libraries/kirigami-addons.git" } ]
+        },
+        {
+            "name": "kquickimageeditor",
+            "buildsystem": "cmake-ninja",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://invent.kde.org/libraries/kquickimageeditor"
+                }
+            ]
+        },
+        {
+            "name": "olm",
+            "buildsystem": "cmake-ninja",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://gitlab.matrix.org/matrix-org/olm.git",
+                    "tag": "3.2.10",
+                    "x-checker-data": {
+                        "type": "git",
+                        "tag-pattern": "^([\\d.]+)$"
+                    },
+                    "commit": "9908862979147a71dc6abaecd521be526ae77be1"
+                }
+            ]
+        },
+        {
+            "name": "libsecret",
+            "buildsystem": "meson",
+            "config-opts": [
+                "-Dmanpage=false",
+                "-Dvapi=false",
+                "-Dgtk_doc=false",
+                "-Dintrospection=false",
+                "-Dgcrypt=false"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.tar.xz",
+                    "sha256": "3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d",
+                    "x-checker-data": {
+                        "type": "gnome",
+                        "name": "libsecret",
+                        "stable-only": true
+                    }
+                }
+            ]
+        },
+        {
+            "name": "qtkeychain",
+            "buildsystem": "cmake-ninja",
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://github.com/frankosterfeld/qtkeychain/archive/v0.13.2.tar.gz",
+                    "sha256": "20beeb32de7c4eb0af9039b21e18370faf847ac8697ab3045906076afbc4caa5",
+                    "x-checker-data": {
+                        "type": "anitya",
+                        "project-id": 4138,
+                        "stable-only": true,
+                        "url-template": "https://github.com/frankosterfeld/qtkeychain/archive/v$version.tar.gz"
+                    }
+                }
+            ],
+            "config-opts": [
+                "-DCMAKE_INSTALL_LIBDIR=/app/lib",
+                "-DLIB_INSTALL_DIR=/app/lib",
+                "-DBUILD_TRANSLATIONS=NO"
+            ]
+        },
+        {
+            "name": "libQuotient",
+            "buildsystem": "cmake-ninja",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/quotient-im/libQuotient.git",
+                    "branch": "dev",
+                    "disable-submodules": true
+                }
+            ],
+            "config-opts": [
+                "-DQuotient_ENABLE_E2EE=ON"
+            ]
+        },
+        {
+            "name": "cmark",
+            "buildsystem": "cmake-ninja",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/commonmark/cmark.git"
+                }
+            ],
+            "config-opts": [
+                "-DCMARK_TESTS=OFF",
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DCMAKE_INSTALL_PREFIX=/app"
+            ],
+            "builddir": true
+        },
+        {
+            "name": "qcoro",
+            "buildsystem": "cmake-ninja",
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://github.com/danvratil/qcoro/archive/refs/tags/v0.7.0.tar.gz",
+                    "sha256": "23ef0217926e67c8d2eb861cf91617da2f7d8d5a9ae6c62321b21448b1669210",
+                    "x-checker-data": {
+                        "type": "anitya",
+                        "project-id": 236236,
+                        "stable-only": true,
+                        "url-template": "https://github.com/danvratil/qcoro/archive/refs/tags/v$version.tar.gz"
+                    }
+                }
+            ]
+        },
+        {
+            "name": "neochat",
+            "buildsystem": "cmake-ninja",
+            "sources": [
+                {
+                    "type": "dir",
+                    "path": "."
+                }
+            ],
+            "config-opts": [
+                "-DNEOCHAT_FLATPAK=ON"
+            ]
+        }
+    ]
+}

.gitignore

@@ -7,3 +7,5 @@ compile_commands.json
 .cache/
 .vscode/
 kate.project.ctags.*
+*.user
+.flatpak-builder/

.gitlab-ci.yml

@@ -5,4 +5,8 @@ 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/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/windows.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml

.kde-ci.yml

@@ -13,16 +13,17 @@ Dependencies:
     'frameworks/kitemmodels': '@stable'
     'frameworks/knotifications': '@stable'
     'libraries/kquickimageeditor': '@stable'
+    'frameworks/sonnet': '@stable'
+    'libraries/kirigami-addons': '@latest'
 - 'on': ['Windows', 'Linux', 'FreeBSD']
   'require':
     'frameworks/qqc2-desktop-style': '@stable'
     'frameworks/kio': '@stable'
     'frameworks/kwindowsystem': '@stable'
-    'frameworks/sonnet': '@stable'
     'frameworks/kconfigwidgets': '@stable'
 - 'on': ['Linux', 'FreeBSD']
   'require':
     'frameworks/kdbusaddons': '@stable'
 
 Options:
-  require-passing-tests-on: [ 'Linux', 'Windows' ]
+  require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ]

.reuse/dep5

@@ -6,15 +6,11 @@ Files: 128-logo.png icons/* logo.png org.kde.neochat.svg org.kde.neochat.tray.sv
 Copyright: 2020 Carson Black <uhhadd@gmail.com>
 License: LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 
-Files: qtquickcontrols2.conf
-Copyright: 2020 Tobias Fella <fella@posteo.de>
-License: CC0-1.0
-
 Files: android/res/drawable/splash.xml
 Copyright: 2020 Tobias Fella <fella@posteo.de>
 License: BSD-2-Clause
 
-Files: */qmldir .gitignore
+Files: .gitignore
 Copyright: None
 License: CC0-1.0
 
@@ -22,7 +18,7 @@ Files: .gitlab/issue_templates/bug.md
 Copyright: 2021 Carl Schwan <carlschwan@kde.org>
 License: CC0-1.0
 
-Files: res.qrc res_android.qrc res_desktop.qrc
+Files: src/res.qrc src/res_android.qrc src/res_desktop.qrc
 Copyright: None
 License: CC0-1.0
 
@@ -31,14 +27,17 @@ Copyright: 2021 Carl Schwan <carlschwan@kde.org>
 License: BSD-2-Clause
 
 Files: src/neochatconfig.kcfg
-Copyright: 2020-2021 Carl Schwan <carlschwan@kde.org>
-Copyright: 2020-2021 Tobias Fella <fella@posteo.de>
+Copyright: 2020-2021 Carl Schwan <carlschwan@kde.org>, Tobias Fella <fella@posteo.de>
 License: BSD-2-Clause
 
 Files: src/neochat.notifyrc
 Copyright: 2020 Tobias Fella <fella@posteo.de>
 License: BSD-2-Clause
 
-Files: imports/NeoChat/Component/confetti.png imports/NeoChat/Component/glowdot.png
+Files: src/qml/Component/confetti.png src/qml/Component/glowdot.png
 Copyright: 2021 Alexey Andreyev <aa13q@ya.ru>
 License: CC0-1.0
+
+Files: .flatpak-manifest.json
+Copyright: 2020-2022 Tobias Fella <fella@posteo.de>
+License: BSD-2-Clause

CMakeLists.txt

@@ -7,9 +7,9 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(NeoChat)
-set(PROJECT_VERSION "22.06")
+set(PROJECT_VERSION "22.11")
 
-set(KF5_MIN_VERSION "5.88.0")
+set(KF5_MIN_VERSION "5.91.0")
 set(QT_MIN_VERSION "5.15.2")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
@@ -25,12 +25,15 @@ include(FeatureSummary)
 include(ECMSetupVersion)
 include(KDEInstallDirs)
 include(ECMFindQmlModule)
-include(KDEClangFormat)
 include(KDECMakeSettings)
+include(ECMAddTests)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMAddAppIcon)
 include(KDEGitCommitHooks)
 include(ECMCheckOutboundLicense)
+if (NOT ANDROID)
+    include(KDEClangFormat)
+endif()
 
 if(NEOCHAT_FLATPAK)
     include(cmake/Flatpak.cmake)
@@ -41,12 +44,12 @@ ecm_setup_version(${PROJECT_VERSION}
     VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
 )
 
-find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg)
-set_package_properties(Qt5 PROPERTIES
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg)
+set_package_properties(Qt${QT_MAJOR_VERSION} PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
 )
-find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons)
+find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels)
 set_package_properties(KF5 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
@@ -55,9 +58,10 @@ set_package_properties(KF5Kirigami2 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Kirigami application UI framework"
 )
+find_package(KF5KirigamiAddons 0.6 REQUIRED)
 
-find_package(Qt5Keychain)
-set_package_properties(Qt5Keychain PROPERTIES
+find_package(Qt${QT_MAJOR_VERSION}Keychain)
+set_package_properties(Qt${QT_MAJOR_VERSION}Keychain PROPERTIES
     TYPE REQUIRED
     PURPOSE "Secure storage of account secrets"
 )
@@ -69,8 +73,8 @@ if(ANDROID)
         PURPOSE "Encrypted communications"
     )
 else()
-    find_package(Qt5 ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem Sonnet)
+    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
         TYPE RUNTIME
     )
@@ -108,13 +112,19 @@ set_package_properties(KQuickImageEditor PROPERTIES
     PURPOSE "Add image editing capability to image attachments"
 )
 
-find_package(QCoro5 COMPONENTS Core QUIET)
-if(NOT QCoro5_FOUND)
+find_package(QCoro${QT_MAJOR_VERSION} COMPONENTS Core QUIET)
+if(NOT QCoro${QT_MAJOR_VERSION}_FOUND)
     find_package(QCoro REQUIRED)
 endif()
 
 qcoro_enable_coroutines()
 
+find_package(KF5DocTools ${KF5_MIN_VERSION})
+set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
+    "Tools to generate documentation"
+    TYPE OPTIONAL
+)
+
 if(NOT Quotient_VERSION_MINOR GREATER 6)
     cmake_policy(SET CMP0063 OLD)
 endif()
@@ -133,14 +143,24 @@ install(FILES org.kde.neochat.tray.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/h
 add_definitions(-DQT_NO_FOREACH)
 
 add_subdirectory(src)
+if (BUILD_TESTING AND Quotient_VERSION_MINOR GREATER 6)
+    find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
+    add_subdirectory(autotests)
+endif()
+
+if(KF5DocTools_FOUND)
+    kdoctools_install(po)
+    add_subdirectory(doc)
+endif()
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
-file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES src/*.cpp src/*.h)
-kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
-
-kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+if (NOT ANDROID)
+    file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES src/*.cpp src/*.h)
+    kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
 
+    kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+endif()
 file(GLOB_RECURSE ALL_SOURCE_FILES *.cpp *.h *.qml)
 # CI installs dependency headers to _install and _build, which break the reuse check
 # Fixes the test by excluding this directory

LICENSES/CC-BY-SA-4.0.txt

@@ -0,0 +1,170 @@
+Creative Commons Attribution-ShareAlike 4.0 International
+
+ Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
+
+Considerations for licensors: Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. More considerations for licensors.
+
+Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described.
+
+Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public.
+
+Creative Commons Attribution-ShareAlike 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
+
+Section 1 – Definitions.
+
+     a.	Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
+
+     b.	Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
+
+     c.	BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, approved by Creative Commons as essentially the equivalent of this Public License.
+
+     d.	Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+
+     e.	Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
+
+     f.	Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
+
+     g.	License Elements means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.
+
+     h.	Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
+
+     i.	Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
+
+     j.	Licensor means the individual(s) or entity(ies) granting rights under this Public License.
+
+     k.	Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
+
+     l.	Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
+
+     m.	You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
+
+Section 2 – Scope.
+
+     a.	License grant.
+
+          1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+
+               A. reproduce and Share the Licensed Material, in whole or in part; and
+
+               B. produce, reproduce, and Share Adapted Material.
+
+          2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
+
+          3. Term. The term of this Public License is specified in Section 6(a).
+
+          4. Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
+
+          5. Downstream recipients.
+
+               A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
+
+               B. Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
+
+               C. No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
+
+          6. No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
+
+     b.	Other rights.
+
+          1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
+
+          2. Patent and trademark rights are not licensed under this Public License.
+
+          3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
+
+Section 3 – License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the following conditions.
+
+     a.	Attribution.
+
+          1. If You Share the Licensed Material (including in modified form), You must:
+
+               A. retain the following if it is supplied by the Licensor with the Licensed Material:
+
+                    i.	identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
+
+                    ii.	a copyright notice;
+
+                    iii. a notice that refers to this Public License;
+
+                    iv.	a notice that refers to the disclaimer of warranties;
+
+                    v.	a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+
+               B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
+
+               C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
+
+          2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
+
+          3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
+
+     b.	ShareAlike.In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
+
+          1. The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.
+
+          2. You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
+
+          3. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
+
+Section 4 – Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
+
+     a.	for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;
+
+     b.	if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and
+
+     c.	You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
+For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+
+Section 5 – Disclaimer of Warranties and Limitation of Liability.
+
+     a.	Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
+
+     b.	To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
+
+     c.	The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
+
+Section 6 – Term and Termination.
+
+     a.	This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
+
+     b.	Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
+
+          1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
+
+          2. upon express reinstatement by the Licensor.
+
+     c.	For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
+
+     d.	For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
+
+     e.	Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+
+Section 7 – Other Terms and Conditions.
+
+     a.	The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
+
+     b.	Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
+
+Section 8 – Interpretation.
+
+     a.	For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
+
+     b.	To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
+
+     c.	No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
+
+     d.	Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
+
+Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
+
+Creative Commons may be contacted at creativecommons.org.

README.md

@@ -31,7 +31,7 @@ and can also directly be downloaded from the [binary factory](https://binary-fac
 
 Nightly builds for [Windows](https://binary-factory.kde.org/job/NeoChat_Nightly_win64/), [MacOS](https://binary-factory.kde.org/job/NeoChat_Nightly_macos/) and [AppImages](https://binary-factory.kde.org/job/NeoChat_Nightly_appimage/) can also be downloaded from the [binary factory](https://binary-factory.kde.org/search/?q=neochat).
 
-![Timeline](https://invent.kde.org/websites/product-screenshots/-/raw/master/neochat/application.png)
+![Timeline](https://cdn.kde.org/screenshots/neochat/application.png)
 
 ## Features
 
@@ -55,7 +55,7 @@ We welcome contributions in this direction.
 
 ## Contact
 
-You can reach the maintainers at #neochat:kde.org, if you are already on Matrix.
+You can reach the maintainers at [#neochat:kde.org](https://matrix.to/#/#neochat:kde.org), if you are already on Matrix.
 Development happens in http://invent.kde.org/network/neochat (not in GitHub).
 
 ## Acknowledgement

android/AndroidManifest.xml

@@ -21,7 +21,7 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
 
-            <meta-data android:name="android.app.lib_name" android:value="neochat"/>
+            <meta-data android:name="android.app.lib_name" android:value="neochat-app"/>
             <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
             <meta-data android:name="android.app.repository" android:value="default"/>
             <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>

autotests/CMakeLists.txt

@@ -0,0 +1,10 @@
+# SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
+# SPDX-License-Identifier: BSD-2-Clause
+
+enable_testing()
+
+ecm_add_test(
+    neochatroomtest.cpp
+    LINK_LIBRARIES neochat Qt::Test Quotient
+    TEST_NAME neochatroomtest
+)

autotests/neochatroomtest.cpp

@@ -0,0 +1,139 @@
+// SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include <QObject>
+#include <QSignalSpy>
+#include <QTest>
+
+#define protected public // please don't hate me
+#include "neochatroom.h"
+#undef protected
+
+#include <connection.h>
+#include <quotient_common.h>
+#include <syncdata.h>
+
+using namespace Quotient;
+
+class NeoChatRoomTest : public QObject {
+    Q_OBJECT
+
+private:
+    Connection *connection = nullptr;
+    NeoChatRoom *room = nullptr;
+
+private Q_SLOTS:
+    void initTestCase();
+    void subtitleTextTest();
+    void eventTest();
+};
+
+void NeoChatRoomTest::initTestCase()
+{
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    room = new NeoChatRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
+
+    auto json = QJsonDocument::fromJson(R"EVENT({
+  "account_data": {
+    "events": [
+      {
+        "content": {
+          "tags": {
+            "u.work": {
+              "order": 0.9
+            }
+          }
+        },
+        "type": "m.tag"
+      },
+      {
+        "content": {
+          "custom_config_key": "custom_config_value"
+        },
+        "type": "org.example.custom.room.config"
+      }
+    ]
+  },
+  "ephemeral": {
+    "events": [
+      {
+        "content": {
+          "user_ids": [
+            "@alice:matrix.org",
+            "@bob:example.com"
+          ]
+        },
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "type": "m.typing"
+      }
+    ]
+  },
+  "state": {
+    "events": [
+      {
+        "content": {
+          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
+          "displayname": "Alice Margatroid",
+          "membership": "join",
+          "reason": "Looking for support"
+        },
+        "event_id": "$143273582443PhrSn:example.org",
+        "origin_server_ts": 1432735824653,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "state_key": "@alice:example.org",
+        "type": "m.room.member",
+        "unsigned": {
+          "age": 1234
+        }
+      }
+    ]
+  },
+  "summary": {
+    "m.heroes": [
+      "@alice:example.com",
+      "@bob:example.com"
+    ],
+    "m.invited_member_count": 0,
+    "m.joined_member_count": 2
+  },
+  "timeline": {
+    "events": [
+      {
+        "content": {
+          "body": "This is an **example** text message",
+          "format": "org.matrix.custom.html",
+          "formatted_body": "<b>This is an example text message</b>",
+          "msgtype": "m.text"
+        },
+        "event_id": "$143273582443PhrSn:example.org",
+        "origin_server_ts": 1432735824654,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "type": "m.room.message",
+        "unsigned": {
+          "age": 1235
+        }
+      }
+    ],
+    "limited": true,
+    "prev_batch": "t34-23535_0_0"
+  }
+})EVENT");
+    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, json.object());
+    room->updateData(std::move(roomData));
+}
+
+void NeoChatRoomTest::subtitleTextTest()
+{
+    QCOMPARE(room->timelineSize(), 1);
+    QCOMPARE(room->subtitleText(), QStringLiteral("@example:example.org: This is an example text message"));
+}
+
+void NeoChatRoomTest::eventTest()
+{
+    QCOMPARE(room->timelineSize(), 1);
+}
+
+QTEST_MAIN(NeoChatRoomTest)
+#include "neochatroomtest.moc"

cmake/Flatpak.cmake

@@ -9,6 +9,6 @@ install(
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Flatpak/99-noto-mono-color-emoji.conf
     DESTINATION
-        ${CMAKE_INSTALL_SYSCONFDIR}/fonts/conf.d/
+        ${CMAKE_INSTALL_SYSCONFDIR}/fonts/local.conf
 )
 

doc/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})

doc/man-neochat.1.docbook

@@ -0,0 +1,85 @@
+<?xml version="1.0" ?>
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
+<!ENTITY % English "INCLUDE">
+]>
+<!--
+SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
+SPDX-License-Identifier: CC-BY-SA-4.0
+-->
+
+<refentry lang="&language;">
+<refentryinfo>
+<title>NeoChat User's Manual</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>Client for interacting with the matrix messaging protocol</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>Description</title>
+  <para>
+    <command>neochat</command> is a chat application for the matrix protocol
+    that work on both desktop and mobile.
+  </para>
+</refsect1>
+
+<refsect1 id="options"><title>Options</title>
+<variablelist>
+  <varlistentry>
+  <term><option>URI</option></term>
+  <listitem>
+    <para>
+      The matrix uri for an user or a room. e.g matrix:u/user:example.org and
+      matrix:r/root:example.org. This will makes NeoChat try to open the given
+      room or conversation.
+    </para>
+  </listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1 id="bug">
+  <title>Reporting bugs</title>
+  <para>You can report bugs and feature requests at <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General">https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General</ulink></para>
+</refsect1>
+
+<refsect1>
+  <title>See Also</title>
+  <simplelist>
+    <member>
+      A list of frequently asked questions about Matrix <ulink url="https://matrix.org/faq/">https://matrix.org/faq/</ulink>
+    </member>
+    <member>kf5options(7)</member>
+    <member>qt5options(7)</member>
+  </simplelist>
+</refsect1>
+
+<refsect1 id="copyright"><title>Copyright</title>
+<para>Copyright &copy; 2020-2022 Tobias Fella </para>
+<para>Copyright &copy; 2020-2022 Carl Schwan </para>
+<para>License: GNU General Public Version 3 or later &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>

imports/NeoChat/Component/ChatBox/ChatBar.qml

@@ -1,423 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
-// SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtQuick.Templates 2.15 as T
-import Qt.labs.platform 1.1 as Platform
-import QtQuick.Window 2.15
-
-import org.kde.kirigami 2.18 as Kirigami
-import org.kde.neochat 1.0
-
-ToolBar {
-    id: chatBar
-    property string replyEventId: ""
-    property string editEventId: ""
-    property alias inputFieldText: inputField.text
-    property alias textField: inputField
-    property alias emojiPaneOpened: emojiButton.checked
-
-    // store each user we autoComplete here, this will be helpful later to generate
-    // the matrix.to links.
-    // This use an hack to define: https://doc.qt.io/qt-5/qml-var.html#property-value-initialization-semantics
-    property var userAutocompleted: ({})
-
-    signal closeAllTriggered()
-    signal inputFieldForceActiveFocusTriggered()
-    signal messageSent()
-    signal pasteImageTriggered()
-    signal editLastUserMessage()
-    signal replyPreviousUserMessage()
-
-    property alias isCompleting: completionMenu.visible
-
-    onInputFieldForceActiveFocusTriggered: {
-        inputField.forceActiveFocus();
-        // set the cursor to the end of the text
-        inputField.cursorPosition = inputField.length;
-    }
-
-    position: ToolBar.Footer
-
-    Kirigami.Theme.colorSet: Kirigami.Theme.View
-
-    // Using a custom background because some styles like Material
-    // or Fusion might have ugly colors for a TextArea placed inside
-    // of a toolbar. ToolBar is otherwise the closest QQC2 component
-    // to what we want because of the padding and spacing values.
-    background: Rectangle {
-        color: Kirigami.Theme.backgroundColor
-    }
-
-    contentItem: RowLayout {
-        spacing: chatBar.spacing
-
-        ScrollView {
-            Layout.fillHeight: true
-            Layout.fillWidth: true
-            Layout.minimumHeight: inputField.implicitHeight
-            // lineSpacing is height+leading, so subtract leading once since leading only exists between lines.
-            Layout.maximumHeight: fontMetrics.lineSpacing * 8 - fontMetrics.leading
-                                + inputField.topPadding + inputField.bottomPadding
-
-            FontMetrics {
-                id: fontMetrics
-                font: inputField.font
-            }
-
-            TextArea {
-                id: inputField
-                focus: true
-                /* Some QQC2 styles will have their own predefined backgrounds for TextAreas.
-                * Make sure there is no background since we are using the ToolBar background.
-                *
-                * This could cause a problem if the QQC2 style was designed around TextArea
-                * background colors being very different from the QPalette::Base color.
-                * Luckily, none of the Qt QQC2 styles do that and neither do KDE's QQC2 styles.
-                */
-                background: MouseArea {
-                    acceptedButtons: Qt.NoButton
-                    cursorShape: Qt.IBeamCursor
-                    z: 1
-                }
-
-                leftPadding: mirrored ? 0 : Kirigami.Units.largeSpacing
-                rightPadding: !mirrored ? 0 : Kirigami.Units.largeSpacing
-                topPadding: 0
-                bottomPadding: 0
-
-                property real progress: 0
-                property bool autoAppeared: false
-                //property int lineHeight: contentHeight / lineCount
-
-                text: inputFieldText
-                placeholderText: currentRoom.usesEncryption ? i18n("This room is encrypted. Sending encrypted messages is not yet supported.") : editEventId.length > 0 ? i18n("Edit Message") : i18n("Write your message...")
-                verticalAlignment: TextEdit.AlignVCenter
-                horizontalAlignment: TextEdit.AlignLeft
-                wrapMode: Text.Wrap
-                readOnly: currentRoom.usesEncryption
-
-                Kirigami.Theme.colorSet: Kirigami.Theme.View
-                Kirigami.Theme.inherit: false
-                Kirigami.SpellChecking.enabled: true
-
-                color: Kirigami.Theme.textColor
-                selectionColor: Kirigami.Theme.highlightColor
-                selectedTextColor: Kirigami.Theme.highlightedTextColor
-                hoverEnabled: !Kirigami.Settings.tabletMode
-
-                selectByMouse: !Kirigami.Settings.tabletMode
-
-                ChatDocumentHandler {
-                    id: documentHandler
-                    document: inputField.textDocument
-                    cursorPosition: inputField.cursorPosition
-                    selectionStart: inputField.selectionStart
-                    selectionEnd: inputField.selectionEnd
-                    room: currentRoom ?? null
-                }
-
-                Timer {
-                    id: repeatTimer
-                    interval: 5000
-                }
-
-                function sendMessage(event) {
-                    if (isCompleting && completionMenu.count > 0) {
-                        chatBar.complete();
-                    } else if (event.modifiers & Qt.ShiftModifier) {
-                        inputField.insert(cursorPosition, "\n")
-                    } else {
-                        currentRoom.sendTypingNotification(false)
-                        chatBar.postMessage()
-                    }
-                    isCompleting = false;
-                }
-
-                Keys.onReturnPressed: { sendMessage(event) }
-                Keys.onEnterPressed: { sendMessage(event) }
-
-                Keys.onEscapePressed: {
-                    closeAllTriggered()
-                }
-
-                Keys.onPressed: {
-                    if (event.key === Qt.Key_PageDown) {
-                        switchRoomDown();
-                    } else if (event.key === Qt.Key_PageUp) {
-                        switchRoomUp();
-                    } else if (event.key === Qt.Key_V && event.modifiers & Qt.ControlModifier) {
-                        chatBar.pasteImage();
-                    } else if (event.key === Qt.Key_Up && event.modifiers & Qt.ControlModifier) {
-                        replyPreviousUserMessage();
-                    } else if (event.key === Qt.Key_Up && inputField.text.length === 0) {
-                        editLastUserMessage();
-                    }
-                }
-
-                Keys.onBacktabPressed: {
-                    if (event.modifiers & Qt.ControlModifier) {
-                        switchRoomUp();
-                        return;
-                    }
-                    if (!isCompleting) {
-                        nextItemInFocusChain(false).forceActiveFocus(Qt.TabFocusReason)
-                        return
-                    }
-                    if (!autoAppeared) {
-                        let decrementedIndex = completionMenu.currentIndex - 1
-                        // Wrap around to the last item
-                        if (decrementedIndex < 0) {
-                            decrementedIndex = Math.max(completionMenu.count - 1, 0) // 0 if count == 0
-                        }
-                        completionMenu.currentIndex = decrementedIndex
-                    } else {
-                        autoAppeared = false;
-                    }
-
-                    chatBar.complete();
-                }
-
-                // yes, decrement goes up and increment goes down visually.
-                Keys.onUpPressed: (event) => {
-                    if (chatBar.isCompleting) {
-                        event.accepted = true
-                        completionMenu.listView.decrementCurrentIndex()
-                        autoAppeared = true;
-                    }
-                    event.accepted = false
-                }
-
-                Keys.onDownPressed: (event) => {
-                    if (chatBar.isCompleting) {
-                        event.accepted = true
-                        completionMenu.listView.incrementCurrentIndex()
-                        autoAppeared = true;
-                    }
-                    event.accepted = false
-                }
-
-                Keys.onTabPressed: {
-                    if (event.modifiers & Qt.ControlModifier) {
-                        switchRoomDown();
-                        return;
-                    }
-                    if (!isCompleting) {
-                        nextItemInFocusChain().forceActiveFocus(Qt.TabFocusReason);
-                        return;
-                    }
-
-                    // TODO detect moved cursor
-
-                    // ignore first time tab was clicked so that user can select
-                    // first emoji/user
-                    if (!autoAppeared) {
-                        let incrementedIndex = completionMenu.currentIndex + 1;
-                        // Wrap around to the first item
-                        if (incrementedIndex > completionMenu.count - 1) {
-                            incrementedIndex = 0
-                        }
-                        completionMenu.currentIndex = incrementedIndex;
-                    } else {
-                        autoAppeared = false;
-                    }
-
-                    chatBar.complete();
-                }
-
-                onTextChanged: {
-                    if (!repeatTimer.running && Config.typingNotifications) {
-                        currentRoom.sendTypingNotification(true)
-                    }
-                    repeatTimer.start()
-
-                    currentRoom.cachedInput = text
-                    autoAppeared = false;
-
-                    const completionInfo = documentHandler.getAutocompletionInfo(isCompleting);
-
-                    if (completionInfo.type === ChatDocumentHandler.Ignore) {
-                        if (completionInfo.keyword) {
-                            // custom emojis
-                            const idx = completionMenu.currentIndex;
-                            completionMenu.model = Array.from(chatBar.customEmojiModel.filterModel(completionInfo.keyword)).concat(EmojiModel.filterModel(completionInfo.keyword))
-                            completionMenu.currentIndex = idx;
-                        }
-                        return;
-                    }
-
-                    if (completionInfo.type === ChatDocumentHandler.None) {
-                        isCompleting = false;
-                        return;
-                    }
-
-                    completionMenu.completionType = completionInfo.type
-                    if (completionInfo.type === ChatDocumentHandler.User) {
-                        completionMenu.model = currentRoom.getUsers(completionInfo.keyword, 10);
-                    } else if (completionInfo.type === ChatDocumentHandler.Command) {
-                        completionMenu.model = CommandModel.filterModel(completionInfo.keyword);
-                    } else {
-                        completionMenu.model = Array.from(chatBar.customEmojiModel.filterModel(completionInfo.keyword)).concat(EmojiModel.filterModel(completionInfo.keyword))
-                    }
-
-                    if (completionMenu.model.length === 0) {
-                        isCompleting = false;
-                        return;
-                    }
-
-                    if (!isCompleting) {
-                        isCompleting = true
-                        autoAppeared = true;
-                        completionMenu.endPosition = cursorPosition
-                    }
-                }
-            }
-        }
-
-        Item {
-            visible: !ChatBoxHelper.isReplying && (!ChatBoxHelper.hasAttachment || uploadingBusySpinner.running)
-            implicitWidth: uploadButton.implicitWidth
-            implicitHeight: uploadButton.implicitHeight
-            ToolButton {
-                id: uploadButton
-                anchors.fill: parent
-                // Matrix does not allow sending attachments in replies
-                visible: !ChatBoxHelper.isReplying  && !ChatBoxHelper.hasAttachment && !uploadingBusySpinner.running
-                icon.name: "mail-attachment"
-                text: i18n("Attach an image or file")
-                display: AbstractButton.IconOnly
-
-                onClicked: {
-                    if (Clipboard.hasImage) {
-                        attachDialog.open()
-                    } else {
-                        var fileDialog = openFileDialog.createObject(ApplicationWindow.overlay)
-                        fileDialog.chosen.connect((path) => {
-                            if (!path) { return }
-                            ChatBoxHelper.attachmentPath = path;
-                        })
-                        fileDialog.open()
-                    }
-                }
-
-                ToolTip.text: text
-                ToolTip.visible: hovered
-            }
-            BusyIndicator {
-                id: uploadingBusySpinner
-                anchors.fill: parent
-                visible: running
-                running: currentRoom && currentRoom.hasFileUploading
-            }
-        }
-
-        ToolButton {
-            id: emojiButton
-            icon.name: "preferences-desktop-emoticons"
-            text: i18n("Add an Emoji")
-            display: AbstractButton.IconOnly
-            checkable: true
-
-            ToolTip.text: text
-            ToolTip.visible: hovered
-        }
-
-        ToolButton {
-            id: sendButton
-            icon.name: "document-send"
-            text: i18n("Send message")
-            display: AbstractButton.IconOnly
-
-            onClicked: {
-                chatBar.postMessage()
-            }
-
-            ToolTip.text: text
-            ToolTip.visible: hovered
-        }
-    }
-
-    Action {
-        id: pasteAction
-        shortcut: StandardKey.Paste
-        onTriggered: {
-            if (Clipboard.hasImage) {
-                pasteImageTriggered();
-            }
-            activeFocusItem.paste();
-        }
-    }
-
-    CompletionMenu {
-        id: completionMenu
-        width: parent.width
-        //height: 80 //Math.min(implicitHeight, delegate.implicitHeight * 6)
-        height: implicitHeight
-        y: -height - 1
-        z: 1
-        Behavior on height {
-            NumberAnimation {
-                property: "height"
-                duration: Kirigami.Units.shortDuration
-                easing.type: Easing.OutCubic
-            }
-        }
-        onCompleteTriggered: {
-            complete()
-            isCompleting = false;
-        }
-    }
-
-    property CustomEmojiModel customEmojiModel: CustomEmojiModel {
-        connection: Controller.activeConnection
-    }
-
-    function pasteImage() {
-        let localPath = Platform.StandardPaths.writableLocation(Platform.StandardPaths.CacheLocation) + "/screenshots/" + (new Date()).getTime() + ".png";
-        if (!Clipboard.saveImage(localPath)) {
-            return;
-        }
-        ChatBoxHelper.attachmentPath = localPath;
-    }
-
-    function postMessage() {
-        checkForFancyEffectsReason();
-
-        if (ChatBoxHelper.hasAttachment) {
-            // send attachment but don't reset the text
-            actionsHandler.postMessage("", ChatBoxHelper.attachmentPath,
-                ChatBoxHelper.replyEventId, ChatBoxHelper.editEventId, {}, this.customEmojiModel);
-            currentRoom.markAllMessagesAsRead();
-            messageSent();
-            return;
-        }
-
-        const re = /^s\/([^\/]*)\/([^\/]*)/;
-        if (Config.allowQuickEdit && re.test(inputField.text)) {
-            // send edited messages
-            actionsHandler.postEdit(inputField.text);
-        } else {
-            // send normal message
-            actionsHandler.postMessage(inputField.text.trim(), ChatBoxHelper.attachmentPath,
-                ChatBoxHelper.replyEventId, ChatBoxHelper.editEventId, userAutocompleted, this.customEmojiModel);
-        }
-        currentRoom.markAllMessagesAsRead();
-        inputField.clear();
-        inputField.text = Qt.binding(function() {
-            return currentRoom ? currentRoom.cachedInput : "";
-        });
-        messageSent()
-    }
-
-    function complete() {
-        documentHandler.replaceAutoComplete(completionMenu.currentDisplayText);
-        if (completionMenu.completionType === ChatDocumentHandler.User
-            && completionMenu.currentDisplayText.length > 0
-            && completionMenu.currentItem.userId.length > 0) {
-            userAutocompleted[completionMenu.currentDisplayText] = completionMenu.currentItem.userId;
-        }
-    }
-}

imports/NeoChat/Component/ChatBox/ChatBox.qml

@@ -1,283 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
-// SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import Qt.labs.platform 1.1 as Platform
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Component.ChatBox 1.0
-import NeoChat.Component.Emoji 1.0
-
-Item {
-    id: root
-    property alias inputFieldText: chatBar.inputFieldText
-
-    signal fancyEffectsReasonFound(string fancyEffect)
-    signal messageSent()
-    signal editLastUserMessage()
-    signal replyPreviousUserMessage()
-
-    Kirigami.Theme.colorSet: Kirigami.Theme.View
-
-    implicitWidth: {
-        let w = 0
-        for(let i = 0; i < visibleChildren.length; ++i) {
-            w = Math.max(w, Math.ceil(visibleChildren[i].implicitWidth))
-        }
-        return w
-    }
-    implicitHeight: {
-        let h = 0
-        for(let i = 0; i < visibleChildren.length; ++i) {
-            h += Math.ceil(visibleChildren[i].implicitHeight)
-        }
-        return h
-    }
-
-    // For some reason, this is needed to make the height animation work even though
-    // it used to work and height should be directly affected by implicitHeight
-    height: implicitHeight
-
-    Behavior on height {
-        NumberAnimation {
-            property: "height"
-            duration: Kirigami.Units.shortDuration
-            easing.type: Easing.OutCubic
-        }
-    }
-
-    Kirigami.Separator {
-        id: connectionPaneSeparator
-        visible: connectionPane.visible
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: connectionPane.top
-        z: 1
-    }
-
-    QQC2.Pane {
-        id: connectionPane
-        padding: fontMetrics.lineSpacing * 0.25
-        FontMetrics {
-            id: fontMetrics
-            font: networkLabel.font
-        }
-        spacing: 0
-        Kirigami.Theme.colorSet: Kirigami.Theme.View
-        background: Rectangle {
-            color: Kirigami.Theme.backgroundColor
-        }
-        visible: !Controller.isOnline
-        width: parent.width
-        QQC2.Label {
-            id: networkLabel
-            text: i18n("NeoChat is offline. Please check your network connection.")
-        }
-        anchors.bottom: emojiPickerLoaderSeparator.top
-    }
-
-    Kirigami.Separator {
-        id: emojiPickerLoaderSeparator
-        visible: emojiPickerLoader.visible
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: emojiPickerLoader.top
-        z: 1
-    }
-
-    Loader {
-        id: emojiPickerLoader
-        active: visible
-        visible: chatBar.emojiPaneOpened
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: replySeparator.top
-        sourceComponent: QQC2.Pane {
-            topPadding: 0
-            bottomPadding: 0
-            rightPadding: 0
-            leftPadding: 0
-            Kirigami.Theme.colorSet: Kirigami.Theme.View
-            contentItem: EmojiPicker {
-                textArea: chatBar.textField
-                onChosen: addText(emoji)
-            }
-        }
-        Behavior on height {
-            NumberAnimation {
-                property: "height"
-                duration: Kirigami.Units.shortDuration
-                easing.type: Easing.OutCubic
-            }
-        }
-
-    }
-
-    Kirigami.Separator {
-        id: replySeparator
-        visible: replyPane.visible
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: replyPane.top
-    }
-
-
-    ReplyPane {
-        id: replyPane
-        visible: ChatBoxHelper.isReplying || ChatBoxHelper.isEditing
-        user: ChatBoxHelper.replyUser
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: attachmentSeparator.top
-        Behavior on height {
-            NumberAnimation {
-                property: "height"
-                duration: Kirigami.Units.shortDuration
-                easing.type: Easing.OutCubic
-            }
-        }
-        onReplyCancelled: {
-            root.focusInputField()
-        }
-    }
-
-    Kirigami.Separator {
-        id: attachmentSeparator
-        visible: attachmentPane.visible
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: attachmentPane.top
-    }
-
-    AttachmentPane {
-        id: attachmentPane
-        visible: ChatBoxHelper.hasAttachment
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: chatBarSeparator.top
-        Behavior on height {
-            NumberAnimation {
-                property: "height"
-                duration: Kirigami.Units.shortDuration
-                easing.type: Easing.OutCubic
-            }
-        }
-    }
-
-    Kirigami.Separator {
-        id: chatBarSeparator
-        visible: chatBar.visible
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: chatBar.top
-    }
-
-    ChatBar {
-        id: chatBar
-        visible: currentRoom.canSendEvent("m.room.message")
-        width: parent.width
-        height: visible ? implicitHeight : 0
-        anchors.bottom: parent.bottom
-
-        Behavior on height {
-            NumberAnimation {
-                property: "height"
-                duration: Kirigami.Units.shortDuration
-                easing.type: Easing.OutCubic
-            }
-        }
-
-        onCloseAllTriggered: closeAll()
-        onMessageSent: {
-            closeAll()
-            checkForFancyEffectsReason()
-            root.messageSent();
-        }
-        onEditLastUserMessage: {
-            root.editLastUserMessage();
-        }
-        onReplyPreviousUserMessage: {
-            root.replyPreviousUserMessage();
-        }
-    }
-
-    function checkForFancyEffectsReason() {
-        if (!Config.showFancyEffects) {
-            return
-        }
-
-        let text = root.inputFieldText.trim()
-        if (text.includes('\u{2744}')) {
-            root.fancyEffectsReasonFound("snowflake")
-        }
-        if (text.includes('\u{1F386}')) {
-            root.fancyEffectsReasonFound("fireworks")
-        }
-        if (text.includes('\u{1F387}')) {
-            root.fancyEffectsReasonFound("fireworks")
-        }
-        if (text.includes('\u{1F389}')) {
-            root.fancyEffectsReasonFound("confetti")
-        }
-        if (text.includes('\u{1F38A}')) {
-            root.fancyEffectsReasonFound("confetti")
-        }
-    }
-
-    function addText(text) {
-        root.inputFieldText = inputFieldText + text
-    }
-
-    function insertText(str) {
-        root.inputFieldText = inputFieldText.substr(0, inputField.cursorPosition) + str + inputFieldText.substr(inputField.cursorPosition)
-    }
-
-    function focusInputField() {
-        chatBar.inputFieldForceActiveFocusTriggered()
-    }
-
-    Connections {
-        target: RoomManager
-
-        function onCurrentRoomChanged() {
-            chatBar.userAutocompleted = {};
-        }
-    }
-
-    Connections {
-        target: ChatBoxHelper
-
-        function onShouldClearText() {
-            root.inputFieldText = "";
-        }
-
-        function onEditing(editContent, editFormatedContent) {
-            // Set the input field in edit mode
-            root.inputFieldText = editContent;
-
-            // clean autocompletion list
-            chatBar.userAutocompleted = {};
-
-            // Fill autocompletion list with values extracted from message.
-            // We can't just iterate on every user in the list and try to
-            // find matching display name since some users have display name
-            // matching frequent words and this will marks too many words as
-            // mentions.
-            const regex = /<a href=\"https:\/\/matrix.to\/#\/(@[a-zA-Z09]*:[a-zA-Z09.]*)\">([^<]*)<\/a>/g;
-
-            let match;
-            while ((match = regex.exec(editFormatedContent.toString())) !== null) {
-                chatBar.userAutocompleted[match[2]] = match[1];
-            }
-            chatBox.forceActiveFocus();
-        }
-    }
-
-    function closeAll() {
-        ChatBoxHelper.clear();
-        chatBar.emojiPaneOpened = false;
-    }
-}

imports/NeoChat/Component/ChatBox/CompletionMenu.qml

@@ -1,162 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
-// SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import Qt.labs.qmlmodels 1.0
-
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-
-Popup {
-    id: control
-
-    // Expose internal ListView properties.
-    property alias model: completionListView.model
-    property alias listView: completionListView
-    property alias currentIndex: completionListView.currentIndex
-    property alias currentItem: completionListView.currentItem
-    property alias count: completionListView.count
-    property alias delegate: completionListView.delegate
-
-    // Autocomplee text
-    property string currentDisplayText: currentItem && (currentItem.displayName ?? "")
-
-    property int completionType: ChatDocumentHandler.Emoji
-    property int beginPosition: 0
-    property int endPosition: 0
-
-    signal completeTriggered()
-
-    Kirigami.Theme.colorSet: Kirigami.Theme.View
-
-    bottomPadding: 0
-    leftPadding: 0
-    rightPadding: 0
-    topPadding: 0
-    clip: true
-
-    onVisibleChanged: if (!visible) {
-        completionListView.currentIndex = 0;
-    }
-
-    implicitHeight: Math.min(completionListView.contentHeight, Kirigami.Units.gridUnit * 10)
-
-    contentItem: ScrollView {
-        ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
-        ListView {
-            id: completionListView
-            implicitWidth: contentWidth
-            delegate: {
-                if (completionType === ChatDocumentHandler.Emoji) {
-                    emojiDelegate
-                } else if (completionType === ChatDocumentHandler.Command) {
-                    commandDelegate
-                } else if (completionType === ChatDocumentHandler.User) {
-                    usernameDelegate
-                }
-            }
-
-            keyNavigationWraps: true
-
-            //interactive: Window.window ? contentHeight + control.topPadding + control.bottomPadding > Window.window.height : false
-            clip: true
-            currentIndex: control.currentIndex || 0
-        }
-    }
-
-    background: Rectangle {
-        color: Kirigami.Theme.backgroundColor
-    }
-
-    Component {
-        id: usernameDelegate
-        Kirigami.BasicListItem {
-            id: usernameItem
-            width: ListView.view.width ?? implicitWidth
-            property string displayName: modelData.displayName
-            property string userId: modelData.id
-            leading: Kirigami.Avatar {
-                implicitHeight: Kirigami.Units.gridUnit
-                implicitWidth: implicitHeight
-                source: modelData.avatarMediaId ? ("image://mxc/" + modelData.avatarMediaId) : ""
-                color: modelData.color ? Qt.darker(modelData.color, 1.1) : null
-            }
-            labelItem.textFormat: Text.PlainText
-            text: modelData.displayName
-            onClicked: completeTriggered();
-        }
-    }
-
-    Component {
-        id: emojiDelegate
-        Kirigami.BasicListItem {
-            id: emojiItem
-            width: ListView.view.width ?? implicitWidth
-            property string displayName: modelData.isCustom ? modelData.shortname : modelData.unicode
-            text: modelData.shortname
-            height: Kirigami.Units.gridUnit * 2
-
-            leading: Image {
-                source: modelData.isCustom ? modelData.unicode : ""
-
-                width: height
-                sourceSize.width: width
-                sourceSize.height: height
-
-                Rectangle {
-                    anchors.fill: parent
-                    visible: parent.status === Image.Loading
-                    radius: height/2
-                    gradient: ShimmerGradient { }
-                }
-
-                Label {
-                    id: unicodeLabel
-
-                    visible: !modelData.isCustom
-
-                    font.family: 'emoji'
-                    font.pixelSize: height - 2
-
-                    text: modelData.unicode
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
-
-                    anchors.fill: parent
-                }
-            }
-
-            onClicked: completeTriggered();
-        }
-    }
-
-    Component {
-        id: commandDelegate
-        Kirigami.BasicListItem {
-            id: commandItem
-            width: ListView.view.width ?? implicitWidth
-            text: "<i>" + modelData.parameter.replace("<", "&lt;").replace(">", "&gt;") + "</i> " +  modelData.help
-            property string displayName: modelData.command
-
-            leading: Label {
-                id: commandLabel
-                Layout.preferredHeight: Kirigami.Units.gridUnit
-                Layout.preferredWidth: textMetrics.tightBoundingRect.width
-                text: modelData.command
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-            }
-            TextMetrics {
-                id: textMetrics
-                text: modelData.command
-                font: commandLabel.font
-            }
-            onClicked: completeTriggered();
-        }
-    }
-}

imports/NeoChat/Component/ChatBox/qmldir

@@ -1,7 +0,0 @@
-module NeoChat.Component.ChatBox
-ChatBox 1.0 ChatBox.qml
-ChatBar 1.0 ChatBar.qml
-ReplyPane 1.0 ReplyPane.qml
-AttachmentPane 1.0 AttachmentPane.qml
-CompletionMenu 1.0 CompletionMenu.qml
-EmojiPickerPane 1.0 EmojiPickerPane.qml

imports/NeoChat/Component/Emoji/EmojiPicker.qml

@@ -1,169 +0,0 @@
-// SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0 as NeoChat
-import NeoChat.Component 1.0
-
-ColumnLayout {
-    id: _picker
-
-    property string emojiCategory: "history"
-    property var textArea
-    readonly property var emojiModel: NeoChat.EmojiModel
-
-    property NeoChat.CustomEmojiModel customModel: NeoChat.CustomEmojiModel {
-        connection: NeoChat.Controller.activeConnection
-    }
-
-    signal chosen(string emoji)
-
-    spacing: 0
-
-    ListView {
-        Layout.fillWidth: true
-        Layout.preferredHeight: Kirigami.Units.gridUnit * 2 + 2 // for the focus line
-
-        boundsBehavior: Flickable.DragOverBounds
-
-        clip: true
-
-        orientation: ListView.Horizontal
-
-        model: ListModel {
-            ListElement { label: "custom"; category: "custom" }
-            ListElement { label: "⌛️"; category: "history" }
-            ListElement { label: "😏"; category: "people" }
-            ListElement { label: "🌲"; category: "nature" }
-            ListElement { label: "🍛"; category: "food"}
-            ListElement { label: "🚁"; category: "activity" }
-            ListElement { label: "🚅"; category: "travel" }
-            ListElement { label: "💡"; category: "objects" }
-            ListElement { label: "🔣"; category: "symbols" }
-            ListElement { label: "🏁"; category: "flags" }
-        }
-
-        delegate: ItemDelegate {
-            id: del
-
-            required property string label
-            required property string category
-
-            width: contentItem.Layout.preferredWidth
-            height: Kirigami.Units.gridUnit * 2
-
-            contentItem: Kirigami.Heading {
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-                level: del.label === "custom" ? 4 : 1
-
-                Layout.preferredWidth: del.label === "custom" ? implicitWidth + Kirigami.Units.largeSpacing : Kirigami.Units.gridUnit * 2
-
-                font.family: del.label === "custom" ? Kirigami.Theme.defaultFont.family : 'emoji'
-                text: del.label === "custom" ? i18n("Custom") : del.label
-            }
-
-            Rectangle {
-                anchors.bottom: parent.bottom
-
-                width: parent.width
-                height: 2
-
-                visible: emojiCategory === category
-
-                color: Kirigami.Theme.focusColor
-            }
-
-            onClicked: emojiCategory = category
-        }
-    }
-
-    Kirigami.Separator {
-        Layout.fillWidth: true
-        Layout.preferredHeight: 1
-    }
-
-    GridView {
-        Layout.fillWidth: true
-        Layout.preferredHeight: Kirigami.Units.gridUnit * 8
-        Layout.fillHeight: true
-
-        cellWidth: Kirigami.Units.gridUnit * 2
-        cellHeight: Kirigami.Units.gridUnit * 2
-
-        boundsBehavior: Flickable.DragOverBounds
-
-        clip: true
-
-        model: {
-            switch (emojiCategory) {
-            case "custom":
-                return _picker.customModel
-            case "history":
-                return emojiModel.history
-            case "people":
-                return emojiModel.people
-            case "nature":
-                return emojiModel.nature
-            case "food":
-                return emojiModel.food
-            case "activity":
-                return emojiModel.activity
-            case "travel":
-                return emojiModel.travel
-            case "objects":
-                return emojiModel.objects
-            case "symbols":
-                return emojiModel.symbols
-            case "flags":
-                return emojiModel.flags
-            }
-            return null
-        }
-
-        delegate: ItemDelegate {
-            width: Kirigami.Units.gridUnit * 2
-            height: Kirigami.Units.gridUnit * 2
-
-            contentItem: Kirigami.Heading {
-                level: 1
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-                font.family: 'emoji'
-                text: modelData.isCustom ? "" : modelData.unicode
-            }
-
-            Image {
-                visible: modelData.isCustom
-                source: visible ? modelData.unicode : ""
-                anchors.fill: parent
-                anchors.margins: 2
-
-                sourceSize.width: width
-                sourceSize.height: height
-
-                Rectangle {
-                    anchors.fill: parent
-                    visible: parent.status === Image.Loading
-                    radius: height/2
-                    gradient: ShimmerGradient { }
-                }
-            }
-
-            onClicked: {
-                if (modelData.isCustom) {
-                    chosen(modelData.shortname)
-                } else {
-                    chosen(modelData.unicode)
-                }
-                emojiModel.emojiUsed(modelData)
-            }
-        }
-
-        ScrollBar.vertical: ScrollBar {}
-    }
-}

imports/NeoChat/Component/Emoji/qmldir

@@ -1,2 +0,0 @@
-module NeoChat.Component.Emoji
-EmojiPicker 1.0 EmojiPicker.qml

imports/NeoChat/Component/FullScreenImage.qml

@@ -1,70 +0,0 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-
-import org.kde.kirigami 2.15 as Kirigami
-
-ApplicationWindow {
-    id: root
-
-    property alias source: image.source
-    property string filename
-    property string blurhash: ""
-    property int imageWidth: -1
-    property int imageHeight: -1
-
-    flags: Qt.FramelessWindowHint | Qt.WA_TranslucentBackground
-
-    title: i18n("Image View - %1", filename)
-
-    Shortcut {
-        sequence: "Escape"
-        onActivated: root.destroy()
-    }
-
-    color: Kirigami.Theme.backgroundColor
-
-    background: AbstractButton {
-        onClicked: root.destroy()
-    }
-
-    BusyIndicator {
-        visible: image.status !== Image.Ready && root.blurhash === ""
-        anchors.centerIn: parent
-        running: visible
-    }
-
-    AnimatedImage {
-	    id: image
-        anchors.centerIn: parent
-
-        width: Math.min(root.imageWidth !== -1 ? root.imageWidth : sourceSize.width, root.width)
-        height: Math.min(root.imageHeight !== -1 ? root.imageWidth : sourceSize.height, root.height)
-
-        fillMode: Image.PreserveAspectFit
-
-        Image {
-            anchors.centerIn: parent
-            width: image.width
-            height: image.height
-            source: root.blurhash !== "" ? ("image://blurhash/" + root.blurhash) : ""
-            visible: root.blurhash !== "" && parent.status !== Image.Ready
-        }
-    }
-
-    Button {
-        anchors.top: parent.top
-        anchors.right: parent.right
-
-        text: i18n("Close")
-        icon.name: "dialog-close"
-        display: AbstractButton.IconOnly
-
-        width: Kirigami.Units.gridUnit * 2
-        height: Kirigami.Units.gridUnit * 2
-
-        onClicked: root.destroy()
-    }
-}

imports/NeoChat/Component/Login/Sso.qml

@@ -1,40 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.12 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-
-LoginStep {
-    id: root
-
-    title: i18nc("@title", "Login")
-    message: i18n("Login with single sign-on")
-
-    Kirigami.FormLayout {
-        Connections {
-            target: LoginHelper
-            function onSsoUrlChanged() {
-                Qt.openUrlExternally(LoginHelper.ssoUrl)
-            }
-            function onConnected() {
-                processed("qrc:/imports/NeoChat/Component/Login/Loading.qml")
-            }
-        }
-
-        QQC2.Button {
-            text: i18n("Login")
-            onClicked: {
-                LoginHelper.loginWithSso()
-                root.showMessage(i18n("Complete the authentication steps in your browser"))
-            }
-            Component.onCompleted: forceActiveFocus()
-            Keys.onReturnPressed: clicked()
-        }
-    }
-}

imports/NeoChat/Component/Login/qmldir

@@ -1,7 +0,0 @@
-module NeoChat.Component.Login
-Login 1.0 Login.qml
-Password 1.0 Password.qml
-LoginRegister 1.0 LoginRegister.qml
-Loading 1.0 Loading.qml
-LoginMethod 1.0 LoginMethod.qml
-LoginStep 1.0 LoginStep.qml

imports/NeoChat/Component/Timeline/AudioDelegate.qml

@@ -1,77 +0,0 @@
-// SPDX-FileCopyrightText: 2019-2020 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.15
-import Qt.labs.platform 1.1 as Platform
-import QtMultimedia 5.15
-
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Dialog 1.0
-import NeoChat.Menu.Timeline 1.0
-
-TimelineContainer {
-    id: audioDelegate
-
-    width: ListView.view.width
-    onReplyClicked: ListView.view.goToEvent(eventID)
-    hoverComponent: hoverActions
-    innerObject: Control {
-        Layout.fillWidth: true
-        Layout.maximumWidth: audioDelegate.bubbleMaxWidth
-
-        Audio {
-            id: audio
-            source: currentRoom.urlToMxcUrl(content.url)
-            autoLoad: false
-        }
-
-        TapHandler {
-            acceptedButtons: Qt.RightButton
-            onTapped: openFileContext(model, parent)
-        }
-        TapHandler {
-            acceptedButtons: Qt.LeftButton
-            onLongPressed: openFileContext(model, parent)
-        }
-
-        contentItem: ColumnLayout {
-            RowLayout {
-                ToolButton {
-                    icon.name: audio.playbackState == Audio.PlayingState ? "media-playback-pause" : "media-playback-start"
-
-                    onClicked: {
-                        if (audio.playbackState == Audio.PlayingState) {
-                            audio.pause()
-                        } else {
-                            audio.play()
-                        }
-                    }
-                }
-                Label {
-                    text: model.display
-                }
-            }
-            RowLayout {
-                visible: audio.hasAudio
-                Layout.leftMargin: Kirigami.Units.largeSpacing
-                Layout.rightMargin: Kirigami.Units.largeSpacing
-                // Server doesn't support seeking, so use ProgressBar instead of Slider :(
-                ProgressBar {
-                    from: 0
-                    to: audio.duration
-                    value: audio.position
-                }
-
-                Label {
-                    text: Controller.formatDuration(audio.position) + "/" + Controller.formatDuration(audio.duration)
-                }
-            }
-        }
-    }
-}

imports/NeoChat/Component/Timeline/MessageDelegate.qml

@@ -1,36 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-
-import Qt.labs.qmlmodels 1.0
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-
-TimelineContainer {
-    id: messageDelegate
-
-    width: ListView.view.width
-    property bool isEmote: false
-
-    onReplyClicked: ListView.view.goToEvent(eventID)
-    hoverComponent: hoverActions
-
-    innerObject: RichLabel {
-        isEmote: messageDelegate.isEmote
-        Layout.maximumWidth: messageDelegate.bubbleMaxWidth
-
-        TapHandler {
-            acceptedButtons: Qt.RightButton
-            onTapped: openMessageContext(model, parent.selectedText)
-        }
-
-        TapHandler {
-            acceptedButtons: Qt.LeftButton
-            onLongPressed: openMessageContext(model, parent.selectedText)
-        }
-    }
-}

imports/NeoChat/Component/Timeline/ReadMarkerDelegate.qml

@@ -1,78 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-
-import Qt.labs.qmlmodels 1.0
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-
-QQC2.ItemDelegate {
-    padding: Kirigami.Units.largeSpacing
-    topInset: Kirigami.Units.largeSpacing
-    topPadding: Kirigami.Units.largeSpacing * 2
-    width: ListView.view.width - Kirigami.Units.gridUnit
-    x: Kirigami.Units.gridUnit / 2
-    contentItem: QQC2.Label {
-        text: i18nc("Relative time since the room was last read", "Last read: %1", time)
-    }
-
-    background: Kirigami.ShadowedRectangle {
-        color: Kirigami.Theme.backgroundColor
-        opacity: 0.6
-        radius: Kirigami.Units.smallSpacing
-        shadow.size: Kirigami.Units.smallSpacing
-        shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10)
-        border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-        border.width: 1
-    }
-
-    Timer {
-        id: makeMeDisapearTimer
-        interval: Kirigami.Units.humanMoment * 2
-        onTriggered: if (QQC2.ApplicationWindow.window.visibility !== QQC2.ApplicationWindow.Hidden) {
-            currentRoom.markAllMessagesAsRead();
-        }
-    }
-
-    ListView.onPooled: makeMeDisapearTimer.stop()
-
-    ListView.onAdd: {
-        const view = ListView.view;
-        if (view.atYEnd) {
-            makeMeDisapearTimer.start()
-        }
-    }
-
-    // When the read marker is visible and we are at the end of the list,
-    // start the makeMeDisapearTimer
-    Connections {
-        target: ListView.view
-        function onAtYEndChanged() {
-            makeMeDisapearTimer.start();
-        }
-    }
-
-
-    ListView.onRemove: {
-        const view = ListView.view;
-
-        if (view.atYEnd) {
-            // easy case just mark everything as read
-            if (QQC2.ApplicationWindow.window.visibility !== QQC2.ApplicationWindow.Hidden) {
-                currentRoom.markAllMessagesAsRead();
-            }
-            return;
-        }
-
-        // mark the last visible index
-        const lastVisibleIdx = lastVisibleIndex();
-
-        if (lastVisibleIdx < index) {
-            currentRoom.readMarkerEventId = sortedMessageEventModel.data(sortedMessageEventModel.index(lastVisibleIdx, 0), MessageEventModel.EventIdRole)
-        }
-    }
-}

imports/NeoChat/Component/Timeline/ReplyComponent.qml

@@ -1,103 +0,0 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Component.Timeline 1.0
-
-MouseArea {
-    id: replyButton
-    Layout.fillWidth: true
-    implicitHeight: replyName.implicitHeight + (loader.item ? loader.item.height : 0) + Kirigami.Units.largeSpacing
-    implicitWidth: Math.min(bubbleMaxWidth, Math.max((loader.item ? loader.item.width + Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing : 0), replyName.implicitWidth)) + Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 3
-    Component.onCompleted: {
-        parent.Layout.fillWidth = true;
-        parent.Layout.preferredWidth = Qt.binding(function() { return implicitWidth; })
-        parent.Layout.maximumWidth = Qt.binding(function() { return bubbleMaxWidth + Kirigami.Units.largeSpacing * 2; })
-    }
-    Rectangle {
-        id: replyLeftBorder
-        width: Kirigami.Units.smallSpacing
-        height: parent.height
-        x: Config.compactLayout ? Kirigami.Units.largeSpacing : 0
-        color: Kirigami.Theme.highlightColor
-    }
-
-    Kirigami.Avatar {
-        id: replyAvatar
-        anchors.left: replyLeftBorder.right
-        anchors.leftMargin: Kirigami.Units.smallSpacing
-        width: visible ? Kirigami.Units.gridUnit : 0
-        height: Kirigami.Units.gridUnit
-        sourceSize.width: width
-        sourceSize.height: height
-        Layout.alignment: Qt.AlignTop
-        visible: Config.showAvatarInTimeline
-        source: reply.author.avatarMediaId ? ("image://mxc/" + reply.author.avatarMediaId) : ""
-        name: reply.author.name || ""
-        color: reply.author.color
-    }
-
-    QQC2.Label {
-        id: replyName
-        anchors {
-            left: replyAvatar.right
-            leftMargin: Kirigami.Units.smallSpacing
-            right: parent.right
-            rightMargin: Kirigami.Units.smallSpacing
-        }
-        text: currentRoom.htmlSafeMemberName(reply.author.id)
-        color: reply.author.color
-        elide: Text.ElideRight
-    }
-
-    Loader {
-        id: loader
-        anchors.top: replyName.bottom
-        sourceComponent: {
-            switch (reply.type) {
-                case "image":
-                case "sticker":
-                    return imageComponent;
-                case "message":
-                    return textComponent;
-                // TODO support more types
-                default:
-                    return textComponent;
-            }
-        }
-
-        Component {
-            id: textComponent
-            RichLabel {
-                id: replyText
-                textMessage: reply.display
-                textFormat: Text.RichText
-                width: Math.min(implicitWidth, bubbleMaxWidth - Kirigami.Units.largeSpacing * 3)
-                x: Kirigami.Units.smallSpacing * 3 + replyAvatar.width
-            }
-        }
-
-        Component {
-            id: imageComponent
-            Image {
-                readonly property var content: reply.content
-                readonly property bool isThumbnail: !(content.info.thumbnail_info == null || content.thumbnailMediaId == null)
-                //    readonly property var info: isThumbnail ? content.info.thumbnail_info : content.info
-                readonly property var info: content.info
-                readonly property string mediaId: isThumbnail ? content.thumbnailMediaId : content.mediaId
-                source: "image://mxc/" + mediaId
-
-                width: bubbleMaxWidth * 0.75 - Kirigami.Units.smallSpacing * 5 - replyAvatar.width
-                height: reply.content.info.h / reply.content.info.w * width
-                x: Kirigami.Units.smallSpacing * 3 + replyAvatar.width
-            }
-        }
-    }
-}

imports/NeoChat/Component/Timeline/SectionDelegate.qml

@@ -1,17 +0,0 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-
-import org.kde.kirigami 2.15 as Kirigami
-
-Kirigami.Heading {
-    level: 4
-    text: model.showSection ? section : ""
-    color: Kirigami.Theme.disabledTextColor
-    horizontalAlignment: Text.AlignHCenter
-    verticalAlignment: Text.AlignVCenter
-    topPadding: Kirigami.Units.largeSpacing * 2
-    bottomPadding: Kirigami.Units.smallSpacing
-}

imports/NeoChat/Component/Timeline/StateDelegate.qml

@@ -1,66 +0,0 @@
-// SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.15 as Kirigami
-
-import NeoChat.Component 1.0
-import NeoChat.Dialog 1.0
-
-Control {
-    x: Kirigami.Units.gridUnit * 1.5 + Kirigami.Units.smallSpacing
-    width: ListView.view.width - Kirigami.Units.largeSpacing - x
-
-    height: sectionDelegate.height + rowLayout.height
-    SectionDelegate {
-        id: sectionDelegate
-        width: parent.width
-        anchors.top: parent.top
-        anchors.leftMargin: Kirigami.Units.smallSpacing
-        visible: model.showSection
-        height: visible ? implicitHeight : 0
-    }
-
-    RowLayout {
-        id: rowLayout
-        height: label.contentHeight
-        width: parent.width
-        anchors.bottom: parent.bottom
-
-        Kirigami.Avatar {
-            id: icon
-            Layout.preferredWidth: Kirigami.Units.iconSizes.small
-            Layout.preferredHeight: Kirigami.Units.iconSizes.small
-            Layout.alignment: Qt.AlignTop
-
-            name: author.displayName
-            source: author.avatarMediaId ? ("image://mxc/" + author.avatarMediaId) : ""
-            color: author.color
-
-            Component {
-                id: userDetailDialog
-
-                UserDetailDialog {}
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: userDetailDialog.createObject(ApplicationWindow.overlay, {room: currentRoom, user: author.object, displayName: author.displayName, avatarMediaId: author.avatarMediaId, avatarUrl: author.avatarUrl}).open()
-            }
-        }
-
-        Label {
-            id: label
-            Layout.alignment: Qt.AlignVCenter
-            Layout.fillWidth: true
-            Layout.preferredHeight: icon.height
-            wrapMode: Text.WordWrap
-            textFormat: Text.RichText
-            text: `<style>a {text-decoration: none;}</style><a href="https://matrix.to/#/${author.id}" style="color: ${author.color}">${currentRoom.htmlSafeMemberName(author.id)}</a> ${aggregateDisplay}`
-            onLinkActivated: userDetailDialog.createObject(ApplicationWindow.overlay, {room: currentRoom, user: author.object, displayName: author.displayName, avatarMediaId: author.avatarMediaId, avatarUrl: author.avatarUrl}).open()
-        }
-    }
-}

imports/NeoChat/Component/Timeline/TimelineContainer.qml

@@ -1,261 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.12
-
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Dialog 1.0
-
-QQC2.ItemDelegate {
-    id: messageDelegate
-    default property alias innerObject : column.children
-    // readonly property bool failed: marks == EventStatus.SendingFailed
-
-    property bool isEmote: false
-    property bool cardBackground: true
-
-    readonly property int bubbleMaxWidth: Config.compactLayout && !Config.showAvatarInTimeline ? width - Kirigami.Units.largeSpacing * 4 : (Config.compactLayout ? width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 4 : Math.min(width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 6, Kirigami.Units.gridUnit * 20))
-
-    property bool showUserMessageOnRight: Config.showLocalMessagesOnRight &&
-        model.author.isLocalUser &&
-        !applicationWindow().wideScreen &&
-        !Config.compactLayout
-
-    signal openExternally()
-    signal replyClicked(string eventID)
-
-    Component.onCompleted: {
-        if (model.isReply && model.reply === undefined) {
-            messageEventModel.loadReply(sortedMessageEventModel.mapToSource(sortedMessageEventModel.index(model.index, 0)))
-        }
-    }
-
-    topPadding: 0
-    bottomPadding: 0
-    background: null
-    property Item hoverComponent
-
-    // show hover actions
-    onHoveredChanged: {
-        if (hovered && !Kirigami.Settings.isMobile) {
-            updateHoverComponent();
-        }
-    }
-
-    // updates the global hover component to point to this delegate, and update its position
-    function updateHoverComponent() {
-        if (hoverComponent) {
-            hoverComponent.bubble = bubble
-            hoverComponent.updateFunction = updateHoverComponent;
-            hoverComponent.event = model
-        }
-    }
-
-    height: sectionDelegate.height + Math.max(model.showAuthor ? avatar.height : 0, bubble.implicitHeight) + loader.height + (showAuthor ? Kirigami.Units.largeSpacing : 0)
-
-    SectionDelegate {
-        id: sectionDelegate
-        width: parent.width
-        anchors.left: avatar.left
-        anchors.leftMargin: Kirigami.Units.smallSpacing
-        visible: model.showSection
-        height: visible ? implicitHeight : 0
-    }
-
-    Kirigami.Avatar {
-        id: avatar
-        width: visible || Config.showAvatarInTimeline ? Kirigami.Units.gridUnit * 2 : 0
-        height: width
-        sourceSize.width: width
-        sourceSize.height: width
-        anchors {
-            top: sectionDelegate.bottom
-            topMargin: model.showAuthor ? Kirigami.Units.largeSpacing : 0
-            left: parent.left
-            leftMargin: Kirigami.Units.largeSpacing
-        }
-
-        visible: model.showAuthor &&
-            Config.showAvatarInTimeline &&
-            (Config.compactLayout || !showUserMessageOnRight)
-        name: model.author.name ?? model.author.displayName
-        source: visible && model.author.avatarMediaId ? ("image://mxc/" + model.author.avatarMediaId) : ""
-        color: model.author.color
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
-                    room: currentRoom,
-                    user: author.object,
-                    displayName: author.displayName,
-                    avatarMediaId: author.avatarMediaId,
-                    avatarUrl: author.avatarUrl
-                }).open();
-            }
-            cursorShape: Qt.PointingHandCursor
-        }
-    }
-
-    QQC2.Control {
-        id: bubble
-        topPadding: Config.compactLayout ? Kirigami.Units.smallSpacing / 2 : Kirigami.Units.largeSpacing
-        bottomPadding: Config.compactLayout ? Kirigami.Units.mediumSpacing / 2 : Kirigami.Units.largeSpacing
-        leftPadding: Kirigami.Units.smallSpacing
-        rightPadding: Config.compactLayout ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing
-        hoverEnabled: true
-
-        // state: Config.compactLayout ? "compactLayout" : "default"
-        state: showUserMessageOnRight ? "userMessageOnRight" : "userMessageOnLeft"
-
-        anchors {
-            top: avatar.top
-            leftMargin: Kirigami.Units.largeSpacing
-            rightMargin: showUserMessageOnRight ? Kirigami.Units.smallSpacing : Kirigami.Units.largeSpacing
-        }
-        // HACK: anchoring didn't reset anchors.right when switching from parent.right to undefined reliably
-        width: Config.compactLayout ? messageDelegate.width - (Config.showAvatarInTimeline ? Kirigami.Units.gridUnit * 2 : 0) + Kirigami.Units.largeSpacing * 2 : implicitWidth
-
-
-        // states for anchor animations on window resize
-        // as setting anchors to undefined did not work reliably
-        states: [
-            State {
-                name: "userMessageOnRight"
-                AnchorChanges {
-                    target: bubble
-                    anchors.left: undefined
-                    anchors.right: parent.right
-                }
-            },
-            State {
-                name: "userMessageOnLeft"
-                AnchorChanges {
-                    target: bubble
-                    anchors.left: avatar.right
-                    anchors.right: undefined
-                }
-            }
-        ]
-
-        transitions: [
-            Transition {
-                AnchorAnimation{duration: Kirigami.Units.longDuration; easing.type: Easing.OutCubic}
-            }
-        ]
-
-        contentItem: ColumnLayout {
-            id: column
-            spacing: 0
-            Item {
-                id: rowLayout
-                visible: model.showAuthor && !isEmote
-                Layout.fillWidth: true
-                Layout.leftMargin: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing : 0
-                Layout.rightMargin: Kirigami.Units.largeSpacing
-                Layout.preferredWidth: nameLabel.implicitWidth + timeLabel.implicitWidth + Kirigami.Units.largeSpacing * 2
-                Layout.maximumWidth: bubbleMaxWidth
-                implicitHeight: visible ? nameLabel.implicitHeight : 0
-
-                QQC2.Label {
-                    id: nameLabel
-                    topInset: 0
-
-                    visible: model.showAuthor && !isEmote
-                    anchors.left: rowLayout.left
-                    anchors.right: timeLabel.left
-                    anchors.rightMargin: Kirigami.Units.smallSpacing
-
-                    text: visible ? author.displayName : ""
-                    textFormat: Text.PlainText
-                    font.weight: Font.Bold
-                    color: author.color
-                    wrapMode: Text.Wrap
-                    MouseArea {
-                        anchors.fill: parent
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
-                                room: currentRoom,
-                                user: author.object,
-                                displayName: author.displayName,
-                                avatarMediaId: author.avatarMediaId,
-                                avatarUrl: author.avatarUrl
-                            }).open();
-                        }
-                    }
-                }
-                QQC2.Label {
-                    id: timeLabel
-                    anchors.right: rowLayout.right
-                    visible: model.showAuthor && !isEmote
-                    text: visible ? time.toLocaleTimeString(Locale.ShortFormat) : ""
-                    color: Kirigami.Theme.disabledTextColor
-                }
-            }
-            Loader {
-                id: replyLoader
-                active: model.reply !== undefined
-                source: 'qrc:imports/NeoChat/Component/Timeline/ReplyComponent.qml'
-                visible: active
-                Layout.topMargin: Kirigami.Units.smallSpacing
-                Layout.bottomMargin: Config.compactLayout ? 0 : Kirigami.Units.smallSpacing
-
-                Connections {
-                    target: replyLoader.item
-                    function onClicked() {
-                        replyClicked(reply.eventId)
-                    }
-                }
-            }
-        }
-
-        background: Item {
-            Rectangle {
-                visible: messageDelegate.hovered
-                color: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
-                radius: Kirigami.Units.smallSpacing
-                anchors.fill: parent
-            }
-            Kirigami.ShadowedRectangle {
-                visible: cardBackground && !Config.compactLayout
-                anchors.fill: parent
-                color: {
-                    if (model.author.isLocalUser) {
-                        return Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
-                    } else if (model.isHighlighted) {
-                        return Kirigami.Theme.positiveBackgroundColor
-                    } else {
-                        return Kirigami.Theme.backgroundColor
-                    }
-                }
-                radius: Kirigami.Units.smallSpacing
-                shadow.size: Kirigami.Units.smallSpacing
-                shadow.color: !model.isHighlighted ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
-                border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-                border.width: 1
-            }
-        }
-    }
-
-    Loader {
-        id: loader
-        anchors {
-            left: bubble.left
-            right: parent.right
-            top: bubble.bottom
-            topMargin: active && Config.compactLayout ? 0 : Kirigami.Units.smallSpacing
-        }
-        height: active ? item.implicitHeight : 0
-        //Layout.bottomMargin: readMarker ? Kirigami.Units.smallSpacing : 0
-        active: eventType !== "state" && eventType !== "notice" && reaction != undefined && reaction.length > 0
-        visible: active
-        sourceComponent: ReactionDelegate { }
-    }
-}

imports/NeoChat/Component/Timeline/qmldir

@@ -1,14 +0,0 @@
-module NeoChat.Component.Timeline
-RichLabel 1.0 RichLabel.qml
-TimelineContainer 1.0 TimelineContainer.qml
-StateDelegate 1.0 StateDelegate.qml
-SectionDelegate 1.0 SectionDelegate.qml
-ImageDelegate 1.0 ImageDelegate.qml
-FileDelegate 1.0 FileDelegate.qml
-VideoDelegate 1.0 VideoDelegate.qml
-ReactionDelegate 1.0 ReactionDelegate.qml
-AudioDelegate 1.0 AudioDelegate.qml
-EncryptedDelegate 1.0 EncryptedDelegate.qml
-EventDelegate 1.0 EventDelegate.qml
-MessageDelegate 1.0 MessageDelegate.qml
-ReadMarkerDelegate 1.0 ReadMarkerDelegate.qml

imports/NeoChat/Component/qmldir

@@ -1,7 +0,0 @@
-module NeoChat.Component
-FullScreenImage 1.0 FullScreenImage.qml
-ChatTextInput 1.0 ChatTextInput.qml
-FancyEffectsContainer 1.0 FancyEffectsContainer.qml
-TypingPane 1.0 TypingPane.qml
-QuickSwitcher 1.0 QuickSwitcher.qml
-ShimmerGradient 1.0 ShimmerGradient.qml

imports/NeoChat/Dialog/qmldir

@@ -1,9 +0,0 @@
-module NeoChat.Dialog
-UserDetailDialog 1.0 UserDetailDialog.qml
-LoginDialog 1.0 LoginDialog.qml
-CreateRoomDialog 1.0 CreateRoomDialog.qml
-AcceptInvitationDialog 1.0 AcceptInvitationDialog.qml
-OpenFileDialog 1.0 OpenFileDialog.qml
-ImageClipboardDialog 1.0 ImageClipboardDialog.qml
-StartChatDialog 1.0 StartChatDialog.qml
-EmojiDialog 1.0 EmojiDialog.qml

imports/NeoChat/Menu/Timeline/qmldir

@@ -1,4 +0,0 @@
-module NeoChat.Menu.Timeline
-MessageDelegateContextMenu 1.0 MessageDelegateContextMenu.qml
-FileDelegateContextMenu 1.0 FileDelegateContextMenu.qml
-MessageSourceSheet 1.0 MessageSourceSheet.qml

imports/NeoChat/Menu/qmldir

@@ -1,6 +0,0 @@
-module NeoChat.Menu
-RoomListContextMenu 1.0 RoomListContextMenu.qml
-GlobalMenu 1.0 GlobalMenu.qml
-EditMenu 1.0 EditMenu.qml
-ShareAction 1.0 ShareAction.qml
-ShareDialog 1.0 ShareDialog.qml

imports/NeoChat/Page/JoinRoomPage.qml

@@ -1,162 +0,0 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-
-Kirigami.ScrollablePage {
-    id: root
-    property var connection
-
-    property alias keyword: identifierField.text
-    property string server
-
-    title: i18n("Explore Rooms")
-
-    Component.onCompleted: identifierField.forceActiveFocus()
-
-    header: Control {
-        padding: Kirigami.Units.largeSpacing
-        contentItem: RowLayout {
-            Kirigami.SearchField {
-                id: identifierField
-                property bool isRoomAlias: text.match(/#(.+):(.+)/g)
-                property var room: isRoomAlias ? connection.roomByAlias(text) : null
-                property bool isJoined: room != null
-
-                Layout.fillWidth: true
-
-                placeholderText: i18n("Find a room...")
-            }
-
-            Button {
-                id: joinButton
-
-                visible: identifierField.isRoomAlias
-
-                text: identifierField.isJoined ? i18n("View") : i18n("Join")
-                highlighted: true
-
-                onClicked: {
-                    if (!identifierField.isJoined) {
-                        Controller.joinRoom(identifierField.text);
-                        // When joining the room, the room will be opened
-                    }
-                    applicationWindow().pageStack.layers.pop();
-                }
-            }
-
-            ComboBox {
-                Layout.maximumWidth: 120
-
-                id: serverField
-
-                editable: currentIndex == 1
-
-                model: [i18n("Local"), i18n("Global"), "matrix.org"]
-
-                onCurrentIndexChanged: {
-                    if (currentIndex == 0) {
-                        server = ""
-                    } else if (currentIndex == 2) {
-                        server = "matrix.org"
-                    }
-                }
-
-                Keys.onReturnPressed: {
-                    if (currentIndex == 1) {
-                        server = editText
-                    }
-                }
-            }
-        }
-    }
-
-    ListView {
-        id: publicRoomsListView
-        clip: true
-        model: PublicRoomListModel {
-            id: publicRoomListModel
-
-            connection: root.connection
-            server: root.server
-            keyword: root.keyword
-        }
-
-        onContentYChanged: {
-            if(publicRoomListModel.hasMore && contentHeight - contentY < publicRoomsListView.height + 200)
-                publicRoomListModel.next();
-        }
-        delegate: Kirigami.AbstractListItem {
-            property bool justJoined: false
-            width: publicRoomsListView.width
-            onClicked: {
-                if (!isJoined) {
-                    Controller.joinRoom(roomID)
-                    justJoined = true;
-                } else {
-                    RoomManager.enterRoom(connection.room(roomID))
-                }
-                applicationWindow().pageStack.layers.pop();
-            }
-            contentItem: RowLayout {
-                Kirigami.Avatar {
-                    Layout.preferredWidth: Kirigami.Units.gridUnit * 2
-                    Layout.preferredHeight: Kirigami.Units.gridUnit * 2
-
-                    source: model.avatar ? ("image://mxc/" + model.avatar) : ""
-                    name: name
-                }
-                ColumnLayout {
-                    Layout.fillWidth: true
-                    RowLayout {
-                        Layout.fillWidth: true
-                        Kirigami.Heading {
-                            Layout.fillWidth: true
-                            level: 4
-                            text: name
-                            font.bold: true
-                            textFormat: Text.PlainText
-                            elide: Text.ElideRight
-                            wrapMode: Text.NoWrap
-                        }
-                        Label {
-                            visible: isJoined || justJoined
-                            text: i18n("Joined")
-                            color: Kirigami.Theme.linkColor
-                        }
-                    }
-                    Label {
-                        Layout.fillWidth: true
-                        visible: text
-                        text: topic ? topic.replace(/(\r\n\t|\n|\r\t)/gm," ") : ""
-                        textFormat: Text.PlainText
-                        elide: Text.ElideRight
-                        wrapMode: Text.NoWrap
-                    }
-                    RowLayout {
-                        Layout.fillWidth: true
-                        Kirigami.Icon {
-                            source: "user"
-                            color: Kirigami.Theme.disabledTextColor
-                            implicitHeight: Kirigami.Units.iconSizes.small
-                            implicitWidth: Kirigami.Units.iconSizes.small
-                        }
-                        Label {
-                            text: memberCount + " " + (alias ?? roomID)
-                            color: Kirigami.Theme.disabledTextColor
-                            elide: Text.ElideRight
-                            Layout.fillWidth: true
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

imports/NeoChat/Page/qmldir

@@ -1,9 +0,0 @@
-module NeoChat.Page
-LoadingPage 1.0 LoadingPage.qml
-RoomListPage 1.0 RoomListPage.qml
-RoomPage 1.0 RoomPage.qml
-RoomWindow 1.0 RoomWindow.qml
-JoinRoomPage 1.0 JoinRoomPage.qml
-InviteUserPage 1.0 InviteUserPage.qml
-ImageEditorPage 1.0 ImageEditorPage.qml
-

imports/NeoChat/Panel/qmldir

@@ -1,2 +0,0 @@
-module NeoChat.Panel
-RoomDrawer 1.0 RoomDrawer.qml

imports/NeoChat/RoomSettings/General.qml

@@ -1,202 +0,0 @@
-// SPDX-FileCopyrightText: 2019-2020 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Dialog 1.0
-
-Kirigami.ScrollablePage {
-    id: root
-
-    property var room
-
-    readonly property bool canChangeAvatar: room.canSendState("m.room.avatar")
-    readonly property bool canChangeName: room.canSendState("m.room.name")
-    readonly property bool canChangeTopic: room.canSendState("m.room.topic")
-    readonly property bool canChangeCanonicalAlias: room.canSendState("m.room.canonical_alias")
-
-    title: i18n('General')
-
-    ColumnLayout {
-        Kirigami.FormLayout {
-            Layout.fillWidth: true
-
-            Kirigami.Avatar {
-                Layout.bottomMargin: Kirigami.Units.largeSpacing
-
-                name: room.name
-                source: room.avatarMediaId ? ("image://mxc/" + room.avatarMediaId) : ""
-
-                RoundButton {
-                    anchors.right: parent.right
-                    anchors.bottom: parent.bottom
-                    height: Kirigami.Units.gridUnits
-                    width: Kirigami.Units.gridUnits
-                    icon.name: 'cloud-upload'
-                    Accessible.name: i18n("Update avatar")
-                    enabled: canChangeAvatar
-                    onClicked: {
-                        const fileDialog = openFileDialog.createObject(ApplicationWindow.overlay)
-
-                        fileDialog.chosen.connect(function(path) {
-                            if (!path) return
-
-                            room.changeAvatar(path)
-                        })
-
-                        fileDialog.open()
-                    }
-                }
-            }
-            TextField {
-                id: roomNameField
-                text: room.name
-                Kirigami.FormData.label: i18n("Room Name:")
-                enabled: canChangeName
-            }
-
-            TextArea {
-                id: roomTopicField
-                Layout.fillWidth: true
-                text: room.topic
-                Kirigami.FormData.label: i18n("Room topic:")
-                enabled: canChangeTopic
-            }
-
-
-            Kirigami.Separator {
-                Layout.fillWidth: true
-                visible: canonicalAliasComboBox.visible || altAlias.visible
-            }
-
-            ComboBox {
-                id: canonicalAliasComboBox
-                visible: room.aliases && room.aliases.length
-                Kirigami.FormData.label: i18n("Canonical Alias:")
-                popup.z: 999; // HACK This is an absolute hack, but combos inside OverlaySheets have their popups show up underneath, because of fun z ordering stuff
-
-                enabled: canChangeCanonicalAlias
-
-                model: room.aliases
-
-                currentIndex: room.aliases.indexOf(room.canonicalAlias)
-                onCurrentIndexChanged: {
-                    if (room.canonicalAlias != room.aliases[currentIndex]) {
-                        room.setCanonicalAlias(room.aliases[currentIndex])
-                    }
-                }
-            }
-
-            RowLayout {
-                id: altAlias
-                Kirigami.FormData.label: i18n("Other Aliases:")
-                Layout.fillWidth: true
-
-                visible: room.altAliases && room.altAliases.length
-
-                ColumnLayout {
-                    Layout.fillWidth: true
-
-                    spacing: 0
-
-                    Repeater {
-                        model: room.altAliases
-
-                        delegate: RowLayout {
-                            Layout.maximumWidth: parent.width
-
-                            Label {
-                                text: modelData
-                            }
-
-                            ToolButton {
-                                icon.name: ""
-                                onClicked: room.removeLocalAlias(modelData)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        Kirigami.Separator {
-            Layout.fillWidth: true
-            visible: next.visible || prev.visible 
-        }
-
-        Control {
-            id: next
-            Layout.fillWidth: true
-
-            visible: room.predecessorId && room.connection.room(room.predecessorId)
-
-            padding: Kirigami.Units.largeSpacing
-
-            contentItem: Kirigami.InlineMessage {
-                text: i18n("This room continues another conversation.")
-                actions: Kirigami.Action {
-                    text: i18n("See older messages...")
-                    onTriggered: {
-                        roomListForm.enteredRoom = Controller.activeConnection.room(room.predecessorId)
-                        root.close()
-                    }
-                }
-            }
-        }
-
-        Control {
-            id: prev
-            Layout.fillWidth: true
-
-            visible: room.successorId && room.connection.room(room.successorId)
-
-            padding: Kirigami.Units.largeSpacing
-
-            contentItem: Kirigami.InlineMessage {
-                text: i18n("This room has been replaced.")
-                actions: Kirigami.Action {
-                    text: i18n("See new room...")
-                    onTriggered: {
-                        roomListForm.enteredRoom = Controller.activeConnection.room(room.successorId)
-                        root.close()
-                    }
-                }
-            }
-        }
-
-        Component {
-            id: openFileDialog
-
-            OpenFileDialog {}
-        }
-    }
-
-    footer: ToolBar {
-        contentItem: RowLayout {
-            Item {
-                Layout.fillWidth: true
-            }
-            Button {
-                Layout.alignment: Qt.AlignRight
-                enabled: room.name !== roomNameField.text || room.topic !== roomTopicField.text
-                text: i18n("Apply")
-                onClicked: {
-                    if (room.name != roomNameField.text) {
-                        room.setName(roomNameField.text)
-                    }
-
-                    if (room.topic != roomTopicField.text) {
-                        room.setTopic(roomTopicField.text)
-                    }
-                }
-            }
-        }
-    }
-}
-

imports/NeoChat/RoomSettings/Security.qml

@@ -1,69 +0,0 @@
-// SPDX-FileCopyrightText: 2019-2020 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Dialog 1.0
-
-Kirigami.ScrollablePage {
-    id: root
-
-    property var room
-
-    title: i18n('Security')
-
-    ColumnLayout {
-        Kirigami.FormLayout {
-            Layout.fillWidth: true
-
-            CheckBox {
-                text: i18nc("@option:check", "Private (invite only)")
-                Kirigami.FormData.label: i18nc("@option:check", "Access:")
-                checked: room.joinRule === "invite"
-                enabled: false
-            }
-            Label {
-                text: i18n("Only invited people can join.")
-                font: Kirigami.Theme.smallFont
-            }
-            CheckBox {
-                text: i18nc("@option:check", "Space members")
-                checked: room.joinRule === "restricted"
-                enabled: false
-            }
-            Label {
-                text: i18n("Anyone in a space can find and join.")
-                font: Kirigami.Theme.smallFont
-            }
-            CheckBox {
-                text: i18nc("@option:check", "Public")
-                checked: room.joinRule === "public"
-                enabled: false
-            }
-            Label {
-                text: i18nc("@option:check", "Anyone can find and join.") + room.joinRule
-                font: Kirigami.Theme.smallFont
-            }
-        }
-    }
-
-    footer: ToolBar {
-        contentItem: RowLayout {
-            Item {
-                Layout.fillWidth: true
-            }
-            Button {
-                Layout.alignment: Qt.AlignRight
-                enabled: false
-                text: i18n("Apply")
-            }
-        }
-    }
-}
-

imports/NeoChat/Settings/AccountsPage.qml

@@ -1,216 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as Controls
-import QtQuick.Layouts 1.15
-import Qt.labs.platform 1.1
-
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Dialog 1.0
-
-Kirigami.ScrollablePage {
-    title: i18n("Accounts")
-
-    actions.main: Kirigami.Action {
-        text: i18n("Add an account")
-        icon.name: "list-add-user"
-        onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/WelcomePage.qml")
-        visible: !pageSettingStack.wideMode
-    }
-
-    ListView {
-        model: AccountRegistry
-        delegate: Kirigami.BasicListItem {
-            text: model.connection.localUser.displayName
-            labelItem.textFormat: Text.PlainText
-            subtitle: model.connection.localUserId
-            icon: model.connection.localUser.avatarMediaId ? ("image://mxc/" + model.connection.localUser.avatarMediaId) : "im-user"
-
-            onClicked: {
-                Controller.activeConnection = model.connection
-                pageStack.layers.pop()
-            }
-
-            trailing: RowLayout {
-                Controls.ToolButton {
-                    display: Controls.AbstractButton.IconOnly
-                    action: Kirigami.Action {
-                        text: i18n("Edit this account")
-                        iconName: "document-edit"
-                        onTriggered: {
-                            userEditSheet.connection = model.connection
-                            userEditSheet.open()
-                        }
-                    }
-                }
-                Controls.ToolButton {
-                    display: Controls.AbstractButton.IconOnly
-                    action: Kirigami.Action {
-                        text: i18n("Logout")
-                        iconName: "im-kick-user"
-                        onTriggered: {
-                            Controller.logout(model.connection, true)
-                            if(Controller.accountCount === 1)
-                                pageStack.layers.pop()
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    footer: Controls.ToolBar {
-        Kirigami.Theme.colorSet: Kirigami.Theme.Window
-        Kirigami.ActionToolBar {
-            alignment: Qt.AlignRight
-            rightPadding: Kirigami.Units.smallSpacing
-            width: parent.width
-            flat: false
-            actions: Kirigami.Action {
-                text: i18n("Add an account")
-                icon.name: "list-add-user"
-                onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/WelcomePage.qml")
-            }
-        }
-    }
-    Connections {
-        target: Controller
-        function onConnectionAdded() {
-            if (pageStack.layers.depth > 2)
-                pageStack.layers.pop()
-        }
-        function onPasswordStatus(status) {
-            if(status == Controller.Success)
-                showPassiveNotification(i18n("Password changed successfully"))
-            else if(status == Controller.Wrong)
-                showPassiveNotification(i18n("Wrong password entered"))
-            else
-                showPassiveNotification(i18n("Unknown problem while trying to change password"))
-        }
-    }
-
-    Component {
-        id: openFileDialog
-
-        OpenFileDialog {
-            folder: StandardPaths.writableLocation(StandardPaths.PicturesLocation)
-        }
-    }
-
-    Kirigami.OverlaySheet {
-        id: userEditSheet
-
-        property var connection
-
-        title: i18n("Edit Account")
-
-        Kirigami.FormLayout {
-            RowLayout {
-                Kirigami.Avatar {
-                    id: avatar
-                    source: userEditSheet.connection && userEditSheet.connection.localUser.avatarMediaId ? ("image://mxc/" + userEditSheet.connection.localUser.avatarMediaId) : ""
-
-                    MouseArea {
-                        id: mouseArea
-                        anchors.fill: parent
-                        property var fileDialog: null;
-                        onClicked: {
-                            if (fileDialog != null) {
-                                return;
-                            }
-
-                            fileDialog = openFileDialog.createObject(Controls.ApplicationWindow.Overlay)
-
-                            fileDialog.chosen.connect(function(receivedSource) {
-                                mouseArea.fileDialog = null;
-                                if (!receivedSource) {
-                                    return;
-                                }
-                                parent.source = receivedSource;
-                            });
-                            fileDialog.onRejected.connect(function() {
-                                mouseArea.fileDialog = null;
-                            });
-                            fileDialog.open();
-                        }
-                    }
-                }
-                Controls.Button {
-                    visible: avatar.source.toString().length !== 0
-                    icon.name: "edit-clear"
-
-                    onClicked: avatar.source = ""
-                }
-                Kirigami.FormData.label: i18n("Avatar:")
-            }
-            Controls.TextField {
-                id: name
-                text: userEditSheet.connection ? userEditSheet.connection.localUser.displayName : ""
-                Kirigami.FormData.label: i18n("Name:")
-            }
-            Controls.TextField {
-                id: accountLabel
-                text: userEditSheet.connection ? userEditSheet.connection.localUser.accountLabel : ""
-                Kirigami.FormData.label: i18n("Label:")
-            }
-            Controls.TextField {
-                id: currentPassword
-                Kirigami.FormData.label: i18n("Current Password:")
-                enabled: userEditSheet.connection !== undefined && userEditSheet.connection.canChangePassword !== false
-                echoMode: TextInput.Password
-            }
-            Controls.TextField {
-                id: newPassword
-                Kirigami.FormData.label: i18n("New Password:")
-                enabled: userEditSheet.connection !== undefined && userEditSheet.connection.canChangePassword !== false
-                echoMode: TextInput.Password
-
-            }
-            Controls.TextField {
-                id: confirmPassword
-                Kirigami.FormData.label: i18n("Confirm new Password:")
-                enabled: userEditSheet.connection !== undefined && userEditSheet.connection.canChangePassword !== false
-                echoMode: TextInput.Password
-            }
-
-            RowLayout {
-                Controls.Button {
-                    text: i18n("Save")
-                    onClicked: {
-                        if(!Controller.setAvatar(userEditSheet.connection, avatar.source))
-                            showPassiveNotification("The Avatar could not be set")
-                        if(userEditSheet.connection.localUser.displayName !== name.text)
-                            userEditSheet.connection.localUser.rename(name.text)
-                        if(userEditSheet.connection.localUser.accountLabel !== accountLabel.text)
-                            userEditSheet.connection.localUser.setAccountLabel(accountLabel.text)
-                        if(currentPassword.text !== "" && newPassword.text !== "" && confirmPassword.text !== "") {
-                            if(newPassword.text === confirmPassword.text) {
-                                Controller.changePassword(userEditSheet.connection, currentPassword.text, newPassword.text)
-                            } else {
-                                showPassiveNotification(i18n("Passwords do not match"))
-                                return
-                            }
-                        }
-                        userEditSheet.close()
-                        currentPassword.text = ""
-                        newPassword.text = ""
-                        confirmPassword.text = ""
-                    }
-                }
-                Controls.Button {
-                    text: i18n("Cancel")
-                    onClicked: {
-                        userEditSheet.close()
-                        avatar.source = userEditSheet.connection.localUser.avatarMediaId ? ("image://mxc/" + userEditSheet.connection.localUser.avatarMediaId) : ""
-                        currentPassword.text = ""
-                        newPassword.text = ""
-                        confirmPassword.text = ""
-                    }
-                }
-            }
-        }
-    }
-}

imports/NeoChat/Settings/AppearanceSettingsPage.qml

@@ -1,256 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-import NeoChat.Settings 1.0
-
-Kirigami.ScrollablePage {
-    title: i18nc('@title:window', 'Appearance')
-    ColumnLayout {
-        RowLayout {
-            Layout.alignment: Qt.AlignCenter
-            spacing: Kirigami.Units.gridUnit * 2
-            QQC2.ButtonGroup { id: themeGroup }
-            ThemeRadioButton {
-                innerObject: [
-                    RowLayout {
-                        Layout.fillWidth: true
-                        Kirigami.Avatar {
-                            color: "#4a5bcc"
-                            Layout.alignment: Qt.AlignTop
-                            visible: Config.showAvatarInTimeline
-                            Layout.preferredWidth: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing * 2 : 0
-                            Layout.preferredHeight: Kirigami.Units.largeSpacing * 2
-                        }
-                        QQC2.Control {
-                            Layout.fillWidth: true
-                            contentItem: ColumnLayout {
-                                QQC2.Label {
-                                    Layout.fillWidth: true
-                                    font.weight: Font.Bold
-                                    font.pixelSize: 7
-                                    text: "Paul Müller"
-                                    color: "#4a5bcc"
-                                    wrapMode: Text.Wrap
-                                }
-                                QQC2.Label {
-                                    Layout.fillWidth: true
-                                    text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus facilisis porta mauris, quis finibus sem suscipit tincidunt."
-                                    wrapMode: Text.Wrap
-                                    font.pixelSize: 7
-                                }
-                            }
-                            background: Kirigami.ShadowedRectangle {
-                                color: Kirigami.Theme.backgroundColor
-                                radius: Kirigami.Units.smallSpacing
-                                shadow.size: Kirigami.Units.smallSpacing
-                                shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10)
-                                border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-                                border.width: 1
-                            }
-                        }
-                    },
-                    RowLayout {
-                        Layout.fillWidth: true
-                        Kirigami.Avatar {
-                            color: "#9f244b"
-                            Layout.alignment: Qt.AlignTop
-                            visible: Config.showAvatarInTimeline
-                            Layout.preferredWidth: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing * 2 : 0
-                            Layout.preferredHeight: Kirigami.Units.largeSpacing * 2
-                        }
-                        QQC2.Control {
-                            Layout.fillWidth: true
-                            contentItem: ColumnLayout {
-                                QQC2.Label {
-                                    Layout.fillWidth: true
-                                    font.weight: Font.Bold
-                                    font.pixelSize: 7
-                                    text: "Jean Paul"
-                                    color: "#9f244b"
-                                    wrapMode: Text.Wrap
-                                }
-                                QQC2.Label {
-                                    Layout.fillWidth: true
-                                    text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus facilisis porta , quis sem suscipit tincidunt."
-                                    wrapMode: Text.Wrap
-                                    font.pixelSize: 7
-                                }
-                            }
-                            background: Kirigami.ShadowedRectangle {
-                                color: Kirigami.Theme.backgroundColor
-                                radius: Kirigami.Units.smallSpacing
-                                shadow.size: Kirigami.Units.smallSpacing
-                                shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10)
-                                border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-                                border.width: 1
-                            }
-                        }
-                    }
-                ]
-
-                text: i18n("Bubbles")
-                checked: !Config.compactLayout
-                QQC2.ButtonGroup.group: themeGroup
-                enabled: !Config.isCompactLayoutImmutable
-
-                onToggled: {
-                    Config.compactLayout = !checked;
-                    Config.save();
-                }
-            }
-            ThemeRadioButton {
-                innerObject: [
-                    RowLayout {
-                        Layout.fillWidth: true
-                        Kirigami.Avatar {
-                            color: "#4a5bcc"
-                            Layout.alignment: Qt.AlignTop
-                            visible: Config.showAvatarInTimeline
-                            Layout.preferredWidth: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing * 2 : 0
-                            Layout.preferredHeight: Kirigami.Units.largeSpacing * 2
-                        }
-                        ColumnLayout {
-                            Layout.fillWidth: true
-                            QQC2.Label {
-                                Layout.fillWidth: true
-                                font.weight: Font.Bold
-                                font.pixelSize: 7
-                                text: "Paul Müller"
-                                color: "#4a5bcc"
-                                wrapMode: Text.Wrap
-                            }
-                            QQC2.Label {
-                                Layout.fillWidth: true
-                                text: "Lorem ipsum dolor sit amet, consectetur elit. Vivamus facilisis porta mauris, finibus sem suscipit tincidunt."
-                                wrapMode: Text.Wrap
-                                font.pixelSize: 7
-                            }
-                        }
-                    },
-                    RowLayout {
-                        Layout.fillWidth: true
-                        Kirigami.Avatar {
-                            color: "#9f244b"
-                            Layout.alignment: Qt.AlignTop
-                            visible: Config.showAvatarInTimeline
-                            Layout.preferredWidth: Config.showAvatarInTimeline ? Kirigami.Units.largeSpacing * 2 : 0
-                            Layout.preferredHeight: Kirigami.Units.largeSpacing * 2
-                        }
-                        ColumnLayout {
-                            Layout.fillWidth: true
-                            QQC2.Label {
-                                Layout.fillWidth: true
-                                font.weight: Font.Bold
-                                font.pixelSize: 7
-                                text: "Jean Paul"
-                                color: "#9f244b"
-                                wrapMode: Text.Wrap
-                            }
-                            QQC2.Label {
-                                Layout.fillWidth: true
-                                text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus facilisis porta mauris, quis finibus sem suscipit tincidunt."
-                                wrapMode: Text.Wrap
-                                font.pixelSize: 7
-                            }
-                        }
-                    }
-                ]
-                text: i18n("Compact")
-                checked: Config.compactLayout
-                QQC2.ButtonGroup.group: themeGroup
-                enabled: !Config.isCompactLayoutImmutable
-
-                onToggled: {
-                    Config.compactLayout = checked;
-                    Config.save();
-                }
-            }
-        }
-        Kirigami.FormLayout {
-            Layout.maximumWidth: parent.width
-            QQC2.CheckBox {
-                Kirigami.FormData.label: "Show Avatar:"
-                text: i18n("In Chat")
-                checked: Config.showAvatarInTimeline
-                onToggled: {
-                    Config.showAvatarInTimeline = checked
-                    Config.save()
-                }
-                enabled: !Config.isShowAvatarInTimelineImmutable
-            }
-            QQC2.CheckBox {
-                text: i18n("In Sidebar")
-                checked: Config.showAvatarInRoomDrawer
-                enabled: !Config.isShowAvatarInRoomDrawerImmutable
-                onToggled: {
-                    Config.showAvatarInRoomDrawer = checked
-                    Config.save()
-                }
-            }
-            QQC2.CheckBox {
-                text: i18n("Show Fancy Effects")
-                checked: Config.showFancyEffects
-                enabled: !Config.isShowFancyEffectsImmutable
-                onToggled: {
-                    Config.showFancyEffects = checked;
-                    Config.save();
-                }
-            }
-            Loader {
-                visible: item !== null
-                Kirigami.FormData.label: item ? i18n("Theme:") : ""
-                source: "qrc:/imports/NeoChat/Settings/ColorScheme.qml"
-            }
-            QQC2.CheckBox {
-                visible: Controller.hasWindowSystem
-                text: i18n("Use transparent chat page")
-                enabled: !Config.compactLayout && !Config.isBlurImmutable
-                checked: Config.blur
-                onToggled: {
-                    Config.blur = checked;
-                    Config.save();
-                }
-            }
-            RowLayout {
-                visible: Controller.hasWindowSystem && Config.blur
-                enabled: !Config.isTransparancyImmutable
-                Kirigami.FormData.label: i18n("Transparency:")
-                QQC2.Slider {
-                    enabled: !Config.compactLayout && Config.blur
-                    from: 0
-                    to: 1
-                    stepSize: 0.05
-                    value: Config.transparency
-                    onMoved: {
-                        Config.transparency = value;
-                        Config.save();
-                    }
-
-                    HoverHandler { id: sliderHover }
-                    QQC2.ToolTip.visible: sliderHover.hovered && !enabled
-                    QQC2.ToolTip.text: i18n("Only enabled if the transparent chat page is enabled.")
-                }
-                QQC2.Label {
-                    text: Math.round(Config.transparency * 100) + "%"
-                }
-            }
-            QQC2.CheckBox {
-                text: i18n("Show your messages on the right")
-                checked: Config.showLocalMessagesOnRight
-                enabled: !Config.isShowLocalMessagesOnRightImmutable
-                onToggled: {
-                    Config.showLocalMessagesOnRight = checked
-                    Config.save()
-                }
-            }
-        }
-    }
-}

imports/NeoChat/Settings/DevicesPage.qml

@@ -1,105 +0,0 @@
-// SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as Controls
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-
-Kirigami.ScrollablePage {
-    title: i18n("Devices")
-
-    ListView {
-        model: DevicesModel {
-            id: devices
-        }
-
-        Kirigami.PlaceholderMessage {
-            visible: parent.model.count === 0 // We can assume 0 means loading since there is at least one device
-            anchors.centerIn: parent
-            text: i18n("Loading…")
-            Controls.BusyIndicator {
-                running: parent.visible
-            }
-        }
-
-        delegate: Kirigami.BasicListItem {
-            text: model.displayName
-            subtitle: model.id
-            icon: "network-connect"
-            trailing: RowLayout {
-                Controls.ToolButton {
-                    display: Controls.AbstractButton.IconOnly
-                    action: Kirigami.Action {
-                        text: i18n("Edit device name")
-                        iconName: "document-edit"
-                        onTriggered: {
-                            renameSheet.index = model.index
-                            renameSheet.name = model.displayName
-                            renameSheet.open()
-                        }
-                    }
-                }
-                Controls.ToolButton {
-                    display: Controls.AbstractButton.IconOnly
-                    action: Kirigami.Action {
-                        text: i18n("Logout device")
-                        iconName: "edit-delete-remove"
-                        onTriggered: {
-                            passwordSheet.index = index
-                            passwordSheet.open()
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    Kirigami.OverlaySheet {
-        id: passwordSheet
-
-        property var index
-
-        title: i18n("Remove device")
-        Kirigami.FormLayout {
-            Controls.TextField {
-                id: passwordField
-                Kirigami.FormData.label: i18n("Password:")
-                echoMode: TextInput.Password
-            }
-            Controls.Button {
-                text: i18n("Confirm")
-                onClicked: {
-                    devices.logout(passwordSheet.index, passwordField.text)
-                    passwordField.text = ""
-                    passwordSheet.close()
-                }
-            }
-        }
-    }
-
-    Kirigami.OverlaySheet {
-        id: renameSheet
-        property int index
-        property string name
-
-        title: i18n("Edit device")
-        Kirigami.FormLayout {
-            Controls.TextField {
-                id: nameField
-                Kirigami.FormData.label: i18n("Name:")
-                text: renameSheet.name
-            }
-            Controls.Button {
-                text: i18n("Save")
-                onClicked: {
-                    devices.setName(renameSheet.index, nameField.text)
-                    renameSheet.close()
-                }
-            }
-        }
-    }
-}

imports/NeoChat/Settings/GeneralSettingsPage.qml

@@ -1,133 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-// SPDX-FileCopyrightText: 2021 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-
-Kirigami.ScrollablePage {
-    title: i18nc('@title:window', 'General')
-    ColumnLayout {
-        Kirigami.FormLayout {
-            QQC2.CheckBox {
-                Kirigami.FormData.label: i18n("General settings:")
-                text: i18n("Close to system tray")
-                checked: Config.systemTray
-                visible: Controller.supportSystemTray
-                enabled: !Config.isSystemTrayImmutable
-                onToggled: {
-                    Config.systemTray = checked
-                    Config.save()
-                }
-            }
-            QQC2.CheckBox {
-                text: i18n("Minimize to system tray on startup")
-                checked: Config.minimizeToSystemTrayOnStartup
-                visible: Controller.supportSystemTray && !Kirigami.Settings.isMobile
-                enabled: Config.systemTray && !Config.isMinimizeToSystemTrayOnStartupImmutable
-                onToggled: {
-                    Config.minimizeToSystemTrayOnStartup = checked
-                    Config.save()
-                }
-            }
-            QQC2.CheckBox {
-                // TODO: When there are enough notification and timeline event
-                // settings, make 2 separate groups with FormData labels.
-                Kirigami.FormData.label: i18n("Notifications and events:")
-                text: i18n("Show notifications")
-                checked: Config.showNotifications
-                enabled: !Config.isShowNotificationsImmutable
-                onToggled: {
-                    Config.showNotifications = checked
-                    Config.save()
-                }
-            }
-            QQC2.CheckBox {
-                text: i18n("Show leave and join events")
-                checked: Config.showLeaveJoinEvent
-                enabled: !Config.isShowLeaveJoinEventImmutable
-                onToggled: {
-                    Config.showLeaveJoinEvent = checked
-                    Config.save()
-                }
-            }
-            QQC2.CheckBox {
-                text: i18n("Show name change events")
-                checked: Config.showRename
-                enabled: !Config.isShowRenameImmutable
-                onToggled: {
-                    Config.showRename = checked
-                    Config.save()
-                }
-            }
-            QQC2.CheckBox {
-                text: i18n("Show avatar update events")
-                checked: Config.showAvatarUpdate
-                enabled: !Config.isShowAvatarUpdateImmutable
-                onToggled: {
-                    Config.showAvatarUpdate = checked
-                    Config.save()
-                }
-            }
-            QQC2.RadioButton {
-                Kirigami.FormData.label: i18n("Rooms and private chats:")
-                text: i18n("Separated")
-                checked: !Config.mergeRoomList
-                enabled: !Config.isMergeRoomListImmutable
-                onToggled: {
-                    Config.mergeRoomList = false
-                    Config.save()
-                }
-            }
-            QQC2.RadioButton {
-                text: i18n("Intermixed")
-                checked: Config.mergeRoomList
-                enabled: !Config.isMergeRoomListImmutable
-                onToggled: {
-                    Config.mergeRoomList = true
-                    Config.save()
-                }
-            }
-            QQC2.CheckBox {
-                id: quickEditCheckbox
-                Layout.maximumWidth: parent.width
-                contentItem: QQC2.Label {
-                    text: i18n("Use s/text/replacement syntax to edit your last message")
-                    horizontalAlignment: Text.AlignLeft
-                    verticalAlignment: Text.AlignVCenter
-                    leftPadding: quickEditCheckbox.indicator.width + quickEditCheckbox.spacing
-                    wrapMode: QQC2.Label.Wrap
-                }
-                checked: Config.allowQuickEdit
-                enabled: !Config.isAllowQuickEditImmutable
-                onToggled: {
-                    Config.allowQuickEdit = checked
-                    Config.save()
-                }
-            }
-            QQC2.CheckBox {
-                text: i18n("Send Typing Notifications")
-                checked: Config.typingNotifications
-                enabled: !Config.isTypingNotificationsImmutable
-                onToggled: {
-                    Config.typingNotifications = checked
-                    Config.save()
-                }
-            }
-            QQC2.CheckBox {
-                text: i18n("Automatically hide/unhide the room information when resizing the window")
-                checked: Config.autoRoomInfoDrawer
-                enabled: !Config.isAutoRoomInfoDrawerImmutable
-                onToggled: {
-                    Config.autoRoomInfoDrawer = checked
-                    Config.save()
-                }
-            }
-        }
-    }
-}

imports/NeoChat/Settings/qmldir

@@ -1,4 +0,0 @@
-module NeoChat.Settings
-ThemeRadioButton 1.0 ThemeRadioButton.qml
-SettingsPage 1.0 SettingsPage.qml
-SonnetConfigPage 1.0 SonnetConfigPage.qml

org.kde.neochat.appdata.xml

@@ -24,7 +24,9 @@
   <name xml:lang="hu">NeoChat</name>
   <name xml:lang="ia">Neochat</name>
   <name xml:lang="id">NeoChat</name>
+  <name xml:lang="ie">NeoChat</name>
   <name xml:lang="it">NeoChat</name>
+  <name xml:lang="ka">NeoChat</name>
   <name xml:lang="ko">NeoChat</name>
   <name xml:lang="nl">NeoChat</name>
   <name xml:lang="nn">NeoChat</name>
@@ -44,7 +46,7 @@
   <summary xml:lang="ar">عميل لماتركس، ميفاق الاتصال اللامركزي</summary>
   <summary xml:lang="az">Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu</summary>
   <summary xml:lang="ca">Un client per al Matrix, el protocol de comunicacions descentralitzat</summary>
-  <summary xml:lang="ca-valencia">Un client per al Matrix, el protocol de comunicacions descentralitzat</summary>
+  <summary xml:lang="ca-valencia">Un client per a Matrix, el protocol de comunicacions descentralitzat</summary>
   <summary xml:lang="cs">Klient pro decentralizovaný komunikační protokol matrix</summary>
   <summary xml:lang="de">Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll</summary>
   <summary xml:lang="en-GB">A client for matrix, the decentralised communication protocol</summary>
@@ -55,7 +57,9 @@
   <summary xml:lang="hu">Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz</summary>
   <summary xml:lang="ia">Un cliente per Matrix, le protocollo de communication decentralisate</summary>
   <summary xml:lang="id">Klien untuk matrix, protokol komunikasi terdesentralisasi</summary>
+  <summary xml:lang="ie">Un cliente de Matrix, li protocol de communication decentralisat</summary>
   <summary xml:lang="it">Un client per matrix, il protocollo di comunicazione decentralizzato</summary>
+  <summary xml:lang="ka">კლიენტი Matrix-სთვის, დეცენტრალიზებული კომუნიკაციის პროტოკოლისთვის</summary>
   <summary xml:lang="ko">Matrix, 분산 대화 프로토콜 클라이언트</summary>
   <summary xml:lang="nl">Een client voor matrix, het gedecentraliseerde communicatieprotocol</summary>
   <summary xml:lang="nn">Ein klient for Matrix, den desentraliserte lynmeldings­protokollen</summary>
@@ -85,7 +89,9 @@
     <p xml:lang="hu">A NeoChat egy Matrix kliens. Szöveges üzeneteket, videókat ésaudio fájlokat küldhet családjának, kollégáinak és barátainak a Matrix protokoll használatával.</p>
     <p xml:lang="ia">NeoChat es un cliente de Matrix. Illo te permitte inviar messager de texto, files de video e audio a tu familia, collegas e amicos usante le protocollo de Matrix.</p>
     <p xml:lang="id">NeoChat adalah sebuah klien Matrix. Memungkinkan Anda untuk mengirim pesan teks, file video dan audio ke keluarga, kolega dan teman Anda menggunakan protokol Matrix.</p>
+    <p xml:lang="ie">NeoChat es un cliente de Matrix. On posse usar it por inviar missages textual, video- e audiofiles a su familie, colegos e amics med li protocol Matrix.</p>
     <p xml:lang="it">NeoChat è un client Matrix. Ti consente di inviare messaggi di testo, file video e audio a familiari, colleghi e amici utilizzando il protocollo Matrix.</p>
+    <p xml:lang="ka">NeoChat არის Matrix კლიენტი. ის საშუალებას გაძლევთ გაგზავნოთ ტექსტური შეტყობინებები, ვიდეოები და აუდიო ფაილები თქვენს ოჯახს, კოლეგებსა და მეგობრებს მატრიქსის პროტოკოლის გამოყენებით.</p>
     <p xml:lang="ko">NeoChat은 Matrix 클라이언트입니다. Matrix 프로토콜을 사용하여 가족, 동료, 친구에게 텍스트 메시지, 동영상, 오디오 파일을 전송할 수 있습니다.</p>
     <p xml:lang="nl">NeoChat is een Matrix-client. Het biedt u het verzenden van tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden met het Matrix-protocol.</p>
     <p xml:lang="pl">NeoChat jest programem do Matrisa. Umożliwia wysyłanie wiadomości tekstowych, filmów oraz dźwięku do twojej rodziny, znajomych oraz przyjaciół poprzez protokół Matriksa.</p>
@@ -102,7 +108,7 @@
     <p xml:lang="ar">ماتريكس هو بروتوكول اتصال لامركزي ، يعيد المستخدم إلى السيطرة. يطبق نيوتشات حاليًا جزءًا كبيرًا من الميفاق باستثناء الدردشات المشفرة ودردشة الفيديو.</p>
     <p xml:lang="az">Matrix, istifadəçini nəzarətdə saxlayan, mərkəzləşməmişi rabitə protokoludur. NeoChat, söhbətin və video əlaqəsinin şifrələnməsindən başqa bir çox protokolları həyata keçirə bilir.</p>
     <p xml:lang="ca">Matrix és un protocol de comunicacions descentralitzat, que retorna el control a l'usuari. Actualment el NeoChat implementa una gran part del protocol amb l'excepció dels xats encriptats i els xats de vídeo.</p>
-    <p xml:lang="ca-valencia">Matrix és un protocol de comunicacions descentralitzat, que retorna el control a l'usuari. Actualment NeoChat implementa una gran part del protocol amb l'excepció dels chats encriptats i els chats de vídeo.</p>
+    <p xml:lang="ca-valencia">Matrix és un protocol de comunicacions descentralitzat, que retorna el control a l'usuari. Actualment NeoChat implementa una gran part del protocol amb l'excepció dels xats encriptats i els xats de vídeo.</p>
     <p xml:lang="de">Matrix ist ein dezentralisiertes Kommunikationsprotokoll, das dem Benutzer wieder die Kontrolle zurückgibt. Derzeit implementiert NeoChat einen großen Teil des Protokolls mit der Ausnahme von verschlüsselten Chats und Video-Chat.</p>
     <p xml:lang="en-GB">Matrix is a decentralised communication protocol, putting the user back in control. Currently NeoChat implements large part of the protocol with the exception of encrypted chats and video chat.</p>
     <p xml:lang="es">Matrix es un protocolo de comunicaciones descentralizado, que devuelve el control al usuario. En la actualidad, NeoChat implementa gran parte del protocolo con la excepción de chats cifrados y chats de vídeo.</p>
@@ -112,7 +118,9 @@
     <p xml:lang="hu">A Matrix egy decentralizált kommunikációs protokoll, amely a felhasználók kezébe adja az irányítást.</p>
     <p xml:lang="ia">Matrix es un protocollo de communication decentrate, ponente le usator in le controlo. Currentemente NeoChat implementa un grande parte del protocollo con le exception de conversationes cryptate e conversationes video.</p>
     <p xml:lang="id">Matrix adalah protokol komunikasi terdesentralisasi, menempatkan pengguna kembali dalam kendali. Saat ini NeoChat mengimplementasikan sebagian besar protokol dengan pengecualian obrolan terenkripsi dan obrolan video.</p>
+    <p xml:lang="ie">Matrix es un decentralisat protocol de communication quel retroda li control a un usator. Actualmen, NeoChat implementa un grand parte del protocol except ciffrat conversationes e videotelefonada.</p>
     <p xml:lang="it">Matrix è un protocollo di comunicazione decentralizzato, che restituisce all'utente il controllo. Attualmente NeoChat implementa gran parte del protocollo ad eccezione delle chat cifrate e delle chat video.</p>
+    <p xml:lang="ka">Matrix -ი დეცენტრალიზებული კომუნიკაციის პროტოკოლია, რომელიც მომხმარებელს კონტროლის უფლებას უბრუნებს. ამჟამად NeoChat-ს პროტოკოლის ძირითადი ნაწილის მხარდაჭერა გააჩნია, დაშიფვრისა და ვიდეოჩატის გამოკლებით.</p>
     <p xml:lang="ko">Matrix는 사용자에게 제어권을 돌려 주는 분산 통신 프로토콜입니다. NeoChat은 암호화된 대화 및 영상 통화를 제외한 프로토콜의 대부분 기능을 구현합니다.</p>
     <p xml:lang="nl">Matrix is een gedecentraliseerd communicatieprotocol, dat de gebruiker de controle teruggeeft. Op dit moment implementeert NeoChat grote delen van het protocol met de uitzondering van versleutelde chats en video-chat.</p>
     <p xml:lang="pl">Matrix jest protokołem rozproszonego porozumiewania się oddający użytkownikowi jego władzę. Obecnie NeoChat obsługuje dużą część protokołu poza szyfrowanymi rozmowami tekstowymi i z obrazem.</p>
@@ -129,7 +137,7 @@
     <p xml:lang="ar">يعمل نيوتشات على كل من الأجهزة المحمولة وسطح المكتب مع توفير تجربة مستخدم متسقة.</p>
     <p xml:lang="az">Vahid istifadəçi interfeysi ilə təmin olunan NeoChat, həm mobil telefonda həm də kompyuterlərdə işləyir.</p>
     <p xml:lang="ca">El NeoChat funciona en els mòbils i a l'escriptori, proporcionant una experiència d'usuari coherent.</p>
-    <p xml:lang="ca-valencia">NeoChat funciona en els mòbils i a l'escriptori, proporcionant una experiència d'usuari coherent.</p>
+    <p xml:lang="ca-valencia">NeoChat funciona en els mòbils i en l'escriptori, proporcionant una experiència d'usuari coherent.</p>
     <p xml:lang="de">NeoChat funktioniert sowohl auf dem Mobiltelefon als auch auf dem Arbeitsfläche und bietet ein einheitliches Benutzererlebnis. </p>
     <p xml:lang="en-GB">NeoChat works both on mobile and desktop while providing a consistent user experience.</p>
     <p xml:lang="es">NeoChat funciona en móviles y en el escritorio a la vez que proporciona una experiencia de usuario consistente.</p>
@@ -139,7 +147,9 @@
     <p xml:lang="hu">A NeoChat mobilon és asztali számítógépen is működik, egységes felhasználói élményt nyújtva.</p>
     <p xml:lang="ia">NeoChat functiona sia sur mobile que ur scriptorio durante que forni un experientia de usator consistente.</p>
     <p xml:lang="id">NeoChat berfungsi baik di ponsel dan desktop sambil memberikan pengalaman pengguna yang konsisten.</p>
+    <p xml:lang="ie">NeoChat supporta amb computatores e aparates mobil, ancor providente un consistent experientie de usator.</p>
     <p xml:lang="it">NeoChat funziona sia su dispositivi mobili che desktop, fornendo un'esperienza utente coerente.</p>
+    <p xml:lang="ka">NeoChat მუშაობს როგორც მობილურ, ისე ჩვეულებრივ კომპიუტერებზე იმ დროს, როცა მომხმარებლის ინტერფეისი არ იცვლება.</p>
     <p xml:lang="ko">NeoChat은 모바일과 데스크톱 모두에서 일관된 사용자 경험을 제공합니다.</p>
     <p xml:lang="nl">NeoChat werkt zowel op de mobiel en het bureaublad met het leveren van een consistente gebruikerservaring.</p>
     <p xml:lang="pl">NeoChat działa zarówno na urządzeniach przenośnych jak i biurkowych, zapewniając spójne wrażenia użytkownika</p>
@@ -173,7 +183,9 @@
   <developer_name xml:lang="hu">A KDE Közösség</developer_name>
   <developer_name xml:lang="ia">Le communitate de KDE</developer_name>
   <developer_name xml:lang="id">Komunitas KDE</developer_name>
+  <developer_name xml:lang="ie">Li comunité de KDE</developer_name>
   <developer_name xml:lang="it">La comunità KDE</developer_name>
+  <developer_name xml:lang="ka">KDE-ის საზოგადოება</developer_name>
   <developer_name xml:lang="ko">KDE 커뮤니티</developer_name>
   <developer_name xml:lang="nl">De KDE gemeenschap</developer_name>
   <developer_name xml:lang="nn">KDE-fellesskapet</developer_name>
@@ -206,6 +218,12 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="22.11" date="2022-11-30">
+      <url>https://plasma-mobile.org/2022/11/30/plasma-mobile-gear-22-11/</url>
+    </release>
+    <release version="22.09" date="2022-09-27">
+      <url>https://www.plasma-mobile.org/2022/09/27/plasma-mobile-gear-22-09/</url>
+    </release>
     <release version="22.06" date="2022-06-24">
       <url>https://www.plasma-mobile.org/2022/06/28/plasma-mobile-gear-22-06/</url>
       <description>

org.kde.neochat.desktop

@@ -17,7 +17,9 @@ Name[fr]=NeoChat
 Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
+Name[ie]=NeoChat
 Name[it]=NeoChat
+Name[ka]=NeoChat
 Name[ko]=NeoChat
 Name[lt]=NeoChat
 Name[nl]=NeoChat
@@ -50,7 +52,9 @@ GenericName[fr]=Client « Matrix »
 GenericName[hu]=Matrix kliens
 GenericName[ia]=Cliente de Matrice
 GenericName[id]=Klien Matrix
+GenericName[ie]=Cliente de Matrix
 GenericName[it]=Client Matrix
+GenericName[ka]=Matrix -ის კლიენტი
 GenericName[ko]=Matrix 클라이언트
 GenericName[lt]=Matrix kliento programą
 GenericName[nl]=Matrix-client
@@ -82,7 +86,9 @@ Comment[fr]=Client pour le protocole « Matrix »
 Comment[hu]=Kliens a Matrix protokollhoz
 Comment[ia]=Cliente per le protocollo de Matrix
 Comment[id]=Klien untuk protokol Matrix
+Comment[ie]=Un cliente del protocol Matrix
 Comment[it]=Client per il protocollo Matrix
+Comment[ka]=კლიენტი Matrix-ის პროტოკოლისთვის
 Comment[ko]=Matrix 프로토콜용 클라이언트
 Comment[lt]=Matrix protokolo kliento programa
 Comment[nl]=Client voor het Matrix-protocol

po/ca/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 % Catalan  "INCLUDE">
+]>
+<!--
+SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
+SPDX-License-Identifier: CC-BY-SA-4.0
+-->
+
+<refentry lang="&language;">
+<refentryinfo>
+<title
+>Manual d'usuari del NeoChat</title>
+<author
+><firstname
+>Carl</firstname
+><surname
+>Schwan</surname
+> <contrib
+>Pàgina «man» del NeoChat.</contrib
+> <email
+>carl@carlschwan.eu</email
+></author>
+<date
+>1 de novembre de 2022</date>
+<releaseinfo
+>22.09</releaseinfo>
+<productname
+>NeoChat</productname>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>
+    <command
+>neochat</command>
+  </refentrytitle>
+  <manvolnum
+>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+  <refname
+>neochat</refname>
+  <refpurpose
+>Client per a interactuar amb el protocol de missatgeria Matrix</refpurpose>
+  </refnamediv>
+  <!-- body begins here -->
+  <refsynopsisdiv id='synopsis'>
+  <cmdsynopsis
+><command
+>neochat</command
+> <arg choice="opt"
+><replaceable
+>URI</replaceable
+></arg
+> </cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsect1 id="description">
+  <title
+>Descripció</title>
+  <para
+>El <command
+>neochat</command
+> és una aplicació de xat per al protocol Matrix que funciona tant a l'escriptori com al mòbil. </para>
+</refsect1>
+
+<refsect1 id="options"
+><title
+>Opcions</title>
+<variablelist>
+  <varlistentry>
+  <term
+><option
+>URI</option
+></term>
+  <listitem>
+    <para
+>L'URI de Matrix per a un usuari o una sala. P. ex. matrix:u/usuari:exemple.org o matrix:r/root:exemple.org. Això farà que el NeoChat intenti obrir la sala o conversa indicada. </para>
+  </listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1 id="bug">
+  <title
+>Informar dels errors</title>
+  <para
+>Podeu informar dels errors o de peticions de característiques noves a <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General"
+>https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General</ulink
+></para>
+</refsect1>
+
+<refsect1>
+  <title
+>Vegeu també</title>
+  <simplelist>
+    <member
+>Una llista de les preguntes més freqüents quan a Matrix <ulink url="https://matrix.org/faq/"
+>https://matrix.org/faq/</ulink
+> </member>
+    <member
+>kf5options(7)</member>
+    <member
+>qt5options(7)</member>
+  </simplelist>
+</refsect1>
+
+<refsect1 id="copyright"
+><title
+>Copyright</title>
+<para
+>Copyright &copy; 2020-2022 Tobias Fella </para>
+<para
+>Copyright &copy; 2020-2022 Carl Schwan </para>
+<para
+>Llicència: Publica general de GNU versió 3 o posterior &lt;<ulink url="https://www.gnu.org/licenses/gpl-3.0.html"
+>https://www.gnu.org/licenses/gpl-3.0.html</ulink
+>&gt;</para>
+</refsect1>
+</refentry>

po/es/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 % Spanish "INCLUDE">
+]>
+<!--
+SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
+SPDX-License-Identifier: CC-BY-SA-4.0
+-->
+
+<refentry lang="&language;">
+<refentryinfo>
+<title
+>Manual del usuario de NeoChat</title>
+<author
+><firstname
+>Carl</firstname
+><surname
+>Schwan</surname
+> <contrib
+>Página man de NeoChat.</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
+>Cliente para interactuar con el protocolo de mensajería matrix</refpurpose>
+  </refnamediv>
+  <!-- body begins here -->
+  <refsynopsisdiv id='synopsis'>
+  <cmdsynopsis
+><command
+>neochat</command
+> <arg choice="opt"
+><replaceable
+>URI</replaceable
+></arg
+> </cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsect1 id="description">
+  <title
+>Descripción</title>
+  <para
+><command
+>neochat</command
+> es una aplicación de chat para el protocolo matrix que funciona en el escritorio y en el móvil. </para>
+</refsect1>
+
+<refsect1 id="options"
+><title
+>Opciones</title>
+<variablelist>
+  <varlistentry>
+  <term
+><option
+>URI</option
+></term>
+  <listitem>
+    <para
+>El URI de matrix para un usuario o para una sala. Por ejemplo matrix:u/usuario:ejemplo.org y matrix:r/root:ejemplo.org. Esto hará que NeoChat intente abrir la sala o la conversación indicada. </para>
+  </listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1 id="bug">
+  <title
+>Notificación de fallos</title>
+  <para
+>Puede informar de fallos y solicitar funcionalidades en <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General"
+>https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General</ulink
+></para>
+</refsect1>
+
+<refsect1>
+  <title
+>Consulte también</title>
+  <simplelist>
+    <member
+>Una lista de preguntas frecuentes sobre Matrix <ulink url="https://matrix.org/faq/"
+>https://matrix.org/faq/</ulink
+> </member>
+    <member
+>kf5options(7)</member>
+    <member
+>qt5options(7)</member>
+  </simplelist>
+</refsect1>
+
+<refsect1 id="copyright"
+><title
+>Copyright</title>
+<para
+>Copyright &copy; 2020-2022 Tobias Fella </para>
+<para
+>Copyright &copy; 2020-2022 Carl Schwan </para>
+<para
+>Licencia: Pública General de GNU versión 3 o posterior &lt;<ulink url="https://www.gnu.org/licenses/gpl-3.0.html"
+>https://www.gnu.org/licenses/gpl-3.0.html</ulink
+>&gt;</para>
+</refsect1>
+</refentry>

po/nl/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 % Dutch "INCLUDE">
+]>
+<!--
+SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
+SPDX-License-Identifier: CC-BY-SA-4.0
+-->
+
+<refentry lang="&language;">
+<refentryinfo>
+<title
+>Gebruikershandleiding van NeoChat</title>
+<author
+><firstname
+>Carl</firstname
+><surname
+>Schwan</surname
+> <contrib
+>NeoChat manpagina.</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
+>Client voor gebruik met het berichtenprotocol matrix</refpurpose>
+  </refnamediv>
+  <!-- body begins here -->
+  <refsynopsisdiv id='synopsis'>
+  <cmdsynopsis
+><command
+>neochat</command
+> <arg choice="opt"
+><replaceable
+>URI</replaceable
+></arg
+> </cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsect1 id="description">
+  <title
+>Beschrijving</title>
+  <para
+><command
+>neochat</command
+> is een chat-toepassing voor het matrixprotocol dat zowel werkt op bureaublad als mobiel. </para>
+</refsect1>
+
+<refsect1 id="options"
+><title
+>Opties</title>
+<variablelist>
+  <varlistentry>
+  <term
+><option
+>URI</option
+></term>
+  <listitem>
+    <para
+>De matrix uri voor een gebruiker of een room. bijv. matrix:u/user:example.org en matrix:r/root:example.org. Dit laat NeoChat proberen om de gegeven room of conversatie te openen. </para>
+  </listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1 id="bug">
+  <title
+>Bugs (programmafouten) melden</title>
+  <para
+>U kunt bugs en verzoeken om mogelijkheden rapporteren op <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General"
+>https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General</ulink
+></para>
+</refsect1>
+
+<refsect1>
+  <title
+>Zie ook</title>
+  <simplelist>
+    <member
+>Een lijst met veel gestelde vragen over Matrix <ulink url="https://matrix.org/faq/"
+>https://matrix.org/faq/</ulink
+> </member>
+    <member
+>kf5options(7)</member>
+    <member
+>qt5options(7)</member>
+  </simplelist>
+</refsect1>
+
+<refsect1 id="copyright"
+><title
+>Copyright</title>
+<para
+>Copyright &copy; 2020-2022 Tobias Fella </para>
+<para
+>Copyright &copy; 2020-2022 Carl Schwan </para>
+<para
+>Licentie: GNU General Public Version 3 of later &lt;<ulink url="https://www.gnu.org/licenses/gpl-3.0.html"
+>https://www.gnu.org/licenses/gpl-3.0.html</ulink
+>&gt;</para>
+</refsect1>
+</refentry>

po/uk/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 % Ukrainian "INCLUDE">
+]>
+<!--
+SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
+SPDX-License-Identifier: CC-BY-SA-4.0
+-->
+
+<refentry lang="&language;">
+<refentryinfo>
+<title
+>Інструкція користувача NeoChat</title>
+<author
+><firstname
+>Carl</firstname
+><surname
+>Schwan</surname
+> <contrib
+>Сторінка підручника NeoChat.</contrib
+> <email
+>carl@carlschwan.eu</email
+></author>
+<date
+>1 листопада 2022 року</date>
+<releaseinfo
+>22.09</releaseinfo>
+<productname
+>NeoChat</productname>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>
+    <command
+>neochat</command>
+  </refentrytitle>
+  <manvolnum
+>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+  <refname
+>neochat</refname>
+  <refpurpose
+>Клієнтська програма для взаємодії за допомогою протоколу обміну повідомленнями matrix</refpurpose>
+  </refnamediv>
+  <!-- body begins here -->
+  <refsynopsisdiv id='synopsis'>
+  <cmdsynopsis
+><command
+>neochat</command
+> <arg choice="opt"
+><replaceable
+>Адреса</replaceable
+></arg
+> </cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsect1 id="description">
+  <title
+>Опис</title>
+  <para
+><command
+>neochat</command
+> є програма для спілкування за допомогою протоколу matrix, яка працює на робочих станціях і мобільних пристроях. </para>
+</refsect1>
+
+<refsect1 id="options"
+><title
+>Параметри</title>
+<variablelist>
+  <varlistentry>
+  <term
+><option
+>Адреса</option
+></term>
+  <listitem>
+    <para
+>Адреса matrix для користувача або кімнати. Приклади: matrix:u/user:example.org і matrix:r/root:example.org. Використання параметра призведе до того, що NeoChat спробує відкрити вказану кімнату або сеанс спілкування. </para>
+  </listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1 id="bug">
+  <title
+>Як повідомити про вади</title>
+  <para
+>Ви можете повідомляти про вади та запити щодо реалізації нових можливостей на сайті <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General"
+>https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General</ulink
+></para>
+</refsect1>
+
+<refsect1>
+  <title
+>Додаткові відомості</title>
+  <simplelist>
+    <member
+>Список поширених питань щодо Matrix <ulink url="https://matrix.org/faq/"
+>https://matrix.org/faq/</ulink
+> </member>
+    <member
+>kf5options(7)</member>
+    <member
+>qt5options(7)</member>
+  </simplelist>
+</refsect1>
+
+<refsect1 id="copyright"
+><title
+>Авторські права</title>
+<para
+>&copy; Tobias Fella, 2020-2022 </para>
+<para
+>&copy; Carl Schwan, 2020-2022 </para>
+<para
+>Ліцензування: GNU General Public Version 3 або пізніша версія &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>

qtquickcontrols2.conf

@@ -1,4 +0,0 @@
-[Material]
-Primary=Blue
-Accent=Blue
-Theme=System

res.qrc

@@ -1,88 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file alias="icons/org.kde.neochat.svg">org.kde.neochat.svg</file>
-        <file alias="icons/org.kde.neochat.tray.svg">org.kde.neochat.tray.svg</file>
-        <file>qml/main.qml</file>
-        <file>imports/NeoChat/Page/qmldir</file>
-        <file>imports/NeoChat/Page/LoadingPage.qml</file>
-        <file>imports/NeoChat/Page/RoomListPage.qml</file>
-        <file>imports/NeoChat/Page/RoomPage.qml</file>
-        <file>imports/NeoChat/Page/RoomWindow.qml</file>
-        <file>imports/NeoChat/Page/JoinRoomPage.qml</file>
-        <file>imports/NeoChat/Page/InviteUserPage.qml</file>
-        <file>imports/NeoChat/Page/StartChatPage.qml</file>
-        <file>imports/NeoChat/Page/ImageEditorPage.qml</file>
-        <file>imports/NeoChat/Page/WelcomePage.qml</file>
-        <file>imports/NeoChat/RoomSettings/General.qml</file>
-        <file>imports/NeoChat/RoomSettings/Security.qml</file>
-        <file>imports/NeoChat/RoomSettings/Categories.qml</file>
-        <file>imports/NeoChat/Component/qmldir</file>
-        <file>imports/NeoChat/Component/FullScreenImage.qml</file>
-        <file>imports/NeoChat/Component/FancyEffectsContainer.qml</file>
-        <file>imports/NeoChat/Component/TypingPane.qml</file>
-        <file>imports/NeoChat/Component/ShimmerGradient.qml</file>
-        <file>imports/NeoChat/Component/QuickSwitcher.qml</file>
-        <file>imports/NeoChat/Component/ChatBox</file>
-        <file>imports/NeoChat/Component/ChatBox/ChatBox.qml</file>
-        <file>imports/NeoChat/Component/ChatBox/ChatBar.qml</file>
-        <file>imports/NeoChat/Component/ChatBox/AttachmentPane.qml</file>
-        <file>imports/NeoChat/Component/ChatBox/ReplyPane.qml</file>
-        <file>imports/NeoChat/Component/ChatBox/CompletionMenu.qml</file>
-        <file>imports/NeoChat/Component/ChatBox/qmldir</file>
-        <file>imports/NeoChat/Component/Emoji/EmojiPicker.qml</file>
-        <file>imports/NeoChat/Component/Emoji/qmldir</file>
-        <file>imports/NeoChat/Component/Timeline/qmldir</file>
-        <file>imports/NeoChat/Component/Timeline/ReplyComponent.qml</file>
-        <file>imports/NeoChat/Component/Timeline/StateDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/RichLabel.qml</file>
-        <file>imports/NeoChat/Component/Timeline/TimelineContainer.qml</file>
-        <file>imports/NeoChat/Component/Timeline/SectionDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/VideoDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/ReactionDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/AudioDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/FileDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/ImageDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/EncryptedDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/EventDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/MessageDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/ReadMarkerDelegate.qml</file>
-        <file>imports/NeoChat/Component/Login/qmldir</file>
-        <file>imports/NeoChat/Component/Login/LoginStep.qml</file>
-        <file>imports/NeoChat/Component/Login/Login.qml</file>
-        <file>imports/NeoChat/Component/Login/Password.qml</file>
-        <file>imports/NeoChat/Component/Login/LoginRegister.qml</file>
-        <file>imports/NeoChat/Component/Login/Loading.qml</file>
-        <file>imports/NeoChat/Component/Login/Homeserver.qml</file>
-        <file>imports/NeoChat/Component/Login/LoginMethod.qml</file>
-        <file>imports/NeoChat/Component/Login/Sso.qml</file>
-        <file>imports/NeoChat/Panel/qmldir</file>
-        <file>imports/NeoChat/Panel/RoomDrawer.qml</file>
-        <file>imports/NeoChat/Dialog/qmldir</file>
-        <file>imports/NeoChat/Dialog/UserDetailDialog.qml</file>
-        <file>imports/NeoChat/Dialog/CreateRoomDialog.qml</file>
-        <file>imports/NeoChat/Dialog/EmojiDialog.qml</file>
-        <file>imports/NeoChat/Dialog/OpenFileDialog.qml</file>
-        <file>imports/NeoChat/Menu/qmldir</file>
-        <file>imports/NeoChat/Menu/GlobalMenu.qml</file>
-        <file>imports/NeoChat/Menu/EditMenu.qml</file>
-        <file>imports/NeoChat/Menu/Timeline/qmldir</file>
-        <file>imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml</file>
-        <file>imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml</file>
-        <file>imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml</file>
-        <file>imports/NeoChat/Menu/RoomListContextMenu.qml</file>
-        <file>qtquickcontrols2.conf</file>
-        <file>imports/NeoChat/Component/glowdot.png</file>
-        <file>imports/NeoChat/Component/confetti.png</file>
-        <file>imports/NeoChat/Settings/SettingsPage.qml</file>
-        <file>imports/NeoChat/Settings/ThemeRadioButton.qml</file>
-        <file>imports/NeoChat/Settings/ColorScheme.qml</file>
-        <file>imports/NeoChat/Settings/GeneralSettingsPage.qml</file>
-        <file>imports/NeoChat/Settings/Emoticons.qml</file>
-        <file>imports/NeoChat/Settings/AppearanceSettingsPage.qml</file>
-        <file>imports/NeoChat/Settings/AccountsPage.qml</file>
-        <file>imports/NeoChat/Settings/DevicesPage.qml</file>
-        <file>imports/NeoChat/Settings/About.qml</file>
-        <file>imports/NeoChat/Settings/SonnetConfigPage.qml</file>
-        <file>imports/NeoChat/Settings/qmldir</file>
-    </qresource>
-</RCC>

res_android.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file alias="imports/NeoChat/Menu/ShareAction.qml">imports/NeoChat/Menu/ShareActionAndroid.qml</file>
-    </qresource>
-</RCC>

res_desktop.qrc

@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>imports/NeoChat/Menu/ShareAction.qml</file>
-        <file>imports/NeoChat/Menu/ShareDialog.qml</file>
-    </qresource>
-</RCC>

src/CMakeLists.txt

@@ -3,25 +3,26 @@
 # SPDX-FileCopyrightText: 2020-2021 Tobias Fella <fella@posteo.de>
 # SPDX-License-Identifier: BSD-2-Clause
 
-add_executable(neochat
+add_library(neochat STATIC
     controller.cpp
     actionshandler.cpp
     emojimodel.cpp
     customemojimodel.cpp
-    customemojimodel+network.cpp
     clipboard.cpp
     matriximageprovider.cpp
     messageeventmodel.cpp
     messagefiltermodel.cpp
     roomlistmodel.cpp
+    sortfilterspacelistmodel.cpp
+    spacehierarchycache.cpp
     roommanager.cpp
     neochatroom.cpp
     neochatuser.cpp
     userlistmodel.cpp
     publicroomlistmodel.cpp
     userdirectorylistmodel.cpp
+    keywordnotificationrulemodel.cpp
     utils.cpp
-    main.cpp
     notificationsmanager.cpp
     sortfilterroomlistmodel.cpp
     chatdocumenthandler.cpp
@@ -29,19 +30,38 @@ add_executable(neochat
     filetypesingleton.cpp
     login.cpp
     stickerevent.cpp
-    chatboxhelper.cpp
-    commandmodel.cpp
     webshortcutmodel.cpp
     blurhash.cpp
     blurhashimageprovider.cpp
     joinrulesevent.cpp
     collapsestateproxymodel.cpp
-    ../res.qrc
+    urlhelper.cpp
+    windowcontroller.cpp
+    linkpreviewer.cpp
+    completionmodel.cpp
+    completionproxymodel.cpp
+    actionsmodel.cpp
+    serverlistmodel.cpp
+    statemodel.cpp
+    filetransferpseudojob.cpp
+)
+
+add_executable(neochat-app
+    main.cpp
+    res.qrc
+)
+
+target_include_directories(neochat-app PRIVATE ${CMAKE_BINARY_DIR})
+
+target_link_libraries(neochat-app PRIVATE
+    neochat
 )
 
 if(Quotient_VERSION_MINOR GREATER 6)
-    target_compile_definitions(neochat PRIVATE QUOTIENT_07)
+    target_compile_definitions(neochat PUBLIC QUOTIENT_07)
+    target_sources(neochat PRIVATE pollevent.cpp pollhandler.cpp)
 else()
+    target_compile_definitions(neochat PUBLIC QUOTIENT_VERSION=\"${Quotient_VERSION}\")
     target_sources(neochat PRIVATE neochataccountregistry.cpp)
 endif()
 
@@ -56,36 +76,41 @@ if(NOT ANDROID)
     else()
         target_sources(neochat PRIVATE trayicon.cpp)
     endif()
-    target_link_libraries(neochat PRIVATE KF5::ConfigWidgets KF5::WindowSystem KF5::SonnetCore)
-    target_compile_definitions(neochat PRIVATE -DHAVE_COLORSCHEME)
-    target_compile_definitions(neochat PRIVATE -DHAVE_WINDOWSYSTEM)
+    target_link_libraries(neochat PUBLIC KF5::ConfigWidgets KF5::WindowSystem)
+    target_compile_definitions(neochat PUBLIC -DHAVE_COLORSCHEME)
+    target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM)
 endif()
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
-    target_sources(neochat PRIVATE ../res_desktop.qrc runner.cpp)
-    target_compile_definitions(neochat PRIVATE -DHAVE_RUNNER)
+    target_sources(neochat-app PRIVATE res_desktop.qrc)
+    target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
+    target_sources(neochat PRIVATE runner.cpp)
 else()
-    target_sources(neochat PRIVATE ../res_android.qrc)
+    target_sources(neochat-app PRIVATE res_android.qrc)
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR})
-target_link_libraries(neochat PRIVATE Qt::Quick Qt::Qml Qt::Gui Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES})
+target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons KF5::SonnetCore  KF5::ItemModels Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES})
 if(TARGET QCoro5::Coro)
-    target_link_libraries(neochat PRIVATE QCoro5::Coro)
+    target_link_libraries(neochat PUBLIC QCoro5::Coro)
 else()
-    target_link_libraries(neochat PRIVATE QCoro::QCoro)
+    target_link_libraries(neochat PUBLIC QCoro::QCoro)
 endif()
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
 
 if(NEOCHAT_FLATPAK)
-    target_compile_definitions(neochat PRIVATE NEOCHAT_FLATPAK)
+    target_compile_definitions(neochat PUBLIC NEOCHAT_FLATPAK)
 endif()
 
 if(ANDROID)
     target_sources(neochat PRIVATE notifyrc.qrc)
-    target_link_libraries(neochat PRIVATE Qt5::Svg OpenSSL::SSL)
+    target_link_libraries(neochat PRIVATE Qt::Svg OpenSSL::SSL)
+    target_sources(neochat-app PRIVATE notifyrc.qrc)
+    target_link_libraries(neochat PUBLIC Qt::Svg OpenSSL::SSL)
     kirigami_package_breeze_icons(ICONS
         "arrow-down"
+        "arrow-up"
+        "checkmark"
         "help-about"
         "im-user"
         "im-invisible-user"
@@ -105,6 +130,8 @@ if(ANDROID)
         "user-others"
         "media-playback-pause"
         "media-playback-start"
+        "media-playback-stop"
+        "go-previous"
         "go-up"
         "go-down"
         "list-add"
@@ -115,30 +142,51 @@ if(ANDROID)
         "rating-unrated"
         "search"
         "mail-replied-symbolic"
+        "edit-clear"
         "edit-copy"
         "gtk-quit"
         "compass"
+        "computer"
         "network-connect"
         "list-remove-user"
         "org.kde.neochat"
         "preferences-system-users"
         "preferences-desktop-theme-global"
+        "notifications"
+        "notifications-disabled"
+        "audio-volume-high"
+        "audio-volume-muted"
+        "draw-highlight"
+        "zoom-in"
+        "zoom-out"
+        "image-rotate-left-symbolic"
+        "image-rotate-right-symbolic"
+        "channel-insecure-symbolic"
+        "download"
+        "smiley"
+        "tools-check-spelling"
+        "username-copy"
+        "edit-copy"
     )
 else()
-    target_link_libraries(neochat PRIVATE Qt5::Widgets KF5::KIOWidgets)
+    target_link_libraries(neochat PUBLIC Qt::Widgets KF5::KIOWidgets)
     install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
 endif()
 
+if(NOT ANDROID)
+    set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
+endif()
+
 if(TARGET KF5::DBusAddons)
-    target_link_libraries(neochat PRIVATE KF5::DBusAddons)
-    target_compile_definitions(neochat PRIVATE -DHAVE_KDBUSADDONS)
+    target_link_libraries(neochat PUBLIC KF5::DBusAddons)
+    target_compile_definitions(neochat PUBLIC -DHAVE_KDBUSADDONS)
 endif()
 
 if (TARGET KF5::KIOWidgets)
-    target_compile_definitions(neochat PRIVATE -DHAVE_KIO)
+    target_compile_definitions(neochat PUBLIC -DHAVE_KIO)
 endif()
 
-install(TARGETS neochat ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS neochat-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins)

src/actionshandler.cpp

@@ -2,26 +2,48 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "actionshandler.h"
+
 #include "controller.h"
 
 #include <csapi/joining.h>
-#include <events/roommessageevent.h>
+#include <events/roommemberevent.h>
+
+#include <cmark.h>
 
 #include <KLocalizedString>
-#include <QDebug>
 #include <QStringBuilder>
 
+#include "actionsmodel.h"
 #include "controller.h"
 #include "customemojimodel.h"
+#include "neochatconfig.h"
+#include "neochatroom.h"
 #include "roommanager.h"
+#include "neochatuser.h"
+
+using namespace Quotient;
+
+QString markdownToHTML(const QString &markdown)
+{
+    const auto str = markdown.toUtf8();
+    char *tmp_buf = cmark_markdown_to_html(str.constData(), str.size(), CMARK_OPT_HARDBREAKS | CMARK_OPT_UNSAFE);
+
+    const std::string html(tmp_buf);
+
+    free(tmp_buf);
+
+    auto result = QString::fromStdString(html).trimmed();
+
+    result.replace("<!-- raw HTML omitted -->", "");
+
+    return result;
+}
 
 ActionsHandler::ActionsHandler(QObject *parent)
     : QObject(parent)
 {
 }
 
-ActionsHandler::~ActionsHandler(){};
-
 NeoChatRoom *ActionsHandler::room() const
 {
     return m_room;
@@ -37,298 +59,113 @@ void ActionsHandler::setRoom(NeoChatRoom *room)
     Q_EMIT roomChanged();
 }
 
-Connection *ActionsHandler::connection() const
+void ActionsHandler::handleMessage()
 {
-    return m_connection;
-}
-
-void ActionsHandler::setConnection(Connection *connection)
-{
-    if (m_connection == connection) {
+    checkEffects();
+    if (!m_room->chatBoxAttachmentPath().isEmpty()) {
+        QUrl url(m_room->chatBoxAttachmentPath());
+        auto path = url.isLocalFile() ? url.toLocalFile() : url.toString();
+        m_room->uploadFile(path, m_room->chatBoxText().isEmpty() ? path.mid(path.lastIndexOf('/') + 1) : m_room->chatBoxText());
+        m_room->setChatBoxAttachmentPath({});
+        m_room->setChatBoxText({});
         return;
     }
-    if (m_connection != nullptr) {
-        disconnect(m_connection, &Connection::directChatAvailable, nullptr, nullptr);
-    }
-    m_connection = connection;
-    if (m_connection != nullptr) {
-        connect(m_connection, &Connection::directChatAvailable, this, [this](Quotient::Room *room) {
-            room->setDisplayed(true);
-            RoomManager::instance().enterRoom(qobject_cast<NeoChatRoom *>(room));
-        });
-    }
-    Q_EMIT connectionChanged();
-}
+    QString handledText = m_room->chatBoxText();
 
-void ActionsHandler::postEdit(const QString &text)
-{
-    const auto localId = Controller::instance().activeConnection()->userId();
-    for (auto it = m_room->messageEvents().crbegin(); it != m_room->messageEvents().crend(); ++it) {
-        const auto &evt = **it;
-        if (const auto event = eventCast<const RoomMessageEvent>(&evt)) {
-            if (event->senderId() == localId && event->hasTextContent()) {
-                static QRegularExpression re("^s/([^/]*)/([^/]*)(/g)?");
-                auto match = re.match(text);
-                if (!match.hasMatch()) {
-                    // should not happen but still make sure to send the message normally
-                    // just in case.
-                    postMessage(text, QString(), QString(), QString(), QVariantMap(), nullptr);
+    std::sort(m_room->mentions()->begin(), m_room->mentions()->end(), [](const auto &a, const auto &b) -> bool {
+        return a.cursor.anchor() > b.cursor.anchor();
+    });
+
+    for (const auto &mention : *m_room->mentions()) {
+        if (mention.text.isEmpty() || mention.id.isEmpty()) {
+            continue;
+        }
+        handledText = handledText.replace(mention.cursor.anchor(),
+                                          mention.cursor.position() - mention.cursor.anchor(),
+                                          QStringLiteral("[%1](https://matrix.to/#/%2)").arg(mention.text, mention.id));
+    }
+    m_room->mentions()->clear();
+
+    if (NeoChatConfig::allowQuickEdit()) {
+        QRegularExpression sed("^s/([^/]*)/([^/]*)(/g)?$");
+        auto match = sed.match(m_room->chatBoxText());
+        if (match.hasMatch()) {
+            const QString regex = match.captured(1);
+            const QString replacement = match.captured(2).toHtmlEscaped();
+            const QString flags = match.captured(3);
+
+            for (auto it = m_room->messageEvents().crbegin(); it != m_room->messageEvents().crend(); it++) {
+                if (const auto event = eventCast<const RoomMessageEvent>(&**it)) {
+                    if (event->senderId() == m_room->localUser()->id() && event->hasTextContent()) {
+                        QString originalString;
+                        if (event->content()) {
+                            originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content())->body;
+                        } else {
+                            originalString = event->plainBody();
+                        }
+                        if (flags == "/g") {
+                            m_room->postHtmlMessage(handledText, originalString.replace(regex, replacement), event->msgtype(), "", event->id());
+                        } else {
+                            m_room->postHtmlMessage(handledText,
+                                                    originalString.replace(originalString.indexOf(regex), regex.size(), replacement),
+                                                    event->msgtype(),
+                                                    "",
+                                                    event->id());
+                        }
+                        return;
+                    }
                 }
-                const QString regex = match.captured(1);
-                const QString replacement = match.captured(2);
-                const QString flags = match.captured(3);
-                QString originalString;
-                if (event->content()) {
-                    originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content())->body;
-                } else {
-                    originalString = event->plainBody();
-                }
-                if (flags == "/g") {
-                    m_room->postHtmlMessage(text, originalString.replace(regex, replacement), event->msgtype(), "", event->id());
-                } else {
-                    m_room->postHtmlMessage(text,
-                                            originalString.replace(originalString.indexOf(regex), regex.size(), replacement),
-                                            event->msgtype(),
-                                            "",
-                                            event->id());
-                }
-                return;
             }
         }
     }
-}
+    auto messageType = RoomMessageEvent::MsgType::Text;
 
-void ActionsHandler::postMessage(const QString &text,
-                                 const QString &attachmentPath,
-                                 const QString &replyEventId,
-                                 const QString &editEventId,
-                                 const QVariantMap &usernames,
-                                 CustomEmojiModel *cem)
-{
-    QString rawText = text;
-    QString cleanedText = text;
-
-    auto preprocess = [cem](const QString &it) -> QString {
-        if (cem == nullptr) {
-            return it;
-        }
-        return cem->preprocessText(it);
-    };
-
-    for (auto it = usernames.constBegin(); it != usernames.constEnd(); it++) {
-        cleanedText = cleanedText.replace(it.key(), "[" + it.key() + "](https://matrix.to/#/" + it.value().toString() + ")");
-    }
-
-    if (attachmentPath.length() > 0) {
-        m_room->uploadFile(attachmentPath, cleanedText);
-    }
-
-    if (cleanedText.length() == 0) {
-        return;
-    }
-
-    auto messageEventType = RoomMessageEvent::MsgType::Text;
-
-    // Message commands
-    static const QString shrugPrefix = QStringLiteral("/shrug");
-    static const QString lennyPrefix = QStringLiteral("/lenny");
-    static const QString tableflipPrefix = QStringLiteral("/tableflip");
-    static const QString unflipPrefix = QStringLiteral("/unflip");
-    // static const QString plainPrefix = QStringLiteral("/plain "); // TODO
-    // static const QString htmlPrefix = QStringLiteral("/html "); // TODO
-    static const QString rainbowPrefix = QStringLiteral("/rainbow ");
-    static const QString rainbowmePrefix = QStringLiteral("/rainbowme ");
-    static const QString spoilerPrefix = QStringLiteral("/spoiler ");
-    static const QString mePrefix = QStringLiteral("/me ");
-    static const QString noticePrefix = QStringLiteral("/notice ");
-
-    // Actions commands
-    // static const QString ddgPrefix = QStringLiteral("/ddg "); // TODO
-    // static const QString nickPrefix = QStringLiteral("/nick "); // TODO
-    // static const QString meroomnickPrefix = QStringLiteral("/myroomnick "); // TODO
-    // static const QString roomavatarPrefix = QStringLiteral("/roomavatar "); // TODO
-    // static const QString myroomavatarPrefix = QStringLiteral("/myroomavatar "); // TODO
-    // static const QString myavatarPrefix = QStringLiteral("/myavatar "); // TODO
-    static const QString invitePrefix = QStringLiteral("/invite ");
-    static const QString joinPrefix = QStringLiteral("/join ");
-    static const QString joinShortPrefix = QStringLiteral("/j ");
-    static const QString partPrefix = QStringLiteral("/part");
-    static const QString leavePrefix = QStringLiteral("/leave");
-    static const QString ignorePrefix = QStringLiteral("/ignore ");
-    static const QString unignorePrefix = QStringLiteral("/unignore ");
-    // static const QString queryPrefix = QStringLiteral("/query "); // TODO
-    // static const QString msgPrefix = QStringLiteral("/msg "); // TODO
-    static const QString reactPrefix = QStringLiteral("/react ");
-
-    // Admin commands
-
-    static QStringList rainbowColors{"#ff2b00", "#ff5500", "#ff8000", "#ffaa00", "#ffd500", "#ffff00", "#d4ff00", "#aaff00", "#80ff00",
-                                     "#55ff00", "#2bff00", "#00ff00", "#00ff2b", "#00ff55", "#00ff80", "#00ffaa", "#00ffd5", "#00ffff",
-                                     "#00d4ff", "#00aaff", "#007fff", "#0055ff", "#002bff", "#0000ff", "#2a00ff", "#5500ff", "#7f00ff",
-                                     "#aa00ff", "#d400ff", "#ff00ff", "#ff00d4", "#ff00aa", "#ff0080", "#ff0055", "#ff002b", "#ff0000"};
-
-    if (cleanedText.indexOf(shrugPrefix) == 0) {
-        cleanedText = QStringLiteral("¯\\_(ツ)_/¯") % cleanedText.remove(0, shrugPrefix.length());
-        m_room->postHtmlMessage(cleanedText, cleanedText, messageEventType, replyEventId, editEventId);
-        return;
-    }
-
-    if (cleanedText.indexOf(lennyPrefix) == 0) {
-        cleanedText = QStringLiteral("( ͡° ͜ʖ ͡°)") % cleanedText.remove(0, lennyPrefix.length());
-        m_room->postHtmlMessage(cleanedText, cleanedText, messageEventType, replyEventId, editEventId);
-        return;
-    }
-
-    if (cleanedText.indexOf(tableflipPrefix) == 0) {
-        cleanedText = QStringLiteral("(╯°□°）╯︵ ┻━┻") % cleanedText.remove(0, tableflipPrefix.length());
-        m_room->postHtmlMessage(cleanedText, cleanedText, messageEventType, replyEventId, editEventId);
-        return;
-    }
-
-    if (cleanedText.indexOf(unflipPrefix) == 0) {
-        cleanedText = QStringLiteral("┬──┬ ノ( ゜-゜ノ)") % cleanedText.remove(0, unflipPrefix.length());
-        m_room->postHtmlMessage(cleanedText, cleanedText, messageEventType, replyEventId, editEventId);
-        return;
-    }
-
-    if (cleanedText.indexOf(rainbowPrefix) == 0) {
-        cleanedText = cleanedText.remove(0, rainbowPrefix.length());
-        QString rainbowText;
-        for (int i = 0; i < cleanedText.length(); i++) {
-            rainbowText = rainbowText % QStringLiteral("<font color='") % rainbowColors.at(i % rainbowColors.length()) % "'>" % cleanedText.at(i) % "</font>";
-        }
-        m_room->postHtmlMessage(cleanedText, preprocess(rainbowText), RoomMessageEvent::MsgType::Notice, replyEventId, editEventId);
-        return;
-    }
-
-    if (cleanedText.indexOf(spoilerPrefix) == 0) {
-        cleanedText = cleanedText.remove(0, spoilerPrefix.length());
-        const QStringList splittedText = rawText.split(" ");
-        QString spoilerHtml = QStringLiteral("<span data-mx-spoiler>") % preprocess(cleanedText) % QStringLiteral("</span>");
-        m_room->postHtmlMessage(cleanedText, spoilerHtml, RoomMessageEvent::MsgType::Notice, replyEventId, editEventId);
-        return;
-    }
-
-    if (cleanedText.indexOf(rainbowmePrefix) == 0) {
-        cleanedText = cleanedText.remove(0, rainbowmePrefix.length());
-        QString rainbowText;
-        for (int i = 0; i < cleanedText.length(); i++) {
-            rainbowText = rainbowText % QStringLiteral("<font color='") % rainbowColors.at(i % rainbowColors.length()) % "'>" % cleanedText.at(i) % "</font>";
-        }
-        m_room->postHtmlMessage(cleanedText, preprocess(rainbowText), messageEventType, replyEventId, editEventId);
-        return;
-    }
-
-    if (rawText.indexOf(joinPrefix) == 0 || rawText.indexOf(joinShortPrefix) == 0) {
-        if (rawText.indexOf(joinPrefix) == 0) {
-            rawText = rawText.remove(0, joinPrefix.length());
-        } else {
-            rawText = rawText.remove(0, joinShortPrefix.length());
-        }
-        const QStringList splittedText = rawText.split(" ");
-        if (text.count() == 0) {
-            Q_EMIT showMessage(MessageType::Error, i18n("Invalid command"));
-            return;
-        }
-        if (splittedText.count() > 1) {
-            Controller::instance().joinRoom(splittedText[0] + ":" + splittedText[1]);
-            return;
-        } else if (splittedText[0].indexOf(":") != -1) {
-            Controller::instance().joinRoom(splittedText[0]);
-            return;
-        } else {
-            Controller::instance().joinRoom(splittedText[0] + ":matrix.org");
-        }
-        return;
-    }
-
-    if (rawText.indexOf(invitePrefix) == 0) {
-        rawText = rawText.remove(0, invitePrefix.length());
-        const QStringList splittedText = rawText.split(" ");
-        if (splittedText.count() == 0) {
-            Q_EMIT showMessage(MessageType::Error, i18n("Invalid command"));
-            return;
-        }
-        m_room->inviteToRoom(splittedText[0]);
-        return;
-    }
-
-    if (rawText.indexOf(partPrefix) == 0 || rawText.indexOf(leavePrefix) == 0) {
-        if (rawText.indexOf(partPrefix) == 0) {
-            rawText = rawText.remove(0, partPrefix.length());
-        } else {
-            rawText = rawText.remove(0, leavePrefix.length());
-        }
-        const QStringList splittedText = rawText.split(" ");
-        if (splittedText.count() == 0 || splittedText[0].isEmpty()) {
-            // leave current room
-            m_connection->leaveRoom(m_room);
-            return;
-        }
-        m_connection->leaveRoom(m_connection->room(splittedText[0]));
-        return;
-    }
-
-    if (rawText.indexOf(ignorePrefix) == 0) {
-        rawText = rawText.remove(0, ignorePrefix.length());
-        const QStringList splittedText = rawText.split(" ");
-        if (splittedText.count() == 0) {
-            Q_EMIT showMessage(MessageType::Error, i18n("Invalid command"));
-            return;
-        }
-
-        if (m_connection->users().contains(splittedText[0])) {
-            Q_EMIT showMessage(MessageType::Error, i18n("Invalid command"));
-            return;
-        }
-
-        const auto *user = m_connection->users()[splittedText[0]];
-        m_connection->addToIgnoredUsers(user);
-        return;
-    }
-
-    if (rawText.indexOf(unignorePrefix) == 0) {
-        rawText = rawText.remove(0, unignorePrefix.length());
-        const QStringList splittedText = rawText.split(" ");
-        if (splittedText.count() == 0) {
-            Q_EMIT showMessage(MessageType::Error, i18n("Invalid command"));
-            return;
-        }
-
-        if (m_connection->users().contains(splittedText[0])) {
-            Q_EMIT showMessage(MessageType::Error, i18n("Invalid command"));
-            return;
-        }
-
-        const auto *user = m_connection->users()[splittedText[0]];
-        m_connection->removeFromIgnoredUsers(user);
-        return;
-    }
-
-    if (rawText.indexOf(reactPrefix) == 0) {
-        rawText = rawText.remove(0, reactPrefix.length());
-        if (replyEventId.isEmpty()) {
-            for (auto it = m_room->messageEvents().crbegin(); it != m_room->messageEvents().crend(); ++it) {
-                const auto &evt = **it;
-                if (const auto event = eventCast<const RoomMessageEvent>(&evt)) {
-                    m_room->toggleReaction(event->id(), rawText);
+    if (handledText.startsWith(QLatin1Char('/'))) {
+        for (const auto &action : ActionsModel::instance().allActions()) {
+            if (handledText.indexOf(action.prefix) == 1
+                && (handledText.indexOf(" ") == action.prefix.length() + 1 || handledText.length() == action.prefix.length() + 1)) {
+                handledText = action.handle(handledText.mid(action.prefix.length() + 1).trimmed(), m_room);
+                if (action.messageType.has_value()) {
+                    messageType = *action.messageType;
+                }
+                if (action.messageAction) {
+                    break;
+                } else {
                     return;
                 }
             }
-            Q_EMIT showMessage(MessageType::Error, i18n("Couldn't find a message to react to"));
-            return;
         }
-        m_room->toggleReaction(replyEventId, rawText);
-        return;
     }
 
-    if (cleanedText.indexOf(mePrefix) == 0) {
-        cleanedText = cleanedText.remove(0, mePrefix.length());
-        messageEventType = RoomMessageEvent::MsgType::Emote;
-        rawText = rawText.remove(0, mePrefix.length());
-    } else if (cleanedText.indexOf(noticePrefix) == 0) {
-        cleanedText = cleanedText.remove(0, noticePrefix.length());
-        messageEventType = RoomMessageEvent::MsgType::Notice;
+    handledText = CustomEmojiModel::instance().preprocessText(handledText);
+    handledText = markdownToHTML(handledText);
+    if (handledText.count("<p>") == 1 && handledText.count("</p>") == 1) {
+        handledText.remove("<p>");
+        handledText.remove("</p>");
+    }
+
+    if (handledText.length() == 0) {
+        return;
+    }
+    m_room->postMessage(m_room->chatBoxText(), handledText, messageType, m_room->chatBoxReplyId(), m_room->chatBoxEditId());
+}
+
+void ActionsHandler::checkEffects()
+{
+    std::optional<QString> effect = std::nullopt;
+    const auto &text = m_room->chatBoxText();
+    if (text.contains("\u2744")) {
+        effect = QLatin1String("snowflake");
+    } else if (text.contains("\u1F386")) {
+        effect = QLatin1String("fireworks");
+    } else if (text.contains("\u2F387")) {
+        effect = QLatin1String("fireworks");
+    } else if (text.contains("\u1F389")) {
+        effect = QLatin1String("confetti");
+    } else if (text.contains("\u1F38A")) {
+        effect = QLatin1String("confetti");
+    }
+    if (effect.has_value()) {
+        Q_EMIT showEffect(*effect);
     }
-    m_room->postMessage(rawText, preprocess(m_room->preprocessText(cleanedText)), messageEventType, replyEventId, editEventId);
 }

src/actionshandler.h

@@ -5,12 +5,12 @@
 
 #include <QObject>
 
-#include "connection.h"
+#include <events/roommessageevent.h>
+
 #include "neochatroom.h"
 
-using namespace Quotient;
-
 class CustomEmojiModel;
+class NeoChatRoom;
 
 /// \brief Handles user interactions with NeoChat (joining room, creating room,
 /// sending message). Account management is handled by Controller.
@@ -18,56 +18,29 @@ class ActionsHandler : public QObject
 {
     Q_OBJECT
 
-    /// \brief The connection that will handle sending the message.
-    Q_PROPERTY(Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
-
-    /// \brief The connection that will handle sending the message.
+    /// \brief The room that messages will be sent to.
     Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
 
 public:
-    enum MessageType {
-        Info,
-        Error,
-    };
-    Q_ENUM(MessageType);
-
     explicit ActionsHandler(QObject *parent = nullptr);
-    ~ActionsHandler();
-
-    [[nodiscard]] Connection *connection() const;
-    void setConnection(Connection *connection);
 
     [[nodiscard]] NeoChatRoom *room() const;
     void setRoom(NeoChatRoom *room);
 
 Q_SIGNALS:
-    /// \brief Show error or information message.
-    ///
-    /// These messages will be displayed in the room view header.
-    void showMessage(ActionsHandler::MessageType messageType, QString message);
-
     void roomChanged();
-    void connectionChanged();
+    void showEffect(QString effect);
 
 public Q_SLOTS:
 
     /// \brief Post a message.
     ///
     /// This also interprets commands if any.
-    void postMessage(const QString &text,
-                     const QString &attachementPath,
-                     const QString &replyEventId,
-                     const QString &editEventId,
-                     const QVariantMap &usernames,
-                     CustomEmojiModel *cem);
-
-    /// \brief Send edit instructions (.e.g s/hallo/hello/)
-    ///
-    /// This will automatically edit the last message posted and send the sed
-    /// instruction to IRC.
-    void postEdit(const QString &text);
+    void handleMessage();
 
 private:
-    Connection *m_connection = nullptr;
     NeoChatRoom *m_room = nullptr;
+    void checkEffects();
 };
+
+QString markdownToHTML(const QString &markdown);

src/actionsmodel.cpp

@@ -0,0 +1,558 @@
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "actionsmodel.h"
+
+#include "controller.h"
+#include "neochatroom.h"
+#include "neochatuser.h"
+#include "roommanager.h"
+#include <events/roommemberevent.h>
+#include <events/roompowerlevelsevent.h>
+
+#include <KLocalizedString>
+
+using Action = ActionsModel::Action;
+using namespace Quotient;
+
+QStringList rainbowColors{"#ff2b00", "#ff5500", "#ff8000", "#ffaa00", "#ffd500", "#ffff00", "#d4ff00", "#aaff00", "#80ff00", "#55ff00", "#2bff00", "#00ff00",
+                          "#00ff2b", "#00ff55", "#00ff80", "#00ffaa", "#00ffd5", "#00ffff", "#00d4ff", "#00aaff", "#007fff", "#0055ff", "#002bff", "#0000ff",
+                          "#2a00ff", "#5500ff", "#7f00ff", "#aa00ff", "#d400ff", "#ff00ff", "#ff00d4", "#ff00aa", "#ff0080", "#ff0055", "#ff002b", "#ff0000"};
+
+QVector<ActionsModel::Action> actions{
+    Action{
+        QStringLiteral("shrug"),
+        [](const QString &message, NeoChatRoom *) {
+            return QStringLiteral("¯\\\\_(ツ)_/¯ %1").arg(message);
+        },
+        true,
+        std::nullopt,
+        kli18n("<message>"),
+        kli18n("Prepends ¯\\_(ツ)_/¯ to a plain-text message"),
+    },
+    Action{
+        QStringLiteral("lenny"),
+        [](const QString &message, NeoChatRoom *) {
+            return QStringLiteral("( ͡° ͜ʖ ͡°) %1").arg(message);
+        },
+        true,
+        std::nullopt,
+        kli18n("<message>"),
+        kli18n("Prepends ( ͡° ͜ʖ ͡°) to a plain-text message"),
+    },
+    Action{
+        QStringLiteral("tableflip"),
+        [](const QString &message, NeoChatRoom *) {
+            return QStringLiteral("(╯°□°）╯︵ ┻━┻ %1").arg(message);
+        },
+        true,
+        std::nullopt,
+        kli18n("<message>"),
+        kli18n("Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message"),
+    },
+    Action{
+        QStringLiteral("unflip"),
+        [](const QString &message, NeoChatRoom *) {
+            return QStringLiteral("┬──┬ ノ( ゜-゜ノ) %1").arg(message);
+        },
+        true,
+        std::nullopt,
+        kli18n("<message>"),
+        kli18n("Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message"),
+    },
+    Action{
+        QStringLiteral("rainbow"),
+        [](const QString &text, NeoChatRoom *room) {
+            QString rainbowText;
+            for (int i = 0; i < text.length(); i++) {
+                rainbowText += QStringLiteral("<font color='%2'>%3</font>").arg(rainbowColors[i % rainbowColors.length()], text.at(i));
+            }
+            // 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),
+                              rainbowText,
+                              RoomMessageEvent::MsgType::Text,
+                              room->chatBoxReplyId(),
+                              room->chatBoxEditId());
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("<message>"),
+        kli18n("Sends the given message colored as a rainbow"),
+    },
+    Action{
+        QStringLiteral("rainbowme"),
+        [](const QString &text, NeoChatRoom *room) {
+            QString rainbowText;
+            for (int i = 0; i < text.length(); i++) {
+                rainbowText += QStringLiteral("<font color='%2'>%3</font>").arg(rainbowColors[i % rainbowColors.length()], text.at(i));
+            }
+            // 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),
+                              rainbowText,
+                              RoomMessageEvent::MsgType::Emote,
+                              room->chatBoxReplyId(),
+                              room->chatBoxEditId());
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("<message>"),
+        kli18n("Sends the given emote colored as a rainbow"),
+    },
+    Action{
+        QStringLiteral("plain"),
+        [](const QString &text, NeoChatRoom *room) {
+            room->postMessage(text, text.toHtmlEscaped(), RoomMessageEvent::MsgType::Text, {}, {});
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("<message>"),
+        kli18n("Sends the given message as plain text"),
+    },
+    Action{
+        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),
+                              QStringLiteral("<span data-mx-spoiler>%1</span>").arg(text),
+                              RoomMessageEvent::MsgType::Text,
+                              room->chatBoxReplyId(),
+                              room->chatBoxEditId());
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("<message>"),
+        kli18n("Sends the given message as a spoiler"),
+    },
+    Action{
+        QStringLiteral("me"),
+        [](const QString &text, NeoChatRoom *) {
+            return text;
+        },
+        true,
+        RoomMessageEvent::MsgType::Emote,
+        kli18n("<message>"),
+        kli18n("Sends the given emote"),
+    },
+    Action{
+        QStringLiteral("notice"),
+        [](const QString &text, NeoChatRoom *) {
+            return text;
+        },
+        true,
+        RoomMessageEvent::MsgType::Notice,
+        kli18n("<message>"),
+        kli18n("Sends the given message as a notice"),
+    },
+    Action{
+        QStringLiteral("invite"),
+        [](const QString &text, NeoChatRoom *room) {
+            static const QRegularExpression mxidRegex(
+                QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
+            auto regexMatch = mxidRegex.match(text);
+            if (!regexMatch.hasMatch()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
+                return QString();
+            }
+#ifdef QUOTIENT_07
+            if (room->currentState().get<RoomMemberEvent>(text)->membership() == Membership::Invite) {
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is already invited to this room.", "%1 is already invited to this room.", text));
+                return QString();
+            }
+            if (room->currentState().get<RoomMemberEvent>(text)->membership() == Membership::Ban) {
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is banned from this room.", "%1 is banned from this room.", text));
+                return QString();
+            }
+#endif
+            if (room->localUser()->id() == text) {
+                Q_EMIT room->showMessage(NeoChatRoom::Positive, i18n("You are already in this room."));
+                return QString();
+            }
+            if (room->users().contains(room->user(text))) {
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is already in this room.", "%1 is already in this room.", text));
+                return QString();
+            }
+            room->inviteToRoom(text);
+            Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> was invited into this room", "%1 was invited into this room", text));
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("<user id>"),
+        kli18n("Invites the user to this room"),
+    },
+    Action{
+        QStringLiteral("join"),
+        [](const QString &text, NeoChatRoom *room) {
+            QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
+            auto regexMatch = roomRegex.match(text);
+            if (!regexMatch.hasMatch()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error,
+                                         i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
+                return QString();
+            }
+            auto 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("Joining room <roomname>.", "Joining room %1.", text));
+            Controller::instance().joinRoom(text);
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("<room alias or id>"),
+        kli18n("Joins the given room"),
+    },
+    Action{
+        QStringLiteral("j"),
+        [](const QString &text, NeoChatRoom *room) {
+            QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
+            auto regexMatch = roomRegex.match(text);
+            if (!regexMatch.hasMatch()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error,
+                                         i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
+                return QString();
+            }
+            if (Controller::instance().activeConnection()->room(text) || Controller::instance().activeConnection()->roomByAlias(text)) {
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("You are already in room <roomname>.", "You are already in room %1.", text));
+                return QString();
+            }
+            Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Joining room <roomname>.", "Joining room %1.", text));
+            Controller::instance().joinRoom(text);
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("<room alias or id>"),
+        kli18n("Joins the given room"),
+    },
+    Action{
+        QStringLiteral("part"),
+        [](const QString &text, NeoChatRoom *room) {
+            if (text.isEmpty()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18n("Leaving this room."));
+                room->connection()->leaveRoom(room);
+            } else {
+                QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
+                auto regexMatch = roomRegex.match(text);
+                if (!regexMatch.hasMatch()) {
+                    Q_EMIT room->showMessage(NeoChatRoom::Error,
+                                             i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
+                    return QString();
+                }
+                auto leaving = room->connection()->room(text);
+                if (!leaving) {
+                    leaving = room->connection()->roomByAlias(text);
+                }
+                if (leaving) {
+                    Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Leaving room <roomname>.", "Leaving room %1.", text));
+                    room->connection()->leaveRoom(leaving);
+                } else {
+                    Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Room <roomname> not found", "Room %1 not found.", text));
+                }
+            }
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("[<room alias or id>]"),
+        kli18n("Leaves the given room or this room, if there is none given"),
+    },
+    Action{
+        QStringLiteral("leave"),
+        [](const QString &text, NeoChatRoom *room) {
+            if (text.isEmpty()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18n("Leaving this room."));
+                room->connection()->leaveRoom(room);
+            } else {
+                QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
+                auto regexMatch = roomRegex.match(text);
+                if (!regexMatch.hasMatch()) {
+                    Q_EMIT room->showMessage(NeoChatRoom::Error,
+                                             i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
+                    return QString();
+                }
+                auto leaving = room->connection()->room(text);
+                if (!leaving) {
+                    leaving = room->connection()->roomByAlias(text);
+                }
+                if (leaving) {
+                    Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Leaving room <roomname>.", "Leaving room %1.", text));
+                    room->connection()->leaveRoom(leaving);
+                } else {
+                    Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Room <roomname> not found", "Room %1 not found.", text));
+                }
+            }
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("[<room alias or id>]"),
+        kli18n("Leaves the given room or this room, if there is none given"),
+    },
+    Action{
+        QStringLiteral("nick"),
+        [](const QString &text, NeoChatRoom *room) {
+            if (text.isEmpty()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("No new nickname provided, no changes will happen."));
+            } else {
+                room->connection()->user()->rename(text);
+            }
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("<display name>"),
+        kli18n("Changes your global display name"),
+    },
+    Action{
+        QStringLiteral("roomnick"),
+        [](const QString &text, NeoChatRoom *room) {
+            if (text.isEmpty()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("No new nickname provided, no changes will happen."));
+            } else {
+                room->connection()->user()->rename(text, room);
+            }
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("<display name>"),
+        kli18n("Changes your display name in this room"),
+    },
+    Action{
+        QStringLiteral("ignore"),
+        [](const QString &text, NeoChatRoom *room) {
+            static const QRegularExpression mxidRegex(
+                QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
+            auto regexMatch = mxidRegex.match(text);
+            if (!regexMatch.hasMatch()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
+                return QString();
+            }
+            auto user = room->connection()->users()[text];
+            if (room->connection()->ignoredUsers().contains(user->id())) {
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<username> is already ignored.", "%1 is already ignored.", text));
+                return QString();
+            }
+            if (user) {
+                room->connection()->addToIgnoredUsers(user);
+                Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> is now ignored", "%1 is now ignored.", text));
+            } else {
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("<username> is not a known user", "%1 is not a known user.", text));
+            }
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("<user id>"),
+        kli18n("Ignores the given user"),
+    },
+    Action{
+        QStringLiteral("unignore"),
+        [](const QString &text, NeoChatRoom *room) {
+            static const QRegularExpression mxidRegex(
+                QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
+            auto regexMatch = mxidRegex.match(text);
+            if (!regexMatch.hasMatch()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
+                return QString();
+            }
+            auto user = room->connection()->users()[text];
+            if (user) {
+                if (!room->connection()->ignoredUsers().contains(user->id())) {
+                    Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<username> is not ignored.", "%1 is not ignored.", text));
+                    return QString();
+                }
+                room->connection()->removeFromIgnoredUsers(user);
+                Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> is no longer ignored.", "%1 is no longer ignored.", text));
+            } else {
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("<username> is not a known user", "%1 is not a known user.", text));
+            }
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("<user id>"),
+        kli18n("Unignores the given user"),
+    },
+    Action{
+        QStringLiteral("react"),
+        [](const QString &text, NeoChatRoom *room) {
+            QString replyEventId = room->chatBoxReplyId();
+            if (replyEventId.isEmpty()) {
+                for (auto it = room->messageEvents().crbegin(); it != room->messageEvents().crend(); it++) {
+                    const auto &evt = **it;
+                    if (const auto event = eventCast<const RoomMessageEvent>(&evt)) {
+                        room->toggleReaction(event->id(), text);
+                        return QString();
+                    }
+                }
+            }
+            room->toggleReaction(replyEventId, text);
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("<reaction text>"),
+        kli18n("React to the message with the given text"),
+    },
+    Action{
+        QStringLiteral("ban"),
+        [](const QString &text, NeoChatRoom *room) {
+            auto parts = text.split(QLatin1String(" "));
+            static const QRegularExpression mxidRegex(
+                QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
+            auto regexMatch = mxidRegex.match(parts[0]);
+            if (!regexMatch.hasMatch()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
+                return QString();
+            }
+#ifdef QUOTIENT_07
+            auto state = room->currentState().get<RoomMemberEvent>(parts[0]);
+            if (state && state->membership() == Membership::Ban) {
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is already banned from this room.", "%1 is already banned from this room.", text));
+                return QString();
+            }
+#endif
+            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
+            if (plEvent->ban() > plEvent->powerLevelForUser(room->localUser()->id())) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to ban users from this room."));
+                return QString();
+            }
+            if (plEvent->powerLevelForUser(room->localUser()->id()) <= plEvent->powerLevelForUser(parts[0])) {
+                Q_EMIT room->showMessage(
+                    NeoChatRoom::Error,
+                    i18nc("You are not allowed to ban <username> from this room.", "You are not allowed to ban %1 from this room.", parts[0]));
+                return QString();
+            }
+            room->ban(parts[0], parts.size() > 1 ? parts.mid(1).join(" ") : QString());
+            Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> was banned from this room.", "%1 was banned from this room.", parts[0]));
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("<user id> [<reason>]"),
+        kli18n("Bans the given user"),
+    },
+    Action{
+        QStringLiteral("unban"),
+        [](const QString &text, NeoChatRoom *room) {
+            static const QRegularExpression mxidRegex(
+                QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
+            auto regexMatch = mxidRegex.match(text);
+            if (!regexMatch.hasMatch()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
+                return QString();
+            }
+            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
+            if (plEvent->ban() > plEvent->powerLevelForUser(room->localUser()->id())) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to unban users from this room."));
+                return QString();
+            }
+#ifdef QUOTIENT_07
+            auto state = room->currentState().get<RoomMemberEvent>(text);
+            if (state && state->membership() != Membership::Ban) {
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is not banned from this room.", "%1 is not banned from this room.", text));
+                return QString();
+            }
+#endif
+            room->unban(text);
+            Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> was unbanned from this room.", "%1 was unbanned from this room.", text));
+
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("<user id>"),
+        kli18n("Removes the ban of the given user"),
+    },
+    Action{
+        QStringLiteral("kick"),
+        [](const QString &text, NeoChatRoom *room) {
+            auto parts = text.split(QLatin1String(" "));
+            static const QRegularExpression mxidRegex(
+                QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
+            auto regexMatch = mxidRegex.match(parts[0]);
+            if (!regexMatch.hasMatch()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error,
+                                         i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", parts[0]));
+                return QString();
+            }
+            if (parts[0] == room->localUser()->id()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You cannot kick yourself from the room."));
+                return QString();
+            }
+#ifdef QUOTIENT_07
+            if (!room->isMember(parts[0])) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("<username> is not in this room", "%1 is not in this room.", parts[0]));
+                return QString();
+            }
+#endif
+            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
+            auto kick = plEvent->kick();
+            if (plEvent->powerLevelForUser(room->localUser()->id()) < kick) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to kick users from this room."));
+                return QString();
+            }
+            if (plEvent->powerLevelForUser(room->localUser()->id()) <= plEvent->powerLevelForUser(parts[0])) {
+                Q_EMIT room->showMessage(
+                    NeoChatRoom::Error,
+                    i18nc("You are not allowed to kick <username> from this room", "You are not allowed to kick %1 from this room.", parts[0]));
+                return QString();
+            }
+            room->kickMember(parts[0], parts.size() > 1 ? parts.mid(1).join(" ") : QString());
+            Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> was kicked from this room.", "%1 was kicked from this room.", parts[0]));
+            return QString();
+        },
+        false,
+        std::nullopt,
+        kli18n("<user id> [<reason>]"),
+        kli18n("Removes the user from the room"),
+    },
+};
+
+int ActionsModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return actions.size();
+}
+
+QVariant ActionsModel::data(const QModelIndex &index, int role) const
+{
+    if (index.row() < 0 || index.row() >= actions.size()) {
+        return {};
+    }
+    if (role == Prefix) {
+        return actions[index.row()].prefix;
+    }
+    if (role == Description) {
+        return actions[index.row()].description.toString();
+    }
+    if (role == CompletionType) {
+        return QStringLiteral("action");
+    }
+    if (role == Parameters) {
+        return actions[index.row()].parameters.toString();
+    }
+    return {};
+}
+
+QHash<int, QByteArray> ActionsModel::roleNames() const
+{
+    return {
+        {Prefix, "prefix"},
+        {Description, "description"},
+        {CompletionType, "completionType"},
+    };
+}
+
+QVector<Action> &ActionsModel::allActions() const
+{
+    return actions;
+}

src/actionsmodel.h

@@ -0,0 +1,49 @@
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#pragma once
+
+#include <KLazyLocalizedString>
+#include <QAbstractListModel>
+#include <events/roommessageevent.h>
+
+class NeoChatRoom;
+
+class ActionsModel : public QAbstractListModel
+{
+public:
+    struct Action {
+        // The prefix, without '/' and space after the word
+        QString prefix;
+        std::function<QString(const QString &, NeoChatRoom *)> handle;
+        // If this is true, this action transforms a message to a different message and it will be sent.
+        // If this is false, this message does some action on the client and should not be sent as a message.
+        bool messageAction;
+        // If this action changes the message type, this is the new message type. Otherwise it's nullopt
+        std::optional<Quotient::RoomMessageEvent::MsgType> messageType = std::nullopt;
+        KLazyLocalizedString parameters;
+        KLazyLocalizedString description;
+    };
+    static ActionsModel &instance()
+    {
+        static ActionsModel _instance;
+        return _instance;
+    }
+
+    enum Roles {
+        Prefix = Qt::DisplayRole,
+        Description,
+        CompletionType,
+        Parameters,
+    };
+    Q_ENUM(Roles);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QHash<int, QByteArray> roleNames() const override;
+
+    QVector<Action> &allActions() const;
+
+private:
+    ActionsModel() = default;
+};

src/blurhash.cpp

@@ -3,6 +3,10 @@
 
 #include "blurhash.h"
 
+#include <math.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
 #include <vector>
 
 namespace

src/blurhash.h

@@ -3,11 +3,7 @@
 
 #pragma once
 
-#include <math.h>
-#include <stdbool.h>
 #include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
 
 uint8_t *decode(const char *blurhash, int width, int height, int punch, int nChannels);
 

src/chatboxhelper.cpp

@@ -1,158 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org>
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "chatboxhelper.h"
-#include <QDebug>
-
-ChatBoxHelper::ChatBoxHelper(QObject *parent)
-    : QObject(parent)
-{
-}
-
-bool ChatBoxHelper::isEditing() const
-{
-    return !m_editEventId.isEmpty();
-}
-
-QString ChatBoxHelper::editEventId() const
-{
-    return m_editEventId;
-}
-
-void ChatBoxHelper::setEditEventId(const QString &editEventId)
-{
-    if (m_editEventId == editEventId) {
-        return;
-    }
-
-    m_editEventId = editEventId;
-    Q_EMIT editEventIdChanged(m_editEventId);
-    Q_EMIT isEditingChanged(!m_editEventId.isEmpty());
-}
-
-QString ChatBoxHelper::editContent() const
-{
-    return m_editContent;
-}
-
-void ChatBoxHelper::setEditContent(const QString &editContent)
-{
-    if (m_editContent == editContent) {
-        return;
-    }
-
-    m_editContent = editContent;
-    Q_EMIT editContentChanged();
-}
-
-QString ChatBoxHelper::replyEventId() const
-{
-    return m_replyEventId;
-}
-
-void ChatBoxHelper::setReplyEventId(const QString &replyEventId)
-{
-    if (m_replyEventId == replyEventId) {
-        return;
-    }
-
-    m_replyEventId = replyEventId;
-    Q_EMIT replyEventIdChanged(m_replyEventId);
-}
-
-QString ChatBoxHelper::replyEventContent() const
-{
-    return m_replyEventContent;
-}
-
-void ChatBoxHelper::setReplyEventContent(const QString &replyEventContent)
-{
-    if (m_replyEventContent == replyEventContent) {
-        return;
-    }
-
-    m_replyEventContent = replyEventContent;
-    Q_EMIT replyEventContentChanged(m_replyEventContent);
-    Q_EMIT isReplyingChanged(!m_replyEventContent.isEmpty());
-}
-
-bool ChatBoxHelper::isReplying() const
-{
-    return !m_replyEventId.isEmpty();
-}
-
-QString ChatBoxHelper::attachmentPath() const
-{
-    return m_attachmentPath;
-}
-
-void ChatBoxHelper::setAttachmentPath(const QString &attachmentPath)
-{
-    if (m_attachmentPath == attachmentPath) {
-        return;
-    }
-
-    m_attachmentPath = attachmentPath;
-    Q_EMIT attachmentPathChanged(m_attachmentPath);
-    Q_EMIT hasAttachmentChanged(!m_attachmentPath.isEmpty());
-}
-
-bool ChatBoxHelper::hasAttachment() const
-{
-    return !m_attachmentPath.isEmpty();
-}
-
-void ChatBoxHelper::replyToMessage(const QString &replyEventId, const QString &replyEvent, const QVariant &replyUser)
-{
-    setEditEventId(QString());
-    setEditContent(QString());
-    setReplyEventId(replyEventId);
-    setReplyEventContent(replyEvent);
-    setReplyUser(replyUser);
-}
-
-QVariant ChatBoxHelper::replyUser() const
-{
-    return m_replyUser;
-}
-
-void ChatBoxHelper::setReplyUser(const QVariant &replyUser)
-{
-    if (m_replyUser == replyUser) {
-        return;
-    }
-    m_replyUser = replyUser;
-    Q_EMIT replyUserChanged();
-}
-
-void ChatBoxHelper::clear()
-{
-    setEditEventId(QString());
-    setEditContent(QString());
-    setReplyEventId(QString());
-    setReplyEventContent(QString());
-    setAttachmentPath(QString());
-    setReplyUser(QVariant());
-}
-
-void ChatBoxHelper::edit(const QString &message, const QString &formattedBody, const QString &eventId)
-{
-    setEditEventId(eventId);
-    setEditContent(message);
-    Q_EMIT editing(message, formattedBody);
-}
-
-void ChatBoxHelper::clearEditReply()
-{
-    setEditEventId(QString());
-    setEditContent(QString());
-    setReplyEventId(QString());
-    setReplyEventContent(QString());
-    setReplyUser(QVariant());
-    Q_EMIT shouldClearText();
-}
-
-void ChatBoxHelper::clearAttachment()
-{
-    setAttachmentPath(QString());
-}

src/chatboxhelper.h

@@ -1,75 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org>
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <QObject>
-#include <QVariant>
-
-/// Helper singleton for keeping the chatbar state in sync in the application.
-class ChatBoxHelper : public QObject
-{
-    Q_OBJECT
-    /// True, iff the user is currently editing one of their previous message.
-    Q_PROPERTY(bool isEditing READ isEditing NOTIFY isEditingChanged)
-    Q_PROPERTY(QString editEventId READ editEventId WRITE setEditEventId NOTIFY editEventIdChanged)
-    Q_PROPERTY(QString editContent READ editContent WRITE setEditContent NOTIFY editContentChanged)
-
-    Q_PROPERTY(bool isReplying READ isReplying NOTIFY isReplyingChanged)
-    Q_PROPERTY(QString replyEventId READ replyEventId WRITE setReplyEventId NOTIFY replyEventIdChanged)
-    Q_PROPERTY(QString replyEventContent READ replyEventContent WRITE setReplyEventContent NOTIFY replyEventContentChanged)
-    Q_PROPERTY(QVariant replyUser READ replyUser WRITE setReplyUser NOTIFY replyUserChanged)
-
-    Q_PROPERTY(QString attachmentPath READ attachmentPath WRITE setAttachmentPath NOTIFY attachmentPathChanged)
-    Q_PROPERTY(bool hasAttachment READ hasAttachment NOTIFY hasAttachmentChanged)
-
-public:
-    ChatBoxHelper(QObject *parent = nullptr);
-    ~ChatBoxHelper() = default;
-
-    bool isEditing() const;
-    QString editEventId() const;
-    QString editContent() const;
-
-    QString replyEventId() const;
-    QString replyEventContent() const;
-    QVariant replyUser() const;
-    bool isReplying() const;
-
-    QString attachmentPath() const;
-    bool hasAttachment() const;
-
-    void setEditEventId(const QString &editEventId);
-    void setEditContent(const QString &editContent);
-    void setReplyEventId(const QString &replyEventId);
-    void setReplyEventContent(const QString &replyEventContent);
-    void setAttachmentPath(const QString &attachmentPath);
-    void setReplyUser(const QVariant &replyUser);
-
-    Q_INVOKABLE void replyToMessage(const QString &replyEventid, const QString &replyEvent, const QVariant &replyUser);
-    Q_INVOKABLE void edit(const QString &message, const QString &formattedBody, const QString &eventId);
-    Q_INVOKABLE void clear();
-    Q_INVOKABLE void clearEditReply();
-    Q_INVOKABLE void clearAttachment();
-
-Q_SIGNALS:
-    void isEditingChanged(bool isEditing);
-    void editEventIdChanged(const QString &editEventId);
-    void editContentChanged();
-    void replyEventIdChanged(const QString &replyEventId);
-    void replyEventContentChanged(const QString &replyEventContent);
-    void replyUserChanged();
-    void isReplyingChanged(bool isReplying);
-    void attachmentPathChanged(const QString &attachmentPath);
-    void hasAttachmentChanged(bool hasAttachment);
-    void editing(const QString &message, const QString &formattedBody);
-    void shouldClearText();
-
-private:
-    QString m_editEventId;
-    QString m_editContent;
-    QString m_replyEventId;
-    QString m_replyEventContent;
-    QVariant m_replyUser;
-    QString m_attachmentPath;
-};