GIT_SILENT Sync po/docbooks with svn

These weren't removed in d165cd955d
because I forgot.

.craft.ini

@@ -2,5 +2,6 @@
 ; SPDX-License-Identifier: CC0-1.0
 
 [BlueprintSettings]
-kde/unreleased/kirigami-addons.version=master
+kde/applications/neochat.packageAppx=True
+kde/frameworks/extra-cmake-modules.version=master
 libs/qt.qtMajorVersion=6

.flatpak-manifest.json

@@ -2,7 +2,7 @@
     "id": "org.kde.neochat",
     "branch": "master",
     "runtime": "org.kde.Platform",
-    "runtime-version": "6.6-kf6preview",
+    "runtime-version": "6.7",
     "sdk": "org.kde.Sdk",
     "command": "neochat",
     "tags": [
@@ -27,7 +27,7 @@
             "name": "kirigamiaddons",
             "config-opts": [ "-DBUILD_TESTING=OFF" ],
             "buildsystem": "cmake-ninja",
-            "sources": [ { "type": "git", "url": "https://invent.kde.org/libraries/kirigami-addons.git" } ]
+            "sources": [ { "type": "git", "url": "https://invent.kde.org/libraries/kirigami-addons.git", "commit": "34d311219e8b7209746a98b3a29b91ded05ff936" } ]
         },
         {
             "name": "kquickimageeditor",
@@ -110,7 +110,7 @@
                 {
                     "type": "git",
                     "url": "https://github.com/quotient-im/libQuotient.git",
-                    "branch": "dev",
+                    "branch": "0.8.x",
                     "disable-submodules": true
                 }
             ],

.gitignore

@@ -12,3 +12,4 @@ kate.project.ctags.*
 .idea/
 cmake-build-*
 src/res.generated.qrc
+.qmlls.ini

.gitlab-ci.yml

@@ -8,8 +8,9 @@ include:
       - /gitlab-templates/android-qt6.yml
       - /gitlab-templates/linux-qt6.yml
       - /gitlab-templates/windows-qt6.yml
-      - /gitlab-templates/freebsd-qt6.yml
+#      - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/flatpak.yml
       - /gitlab-templates/craft-android-qt6-apks.yml
       - /gitlab-templates/craft-appimage-qt6.yml
       - /gitlab-templates/craft-windows-x86-64-qt6.yml
+      - /gitlab-templates/craft-windows-appx-qt6.yml

.kde-ci.yml

@@ -28,9 +28,11 @@ Dependencies:
     'frameworks/kio': '@latest-kf6'
     'frameworks/kwindowsystem': '@latest-kf6'
     'frameworks/kstatusnotifieritem': '@latest-kf6'
+    'frameworks/kcrash': '@latest-kf6'
 - 'on': ['Linux', 'FreeBSD']
   'require':
     'frameworks/kdbusaddons': '@latest-kf6'
+    'frameworks/purpose': '@latest-kf6'
 
 - 'on': ['Linux']
   'require':
@@ -38,4 +40,4 @@ Dependencies:
 
 Options:
   per-test-timeout: 90
-  require-passing-tests-on: [ '@all' ]
+  require-passing-tests-on: [ 'Linux', 'Android', 'FreeBSD' ]

.reuse/dep5

@@ -49,3 +49,7 @@ License: CC0-1.0
 Files: appiumtests/data/*
 Copyright: 2023 Tobias Fella <tobias.fella@kde.org>
 License: CC0-1.0
+
+Files: src/purpose/purposeplugin.json
+Copyright: 2023 Tobias Fella <tobias.fella@kde.org>
+License: BSD-2-Clause

CMakeLists.txt

@@ -8,13 +8,13 @@ cmake_minimum_required(VERSION 3.16)
 
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "24")
-set(RELEASE_SERVICE_VERSION_MINOR "01")
-set(RELEASE_SERVICE_VERSION_MICRO "90")
+set(RELEASE_SERVICE_VERSION_MINOR "11")
+set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
 
-set(KF_MIN_VERSION "5.240.0")
+set(KF_MIN_VERSION "6.6")
 set(QT_MIN_VERSION "6.5")
 
 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
@@ -24,7 +24,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(KDE_COMPILERSETTINGS_LEVEL 5.105)
+set(KDE_COMPILERSETTINGS_LEVEL 6.0)
 
 include(FeatureSummary)
 include(ECMSetupVersion)
@@ -38,6 +38,7 @@ include(KDEGitCommitHooks)
 include(ECMCheckOutboundLicense)
 include(ECMQtDeclareLoggingCategory)
 include(ECMAddAndroidApk)
+include(ECMQmlModule)
 if (NOT ANDROID)
     include(KDEClangFormat)
 endif()
@@ -58,6 +59,11 @@ set_package_properties(Qt6 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
 )
+
+if (QT_KNOWN_POLICY_QTP0004)
+qt_policy(SET QTP0004 NEW)
+endif ()
+
 find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels ColorScheme)
 set_package_properties(KF6 PROPERTIES
     TYPE REQUIRED
@@ -69,6 +75,10 @@ set_package_properties(KF6Kirigami PROPERTIES
 )
 find_package(KF6KirigamiAddons 0.7.2 REQUIRED)
 
+if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT NEOCHAT_FLATPAK AND NOT NEOCHAT_APPIMAGE)
+    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Purpose)
+endif ()
+
 if(ANDROID)
     find_package(OpenSSL)
     set_package_properties(OpenSSL PROPERTIES
@@ -77,7 +87,8 @@ if(ANDROID)
     )
 else()
     find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem)
+    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem Crash)
+    find_package(KF6SyntaxHighlighting ${KF_MIN_VERSION} REQUIRED)
     set_package_properties(KF6QQC2DesktopStyle PROPERTIES
         TYPE RUNTIME
     )
@@ -94,7 +105,7 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     find_package(KF6DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()
 
-find_package(QuotientQt6 0.7)
+find_package(QuotientQt6 0.8.2)
 set_package_properties(QuotientQt6 PROPERTIES
     TYPE REQUIRED
     DESCRIPTION "Qt wrapper around Matrix API"

README.md

@@ -1,6 +1,6 @@
 <!--
     SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carlschwan@kde.org>
-    SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
+    SPDX-FileCopyrightText: 2020-2024 Tobias Fella <tobias.fella@kde.org>
     SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
     SPDX-License-Identifier: CC0-1.0
 -->
@@ -16,19 +16,18 @@ A Qt/QML based Matrix client.
 ## Introduction
 
 NeoChat is a client for [Matrix](https://matrix.org), the decentralized communication protocol for instant
-messaging. It is a fork of Spectral, using KDE frameworks, most notably [Kirigami](https://invent.kde.org/frameworks/kirigami)
-to provide a convergent experience across multiple platforms.
+messaging.
 
-NeoChat also make use of other KDE Frameworks as well as [libQuotient](https://github.com/quotient-im/libQuotient), a
+NeoChat is based on KDE frameworks and as [libQuotient](https://github.com/quotient-im/libQuotient), a
 Qt-based SDK for the [Matrix Protocol](https://spec.matrix.org/).
 
 ![Timeline](https://cdn.kde.org/screenshots/neochat/application.png)
 
 ## Features
 
-NeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions
-of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly
-evolving but the aim remains to provide eventual support for the entire spec.
+NeoChat aims to be a fully featured application for the Matrix specification. As such most parts of the current specification are supported, with the notable exceptions
+of VoIP, threads, and some aspects of End-to-End Encryption. There are a few other smaller omissions due to the fact that the Matrix spec is constantly
+evolving, but the aim remains to provide eventual support for the entire spec.
 
 Due to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:
 - Polls - MSC3381
@@ -39,26 +38,9 @@ Due to the nature of the Matrix specification development NeoChat also supports
 
 Details where to find stable releases for NeoChat can be found on its [homepage](https://apps.kde.org/neochat).
 
-In addition to the stable builds, unstable nightly builds are available for all platforms. These can be downloaded
-from the [binary factory](https://binary-factory.kde.org/). There are unstable versions for the following platforms
-in addition to stable ones:
-- Android
-- MacOS
-- Windows
-
-Additionally the nightly Flatpak version can be obtained from the nightly Flatpak repo using the following commands in your terminal:
-
-```
-flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-flatpak remote-add --if-not-exists kdeapps --from https://distribute.kde.org/kdeapps.flatpakrepo
-flatpak install kdeapps org.kde.neochat
-```
-
-The unstable Android version can also be obtained from the [KDE nightly F-Droid repo](https://community.kde.org/Android/FDroid).
-
-## Running
-
-Just start the executable in your preferred way - either from the build directory or from the installed location.
+Nightly builds for Linux and Windows can be downloaded from [cdn.kde.org](https://cdn.kde.org/ci-builds/network/neochat/).
+Nightly builds for Android are available from [KDE's nightly F-Droid repository](https://community.kde.org/Android/F-Droid).
+Nightly Flatpaks are available from [KDE's nightly Flatpak repository](https://userbase.kde.org/Tutorials/Flatpak).
 
 ## Building NeoChat
 
@@ -69,14 +51,18 @@ is primarily aimed at Linux development.
 For Windows and Android [Craft](https://invent.kde.org/packaging/craft) is the primary choice. There are guides for setting up
 development environments for [Windows](https://community.kde.org/Get_Involved/development/Windows) and [Android](https://develop.kde.org/docs/packaging/android/building_applications/).
 
+## Running
+
+Just start the executable in your preferred way - either from the build directory or from the installed location.
+
 ## Tests
 
-Tests are in the repository under [autotests](autotests) and should all pass for any contribution.
+Tests are in the repository under [autotests](autotests) and [appiumtests](appiumtests).
 
 The project has CI setup to test new commits to the repository. All tests are expected to pass for a merge request to
 be complete.
 
-Current build status
+## Current build status
 
 ![coverage](https://invent.kde.org/network/neochat/badges/master/pipeline.svg)
 
@@ -100,9 +86,9 @@ The best place to reach the maintainers is on the KDE Matrix instance in the Neo
 
 ## Acknowledgement
 
-This program utilizes [libQuotient](https://github.com/quotient-im/libQuotient/) as its Matrix SDK.
+NeoChat utilizes [libQuotient](https://github.com/quotient-im/libQuotient/) as its Matrix SDK.
 
-This program is a fork of [Spectral](https://gitlab.com/spectral-im/spectral/).
+NeoChat is a fork of [Spectral](https://gitlab.com/spectral-im/spectral/).
 
 ## License
 

appiumtests/createroomtest.py

@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+
+import os
+import subprocess
+import sys
+import unittest
+import time
+
+from appium import webdriver
+from appium.options.common.base import AppiumOptions
+from appium.webdriver.common.appiumby import AppiumBy
+
+
+class CreateRoomTest(unittest.TestCase):
+
+    mockServerProcess: subprocess.Popen
+
+    @classmethod
+    def setUpClass(cls):
+        cls.mockServerProcess = subprocess.Popen([sys.executable, os.path.join(os.path.dirname(__file__), "login-server.py")])
+        options = AppiumOptions()
+        options.set_capability("app", "neochat --ignore-ssl-errors --test")
+        cls.driver = webdriver.Remote(command_executor='http://127.0.0.1:4723', options=options)
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        if not self._outcome.result.wasSuccessful():
+            self.driver.get_screenshot_as_file("failed_test_shot_{}.png".format(self.id()))
+
+    @classmethod
+    def tearDownClass(self):
+        self.mockServerProcess.terminate()
+        self.driver.quit()
+
+    def test_create_room(self):
+        self.driver.find_element(by=AppiumBy.NAME, value="@user:localhost:1234").click()
+        self.driver.find_element(by=AppiumBy.NAME, value="Show Menu").click()
+        self.driver.find_element(by=AppiumBy.NAME, value="Create a Room").click()
+        self.driver.find_element(by=AppiumBy.NAME, value="Name:").send_keys("Super awesome room name")#
+        time.sleep(0.1) # without this, the second half of the text is sent to the topic field?!
+        self.driver.find_element(by=AppiumBy.NAME, value="Topic:").send_keys("There are not enough raccoons here")
+        time.sleep(0.1)
+        self.driver.find_element(by=AppiumBy.NAME, value="Create Room").click()
+        time.sleep(0.1)
+        self.driver.find_element(by=AppiumBy.NAME, value="Super awesome room name").click()
+        self.driver.find_element(by=AppiumBy.NAME, value="Show Room Information").click()
+        self.driver.find_element(by=AppiumBy.NAME, value="There are not enough raccoons here")
+
+
+if __name__ == '__main__':
+    unittest.main()

appiumtests/data/sync_response_new_room.json

@@ -0,0 +1,78 @@
+{
+    "next_batch": "batch1234",
+    "rooms": {
+        "join": {
+            "!newroom123321:localhost:1234": {
+                "state": {
+                    "events": [
+                        {
+                            "type": "m.room.member",
+                            "state_key": "@user:localhost:1234",
+                            "sender": "@user:localhost:1234",
+                            "origin_server_ts": 1432735824653,
+                            "event_id": "$event_id_1234_0:localhost:1234",
+                            "room_id": "!newroom123321:localhost:1234",
+                            "content": {
+                                "avatar_url": "",
+                                "displayname": "A Display Name",
+                                "membership": "join",
+                                "reason": "Nothing"
+                            },
+                            "unsigned": {
+                                "age": 1234
+                            }
+                        },
+                        {
+                            "type": "m.room.name",
+                            "state_key": "",
+                            "sender": "@user:localhost:1234",
+                            "origin_server_ts": 1432735824653,
+                            "event_id": "$event_id_1234_1:localhost:1234",
+                            "room_id": "!newroom123321:localhost:1234",
+                            "content": {
+                                "name": "Super awesome room name"
+                            },
+                            "unsigned": {
+                                "age": 1234
+                            }
+                        },
+                        {
+                            "type": "m.room.topic",
+                            "state_key": "",
+                            "sender": "@user:localhost:1234",
+                            "origin_server_ts": 1432735824653,
+                            "event_id": "$event_id_1234_2:localhost:1234",
+                            "room_id": "!newroom123321:localhost:1234",
+                            "content": {
+                                "topic": "There are not enough raccoons here"
+                            },
+                            "unsigned": {
+                                "age": 1234
+                            }
+                        }
+                    ]
+                },
+                "timeline": {
+                    "events": [
+                        {
+                            "type": "m.room.message",
+                            "sender": "@user:localhost:1234",
+                            "origin_server_ts": 1432735824653,
+                            "event_id": "$event_id_1234_1:localhost:1234",
+                            "room_id": "!newroom123321:localhost:1234",
+                            "content": {
+                                "body": "This is a message",
+                                "format": "org.matrix.custom.html",
+                                "formatted_body": "<a href=\"https://matrix.to/#/@user:localhost:1234\">User</a>:",
+                                "msgtype": "m.text"
+                            },
+                            "unsigned": {
+                                "age": 1234
+                            }
+                        }
+                    ]
+                }
+            }
+        }
+    }
+}

appiumtests/login-server.py

@@ -6,6 +6,8 @@ from flask import Flask, request, abort
 import os
 app = Flask(__name__)
 
+next_sync_payload = ""
+
 
 @app.route("/_matrix/client/v3/login", methods=["GET"])
 def login_get():
@@ -42,8 +44,13 @@ def load_json(name):
 
 @app.route("/_matrix/client/r0/sync")
 def sync():
-
-    result = load_json("sync_response_no_rooms") if ("login" in request.headers.get("Authorization")) else load_json("sync_response_rooms")
+    global next_sync_payload
+    result = dict()
+    if len(next_sync_payload) > 0:
+        result = load_json(next_sync_payload)
+        next_sync_payload = ""
+    else:
+        result = load_json("sync_response_no_rooms") if ("login" in request.headers.get("Authorization")) else load_json("sync_response_rooms")
     return result
 
 @app.route("/.well-known/matrix/client")
@@ -65,6 +72,18 @@ def upload_keys():
     reply = dict()
     return reply
 
+@app.route("/_matrix/client/v3/createRoom", methods=["POST"])
+def create_room():
+    global next_sync_payload
+    data = request.get_json()
+    if data["name"] != "Super awesome room name" or data["topic"] != "There are not enough raccoons here":
+        return dict(), 400
+    response = dict()
+    response["room_id"] = "!newroom123321:localhost:1234"
+    next_sync_payload = "sync_response_new_room"
+    return response
+
+
 
 if __name__ == "__main__":
     app.run(ssl_context='adhoc', port=1234)

appiumtests/openuserdetailstest.py

@@ -39,6 +39,10 @@ class OpenUserDetailsTest(unittest.TestCase):
 
     def test_open_sheet(self):
         self.driver.find_element(by=AppiumBy.NAME, value="@user:localhost:1234").click()
+        try:
+            self.driver.find_element(by=AppiumBy.NAME, value="Expand Normal").click()
+        except:
+            pass
         self.driver.find_element(by=AppiumBy.NAME, value="Empty room (!room_id_1234:localhost:1234)").click()
         self.driver.find_element(by=AppiumBy.NAME, value="A Display Name").click()
         self.driver.find_element(by=AppiumBy.NAME, value="Account Details")

autotests/chatbarcachetest.cpp

@@ -6,6 +6,7 @@
 #include <QObject>
 #include <QTest>
 
+#include <Quotient/roommember.h>
 #include <Quotient/syncdata.h>
 #include <qtestcase.h>
 
@@ -50,7 +51,7 @@ void ChatBarCacheTest::empty()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(nullptr));
+    QCOMPARE(chatBarCache->relationUser(), room->member(QString()));
     QCOMPARE(chatBarCache->relationMessage(), QString());
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
@@ -64,7 +65,7 @@ void ChatBarCacheTest::noRoom()
     // ChatBarCache has no parent.
 
     QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.");
-    QCOMPARE(chatBarCache->relationUser(), QVariantMap());
+    QCOMPARE(chatBarCache->relationUser(), Quotient::RoomMember());
 
     QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.");
     QCOMPARE(chatBarCache->relationMessage(), QString());
@@ -80,7 +81,7 @@ void ChatBarCacheTest::badParent()
     // ChatBarCache has no parent.
 
     QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.");
-    QCOMPARE(chatBarCache->relationUser(), QVariantMap());
+    QCOMPARE(chatBarCache->relationUser(), Quotient::RoomMember());
 
     QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.");
     QCOMPARE(chatBarCache->relationMessage(), QString());
@@ -98,7 +99,7 @@ void ChatBarCacheTest::reply()
     QCOMPARE(chatBarCache->replyId(), QLatin1String("$153456789:example.org"));
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(room->user(QLatin1String("@example:example.org"))));
+    QCOMPARE(chatBarCache->relationUser(), room->member(QLatin1String("@example:example.org")));
     QCOMPARE(chatBarCache->relationMessage(), QLatin1String("This is an example\ntext message"));
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
@@ -106,8 +107,13 @@ void ChatBarCacheTest::reply()
 void ChatBarCacheTest::edit()
 {
     QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
+
     chatBarCache->setText(QLatin1String("some text"));
     chatBarCache->setAttachmentPath(QLatin1String("some/path"));
+    connect(chatBarCache.get(), &ChatBarCache::relationIdChanged, this, [](const QString &oldEventId, const QString &newEventId) {
+        QCOMPARE(oldEventId, QString());
+        QCOMPARE(newEventId, QString(QLatin1String("$153456789:example.org")));
+    });
     chatBarCache->setEditId(QLatin1String("$153456789:example.org"));
 
     QCOMPARE(chatBarCache->text(), QLatin1String("some text"));
@@ -115,7 +121,7 @@ void ChatBarCacheTest::edit()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), true);
     QCOMPARE(chatBarCache->editId(), QLatin1String("$153456789:example.org"));
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(room->user(QLatin1String("@example:example.org"))));
+    QCOMPARE(chatBarCache->relationUser(), room->member(QLatin1String("@example:example.org")));
     QCOMPARE(chatBarCache->relationMessage(), QLatin1String("This is an example\ntext message"));
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
@@ -132,7 +138,7 @@ void ChatBarCacheTest::attachment()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(nullptr));
+    QCOMPARE(chatBarCache->relationUser(), room->member(QString()));
     QCOMPARE(chatBarCache->relationMessage(), QString());
     QCOMPARE(chatBarCache->attachmentPath(), QLatin1String("some/path"));
 }

autotests/data/test-eventhandler-sync.json

@@ -25,7 +25,7 @@
         "content": {
           "user_ids": [
             "@alice:matrix.org",
-            "@bob:example.com"
+            "@bob:kde.org"
           ]
         },
         "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
@@ -35,7 +35,7 @@
         "content": {
           "$153456789:example.org": {
             "m.read": {
-              "@alice:matrix.org": {
+              "@alice:example.org": {
                 "ts": 1436451550453
               }
             }
@@ -47,7 +47,7 @@
         "content": {
           "$1532735824654:example.org": {
             "m.read": {
-              "@bob:example.com": {
+              "@bob:kde.org": {
                 "ts": 1436451550453
               }
             }
@@ -67,6 +67,18 @@
         },
         "type": "m.receipt"
       },
+      {
+        "content": {
+          "$1532735824654:example.org": {
+            "m.read": {
+              "@tim2:example.com": {
+                "ts": 1436451550454
+              }
+            }
+          }
+        },
+        "type": "m.receipt"
+      },
       {
         "content": {
           "$1532735824654:example.org": {
@@ -136,6 +148,22 @@
           "age": 1234
         }
       },
+      {
+        "content": {
+          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
+          "displayname": "Bob",
+          "membership": "join"
+        },
+        "event_id": "$143273582443PhrSn:example.org",
+        "origin_server_ts": 1432735824653,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "bob:kde.org",
+        "state_key": "@bob:kde.org",
+        "type": "m.room.member",
+        "unsigned": {
+          "age": 1234
+        }
+      },
       {
         "content": {
           "displayname": "Look\nat\nme\nI\nput\nnewlines\nin\nmy\ndisplay name",
@@ -156,7 +184,7 @@
   "summary": {
     "m.heroes": [
       "@alice:example.com",
-      "@bob:example.com"
+      "@bob:kde.org"
     ],
     "m.invited_member_count": 0,
     "m.joined_member_count": 2

autotests/data/test-invalidmatrixtolink-event.json

@@ -1,14 +0,0 @@
-{
-    "content": {
-        "body": "https://matrix.to/#/@alice:example.org",
-        "msgtype": "m.text"
-    },
-    "event_id": "$validlink1:example.org",
-    "origin_server_ts": 1432735824654,
-    "room_id": "!test:example.org",
-    "sender": "@example:example.org",
-    "type": "m.room.message",
-    "unsigned": {
-        "age": 1234
-    }
-}

autotests/data/test-invalidmxclink-event.json

@@ -1,14 +0,0 @@
-{
-    "content": {
-        "body": "mxc://example.org/SEsfnsuifSDFSSEF",
-        "msgtype": "m.text"
-    },
-    "event_id": "$validlink1:example.org",
-    "origin_server_ts": 1432735824654,
-    "room_id": "!test:example.org",
-    "sender": "@example:example.org",
-    "type": "m.room.message",
-    "unsigned": {
-        "age": 1234
-    }
-}

autotests/data/test-invalidnospacelink-event.json

@@ -1,14 +0,0 @@
-{
-    "content": {
-        "body": "testhttps://kde.org",
-        "msgtype": "m.text"
-    },
-    "event_id": "$validlink1:example.org",
-    "origin_server_ts": 1432735824654,
-    "room_id": "!test:example.org",
-    "sender": "@example:example.org",
-    "type": "m.room.message",
-    "unsigned": {
-        "age": 1234
-    }
-}

autotests/data/test-min-sync.json

@@ -37,16 +37,14 @@
     "events": [
       {
         "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Alice Margatroid",
-          "membership": "join",
-          "reason": "Looking for support"
+          "displayname": "Example",
+          "membership": "join"
         },
         "event_id": "$143273582443PhrSn:example.org",
         "origin_server_ts": 1432735824653,
         "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
         "sender": "@example:example.org",
-        "state_key": "@alice:example.org",
+        "state_key": "@example:example.org",
         "type": "m.room.member",
         "unsigned": {
           "age": 1234

autotests/data/test-reactionmodel-sync.json

@@ -130,7 +130,23 @@
         "origin_server_ts": 1432735824653,
         "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
         "sender": "@example:example.org",
-        "state_key": "@alice:example.org",
+        "state_key": "@alice:matrix.org",
+        "type": "m.room.member",
+        "unsigned": {
+          "age": 1234
+        }
+      },
+      {
+        "content": {
+          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
+          "displayname": "Bob",
+          "membership": "join"
+        },
+        "event_id": "$143273582443PhrSn:example.org",
+        "origin_server_ts": 1432735824653,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "bob:example.org",
+        "state_key": "@bob:example.org",
         "type": "m.room.member",
         "unsigned": {
           "age": 1234

autotests/data/test-texthandler-sync.json

@@ -51,6 +51,21 @@
         "unsigned": {
           "age": 1234
         }
+      },
+      {
+        "content": {
+          "displayname": "Example",
+          "membership": "join"
+        },
+        "event_id": "$143273582443PhrSn:example.org",
+        "origin_server_ts": 1432735824653,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "state_key": "@example:example.org",
+        "type": "m.room.member",
+        "unsigned": {
+          "age": 1234
+        }
       }
     ]
   },

autotests/data/test-validplainlink-event.json

@@ -1,14 +0,0 @@
-{
-    "content": {
-        "body": "https://kde.org",
-        "msgtype": "m.text"
-    },
-    "event_id": "$validlink1:example.org",
-    "origin_server_ts": 1432735824654,
-    "room_id": "!test:example.org",
-    "sender": "@example:example.org",
-    "type": "m.room.message",
-    "unsigned": {
-        "age": 1234
-    }
-}

autotests/data/test-validplainwwwlink-event.json

@@ -1,14 +0,0 @@
-{
-    "content": {
-        "body": "www.example.org",
-        "msgtype": "m.text"
-    },
-    "event_id": "$validlink1:example.org",
-    "origin_server_ts": 1432735824654,
-    "room_id": "!test:example.org",
-    "sender": "@example:example.org",
-    "type": "m.room.message",
-    "unsigned": {
-        "age": 1234
-    }
-}

autotests/data/test-validrichlink-event.json

@@ -1,16 +0,0 @@
-{
-    "content": {
-        "body": "[Rich Link](https://kde.org)",
-        "format": "org.matrix.custom.html",
-        "formatted_body": "<a href=\"https://kde.org\">Rich Link</a>",
-        "msgtype": "m.text"
-    },
-    "event_id": "$validlink1:example.org",
-    "origin_server_ts": 1432735824654,
-    "room_id": "!test:example.org",
-    "sender": "@example:example.org",
-    "type": "m.room.message",
-    "unsigned": {
-        "age": 1234
-    }
-}

autotests/delegatesizehelpertest.cpp

@@ -130,7 +130,7 @@ void DelegateSizeHelperTest::equalBreakpoint_data()
 }
 
 /**
- * We expect a default return except in the case where the the two percentages are
+ * We expect a default return except in the case where the two percentages are
  * equal as that case can be calculated without dividing by zero.
  */
 void DelegateSizeHelperTest::equalBreakpoint()

autotests/eventhandlertest.cpp

@@ -12,7 +12,6 @@
 #include <Quotient/quotient_common.h>
 #include <Quotient/syncdata.h>
 
-#include "enums/delegatetype.h"
 #include "linkpreviewer.h"
 #include "models/reactionmodel.h"
 #include "neochatroom.h"
@@ -29,21 +28,12 @@ class EventHandlerTest : public QObject
 private:
     Connection *connection = nullptr;
     TestUtils::TestRoom *room = nullptr;
-    EventHandler eventHandler;
-    EventHandler emptyHandler;
-    EventHandler noEventHandler;
 
 private Q_SLOTS:
     void initTestCase();
 
-    void nullSetEvent();
     void eventId();
     void nullEventId();
-    void delegateType_data();
-    void delegateType();
-    void nullDelegateType();
-    void author();
-    void nullAuthor();
     void authorDisplayName();
     void nullAuthorDisplayName();
     void singleLineSidplayName();
@@ -51,7 +41,6 @@ private Q_SLOTS:
     void time();
     void nullTime();
     void timeString();
-    void nullTimeString();
     void highlighted();
     void nullHighlighted();
     void hidden();
@@ -61,6 +50,8 @@ private Q_SLOTS:
     void genericBody_data();
     void genericBody();
     void nullGenericBody();
+    void markdownBody();
+    void markdownBodyReply();
     void subtitle();
     void nullSubtitle();
     void mediaInfo();
@@ -69,253 +60,152 @@ private Q_SLOTS:
     void nullHasReply();
     void replyId();
     void nullReplyId();
-    void replyDelegateType();
-    void nullReplyDelegateType();
     void replyAuthor();
     void nullReplyAuthor();
-    void replyBody();
-    void nullReplyBody();
-    void replyMediaInfo();
-    void nullReplyMediaInfo();
     void thread();
     void nullThread();
     void location();
     void nullLocation();
-    void readMarkers();
-    void nullReadMarkers();
-
-    void cleanup();
 };
 
 void EventHandlerTest::initTestCase()
 {
     connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
     room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-eventhandler-sync.json"));
-
-    eventHandler.setRoom(room);
-    noEventHandler.setRoom(room);
-}
-
-void EventHandlerTest::nullSetEvent()
-{
-    QTest::ignoreMessage(QtWarningMsg, "cannot setEvent when m_room is set to nullptr.");
-    emptyHandler.setEvent(room->messageEvents().at(0).get());
 }
 
 void EventHandlerTest::eventId()
 {
-    eventHandler.setEvent(room->messageEvents().at(0).get());
-
-    QCOMPARE(eventHandler.getId(), QStringLiteral("$153456789:example.org"));
+    QCOMPARE(EventHandler::id(room->messageEvents().at(0).get()), QStringLiteral("$153456789:example.org"));
 }
 
 void EventHandlerTest::nullEventId()
 {
-    QTest::ignoreMessage(QtWarningMsg, "getId called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getId(), QString());
-}
-
-void EventHandlerTest::delegateType_data()
-{
-    QTest::addColumn<int>("eventNum");
-    QTest::addColumn<DelegateType::Type>("delegateType");
-
-    QTest::newRow("message") << 0 << DelegateType::Message;
-    QTest::newRow("state") << 1 << DelegateType::State;
-    QTest::newRow("message 2") << 2 << DelegateType::Message;
-    QTest::newRow("reaction") << 3 << DelegateType::Other;
-    QTest::newRow("video") << 4 << DelegateType::Video;
-    QTest::newRow("location") << 7 << DelegateType::Location;
-}
-
-void EventHandlerTest::delegateType()
-{
-    QFETCH(int, eventNum);
-    QFETCH(DelegateType::Type, delegateType);
-
-    eventHandler.setEvent(room->messageEvents().at(eventNum).get());
-
-    QCOMPARE(eventHandler.getDelegateType(), delegateType);
-}
-
-void EventHandlerTest::nullDelegateType()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getDelegateType called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getDelegateType(), DelegateType::Other);
-}
-
-void EventHandlerTest::author()
-{
-    auto event = room->messageEvents().at(0).get();
-    auto author = room->user(event->senderId());
-    eventHandler.setEvent(event);
-
-    auto eventHandlerAuthor = eventHandler.getAuthor();
-
-    QCOMPARE(eventHandlerAuthor["isLocalUser"_ls], author->id() == room->localUser()->id());
-    QCOMPARE(eventHandlerAuthor["id"_ls], author->id());
-    QCOMPARE(eventHandlerAuthor["displayName"_ls], author->displayname(room));
-    QCOMPARE(eventHandlerAuthor["avatarSource"_ls], room->avatarForMember(author));
-    QCOMPARE(eventHandlerAuthor["avatarMediaId"_ls], author->avatarMediaId(room));
-    QCOMPARE(eventHandlerAuthor["color"_ls], Utils::getUserColor(author->hueF()));
-    QCOMPARE(eventHandlerAuthor["object"_ls], QVariant::fromValue(author));
-}
-
-void EventHandlerTest::nullAuthor()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getAuthor called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getAuthor(), QVariantMap());
-
-    QTest::ignoreMessage(QtWarningMsg, "getAuthor called with m_event set to nullptr. Returning empty user.");
-    QCOMPARE(noEventHandler.getAuthor(), room->getUser(nullptr));
+    QTest::ignoreMessage(QtWarningMsg, "id called with event set to nullptr.");
+    QCOMPARE(EventHandler::id(nullptr), QString());
 }
 
 void EventHandlerTest::authorDisplayName()
 {
-    auto event = room->messageEvents().at(1).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getAuthorDisplayName(), QStringLiteral("before"));
+    QCOMPARE(EventHandler::authorDisplayName(room, room->messageEvents().at(1).get()), QStringLiteral("before"));
 }
 
 void EventHandlerTest::nullAuthorDisplayName()
 {
-    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getAuthorDisplayName(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "authorDisplayName called with room set to nullptr.");
+    QCOMPARE(EventHandler::authorDisplayName(nullptr, nullptr), QString());
 
-    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getAuthorDisplayName(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "authorDisplayName called with event set to nullptr.");
+    QCOMPARE(EventHandler::authorDisplayName(room, nullptr), QString());
 }
 
 void EventHandlerTest::singleLineSidplayName()
 {
-    auto event = room->messageEvents().at(11).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.singleLineAuthorDisplayname(), QStringLiteral("Look at me I put newlines in my display name"));
+    QCOMPARE(EventHandler::singleLineAuthorDisplayname(room, room->messageEvents().at(11).get()),
+             QStringLiteral("Look at me I put newlines in my display name"));
 }
 
 void EventHandlerTest::nullSingleLineDisplayName()
 {
-    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.singleLineAuthorDisplayname(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "singleLineAuthorDisplayname called with room set to nullptr.");
+    QCOMPARE(EventHandler::singleLineAuthorDisplayname(nullptr, nullptr), QString());
 
-    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.singleLineAuthorDisplayname(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "singleLineAuthorDisplayname called with event set to nullptr.");
+    QCOMPARE(EventHandler::singleLineAuthorDisplayname(room, nullptr), QString());
 }
 
 void EventHandlerTest::time()
 {
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
+    const auto event = room->messageEvents().at(0).get();
 
-    QCOMPARE(eventHandler.getTime(), QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC));
-    QCOMPARE(eventHandler.getTime(true, QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC)), QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC));
+    QCOMPARE(EventHandler::time(event), QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC));
+    QCOMPARE(EventHandler::time(event, true, QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC)), QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC));
 }
 
 void EventHandlerTest::nullTime()
 {
-    QTest::ignoreMessage(QtWarningMsg, "getTime called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getTime(), QDateTime());
+    QTest::ignoreMessage(QtWarningMsg, "time called with event set to nullptr.");
+    QCOMPARE(EventHandler::time(nullptr), QDateTime());
 
-    eventHandler.setEvent(room->messageEvents().at(0).get());
     QTest::ignoreMessage(QtWarningMsg, "a value must be provided for lastUpdated for a pending event.");
-    QCOMPARE(eventHandler.getTime(true), QDateTime());
+    QCOMPARE(EventHandler::time(room->messageEvents().at(0).get(), true), QDateTime());
 }
 
 void EventHandlerTest::timeString()
 {
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
+    const auto event = room->messageEvents().at(0).get();
 
     KFormat format;
 
-    QCOMPARE(eventHandler.getTimeString(false),
+    QCOMPARE(EventHandler::timeString(event, false),
              QLocale().toString(QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toLocalTime().time(), QLocale::ShortFormat));
-    QCOMPARE(eventHandler.getTimeString(true),
+    QCOMPARE(EventHandler::timeString(event, true),
              format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(eventHandler.getTimeString(false, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+    QCOMPARE(EventHandler::timeString(event, false, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().time(), QLocale::ShortFormat));
-    QCOMPARE(eventHandler.getTimeString(true, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+    QCOMPARE(EventHandler::timeString(event, true, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(eventHandler.getTimeString(false, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+    QCOMPARE(EventHandler::timeString(event, false, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().time(), QLocale::LongFormat));
-    QCOMPARE(eventHandler.getTimeString(true, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+    QCOMPARE(EventHandler::timeString(event, true, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().date(), QLocale::LongFormat));
-}
-
-void EventHandlerTest::nullTimeString()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getTimeString called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getTimeString(false), QString());
-
-    eventHandler.setEvent(room->messageEvents().at(0).get());
-    QTest::ignoreMessage(QtWarningMsg, "a value must be provided for lastUpdated for a pending event.");
-    QCOMPARE(eventHandler.getTimeString(false, QLocale::ShortFormat, true), QString());
+    QCOMPARE(EventHandler::timeString(event, QStringLiteral("hh:mm")),
+             QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toString(QStringLiteral("hh:mm")));
 }
 
 void EventHandlerTest::highlighted()
 {
-    auto event = room->messageEvents().at(2).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isHighlighted(), true);
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isHighlighted(), false);
+    QCOMPARE(EventHandler::isHighlighted(room, room->messageEvents().at(2).get()), true);
+    QCOMPARE(EventHandler::isHighlighted(room, room->messageEvents().at(0).get()), false);
 }
 
 void EventHandlerTest::nullHighlighted()
 {
-    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.isHighlighted(), false);
+    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with room set to nullptr.");
+    QCOMPARE(EventHandler::isHighlighted(nullptr, nullptr), false);
 
-    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.isHighlighted(), false);
+    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with event set to nullptr.");
+    QCOMPARE(EventHandler::isHighlighted(room, nullptr), false);
 }
 
 void EventHandlerTest::hidden()
 {
-    auto event = room->messageEvents().at(3).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isHidden(), true);
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isHidden(), false);
+    QCOMPARE(EventHandler::isHidden(room, room->messageEvents().at(3).get()), true);
+    QCOMPARE(EventHandler::isHidden(room, room->messageEvents().at(0).get()), false);
 }
 
 void EventHandlerTest::nullHidden()
 {
-    QTest::ignoreMessage(QtWarningMsg, "isHidden called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.isHidden(), false);
+    QTest::ignoreMessage(QtWarningMsg, "isHidden called with room set to nullptr.");
+    QCOMPARE(EventHandler::isHidden(nullptr, nullptr), false);
 
-    QTest::ignoreMessage(QtWarningMsg, "isHidden called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.isHidden(), false);
+    QTest::ignoreMessage(QtWarningMsg, "isHidden called with event set to nullptr.");
+    QCOMPARE(EventHandler::isHidden(room, nullptr), false);
 }
 
 void EventHandlerTest::body()
 {
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
+    const auto event = room->messageEvents().at(0).get();
 
-    QCOMPARE(eventHandler.getRichBody(), QStringLiteral("<b>This is an example<br>text message</b>"));
-    QCOMPARE(eventHandler.getRichBody(true), QStringLiteral("<b>This is an example text message</b>"));
-    QCOMPARE(eventHandler.getPlainBody(), QStringLiteral("This is an example\ntext message"));
-    QCOMPARE(eventHandler.getPlainBody(true), QStringLiteral("This is an example text message"));
+    QCOMPARE(EventHandler::richBody(room, event), QStringLiteral("<b>This is an example<br>text message</b>"));
+    QCOMPARE(EventHandler::richBody(room, event, true), QStringLiteral("<b>This is an example text message</b>"));
+    QCOMPARE(EventHandler::plainBody(room, event), QStringLiteral("This is an example\ntext message"));
+    QCOMPARE(EventHandler::plainBody(room, event, true), QStringLiteral("This is an example text message"));
 }
 
 void EventHandlerTest::nullBody()
 {
-    QTest::ignoreMessage(QtWarningMsg, "getRichBody called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getRichBody(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "richBody called with room set to nullptr.");
+    QCOMPARE(EventHandler::richBody(nullptr, nullptr), QString());
 
-    QTest::ignoreMessage(QtWarningMsg, "getPlainBody called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getPlainBody(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "richBody called with event set to nullptr.");
+    QCOMPARE(EventHandler::richBody(room, nullptr), QString());
+
+    QTest::ignoreMessage(QtWarningMsg, "plainBody called with room set to nullptr.");
+    QCOMPARE(EventHandler::plainBody(nullptr, nullptr), QString());
+
+    QTest::ignoreMessage(QtWarningMsg, "plainBody called with event set to nullptr.");
+    QCOMPARE(EventHandler::plainBody(room, nullptr), QString());
 }
 
 void EventHandlerTest::genericBody_data()
@@ -335,42 +225,45 @@ void EventHandlerTest::genericBody()
     QFETCH(int, eventNum);
     QFETCH(QString, output);
 
-    eventHandler.setEvent(room->messageEvents().at(eventNum).get());
-
-    QCOMPARE(eventHandler.getGenericBody(), output);
+    QCOMPARE(EventHandler::genericBody(room->messageEvents().at(eventNum).get()), output);
 }
 
 void EventHandlerTest::nullGenericBody()
 {
-    QTest::ignoreMessage(QtWarningMsg, "getGenericBody called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getGenericBody(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "genericBody called with event set to nullptr.");
+    QCOMPARE(EventHandler::genericBody(nullptr), QString());
+}
+
+void EventHandlerTest::markdownBody()
+{
+    QCOMPARE(EventHandler::markdownBody(room->messageEvents().at(0).get()), QStringLiteral("This is an example\ntext message"));
+}
+
+void EventHandlerTest::markdownBodyReply()
+{
+    QCOMPARE(EventHandler::markdownBody(room->messageEvents().at(5).get()), QStringLiteral("reply"));
 }
 
 void EventHandlerTest::subtitle()
 {
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.subtitleText(), QStringLiteral("after: This is an example text message"));
-
-    event = room->messageEvents().at(2).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.subtitleText(), QStringLiteral("after: This is a highlight @bob:kde.org and this is a link https://kde.org"));
+    QCOMPARE(EventHandler::subtitleText(room, room->messageEvents().at(0).get()), QStringLiteral("after: This is an example text message"));
+    QCOMPARE(EventHandler::subtitleText(room, room->messageEvents().at(2).get()),
+             QStringLiteral("after: This is a highlight @bob:kde.org and this is a link https://kde.org"));
 }
 
 void EventHandlerTest::nullSubtitle()
 {
-    QTest::ignoreMessage(QtWarningMsg, "subtitleText called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.subtitleText(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "subtitleText called with room set to nullptr.");
+    QCOMPARE(EventHandler::subtitleText(nullptr, nullptr), QString());
+
+    QTest::ignoreMessage(QtWarningMsg, "subtitleText called with event set to nullptr.");
+    QCOMPARE(EventHandler::subtitleText(room, nullptr), QString());
 }
 
 void EventHandlerTest::mediaInfo()
 {
     auto event = room->messageEvents().at(4).get();
-    eventHandler.setEvent(event);
-
-    auto mediaInfo = eventHandler.getMediaInfo();
+    auto mediaInfo = EventHandler::mediaInfo(room, event);
     auto thumbnailInfo = mediaInfo["tempInfo"_ls].toMap();
 
     QCOMPARE(mediaInfo["source"_ls], room->makeMediaUrl(event->id(), QUrl("mxc://kde.org/1234567"_ls)));
@@ -390,271 +283,102 @@ void EventHandlerTest::mediaInfo()
 
 void EventHandlerTest::nullMediaInfo()
 {
-    QTest::ignoreMessage(QtWarningMsg, "getMediaInfo called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getMediaInfo(), QVariantMap());
+    QTest::ignoreMessage(QtWarningMsg, "mediaInfo called with room set to nullptr.");
+    QCOMPARE(EventHandler::mediaInfo(nullptr, nullptr), QVariantMap());
 
-    QTest::ignoreMessage(QtWarningMsg, "getMediaInfo called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getMediaInfo(), QVariantMap());
+    QTest::ignoreMessage(QtWarningMsg, "mediaInfo called with event set to nullptr.");
+    QCOMPARE(EventHandler::mediaInfo(room, nullptr), QVariantMap());
 }
 
 void EventHandlerTest::hasReply()
 {
-    auto event = room->messageEvents().at(5).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.hasReply(), true);
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.hasReply(), false);
+    QCOMPARE(EventHandler::hasReply(room->messageEvents().at(5).get()), true);
+    QCOMPARE(EventHandler::hasReply(room->messageEvents().at(0).get()), false);
 }
 
 void EventHandlerTest::nullHasReply()
 {
-    QTest::ignoreMessage(QtWarningMsg, "hasReply called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.hasReply(), false);
+    QTest::ignoreMessage(QtWarningMsg, "hasReply called with event set to nullptr.");
+    QCOMPARE(EventHandler::hasReply(nullptr), false);
 }
 
 void EventHandlerTest::replyId()
 {
-    auto event = room->messageEvents().at(5).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReplyId(), QStringLiteral("$153456789:example.org"));
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReplyId(), QStringLiteral(""));
+    QCOMPARE(EventHandler::replyId(room->messageEvents().at(5).get()), QStringLiteral("$153456789:example.org"));
+    QCOMPARE(EventHandler::replyId(room->messageEvents().at(0).get()), QStringLiteral(""));
 }
 
 void EventHandlerTest::nullReplyId()
 {
-    QTest::ignoreMessage(QtWarningMsg, "getReplyId called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReplyId(), QString());
-}
-
-void EventHandlerTest::replyDelegateType()
-{
-    auto event = room->messageEvents().at(5).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReplyDelegateType(), DelegateType::Message);
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReplyDelegateType(), DelegateType::Other);
-}
-
-void EventHandlerTest::nullReplyDelegateType()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getReplyDelegateType called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReplyDelegateType(), DelegateType::Other);
-
-    QTest::ignoreMessage(QtWarningMsg, "getReplyDelegateType called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReplyDelegateType(), DelegateType::Other);
+    QTest::ignoreMessage(QtWarningMsg, "replyId called with event set to nullptr.");
+    QCOMPARE(EventHandler::replyId(nullptr), QString());
 }
 
 void EventHandlerTest::replyAuthor()
 {
-    auto event = room->messageEvents().at(5).get();
     auto replyEvent = room->messageEvents().at(0).get();
-    auto replyAuthor = room->user(replyEvent->senderId());
-    eventHandler.setEvent(event);
+    auto replyAuthor = room->member(replyEvent->senderId());
+    auto eventHandlerReplyAuthor = EventHandler::replyAuthor(room, room->messageEvents().at(5).get());
 
-    auto eventHandlerReplyAuthor = eventHandler.getReplyAuthor();
+    QCOMPARE(eventHandlerReplyAuthor.isLocalMember(), replyAuthor.id() == room->localMember().id());
+    QCOMPARE(eventHandlerReplyAuthor.id(), replyAuthor.id());
+    QCOMPARE(eventHandlerReplyAuthor.displayName(), replyAuthor.displayName());
+    QCOMPARE(eventHandlerReplyAuthor.avatarUrl(), replyAuthor.avatarUrl());
+    QCOMPARE(eventHandlerReplyAuthor.avatarMediaId(), replyAuthor.avatarMediaId());
+    QCOMPARE(eventHandlerReplyAuthor.color(), replyAuthor.color());
 
-    QCOMPARE(eventHandlerReplyAuthor["isLocalUser"_ls], replyAuthor->id() == room->localUser()->id());
-    QCOMPARE(eventHandlerReplyAuthor["id"_ls], replyAuthor->id());
-    QCOMPARE(eventHandlerReplyAuthor["displayName"_ls], replyAuthor->displayname(room));
-    QCOMPARE(eventHandlerReplyAuthor["avatarSource"_ls], room->avatarForMember(replyAuthor));
-    QCOMPARE(eventHandlerReplyAuthor["avatarMediaId"_ls], replyAuthor->avatarMediaId(room));
-    QCOMPARE(eventHandlerReplyAuthor["color"_ls], Utils::getUserColor(replyAuthor->hueF()));
-    QCOMPARE(eventHandlerReplyAuthor["object"_ls], QVariant::fromValue(replyAuthor));
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReplyAuthor(), room->getUser(nullptr));
+    QCOMPARE(EventHandler::replyAuthor(room, room->messageEvents().at(0).get()), RoomMember());
 }
 
 void EventHandlerTest::nullReplyAuthor()
 {
-    QTest::ignoreMessage(QtWarningMsg, "getReplyAuthor called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReplyAuthor(), QVariantMap());
+    QTest::ignoreMessage(QtWarningMsg, "replyAuthor called with room set to nullptr.");
+    QCOMPARE(EventHandler::replyAuthor(nullptr, nullptr), RoomMember());
 
-    QTest::ignoreMessage(QtWarningMsg, "getReplyAuthor called with m_event set to nullptr. Returning empty user.");
-    QCOMPARE(noEventHandler.getReplyAuthor(), room->getUser(nullptr));
-}
-
-void EventHandlerTest::replyBody()
-{
-    auto event = room->messageEvents().at(5).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReplyRichBody(), QStringLiteral("<b>This is an example<br>text message</b>"));
-    QCOMPARE(eventHandler.getReplyRichBody(true), QStringLiteral("<b>This is an example text message</b>"));
-    QCOMPARE(eventHandler.getReplyPlainBody(), QStringLiteral("This is an example\ntext message"));
-    QCOMPARE(eventHandler.getReplyPlainBody(true), QStringLiteral("This is an example text message"));
-}
-
-void EventHandlerTest::nullReplyBody()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getReplyRichBody called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReplyRichBody(), QString());
-
-    QTest::ignoreMessage(QtWarningMsg, "getReplyPlainBody called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReplyPlainBody(), QString());
-}
-
-void EventHandlerTest::replyMediaInfo()
-{
-    auto event = room->messageEvents().at(6).get();
-    auto replyEvent = room->messageEvents().at(4).get();
-    eventHandler.setEvent(event);
-
-    auto mediaInfo = eventHandler.getReplyMediaInfo();
-    auto thumbnailInfo = mediaInfo["tempInfo"_ls].toMap();
-
-    QCOMPARE(mediaInfo["source"_ls], room->makeMediaUrl(replyEvent->id(), QUrl("mxc://kde.org/1234567"_ls)));
-    QCOMPARE(mediaInfo["mimeType"_ls], QStringLiteral("video/mp4"));
-    QCOMPARE(mediaInfo["mimeIcon"_ls], QStringLiteral("video-mp4"));
-    QCOMPARE(mediaInfo["size"_ls], 62650636);
-    QCOMPARE(mediaInfo["duration"_ls], 10);
-    QCOMPARE(mediaInfo["width"_ls], 1920);
-    QCOMPARE(mediaInfo["height"_ls], 1080);
-    QCOMPARE(thumbnailInfo["source"_ls], room->makeMediaUrl(replyEvent->id(), QUrl("mxc://kde.org/2234567"_ls)));
-    QCOMPARE(thumbnailInfo["mimeType"_ls], QStringLiteral("image/jpeg"));
-    QCOMPARE(thumbnailInfo["mimeIcon"_ls], QStringLiteral("image-jpeg"));
-    QCOMPARE(thumbnailInfo["size"_ls], 382249);
-    QCOMPARE(thumbnailInfo["width"_ls], 800);
-    QCOMPARE(thumbnailInfo["height"_ls], 450);
-}
-
-void EventHandlerTest::nullReplyMediaInfo()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getReplyMediaInfo called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReplyMediaInfo(), QVariantMap());
-
-    QTest::ignoreMessage(QtWarningMsg, "getReplyMediaInfo called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReplyMediaInfo(), QVariantMap());
+    QTest::ignoreMessage(QtWarningMsg, "replyAuthor called with event set to nullptr. Returning empty user.");
+    QCOMPARE(EventHandler::replyAuthor(room, nullptr), RoomMember());
 }
 
 void EventHandlerTest::thread()
 {
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
+    QCOMPARE(EventHandler::isThreaded(room->messageEvents().at(0).get()), false);
+    QCOMPARE(EventHandler::threadRoot(room->messageEvents().at(0).get()), QString());
 
-    QCOMPARE(eventHandler.isThreaded(), false);
-    QCOMPARE(eventHandler.threadRoot(), QString());
+    QCOMPARE(EventHandler::isThreaded(room->messageEvents().at(9).get()), true);
+    QCOMPARE(EventHandler::threadRoot(room->messageEvents().at(9).get()), QStringLiteral("$threadroot:example.org"));
+    QCOMPARE(EventHandler::replyId(room->messageEvents().at(9).get()), QStringLiteral("$threadroot:example.org"));
 
-    event = room->messageEvents().at(9).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isThreaded(), true);
-    QCOMPARE(eventHandler.threadRoot(), QStringLiteral("$threadroot:example.org"));
-    QCOMPARE(eventHandler.getReplyId(), QStringLiteral("$threadroot:example.org"));
-
-    event = room->messageEvents().at(10).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isThreaded(), true);
-    QCOMPARE(eventHandler.threadRoot(), QStringLiteral("$threadroot:example.org"));
-    QCOMPARE(eventHandler.getReplyId(), QStringLiteral("$threadmessage1:example.org"));
+    QCOMPARE(EventHandler::isThreaded(room->messageEvents().at(10).get()), true);
+    QCOMPARE(EventHandler::threadRoot(room->messageEvents().at(10).get()), QStringLiteral("$threadroot:example.org"));
+    QCOMPARE(EventHandler::replyId(room->messageEvents().at(10).get()), QStringLiteral("$threadmessage1:example.org"));
 }
 
 void EventHandlerTest::nullThread()
 {
-    QTest::ignoreMessage(QtWarningMsg, "isThreaded called with m_event set to nullptr.");
-    QCOMPARE(emptyHandler.isThreaded(), false);
+    QTest::ignoreMessage(QtWarningMsg, "isThreaded called with event set to nullptr.");
+    QCOMPARE(EventHandler::isThreaded(nullptr), false);
 
-    QTest::ignoreMessage(QtWarningMsg, "threadRoot called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.threadRoot(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "threadRoot called with event set to nullptr.");
+    QCOMPARE(EventHandler::threadRoot(nullptr), QString());
 }
 
 void EventHandlerTest::location()
 {
-    auto event = room->messageEvents().at(7).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getLatitude(), QStringLiteral("51.7035").toFloat());
-    QCOMPARE(eventHandler.getLongitude(), QStringLiteral("-1.14394").toFloat());
-    QCOMPARE(eventHandler.getLocationAssetType(), QStringLiteral("m.pin"));
+    QCOMPARE(EventHandler::latitude(room->messageEvents().at(7).get()), QStringLiteral("51.7035").toFloat());
+    QCOMPARE(EventHandler::longitude(room->messageEvents().at(7).get()), QStringLiteral("-1.14394").toFloat());
+    QCOMPARE(EventHandler::locationAssetType(room->messageEvents().at(7).get()), QStringLiteral("m.pin"));
 }
 
 void EventHandlerTest::nullLocation()
 {
-    QTest::ignoreMessage(QtWarningMsg, "getLatitude called with m_event set to nullptr.");
-    QCOMPARE(emptyHandler.getLatitude(), -100.0);
+    QTest::ignoreMessage(QtWarningMsg, "latitude called with event set to nullptr.");
+    QCOMPARE(EventHandler::latitude(nullptr), -100.0);
 
-    QTest::ignoreMessage(QtWarningMsg, "getLongitude called with m_event set to nullptr.");
-    QCOMPARE(emptyHandler.getLongitude(), -200.0);
+    QTest::ignoreMessage(QtWarningMsg, "longitude called with event set to nullptr.");
+    QCOMPARE(EventHandler::longitude(nullptr), -200.0);
 
-    QTest::ignoreMessage(QtWarningMsg, "getLocationAssetType called with m_event set to nullptr.");
-    QCOMPARE(emptyHandler.getLocationAssetType(), QString());
-}
-
-void EventHandlerTest::readMarkers()
-{
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.hasReadMarkers(), true);
-
-    auto readMarkers = eventHandler.getReadMarkers();
-
-    QCOMPARE(readMarkers.size(), 1);
-    QCOMPARE(readMarkers[0].toMap()["id"_ls], QStringLiteral("@alice:matrix.org"));
-
-    QCOMPARE(eventHandler.getNumberExcessReadMarkers(), QString());
-    QCOMPARE(eventHandler.getReadMarkersString(), QStringLiteral("1 user: @alice:matrix.org"));
-
-    event = room->messageEvents().at(2).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.hasReadMarkers(), true);
-
-    readMarkers = eventHandler.getReadMarkers();
-
-    QCOMPARE(readMarkers.size(), 5);
-
-    QCOMPARE(eventHandler.getNumberExcessReadMarkers(), QStringLiteral("+ 1"));
-    // There are no guarantees on the order of the users it will be different every time so don't match the whole string.
-    QCOMPARE(eventHandler.getReadMarkersString().startsWith(QStringLiteral("6 users:")), true);
-}
-
-void EventHandlerTest::nullReadMarkers()
-{
-    QTest::ignoreMessage(QtWarningMsg, "hasReadMarkers called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.hasReadMarkers(), false);
-
-    QTest::ignoreMessage(QtWarningMsg, "getReadMarkers called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReadMarkers(), QVariantList());
-
-    QTest::ignoreMessage(QtWarningMsg, "getNumberExcessReadMarkers called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getNumberExcessReadMarkers(), QString());
-
-    QTest::ignoreMessage(QtWarningMsg, "getReadMarkersString called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReadMarkersString(), QString());
-
-    QTest::ignoreMessage(QtWarningMsg, "hasReadMarkers called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.hasReadMarkers(), false);
-
-    QTest::ignoreMessage(QtWarningMsg, "getReadMarkers called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReadMarkers(), QVariantList());
-
-    QTest::ignoreMessage(QtWarningMsg, "getNumberExcessReadMarkers called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getNumberExcessReadMarkers(), QString());
-
-    QTest::ignoreMessage(QtWarningMsg, "getReadMarkersString called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReadMarkersString(), QString());
-}
-
-void EventHandlerTest::cleanup()
-{
-    eventHandler.setEvent(nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "locationAssetType called with event set to nullptr.");
+    QCOMPARE(EventHandler::locationAssetType(nullptr), QString());
 }
 
 QTEST_MAIN(EventHandlerTest)

autotests/linkpreviewertest.cpp

@@ -6,12 +6,11 @@
 
 #include "linkpreviewer.h"
 
+#include "utils.h"
 #include <Quotient/events/roommessageevent.h>
 #include <Quotient/quotient_common.h>
 #include <Quotient/syncdata.h>
 
-#include "utils.h"
-
 #include "testutils.h"
 
 using namespace Quotient;
@@ -30,10 +29,11 @@ private Q_SLOTS:
     void linkPreviewsMatch_data();
     void linkPreviewsMatch();
 
+    void multipleLinkPreviewsMatch_data();
+    void multipleLinkPreviewsMatch();
+
     void linkPreviewsReject_data();
     void linkPreviewsReject();
-
-    void editedLink();
 };
 
 void LinkPreviewerTest::initTestCase()
@@ -44,60 +44,59 @@ void LinkPreviewerTest::initTestCase()
 
 void LinkPreviewerTest::linkPreviewsMatch_data()
 {
-    QTest::addColumn<QString>("eventSource");
+    QTest::addColumn<QString>("inputString");
     QTest::addColumn<QUrl>("testOutputLink");
 
-    QTest::newRow("plainHttps") << QStringLiteral("test-validplainlink-event.json") << QUrl("https://kde.org"_ls);
-    QTest::newRow("richHttps") << QStringLiteral("test-validrichlink-event.json") << QUrl("https://kde.org"_ls);
-    QTest::newRow("plainWww") << QStringLiteral("test-validplainwwwlink-event.json") << QUrl("www.example.org"_ls);
-    QTest::newRow("multipleHttps") << QStringLiteral("test-multiplelink-event.json") << QUrl("www.example.org"_ls);
+    QTest::newRow("plainHttps") << QStringLiteral("https://kde.org") << QUrl("https://kde.org"_ls);
+    QTest::newRow("richHttps") << QStringLiteral("<a href=\"https://kde.org\">Rich Link</a>") << QUrl("https://kde.org"_ls);
+    QTest::newRow("richHttpsLinkDescription") << QStringLiteral("<a href=\"https://kde.org\">https://kde.org</a>") << QUrl("https://kde.org"_ls);
 }
 
 void LinkPreviewerTest::linkPreviewsMatch()
 {
-    QFETCH(QString, eventSource);
+    QFETCH(QString, inputString);
     QFETCH(QUrl, testOutputLink);
 
-    auto event = TestUtils::loadEventFromFile<RoomMessageEvent>(eventSource);
-    auto linkPreviewer = LinkPreviewer(room, event.get());
+    auto link = LinkPreviewer::linkPreviews(inputString)[0];
 
-    QCOMPARE(linkPreviewer.empty(), false);
-    QCOMPARE(linkPreviewer.url(), testOutputLink);
+    QCOMPARE(link, testOutputLink);
+}
+
+void LinkPreviewerTest::multipleLinkPreviewsMatch_data()
+{
+    QTest::addColumn<QString>("inputString");
+    QTest::addColumn<QList<QUrl>>("testOutputLinks");
+
+    QTest::newRow("multipleHttps") << QStringLiteral("www.example.org https://kde.org") << QList{QUrl("www.example.org"_ls), QUrl("https://kde.org"_ls)};
+    QTest::newRow("multipleHttps1Invalid") << QStringLiteral("www.example.org mxc://example.org/SEsfnsuifSDFSSEF") << QList{QUrl("www.example.org"_ls)};
+}
+
+void LinkPreviewerTest::multipleLinkPreviewsMatch()
+{
+    QFETCH(QString, inputString);
+    QFETCH(QList<QUrl>, testOutputLinks);
+
+    auto links = LinkPreviewer::linkPreviews(inputString);
+
+    QCOMPARE(links, testOutputLinks);
 }
 
 void LinkPreviewerTest::linkPreviewsReject_data()
 {
-    QTest::addColumn<QString>("eventSource");
+    QTest::addColumn<QString>("inputString");
 
-    QTest::newRow("mxc") << QStringLiteral("test-invalidmxclink-event.json");
-    QTest::newRow("matrixTo") << QStringLiteral("test-invalidmatrixtolink-event.json");
-    QTest::newRow("noSpace") << QStringLiteral("test-invalidnospacelink-event.json");
+    QTest::newRow("mxc") << QStringLiteral("mxc://example.org/SEsfnsuifSDFSSEF");
+    QTest::newRow("matrixTo") << QStringLiteral("https://matrix.to/#/@alice:example.org");
+    QTest::newRow("noSpace") << QStringLiteral("testhttps://kde.org");
 }
 
 void LinkPreviewerTest::linkPreviewsReject()
 {
-    QFETCH(QString, eventSource);
+    QFETCH(QString, inputString);
 
-    auto event = TestUtils::loadEventFromFile<RoomMessageEvent>(eventSource);
-    auto linkPreviewer = LinkPreviewer(room, event.get());
+    auto links = LinkPreviewer::linkPreviews(inputString);
 
-    QCOMPARE(linkPreviewer.empty(), true);
-    QCOMPARE(linkPreviewer.url(), QUrl());
-}
-
-void LinkPreviewerTest::editedLink()
-{
-    room->syncNewEvents(QStringLiteral("test-linkpreviewerintial-sync.json"));
-    auto event = eventCast<const RoomMessageEvent>(room->messageEvents().at(0).get());
-    auto linkPreviewer = LinkPreviewer(room, event);
-
-    QCOMPARE(linkPreviewer.empty(), false);
-    QCOMPARE(linkPreviewer.url(), QUrl("https://kde.org"_ls));
-
-    room->syncNewEvents(QStringLiteral("test-linkpreviewerreplace-sync.json"));
-
-    QCOMPARE(linkPreviewer.empty(), true);
-    QCOMPARE(linkPreviewer.url(), QUrl());
+    QCOMPARE(links.empty(), true);
 }
 
 QTEST_MAIN(LinkPreviewerTest)

autotests/messageeventmodeltest.cpp

@@ -103,7 +103,6 @@ void MessageEventModelTest::simpleTimeline()
 
     QCOMPARE(model->data(model->index(1)), QStringLiteral("<b>This is an example<br>text message</b>"));
     QCOMPARE(model->data(model->index(1), MessageEventModel::DelegateTypeRole), DelegateType::Message);
-    QCOMPARE(model->data(model->index(1), MessageEventModel::PlainText), QStringLiteral("This is an example\ntext message"));
     QCOMPARE(model->data(model->index(1), MessageEventModel::EventIdRole), QStringLiteral("$153456789:example.org"));
 
     QTest::ignoreMessage(QtWarningMsg, "Index QModelIndex(-1,-1,0x0,QObject(0x0)) is not valid (expected valid)");

autotests/reactionmodeltest.cpp

@@ -52,10 +52,8 @@ void ReactionModelTest::basicReaction()
     QCOMPARE(model.data(model.index(0), ReactionModel::TextContentRole), QStringLiteral("<span style=\"font-family: 'emoji';\">👍</span>"));
     QCOMPARE(model.data(model.index(0), ReactionModel::ReactionRole), QStringLiteral("👍"));
     QCOMPARE(model.data(model.index(0), ReactionModel::ToolTipRole),
-             QStringLiteral("@alice:matrix.org reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
-    auto authorList = QVariantList{room->getUser(room->user(QStringLiteral("@alice:matrix.org")))};
-    QCOMPARE(model.data(model.index(0), ReactionModel::AuthorsRole), authorList);
-    QCOMPARE(model.data(model.index(0), ReactionModel::HasLocalUser), false);
+             QStringLiteral("Alice Margatroid reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
+    QCOMPARE(model.data(model.index(0), ReactionModel::HasLocalMember), false);
 }
 
 void ReactionModelTest::newReaction()
@@ -65,7 +63,7 @@ void ReactionModelTest::newReaction()
 
     QCOMPARE(model->rowCount(), 1);
     QCOMPARE(model->data(model->index(0), ReactionModel::ToolTipRole),
-             QStringLiteral("@alice:matrix.org reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
+             QStringLiteral("Alice Margatroid reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
 
     QSignalSpy spy(model, SIGNAL(modelReset()));
 
@@ -74,7 +72,7 @@ void ReactionModelTest::newReaction()
     QCOMPARE(spy.count(), 2); // Once for each of the 2 new reactions.
     QCOMPARE(model->data(model->index(1), ReactionModel::ReactionRole), QStringLiteral("😆"));
     QCOMPARE(model->data(model->index(0), ReactionModel::ToolTipRole),
-             QStringLiteral("@alice:matrix.org and @bob:example.org reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
+             QStringLiteral("Alice Margatroid and Bob reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
 
     delete model;
 }

autotests/texthandlertest.cpp

@@ -10,7 +10,9 @@
 #include <Quotient/syncdata.h>
 #include <qnamespace.h>
 
+#include "enums/messagecomponenttype.h"
 #include "models/customemojimodel.h"
+#include "models/messagecontentmodel.h"
 #include "neochatconnection.h"
 #include "utils.h"
 
@@ -33,7 +35,6 @@ private Q_SLOTS:
     void stripDisallowedTags();
     void stripDisallowedAttributes();
     void emptyCodeTags();
-    void formatBlockQuote();
 
     void sendSimpleStringCase();
     void sendSingleParaMarkup();
@@ -45,6 +46,7 @@ private Q_SLOTS:
     void sendCustomEmojiCode_data();
     void sendCustomEmojiCode();
 
+    void receiveSpacelessSelfClosingTag();
     void receiveStripReply();
     void receivePlainTextIn();
 
@@ -59,11 +61,13 @@ private Q_SLOTS:
     void receiveRichtextIn();
     void receiveRichMxcUrl();
     void receiveRichPlainUrl();
-    void receiveRichEmote();
     void receiveRichEdited_data();
     void receiveRichEdited();
     void receiveLineSeparator();
     void receiveRichCodeUrl();
+
+    void componentOutput_data();
+    void componentOutput();
 };
 
 void TextHandlerTest::initTestCase()
@@ -139,16 +143,6 @@ void TextHandlerTest::emptyCodeTags()
     QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
 }
 
-void TextHandlerTest::formatBlockQuote()
-{
-    auto input = QStringLiteral("<blockquote>\n<p>Lorem Ispum</p>\n</blockquote>");
-    auto expectedOutput = QStringLiteral("<blockquote><table><tr><td>\u201CLorem Ispum\u201D</td></tr></table></blockquote>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(input);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), expectedOutput);
-}
-
 void TextHandlerTest::sendSimpleStringCase()
 {
     const QString testInputString = QStringLiteral("This data should just be put in a paragraph.");
@@ -259,6 +253,19 @@ void TextHandlerTest::sendCustomEmojiCode()
     QCOMPARE(testTextHandler.handleSendText(), testOutputString);
 }
 
+void TextHandlerTest::receiveSpacelessSelfClosingTag()
+{
+    const QString testInputString = QStringLiteral("Test...<br/>...ing");
+    const QString testRichOutputString = QStringLiteral("Test...<br/>...ing");
+    const QString testPlainOutputString = QStringLiteral("Test...\n...ing");
+
+    TextHandler testTextHandler;
+    testTextHandler.setData(testInputString);
+
+    QCOMPARE(testTextHandler.handleRecieveRichText(), testRichOutputString);
+    QCOMPARE(testTextHandler.handleRecievePlainText(Qt::RichText), testPlainOutputString);
+}
+
 void TextHandlerTest::receiveStripReply()
 {
     const QString testInputString = QStringLiteral(
@@ -281,6 +288,7 @@ void TextHandlerTest::receiveRichInPlainOut_data()
     QTest::newRow("ampersand") << QStringLiteral("a &amp; b") << QStringLiteral("a & b");
     QTest::newRow("quote") << QStringLiteral("&quot;a and b&quot;") << QStringLiteral("\"a and b\"");
     QTest::newRow("new line") << QStringLiteral("new<br>line") << QStringLiteral("new\nline");
+    QTest::newRow("unescape") << QStringLiteral("can&#x27;t") << QStringLiteral("can't");
 }
 
 void TextHandlerTest::receiveRichInPlainOut()
@@ -455,6 +463,9 @@ void TextHandlerTest::receiveRichPlainUrl()
     QString testOutputStringMxId = QStringLiteral(
         "<b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> <b><a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a></b>");
 
+    QString testInputStringMxIdWithPrefix = QStringLiteral("a @user:kde.org b");
+    QString testOutputStringMxIdWithPrefix = QStringLiteral("a <b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> b");
+
     TextHandler testTextHandler;
     testTextHandler.setData(testInputStringLink1);
 
@@ -468,22 +479,9 @@ void TextHandlerTest::receiveRichPlainUrl()
 
     testTextHandler.setData(testInputStringMxId);
     QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxId);
-}
 
-// Test that user pill is add to an emote message.
-// N.B. The second message in the test timeline is marked as an emote.
-void TextHandlerTest::receiveRichEmote()
-{
-    auto event = room->messageEvents().at(1).get();
-    auto author = room->user(event->senderId());
-    const QString testInputString = QStringLiteral("This is an emote.");
-    const QString testOutputString = QStringLiteral("* <a href=\"https://matrix.to/#/@example:example.org\" style=\"color:")
-        + Utils::getUserColor(author->hueF()).name() + QStringLiteral("\">@example:example.org</a> This is an emote.");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, event), testOutputString);
+    testTextHandler.setData(testInputStringMxIdWithPrefix);
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxIdWithPrefix);
 }
 
 void TextHandlerTest::receiveRichEdited_data()
@@ -494,9 +492,6 @@ void TextHandlerTest::receiveRichEdited_data()
     QTest::newRow("basic") << QStringLiteral("Edited") << QStringLiteral("Edited <span style=\"color:#000000\">(edited)</span>");
     QTest::newRow("multiple paragraphs") << QStringLiteral("<p>Edited</p>\n<p>Edited</p>")
                                          << QStringLiteral("<p>Edited</p>\n<p>Edited <span style=\"color:#000000\">(edited)</span></p>");
-    QTest::newRow("blockquote")
-        << QStringLiteral("<blockquote>Edited</blockquote>")
-        << QStringLiteral("<blockquote><table><tr><td>\u201CEdited\u201D</td></tr></table></blockquote><p> <span style=\"color:#000000\">(edited)</span></p>");
 }
 
 void TextHandlerTest::receiveRichEdited()
@@ -507,7 +502,8 @@ void TextHandlerTest::receiveRichEdited()
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
 
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, room->messageEvents().at(2).get()), testOutputString);
+    const auto event = eventCast<const Quotient::RoomMessageEvent>(room->messageEvents().at(2).get());
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, event, false, event->isReplaced()), testOutputString);
 }
 
 void TextHandlerTest::receiveLineSeparator()
@@ -526,5 +522,57 @@ void TextHandlerTest::receiveRichCodeUrl()
     QCOMPARE(testTextHandler.handleRecieveRichText(), input);
 }
 
+void TextHandlerTest::componentOutput_data()
+{
+    QTest::addColumn<QString>("testInputString");
+    QTest::addColumn<QList<MessageComponent>>("testOutputComponents");
+
+    QTest::newRow("multiple paragraphs") << QStringLiteral("<p>Text</p>\n<p>Text</p>")
+                                         << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                                    MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};
+    QTest::newRow("code") << QStringLiteral("<p>Text</p>\n<pre><code class=\"language-html\">Some code\n</code></pre>")
+                          << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                     MessageComponent{MessageComponentType::Code,
+                                                                      QStringLiteral("Some code"),
+                                                                      QVariantMap{{QStringLiteral("class"), QStringLiteral("html")}}}};
+    QTest::newRow("quote") << QStringLiteral("<p>Text</p>\n<blockquote>\n<p>blockquote</p>\n</blockquote>")
+                           << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                      MessageComponent{MessageComponentType::Quote, QStringLiteral("\"blockquote\""), {}}};
+    QTest::newRow("no tag first paragraph") << QStringLiteral("Text\n<p>Text</p>")
+                                            << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                                       MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};
+    QTest::newRow("no tag last paragraph") << QStringLiteral("<p>Text</p>\nText")
+                                           << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                                      MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};
+    QTest::newRow("inline code") << QStringLiteral("<p><code>https://kde.org</code></p>\n<p>Text</p>")
+                                 << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("<code>https://kde.org</code>"), {}},
+                                                            MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};
+    QTest::newRow("inline code single block") << QStringLiteral("<code>https://kde.org</code>")
+                                              << QList<MessageComponent>{
+                                                     MessageComponent{MessageComponentType::Text, QStringLiteral("<code>https://kde.org</code>"), {}}};
+    QTest::newRow("long start tag")
+        << QStringLiteral(
+               "Ah, you mean something like<br/><pre data-md=\"```\"><code class=\"language-qml\"># main.qml\nimport CustomQml\n...\nControls.TextField { id: "
+               "someField }\nCustomQml {\n    someTextProperty: someField.text\n}\n</code></pre>Sure you can, it's still local to the same file where you "
+               "defined the id")
+        << QList<MessageComponent>{
+               MessageComponent{MessageComponentType::Text, QStringLiteral("Ah, you mean something like<br/>"), {}},
+               MessageComponent{
+                   MessageComponentType::Code,
+                   QStringLiteral(
+                       "# main.qml\nimport CustomQml\n...\nControls.TextField { id: someField }\nCustomQml {\n    someTextProperty: someField.text\n}"),
+                   QVariantMap{{QStringLiteral("class"), QStringLiteral("qml")}}},
+               MessageComponent{MessageComponentType::Text, QStringLiteral("Sure you can, it's still local to the same file where you defined the id"), {}}};
+}
+
+void TextHandlerTest::componentOutput()
+{
+    QFETCH(QString, testInputString);
+    QFETCH(QList<MessageComponent>, testOutputComponents);
+
+    TextHandler testTextHandler;
+    QCOMPARE(testTextHandler.textComponents(testInputString), testOutputComponents);
+}
+
 QTEST_MAIN(TextHandlerTest)
 #include "texthandlertest.moc"

autotests/windowcontrollertest.cpp

@@ -17,7 +17,6 @@ class WindowControllerTest : public QObject
 
 private Q_SLOTS:
     void nullWindow();
-    void geometry();
     void showAndRaise();
     void toggle();
 
@@ -30,32 +29,10 @@ void WindowControllerTest::nullWindow()
     auto &instance = WindowController::instance();
     QCOMPARE(instance.window(), nullptr);
 
-    instance.restoreGeometry();
-    instance.saveGeometry();
     instance.showAndRaiseWindow({});
     instance.toggleWindow();
 }
 
-void WindowControllerTest::geometry()
-{
-    auto &instance = WindowController::instance();
-
-    QWindow window;
-    window.setGeometry(0, 0, 200, 200);
-    instance.setWindow(&window);
-    QCOMPARE(instance.window(), &window);
-
-    instance.saveGeometry();
-    const auto stateConfig = KSharedConfig::openStateConfig();
-    KConfigGroup windowGroup = stateConfig->group(QStringLiteral("Window"));
-    QCOMPARE(KWindowConfig::hasSavedWindowSize(windowGroup), true);
-
-    window.setGeometry(0, 0, 400, 400);
-    QCOMPARE(window.geometry(), QRect(0, 0, 400, 400));
-    instance.restoreGeometry();
-    QCOMPARE(window.geometry(), QRect(0, 0, 200, 200));
-}
-
 void WindowControllerTest::showAndRaise()
 {
     auto &instance = WindowController::instance();

org.kde.neochat.appdata.xml

@@ -25,6 +25,7 @@
   <name xml:lang="fi">NeoChat</name>
   <name xml:lang="fr">NeoChat</name>
   <name xml:lang="gl">NeoChat</name>
+  <name xml:lang="he">NeoChat</name>
   <name xml:lang="hu">NeoChat</name>
   <name xml:lang="ia">Neochat</name>
   <name xml:lang="id">NeoChat</name>
@@ -32,6 +33,7 @@
   <name xml:lang="it">NeoChat</name>
   <name xml:lang="ka">NeoChat</name>
   <name xml:lang="ko">NeoChat</name>
+  <name xml:lang="lv">NeoChat</name>
   <name xml:lang="nl">NeoChat</name>
   <name xml:lang="nn">NeoChat</name>
   <name xml:lang="pa">ਨਿਓ-ਚੈਟ</name>
@@ -53,54 +55,58 @@
   <summary xml:lang="ca">Xategeu amb els vostres amics a Matrix</summary>
   <summary xml:lang="ca-valencia">Xategeu amb els vostres amics a Matrix</summary>
   <summary xml:lang="cs">Mluvte se svými přáteli na Matrixu</summary>
+  <summary xml:lang="en-GB">Chat with your friends on matrix</summary>
   <summary xml:lang="eo">Babilu kun viaj amikoj sur matrix</summary>
   <summary xml:lang="es">Charle con sus amigos en matrix</summary>
   <summary xml:lang="eu">Berriketan jardun zure lagunekin «Matrix»en</summary>
   <summary xml:lang="fi">Keskustelu ystäviesi kanssa Matrixissa</summary>
   <summary xml:lang="fr">Discuter avec vos ami(e)s sur le réseau Matrix</summary>
   <summary xml:lang="gl">Charle coas súas amizades en Matrix.</summary>
-  <summary xml:lang="ia">Starta Conversation conntu amicos sur matrix</summary>
+  <summary xml:lang="he">התכתבות עם החברים שלך ב־matrix</summary>
+  <summary xml:lang="hu">Csevegjen barátaival a matrixon</summary>
+  <summary xml:lang="ia">Starta Conversation con tu amicos sur matrix</summary>
   <summary xml:lang="it">Conversa con i tuoi contatti su matrix</summary>
   <summary xml:lang="ka">ესაუბრეთ მეგობრებს Matrix-ზე</summary>
   <summary xml:lang="ko">Matrix를 사용하여 친구들과 대화하기</summary>
+  <summary xml:lang="lv">Tērzējiet ar saviem draugiem „Matrix“ tīklā</summary>
   <summary xml:lang="nl">Met uw vrienden chatten op matrix</summary>
   <summary xml:lang="nn">Prat med vennar på Matrix</summary>
   <summary xml:lang="pl">Rozmawiaj ze swoimi znajomymi w Matriksie</summary>
   <summary xml:lang="sl">Klepet z vašimi prijatelji na matrixu</summary>
   <summary xml:lang="sv">Chatta med dina vänner på Matrix</summary>
   <summary xml:lang="ta">மேட்ரிக்ஸு மூலம் உங்கள் நண்பர்களிடம் பேசலாம்</summary>
-  <summary xml:lang="tr">Matrix'te arkadaşlarınızla sohbet edin</summary>
+  <summary xml:lang="tr">Matrix’te arkadaşlarınızla sohbet edin</summary>
   <summary xml:lang="uk">Спілкуйтеся з вашими друзями у matrix</summary>
   <summary xml:lang="x-test">xxChat with your friends on matrixxx</summary>
   <summary xml:lang="zh-CN">在 Matrix 上与朋友聊天</summary>
   <summary xml:lang="zh-TW">在 Matrix 上與您的朋友聊天</summary>
   <description>
-    <p>NeoChat is a client for Matrix, the decentralized communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami
-to provide a convergent experience across multiple platforms.</p>
-    <p xml:lang="ar">نيوتشات هو عميل ماتركس Matrix، (ميفاق الاتصال اللامركزي للمراسلة الفورية). يتيح لك نيوتشات إرسال رسائل نصية ومقاطع فيديو وملفات صوتية إلى عائلتك وزملائك وأصدقائك. يستخدم أطر عمل كيدي وأبرزها Kirigami لتوفير تجربة متقاربة عبر منصات متعددة.</p>
-    <p xml:lang="ca">El NeoChat és un client de Matrix, el protocol descentralitzat de comunicacions de missatgeria instantània. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics. Fa servir els Frameworks de KDE i, sobretot, el Kirigami per a proporcionar una experiència convergent a través de diverses plataformes.</p>
-    <p xml:lang="ca-valencia">NeoChat és un client de Matrix, el protocol descentralitzat de comunicacions de missatgeria instantània. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics. Utilitza els Frameworks de KDE i, sobretot, Kirigami per a proporcionar una experiència convergent a través de diverses plataformes.</p>
-    <p xml:lang="en-GB">NeoChat is a client for Matrix, the decentralised communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami to provide a convergent experience across multiple platforms.</p>
-    <p xml:lang="eo">NeoChat estas kliento por Matrix, la malcentra komunikoprotokolo por tuja mesaĝado. Ĝi ebligas al vi sendi tekstmesaĝojn, filmetojn kaj sondosierojn al via familio, kolegoj kaj amikoj. Ĝi uzas KDE-framojn kaj precipe Kirigami por disponigi konverĝan sperton tra pluraj platformoj.</p>
-    <p xml:lang="es">NeoChat es un cliente para Matrix, el protocolo de comunicaciones descentralizado para mensajería instantánea. Le permite enviar mensajes de texto, vídeos y archivos de sonido a su familia, compañeros de trabajo y amigos. Usa la infraestructura de KDE y, en particular, Kirigami para proporcionar una experiencia convergente en muchas plataformas.</p>
-    <p xml:lang="eu">NeoChat «Matrix»erako, bat-bateko mezularitzarako komunikazio deszentralizatuko protokolorako, bezero bat da. Zure sendiari, kide eta lagunei testu mezuak, bideo eta audio fitxategiak bidaltzeko aukera ematen dizu. «KDE Frameworks» eta bereziki «Kirigami» erabiltzen ditu plataforma anitzen artean esperientzia konbergente bat eskaintzeko.</p>
-    <p xml:lang="fi">NeoChat on asiakassovellus Matrixille, hajautetulle pikaviestinyhteyskäytännölle. Sillä voi lähettää teksti-, video- ja ääniviestejä perheelle, tutuille ja ystäville. Se käyttää KDE-kehystä ja erityisesti Kirigamia tuottaakseen mukautuvan monialustaisen käyttökokemuksen.</p>
-    <p xml:lang="fr">NeoChat est un client pour le protocole Matrix, un protocole décentralisé de communications pour messagerie instantané. Il vous permet d'envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos amis. Il utilise les environnements de développement et plus précisément Kirigami pour fournir une expérience convergente sur plusieurs plate-formes. </p>
-    <p xml:lang="gl">NeoChat é un cliente para Matrix, o protocolo de comunicación descentralizada para mensaxaría instantánea. Podes enviar mensaxes de texto, vídeos e ficheiros de son á túa familia, colegas e amizades. Usas infraestruturas de KDE e principalmente Kirigami para proporcionar unha experiencia de uso converxente para varias plataformas.</p>
-    <p xml:lang="ia">NeoChat es un cliente per Matrix, le protocollo de communication decentralisate per messager instantanee. Illo te permitte inviar messager de texto, files de video e audio a tu familia, collegas e amicos usante. Illo usa KDE frameworks e super toto Kirigamii forni un experientia convergente trans platteforme multiple.</p>
-    <p xml:lang="it">NeoChat è un client per Matrix, il protocollo di comunicazione decentralizzato per la messaggistica istantanea. Ti consente di inviare messaggi di testo, video e file audio a familiari, colleghi e amici. Utilizza i framework KDE e in particolare Kirigami per fornire un'esperienza convergente su più piattaforme.</p>
-    <p xml:lang="ka">NeoChat არის Matrix კლიენტი. ის საშუალებას გაძლევთ გაგზავნოთ ტექსტური შეტყობინებები, ვიდეოები და აუდიო ფაილები თქვენს ოჯახს, კოლეგებსა და მეგობრებს მატრიქსის პროტოკოლის გამოყენებით.</p>
-    <p xml:lang="ko">NeoChat은 분산형 인스턴트 메시징 통신 프로토콜인 Matrix 클라이언트입니다. 가족, 동료, 친구에게 텍스트 메시지, 동영상, 오디오 파일을 전송할 수 있습니다. KDE 프레임워크와 Kirigami를 사용하여 다양한 플랫폼에서 일관적인 사용자 경험을 제공합니다.</p>
-    <p xml:lang="nl">NeoChat is een client voor Matrix, het gedecentraliseerde communicatieprotocol voor instant messages. Het biedt u het verzenden van tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden. Het gebruik KDE frameworks en het meest opmerkelijk Kirigami om een convergente ervaring te leveren op meerdere platforms.</p>
-    <p xml:lang="nn">NeoChat er ein klient for Matrix, ein protokoll for desentralisert kommunikasjon. Du kan utveksla tekst, lyd og videoar med kollegaar, vennar og familie. Programmet brukar KDE Frameworks og Kirigami for å gje ei brukarflate tilpassa ulike plattformer.</p>
-    <p xml:lang="pl">NeoChat jest programem do Matriksa, protokołu rozproszonego porozumiewania się w czasie rzeczywistym. Umożliwia wysyłanie wiadomości tekstowych, filmów oraz dźwięku do twojej rodziny, znajomych oraz przyjaciół. Używa szkieletów KDE i głównie Kirigami, aby zapewnić spójne wrażenia na wielu platformach</p>
-    <p xml:lang="pt">O NeoChat é um cliente do Matrix. O mesmo permite-lhe enviar mensagens de texto, ficheiros de vídeo e áudio para a sua família, colegas e amigos com o protocolo Matrix. Usa as plataformas do KDE, e principalmente o Kirigami, para oferecer uma experiência convergente entre várias plataformas.</p>
-    <p xml:lang="sl">Neochat je odjemalec za Matrix, decentralizirani komunikacijski protokol za takojšnje sporočanje. Omogoča vam pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek svoji družini, sodelavcem in prijateljem. Uporablja okvire ogrodje KDE frameworks in predvsem Kirigami za zagotavljanje konvergentne izkušnje na več platformah.</p>
-    <p xml:lang="sv">NeoChat är en klient för Matrix, det decentraliserade kommunikationsprotokollet för direktmeddelanden. Den låter dig skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner. Den använder KDE Ramverk, i synnerhet Kirigami, för att tillhandahålla en konvergent upplevelse på flera plattformar.</p>
-    <p xml:lang="tr">NeoChat, anlık iletileşme için merkezi olmayan iletişim protokolü olan Matrix için bir istemcidir. Ailenize, iş arkadaşlarınıza ve arkadaşlarınıza metin iletiler, videolar ve ses dosyaları göndermenize olanak tanır. Birden çok platformda yakınsak bir deneyim sağlamak için KDE Frameworks ve en önemlilerinden Kirigami'yi kullanır.</p>
-    <p xml:lang="uk">NeoChat — клієнт Matrix, децентралізованого протоколу спілкування для миттєвого обміну повідомленнями. За його допомогою ви можете надсилати текстові повідомлення, відео та звукові файли вашій родин, колегами та друзям. У програмі використано бібліотеки KDE, зокрема Kirigami, для надання однорідного середовища на декількох програмних та апаратних платформах.</p>
-    <p xml:lang="x-test">xxNeoChat is a client for Matrix, the decentralized communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami to provide a convergent experience across multiple platforms.xx</p>
-    <p xml:lang="zh-TW">NeoChat 是去中心化即時通訊協定 Matrix 的一個用戶端。它讓您可以傳送文字訊息、影片、音訊檔案給您的家人、同事或朋友。NeoChat 使用 KDE frameworks，尤其是 Kirigami，來提供跨平台的響應式體驗。</p>
+    <p>NeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.</p>
+    <p xml:lang="ar">نيوتشات هو تطبيق دردشة يتيح لك الاستفادة الكاملة من شبكة Matrix. فهو يوفر لك طريقة آمنة لإرسال الرسائل النصية ومقاطع الفيديو والملفات الصوتية إلى عائلتك وزملائك وأصدقائك.</p>
+    <p xml:lang="ca">El NeoChat és una aplicació de xat que us permet aprofitar plenament la xarxa Matrix. Proporciona una manera segura d'enviar missatges de text, vídeos i arxius d'àudio a la vostra família, companys i amics.</p>
+    <p xml:lang="ca-valencia">NeoChat és una aplicació de xat que us permet aprofitar plenament la xarxa Matrix. Proporciona una manera segura d'enviar missatges de text, vídeos i arxius d'àudio a la vostra família, companys i amics.</p>
+    <p xml:lang="en-GB">NeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.</p>
+    <p xml:lang="eo">NeoChat estas babilej-apo, kiu ebligas al vi plene profiti de la Matrix-reto. Ĝi provizas al vi sekuran manieron sendi tekstmesaĝojn, filmetojn kaj sondosierojn al via familio, kolegoj kaj amikoj.</p>
+    <p xml:lang="es">NeoChat es una aplicación de chat que le permite aprovechar al máximo la red Matrix. Le proporciona un modo seguro de enviar mensajes de texto, vídeos y archivos de sonido a su familia, colegas y amigos.</p>
+    <p xml:lang="eu">NeoChat, Matrix sarearen abantaila guztiei probetsua ateratzeko aukera ematen dizun berriketa aplikaizo bat da. Zure familiari, kideei eta lagunei testu mezuak, bideoak eta audio fitxategiak era seguruan bidaltzeko aukera ematen dizu.</p>
+    <p xml:lang="fi">NeoChat on keskustelusovellus, jolla Matrix-verkosta saa täyden hyödyn. Se tarjoaa salatun kanavan lähettää perheelle, työkavereille ja ystäville tekstiviestejä sekä video- ja äänitiedostoja.</p>
+    <p xml:lang="fr">NeoChat est une application de discussions vous permettant de profiter pleinement du réseau Matrix. Elle vous offre un moyen sécurisé d'envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos ami(e)s.</p>
+    <p xml:lang="gl">NeoChat é unha aplicación de conversa que lle permite usar todas as funcionalidades da rede Matrix. Fornece unha forma segura de enviar mensaxes de texto e ficheiros de vídeo e son a familiares, amizades ou no traballo.</p>
+    <p xml:lang="he">NeoChat הוא יישום התכתבות שמאפשר לך לנצל את רשת Matrix במלואה. הוא מספק דרך מאובטחת לשליחת הודעות כתובות, סרטונים וקובצי שמע למשפחה, לעמיתים לעבודה ולחברים.</p>
+    <p xml:lang="hu">A NeoChat egy olyan csevegőalkalmazás, amellyel teljes mértékben kihasználhatja a Matrix hálózatot. Biztonságos módot biztosít szöveges üzenetek, videók és hangfájlok küldéséhez családtagjainak, kollégáinak és barátainak.</p>
+    <p xml:lang="ia">NeoChat es un app de conversation que te permitte prender avantage plen del rete Matrix. Il te forni un modo secur de inviar messages de texto, videos e files audio a tui familia, collegas e amicos.</p>
+    <p xml:lang="it">NeoChat è un'applicazione di chat che ti consente di sfruttare appieno la rete Matrix. Ti fornisce un modo sicuro per inviare messaggi di testo, video e file audio a familiari, colleghi e amici.</p>
+    <p xml:lang="ka">NeoChat ჩატის აპია, რომელიც საშუალება გაძლევთ, Matrix-ის ქსელის საშუალებები ბოლომდე გამოიყენოთ. ის გაძლევთ უსაფრთხო გზას, გააგზავნოთ ტექსტური შეტყობინებები, ვიდეოებ და აუდიოფაილები თქვენს ოჯახთან, კოლეგებთან და მეგობრებთან.</p>
+    <p xml:lang="lv">„NeoChat“ ir tērzēšanas programma, kas ļauj pilnvērtīgi izmantot „Matrix“ tīklu. Tā sniedz drošu veidu teksta ziņu, video un audio sūtīšanai ģimenes locekļiem, kolēģiem un draugiem.</p>
+    <p xml:lang="nl">NeoChat is een chat-toepassing die u het volledige voordeel van het Matrix-netwerk laat genieten. Het levert u op een veilige manier tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden te verzenden.</p>
+    <p xml:lang="nn">NeoChat er ein prateapp som lèt deg bruka all funksjonalitet i Matrix-nettverket. Du kan utveksla tekst, lyd og videoar med vennar, familie og kollegaar på ein trygg måte.</p>
+    <p xml:lang="pl">NoeChat to aplikacja do rozmów, która umożliwia wykorzystanie wszystkich możliwości Matriksa. Umożliwia wysyłanie wiadomości tekstowych, filmów i dźwięków w bezpieczny sposób do twojej rodziny, kolegów i przyjaciół.</p>
+    <p xml:lang="sl">NeoChat je aplikacija za klepet, ki vam omogoča, da v celoti izkoristite omrežje Matrix. Zagotavlja vam varen način za pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, sodelavcem in prijateljem.</p>
+    <p xml:lang="sv">NeoChat är ett chattprogram som låter dig dra full nytta av Matrix-nätverket. Det ger dig ett säkert sätt att skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner.</p>
+    <p xml:lang="tr">NeoChat, Matrix ağının tüm özelliklerini kullanan bir sohbet uygulamasıdır. Ailenize, arkadaşlarınıza ve iş arkadaşlarınıza metin iletileri, ses ve video dosyaları göndermenin kolay bir yolunu sunar.</p>
+    <p xml:lang="uk">NeoChat є програмою для спілкування, за допомогою якої ви можете скористатися усіма перевагами мережі Matrix. За її допомогою ви можете безпечно надсилати текстові повідомлення, відео та звукові файли вашим родичам, колегам та друзям.</p>
+    <p xml:lang="x-test">xxNeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.xx</p>
+    <p xml:lang="zh-TW">NeoChat 是一個讓您能夠完全利用 Matrix 網路的聊天應用程式。它讓您安全地傳送文字訊息、影片或音訊檔給家人、同事或朋友等等。</p>
     <p>NeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.</p>
     <p xml:lang="ar">يهدف نيوتشات إلى أن يكون تطبيقًا كامل الميزات لمواصفات ماتركس. على هذا النحو يتم دعم كل شيء في المواصفات المستقرة الحالية مع الاستثناءات الملحوظة لـ VoIP والخيوط وبعض جوانب التشفير من طرف إلى طرف. هناك عدد قليل من الإغفالات الصغيرة الأخرى بسبب حقيقة أن مواصفات ماتركس تتطور باستمرار ، ولكن يبقى الهدف توفير الدعم النهائي للمواصفات بأكملها.</p>
     <p xml:lang="ca">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de la VoIP, fils i alguns aspectes de l'encriptatge d'extrem a extrem. Hi ha algunes altres omissions més petites a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu segueix sent proporcionar suport eventual per a tota l'especificació.</p>
@@ -112,17 +118,21 @@ to provide a convergent experience across multiple platforms.</p>
     <p xml:lang="fi">NeoChat pyrkii olemaan Matrix-määritelmän täysominaisuuksinen sovellus, joten se tukee kaikkea nykyisessä vakaassa määritelmässä muutamaa huomattavaa poikkeusta lukuun ottamatta (VoIP, säikeet ja jotkin piirteet päästä päähän -salauksessa). Joitakin pienempiäkin puutteita on Matrix-määritelmän jatkuvan kehityksen vuoksi, mutta lopputavoitteena on tarjota määritelmän täysi tuki.</p>
     <p xml:lang="fr">L'objectif de NeoChat est d'être une application complète pour le protocole Matrix. En tant que tel, tout dans la spécification stable actuelle avec les exceptions notables de VoIP, les processus et certains aspects du chiffrement de bout en bout sont pris en charge. Il y a quelques autres petites omissions en raison du fait que la spécification du protocole Matrix est en constante évolution. Cependant, l'objectif reste de fournir un soutien éventuel pour l'ensemble de la spécification.</p>
     <p xml:lang="gl">NeoChat pretende ser unha aplicación completa para a especificación de Matrix. Coas excepcións de VoIP, conversas fiadas e algúns aspectos da cifraxe de extremo a extremo, a versión estábel segue as especificacións. Existen algunhas outras pequenas omisións debido ao feito de que Matrix está en continua evolución pero a intención é implementar a especificación completa.</p>
-    <p xml:lang="ia">NeoChat aspira a esser un application plenemente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
+    <p xml:lang="he">NeoChat מתיימר להיות יישום עתיר יכולות לפי מפרט Matrix. כיוון שזה ייעודו, כל מה שבמפרט היציב עם חריגות משמעותיות כגון VoIP, שרשורים ועוד מגוון היבטים של הצפנה מקצה לקצה נתמכים גם הם. יש מספר השמטות קטן עקב העובדה שהמפרט של Matrix ממשיך להתפתח אך המטרה היא להמשיך לספק תמיכה בסופו של דבר לכל המפרט.</p>
+    <p xml:lang="hu">A NeoChat célja, hogy a Matrix specifikációnak megfelelő teljes funkcionalitású alkalmazás legyen. Mint ilyen, a jelenlegi stabil specifikáció támogatott a VoIP, a szálak és a végpontok közötti titkosítás egyes elemeinek kivételével. Van még néhány kisebb hiányosság annak köszönhetően, hogy a Matrix specifikáció folyamatosan fejlődik, de végső cél a teljes specifikáció megvalósítása.</p>
+    <p xml:lang="ia">NeoChat aspira a esser un application plenmente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
     <p xml:lang="it">NeoChat mira ad essere un'applicazione completa per le specifiche Matrix. Pertanto, sono supportati tutti gli elementi dell'attuale specifica stabile con le notevoli eccezioni di VoIP, conversazioni e alcuni aspetti della cifratura end-to-end. Ci sono alcune altre piccole omissioni dovute al fatto che le specifiche Matrix sono in continua evoluzione, ma l'obiettivo rimane quello di fornire un eventuale supporto per l'intera specifica.</p>
-    <p xml:lang="ka">NeoChat-ი მიზნად ისახავს Matrix სპეციფიკაციის სრული განხორციელება ჰქონდეს. როგორც ასეთი, ყველაფერი მიმდინარე სპეციფიკაციიდან, VoIP-ის, ძაფებისა და გამჭოლი დაშიფვრის ზოგიერთი ასპექტის გარდა, მხარდაჭერილია. შეძლება ასევე იყოს მცირე ლაფსუსებიც იმის გამო, რომ Matrix-ის სპეციფიკაცია მუდმივად ვითარგდება, მაგრამ ჩვენი მიზანი მისი სრული მხარდაჭერაა.</p>
+    <p xml:lang="ka">NeoChat მიზნად ისახავს Matrix სპეციფიკაციის სრული განხორციელება ჰქონდეს. როგორც ასეთი, ყველაფერი მიმდინარე სპეციფიკაციიდან, VoIP-ის, ძაფებისა და გამჭოლი დაშიფვრის ზოგიერთი ასპექტის გარდა, მხარდაჭერილია. შეძლება ასევე იყოს მცირე ლაფსუსებიც იმის გამო, რომ Matrix-ის სპეციფიკაცია მუდმივად ვითარდება, მაგრამ ჩვენი მიზანი მისი სრული მხარდაჭერაა.</p>
     <p xml:lang="ko">NeoChat은 Matrix 표준을 따르는 프로그램을 목표로 합니다. 현재 안정 버전의 표준에서 제공하는 기능의 대부분을 지원하며, VoIP, 스레드, 일부 종단간 암호화와 같은 기능은 아직 지원하지 않습니다. Matrix 표준은 계속하여 진화 중이기 때문에 일부 기능이 빠져 있을 수도 있지만 장기적으로는 전체 표준을 지원하는 것이 목표입니다.</p>
+    <p xml:lang="lv">„NeoChat“ mērķis ir piedāvāt plašas iespējas atbilstoši „Matrix“ specifikācijai. Līdz ar to programma atbalsta visu pašreizējā stabilajā specifikācijā, izņemot VoIP, pavedienus un dažos aspektos galšifrēšanu. Pastāv citas atsevišķas sīkas neieviestas daļas, jo „Matrix“ specifikācija nepārtraukti attīstās, tomēr mērķis ir ar laiku nodrošināt atbalstu pilnai specifikācijai.</p>
     <p xml:lang="nl">NeoChat richt zich op het volledig bieden van alle mogelijkheden van de Matrix-specificatie. Alles in de huidige stabiele specificatie met merkbare uitzondering van VoIP, gekoppelde discussies en sommige aspecten van eind-tot-eind versleuteling worden ondersteund. Er zijn een paar andere kleinere omissies vanwege het feit dat de Matrix specificatie constant evolueert maar het doel blijft het eventueel bieden van ondersteuning van de gehele specificatie.</p>
     <p xml:lang="nn">NeoChat har som mål å støtta all funksjonalitet i Matrix-spesifikasjonen. Førebels er alt i den gjeldande stabile spesifikasjonen støtta, med unntak av VoIP, trådar og nokre delar av ende-til-kryptering. Det finst òg andre småting som ikkje er støtta, sidan Matrix-spesifikasjon er i stadig endring, men målet er altså støtte for alt.</p>
     <p xml:lang="pl">NeoChat w zamyśle ma być pełnowartościową aplikacją wg wytycznych Matriksa. Z tego powodu, wszystko, co jest obecnie w stabilnych wytycznych z pominięciem VoIP, wątków i niektórych części szyfrowania Użytkownik-do-Użytkownika są obecnie obsługiwane. Pominięto też kilka mniejszych rzeczy ze względu na ciągły rozwój wytycznych Matriksa, lecz celem nadal jest zapewnienie obsługi wszystkich wytycznych.</p>
     <p xml:lang="pt">O NeoChat pretende ser uma aplicação completa para a especificação do Matrix. Como tal, tudo o que existe na especificação estável actual, com as notáveis excepções do VoIP, tópicos e alguns aspectos da Encriptação Ponto-a-Ponto, são suportados. Existem mais algumas omissões, devido ao facto que a norma do Matrix está em constante evolução, mas o objectivo continua a ser oferecer o suporte eventual para a norma por inteiro.</p>
+    <p xml:lang="ru">Целью создания NeoChat является полноценная реализация программы для спецификации Matrix. Как следствие, реализовано всё в текущей стабильной спецификации (за исключением голосовой интернет-связи, потоков и некоторых аспектов сквозного шифрования). Есть также несколько других незначительных пробелов, обусловленных постоянными изменениями спецификации Matrix. Тем не менее, стоит задача в итоге предоставить полную поддержку спецификации.</p>
     <p xml:lang="sl">Neochat cilja, da bi bila popolna aplikacija po specifikaciji Matrixa. Kot takšna vsebuje vse v trenutni stabilni specifikaciji z pomembnimi izjemami pri VoIP, nitih in nekaterih vidikov šifriranja od konca do konca. Obstaja nekaj drugih manjših opustitev zaradi dejstva, da se specifikacija Matrix nenehno razvija, vendar cilj ostaja zagotoviti morebitno podporo celotni specifikaciji.</p>
     <p xml:lang="sv">NeoChat har som mål att vara ett fullständigt program enligt Matrix-specifikationen. Som sådant stöds allt i den nuvarande stabila specifikationen, med de nämnvärda undantagen VoIP, trådar och några aspekter av kryptering hela vägen. Det finns några ytterligare utelämnanden på grund av att Matrix-specifikationen hela tiden utvecklas, men målet förblir att till slut erbjuda stöd för hela specifikationen.</p>
-    <p xml:lang="tr">NeoChat, Matrix belirtimi için tam özellikli bir uygulama olmayı hedefler. Bu nedenle; VoIP, ileti zincirleri ve Uçtan Uca Şifreleme'nin bazı yönleri gibi dikkate değer istisnalar dışında var olan kararlı belirtimdeki her şey desteklenir. Matrix belirtiminin sürekli gelişmesi nedeniyle birkaç küçük eksiklik daha var; ancak amaç tüm belirtim için nihai destek sağlamak olmayı sürdürüyor.</p>
+    <p xml:lang="tr">NeoChat, Matrix belirtimi için tam özellikli bir uygulama olmayı hedefler. Bu nedenle; VoIP, ileti zincirleri ve Uçtan Uca Şifreleme’nin bazı yönleri gibi dikkate değer istisnalar dışında var olan kararlı belirtimdeki her şey desteklenir. Matrix belirtiminin sürekli gelişmesi nedeniyle birkaç küçük eksiklik daha var; ancak amaç tüm belirtim için nihai destek sağlamak olmayı sürdürüyor.</p>
     <p xml:lang="uk">Метою створення NeoChat є повноцінна реалізація програми для специфікації Matrix. Як наслідок, реалізовано усе у поточній стабільній специфікації, окрім голосового інтернет-зв'язку, потоків та деяких аспектів міжвузлового шифрування. Є також декілька інших незначних прогалин через те, що специфікація Matrix постійно змінюється, але метою лишається повна підтримка специфікації.</p>
     <p xml:lang="x-test">xxNeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.xx</p>
     <p xml:lang="zh-TW">NeoChat 以完整支援 Matrix 標準為目標，因此目前穩定版標準除了 VoIP、對話串與端對端加密的某些部分以外的所有部分都有支援。其他部分還有一些較小的不支援的部分，這是因為 Matrix 標準隨時都在改進，但目標仍然時最終提供整個標準的完整支援。</p>
@@ -137,14 +147,18 @@ to provide a convergent experience across multiple platforms.</p>
     <p xml:lang="fi">Matrix-määritelmän kehittyessä NeoChat tukee myös monia epävakaita ominaisuuksia. Tällä hetkellä näitä ovat:</p>
     <p xml:lang="fr">En raison de la nature du développement des spécifications du protocole Matrix, NeoChat prend également en charge de nombreuses fonctionnalités instables. Actuellement, ce sont :</p>
     <p xml:lang="gl">Debido á natureza do desenvolvemento da especificación de Matrix, NeoChat tamén inclúe varias funcionalidades non estábeis:</p>
+    <p xml:lang="he">מטבע הדברים, הפיתוח של NeoChat תומך במגוון יכולות מפוקפקות כתלות בהתפתחות המפרט הטכני של Matrix. היכולות האלה הן:</p>
+    <p xml:lang="hu">A Matrix specifikáció fejlesztésének jellegéből adódóan a NeoChat számos instabil funkciót is támogat. Jelenleg a következőket:</p>
     <p xml:lang="ia">Debite al natura del disveloppamento de specification de Matrix NeoChat tamben supporta numerose characteristicas instabile. Currentemente istes es:</p>
     <p xml:lang="it">A causa della natura dello sviluppo delle specifiche Matrix, NeoChat supporta anche numerose funzionalità instabili. Attualmente queste sono:</p>
     <p xml:lang="ka">Matrix-ის სპეციფიკაციის განვითარების ბუნების გამო NeoChat-ს ასევე აქვს უამრავი არასტაბილური ფუნქციაც. ახლა ისინია:</p>
     <p xml:lang="ko">Matrix 표준 개발의 특징으로 인하여 NeoChat은 일부 실험적인 기능을 지원합니다. 현재 지원하는 기능은 다음과 같습니다.</p>
+    <p xml:lang="lv">„Matrix“ specifikācijas veida dēļ „NeoChat“ attīstība atbalsta arī vairākas nestabilas iespējas, šobrīd šādas ir:</p>
     <p xml:lang="nl">Vanwege de aard van de ontwikkeling van de Matrix specificatie ondersteunt NeoChat ook talloze onstabiele mogelijkheden. Dit zijn nu:</p>
     <p xml:lang="nn">På grunn av måten Matrix-spesifikasjonen vert utvikla på, støttar NeoChat òg nokre uferdige funksjonar:</p>
     <p xml:lang="pl">Ze względu na sposób rozwoju Matriksa, NeoChat obsługuje także kilka niestabilnych możliwości. Obecnie są to:</p>
     <p xml:lang="pt">Devido à natureza do desenvolvimento da especificação do Matrix, o NeoChat também suporta diversas funcionalidades instáveis. De momento são:</p>
+    <p xml:lang="ru">В силу природы разработки спецификации Matrix в NeoChat тоже предусмотрена поддержка многочисленных нестабильных возможностей. В текущей версии это следующие возможности:</p>
     <p xml:lang="sl">Zaradi narave razvoja specifikacije Matrixa NeoChat podpira tudi številne nestabilne zmožnosti. Trenutno so to:</p>
     <p xml:lang="sv">På grund av sättet Matrix-specifikationens utvecklas, stöder NeoChat också ett stor antal instabila funktioner. För närvarande är de:</p>
     <p xml:lang="ta">மேட்ரிக்ஸு நெறிமுறை வரையறுக்கப்படும் வித‍த்தின் காரணமாக, பல நிலையற்ற அம்சங்களையும் நியோச்சாட் ஆதரிக்கிறது. தற்போது ஆதரிக்கப்படுபவை:</p>
@@ -164,10 +178,13 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="fi">Kyselyt – MSC3381</li>
       <li xml:lang="fr">Sondages - MSC3381</li>
       <li xml:lang="gl">Enquisas — MSC3381</li>
+      <li xml:lang="he">סקרים - MSC3381</li>
+      <li xml:lang="hu">Szavazások - MSC3381</li>
       <li xml:lang="ia">Inquestas - MSC3381</li>
       <li xml:lang="it">Sondaggi - MSC3381</li>
       <li xml:lang="ka">Polls - MSC3381</li>
       <li xml:lang="ko">투표 - MSC3381</li>
+      <li xml:lang="lv">Aptaujas — MSC3381</li>
       <li xml:lang="nl">Polls - MSC3381</li>
       <li xml:lang="nn">Avstemmingar – MSC3381</li>
       <li xml:lang="pl">Ankiety - MSC3381</li>
@@ -175,7 +192,7 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="sl">Polls - MSC3381</li>
       <li xml:lang="sv">Polls - MSC3381</li>
       <li xml:lang="ta">வாக்கெடுப்புகள் - MSC3381</li>
-      <li xml:lang="tr">Anketler - MSC3381</li>
+      <li xml:lang="tr">Anketler — MSC3381</li>
       <li xml:lang="uk">Опитування - MSC3381</li>
       <li xml:lang="x-test">xxPolls - MSC3381xx</li>
       <li xml:lang="zh-TW">投票 - MSC3381</li>
@@ -190,18 +207,22 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="fi">Tarrapakkaukset – MSC2545</li>
       <li xml:lang="fr">Paquets d'auto-collants - MSC2545</li>
       <li xml:lang="gl">Paquetes de adhesivos — MSC2545</li>
+      <li xml:lang="he">חבילות מדבקות - MSC2545</li>
+      <li xml:lang="hu">Matricacsomagok - MSC2545</li>
       <li xml:lang="ia">Etiquetta gummate (sticker) -MSC2545</li>
       <li xml:lang="it">Pacchetti di adesivi - MSC2545</li>
       <li xml:lang="ka">სტიკერების პაკეტები - MSC2545</li>
       <li xml:lang="ko">스티커 팩 - MSC2545</li>
+      <li xml:lang="lv">Uzlīmju pakas — MSC2545</li>
       <li xml:lang="nl">Sticker Packs - MSC2545</li>
       <li xml:lang="nn">Klistremerke-pakkar – MSC2545</li>
       <li xml:lang="pl">Paczki naklejek - MSC2545</li>
       <li xml:lang="pt">Pacotes de Autocolantes - MSC2545</li>
+      <li xml:lang="ru">Наборы стикеров — MSC2545</li>
       <li xml:lang="sl">Sticker Packs - MSC2545</li>
       <li xml:lang="sv">Sticker Packs - MSC2545</li>
       <li xml:lang="ta">ஒட்டி தொகுப்புகள் - MSC2545</li>
-      <li xml:lang="tr">Yapışkan Paketleri - MSC2545</li>
+      <li xml:lang="tr">Çıkartma Paketleri — MSC2545</li>
       <li xml:lang="uk">Пакунки наліпок - MSC2545</li>
       <li xml:lang="x-test">xxSticker Packs - MSC2545xx</li>
       <li xml:lang="zh-TW">貼圖包 - MSC2545</li>
@@ -216,18 +237,22 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="fi">Sijaintitapahtumat – MSC3488</li>
       <li xml:lang="fr">Événements de lieu - MSC3488</li>
       <li xml:lang="gl">Localización de eventos — MSC3488</li>
+      <li xml:lang="he">אירועי מקום - MSC3488</li>
+      <li xml:lang="hu">Események helyadatai - MSC3488</li>
       <li xml:lang="ia">Eventos de Location - MSC3488</li>
       <li xml:lang="it">Località eventi - MSC3488</li>
       <li xml:lang="ka">მდებარეობის მოვლენები - MSC3488</li>
       <li xml:lang="ko">위치 이벤트 - MSC3488</li>
+      <li xml:lang="lv">Atrašanās vietas notikumi — MSC3488</li>
       <li xml:lang="nl">Locatie gebeurtenissen - MSC3488</li>
       <li xml:lang="nn">Posisjonshendingar – MSC3488</li>
       <li xml:lang="pl">Wydarzenia w miejscach - MSC3488</li>
       <li xml:lang="pt">Eventos com Localizações - MSC3488</li>
+      <li xml:lang="ru">События местоположения — MSC3488</li>
       <li xml:lang="sl">Location Events - MSC3488</li>
       <li xml:lang="sv">Location Events - MSC3488</li>
       <li xml:lang="ta">இட நிகழ்வுகள் - MSC3488</li>
-      <li xml:lang="tr">Konum Etkinlikleri - MSC3488</li>
+      <li xml:lang="tr">Konum Etkinlikleri — MSC3488</li>
       <li xml:lang="uk">Місцеві зустрічі - MSC3488</li>
       <li xml:lang="x-test">xxLocation Events - MSC3488xx</li>
       <li xml:lang="zh-TW">位置事件 - MSC3488</li>
@@ -235,47 +260,21 @@ to provide a convergent experience across multiple platforms.</p>
   </description>
   <url type="homepage">https://apps.kde.org/neochat</url>
   <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?product=NeoChat</url>
+  <url type="vcs-browser">https://invent.kde.org/network/neochat</url>
+  <url type="contact">https://go.kde.org/matrix/#/#neochat:kde.org</url>
+  <url type="donation">https://kde.org/community/donations/?app=neochat</url>
+  <url type="contribute">https://community.kde.org/Get_Involved/</url>
   <categories>
     <category>Network</category>
   </categories>
-  <developer_name>The KDE Community</developer_name>
-  <developer_name xml:lang="ar">مجتمع كِيدِي</developer_name>
-  <developer_name xml:lang="az">KDE Cəmiyyəti</developer_name>
-  <developer_name xml:lang="ca">La comunitat KDE</developer_name>
-  <developer_name xml:lang="ca-valencia">La comunitat KDE</developer_name>
-  <developer_name xml:lang="cs">Komunita KDE</developer_name>
-  <developer_name xml:lang="de">Die KDE-Gemeinschaft</developer_name>
-  <developer_name xml:lang="el">Η Κοινότητα του KDE</developer_name>
-  <developer_name xml:lang="en-GB">The KDE Community</developer_name>
-  <developer_name xml:lang="eo">La KDE-Komunumo</developer_name>
-  <developer_name xml:lang="es">La comunidad KDE</developer_name>
-  <developer_name xml:lang="eu">KDE komunitatea</developer_name>
-  <developer_name xml:lang="fi">KDE-yhteisö</developer_name>
-  <developer_name xml:lang="fr">La communauté de KDE</developer_name>
-  <developer_name xml:lang="gl">A comunidade KDE</developer_name>
-  <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>
-  <developer_name xml:lang="pa">ਕੇਡੀਈ ਕਮਿਊਨਟੀ</developer_name>
-  <developer_name xml:lang="pl">Społeczność KDE</developer_name>
-  <developer_name xml:lang="pt">A Comunidade do KDE</developer_name>
-  <developer_name xml:lang="pt-BR">A comunidade KDE</developer_name>
-  <developer_name xml:lang="ru">Сообщество KDE</developer_name>
-  <developer_name xml:lang="sk">KDE Komunita</developer_name>
-  <developer_name xml:lang="sl">Skupnost KDE</developer_name>
-  <developer_name xml:lang="sv">KDE-gemenskapen</developer_name>
-  <developer_name xml:lang="ta">கே.டீ.யீ. சமூகம்</developer_name>
-  <developer_name xml:lang="tr">KDE Topluluğu</developer_name>
-  <developer_name xml:lang="uk">Спільнота KDE</developer_name>
-  <developer_name xml:lang="x-test">xxThe KDE Communityxx</developer_name>
-  <developer_name xml:lang="zh-CN">KDE 社区</developer_name>
-  <developer_name xml:lang="zh-TW">KDE 社群</developer_name>
+  <keywords>
+    <keyword>Matrix</keyword>
+    <keyword>Kirigami</keyword>
+  </keywords>
+  <developer id="kde.org">
+    <name>The KDE Community</name>
+    <url>https://kde.org</url>
+  </developer>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
   <custom>
@@ -289,32 +288,100 @@ to provide a convergent experience across multiple platforms.</p>
   </custom>
   <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
   <screenshots>
-    <screenshot type="default">
-      <image>https://cdn.kde.org/screenshots/neochat/application-mobile.png</image>
-    </screenshot>
     <screenshot type="default">
       <image>https://cdn.kde.org/screenshots/neochat/application.png</image>
-    </screenshot>
-    <screenshot environment="windows">
-      <image>https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Timeline.png</image>
       <caption>Main view with room list, chat, and room information</caption>
       <caption xml:lang="ar">العرض الرئيسة مع قائمة الغرف والدردشات و معلومات الغرفة</caption>
       <caption xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</caption>
       <caption xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</caption>
+      <caption xml:lang="en-GB">Main view with room list, chat, and room information</caption>
       <caption xml:lang="eo">Ĉefa vido kun ĉambra listo, babilejo kaj ĉambra informo</caption>
       <caption xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</caption>
       <caption xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</caption>
       <caption xml:lang="fi">Päänäkymä, jossa huoneluettelo, keskustelu ja huoneen tiedot</caption>
       <caption xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</caption>
       <caption xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</caption>
+      <caption xml:lang="he">תצוגה ראשית עם רשימת חדרים, צ׳אט ופרטי חדר</caption>
+      <caption xml:lang="hu">A fő nézet a szobalistával, csevegéssel és szobainformációkkal</caption>
       <caption xml:lang="ia">Vista principal con lista de sala, chat e information de sala</caption>
       <caption xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</caption>
       <caption xml:lang="ka">მთავარი ხედი სურათების სიით, ჩატით და ოთახის ინფორმაციით</caption>
       <caption xml:lang="ko">대화방 목록, 채팅, 대화방 정보가 표시된 주 보기</caption>
+      <caption xml:lang="lv">Pamata skats ar istabu sarakstu, tērzēšanu un istabas informāciju</caption>
       <caption xml:lang="nl">Hoofdweergave met lijst met rooms, chat en roominformatie</caption>
       <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
       <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
       <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
+      <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
+      <caption xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</caption>
+      <caption xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</caption>
+      <caption xml:lang="tr">Oda listesini, sohbet penceresini ve oda bilgisini gösteren ana görünüm</caption>
+      <caption xml:lang="uk">Головна панель із списком кімнат, спілкуванням та даними щодо кімнати</caption>
+      <caption xml:lang="x-test">xxMain view with room list, chat, and room informationxx</caption>
+      <caption xml:lang="zh-TW">主頁面，包含聊天室列表、聊天內容，與聊天室資訊</caption>
+    </screenshot>
+    <screenshot type="default">
+      <image>https://cdn.kde.org/screenshots/neochat/spaces.png</image>
+      <caption>Discover new communities with Matrix Spaces</caption>
+      <caption xml:lang="ar">اكتشف مجتمعات جديدة مع فضاءات ماتركس</caption>
+      <caption xml:lang="ca">Descobriu comunitats noves amb els espais de Matrix</caption>
+      <caption xml:lang="ca-valencia">Descobriu comunitats noves amb els espais de Matrix</caption>
+      <caption xml:lang="en-GB">Discover new communities with Matrix Spaces</caption>
+      <caption xml:lang="eo">Malkovru novajn komunumojn per Matrix Spaces</caption>
+      <caption xml:lang="es">Descubra nuevas comunidades con los espacios de Matrix</caption>
+      <caption xml:lang="eu">Ezagutu komunitate berriak Matrixeko Tokiak erabiliz</caption>
+      <caption xml:lang="fi">Löydä uusia yhteisöjä Matrix Spacesillä</caption>
+      <caption xml:lang="fr">Découvrez de nouvelles communautés avec les espaces sous Matrix</caption>
+      <caption xml:lang="gl">Descubra novas comunidades dos espazos de Matrix.</caption>
+      <caption xml:lang="he">אפשר להיחשף לקהילות חדשות דרך Matrix Spaces</caption>
+      <caption xml:lang="hu">Fedezzen fel új közösségeket a Matrix Terek segítségével</caption>
+      <caption xml:lang="ia">Discoperi nove communitate con Matrix Spaces (Spatios de Matrix)</caption>
+      <caption xml:lang="it">Scopri nuove comunità con Matrix Spaces</caption>
+      <caption xml:lang="ka">აღმოაჩინეთ ახალი საზოგადოებები Matrix Spaces-თან ერთად</caption>
+      <caption xml:lang="lv">Atklājiet jaunas kopienas ar „Matrix“ telpām</caption>
+      <caption xml:lang="nl">Ontdek nieuwe gemeenschappen met Matrix-ruimten</caption>
+      <caption xml:lang="nn">Oppdag nye fellesskap med Matrix Spaces</caption>
+      <caption xml:lang="pl">Odkrywaj nowe społeczności w Przestrzeniach Matriksa</caption>
+      <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
+      <caption xml:lang="sv">Upptäck nya gemenskaper med Matrix Spaces</caption>
+      <caption xml:lang="tr">Matrix Alanlar ile yeni topluluklar keşfedin</caption>
+      <caption xml:lang="uk">Пошук нових спільнот за допомогою Matrix Spaces</caption>
+      <caption xml:lang="x-test">xxDiscover new communities with Matrix Spacesxx</caption>
+      <caption xml:lang="zh-TW">利用 Matrix 聊天空間發現新的社群</caption>
+    </screenshot>
+    <!--
+    Currently invalid. See https://github.com/ximion/appstream/issues/611
+    <screenshot type="default" environment="plasma-mobile">
+      <image>https://cdn.kde.org/screenshots/neochat/neochat-1.png</image>
+      <caption>List of chats on mobile</caption>
+    </screenshot>
+    -->
+    <screenshot environment="windows">
+      <image>https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Timeline.png</image>
+      <caption>Main view with room list, chat, and room information</caption>
+      <caption xml:lang="ar">العرض الرئيسة مع قائمة الغرف والدردشات و معلومات الغرفة</caption>
+      <caption xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</caption>
+      <caption xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</caption>
+      <caption xml:lang="en-GB">Main view with room list, chat, and room information</caption>
+      <caption xml:lang="eo">Ĉefa vido kun ĉambra listo, babilejo kaj ĉambra informo</caption>
+      <caption xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</caption>
+      <caption xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</caption>
+      <caption xml:lang="fi">Päänäkymä, jossa huoneluettelo, keskustelu ja huoneen tiedot</caption>
+      <caption xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</caption>
+      <caption xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</caption>
+      <caption xml:lang="he">תצוגה ראשית עם רשימת חדרים, צ׳אט ופרטי חדר</caption>
+      <caption xml:lang="hu">A fő nézet a szobalistával, csevegéssel és szobainformációkkal</caption>
+      <caption xml:lang="ia">Vista principal con lista de sala, chat e information de sala</caption>
+      <caption xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</caption>
+      <caption xml:lang="ka">მთავარი ხედი სურათების სიით, ჩატით და ოთახის ინფორმაციით</caption>
+      <caption xml:lang="ko">대화방 목록, 채팅, 대화방 정보가 표시된 주 보기</caption>
+      <caption xml:lang="lv">Pamata skats ar istabu sarakstu, tērzēšanu un istabas informāciju</caption>
+      <caption xml:lang="nl">Hoofdweergave met lijst met rooms, chat en roominformatie</caption>
+      <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
+      <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
+      <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
       <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
       <caption xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</caption>
       <caption xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</caption>
@@ -330,20 +397,25 @@ to provide a convergent experience across multiple platforms.</p>
       <caption xml:lang="ca">Pantalla d'inici de sessió</caption>
       <caption xml:lang="ca-valencia">Pantalla d'inici de sessió</caption>
       <caption xml:lang="cs">Přihlašovací obrazovka</caption>
+      <caption xml:lang="en-GB">Login screen</caption>
       <caption xml:lang="eo">Ensaluta ekrano</caption>
       <caption xml:lang="es">Pantalla de inicio de sesión</caption>
       <caption xml:lang="eu">Saio-hasteko pantaila</caption>
       <caption xml:lang="fi">Kirjautumisnäkymä</caption>
       <caption xml:lang="fr">Écran de connexion</caption>
       <caption xml:lang="gl">Pantalla de identificación.</caption>
+      <caption xml:lang="he">מסך כניסה</caption>
+      <caption xml:lang="hu">Bejelentkező képernyő</caption>
       <caption xml:lang="ia">Schermo de accesso</caption>
       <caption xml:lang="it">Schermata di accesso</caption>
       <caption xml:lang="ka">შესვლის ეკრანი</caption>
       <caption xml:lang="ko">로그인 화면</caption>
+      <caption xml:lang="lv">Ierakstīšanās logs</caption>
       <caption xml:lang="nl">Aanmeldscherm</caption>
       <caption xml:lang="nn">Innloggingsbilete</caption>
       <caption xml:lang="pl">Ekran logowania</caption>
       <caption xml:lang="pt">Ecrã de autenticação</caption>
+      <caption xml:lang="ru">Окно входа</caption>
       <caption xml:lang="sl">Prijavni zaslon</caption>
       <caption xml:lang="sv">Inloggningsfönster</caption>
       <caption xml:lang="ta">நுழைவுத் திரை</caption>
@@ -357,6 +429,31 @@ to provide a convergent experience across multiple platforms.</p>
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="24.08.1" date="2024-09-12"/>
+    <release version="24.08.0" date="2024-08-22"/>
+    <release version="24.05.2" date="2024-07-04"/>
+    <release version="24.05.1" date="2024-06-13"/>
+    <release version="24.05.0" date="2024-05-23"/>
+    <release version="24.02.2" date="2024-04-11"/>
+    <release version="24.02.1" date="2024-03-21"/>
+    <release version="24.02.0" date="2024-02-28">
+      <url>https://kde.org/announcements/megarelease/6/#neochat</url>
+      <description>
+        <p>In the newest version, when launching the app, you will get a welcome page that lets you choose which account you want to use and lets you log in to other accounts. The welcome screen will also warn you when NeoChat cannot load an account.</p>
+        <p>NeoChat will also let you register a new account directly from the app itself. Deactivating your Matrix account is also possible from within NeoChat.</p>
+        <p>Spaces are a relatively new feature of Matrix that let you group chat channels together. This is used to improve the discoverability of rooms, manage large communities, or just tidy all the channels you are in. You can now do all this without leaving NeoChat.</p>
+        <p>NeoChat won't let you miss any new notifications anymore. We added a new page that includes all your recent notifications and when NeoChat is closed, you will still be able to receive push notifications. The main timeline will let you know when more messages are loading and when you reach the end of it.</p>
+        <p>More NeoChat Goodies</p>
+        <ul>
+          <li>QR Codes to share contacts</li>
+          <li>Improved room upgrades</li>
+          <li>Added button to reject invitation and ignore user</li>
+          <li>Display device security details</li>
+          <li>Added room security settings</li>
+        </ul>
+      </description>
+    </release>
+    <release version="23.08.5" date="2024-02-15"/>
     <release version="23.08.4" date="2023-12-07"/>
     <release version="23.08.3" date="2023-11-09"/>
     <release version="23.08.2" date="2023-10-12"/>
@@ -504,4 +601,8 @@ to provide a convergent experience across multiple platforms.</p>
       <url>https://carlschwan.eu/2020/12/23/announcing-neochat-1.0-the-kde-matrix-client/</url>
     </release>
   </releases>
+  <branding>
+    <color type="primary" scheme_preference="light">#a6e4f3</color>
+    <color type="primary" scheme_preference="dark">#235670</color>
+  </branding>
 </component>

org.kde.neochat.desktop

@@ -18,6 +18,7 @@ Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[gl]=NeoChat
+Name[he]=NeoChat
 Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
@@ -26,6 +27,7 @@ Name[it]=NeoChat
 Name[ka]=NeoChat
 Name[ko]=NeoChat
 Name[lt]=NeoChat
+Name[lv]=NeoChat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
 Name[pa]=ਨਿਓ-ਚੈਟ
@@ -58,6 +60,7 @@ GenericName[eu]=Matrix bezeroa
 GenericName[fi]=Matrix-asiakas
 GenericName[fr]=Client « Matrix »
 GenericName[gl]=Cliente de Matrix
+GenericName[he]=לקוח Matrix
 GenericName[hu]=Matrix kliens
 GenericName[ia]=Cliente de Matrice
 GenericName[id]=Klien Matrix
@@ -65,7 +68,8 @@ GenericName[ie]=Cliente de Matrix
 GenericName[it]=Client Matrix
 GenericName[ka]=Matrix -ის კლიენტი
 GenericName[ko]=Matrix 클라이언트
-GenericName[lt]=Matrix kliento programą
+GenericName[lt]=Matrix kliento programa
+GenericName[lv]=„Matrix“ klients
 GenericName[nl]=Matrix-client
 GenericName[nn]=Matrix-klient
 GenericName[pa]=ਮੈਟਰਿਕਸ ਕਲਾਈਂਟ
@@ -97,6 +101,7 @@ Comment[eu]=Matrix protokolorako bezeroa
 Comment[fi]=Asiakas Matrix-yhteyskäytännölle
 Comment[fr]=Client pour le protocole « Matrix »
 Comment[gl]=Cliente para o protocolo Matrix.
+Comment[he]=לקוח לפרוטוקול Matrix
 Comment[hu]=Kliens a Matrix protokollhoz
 Comment[ia]=Cliente per le protocollo de Matrix
 Comment[id]=Klien untuk protokol Matrix
@@ -105,6 +110,7 @@ Comment[it]=Client per il protocollo Matrix
 Comment[ka]=კლიენტი Matrix-ის პროტოკოლისთვის
 Comment[ko]=Matrix 프로토콜용 클라이언트
 Comment[lt]=Matrix protokolo kliento programa
+Comment[lv]=Klients „Matrix“ protokolam
 Comment[nl]=Client voor het Matrix-protocol
 Comment[nn]=Klient for Matrix-protokollen
 Comment[pa]=ਮੈਟਰਿਕਸ ਪਰੋਟੋਕਾਲ ਲਈ ਕਲਾਈਂਟ ਹੈ

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

@@ -77,7 +77,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0
 ></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>
+>L'URI de Matrix per a un usuari o una sala. P. ex. matrix:u/usuari:example.org o matrix:r/root:example.org. Això farà que el NeoChat intenti obrir la sala o conversa indicada. </para>
   </listitem>
   </varlistentry>
 </variablelist>

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

@@ -77,7 +77,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0
 ></term>
   <listitem>
     <para
->Bir kullanıcı veya oda için matrix URI'si; örneğin, matrix:u/kullanıcı:örnek.org ve matrix:r/kök:örnek.org. Bu, NeoChat'in verilen odayı veya konuşmayı açmayı denemesini sağlar. </para>
+>Bir kullanıcı veya oda için matrix URI’si; örneğin, matrix:u/kullanıcı:örnek.org ve matrix:r/kök:örnek.org. Bu, NeoChat’in verilen odayı veya konuşmayı açmayı denemesini sağlar. </para>
   </listitem>
   </varlistentry>
 </variablelist>

src/CMakeLists.txt

@@ -3,6 +3,10 @@
 # SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
 # SPDX-License-Identifier: BSD-2-Clause
 
+if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT NEOCHAT_FLATPAK AND NOT NEOCHAT_APPIMAGE)
+    add_subdirectory(purpose)
+endif()
+
 add_library(neochat STATIC
     controller.cpp
     controller.h
@@ -16,8 +20,6 @@ add_library(neochat STATIC
     models/customemojimodel.h
     clipboard.cpp
     clipboard.h
-    matriximageprovider.cpp
-    matriximageprovider.h
     models/messageeventmodel.cpp
     models/messageeventmodel.h
     models/messagefiltermodel.cpp
@@ -56,6 +58,8 @@ add_library(neochat STATIC
     notificationsmanager.h
     models/sortfilterroomlistmodel.cpp
     models/sortfilterroomlistmodel.h
+    models/roomtreemodel.cpp
+    models/roomtreemodel.h
     chatdocumenthandler.cpp
     chatdocumenthandler.h
     models/devicesmodel.cpp
@@ -120,6 +124,7 @@ add_library(neochat STATIC
     events/pollevent.cpp
     pollhandler.cpp
     utils.h
+    utils.cpp
     registration.cpp
     neochatconnection.cpp
     neochatconnection.h
@@ -129,6 +134,8 @@ add_library(neochat STATIC
     jobs/neochatdeletedevicejob.h
     jobs/neochatchangepasswordjob.cpp
     jobs/neochatchangepasswordjob.h
+    jobs/neochatgetcommonroomsjob.cpp
+    jobs/neochatgetcommonroomsjob.h
     mediasizehelper.cpp
     mediasizehelper.h
     eventhandler.cpp
@@ -144,11 +151,59 @@ add_library(neochat STATIC
     models/timelinemodel.cpp
     models/timelinemodel.h
     enums/pushrule.h
+    models/itinerarymodel.cpp
+    models/itinerarymodel.h
+    proxycontroller.cpp
+    proxycontroller.h
+    models/linemodel.cpp
+    models/linemodel.h
+    events/locationbeaconevent.h
+    events/widgetevent.h
+    enums/messagecomponenttype.h
+    models/messagecontentmodel.cpp
+    models/messagecontentmodel.h
+    enums/neochatroomtype.h
+    models/sortfilterroomtreemodel.cpp
+    models/sortfilterroomtreemodel.h
+    mediamanager.cpp
+    mediamanager.h
+    models/statekeysmodel.cpp
+    models/statekeysmodel.h
+    sharehandler.cpp
+    sharehandler.h
+    models/roomtreeitem.cpp
+    models/roomtreeitem.h
+    foreigntypes.h
+    models/threepidmodel.cpp
+    models/threepidmodel.h
+    threepidaddhelper.cpp
+    threepidaddhelper.h
+    jobs/neochatadd3pidjob.cpp
+    jobs/neochatadd3pidjob.h
+    identityserverhelper.cpp
+    identityserverhelper.h
+    enums/powerlevel.cpp
+    enums/powerlevel.h
+    models/permissionsmodel.cpp
+    models/permissionsmodel.h
+    threepidbindhelper.cpp
+    threepidbindhelper.h
+    models/readmarkermodel.cpp
+    models/readmarkermodel.h
+    neochatroommember.cpp
+    neochatroommember.h
+    models/threadmodel.cpp
+    models/threadmodel.h
 )
 
-qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
+set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
+    QT_QML_SINGLETON_TYPE TRUE
+)
+
+ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
+    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat
     QML_FILES
-        qml/main.qml
+        qml/Main.qml
         qml/AccountMenu.qml
         qml/ExploreComponent.qml
         qml/ExploreComponentMobile.qml
@@ -160,71 +215,19 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/UserInfo.qml
         qml/UserInfoDesktop.qml
         qml/RoomPage.qml
-        qml/RoomWindow.qml
-        qml/JoinRoomPage.qml
+        qml/ExploreRoomsPage.qml
         qml/ManualRoomDialog.qml
         qml/ExplorerDelegate.qml
         qml/InviteUserPage.qml
-        qml/StartChatPage.qml
         qml/ImageEditorPage.qml
-        qml/WelcomePage.qml
-        qml/General.qml
-        qml/RoomSecurity.qml
-        qml/PushNotification.qml
-        qml/Categories.qml
-        qml/Permissions.qml
         qml/NeochatMaximizeComponent.qml
-        qml/FancyEffectsContainer.qml
         qml/TypingPane.qml
         qml/QuickSwitcher.qml
         qml/HoverActions.qml
-        qml/ChatBar.qml
         qml/AttachmentPane.qml
-        qml/ReplyPane.qml
-        qml/CompletionMenu.qml
-        qml/PieProgressBar.qml
         qml/QuickFormatBar.qml
-        qml/RoomData.qml
-        qml/ServerData.qml
-        qml/EmojiPicker.qml
-        qml/TimelineDelegate.qml
-        qml/ReplyComponent.qml
-        qml/StateDelegate.qml
-        qml/RichLabel.qml
-        qml/MessageDelegate.qml
-        qml/Bubble.qml
-        qml/SectionDelegate.qml
-        qml/VideoDelegate.qml
-        qml/ReactionDelegate.qml
-        qml/LinkPreviewDelegate.qml
-        qml/AudioDelegate.qml
-        qml/FileDelegate.qml
-        qml/ImageDelegate.qml
-        qml/EncryptedDelegate.qml
-        qml/EventDelegate.qml
-        qml/TextDelegate.qml
-        qml/ReadMarkerDelegate.qml
-        qml/PollDelegate.qml
-        qml/MimeComponent.qml
-        qml/StateComponent.qml
-        qml/MessageEditComponent.qml
-        qml/AvatarFlow.qml
-        qml/LoginStep.qml
-        qml/Login.qml
-        qml/Homeserver.qml
-        qml/Username.qml
-        qml/RegisterPassword.qml
-        qml/Captcha.qml
-        qml/Terms.qml
-        qml/Email.qml
-        qml/Password.qml
-        qml/LoginRegister.qml
-        qml/Loading.qml
-        qml/LoginMethod.qml
-        qml/Sso.qml
         qml/UserDetailDialog.qml
         qml/CreateRoomDialog.qml
-        qml/EmojiDialog.qml
         qml/OpenFileDialog.qml
         qml/KeyVerificationDialog.qml
         qml/ConfirmLogoutDialog.qml
@@ -240,42 +243,14 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/MessageDelegateContextMenu.qml
         qml/FileDelegateContextMenu.qml
         qml/MessageSourceSheet.qml
-        qml/ReportSheet.qml
-        qml/SettingsPage.qml
-        qml/ThemeRadioButton.qml
-        qml/ColorScheme.qml
-        qml/GeneralSettingsPage.qml
-        qml/EmoticonsPage.qml
-        qml/EmoticonEditorPage.qml
-        qml/EmoticonFormCard.qml
-        qml/GlobalNotificationsPage.qml
-        qml/NotificationRuleItem.qml
-        qml/AppearanceSettingsPage.qml
-        qml/AccountsPage.qml
-        qml/AccountEditorPage.qml
-        qml/DevicesPage.qml
-        qml/DeviceDelegate.qml
-        qml/DevicesCard.qml
-        qml/About.qml
-        qml/AboutKDE.qml
-        qml/SonnetConfigPage.qml
-        qml/NetworkProxyPage.qml
-        qml/DevtoolsPage.qml
         qml/ConfirmEncryptionDialog.qml
-        qml/RemoveSheet.qml
-        qml/BanSheet.qml
-        qml/EmojiTonesPicker.qml
-        qml/EmojiDelegate.qml
-        qml/EmojiGrid.qml
-        qml/SearchPage.qml
-        qml/LocationDelegate.qml
+        qml/RoomSearchPage.qml
         qml/LocationChooser.qml
         qml/TimelineView.qml
         qml/InvitationView.qml
         qml/AvatarTabButton.qml
         qml/SpaceDrawer.qml
         qml/OsmLocationPlugin.qml
-        qml/LiveLocationDelegate.qml
         qml/FullScreenMap.qml
         qml/LocationsPage.qml
         qml/LocationMapItem.qml
@@ -286,23 +261,63 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/RoomInformation.qml
         qml/RoomMedia.qml
         qml/ChooseRoomDialog.qml
-        qml/ShareAction.qml
         qml/SpaceHomePage.qml
         qml/SpaceHierarchyDelegate.qml
         qml/RemoveChildDialog.qml
         qml/SelectParentDialog.qml
-        qml/Security.qml
         qml/QrCodeMaximizeComponent.qml
         qml/SelectSpacesDialog.qml
-        qml/AttachDialog.qml
         qml/NotificationsView.qml
-        qml/LoadingDelegate.qml
-        qml/TimelineEndDelegate.qml
-    RESOURCES
-        qml/confetti.png
-        qml/glowdot.png
+        qml/SearchPage.qml
+        qml/ServerComboBox.qml
+        qml/UserSearchPage.qml
+        qml/ManualUserDialog.qml
+        qml/RecommendedSpaceDialog.qml
+        qml/RoomTreeSection.qml
+        qml/DelegateContextMenu.qml
+        qml/ShareDialog.qml
+        qml/UnlockSSSSDialog.qml
+        qml/QrScannerPage.qml
+        qml/JoinRoomDialog.qml
+        qml/ConfirmUrlDialog.qml
+        qml/AccountSwitchDialog.qml
+        qml/ConfirmLeaveDialog.qml
+        qml/CodeMaximizeComponent.qml
+        qml/EditStateDialog.qml
+        qml/ConsentDialog.qml
+        qml/AskDirectChatConfirmation.qml
+        qml/HoverLinkIndicator.qml
+        qml/AvatarNotification.qml
+        qml/ReasonDialog.qml
+    DEPENDENCIES
+        QtCore
+        QtQuick
+    IMPORTS
+        org.kde.neochat.timeline
+        org.kde.neochat.settings
+        org.kde.neochat.devtools
+        org.kde.neochat.login
+        org.kde.neochat.chatbar
 )
 
+add_subdirectory(settings)
+add_subdirectory(timeline)
+add_subdirectory(devtools)
+add_subdirectory(login)
+add_subdirectory(chatbar)
+
+if(UNIX)
+    qt_target_qml_sources(neochat QML_FILES qml/ShareAction.qml)
+else()
+    set_source_files_properties(qml/ShareActionStub.qml PROPERTIES
+        QT_RESOURCE_ALIAS qml/ShareAction.qml
+    )
+    qt_target_qml_sources(neochat QML_FILES qml/ShareActionStub.qml)
+endif()
+
+
+configure_file(config-neochat.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-neochat.h)
+
 if(WIN32)
     set_target_properties(neochat PROPERTIES OUTPUT_NAME "neochatlib")
 endif()
@@ -316,6 +331,15 @@ ecm_qt_declare_logging_category(neochat
     EXPORT NEOCHAT
 )
 
+ecm_qt_declare_logging_category(neochat
+    HEADER "publicroomlist_logging.h"
+    IDENTIFIER "PublicRoomList"
+    CATEGORY_NAME "org.kde.neochat.publicroomlistmodel"
+    DESCRIPTION "Neochat: publicroomlistmodel"
+    DEFAULT_SEVERITY Info
+    EXPORT NEOCHAT
+)
+
 ecm_qt_declare_logging_category(neochat
     HEADER "eventhandler_logging.h"
     IDENTIFIER "EventHandling"
@@ -363,11 +387,18 @@ endif()
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
-    target_compile_definitions(neochat PUBLIC -DHAVE_X11)
+    target_compile_definitions(neochat PUBLIC -DHAVE_X11=1)
     target_sources(neochat PRIVATE runner.cpp)
+
+    if (TARGET KUnifiedPush)
+        target_sources(neochat PRIVATE fakerunner.cpp)
+    endif()
+else()
+    target_compile_definitions(neochat PUBLIC -DHAVE_X11=0)
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums)
+target_link_libraries(neochat PRIVATE settingsplugin timelineplugin devtoolsplugin loginplugin chatbarplugin)
 target_link_libraries(neochat PUBLIC
     Qt::Core
     Qt::Quick
@@ -391,7 +422,11 @@ target_link_libraries(neochat PUBLIC
     QCoro::Network
 )
 
-kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
+if (TARGET KF6::Crash)
+    target_link_libraries(neochat PUBLIC KF6::Crash)
+endif()
+
+kconfig_target_kcfg_file(neochat FILE neochatconfig.kcfg CLASS_NAME NeoChatConfig MUTATORS GENERATE_PROPERTIES DEFAULT_VALUE_GETTERS PARENT_IN_CONSTRUCTOR SINGLETON GENERATE_MOC QML_REGISTRATION)
 
 if(NEOCHAT_FLATPAK)
     target_compile_definitions(neochat PUBLIC NEOCHAT_FLATPAK)
@@ -493,7 +528,7 @@ if(ANDROID)
     )
     ecm_add_android_apk(neochat-app ANDROID_DIR ${CMAKE_SOURCE_DIR}/android)
 else()
-    target_link_libraries(neochat PUBLIC Qt::Widgets KF6::KIOWidgets)
+    target_link_libraries(neochat PUBLIC Qt::Widgets KF6::KIOWidgets KF6::SyntaxHighlighting)
     install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
 endif()
 
@@ -501,7 +536,7 @@ if(NOT ANDROID)
     set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
 endif()
 
-if(TARGET KF6::DBusAddons)
+if(TARGET KF6::DBusAddons AND NOT WIN32)
     target_link_libraries(neochat PUBLIC KF6::DBusAddons)
     target_compile_definitions(neochat PUBLIC -DHAVE_KDBUSADDONS)
 endif()

src/actionshandler.cpp

@@ -56,7 +56,7 @@ void ActionsHandler::handleMessageEvent(ChatBarCache *chatBarCache)
 
     QString handledText = chatBarCache->text();
     handledText = handleMentions(handledText, chatBarCache->mentions());
-    handleMessage(m_room->mainCache()->text(), handledText, chatBarCache);
+    handleMessage(chatBarCache->text(), handledText, chatBarCache);
 }
 
 QString ActionsHandler::handleMentions(QString handledText, QList<Mention> *mentions)
@@ -80,6 +80,7 @@ QString ActionsHandler::handleMentions(QString handledText, QList<Mention> *ment
 
 void ActionsHandler::handleMessage(const QString &text, QString handledText, ChatBarCache *chatBarCache)
 {
+    Q_ASSERT(m_room);
     if (NeoChatConfig::allowQuickEdit()) {
         QRegularExpression sed(QStringLiteral("^s/([^/]*)/([^/]*)(/g)?$"));
         auto match = sed.match(text);
@@ -90,7 +91,7 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, Cha
 
             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()) {
+                    if (event->senderId() == m_room->localMember().id() && event->hasTextContent()) {
                         QString originalString;
                         if (event->content()) {
                             originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content())->body;

src/actionshandler.h

@@ -58,7 +58,7 @@ public Q_SLOTS:
     void handleMessageEvent(ChatBarCache *chatBarCache);
 
 private:
-    NeoChatRoom *m_room = nullptr;
+    QPointer<NeoChatRoom> m_room;
     void checkEffects(const QString &text);
 
     QString handleMentions(QString handledText, QList<Mention> *mentions);

src/chatbar/AttachDialog.qml

@@ -13,13 +13,15 @@ import org.kde.neochat
 QQC2.Popup {
     id: root
 
-    padding: 16
+    padding: Kirigami.Units.largeSpacing
 
     signal chosen(string path)
 
     contentItem: RowLayout {
+
+        spacing: Kirigami.Units.smallSpacing
+
         QQC2.ToolButton {
-            Layout.preferredWidth: 160
             Layout.fillHeight: true
 
             icon.name: 'mail-attachment'
@@ -27,30 +29,26 @@ QQC2.Popup {
             text: i18n("Choose local file")
 
             onClicked: {
-                root.close()
-
-                var fileDialog = openFileDialog.createObject(QQC2.ApplicationWindow.overlay)
-                fileDialog.chosen.connect(path => root.chosen(path))
-                fileDialog.open()
+                root.close();
+                var fileDialog = openFileDialog.createObject(QQC2.Overlay.overlay);
+                fileDialog.chosen.connect(path => root.chosen(path));
+                fileDialog.open();
             }
         }
 
         Kirigami.Separator {}
 
         QQC2.ToolButton {
-            Layout.preferredWidth: 160
             Layout.fillHeight: true
 
-            padding: 16
-
             icon.name: 'insert-image'
             text: i18n("Clipboard image")
             onClicked: {
-                const path = StandardPaths.standardLocations(StandardPaths.CacheLocation)[0] + "/screenshots/" + (new Date()).getTime() + ".png"
+                const path = StandardPaths.standardLocations(StandardPaths.CacheLocation)[0] + "/screenshots/" + (new Date()).getTime() + ".png";
                 if (!Clipboard.saveImage(path)) {
                     return;
                 }
-                root.chosen(path)
+                root.chosen(path);
                 root.close();
             }
         }

src/chatbar/CMakeLists.txt

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+# SPDX-License-Identifier: BSD-2-Clause
+
+qt_add_library(chatbar STATIC)
+ecm_add_qml_module(chatbar GENERATE_PLUGIN_SOURCE
+    URI org.kde.neochat.chatbar
+    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/chatbar
+    QML_FILES
+        AttachDialog.qml
+        ChatBar.qml
+        CompletionMenu.qml
+        EmojiDelegate.qml
+        EmojiGrid.qml
+        ReplyPane.qml
+        PieProgressBar.qml
+        EmojiPicker.qml
+        EmojiDialog.qml
+        EmojiTonesPicker.qml
+)

src/chatbar/ChatBar.qml

@@ -9,7 +9,6 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.neochat
-import org.kde.neochat.config
 
 /**
  * @brief A component for typing and sending chat messages.
@@ -34,7 +33,25 @@ QQC2.Control {
 
     onActiveFocusChanged: textField.forceActiveFocus()
 
-    onCurrentRoomChanged: _private.chatBarCache = currentRoom.mainCache
+    onCurrentRoomChanged: {
+        _private.chatBarCache = currentRoom.mainCache
+        if (ShareHandler.text.length > 0 && ShareHandler.room === root.currentRoom.id) {
+            textField.text = ShareHandler.text;
+            ShareHandler.text = "";
+            ShareHandler.room = "";
+        }
+    }
+
+    Connections {
+        target: ShareHandler
+        function onRoomChanged(): void {
+            if (ShareHandler.text.length > 0 && ShareHandler.room === root.currentRoom.id) {
+                textField.text = ShareHandler.text;
+                ShareHandler.text = "";
+                ShareHandler.room = "";
+            }
+        }
+    }
 
     /**
      * @brief The ActionsHandler object to use.
@@ -57,15 +74,15 @@ QQC2.Control {
             property bool isBusy: root.currentRoom && root.currentRoom.hasFileUploading
 
             // Matrix does not allow sending attachments in replies
-            visible: _private.chatBarCache.replyId.length === 0  && _private.chatBarCache.attachmentPath.length === 0
+            visible: _private.chatBarCache.replyId.length === 0 && _private.chatBarCache.attachmentPath.length === 0
             icon.name: "mail-attachment"
             text: i18n("Attach an image or file")
             displayHint: Kirigami.DisplayHint.IconOnly
 
             onTriggered: {
-                let dialog = (Clipboard.hasImage ? attachDialog : openFileDialog).createObject(applicationWindow().overlay)
-                dialog.chosen.connect(path => _private.chatBarCache.attachmentPath = path)
-                dialog.open()
+                let dialog = (Clipboard.hasImage ? attachDialog : openFileDialog).createObject(applicationWindow().overlay);
+                dialog.chosen.connect(path => _private.chatBarCache.attachmentPath = path);
+                dialog.open();
             }
 
             tooltip: text
@@ -83,9 +100,9 @@ QQC2.Control {
 
             onTriggered: {
                 if (emojiDialog.visible) {
-                    emojiDialog.close()
+                    emojiDialog.close();
                 } else {
-                    emojiDialog.open()
+                    emojiDialog.open();
                 }
             }
             tooltip: text
@@ -98,7 +115,9 @@ QQC2.Control {
             displayHint: QQC2.AbstractButton.IconOnly
 
             onTriggered: {
-                locationChooser.createObject(QQC2.ApplicationWindow.overlay, {room: root.currentRoom}).open()
+                locationChooser.createObject(QQC2.Overlay.overlay, {
+                    room: root.currentRoom
+                }).open();
             }
             tooltip: text
         },
@@ -113,7 +132,7 @@ QQC2.Control {
             checkable: true
 
             onTriggered: {
-                _private.postMessage()
+                _private.postMessage();
             }
 
             tooltip: text
@@ -123,7 +142,7 @@ QQC2.Control {
     /**
      * @brief A message has been sent from the chat bar.
      */
-    signal messageSent()
+    signal messageSent
 
     spacing: 0
 
@@ -134,7 +153,7 @@ QQC2.Control {
         color: Kirigami.Theme.backgroundColor
         Kirigami.Separator {
             anchors.left: parent.left
-            anchors.right:parent.right
+            anchors.right: parent.right
             anchors.top: parent.top
         }
     }
@@ -146,7 +165,8 @@ QQC2.Control {
 
     contentItem: ColumnLayout {
         spacing: 0
-        Item { // Required to adjust for the top separator
+        Item {
+            // Required to adjust for the top separator
             Layout.preferredHeight: 1
             Layout.fillWidth: true
         }
@@ -199,18 +219,18 @@ QQC2.Control {
                     }
 
                     onTextChanged: {
-                        if (!repeatTimer.running && Config.typingNotifications) {
-                            var textExists = text.length > 0
-                            root.currentRoom.sendTypingNotification(textExists)
-                            textExists ? repeatTimer.start() : repeatTimer.stop()
+                        if (!repeatTimer.running && NeoChatConfig.typingNotifications) {
+                            var textExists = text.length > 0;
+                            root.currentRoom.sendTypingNotification(textExists);
+                            textExists ? repeatTimer.start() : repeatTimer.stop();
                         }
-                        _private.chatBarCache.text = text
+                        _private.chatBarCache.text = text;
                     }
                     onSelectedTextChanged: {
                         if (selectedText.length > 0) {
-                            quickFormatBar.selectionStart = selectionStart
-                            quickFormatBar.selectionEnd = selectionEnd
-                            quickFormatBar.open()
+                            quickFormatBar.selectionStart = selectionStart;
+                            quickFormatBar.selectionEnd = selectionEnd;
+                            quickFormatBar.open();
                         }
                     }
 
@@ -220,47 +240,49 @@ QQC2.Control {
                         x: textField.cursorRectangle.x
                         y: textField.cursorRectangle.y - height
 
-                        onFormattingSelected: root.formatText(format, selectionStart, selectionEnd)
+                        onFormattingSelected: _private.formatText(format, selectionStart, selectionEnd)
                     }
 
                     Keys.onDeletePressed: {
                         if (selectedText.length > 0) {
-                            remove(selectionStart, selectionEnd)
+                            remove(selectionStart, selectionEnd);
                         } else {
-                            remove(cursorPosition, cursorPosition + 1)
+                            remove(cursorPosition, cursorPosition + 1);
                         }
                         if (textField.text == selectedText || textField.text.length <= 1) {
-                            root.currentRoom.sendTypingNotification(false)
-                            repeatTimer.stop()
+                            root.currentRoom.sendTypingNotification(false);
+                            repeatTimer.stop();
                         }
                         if (quickFormatBar.visible) {
-                            quickFormatBar.close()
+                            quickFormatBar.close();
                         }
                     }
                     Keys.onEnterPressed: event => {
                         if (completionMenu.visible) {
-                            completionMenu.complete()
+                            completionMenu.complete();
                         } else if (event.modifiers & Qt.ShiftModifier || Kirigami.Settings.isMobile) {
-                            textField.insert(cursorPosition, "\n")
+                            textField.insert(cursorPosition, "\n");
                         } else {
                             _private.postMessage();
                         }
                     }
                     Keys.onReturnPressed: event => {
                         if (completionMenu.visible) {
-                            completionMenu.complete()
+                            completionMenu.complete();
                         } else if (event.modifiers & Qt.ShiftModifier || Kirigami.Settings.isMobile) {
-                            textField.insert(cursorPosition, "\n")
+                            textField.insert(cursorPosition, "\n");
                         } else {
                             _private.postMessage();
                         }
                     }
                     Keys.onTabPressed: {
                         if (completionMenu.visible) {
-                            completionMenu.complete()
+                            completionMenu.complete();
+                        } else {
+                            contextDrawer.handle.children[0].forceActiveFocus()
                         }
                     }
-                    Keys.onPressed: (event) => {
+                    Keys.onPressed: event => {
                         if (event.key === Qt.Key_V && event.modifiers & Qt.ControlModifier) {
                             event.accepted = _private.pasteImage();
                         } else if (event.key === Qt.Key_Up && event.modifiers & Qt.ControlModifier) {
@@ -268,26 +290,26 @@ QQC2.Control {
                         } else if (event.key === Qt.Key_Up && textField.text.length === 0) {
                             root.currentRoom.editLastMessage();
                         } else if (event.key === Qt.Key_Up && completionMenu.visible) {
-                            completionMenu.decrementIndex()
+                            completionMenu.decrementIndex();
                         } else if (event.key === Qt.Key_Down && completionMenu.visible) {
-                            completionMenu.incrementIndex()
+                            completionMenu.incrementIndex();
                         } else if (event.key === Qt.Key_Backspace) {
                             if (textField.text == selectedText || textField.text.length <= 1) {
-                                root.currentRoom.sendTypingNotification(false)
-                                repeatTimer.stop()
+                                root.currentRoom.sendTypingNotification(false);
+                                repeatTimer.stop();
                             }
                             if (quickFormatBar.visible && selectedText.length > 0) {
-                                quickFormatBar.close()
+                                quickFormatBar.close();
                             }
                         }
                     }
                     Keys.onShortcutOverride: event => {
                         if (completionMenu.visible) {
-                            completionMenu.close()
+                            completionMenu.close();
                         } else if ((_private.chatBarCache.isReplying || _private.chatBarCache.attachmentPath.length > 0) && event.key === Qt.Key_Escape) {
-                            _private.chatBarCache.attachmentPath = ""
-                            _private.chatBarCache.replyId = ""
-                            _private.chatBarCache.threadId = ""
+                            _private.chatBarCache.attachmentPath = "";
+                            _private.chatBarCache.replyId = "";
+                            _private.chatBarCache.threadId = "";
                             event.accepted = true;
                         }
                     }
@@ -331,8 +353,8 @@ QQC2.Control {
         startBreakpoint: Kirigami.Units.gridUnit * 46
         endBreakpoint: Kirigami.Units.gridUnit * 66
         startPercentWidth: 100
-        endPercentWidth: Config.compactLayout ? 100 : 85
-        maxWidth: Config.compactLayout ? -1 : Kirigami.Units.gridUnit * 60
+        endPercentWidth: NeoChatConfig.compactLayout ? 100 : 85
+        maxWidth: NeoChatConfig.compactLayout ? -1 : Kirigami.Units.gridUnit * 60
 
         parentWidth: root.width
     }
@@ -342,7 +364,7 @@ QQC2.Control {
         ReplyPane {
             userName: _private.chatBarCache.relationUser.displayName
             userColor: _private.chatBarCache.relationUser.color
-            userAvatar: _private.chatBarCache.relationUser.avatarSource
+            userAvatar: _private.chatBarCache.relationUser.avatarUrl
             text: _private.chatBarCache.relationMessage
 
             onCancel: {
@@ -358,7 +380,7 @@ QQC2.Control {
 
             onAttachmentCancelled: {
                 _private.chatBarCache.attachmentPath = "";
-                root.forceActiveFocus()
+                root.forceActiveFocus();
             }
         }
     }
@@ -370,11 +392,11 @@ QQC2.Control {
 
         function postMessage() {
             root.actionsHandler.handleMessageEvent(_private.chatBarCache);
-            repeatTimer.stop()
+            repeatTimer.stop();
             root.currentRoom.markAllMessagesAsRead();
             textField.clear();
-            _private.chatBarCache.replyId = "";
-            messageSent()
+            _private.chatBarCache.clearRelations();
+            messageSent();
         }
 
         function formatText(format, selectionStart, selectionEnd) {
@@ -386,21 +408,19 @@ QQC2.Control {
             */
             let innerText = textField.text.substr(selectionStart, selectionEnd - selectionStart);
             if (innerText.charAt(innerText.length - 1) === " ") {
-                let trimmedRightString = innerText.replace(/\s*$/,"");
+                let trimmedRightString = innerText.replace(/\s*$/, "");
                 let trimDifference = innerText.length - trimmedRightString.length;
                 selectionEnd -= trimDifference;
             }
             if (innerText.charAt(0) === " ") {
-                let trimmedLeftString = innerText.replace(/^\s*/,"");
+                let trimmedLeftString = innerText.replace(/^\s*/, "");
                 let trimDifference = innerText.length - trimmedLeftString.length;
                 selectionStart = selectionStart + trimDifference;
             }
-
             let startText = textField.text.substr(0, selectionStart);
             // Needs updating with the new selectionStart and selectionEnd with white space trimmed.
             innerText = textField.text.substr(selectionStart, selectionEnd - selectionStart);
             let endText = textField.text.substr(selectionEnd);
-
             textField.text = "";
             textField.text = startText + format.start + innerText + format.end + format.extra + endText;
 
@@ -495,13 +515,14 @@ QQC2.Control {
         currentRoom: root.currentRoom
 
         onChosen: emoji => insertText(emoji)
-        onClosed: if (emojiAction.checked) emojiAction.checked = false
+        onClosed: if (emojiAction.checked) {
+            emojiAction.checked = false;
+        }
     }
 
     function insertText(text) {
         let initialCursorPosition = textField.cursorPosition;
-
-        textField.text = textField.text.substr(0, initialCursorPosition) + text + textField.text.substr(initialCursorPosition)
-        textField.cursorPosition = initialCursorPosition + text.length
+        textField.text = textField.text.substr(0, initialCursorPosition) + text + textField.text.substr(initialCursorPosition);
+        textField.cursorPosition = initialCursorPosition + text.length;
     }
 }

src/chatbar/CompletionMenu.qml

@@ -21,27 +21,24 @@ QQC2.Popup {
 
     visible: completions.count > 0
 
-    onVisibleChanged: if (visible) root.open()
-
-    RoomListModel {
-        id: roomListModel
-        connection: root.connection
+    onVisibleChanged: if (visible) {
+        root.open();
     }
 
     Component.onCompleted: {
-        chatDocumentHandler.completionModel.roomListModel = roomListModel;
+        chatDocumentHandler.completionModel.roomListModel = RoomManager.roomListModel;
     }
 
     function incrementIndex() {
-        completions.incrementCurrentIndex()
+        completions.incrementCurrentIndex();
     }
 
     function decrementIndex() {
-        completions.decrementCurrentIndex()
+        completions.decrementCurrentIndex();
     }
 
     function complete() {
-        root.chatDocumentHandler.complete(completions.currentIndex)
+        root.chatDocumentHandler.complete(completions.currentIndex);
     }
 
     leftPadding: 0

src/chatbar/EmojiDelegate.qml

@@ -24,7 +24,7 @@ QQC2.ItemDelegate {
     contentItem: Item {
         Kirigami.Heading {
             anchors.fill: parent
-            visible: !root.emoji.startsWith("image") && !root.isImage
+            visible: !root.emoji.startsWith("mxc") && !root.isImage
             text: root.emoji
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
@@ -41,17 +41,17 @@ QQC2.ItemDelegate {
         }
         Image {
             anchors.fill: parent
-            visible: root.emoji.startsWith("image") || root.isImage
+            visible: root.emoji.startsWith("mxc") || root.isImage
             source: visible ? root.emoji : ""
         }
     }
 
     background: Rectangle {
         color: root.checked ? Kirigami.Theme.highlightColor : Kirigami.Theme.backgroundColor
-        radius: Kirigami.Units.smallSpacing
+        radius: Kirigami.Units.cornerRadius
 
         Rectangle {
-            radius: Kirigami.Units.smallSpacing
+            radius: Kirigami.Units.cornerRadius
             anchors.fill: parent
             color: Kirigami.Theme.highlightColor
             opacity: root.hovered && !root.pressed ? 0.2 : 0

src/chatbar/EmojiDialog.qml

@@ -25,31 +25,35 @@ QQC2.Popup {
     Connections {
         target: RoomManager
         function onCurrentRoomChanged() {
-            root.close()
+            root.close();
         }
     }
 
     onVisibleChanged: {
         if (!visible) {
-            emojiPicker.clearSearchField()
-            return
+            emojiPicker.clearSearchField();
+            return;
         }
-        emojiPicker.forceActiveFocus()
+        emojiPicker.forceActiveFocus();
     }
 
     background: Kirigami.ShadowedRectangle {
-        Kirigami.Theme.colorSet: Kirigami.Theme.View
+        radius: Kirigami.Units.cornerRadius
         color: Kirigami.Theme.backgroundColor
-        radius: Kirigami.Units.mediumSpacing
-        shadow {
-            size: Kirigami.Units.largeSpacing
-            color: Qt.rgba(0.0, 0.0, 0.0, 0.3)
-            yOffset: 2
-        }
+
         border {
-            color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-            width: 2
+            width: 1
+            color: Kirigami.ColorUtils.linearInterpolation(Kirigami.Theme.backgroundColor, Kirigami.Theme.textColor, Kirigami.Theme.frameContrast)
         }
+
+        shadow {
+            size: Kirigami.Units.gridUnit
+            yOffset: 0
+            color: Qt.rgba(0, 0, 0, 0.2)
+        }
+
+        Kirigami.Theme.inherit: false
+        Kirigami.Theme.colorSet: Kirigami.Theme.View
     }
 
     modal: true
@@ -60,7 +64,7 @@ QQC2.Popup {
     padding: 2
 
     implicitHeight: Kirigami.Units.gridUnit * 20 + 2 * padding
-    width: Math.min(contentItem.categoryIconSize * 11 + 2 * padding, QQC2.Overlay.overlay.width)
+    width: Math.min(contentItem.categoryIconSize * 11 + 2 * padding, applicationWindow().width)
     contentItem: EmojiPicker {
         id: emojiPicker
         height: 400
@@ -68,8 +72,10 @@ QQC2.Popup {
         includeCustom: root.includeCustom
         showQuickReaction: root.showQuickReaction
         onChosen: emoji => {
-            root.chosen(emoji)
-            if (root.closeOnChosen) root.close()
+            root.chosen(emoji);
+            if (root.closeOnChosen) {
+                root.close();
+            }
         }
     }
 }

src/chatbar/EmojiGrid.qml

@@ -22,7 +22,7 @@ QQC2.ScrollView {
     signal stickerChosen(int index)
 
     onActiveFocusChanged: if (activeFocus) {
-        emojis.forceActiveFocus()
+        emojis.forceActiveFocus();
     }
 
     GridView {
@@ -34,9 +34,9 @@ QQC2.ScrollView {
         currentIndex: -1
         keyNavigationEnabled: true
         onActiveFocusChanged: if (activeFocus && currentIndex === -1) {
-            currentIndex = 0
+            currentIndex = 0;
         } else {
-            currentIndex = -1
+            currentIndex = -1;
         }
         onModelChanged: currentIndex = -1
 
@@ -61,19 +61,23 @@ QQC2.ScrollView {
             Keys.onReturnPressed: clicked()
             onClicked: {
                 if (root.stickers) {
-                    root.stickerChosen(model.index)
+                    root.stickerChosen(model.index);
                 }
-                root.chosen(modelData.isCustom ? modelData.shortName : modelData.unicode)
-                EmojiModel.emojiUsed(modelData)
+                root.chosen(modelData.isCustom ? modelData.shortName : modelData.unicode);
+                EmojiModel.emojiUsed(modelData);
             }
             Keys.onSpacePressed: pressAndHold()
             onPressAndHold: {
                 if (EmojiModel.tones(modelData.shortName).length === 0) {
                     return;
                 }
-                let tones = tonesPopupComponent.createObject(emojiDelegate, {shortName: modelData.shortName, unicode: modelData.unicode, categoryIconSize: root.targetIconSize})
-                tones.open()
-                tones.forceActiveFocus()
+                let tones = tonesPopupComponent.createObject(emojiDelegate, {
+                    shortName: modelData.shortName,
+                    unicode: modelData.unicode,
+                    categoryIconSize: root.targetIconSize
+                });
+                tones.open();
+                tones.forceActiveFocus();
             }
             showTones: !!modelData && EmojiModel.tones(modelData.shortName).length > 0
         }

src/chatbar/EmojiPicker.qml

@@ -20,9 +20,9 @@ ColumnLayout {
 
     readonly property var currentEmojiModel: {
         if (includeCustom) {
-            EmojiModel.categoriesWithCustom
+            EmojiModel.categoriesWithCustom;
         } else {
-            EmojiModel.categories
+            EmojiModel.categories;
         }
     }
 
@@ -73,8 +73,12 @@ ColumnLayout {
             focus: true
             orientation: ListView.Horizontal
 
-            Keys.onReturnPressed: if (emojiGrid.count > 0) emojiGrid.focus = true
-            Keys.onEnterPressed: if (emojiGrid.count > 0) emojiGrid.focus = true
+            Keys.onReturnPressed: if (emojiGrid.count > 0) {
+                emojiGrid.focus = true;
+            }
+            Keys.onEnterPressed: if (emojiGrid.count > 0) {
+                emojiGrid.focus = true;
+            }
 
             KeyNavigation.down: emojiGrid.count > 0 ? emojiGrid : categories
             KeyNavigation.tab: emojiGrid.count > 0 ? emojiGrid : categories
@@ -208,6 +212,6 @@ ColumnLayout {
     }
 
     function clearSearchField() {
-        searchField.text = ""
+        searchField.text = "";
     }
 }

src/chatbar/EmojiTonesPicker.qml

@@ -30,7 +30,7 @@ QQC2.Popup {
     onOpened: x = Math.min(parent.mapFromGlobal(QQC2.Overlay.overlay.width - root.width, 0).x, -(width - parent.width) / 2)
     background: Kirigami.ShadowedRectangle {
         color: Kirigami.Theme.backgroundColor
-        radius: Kirigami.Units.mediumSpacing
+        radius: Kirigami.Units.cornerRadius
         shadow {
             size: Kirigami.Units.largeSpacing
             color: Qt.rgba(0.0, 0.0, 0.0, 0.3)
@@ -63,9 +63,9 @@ QQC2.Popup {
             Keys.onEnterPressed: clicked()
             Keys.onReturnPressed: clicked()
             onClicked: {
-                root.chosen(modelData.unicode)
-                EmojiModel.emojiUsed(modelData)
-                root.close()
+                root.chosen(modelData.unicode);
+                EmojiModel.emojiUsed(modelData);
+                root.close();
             }
         }
     }

src/chatbar/ReplyPane.qml

@@ -89,7 +89,7 @@ RowLayout {
         text: i18nc("@action:button", "Cancel reply")
         icon.name: "dialog-close"
         onClicked: {
-            root.cancel()
+            root.cancel();
         }
         QQC2.ToolTip.text: text
         QQC2.ToolTip.visible: hovered

src/chatbarcache.cpp

@@ -3,6 +3,9 @@
 
 #include "chatbarcache.h"
 
+#include <Quotient/roommember.h>
+
+#include "chatdocumenthandler.h"
 #include "eventhandler.h"
 #include "neochatroom.h"
 
@@ -43,14 +46,14 @@ void ChatBarCache::setReplyId(const QString &replyId)
     if (m_relationType == Reply && m_relationId == replyId) {
         return;
     }
-    m_relationId = replyId;
+    const auto oldEventId = std::exchange(m_relationId, replyId);
     if (m_relationId.isEmpty()) {
         m_relationType = None;
     } else {
         m_relationType = Reply;
     }
     m_attachmentPath = QString();
-    Q_EMIT relationIdChanged();
+    Q_EMIT relationIdChanged(oldEventId, m_relationId);
     Q_EMIT attachmentPathChanged();
 }
 
@@ -72,18 +75,18 @@ void ChatBarCache::setEditId(const QString &editId)
     if (m_relationType == Edit && m_relationId == editId) {
         return;
     }
-    m_relationId = editId;
+    const auto oldEventId = std::exchange(m_relationId, editId);
     if (m_relationId.isEmpty()) {
         m_relationType = None;
     } else {
         m_relationType = Edit;
     }
     m_attachmentPath = QString();
-    Q_EMIT relationIdChanged();
+    Q_EMIT relationIdChanged(oldEventId, m_relationId);
     Q_EMIT attachmentPathChanged();
 }
 
-QVariantMap ChatBarCache::relationUser() const
+Quotient::RoomMember ChatBarCache::relationUser() const
 {
     if (parent() == nullptr) {
         qWarning() << "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.";
@@ -95,9 +98,9 @@ QVariantMap ChatBarCache::relationUser() const
         return {};
     }
     if (m_relationId.isEmpty()) {
-        return room->getUser(nullptr);
+        return room->member(QString());
     }
-    return room->getUser(room->user((*room->findInTimeline(m_relationId))->senderId()));
+    return room->member((*room->findInTimeline(m_relationId))->senderId());
 }
 
 QString ChatBarCache::relationMessage() const
@@ -114,11 +117,9 @@ QString ChatBarCache::relationMessage() const
         qWarning() << "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.";
         return {};
     }
-    EventHandler eventhandler;
-    eventhandler.setRoom(room);
+
     if (auto event = room->findInTimeline(m_relationId); event != room->historyEdge()) {
-        eventhandler.setEvent(&**event);
-        return eventhandler.getPlainBody();
+        return EventHandler::markdownBody(&**event);
     }
     return {};
 }
@@ -138,8 +139,8 @@ void ChatBarCache::setThreadId(const QString &threadId)
     if (m_threadId == threadId) {
         return;
     }
-    m_threadId = threadId;
-    Q_EMIT threadIdChanged();
+    const auto oldThreadId = std::exchange(m_threadId, threadId);
+    Q_EMIT threadIdChanged(oldThreadId, m_threadId);
 }
 
 QString ChatBarCache::attachmentPath() const
@@ -154,9 +155,19 @@ void ChatBarCache::setAttachmentPath(const QString &attachmentPath)
     }
     m_attachmentPath = attachmentPath;
     m_relationType = None;
-    m_relationId = QString();
+    const auto oldEventId = std::exchange(m_relationId, QString());
+    Q_EMIT attachmentPathChanged();
+    Q_EMIT relationIdChanged(oldEventId, m_relationId);
+}
+
+void ChatBarCache::clearRelations()
+{
+    const auto oldEventId = std::exchange(m_relationId, QString());
+    const auto oldThreadId = std::exchange(m_threadId, QString());
+    m_attachmentPath = QString();
+    Q_EMIT relationIdChanged(oldEventId, m_relationId);
+    Q_EMIT threadIdChanged(oldThreadId, m_threadId);
     Q_EMIT attachmentPathChanged();
-    Q_EMIT relationIdChanged();
 }
 
 QList<Mention> *ChatBarCache::mentions()
@@ -164,6 +175,54 @@ QList<Mention> *ChatBarCache::mentions()
     return &m_mentions;
 }
 
+void ChatBarCache::updateMentions(QQuickTextDocument *document, ChatDocumentHandler *documentHandler)
+{
+    documentHandler->setDocument(document);
+
+    if (parent() == nullptr) {
+        qWarning() << "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.";
+        return;
+    }
+    if (m_relationId.isEmpty()) {
+        return;
+    }
+    auto room = dynamic_cast<NeoChatRoom *>(parent());
+    if (room == nullptr) {
+        qWarning() << "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.";
+        return;
+    }
+
+    if (auto event = room->findInTimeline(m_relationId); event != room->historyEdge()) {
+        if (const auto &roomMessageEvent = &*event->viewAs<Quotient::RoomMessageEvent>()) {
+            // Replaces the mentions that are baked into the HTML but plaintext in the original markdown
+            const QRegularExpression re(QStringLiteral(R"lit(<a\shref="https:\/\/matrix.to\/#\/([\S]*)"\s?>([\S]*)<\/a>)lit"));
+
+            m_mentions.clear();
+
+            int linkSize = 0;
+            auto matches = re.globalMatch(EventHandler::rawMessageBody(*roomMessageEvent));
+            while (matches.hasNext()) {
+                const QRegularExpressionMatch match = matches.next();
+                if (match.hasMatch()) {
+                    const QString id = match.captured(1);
+                    const QString name = match.captured(2);
+
+                    const int position = match.capturedStart(0) - linkSize;
+                    const int end = position + name.length();
+                    linkSize += match.capturedLength(0) - name.length();
+
+                    QTextCursor cursor(documentHandler->document()->textDocument());
+                    cursor.setPosition(position);
+                    cursor.setPosition(end, QTextCursor::KeepAnchor);
+                    cursor.setKeepPositionOnInsert(true);
+
+                    m_mentions.push_back(Mention{.cursor = cursor, .text = name, .start = position, .position = end, .id = id});
+                }
+            }
+        }
+    }
+}
+
 QString ChatBarCache::savedText() const
 {
     return m_savedText;

src/chatbarcache.h

@@ -5,8 +5,17 @@
 
 #include <QObject>
 #include <QQmlEngine>
+#include <QQuickTextDocument>
 #include <QTextCursor>
 
+class ChatDocumentHandler;
+
+namespace Quotient
+{
+class RoomMember;
+}
+
+
 /**
  * @brief Defines a user mention in the current chat or edit text.
  */
@@ -24,7 +33,7 @@ struct Mention {
  * A class to cache data from a chat bar.
  *
  * A chat bar can be anything that allows users to compose or edit message, it doesn't
- * necessarily have to use the ChatBar component, e.g. MessageEditComponent.
+ * necessarily have to use the ChatBar component, e.g. ChatBarComponent.
  *
  * This object is intended to allow the current contents of a chat bar to be cached
  * between different rooms, i.e. there is an expectation that each NeoChatRoom could
@@ -34,7 +43,7 @@ struct Mention {
  *       as it's parent. This is necessary for certain functions which need to get
  *       relevant room information.
  *
- * @sa ChatBar, MessageEditComponent, NeoChatRoom
+ * @sa ChatBar, ChatBarComponent, NeoChatRoom
  */
 class ChatBarCache : public QObject
 {
@@ -85,26 +94,13 @@ class ChatBarCache : public QObject
     Q_PROPERTY(QString editId READ editId WRITE setEditId NOTIFY relationIdChanged)
 
     /**
-     * @brief Get the user for the message being replied to.
+     * @brief Get the RoomMember object for the message being replied to.
      *
-     * This is different to getting a Quotient::User object
-     * as neither of those can provide details like the displayName or avatarMediaId
-     * without the room context as these can vary from room to room.
+     * Returns an empty RoomMember if not replying to a message.
      *
-     * Returns an empty user if not replying to a message.
-     *
-     * The user QVariantMap has the following properties:
-     *  - isLocalUser - Whether the user is the local user.
-     *  - id - The matrix ID of the user.
-     *  - displayName - Display name in the context of this room.
-     *  - avatarSource - The mxc URL for the user's avatar in the current room.
-     *  - avatarMediaId - Avatar id in the context of this room.
-     *  - color - Color for the user.
-     *  - object - The Quotient::User object for the user.
-     *
-     * @sa getUser, Quotient::User
+     * @sa Quotient::RoomMember
      */
-    Q_PROPERTY(QVariantMap relationUser READ relationUser NOTIFY relationIdChanged)
+    Q_PROPERTY(Quotient::RoomMember relationUser READ relationUser NOTIFY relationIdChanged)
 
     /**
      * @brief The content of the related message.
@@ -158,7 +154,7 @@ public:
     QString editId() const;
     void setEditId(const QString &editId);
 
-    QVariantMap relationUser() const;
+    Quotient::RoomMember relationUser() const;
 
     QString relationMessage() const;
 
@@ -169,11 +165,23 @@ public:
     QString attachmentPath() const;
     void setAttachmentPath(const QString &attachmentPath);
 
+    /**
+     * @brief Clear all relations in the cache.
+     *
+     * This includes relation ID, thread root ID and attachment path.
+     */
+    Q_INVOKABLE void clearRelations();
+
     /**
      * @brief Retrieve the mentions for the current chat bar text.
      */
     QList<Mention> *mentions();
 
+    /**
+     * @brief Update the mentions in @p document when editing a message.
+     */
+    Q_INVOKABLE void updateMentions(QQuickTextDocument *document, ChatDocumentHandler *documentHandler);
+
     /**
      * @brief Get the saved chat bar text.
      */
@@ -186,8 +194,8 @@ public:
 
 Q_SIGNALS:
     void textChanged();
-    void relationIdChanged();
-    void threadIdChanged();
+    void relationIdChanged(const QString &oldEventId, const QString &newEventId);
+    void threadIdChanged(const QString &oldThreadId, const QString &newThreadId);
     void attachmentPathChanged();
 
 private:

src/chatdocumenthandler.h

@@ -91,7 +91,7 @@ class ChatDocumentHandler : public QObject
     Q_PROPERTY(CompletionModel *completionModel READ completionModel CONSTANT)
 
     /**
-     * @brief The current room that the the text document is being handled for.
+     * @brief The current room that the text document is being handled for.
      */
     Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
 

src/colorschemer.cpp

@@ -26,23 +26,9 @@ void ColorSchemer::apply(int idx)
     c->activateScheme(c->model()->index(idx, 0));
 }
 
-void ColorSchemer::apply(const QString &name)
+int ColorSchemer::indexForCurrentScheme()
 {
-    c->activateScheme(c->indexForScheme(name));
-}
-
-int ColorSchemer::indexForScheme(const QString &name) const
-{
-    auto index = c->indexForScheme(name).row();
-    if (index == -1) {
-        index = 0;
-    }
-    return index;
-}
-
-QString ColorSchemer::nameForIndex(int index) const
-{
-    return c->model()->data(c->model()->index(index, 0), Qt::DisplayRole).toString();
+    return c->indexForSchemeId(c->activeSchemeId()).row();
 }
 
 #include "moc_colorschemer.cpp"

src/colorschemer.h

@@ -44,21 +44,11 @@ public:
     Q_INVOKABLE void apply(int idx);
 
     /**
-     * @brief Activates the KColorScheme with the given name.
+     * @brief Get the row for the current color scheme.
      *
      * @sa KColorScheme
      */
-    Q_INVOKABLE void apply(const QString &name);
-
-    /**
-     * @brief Returns the index for the scheme with the given name.
-     */
-    Q_INVOKABLE int indexForScheme(const QString &name) const;
-
-    /**
-     * @brief Returns the name for the scheme with the given index.
-     */
-    Q_INVOKABLE QString nameForIndex(int index) const;
+    Q_INVOKABLE int indexForCurrentScheme();
 
 private:
     KColorSchemeManager *c;

src/config-neochat.h.in

@@ -0,0 +1,8 @@
+/*
+   SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+   SPDX-License-Identifier: LGPL-2.0-or-later
+*/
+
+#pragma once
+
+#define CMAKE_INSTALL_FULL_LIBEXECDIR_KF6 "${KDE_INSTALL_FULL_LIBEXECDIR_KF}"

src/controller.cpp

@@ -9,27 +9,18 @@
 #include <KLocalizedString>
 
 #include <QGuiApplication>
-#include <QNetworkProxy>
-#include <QQuickTextDocument>
-#include <QQuickWindow>
-#include <QStandardPaths>
-#include <QStringBuilder>
 #include <QTimer>
 
 #include <signal.h>
 
-#include <Quotient/accountregistry.h>
-#include <Quotient/connection.h>
-#include <Quotient/csapi/logout.h>
 #include <Quotient/csapi/notifications.h>
-#include <Quotient/eventstats.h>
-#include <Quotient/jobs/downloadfilejob.h>
 #include <Quotient/qt_connection_util.h>
+#include <Quotient/settings.h>
 
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "notificationsmanager.h"
-#include "roommanager.h"
+#include "proxycontroller.h"
 
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
 #include "trayicon.h"
@@ -37,6 +28,18 @@
 #include "trayicon_sni.h"
 #endif
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
+#ifndef Q_OS_ANDROID
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusMessage>
+#endif
+#endif
+
+#ifdef HAVE_KUNIFIEDPUSH
+#include <kunifiedpush/connector.h>
+#endif
+
 bool testMode = false;
 
 using namespace Quotient;
@@ -46,7 +49,7 @@ Controller::Controller(QObject *parent)
 {
     Connection::setRoomType<NeoChatRoom>();
 
-    setApplicationProxy();
+    ProxyController::instance().setApplicationProxy();
 
 #ifndef Q_OS_ANDROID
     setQuitOnLastWindowClosed();
@@ -59,7 +62,11 @@ Controller::Controller(QObject *parent)
         });
     } else {
         auto c = new NeoChatConnection(this);
+#if Quotient_VERSION_MINOR > 8
+        c->assumeIdentity(QStringLiteral("@user:localhost:1234"), QStringLiteral("device_1234"), QStringLiteral("token_1234"));
+#else
         c->assumeIdentity(QStringLiteral("@user:localhost:1234"), QStringLiteral("token_1234"));
+#endif
         connect(c, &Connection::connected, this, [c, this]() {
             m_accountRegistry.add(c);
             c->syncLoop();
@@ -98,12 +105,16 @@ Controller::Controller(QObject *parent)
     connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, [this]() {
         if (m_accountRegistry.size() > oldAccountCount) {
             auto connection = dynamic_cast<NeoChatConnection *>(m_accountRegistry.accounts()[m_accountRegistry.size() - 1]);
-            connect(connection, &NeoChatConnection::syncDone, this, [connection]() {
-                NotificationsManager::instance().handleNotifications(connection);
-            });
-            connectSingleShot(connection, &NeoChatConnection::syncDone, this, [this, connection] {
-                connection->setupPushNotifications(m_endpoint);
-            });
+            connect(
+                connection,
+                &NeoChatConnection::syncDone,
+                this,
+                [this, connection] {
+                    if (!m_endpoint.isEmpty()) {
+                        connection->setupPushNotifications(m_endpoint);
+                    }
+                },
+                Qt::SingleShotConnection);
         }
         oldAccountCount = m_accountRegistry.size();
     });
@@ -118,7 +129,9 @@ Controller::Controller(QObject *parent)
         }
     });
 
-    connector->registerClient(i18n("Receiving push notifications"));
+    connector->registerClient(
+        i18nc("The reason for using push notifications, as in: '[Push notifications are used for] Receiving notifications for new messages'",
+              "Receiving notifications for new messages"));
 
     m_endpoint = connector->endpoint();
 #endif
@@ -143,8 +156,18 @@ void Controller::addConnection(NeoChatConnection *c)
         c->saveState();
     });
     connect(c, &NeoChatConnection::loggedOut, this, [this, c] {
+        if (accounts().count() > 1) {
+            // Only set the connection if the account being logged out is currently active
+            if (c == activeConnection()) {
+                setActiveConnection(dynamic_cast<NeoChatConnection *>(accounts().accounts()[0]));
+            }
+        } else {
+            setActiveConnection(nullptr);
+        }
+
         dropConnection(c);
     });
+    connect(c, &NeoChatConnection::badgeNotificationCountChanged, this, &Controller::updateBadgeNotificationCount);
 
     c->sync();
 
@@ -167,7 +190,7 @@ void Controller::invokeLogin()
         m_accountsLoading += accountId;
         Q_EMIT accountsLoadingChanged();
         if (!account.homeserver().isEmpty()) {
-            auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account);
+            auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account.userId());
             connect(accessTokenLoadingJob, &QKeychain::Job::finished, this, [accountId, this, accessTokenLoadingJob](QKeychain::Job *) {
                 AccountSettings account{accountId};
                 QString accessToken;
@@ -178,26 +201,46 @@ void Controller::invokeLogin()
                 }
 
                 auto connection = new NeoChatConnection(account.homeserver());
-                connect(connection, &NeoChatConnection::connected, this, [this, connection] {
+                m_connectionsLoading[accountId] = connection;
+                connect(connection, &NeoChatConnection::connected, this, [this, connection, accountId] {
                     connection->loadState();
-                    addConnection(connection);
-                    m_accountsLoading.removeAll(connection->userId());
-                    Q_EMIT accountsLoadingChanged();
+                    if (connection->allRooms().size() == 0 || connection->allRooms()[0]->currentState().get<RoomCreateEvent>()) {
+                        addConnection(connection);
+                        m_accountsLoading.removeAll(connection->userId());
+                        m_connectionsLoading.remove(accountId);
+                        Q_EMIT accountsLoadingChanged();
+                    } else {
+                        connect(
+                            connection->allRooms()[0],
+                            &Room::baseStateLoaded,
+                            this,
+                            [this, connection, accountId]() {
+                                addConnection(connection);
+                                m_accountsLoading.removeAll(connection->userId());
+                                m_connectionsLoading.remove(accountId);
+                                Q_EMIT accountsLoadingChanged();
+                            },
+                            Qt::SingleShotConnection);
+                    }
                 });
                 connect(connection, &NeoChatConnection::networkError, this, [this](const QString &error, const QString &, int, int) {
                     Q_EMIT errorOccured(i18n("Network Error: %1", error), {});
                 });
+#if Quotient_VERSION_MINOR > 8
+                connection->assumeIdentity(account.userId(), account.deviceId(), accessToken);
+#else
                 connection->assumeIdentity(account.userId(), accessToken);
+#endif
             });
         }
     }
 }
 
-QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const AccountSettings &account)
+QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const QString &userId)
 {
-    qDebug() << "Reading access token from the keychain for" << account.userId();
+    qDebug() << "Reading access token from the keychain for" << userId;
     auto job = new QKeychain::ReadPasswordJob(qAppName(), this);
-    job->setKey(account.userId());
+    job->setKey(userId);
 
     // Handling of errors
     connect(job, &QKeychain::Job::finished, this, [this, job]() {
@@ -228,23 +271,19 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const Accoun
     return job;
 }
 
-bool Controller::saveAccessTokenToKeyChain(const AccountSettings &account, const QByteArray &accessToken)
+void Controller::saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken)
 {
-    qDebug() << "Save the access token to the keychain for " << account.userId();
-    QKeychain::WritePasswordJob job(qAppName());
-    job.setAutoDelete(false);
-    job.setKey(account.userId());
-    job.setBinaryData(accessToken);
-    QEventLoop loop;
-    QKeychain::WritePasswordJob::connect(&job, &QKeychain::Job::finished, &loop, &QEventLoop::quit);
-    job.start();
-    loop.exec();
-
-    if (job.error()) {
-        qWarning() << "Could not save access token to the keychain: " << qPrintable(job.errorString());
-        return false;
-    }
-    return true;
+    qDebug() << "Save the access token to the keychain for " << userId;
+    auto job = new QKeychain::WritePasswordJob(qAppName());
+    job->setAutoDelete(true);
+    job->setKey(userId);
+    job->setBinaryData(accessToken);
+    connect(job, &QKeychain::WritePasswordJob::finished, this, [job]() {
+        if (job->error()) {
+            qWarning() << "Could not save access token to the keychain: " << qPrintable(job->errorString());
+        }
+    });
+    job->start();
 }
 
 bool Controller::supportSystemTray() const
@@ -285,26 +324,15 @@ void Controller::setActiveConnection(NeoChatConnection *connection)
     if (connection == m_connection) {
         return;
     }
-    if (m_connection != nullptr) {
-        disconnect(m_connection, &NeoChatConnection::syncError, this, nullptr);
-        disconnect(m_connection, &NeoChatConnection::accountDataChanged, this, nullptr);
-    }
-    m_connection = connection;
-    if (connection != nullptr) {
-        connect(connection, &NeoChatConnection::requestFailed, this, [](BaseJob *job) {
-            if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"_ls].toString() == "M_TOO_LARGE"_ls) {
-                RoomManager::instance().warning(i18n("File too large to download."), i18n("Contact your matrix server administrator for support."));
-            }
-        });
-    }
-    NeoChatConfig::self()->save();
-    Q_EMIT activeConnectionChanged();
-}
 
-void Controller::forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item)
-{
-    // HACK: Workaround bug QTBUG 93281
-    connect(textDocument->textDocument(), SIGNAL(imagesLoaded()), item, SLOT(updateWholeDocument()));
+    m_connection = connection;
+
+    if (m_connection != nullptr) {
+        m_connection->refreshBadgeNotificationCount();
+        updateBadgeNotificationCount(m_connection, m_connection->badgeNotificationCount());
+    }
+
+    Q_EMIT activeConnectionChanged(m_connection);
 }
 
 void Controller::listenForNotifications()
@@ -328,34 +356,34 @@ void Controller::listenForNotifications()
 #endif
 }
 
-void Controller::setApplicationProxy()
+void Controller::updateBadgeNotificationCount(NeoChatConnection *connection, int count)
 {
-    NeoChatConfig *cfg = NeoChatConfig::self();
-    QNetworkProxy proxy;
+    if (connection == m_connection) {
+#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
+#ifndef Q_OS_ANDROID
+        // copied from Telegram desktop
+        const auto launcherUrl = "application://org.kde.neochat.desktop"_ls;
+        // Gnome requires that count is a 64bit integer
+        const qint64 counterSlice = std::min(count, 9999);
+        QVariantMap dbusUnityProperties;
 
-    // type match to ProxyType from neochatconfig.kcfg
-    switch (cfg->proxyType()) {
-    case 1: // HTTP
-        proxy.setType(QNetworkProxy::HttpProxy);
-        proxy.setHostName(cfg->proxyHost());
-        proxy.setPort(cfg->proxyPort());
-        proxy.setUser(cfg->proxyUser());
-        proxy.setPassword(cfg->proxyPassword());
-        break;
-    case 2: // SOCKS 5
-        proxy.setType(QNetworkProxy::Socks5Proxy);
-        proxy.setHostName(cfg->proxyHost());
-        proxy.setPort(cfg->proxyPort());
-        proxy.setUser(cfg->proxyUser());
-        proxy.setPassword(cfg->proxyPassword());
-        break;
-    case 0: // System Default
-    default:
-        // do nothing
-        break;
+        if (counterSlice > 0) {
+            dbusUnityProperties["count"_ls] = counterSlice;
+            dbusUnityProperties["count-visible"_ls] = true;
+        } else {
+            dbusUnityProperties["count-visible"_ls] = false;
+        }
+
+        auto signal = QDBusMessage::createSignal("/com/canonical/unity/launcherentry/neochat"_ls, "com.canonical.Unity.LauncherEntry"_ls, "Update"_ls);
+
+        signal.setArguments({launcherUrl, dbusUnityProperties});
+
+        QDBusConnection::sessionBus().send(signal);
+#endif // Q_OS_ANDROID
+#else
+        qGuiApp->setBadgeNumber(count);
+#endif // QT_VERSION_CHECK(6, 6, 0)
     }
-
-    QNetworkProxy::setApplicationProxy(proxy);
 }
 
 bool Controller::isFlatpak() const
@@ -372,9 +400,53 @@ AccountRegistry &Controller::accounts()
     return m_accountRegistry;
 }
 
-#include "moc_controller.cpp"
+QString Controller::loadFileContent(const QString &path) const
+{
+    QUrl url(path);
+    QFile file(url.isLocalFile() ? url.toLocalFile() : url.toString());
+    file.open(QFile::ReadOnly);
+    return QString::fromLatin1(file.readAll());
+}
 
 void Controller::setTestMode(bool test)
 {
     testMode = test;
 }
+
+void Controller::removeConnection(const QString &userId)
+{
+    if (m_connectionsLoading.contains(userId) && m_connectionsLoading[userId]) {
+        auto connection = m_connectionsLoading[userId];
+        m_accountsLoading.removeAll(userId);
+        Q_EMIT accountsLoadingChanged();
+        SettingsGroup("Accounts"_ls).remove(userId);
+    }
+}
+
+bool Controller::csSupported() const
+{
+#if Quotient_VERSION_MINOR > 8
+    return true;
+#else
+    return false;
+#endif
+}
+
+void Controller::revertToDefaultConfig()
+{
+    const auto config = NeoChatConfig::self();
+    config->setDefaults();
+    config->save();
+}
+
+bool Controller::isImageShown(const QString &eventId)
+{
+    return m_shownImages.contains(eventId);
+}
+
+void Controller::markImageShown(const QString &eventId)
+{
+    m_shownImages.append(eventId);
+}
+
+#include "moc_controller.cpp"

src/controller.h

@@ -5,15 +5,9 @@
 
 #include <QObject>
 #include <QQmlEngine>
-#include <QQuickItem>
 
 #include "neochatconnection.h"
 #include <Quotient/accountregistry.h>
-#include <Quotient/settings.h>
-
-#ifdef HAVE_KUNIFIEDPUSH
-#include <kunifiedpush/connector.h>
-#endif
 
 class TrayIcon;
 class QQuickTextDocument;
@@ -56,7 +50,19 @@ class Controller : public QObject
 
     Q_PROPERTY(QStringList accountsLoading MEMBER m_accountsLoading NOTIFY accountsLoadingChanged)
 
+    Q_PROPERTY(bool csSupported READ csSupported CONSTANT)
+
 public:
+    /**
+     * @brief Define the types on inline messages that can be shown.
+     */
+    enum MessageType {
+        Positive, /**< Positive message, typically green. */
+        Info, /**< Info message, typically highlight color. */
+        Error, /**< Error message, typically red. */
+    };
+    Q_ENUM(MessageType)
+
     static Controller &instance();
     static Controller *create(QQmlEngine *engine, QJSEngine *)
     {
@@ -80,59 +86,63 @@ public:
     /**
      * @brief Save an access token to the keychain for the given account.
      */
-    bool saveAccessTokenToKeyChain(const Quotient::AccountSettings &account, const QByteArray &accessToken);
+    void saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken);
 
     [[nodiscard]] bool supportSystemTray() const;
 
-    /**
-     * @brief Sets the QNetworkProxy for the application.
-     *
-     * @sa QNetworkProxy::setApplicationProxy
-     */
-    Q_INVOKABLE void setApplicationProxy();
-
     bool isFlatpak() const;
 
-    /**
-     * @brief Force a QQuickTextDocument to refresh when images are loaded.
-     *
-     * HACK: This is a workaround for QTBUG 93281.
-     */
-    Q_INVOKABLE void forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item);
-
     /**
      * @brief Start listening for notifications in dbus-activated mode.
      * These notifications will quit the application when closed.
      */
     static void listenForNotifications();
 
+    Q_INVOKABLE QString loadFileContent(const QString &path) const;
+
     Quotient::AccountRegistry &accounts();
 
     static void setTestMode(bool testMode);
 
+    Q_INVOKABLE void removeConnection(const QString &userId);
+
+    bool csSupported() const;
+
+    /**
+     * @brief Revert all configuration values to their default.
+     *
+     * The parameters along with their defaults are specified in the config file
+     * neochatconfig.kcfg.
+     */
+    Q_INVOKABLE void revertToDefaultConfig();
+
+    Q_INVOKABLE bool isImageShown(const QString &eventId);
+    Q_INVOKABLE void markImageShown(const QString &eventId);
+
 private:
     explicit Controller(QObject *parent = nullptr);
 
     QPointer<NeoChatConnection> m_connection;
     TrayIcon *m_trayIcon = nullptr;
 
-    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const Quotient::AccountSettings &account);
-
-    void loadSettings();
-    void saveSettings() const;
+    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const QString &account);
 
     Quotient::AccountRegistry m_accountRegistry;
     QStringList m_accountsLoading;
+    QMap<QString, QPointer<NeoChatConnection>> m_connectionsLoading;
     QString m_endpoint;
+    QStringList m_shownImages;
 
 private Q_SLOTS:
     void invokeLogin();
     void setQuitOnLastWindowClosed();
+    void updateBadgeNotificationCount(NeoChatConnection *connection, int count);
 
 Q_SIGNALS:
     void errorOccured(const QString &error, const QString &detail);
     void connectionAdded(NeoChatConnection *connection);
     void connectionDropped(NeoChatConnection *connection);
-    void activeConnectionChanged();
+    void activeConnectionChanged(NeoChatConnection *connection);
     void accountsLoadingChanged();
+    void showMessage(MessageType messageType, const QString &message);
 };

src/devtools/AccountData.qml

@@ -0,0 +1,35 @@
+// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.formcard as FormCard
+
+import org.kde.neochat
+
+ColumnLayout {
+    id: root
+
+    required property NeoChatConnection connection
+
+    FormCard.FormHeader {
+        title: i18nc("@title:group", "Account Data")
+    }
+    FormCard.FormCard {
+        Repeater {
+            model: root.connection.accountDataEventTypes
+            delegate: FormCard.FormButtonDelegate {
+                text: modelData
+                onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+                    sourceText: root.connection.accountDataJsonString(modelData)
+                }, {
+                    title: i18nc("@title:window", "Event Source"),
+                    width: Kirigami.Units.gridUnit * 25
+                })
+            }
+        }
+    }
+}

src/devtools/CMakeLists.txt

@@ -0,0 +1,16 @@
+# SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
+# SPDX-License-Identifier: BSD-2-Clause
+
+qt_add_library(devtools STATIC)
+ecm_add_qml_module(devtools GENERATE_PLUGIN_SOURCE
+    URI org.kde.neochat.devtools
+    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/devtools
+    QML_FILES
+        DevtoolsPage.qml
+        AccountData.qml
+        DebugOptions.qml
+        FeatureFlagPage.qml
+        RoomData.qml
+        ServerData.qml
+        StateKeys.qml
+)