GIT_SILENT Sync po/docbooks with svn

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

.craft.ini

@@ -2,5 +2,5 @@
 ; SPDX-License-Identifier: CC0-1.0
 
 [BlueprintSettings]
-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.7",
+    "runtime-version": "6.6",
     "sdk": "org.kde.Sdk",
     "command": "neochat",
     "tags": [

.gitlab-ci.yml

@@ -8,10 +8,8 @@ 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/snap-snapcraft-lxd.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

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 "11")
-set(RELEASE_SERVICE_VERSION_MICRO "70")
+set(RELEASE_SERVICE_VERSION_MINOR "05")
+set(RELEASE_SERVICE_VERSION_MICRO "2")
 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 "6.6")
+set(KF_MIN_VERSION "6.0")
 set(QT_MIN_VERSION "6.5")
 
 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
@@ -38,9 +38,6 @@ include(KDEGitCommitHooks)
 include(ECMCheckOutboundLicense)
 include(ECMQtDeclareLoggingCategory)
 include(ECMAddAndroidApk)
-include(ECMQmlModule)
-include(GenerateExportHeader)
-include(ECMGenerateHeaders)
 if (NOT ANDROID)
     include(KDEClangFormat)
 endif()
@@ -62,9 +59,7 @@ set_package_properties(Qt6 PROPERTIES
     PURPOSE "Basic application components"
 )
 
-if (QT_KNOWN_POLICY_QTP0004)
-qt_policy(SET QTP0004 NEW)
-endif ()
+qt_policy(SET QTP0001 NEW)
 
 find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels ColorScheme)
 set_package_properties(KF6 PROPERTIES
@@ -103,11 +98,11 @@ else()
     )
 endif()
 
-if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU)
+if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     find_package(KF6DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()
 
-find_package(QuotientQt6 0.8.2)
+find_package(QuotientQt6 0.7)
 set_package_properties(QuotientQt6 PROPERTIES
     TYPE REQUIRED
     DESCRIPTION "Qt wrapper around Matrix API"

README.md

@@ -38,8 +38,8 @@ 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).
 
-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 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

android/AndroidManifest.xml

@@ -55,6 +55,5 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/> <!-- for Android >= 33 -->
 
 </manifest>

appiumtests/createroomtest.py

@@ -1,56 +0,0 @@
-#!/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

@@ -1,78 +0,0 @@
-{
-    "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,8 +6,6 @@ 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():
@@ -44,13 +42,8 @@ def load_json(name):
 
 @app.route("/_matrix/client/r0/sync")
 def sync():
-    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")
+
+    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")
@@ -72,18 +65,6 @@ 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)

autotests/CMakeLists.txt

@@ -82,9 +82,3 @@ ecm_add_test(
     LINK_LIBRARIES neochat Qt::Test
     TEST_NAME linkpreviewertest
 )
-
-ecm_add_test(
-    messagecontentmodeltest.cpp
-    LINK_LIBRARIES neochat Qt::Test
-    TEST_NAME messagecontentmodeltest
-)

autotests/actionshandlertest.cpp

@@ -14,6 +14,7 @@ class ActionsHandlerTest : public QObject
 
 private:
     Quotient::Connection *connection = Quotient::Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    ActionsHandler *actionsHandler = new ActionsHandler(this);
 
 private Q_SLOTS:
     void nullObject();
@@ -22,19 +23,20 @@ private Q_SLOTS:
 void ActionsHandlerTest::nullObject()
 {
     QTest::ignoreMessage(QtWarningMsg, "ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.");
-    ActionsHandler::handleMessageEvent(nullptr, nullptr);
+    actionsHandler->handleMessageEvent(nullptr);
 
     auto chatBarCache = new ChatBarCache(this);
     QTest::ignoreMessage(QtWarningMsg, "ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.");
-    ActionsHandler::handleMessageEvent(nullptr, chatBarCache);
+    actionsHandler->handleMessageEvent(chatBarCache);
 
     auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"));
+    actionsHandler->setRoom(room);
     QTest::ignoreMessage(QtWarningMsg, "ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.");
-    ActionsHandler::handleMessageEvent(room, nullptr);
+    actionsHandler->handleMessageEvent(nullptr);
 
     // The final one should throw no warning so we make sure.
     QTest::failOnWarning("ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.");
-    ActionsHandler::handleMessageEvent(room, chatBarCache);
+    actionsHandler->handleMessageEvent(chatBarCache);
 }
 
 QTEST_GUILESS_MAIN(ActionsHandlerTest)

autotests/chatbarcachetest.cpp

@@ -6,7 +6,6 @@
 #include <QObject>
 #include <QTest>
 
-#include <Quotient/roommember.h>
 #include <Quotient/syncdata.h>
 #include <qtestcase.h>
 
@@ -51,7 +50,7 @@ void ChatBarCacheTest::empty()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationAuthor(), room->member(QString()));
+    QCOMPARE(chatBarCache->relationUser(), room->getUser(nullptr));
     QCOMPARE(chatBarCache->relationMessage(), QString());
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
@@ -65,7 +64,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->relationAuthor(), Quotient::RoomMember());
+    QCOMPARE(chatBarCache->relationUser(), QVariantMap());
 
     QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.");
     QCOMPARE(chatBarCache->relationMessage(), QString());
@@ -81,7 +80,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->relationAuthor(), Quotient::RoomMember());
+    QCOMPARE(chatBarCache->relationUser(), QVariantMap());
 
     QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.");
     QCOMPARE(chatBarCache->relationMessage(), QString());
@@ -99,7 +98,7 @@ void ChatBarCacheTest::reply()
     QCOMPARE(chatBarCache->replyId(), QLatin1String("$153456789:example.org"));
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationAuthor(), room->member(QLatin1String("@example:example.org")));
+    QCOMPARE(chatBarCache->relationUser(), room->getUser(room->user(QLatin1String("@example:example.org"))));
     QCOMPARE(chatBarCache->relationMessage(), QLatin1String("This is an example\ntext message"));
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
@@ -107,13 +106,8 @@ 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"));
@@ -121,7 +115,7 @@ void ChatBarCacheTest::edit()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), true);
     QCOMPARE(chatBarCache->editId(), QLatin1String("$153456789:example.org"));
-    QCOMPARE(chatBarCache->relationAuthor(), room->member(QLatin1String("@example:example.org")));
+    QCOMPARE(chatBarCache->relationUser(), room->getUser(room->user(QLatin1String("@example:example.org"))));
     QCOMPARE(chatBarCache->relationMessage(), QLatin1String("This is an example\ntext message"));
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
@@ -138,7 +132,7 @@ void ChatBarCacheTest::attachment()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationAuthor(), room->member(QString()));
+    QCOMPARE(chatBarCache->relationUser(), room->getUser(nullptr));
     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:kde.org"
+            "@bob:example.com"
           ]
         },
         "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
@@ -35,7 +35,7 @@
         "content": {
           "$153456789:example.org": {
             "m.read": {
-              "@alice:example.org": {
+              "@alice:matrix.org": {
                 "ts": 1436451550453
               }
             }
@@ -47,7 +47,7 @@
         "content": {
           "$1532735824654:example.org": {
             "m.read": {
-              "@bob:kde.org": {
+              "@bob:example.com": {
                 "ts": 1436451550453
               }
             }
@@ -67,18 +67,6 @@
         },
         "type": "m.receipt"
       },
-      {
-        "content": {
-          "$1532735824654:example.org": {
-            "m.read": {
-              "@tim2:example.com": {
-                "ts": 1436451550454
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
       {
         "content": {
           "$1532735824654:example.org": {
@@ -148,22 +136,6 @@
           "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",
@@ -184,7 +156,7 @@
   "summary": {
     "m.heroes": [
       "@alice:example.com",
-      "@bob:kde.org"
+      "@bob:example.com"
     ],
     "m.invited_member_count": 0,
     "m.joined_member_count": 2

autotests/data/test-invalidmatrixtolink-event.json

@@ -0,0 +1,14 @@
+{
+    "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

@@ -0,0 +1,14 @@
+{
+    "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

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

autotests/data/test-reactionmodel-sync.json

@@ -130,23 +130,7 @@
         "origin_server_ts": 1432735824653,
         "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
         "sender": "@example: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",
+        "state_key": "@alice:example.org",
         "type": "m.room.member",
         "unsigned": {
           "age": 1234

autotests/data/test-texthandler-sync.json

@@ -51,21 +51,6 @@
         "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

@@ -0,0 +1,14 @@
+{
+    "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

@@ -0,0 +1,14 @@
+{
+    "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

@@ -0,0 +1,16 @@
+{
+    "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/eventhandlertest.cpp

@@ -29,11 +29,15 @@ private:
     Connection *connection = nullptr;
     TestUtils::TestRoom *room = nullptr;
 
+    EventHandler emptyHandler = EventHandler(nullptr, nullptr);
+
 private Q_SLOTS:
     void initTestCase();
 
     void eventId();
     void nullEventId();
+    void author();
+    void nullAuthor();
     void authorDisplayName();
     void nullAuthorDisplayName();
     void singleLineSidplayName();
@@ -41,6 +45,7 @@ private Q_SLOTS:
     void time();
     void nullTime();
     void timeString();
+    void nullTimeString();
     void highlighted();
     void nullHighlighted();
     void hidden();
@@ -51,7 +56,6 @@ private Q_SLOTS:
     void genericBody();
     void nullGenericBody();
     void markdownBody();
-    void markdownBodyReply();
     void subtitle();
     void nullSubtitle();
     void mediaInfo();
@@ -62,10 +66,16 @@ private Q_SLOTS:
     void nullReplyId();
     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 EventHandlerTest::initTestCase()
@@ -76,136 +86,183 @@ void EventHandlerTest::initTestCase()
 
 void EventHandlerTest::eventId()
 {
-    QCOMPARE(EventHandler::id(room->messageEvents().at(0).get()), QStringLiteral("$153456789:example.org"));
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandler.getId(), QStringLiteral("$153456789:example.org"));
 }
 
 void EventHandlerTest::nullEventId()
 {
-    QTest::ignoreMessage(QtWarningMsg, "id called with event set to nullptr.");
-    QCOMPARE(EventHandler::id(nullptr), QString());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getId called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getId(), QString());
+}
+
+void EventHandlerTest::author()
+{
+    auto event = room->messageEvents().at(0).get();
+    auto author = room->user(event->senderId());
+    EventHandler eventHandler(room, 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());
+
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getAuthor called with m_event set to nullptr. Returning empty user.");
+    QCOMPARE(noEventHandler.getAuthor(), room->getUser(nullptr));
 }
 
 void EventHandlerTest::authorDisplayName()
 {
-    QCOMPARE(EventHandler::authorDisplayName(room, room->messageEvents().at(1).get()), QStringLiteral("before"));
+    EventHandler eventHandler(room, room->messageEvents().at(1).get());
+    QCOMPARE(eventHandler.getAuthorDisplayName(), QStringLiteral("before"));
 }
 
 void EventHandlerTest::nullAuthorDisplayName()
 {
-    QTest::ignoreMessage(QtWarningMsg, "authorDisplayName called with room set to nullptr.");
-    QCOMPARE(EventHandler::authorDisplayName(nullptr, nullptr), QString());
+    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.getAuthorDisplayName(), QString());
 
-    QTest::ignoreMessage(QtWarningMsg, "authorDisplayName called with event set to nullptr.");
-    QCOMPARE(EventHandler::authorDisplayName(room, nullptr), QString());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getAuthorDisplayName(), QString());
 }
 
 void EventHandlerTest::singleLineSidplayName()
 {
-    QCOMPARE(EventHandler::singleLineAuthorDisplayname(room, room->messageEvents().at(11).get()),
-             QStringLiteral("Look at me I put newlines in my display name"));
+    EventHandler eventHandler(room, room->messageEvents().at(11).get());
+    QCOMPARE(eventHandler.singleLineAuthorDisplayname(), QStringLiteral("Look at me I put newlines in my display name"));
 }
 
 void EventHandlerTest::nullSingleLineDisplayName()
 {
-    QTest::ignoreMessage(QtWarningMsg, "singleLineAuthorDisplayname called with room set to nullptr.");
-    QCOMPARE(EventHandler::singleLineAuthorDisplayname(nullptr, nullptr), QString());
+    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.singleLineAuthorDisplayname(), QString());
 
-    QTest::ignoreMessage(QtWarningMsg, "singleLineAuthorDisplayname called with event set to nullptr.");
-    QCOMPARE(EventHandler::singleLineAuthorDisplayname(room, nullptr), QString());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.singleLineAuthorDisplayname(), QString());
 }
 
 void EventHandlerTest::time()
 {
-    const auto event = room->messageEvents().at(0).get();
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
 
-    QCOMPARE(EventHandler::time(event), QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC));
-    QCOMPARE(EventHandler::time(event, true, QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC)), QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC));
+    QCOMPARE(eventHandler.getTime(), QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC));
+    QCOMPARE(eventHandler.getTime(true, QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC)), QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC));
 }
 
 void EventHandlerTest::nullTime()
 {
-    QTest::ignoreMessage(QtWarningMsg, "time called with event set to nullptr.");
-    QCOMPARE(EventHandler::time(nullptr), QDateTime());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getTime called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getTime(), QDateTime());
 
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
     QTest::ignoreMessage(QtWarningMsg, "a value must be provided for lastUpdated for a pending event.");
-    QCOMPARE(EventHandler::time(room->messageEvents().at(0).get(), true), QDateTime());
+    QCOMPARE(eventHandler.getTime(true), QDateTime());
 }
 
 void EventHandlerTest::timeString()
 {
-    const auto event = room->messageEvents().at(0).get();
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
 
     KFormat format;
 
-    QCOMPARE(EventHandler::timeString(event, false),
+    QCOMPARE(eventHandler.getTimeString(false),
              QLocale().toString(QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toLocalTime().time(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(event, true),
+    QCOMPARE(eventHandler.getTimeString(true),
              format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(event, false, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+    QCOMPARE(eventHandler.getTimeString(false, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().time(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(event, true, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+    QCOMPARE(eventHandler.getTimeString(true, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(event, false, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+    QCOMPARE(eventHandler.getTimeString(false, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().time(), QLocale::LongFormat));
-    QCOMPARE(EventHandler::timeString(event, true, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+    QCOMPARE(eventHandler.getTimeString(true, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().date(), QLocale::LongFormat));
-    QCOMPARE(EventHandler::timeString(event, QStringLiteral("hh:mm")),
-             QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toString(QStringLiteral("hh:mm")));
+}
+
+void EventHandlerTest::nullTimeString()
+{
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getTimeString called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getTimeString(false), QString());
+
+    EventHandler eventHandler(room, 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());
 }
 
 void EventHandlerTest::highlighted()
 {
-    QCOMPARE(EventHandler::isHighlighted(room, room->messageEvents().at(2).get()), true);
-    QCOMPARE(EventHandler::isHighlighted(room, room->messageEvents().at(0).get()), false);
+    EventHandler eventHandlerHighlight(room, room->messageEvents().at(2).get());
+    QCOMPARE(eventHandlerHighlight.isHighlighted(), true);
+
+    EventHandler eventHandlerNoHighlight(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoHighlight.isHighlighted(), false);
 }
 
 void EventHandlerTest::nullHighlighted()
 {
-    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with room set to nullptr.");
-    QCOMPARE(EventHandler::isHighlighted(nullptr, nullptr), false);
+    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.isHighlighted(), false);
 
-    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with event set to nullptr.");
-    QCOMPARE(EventHandler::isHighlighted(room, nullptr), false);
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.isHighlighted(), false);
 }
 
 void EventHandlerTest::hidden()
 {
-    QCOMPARE(EventHandler::isHidden(room, room->messageEvents().at(3).get()), true);
-    QCOMPARE(EventHandler::isHidden(room, room->messageEvents().at(0).get()), false);
+    EventHandler eventHandlerHidden(room, room->messageEvents().at(3).get());
+    QCOMPARE(eventHandlerHidden.isHidden(), true);
+
+    EventHandler eventHandlerNoHidden(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoHidden.isHidden(), false);
 }
 
 void EventHandlerTest::nullHidden()
 {
-    QTest::ignoreMessage(QtWarningMsg, "isHidden called with room set to nullptr.");
-    QCOMPARE(EventHandler::isHidden(nullptr, nullptr), false);
+    QTest::ignoreMessage(QtWarningMsg, "isHidden called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.isHidden(), false);
 
-    QTest::ignoreMessage(QtWarningMsg, "isHidden called with event set to nullptr.");
-    QCOMPARE(EventHandler::isHidden(room, nullptr), false);
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "isHidden called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.isHidden(), false);
 }
 
 void EventHandlerTest::body()
 {
-    const auto event = room->messageEvents().at(0).get();
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
 
-    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"));
+    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"));
 }
 
 void EventHandlerTest::nullBody()
 {
-    QTest::ignoreMessage(QtWarningMsg, "richBody called with room set to nullptr.");
-    QCOMPARE(EventHandler::richBody(nullptr, nullptr), QString());
+    EventHandler noEventHandler(room, nullptr);
 
-    QTest::ignoreMessage(QtWarningMsg, "richBody called with event set to nullptr.");
-    QCOMPARE(EventHandler::richBody(room, nullptr), QString());
+    QTest::ignoreMessage(QtWarningMsg, "getRichBody called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getRichBody(), 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());
+    QTest::ignoreMessage(QtWarningMsg, "getPlainBody called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getPlainBody(), QString());
 }
 
 void EventHandlerTest::genericBody_data()
@@ -213,13 +270,11 @@ void EventHandlerTest::genericBody_data()
     QTest::addColumn<int>("eventNum");
     QTest::addColumn<QString>("output");
 
-    QTest::newRow("message") << 0 << QStringLiteral("<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message");
-    QTest::newRow("member") << 1
-                            << QStringLiteral(
-                                   "<a href=\"https://matrix.to/#/@example:example.org\">after</a> changed their display name and updated their avatar");
-    QTest::newRow("message 2") << 2 << QStringLiteral("<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message");
+    QTest::newRow("message") << 0 << QStringLiteral("sent a message");
+    QTest::newRow("member") << 1 << QStringLiteral("changed their display name and updated their avatar");
+    QTest::newRow("message 2") << 2 << QStringLiteral("sent a message");
     QTest::newRow("reaction") << 3 << QStringLiteral("Unknown event");
-    QTest::newRow("video") << 4 << QStringLiteral("<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message");
+    QTest::newRow("video") << 4 << QStringLiteral("sent a message");
 }
 
 void EventHandlerTest::genericBody()
@@ -227,48 +282,47 @@ void EventHandlerTest::genericBody()
     QFETCH(int, eventNum);
     QFETCH(QString, output);
 
-    QCOMPARE(EventHandler::genericBody(room, room->messageEvents().at(eventNum).get()), output);
+    EventHandler eventHandler(room, room->messageEvents().at(eventNum).get());
+
+    QCOMPARE(eventHandler.getGenericBody(), output);
 }
 
 void EventHandlerTest::nullGenericBody()
 {
-    QTest::ignoreMessage(QtWarningMsg, "genericBody called with room set to nullptr.");
-    QCOMPARE(EventHandler::genericBody(nullptr, nullptr), QString());
-
-    QTest::ignoreMessage(QtWarningMsg, "genericBody called with event set to nullptr.");
-    QCOMPARE(EventHandler::genericBody(room, nullptr), QString());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getGenericBody called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getGenericBody(), QString());
 }
 
 void EventHandlerTest::markdownBody()
 {
-    QCOMPARE(EventHandler::markdownBody(room->messageEvents().at(0).get()), QStringLiteral("This is an example\ntext message"));
-}
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
 
-void EventHandlerTest::markdownBodyReply()
-{
-    QCOMPARE(EventHandler::markdownBody(room->messageEvents().at(5).get()), QStringLiteral("reply"));
+    QCOMPARE(eventHandler.getMarkdownBody(), QStringLiteral("This is an example\ntext message"));
 }
 
 void EventHandlerTest::subtitle()
 {
-    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"));
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandler.subtitleText(), QStringLiteral("after: This is an example text message"));
+
+    EventHandler eventHandler2(room, room->messageEvents().at(2).get());
+    QCOMPARE(eventHandler2.subtitleText(), 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 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());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "subtitleText called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.subtitleText(), QString());
 }
 
 void EventHandlerTest::mediaInfo()
 {
     auto event = room->messageEvents().at(4).get();
-    auto mediaInfo = EventHandler::mediaInfo(room, event);
+    EventHandler eventHandler(room, event);
+
+    auto mediaInfo = eventHandler.getMediaInfo();
     auto thumbnailInfo = mediaInfo["tempInfo"_ls].toMap();
 
     QCOMPARE(mediaInfo["source"_ls], room->makeMediaUrl(event->id(), QUrl("mxc://kde.org/1234567"_ls)));
@@ -288,102 +342,231 @@ void EventHandlerTest::mediaInfo()
 
 void EventHandlerTest::nullMediaInfo()
 {
-    QTest::ignoreMessage(QtWarningMsg, "mediaInfo called with room set to nullptr.");
-    QCOMPARE(EventHandler::mediaInfo(nullptr, nullptr), QVariantMap());
+    QTest::ignoreMessage(QtWarningMsg, "getMediaInfo called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.getMediaInfo(), QVariantMap());
 
-    QTest::ignoreMessage(QtWarningMsg, "mediaInfo called with event set to nullptr.");
-    QCOMPARE(EventHandler::mediaInfo(room, nullptr), QVariantMap());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getMediaInfo called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getMediaInfo(), QVariantMap());
 }
 
 void EventHandlerTest::hasReply()
 {
-    QCOMPARE(EventHandler::hasReply(room->messageEvents().at(5).get()), true);
-    QCOMPARE(EventHandler::hasReply(room->messageEvents().at(0).get()), false);
+    EventHandler eventHandlerReply(room, room->messageEvents().at(5).get());
+    QCOMPARE(eventHandlerReply.hasReply(), true);
+
+    EventHandler eventHandlerNoReply(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoReply.hasReply(), false);
 }
 
 void EventHandlerTest::nullHasReply()
 {
-    QTest::ignoreMessage(QtWarningMsg, "hasReply called with event set to nullptr.");
-    QCOMPARE(EventHandler::hasReply(nullptr), false);
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "hasReply called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.hasReply(), false);
 }
 
 void EventHandlerTest::replyId()
 {
-    QCOMPARE(EventHandler::replyId(room->messageEvents().at(5).get()), QStringLiteral("$153456789:example.org"));
-    QCOMPARE(EventHandler::replyId(room->messageEvents().at(0).get()), QStringLiteral(""));
+    EventHandler eventHandlerReply(room, room->messageEvents().at(5).get());
+    QCOMPARE(eventHandlerReply.getReplyId(), QStringLiteral("$153456789:example.org"));
+
+    EventHandler eventHandlerNoReply(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoReply.getReplyId(), QStringLiteral(""));
 }
 
 void EventHandlerTest::nullReplyId()
 {
-    QTest::ignoreMessage(QtWarningMsg, "replyId called with event set to nullptr.");
-    QCOMPARE(EventHandler::replyId(nullptr), QString());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getReplyId called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getReplyId(), QString());
 }
 
 void EventHandlerTest::replyAuthor()
 {
     auto replyEvent = room->messageEvents().at(0).get();
-    auto replyAuthor = room->member(replyEvent->senderId());
-    auto eventHandlerReplyAuthor = EventHandler::replyAuthor(room, room->messageEvents().at(5).get());
+    auto replyAuthor = room->user(replyEvent->senderId());
+    EventHandler eventHandler(room, room->messageEvents().at(5).get());
 
-    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());
+    auto eventHandlerReplyAuthor = eventHandler.getReplyAuthor();
 
-    QCOMPARE(EventHandler::replyAuthor(room, room->messageEvents().at(0).get()), RoomMember());
+    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));
+
+    EventHandler eventHandlerNoAuthor(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoAuthor.getReplyAuthor(), room->getUser(nullptr));
 }
 
 void EventHandlerTest::nullReplyAuthor()
 {
-    QTest::ignoreMessage(QtWarningMsg, "replyAuthor called with room set to nullptr.");
-    QCOMPARE(EventHandler::replyAuthor(nullptr, nullptr), RoomMember());
+    QTest::ignoreMessage(QtWarningMsg, "getReplyAuthor called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.getReplyAuthor(), QVariantMap());
 
-    QTest::ignoreMessage(QtWarningMsg, "replyAuthor called with event set to nullptr. Returning empty user.");
-    QCOMPARE(EventHandler::replyAuthor(room, nullptr), RoomMember());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getReplyAuthor called with m_event set to nullptr. Returning empty user.");
+    QCOMPARE(noEventHandler.getReplyAuthor(), room->getUser(nullptr));
+}
+
+void EventHandlerTest::replyBody()
+{
+    EventHandler eventHandler(room, room->messageEvents().at(5).get());
+
+    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()
+{
+    EventHandler noEventHandler(room, nullptr);
+
+    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 eventHandler(room, 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());
+
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getReplyMediaInfo called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getReplyMediaInfo(), QVariantMap());
 }
 
 void EventHandlerTest::thread()
 {
-    QCOMPARE(EventHandler::isThreaded(room->messageEvents().at(0).get()), false);
-    QCOMPARE(EventHandler::threadRoot(room->messageEvents().at(0).get()), QString());
+    EventHandler eventHandlerNoThread(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoThread.isThreaded(), false);
+    QCOMPARE(eventHandlerNoThread.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"));
+    EventHandler eventHandlerThreadRoot(room, room->messageEvents().at(9).get());
+    QCOMPARE(eventHandlerThreadRoot.isThreaded(), true);
+    QCOMPARE(eventHandlerThreadRoot.threadRoot(), QStringLiteral("$threadroot:example.org"));
+    QCOMPARE(eventHandlerThreadRoot.getReplyId(), QStringLiteral("$threadroot: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"));
+    EventHandler eventHandlerThreadReply(room, room->messageEvents().at(10).get());
+    QCOMPARE(eventHandlerThreadReply.isThreaded(), true);
+    QCOMPARE(eventHandlerThreadReply.threadRoot(), QStringLiteral("$threadroot:example.org"));
+    QCOMPARE(eventHandlerThreadReply.getReplyId(), QStringLiteral("$threadmessage1:example.org"));
 }
 
 void EventHandlerTest::nullThread()
 {
-    QTest::ignoreMessage(QtWarningMsg, "isThreaded called with event set to nullptr.");
-    QCOMPARE(EventHandler::isThreaded(nullptr), false);
+    QTest::ignoreMessage(QtWarningMsg, "isThreaded called with m_event set to nullptr.");
+    QCOMPARE(emptyHandler.isThreaded(), false);
 
-    QTest::ignoreMessage(QtWarningMsg, "threadRoot called with event set to nullptr.");
-    QCOMPARE(EventHandler::threadRoot(nullptr), QString());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "threadRoot called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.threadRoot(), QString());
 }
 
 void EventHandlerTest::location()
 {
-    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"));
+    EventHandler eventHandler(room, room->messageEvents().at(7).get());
+
+    QCOMPARE(eventHandler.getLatitude(), QStringLiteral("51.7035").toFloat());
+    QCOMPARE(eventHandler.getLongitude(), QStringLiteral("-1.14394").toFloat());
+    QCOMPARE(eventHandler.getLocationAssetType(), QStringLiteral("m.pin"));
 }
 
 void EventHandlerTest::nullLocation()
 {
-    QTest::ignoreMessage(QtWarningMsg, "latitude called with event set to nullptr.");
-    QCOMPARE(EventHandler::latitude(nullptr), -100.0);
+    QTest::ignoreMessage(QtWarningMsg, "getLatitude called with m_event set to nullptr.");
+    QCOMPARE(emptyHandler.getLatitude(), -100.0);
 
-    QTest::ignoreMessage(QtWarningMsg, "longitude called with event set to nullptr.");
-    QCOMPARE(EventHandler::longitude(nullptr), -200.0);
+    QTest::ignoreMessage(QtWarningMsg, "getLongitude called with m_event set to nullptr.");
+    QCOMPARE(emptyHandler.getLongitude(), -200.0);
 
-    QTest::ignoreMessage(QtWarningMsg, "locationAssetType called with event set to nullptr.");
-    QCOMPARE(EventHandler::locationAssetType(nullptr), QString());
+    QTest::ignoreMessage(QtWarningMsg, "getLocationAssetType called with m_event set to nullptr.");
+    QCOMPARE(emptyHandler.getLocationAssetType(), QString());
+}
+
+void EventHandlerTest::readMarkers()
+{
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+    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"));
+
+    EventHandler eventHandler2(room, room->messageEvents().at(2).get());
+    QCOMPARE(eventHandler2.hasReadMarkers(), true);
+
+    readMarkers = eventHandler2.getReadMarkers();
+
+    QCOMPARE(readMarkers.size(), 5);
+
+    QCOMPARE(eventHandler2.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(eventHandler2.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());
+
+    EventHandler noEventHandler(room, nullptr);
+
+    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());
 }
 
 QTEST_MAIN(EventHandlerTest)

autotests/linkpreviewertest.cpp

@@ -6,11 +6,12 @@
 
 #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;
@@ -29,9 +30,6 @@ private Q_SLOTS:
     void linkPreviewsMatch_data();
     void linkPreviewsMatch();
 
-    void multipleLinkPreviewsMatch_data();
-    void multipleLinkPreviewsMatch();
-
     void linkPreviewsReject_data();
     void linkPreviewsReject();
 };
@@ -44,59 +42,45 @@ void LinkPreviewerTest::initTestCase()
 
 void LinkPreviewerTest::linkPreviewsMatch_data()
 {
-    QTest::addColumn<QString>("inputString");
+    QTest::addColumn<QString>("eventSource");
     QTest::addColumn<QUrl>("testOutputLink");
 
-    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);
+    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);
 }
 
 void LinkPreviewerTest::linkPreviewsMatch()
 {
-    QFETCH(QString, inputString);
+    QFETCH(QString, eventSource);
     QFETCH(QUrl, testOutputLink);
 
-    auto link = LinkPreviewer::linkPreviews(inputString)[0];
+    auto event = TestUtils::loadEventFromFile<RoomMessageEvent>(eventSource);
+    auto linkPreviewer = LinkPreviewer(LinkPreviewer::linkPreview(event.get()), connection);
 
-    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);
+    QCOMPARE(linkPreviewer.empty(), false);
+    QCOMPARE(linkPreviewer.url(), testOutputLink);
 }
 
 void LinkPreviewerTest::linkPreviewsReject_data()
 {
-    QTest::addColumn<QString>("inputString");
+    QTest::addColumn<QString>("eventSource");
 
-    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");
+    QTest::newRow("mxc") << QStringLiteral("test-invalidmxclink-event.json");
+    QTest::newRow("matrixTo") << QStringLiteral("test-invalidmatrixtolink-event.json");
+    QTest::newRow("noSpace") << QStringLiteral("test-invalidnospacelink-event.json");
 }
 
 void LinkPreviewerTest::linkPreviewsReject()
 {
-    QFETCH(QString, inputString);
+    QFETCH(QString, eventSource);
 
-    auto links = LinkPreviewer::linkPreviews(inputString);
+    auto event = TestUtils::loadEventFromFile<RoomMessageEvent>(eventSource);
+    auto linkPreviewer = LinkPreviewer(LinkPreviewer::linkPreview(event.get()), connection);
 
-    QCOMPARE(links.empty(), true);
+    QCOMPARE(linkPreviewer.empty(), true);
+    QCOMPARE(linkPreviewer.url(), QUrl());
 }
 
 QTEST_MAIN(LinkPreviewerTest)

autotests/messagecontentmodeltest.cpp

@@ -1,61 +0,0 @@
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include <QObject>
-#include <QSignalSpy>
-#include <QTest>
-
-#include <Quotient/connection.h>
-#include <Quotient/quotient_common.h>
-#include <Quotient/roommember.h>
-#include <Quotient/syncdata.h>
-
-#include "models/messagecontentmodel.h"
-
-#include "testutils.h"
-
-using namespace Quotient;
-using namespace Qt::Literals::StringLiterals;
-
-class MessageContentModelTest : public QObject
-{
-    Q_OBJECT
-
-private:
-    Connection *connection = nullptr;
-
-private Q_SLOTS:
-    void initTestCase();
-
-    void missingEvent();
-};
-
-void MessageContentModelTest::initTestCase()
-{
-    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-}
-
-void MessageContentModelTest::missingEvent()
-{
-    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#firstRoom:kde.org"));
-    auto model1 = MessageContentModel(room, "$153456789:example.org"_L1);
-
-    QCOMPARE(model1.rowCount(), 1);
-    QCOMPARE(model1.data(model1.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);
-    QCOMPARE(model1.data(model1.index(0), MessageContentModel::DisplayRole), "Loading"_L1);
-
-    auto model2 = MessageContentModel(room, "$153456789:example.org"_L1, true);
-
-    QCOMPARE(model2.rowCount(), 1);
-    QCOMPARE(model2.data(model2.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);
-    QCOMPARE(model2.data(model2.index(0), MessageContentModel::DisplayRole), "Loading reply"_L1);
-
-    room->syncNewEvents(QLatin1String("test-min-sync.json"));
-    QCOMPARE(model1.rowCount(), 2);
-    QCOMPARE(model1.data(model1.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Author);
-    QCOMPARE(model1.data(model1.index(1), MessageContentModel::ComponentTypeRole), MessageComponentType::Text);
-    QCOMPARE(model1.data(model1.index(1), MessageContentModel::DisplayRole), u"<b>This is an example<br>text message</b>"_s);
-}
-
-QTEST_MAIN(MessageContentModelTest)
-#include "messagecontentmodeltest.moc"

autotests/reactionmodeltest.cpp

@@ -52,8 +52,10 @@ 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 Margatroid reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
-    QCOMPARE(model.data(model.index(0), ReactionModel::HasLocalMember), false);
+             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);
 }
 
 void ReactionModelTest::newReaction()
@@ -63,7 +65,7 @@ void ReactionModelTest::newReaction()
 
     QCOMPARE(model->rowCount(), 1);
     QCOMPARE(model->data(model->index(0), ReactionModel::ToolTipRole),
-             QStringLiteral("Alice Margatroid reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
+             QStringLiteral("@alice:matrix.org reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
 
     QSignalSpy spy(model, SIGNAL(modelReset()));
 
@@ -72,7 +74,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 Margatroid and Bob reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
+             QStringLiteral("@alice:matrix.org and @bob:example.org reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
 
     delete model;
 }

autotests/texthandlertest.cpp

@@ -12,7 +12,9 @@
 
 #include "enums/messagecomponenttype.h"
 #include "models/customemojimodel.h"
+#include "models/messagecontentmodel.h"
 #include "neochatconnection.h"
+#include "utils.h"
 
 #include "testutils.h"
 
@@ -44,7 +46,6 @@ private Q_SLOTS:
     void sendCustomEmojiCode_data();
     void sendCustomEmojiCode();
 
-    void receiveSpacelessSelfClosingTag();
     void receiveStripReply();
     void receivePlainTextIn();
 
@@ -84,11 +85,11 @@ void TextHandlerTest::initTestCase()
 
 void TextHandlerTest::allowedAttributes()
 {
-    const QString testInputString1 = QStringLiteral("<span data-mx-spoiler><font color=#FFFFFF>Test</font><span>");
-    const QString testOutputString1 = QStringLiteral("<span data-mx-spoiler><font color=#FFFFFF>Test</font><span>");
+    const QString testInputString1 = QStringLiteral("<p><span data-mx-spoiler><font color=#FFFFFF>Test</font><span></p>");
+    const QString testOutputString1 = QStringLiteral("<p><span data-mx-spoiler><font color=#FFFFFF>Test</font><span></p>");
     // Handle urls where the href has either single (') or double (") quotes.
-    const QString testInputString2 = QStringLiteral("<a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a>");
-    const QString testOutputString2 = QStringLiteral("<a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a>");
+    const QString testInputString2 = QStringLiteral("<p><a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a></p>");
+    const QString testOutputString2 = QStringLiteral("<p><a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a></p>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString1);
@@ -116,7 +117,7 @@ void TextHandlerTest::stripDisallowedTags()
 void TextHandlerTest::stripDisallowedAttributes()
 {
     const QString testInputString = QStringLiteral("<p style=\"font-size:50px;\" color=#FFFFFF>Test</p>");
-    const QString testOutputString = QStringLiteral("Test");
+    const QString testOutputString = QStringLiteral("<p>Test</p>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -143,8 +144,8 @@ void TextHandlerTest::emptyCodeTags()
 
 void TextHandlerTest::sendSimpleStringCase()
 {
-    const QString testInputString = QStringLiteral("This data should just be left alone.");
-    const QString testOutputString = QStringLiteral("This data should just be left alone.");
+    const QString testInputString = QStringLiteral("This data should just be put in a paragraph.");
+    const QString testOutputString = QStringLiteral("<p>This data should just be put in a paragraph.</p>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -157,8 +158,8 @@ void TextHandlerTest::sendSingleParaMarkup()
     const QString testInputString = QStringLiteral(
         "Text para with **bold**, *italic*, [link](https://kde.org), ![image](mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e), `inline code`.");
     const QString testOutputString = QStringLiteral(
-        "Text para with <strong>bold</strong>, <em>italic</em>, <a href=\"https://kde.org\">link</a>, <img "
-        "src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e\" alt=\"image\">, <code>inline code</code>.");
+        "<p>Text para with <strong>bold</strong>, <em>italic</em>, <a href=\"https://kde.org\">link</a>, <img "
+        "src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e\" alt=\"image\">, <code>inline code</code>.</p>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -184,7 +185,7 @@ void TextHandlerTest::sendMultipleSectionMarkup()
 void TextHandlerTest::sendBadLinks()
 {
     const QString testInputString = QStringLiteral("[link](kde.org), ![image](https://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e)");
-    const QString testOutputString = QStringLiteral("<a>link</a>, <img alt=\"image\">");
+    const QString testOutputString = QStringLiteral("<p><a>link</a>, <img alt=\"image\"></p>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -221,8 +222,8 @@ void TextHandlerTest::sendCodeClass()
 void TextHandlerTest::sendCustomEmoji()
 {
     const QString testInputString = QStringLiteral(":test:");
-    const QString testOutputString =
-        QStringLiteral("<img data-mx-emoticon=\"\" src=\"mxc://example.org/test\" alt=\":test:\" title=\":test:\" height=\"32\" vertical-align=\"middle\" />");
+    const QString testOutputString = QStringLiteral(
+        "<p><img data-mx-emoticon=\"\" src=\"mxc://example.org/test\" alt=\":test:\" title=\":test:\" height=\"32\" vertical-align=\"middle\" /></p>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -235,7 +236,7 @@ void TextHandlerTest::sendCustomEmojiCode_data()
     QTest::addColumn<QString>("testInputString");
     QTest::addColumn<QString>("testOutputString");
 
-    QTest::newRow("inline") << QStringLiteral("`:test:`") << QStringLiteral("<code>:test:</code>");
+    QTest::newRow("inline") << QStringLiteral("`:test:`") << QStringLiteral("<p><code>:test:</code></p>");
     QTest::newRow("block") << QStringLiteral("```\n:test:\n```") << QStringLiteral("<pre><code>:test:\n</code></pre>");
 }
 
@@ -251,19 +252,6 @@ 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(
@@ -286,7 +274,6 @@ 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()
@@ -373,7 +360,7 @@ void TextHandlerTest::receivePlainStripMarkup()
 void TextHandlerTest::receiveRichUserPill()
 {
     const QString testInputString = QStringLiteral("<p><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></p>");
-    const QString testOutputString = QStringLiteral("<b><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></b>");
+    const QString testOutputString = QStringLiteral("<p><b><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></b></p>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -384,7 +371,7 @@ void TextHandlerTest::receiveRichUserPill()
 void TextHandlerTest::receiveRichStrikethrough()
 {
     const QString testInputString = QStringLiteral("<p><del>Test</del></p>");
-    const QString testOutputString = QStringLiteral("<s>Test</s>");
+    const QString testOutputString = QStringLiteral("<p><s>Test</s></p>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -461,9 +448,6 @@ 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);
 
@@ -477,9 +461,6 @@ void TextHandlerTest::receiveRichPlainUrl()
 
     testTextHandler.setData(testInputStringMxId);
     QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxId);
-
-    testTextHandler.setData(testInputStringMxIdWithPrefix);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxIdWithPrefix);
 }
 
 void TextHandlerTest::receiveRichEdited_data()
@@ -554,7 +535,7 @@ void TextHandlerTest::componentOutput_data()
                "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::Text, QStringLiteral("Ah, you mean something like"), {}},
                MessageComponent{
                    MessageComponentType::Code,
                    QStringLiteral(

autotests/windowcontrollertest.cpp

@@ -17,6 +17,7 @@ class WindowControllerTest : public QObject
 
 private Q_SLOTS:
     void nullWindow();
+    void geometry();
     void showAndRaise();
     void toggle();
 
@@ -29,10 +30,32 @@ 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,7 +25,6 @@
   <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>
@@ -55,8 +54,6 @@
   <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="de">Mit den Freunden auf Matrix unterhalten</summary>
-  <summary xml:lang="el">Συνομιλήστε με τους φίλους σας στο matrix</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>
@@ -64,7 +61,6 @@
   <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="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>
@@ -87,16 +83,12 @@
     <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="de">NeoChat ist eine Anwendung für Unterhaltungen mit allen Vorteilen des Matrix-Netzwerkes. Sie bietet eine sichere Möglichkeit zum Versenden von Nachrichten, Videos und Audiodateien and die Familienmitglieder.</p>
-    <p xml:lang="el">Το NeoChat είναι μια εφαρμογή συνομιλίας που σας επιτρέπει να εκμεταλλευτείτε πλήρως το δίκτυο Matrix. Σας παρέχει έναν ασφαλή τρόπο να στέλνετε μηνύματα κειμένου, βίντεο και αρχεία ήχου στην οικογένεια, τους συναδέλφους και τους φίλους σας.</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>
@@ -115,8 +107,6 @@
     <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>
     <p xml:lang="ca-valencia">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'encriptació d'extrem a extrem. Hi ha algunes altres omissions més xicotetes a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu seguix sent proporcionar suport eventual per a tota l'especificació.</p>
-    <p xml:lang="de">NeoChat versucht eine vollumfängliche Anwendung für die Spezifikation von Matrix zu sein. Damit wird alles der aktuellen stabilen Spezifikation mit den erwähnenswerten Ausnahmen von VoIP, Diskussionsfäden und ein paar Teilen der Ende-zu-Ende-Verschlüsselung unterstützt. Zudem sind andere kleinere Auslassungen vorhanden, da sich die Matrixspezifikation ständig weiterentwickelt. Nichtsdestotrotz soll letztendlich die gesamte Spezifikation unterstützt werden.</p>
-    <p xml:lang="el">Το NeoChat στοχεύει να είναι μια πλήρως εξοπλισμένη εφαρμογή για τις προδιαγραφές Matrix. Ως εκ τούτου, υποστηρίζονται όλα τα στοιχεία της τρέχουσας σταθερής προδιαγραφής με τις αξιοσημείωτες εξαιρέσεις του VoIP, των νημάτων και ορισμένων πτυχών της κρυπτογράφησης στα άκρα. Υπάρχουν μερικές άλλες μικρότερες παραλείψεις που οφείλονται στο γεγονός ότι η προδιαγραφή Matrix εξελίσσεται συνεχώς, αλλά ο στόχος παραμένει να παρέχεται τελικά υποστήριξη για ολόκληρη την προδιαγραφή.</p>
     <p xml:lang="en-GB">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="eo">NeoChat celas esti plene kapabla aplikaĵo por la Matrix-specifo. Kiel tia, ĉio en la nuna stabila specifo kun la rimarkindaj esceptoj de VoIP, fadenoj kaj kelkaj aspektoj de Fin-al-Fina Ĉifrado estas subtenataj. Estas kelkaj aliaj pli malgrandaj preterlasoj pro la fakto, ke la Matrix-speco konstante evoluas, sed la celo restas provizi finfine subtenon por la tuta specifaĵo.</p>
     <p xml:lang="es">NeoChat pretende ser una aplicación con todas las funciones para la especificación de Matrix. Como tal, admite todo en la especificación estable actual, con las notables excepciones de VoIP, subprocesos y algunas funciones de cifrado de extremo a extremo. Existen algunas omisiones menos importantes debido al hecho de que la especificación de Matrix está en constante evolución, pero el objetivo sigue siendo brindar compatibilidad final con toda la especificación.</p>
@@ -124,7 +114,6 @@
     <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="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>
@@ -146,8 +135,6 @@
     <p xml:lang="ar">نظرًا لطبيعة تطوير مواصفات ماتركس، يدعم نيوتشات أيضًا العديد من الميزات غير المستقرة وهي:</p>
     <p xml:lang="ca">A causa de la naturalesa del desenvolupament de l'especificació de Matrix, el NeoChat també implementa nombroses característiques inestables. Actualment són:</p>
     <p xml:lang="ca-valencia">A causa de la naturalea del desenvolupament de l'especificació de Matrix, NeoChat també implementa nombroses característiques inestables. Actualment són:</p>
-    <p xml:lang="de">Durch die Weiterentwicklung der Matrix-Spezifikation unterstützt auch NeoChat einige als noch instabil gekennzeichnete Funktionen. Derzeit sind das:</p>
-    <p xml:lang="el">Λόγω της φύσης της ανάπτυξης των προδιαγραφών Matrix, το NeoChat υποστηρίζει επίσης πολλά ασταθή χαρακτηριστικά. Επί του παρόντος, αυτά είναι:</p>
     <p xml:lang="en-GB">Due to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:</p>
     <p xml:lang="eo">Pro la naturo de la Matrix-specifevoluo NeoChat ankaŭ subtenas multajn malstabilajn funkciojn. Nuntempe ĉi tiuj estas:</p>
     <p xml:lang="es">Debido a la naturaleza del desarrollo de la especificación de Matrix, NeoChat también permite numerosas funciones no estables, como:</p>
@@ -155,7 +142,6 @@
     <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>
@@ -179,7 +165,6 @@
       <li xml:lang="ar">التصويت - MSC3381</li>
       <li xml:lang="ca">Enquestes - MSC3381</li>
       <li xml:lang="ca-valencia">Enquestes - MSC3381</li>
-      <li xml:lang="el">Δημοσκοπήσεις - MSC3381</li>
       <li xml:lang="en-GB">Polls - MSC3381</li>
       <li xml:lang="eo">Enketoj - MSC3381</li>
       <li xml:lang="es">Encuestas - MSC3381</li>
@@ -187,7 +172,6 @@
       <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>
@@ -209,7 +193,6 @@
       <li xml:lang="ar">حزم الملصقات - MSC2545</li>
       <li xml:lang="ca">Paquets d'adhesius - MSC2545</li>
       <li xml:lang="ca-valencia">Paquets d'adhesius - MSC2545</li>
-      <li xml:lang="el">Πακέτα αυτοκόλλητων - MSC2545</li>
       <li xml:lang="en-GB">Sticker Packs - MSC2545</li>
       <li xml:lang="eo">Glumark-Pakoj - MSC2545</li>
       <li xml:lang="es">Paquetes de pegatinas - MSC2545</li>
@@ -217,7 +200,6 @@
       <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>
@@ -240,7 +222,6 @@
       <li xml:lang="ar">موقع الأحداث - MSC3488</li>
       <li xml:lang="ca">Esdeveniments d'ubicació - MSC3488</li>
       <li xml:lang="ca-valencia">Esdeveniments d'ubicació - MSC3488</li>
-      <li xml:lang="el">Τοποθεσία γεγονότα - MSC3488</li>
       <li xml:lang="en-GB">Location Events - MSC3488</li>
       <li xml:lang="eo">Lokaj Eventoj - MSC3488</li>
       <li xml:lang="es">Eventos de ubicación - MSC3488</li>
@@ -248,7 +229,6 @@
       <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>
@@ -305,8 +285,6 @@
       <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="de">Hauptansicht mit Raumliste, Unterhaltung und Raum-Informationen</caption>
-      <caption xml:lang="el">Κύρια προβολή με λίστα δωματίων, συνομιλία και πληροφορίες δωματίων</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>
@@ -314,7 +292,6 @@
       <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>
@@ -340,16 +317,12 @@
       <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="de">Neue Gemeinschaften mit den Umgebungen von Matrix erkunden</caption>
-      <caption xml:lang="el">Ανακαλύψτε νέες κοινότητες με το Matrix Spaces</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>
@@ -378,8 +351,6 @@
       <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="de">Hauptansicht mit Raumliste, Unterhaltung und Raum-Informationen</caption>
-      <caption xml:lang="el">Κύρια προβολή με λίστα δωματίων, συνομιλία και πληροφορίες δωματίων</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>
@@ -387,7 +358,6 @@
       <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>
@@ -414,8 +384,6 @@
       <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="de">Anmeldebildschirm</caption>
-      <caption xml:lang="el">Οθόνη εισόδου</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>
@@ -423,7 +391,6 @@
       <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>
@@ -448,9 +415,6 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
-    <release version="24.08.2" date="2024-10-10"/>
-    <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"/>

org.kde.neochat.desktop

@@ -18,7 +18,6 @@ Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[gl]=NeoChat
-Name[he]=NeoChat
 Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
@@ -60,7 +59,6 @@ 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
@@ -101,7 +99,6 @@ 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

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

@@ -1,122 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
-<!ENTITY % Slovenian "INCLUDE">
-]>
-<!--
-SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
-SPDX-License-Identifier: CC-BY-SA-4.0
--->
-
-<refentry lang="&language;">
-<refentryinfo>
-<title
->Uporabniški priročnik za NeoChat</title>
-<author
-><firstname
->Carl</firstname
-><surname
->Schwan</surname
-> <contrib
->Stran z navodili za NeoChat.</contrib
-> <email
->carl@carlschwan.eu</email
-></author>
-<date
->01.11.2022</date>
-<releaseinfo
->22,09</releaseinfo>
-<productname
->NeoChat</productname>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>
-    <command
->neochat</command>
-  </refentrytitle>
-  <manvolnum
->1</manvolnum>
-</refmeta>
-
-<refnamediv>
-  <refname
->neochat</refname>
-  <refpurpose
->Odjemalec za interakcijo s protokolom za matrično sporočanje</refpurpose>
-  </refnamediv>
-  <!-- body begins here -->
-  <refsynopsisdiv id='synopsis'>
-  <cmdsynopsis
-><command
->neochat</command
-> <arg choice="opt"
-><replaceable
->URI</replaceable
-></arg
-> </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsect1 id="description">
-  <title
->Opis</title>
-  <para
-><command
->neochat</command
-> je aplikacija za klepet za matrični protokol, ki deluje na namizju in mobilni napravi. </para>
-</refsect1>
-
-<refsect1 id="options"
-><title
->Možnosti</title>
-<variablelist>
-  <varlistentry>
-  <term
-><option
->URI</option
-></term>
-  <listitem>
-    <para
->Uri matrike za uporabnika ali sobo. npr. matrix:u/user:example.org in matrix:r/root:example.org. Tako bo NeoChat poskušal odpreti dano sobo ali pogovor. </para>
-  </listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1 id="bug">
-  <title
->Poročanje o napakah</title>
-  <para
->Napake in zahteve po funkcijah lahko prijavite na <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General"
->https://bugs.kde.org/enter_bug.cgi? product=NeoChat&amp;component=General</ulink
-></para>
-</refsect1>
-
-<refsect1>
-  <title
->Poglej tudi</title>
-  <simplelist>
-    <member
->Seznam pogostih vprašanj o Matrix <ulink url="https://matrix.org/faq/"
->https://matrix.org/faq/</ulink
-> </member>
-    <member
->kf5options(7)</member>
-    <member
->qt5options(7)</member>
-  </simplelist>
-</refsect1>
-
-<refsect1 id="copyright"
-><title
->Avtorske pravice</title>
-<para
->Avtorske pravice &copy; 2020-2022 Tobias Fella </para>
-<para
->Avtorske pravice &copy; 2020-2022 Carl Schwan </para>
-<para
->Licenca: GNU General Public različica 3 ali novejša &lt;<ulink url="https://www.gnu.org/licenses/gpl-3.0.html"
->https://www.gnu.org/licenses/gpl-3.0 .html</ulink
->&gt;</para>
-</refsect1>
-</refentry>

po/tr/docs/neochat/CMakeLists.txt

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

snapcraft.yaml

@@ -1,158 +0,0 @@
-# SPDX-FileCopyrightText: 2024 Scarlett Moore <sgmoore@kde.org>
-#
-# SPDX-License-Identifier: CC0-1.0
----
-name: neochat
-base: core22
-adopt-info: neochat
-grade: stable
-confinement: strict
-apps:
-  neochat:
-    extensions:
-      - kde-neon-6
-    command: usr/bin/neochat
-    common-id: org.kde.neochat
-    desktop: usr/share/applications/org.kde.neochat.desktop
-    plugs:
-      - home
-      - removable-media
-      - audio-playback
-      - unity7
-      - network
-      - network-bind
-      - network-manager-observe
-      - password-manager-service
-      - accounts-service
-
-compression: lzo
-
-slots:
-  session-dbus-interface:
-    interface: dbus
-    name: org.kde.neochat
-    bus: session
-
-parts:
-  olm:
-    source: https://gitlab.matrix.org/matrix-org/olm.git
-    source-depth: 1
-    source-tag: '3.2.12'
-    plugin: cmake
-    cmake-parameters:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DCMAKE_INSTALL_PREFIX=/usr
-    prime:
-      - -usr/include
-      - -usr/lib/*/pkgconfig
-      - -usr/lib/*/cmake
-
-  libsecret:
-    source: https://gitlab.gnome.org/GNOME/libsecret.git
-    source-tag: '0.21.4'
-    source-depth: 1
-    plugin: meson
-    meson-parameters:
-      - --prefix=/usr
-      - -Doptimization=3
-      - -Ddebug=true
-      - -Dmanpage=false
-      - -Dvapi=false
-      - -Dintrospection=false
-      - -Dcrypto=disabled
-      - -Dgtk_doc=false
-    build-packages:
-      - meson
-      - libglib2.0-dev
-      - libgcrypt20-dev
-    prime:
-      - -usr/include
-      - -usr/lib/*/pkgconfig
-
-  qtkeychain:
-    after: [libsecret]
-    source: https://github.com/frankosterfeld/qtkeychain.git
-    source-tag: 0.14.3
-    source-depth: 1
-    plugin: cmake
-    build-environment:
-      - PKG_CONFIG_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig:$PKG_CONFIG_PATH
-    cmake-parameters:
-      - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DBUILD_TRANSLATIONS=NO
-      - -DBUILD_WITH_QT6=ON
-    prime:
-      - -usr/include
-      - -usr/lib/*/pkgconfig
-      - -usr/lib/*/cmake
-
-  libquotient:
-    after:
-      - olm
-      - qtkeychain
-    source: https://github.com/quotient-im/libQuotient.git
-    source-tag: 0.8.2
-    source-depth: 1
-    plugin: cmake
-    build-packages:
-      - libssl-dev
-    cmake-parameters:
-      - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DBUILD_TESTING=OFF
-      - -DQuotient_ENABLE_E2EE=ON
-      - -DBUILD_WITH_QT6=ON
-    prime:
-      - -usr/include
-      - -usr/lib/*/pkgconfig
-      - -usr/lib/*/cmake
-
-  kquickimageeditor:
-    source: https://invent.kde.org/libraries/kquickimageeditor.git
-    source-tag: 'v0.3.0'
-    source-depth: 1
-    plugin: cmake
-    cmake-parameters:
-      - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DBUILD_WITH_QT6=ON
-      - -DBUILD_TESTING=OFF
-    prime:
-      - -usr/include
-      - -usr/lib/*/pkgconfig
-      - -usr/lib/*/cmake
-
-  neochat:
-    after:
-      - qtkeychain
-      - libquotient
-      - kquickimageeditor
-    parse-info:
-      - usr/share/metainfo/org.kde.neochat.appdata.xml
-    source: https://invent.kde.org/network/neochat.git
-    source-tag: 'v24.08.1'
-    plugin: cmake
-    build-packages:
-      - cmark
-      - libcmark-dev
-      - libsqlite3-dev
-      - libvulkan-dev
-      - libxkbcommon-dev
-      - libicu-dev
-      - libpulse0
-    cmake-parameters:
-      - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DBUILD_TESTING=OFF
-    prime:
-      - -usr/share/man
-
-  deps:
-    after: [neochat]
-    plugin: nil
-    stage-packages:
-      - libcmark0.30.2
-    prime:
-      - usr/lib/*/libcmark.so*
-

src/CMakeLists.txt

@@ -20,6 +20,8 @@ add_library(neochat STATIC
     models/customemojimodel.h
     clipboard.cpp
     clipboard.h
+    matriximageprovider.cpp
+    matriximageprovider.h
     models/messageeventmodel.cpp
     models/messageeventmodel.h
     models/messagefiltermodel.cpp
@@ -134,8 +136,6 @@ 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
@@ -158,6 +158,7 @@ add_library(neochat STATIC
     models/linemodel.cpp
     models/linemodel.h
     events/locationbeaconevent.h
+    events/serveraclevent.h
     events/widgetevent.h
     enums/messagecomponenttype.h
     models/messagecontentmodel.cpp
@@ -176,33 +177,13 @@ add_library(neochat STATIC
     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
-    enums/messagetype.h
-    messagecomponent.h
 )
 
 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
+qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat
     QML_FILES
         qml/Main.qml
@@ -226,10 +207,16 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         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/EmojiPicker.qml
         qml/UserDetailDialog.qml
         qml/CreateRoomDialog.qml
+        qml/EmojiDialog.qml
         qml/OpenFileDialog.qml
         qml/KeyVerificationDialog.qml
         qml/ConfirmLogoutDialog.qml
@@ -240,10 +227,18 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/EmojiSas.qml
         qml/ConfirmDeactivateAccountDialog.qml
         qml/VerificationCanceled.qml
+        qml/GlobalMenu.qml
+        qml/EditMenu.qml
         qml/MessageDelegateContextMenu.qml
         qml/FileDelegateContextMenu.qml
         qml/MessageSourceSheet.qml
+        qml/ReportSheet.qml
         qml/ConfirmEncryptionDialog.qml
+        qml/RemoveSheet.qml
+        qml/BanSheet.qml
+        qml/EmojiTonesPicker.qml
+        qml/EmojiDelegate.qml
+        qml/EmojiGrid.qml
         qml/RoomSearchPage.qml
         qml/LocationChooser.qml
         qml/TimelineView.qml
@@ -267,6 +262,7 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/SelectParentDialog.qml
         qml/QrCodeMaximizeComponent.qml
         qml/SelectSpacesDialog.qml
+        qml/AttachDialog.qml
         qml/NotificationsView.qml
         qml/SearchPage.qml
         qml/ServerComboBox.qml
@@ -284,34 +280,15 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         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(NOT ANDROID AND NOT WIN32)
-    qt_target_qml_sources(neochat QML_FILES
-        qml/ShareAction.qml
-        qml/GlobalMenu.qml
-        qml/EditMenu.qml
-    )
+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
@@ -389,7 +366,7 @@ if(NOT ANDROID)
     target_compile_definitions(neochat PUBLIC -DHAVE_ICU)
 endif()
 
-if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU)
+if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
     target_compile_definitions(neochat PUBLIC -DHAVE_X11=1)
     target_sources(neochat PRIVATE runner.cpp)
@@ -402,7 +379,7 @@ else()
 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 PRIVATE settingsplugin timelineplugin devtoolsplugin loginplugin)
 target_link_libraries(neochat PUBLIC
     Qt::Core
     Qt::Quick
@@ -430,7 +407,7 @@ 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)
+kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
 
 if(NEOCHAT_FLATPAK)
     target_compile_definitions(neochat PUBLIC NEOCHAT_FLATPAK)
@@ -445,11 +422,8 @@ if(ANDROID)
     target_sources(neochat-app PRIVATE notifyrc.qrc)
     target_link_libraries(neochat PUBLIC Qt::Svg OpenSSL::SSL)
     kirigami_package_breeze_icons(ICONS
-        "arrow-down-symbolic"
-        "arrow-up-symbolic"
-        "arrow-up-double-symbolic"
-        "arrow-left-symbolic"
-        "arrow-right-symbolic"
+        "arrow-down"
+        "arrow-up"
         "checkmark"
         "help-about"
         "im-user"
@@ -458,7 +432,6 @@ if(ANDROID)
         "mail-attachment"
         "dialog-cancel"
         "preferences-desktop-emoticons"
-        "preferences-security"
         "document-open"
         "document-save"
         "document-send"

src/actionshandler.cpp

@@ -1,48 +1,70 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org>
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "actionshandler.h"
 
-#include "chatbarcache.h"
+#include <Quotient/csapi/joining.h>
+#include <Quotient/events/roommemberevent.h>
+
+#include <cmark.h>
+
+#include <KLocalizedString>
+#include <QStringBuilder>
+
 #include "models/actionsmodel.h"
 #include "neochatconfig.h"
 #include "texthandler.h"
 
 using namespace Quotient;
-using namespace Qt::StringLiterals;
 
-void ActionsHandler::handleMessageEvent(NeoChatRoom *room, ChatBarCache *chatBarCache)
+ActionsHandler::ActionsHandler(QObject *parent)
+    : QObject(parent)
 {
-    if (room == nullptr || chatBarCache == nullptr) {
+}
+
+NeoChatRoom *ActionsHandler::room() const
+{
+    return m_room;
+}
+
+void ActionsHandler::setRoom(NeoChatRoom *room)
+{
+    if (m_room == room) {
+        return;
+    }
+
+    m_room = room;
+    Q_EMIT roomChanged();
+}
+
+void ActionsHandler::handleMessageEvent(ChatBarCache *chatBarCache)
+{
+    if (!m_room || !chatBarCache) {
         qWarning() << "ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.";
         return;
     }
 
+    checkEffects(chatBarCache->text());
     if (!chatBarCache->attachmentPath().isEmpty()) {
         QUrl url(chatBarCache->attachmentPath());
         auto path = url.isLocalFile() ? url.toLocalFile() : url.toString();
-        room->uploadFile(QUrl(path), chatBarCache->text().isEmpty() ? path.mid(path.lastIndexOf(u'/') + 1) : chatBarCache->text());
+        m_room->uploadFile(QUrl(path), chatBarCache->text().isEmpty() ? path.mid(path.lastIndexOf(u'/') + 1) : chatBarCache->text());
         chatBarCache->setAttachmentPath({});
         chatBarCache->setText({});
         return;
     }
 
-    const auto handledText = handleMentions(chatBarCache);
-    const auto result = handleQuickEdit(room, handledText);
-    if (!result) {
-        handleMessage(room, handledText, chatBarCache);
-    }
+    QString handledText = chatBarCache->text();
+    handledText = handleMentions(handledText, chatBarCache->mentions());
+    handleMessage(m_room->mainCache()->text(), handledText, chatBarCache);
 }
 
-QString ActionsHandler::handleMentions(ChatBarCache *chatBarCache)
+QString ActionsHandler::handleMentions(QString handledText, QList<Mention> *mentions)
 {
-    const auto mentions = chatBarCache->mentions();
     std::sort(mentions->begin(), mentions->end(), [](const auto &a, const auto &b) -> bool {
         return a.cursor.anchor() > b.cursor.anchor();
     });
 
-    auto handledText = chatBarCache->text();
     for (const auto &mention : *mentions) {
         if (mention.text.isEmpty() || mention.id.isEmpty()) {
             continue;
@@ -56,64 +78,48 @@ QString ActionsHandler::handleMentions(ChatBarCache *chatBarCache)
     return handledText;
 }
 
-bool ActionsHandler::handleQuickEdit(NeoChatRoom *room, const QString &handledText)
+void ActionsHandler::handleMessage(const QString &text, QString handledText, ChatBarCache *chatBarCache)
 {
-    if (room == nullptr) {
-        return false;
-    }
-
+    Q_ASSERT(m_room);
     if (NeoChatConfig::allowQuickEdit()) {
         QRegularExpression sed(QStringLiteral("^s/([^/]*)/([^/]*)(/g)?$"));
-        auto match = sed.match(handledText);
+        auto match = sed.match(text);
         if (match.hasMatch()) {
             const QString regex = match.captured(1);
             const QString replacement = match.captured(2).toHtmlEscaped();
             const QString flags = match.captured(3);
 
-            for (auto it = room->messageEvents().crbegin(); it != room->messageEvents().crend(); it++) {
+            for (auto it = m_room->messageEvents().crbegin(); it != m_room->messageEvents().crend(); it++) {
                 if (const auto event = eventCast<const RoomMessageEvent>(&**it)) {
-                    if (event->senderId() == room->localMember().id() && event->hasTextContent()) {
+                    if (event->senderId() == m_room->localUser()->id() && event->hasTextContent()) {
                         QString originalString;
                         if (event->content()) {
-#if Quotient_VERSION_MINOR > 8
-                            originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content().get())->body;
-#else
                             originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content())->body;
-#endif
                         } else {
                             originalString = event->plainBody();
                         }
-                        if (flags == "/g"_L1) {
-                            room->postHtmlMessage(handledText, originalString.replace(regex, replacement), event->msgtype(), {}, event->id());
+                        if (flags == "/g"_ls) {
+                            m_room->postHtmlMessage(handledText, originalString.replace(regex, replacement), event->msgtype(), {}, event->id());
                         } else {
-                            room->postHtmlMessage(handledText,
-                                                  originalString.replace(originalString.indexOf(regex), regex.size(), replacement),
-                                                  event->msgtype(),
-                                                  {},
-                                                  event->id());
+                            m_room->postHtmlMessage(handledText,
+                                                    originalString.replace(originalString.indexOf(regex), regex.size(), replacement),
+                                                    event->msgtype(),
+                                                    {},
+                                                    event->id());
                         }
-                        return true;
+                        return;
                     }
                 }
             }
         }
     }
-    return false;
-}
-
-void ActionsHandler::handleMessage(NeoChatRoom *room, QString handledText, ChatBarCache *chatBarCache)
-{
-    if (room == nullptr) {
-        return;
-    }
-
     auto messageType = RoomMessageEvent::MsgType::Text;
 
     if (handledText.startsWith(QLatin1Char('/'))) {
         for (const auto &action : ActionsModel::instance().allActions()) {
             if (handledText.indexOf(action.prefix) == 1
                 && (handledText.indexOf(" "_ls) == action.prefix.length() + 1 || handledText.length() == action.prefix.length() + 1)) {
-                handledText = action.handle(handledText.mid(action.prefix.length() + 1).trimmed(), room, chatBarCache);
+                handledText = action.handle(handledText.mid(action.prefix.length() + 1).trimmed(), m_room, chatBarCache);
                 if (action.messageType.has_value()) {
                     messageType = *action.messageType;
                 }
@@ -130,11 +136,35 @@ void ActionsHandler::handleMessage(NeoChatRoom *room, QString handledText, ChatB
     textHandler.setData(handledText);
     handledText = textHandler.handleSendText();
 
+    if (handledText.count("<p>"_ls) == 1 && handledText.count("</p>"_ls) == 1) {
+        handledText.remove("<p>"_ls);
+        handledText.remove("</p>"_ls);
+    }
+
     if (handledText.length() == 0) {
         return;
     }
 
-    room->postMessage(chatBarCache->text(), handledText, messageType, chatBarCache->replyId(), chatBarCache->editId(), chatBarCache->threadId());
+    m_room->postMessage(text, handledText, messageType, chatBarCache->replyId(), chatBarCache->editId(), chatBarCache->threadId());
+}
+
+void ActionsHandler::checkEffects(const QString &text)
+{
+    std::optional<QString> effect = std::nullopt;
+    if (text.contains(QStringLiteral("\u2744"))) {
+        effect = QLatin1String("snowflake");
+    } else if (text.contains(QStringLiteral("\u1F386"))) {
+        effect = QLatin1String("fireworks");
+    } else if (text.contains(QStringLiteral("\u2F387"))) {
+        effect = QLatin1String("fireworks");
+    } else if (text.contains(QStringLiteral("\u1F389"))) {
+        effect = QLatin1String("confetti");
+    } else if (text.contains(QStringLiteral("\u1F38A"))) {
+        effect = QLatin1String("confetti");
+    }
+    if (effect.has_value()) {
+        Q_EMIT showEffect(*effect);
+    }
 }
 
 #include "moc_actionshandler.cpp"

src/actionshandler.h

@@ -1,18 +1,22 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org>
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 
-#include <QString>
+#include <QObject>
+#include <QQmlEngine>
+
+#include <Quotient/events/roommessageevent.h>
+
+#include "chatbarcache.h"
+#include "neochatroom.h"
 
-class ChatBarCache;
 class NeoChatRoom;
 
 /**
  * @class ActionsHandler
  *
- * This class contains functions to handle chat messages ready for posting to a room.
+ * This class handles chat messages ready for posting to a room.
  *
  * Everything that needs to be done to prepare the message for posting in a room
  * including:
@@ -27,17 +31,36 @@ class NeoChatRoom;
  *
  * @sa ActionsModel, NeoChatRoom
  */
-class ActionsHandler
+class ActionsHandler : public QObject
 {
+    Q_OBJECT
+    QML_ELEMENT
+
+    /**
+     * @brief The room that messages will be sent to.
+     */
+    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
+
 public:
+    explicit ActionsHandler(QObject *parent = nullptr);
+
+    [[nodiscard]] NeoChatRoom *room() const;
+    void setRoom(NeoChatRoom *room);
+
+Q_SIGNALS:
+    void roomChanged();
+    void showEffect(const QString &effect);
+
+public Q_SLOTS:
     /**
      * @brief Pre-process text and send message event.
      */
-    static void handleMessageEvent(NeoChatRoom *room, ChatBarCache *chatBarCache);
+    void handleMessageEvent(ChatBarCache *chatBarCache);
 
 private:
-    static QString handleMentions(ChatBarCache *chatBarCache);
-    static bool handleQuickEdit(NeoChatRoom *room, const QString &handledText);
+    QPointer<NeoChatRoom> m_room;
+    void checkEffects(const QString &text);
 
-    static void handleMessage(NeoChatRoom *room, QString handledText, ChatBarCache *chatBarCache);
+    QString handleMentions(QString handledText, QList<Mention> *mentions);
+    void handleMessage(const QString &text, QString handledText, ChatBarCache *chatBarCache);
 };

src/chatbar/CMakeLists.txt

@@ -1,18 +0,0 @@
-# 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
-        PieProgressBar.qml
-        EmojiPicker.qml
-        EmojiDialog.qml
-        EmojiTonesPicker.qml
-)

src/chatbarcache.cpp

@@ -3,9 +3,6 @@
 
 #include "chatbarcache.h"
 
-#include <Quotient/roommember.h>
-
-#include "actionshandler.h"
 #include "chatdocumenthandler.h"
 #include "eventhandler.h"
 #include "neochatroom.h"
@@ -54,7 +51,6 @@ void ChatBarCache::setReplyId(const QString &replyId)
         m_relationType = Reply;
     }
     m_attachmentPath = QString();
-    delete m_relationContentModel;
     Q_EMIT relationIdChanged(oldEventId, m_relationId);
     Q_EMIT attachmentPathChanged();
 }
@@ -84,12 +80,11 @@ void ChatBarCache::setEditId(const QString &editId)
         m_relationType = Edit;
     }
     m_attachmentPath = QString();
-    delete m_relationContentModel;
     Q_EMIT relationIdChanged(oldEventId, m_relationId);
     Q_EMIT attachmentPathChanged();
 }
 
-Quotient::RoomMember ChatBarCache::relationAuthor() const
+QVariantMap ChatBarCache::relationUser() const
 {
     if (parent() == nullptr) {
         qWarning() << "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.";
@@ -101,9 +96,9 @@ Quotient::RoomMember ChatBarCache::relationAuthor() const
         return {};
     }
     if (m_relationId.isEmpty()) {
-        return room->member(QString());
+        return room->getUser(nullptr);
     }
-    return room->member((*room->findInTimeline(m_relationId))->senderId());
+    return room->getUser(room->user((*room->findInTimeline(m_relationId))->senderId()));
 }
 
 QString ChatBarCache::relationMessage() const
@@ -122,33 +117,12 @@ QString ChatBarCache::relationMessage() const
     }
 
     if (auto event = room->findInTimeline(m_relationId); event != room->historyEdge()) {
-        return EventHandler::markdownBody(&**event);
+        EventHandler eventhandler(room, &**event);
+        return eventhandler.getMarkdownBody();
     }
     return {};
 }
 
-MessageContentModel *ChatBarCache::relationEventContentModel()
-{
-    if (parent() == nullptr) {
-        qWarning() << "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.";
-        return nullptr;
-    }
-    if (m_relationId.isEmpty()) {
-        return nullptr;
-    }
-    if (m_relationContentModel != nullptr) {
-        return m_relationContentModel;
-    }
-
-    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 nullptr;
-    }
-    m_relationContentModel = new MessageContentModel(room, m_relationId, true);
-    return m_relationContentModel;
-}
-
 bool ChatBarCache::isThreaded() const
 {
     return !m_threadId.isEmpty();
@@ -164,8 +138,8 @@ void ChatBarCache::setThreadId(const QString &threadId)
     if (m_threadId == threadId) {
         return;
     }
-    const auto oldThreadId = std::exchange(m_threadId, threadId);
-    Q_EMIT threadIdChanged(oldThreadId, m_threadId);
+    m_threadId = threadId;
+    Q_EMIT threadIdChanged();
 }
 
 QString ChatBarCache::attachmentPath() const
@@ -181,22 +155,10 @@ void ChatBarCache::setAttachmentPath(const QString &attachmentPath)
     m_attachmentPath = attachmentPath;
     m_relationType = None;
     const auto oldEventId = std::exchange(m_relationId, QString());
-    delete m_relationContentModel;
     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();
-    delete m_relationContentModel;
-    Q_EMIT relationIdChanged(oldEventId, m_relationId);
-    Q_EMIT threadIdChanged(oldThreadId, m_threadId);
-    Q_EMIT attachmentPathChanged();
-}
-
 QList<Mention> *ChatBarCache::mentions()
 {
     return &m_mentions;
@@ -260,15 +222,4 @@ void ChatBarCache::setSavedText(const QString &savedText)
     m_savedText = savedText;
 }
 
-void ChatBarCache::postMessage()
-{
-    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;
-    }
-
-    ActionsHandler::handleMessageEvent(room, this);
-}
-
 #include "moc_chatbarcache.cpp"

src/chatbarcache.h

@@ -8,16 +8,8 @@
 #include <QQuickTextDocument>
 #include <QTextCursor>
 
-#include "models/messagecontentmodel.h"
-
 class ChatDocumentHandler;
 
-namespace Quotient
-{
-class RoomMember;
-}
-
-
 /**
  * @brief Defines a user mention in the current chat or edit text.
  */
@@ -35,7 +27,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. ChatBarComponent.
+ * necessarily have to use the ChatBar component, e.g. MessageEditComponent.
  *
  * 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
@@ -45,7 +37,7 @@ struct Mention {
  *       as it's parent. This is necessary for certain functions which need to get
  *       relevant room information.
  *
- * @sa ChatBar, ChatBarComponent, NeoChatRoom
+ * @sa ChatBar, MessageEditComponent, NeoChatRoom
  */
 class ChatBarCache : public QObject
 {
@@ -96,13 +88,26 @@ class ChatBarCache : public QObject
     Q_PROPERTY(QString editId READ editId WRITE setEditId NOTIFY relationIdChanged)
 
     /**
-     * @brief Get the RoomMember object for the message being replied to.
+     * @brief Get the user for the message being replied to.
      *
-     * Returns an empty RoomMember if not replying to a message.
+     * 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.
      *
-     * @sa Quotient::RoomMember
+     * 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
      */
-    Q_PROPERTY(Quotient::RoomMember relationAuthor READ relationAuthor NOTIFY relationIdChanged)
+    Q_PROPERTY(QVariantMap relationUser READ relationUser NOTIFY relationIdChanged)
 
     /**
      * @brief The content of the related message.
@@ -111,13 +116,6 @@ class ChatBarCache : public QObject
      */
     Q_PROPERTY(QString relationMessage READ relationMessage NOTIFY relationIdChanged)
 
-    /**
-     * @brief The MessageContentModel for the related message.
-     *
-     * Will be nullptr if no related message.
-     */
-    Q_PROPERTY(MessageContentModel *relationEventContentModel READ relationEventContentModel NOTIFY relationIdChanged)
-
     /**
      * @brief Whether the chat bar is replying in a thread.
      */
@@ -163,10 +161,9 @@ public:
     QString editId() const;
     void setEditId(const QString &editId);
 
-    Quotient::RoomMember relationAuthor() const;
+    QVariantMap relationUser() const;
 
     QString relationMessage() const;
-    MessageContentModel *relationEventContentModel();
 
     bool isThreaded() const;
     QString threadId() const;
@@ -175,13 +172,6 @@ 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.
      */
@@ -202,15 +192,10 @@ public:
      */
     void setSavedText(const QString &savedText);
 
-    /**
-     * @brief Post the contents of the cache as a message in the room.
-     */
-    Q_INVOKABLE void postMessage();
-
 Q_SIGNALS:
     void textChanged();
     void relationIdChanged(const QString &oldEventId, const QString &newEventId);
-    void threadIdChanged(const QString &oldThreadId, const QString &newThreadId);
+    void threadIdChanged();
     void attachmentPathChanged();
 
 private:
@@ -221,6 +206,4 @@ private:
     QString m_attachmentPath = QString();
     QList<Mention> m_mentions;
     QString m_savedText;
-
-    QPointer<MessageContentModel> m_relationContentModel;
 };

src/colorschemer.cpp

@@ -26,9 +26,23 @@ void ColorSchemer::apply(int idx)
     c->activateScheme(c->model()->index(idx, 0));
 }
 
-int ColorSchemer::indexForCurrentScheme()
+void ColorSchemer::apply(const QString &name)
 {
-    return c->indexForSchemeId(c->activeSchemeId()).row();
+    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();
 }
 
 #include "moc_colorschemer.cpp"

src/colorschemer.h

@@ -44,11 +44,21 @@ public:
     Q_INVOKABLE void apply(int idx);
 
     /**
-     * @brief Get the row for the current color scheme.
+     * @brief Activates the KColorScheme with the given name.
      *
      * @sa KColorScheme
      */
-    Q_INVOKABLE int indexForCurrentScheme();
+    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;
 
 private:
     KColorSchemeManager *c;

src/controller.cpp

@@ -9,19 +9,27 @@
 #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/csapi/logout.h>
 #include <Quotient/csapi/notifications.h>
+#include <Quotient/eventstats.h>
 #include <Quotient/qt_connection_util.h>
-#include <Quotient/settings.h>
 
 #include "neochatconfig.h"
 #include "neochatconnection.h"
 #include "neochatroom.h"
 #include "notificationsmanager.h"
 #include "proxycontroller.h"
+#include "roommanager.h"
 
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
 #include "trayicon.h"
@@ -37,10 +45,6 @@
 #endif
 #endif
 
-#ifdef HAVE_KUNIFIEDPUSH
-#include <kunifiedpush/connector.h>
-#endif
-
 bool testMode = false;
 
 using namespace Quotient;
@@ -63,11 +67,7 @@ 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();
@@ -106,16 +106,14 @@ 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,
-                [this, connection] {
-                    if (!m_endpoint.isEmpty()) {
-                        connection->setupPushNotifications(m_endpoint);
-                    }
-                },
-                Qt::SingleShotConnection);
+            connect(connection, &NeoChatConnection::syncDone, this, [connection]() {
+                NotificationsManager::instance().handleNotifications(connection);
+            });
+            connectSingleShot(connection, &NeoChatConnection::syncDone, this, [this, connection] {
+                if (!m_endpoint.isEmpty()) {
+                    connection->setupPushNotifications(m_endpoint);
+                }
+            });
         }
         oldAccountCount = m_accountRegistry.size();
     });
@@ -169,10 +167,6 @@ void Controller::addConnection(NeoChatConnection *c)
         dropConnection(c);
     });
     connect(c, &NeoChatConnection::badgeNotificationCountChanged, this, &Controller::updateBadgeNotificationCount);
-    connect(c, &NeoChatConnection::syncDone, this, [this, c]() {
-        m_notificationsManager.handleNotifications(c);
-    });
-    connect(c, &NeoChatConnection::showInviteNotification, &m_notificationsManager, &NotificationsManager::postInviteNotification);
 
     c->sync();
 
@@ -183,8 +177,6 @@ void Controller::dropConnection(NeoChatConnection *c)
 {
     Q_ASSERT_X(c, __FUNCTION__, "Attempt to drop a null connection");
 
-    c->disconnect(this);
-    c->disconnect(&m_notificationsManager);
     m_accountRegistry.drop(c);
     Q_EMIT connectionDropped(c);
 }
@@ -197,7 +189,7 @@ void Controller::invokeLogin()
         m_accountsLoading += accountId;
         Q_EMIT accountsLoadingChanged();
         if (!account.homeserver().isEmpty()) {
-            auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account.userId());
+            auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account);
             connect(accessTokenLoadingJob, &QKeychain::Job::finished, this, [accountId, this, accessTokenLoadingJob](QKeychain::Job *) {
                 AccountSettings account{accountId};
                 QString accessToken;
@@ -211,43 +203,25 @@ void Controller::invokeLogin()
                 m_connectionsLoading[accountId] = connection;
                 connect(connection, &NeoChatConnection::connected, this, [this, connection, accountId] {
                     connection->loadState();
-                    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);
-                    }
+                    addConnection(connection);
+                    m_accountsLoading.removeAll(connection->userId());
+                    m_connectionsLoading.remove(accountId);
+                    Q_EMIT accountsLoadingChanged();
                 });
                 connect(connection, &NeoChatConnection::networkError, this, [this](const QString &error, const QString &, int, int) {
-                    Q_EMIT errorOccured(i18n("Network Error: %1", error));
+                    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 QString &userId)
+QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const AccountSettings &account)
 {
-    qDebug() << "Reading access token from the keychain for" << userId;
+    qDebug() << "Reading access token from the keychain for" << account.userId();
     auto job = new QKeychain::ReadPasswordJob(qAppName(), this);
-    job->setKey(userId);
+    job->setKey(account.userId());
 
     // Handling of errors
     connect(job, &QKeychain::Job::finished, this, [this, job]() {
@@ -257,17 +231,17 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const QStrin
 
         switch (job->error()) {
         case QKeychain::EntryNotFound:
-            Q_EMIT errorOccured(i18n("Access token wasn't found: Maybe it was deleted?"));
+            Q_EMIT errorOccured(i18n("Access token wasn't found"), i18n("Maybe it was deleted?"));
             break;
         case QKeychain::AccessDeniedByUser:
         case QKeychain::AccessDenied:
-            Q_EMIT errorOccured(i18n("Access to keychain was denied: Please allow NeoChat to read the access token"));
+            Q_EMIT errorOccured(i18n("Access to keychain was denied."), i18n("Please allow NeoChat to read the access token"));
             break;
         case QKeychain::NoBackendAvailable:
-            Q_EMIT errorOccured(i18n("No keychain available: Please install a keychain, e.g. KWallet or GNOME keyring on Linux"));
+            Q_EMIT errorOccured(i18n("No keychain available."), i18n("Please install a keychain, e.g. KWallet or GNOME keyring on Linux"));
             break;
         case QKeychain::OtherError:
-            Q_EMIT errorOccured(i18n("Unable to read access token: %1", job->errorString()));
+            Q_EMIT errorOccured(i18n("Unable to read access token"), job->errorString());
             break;
         default:
             break;
@@ -278,19 +252,23 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const QStrin
     return job;
 }
 
-void Controller::saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken)
+bool Controller::saveAccessTokenToKeyChain(const AccountSettings &account, const QByteArray &accessToken)
 {
-    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();
+    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;
 }
 
 bool Controller::supportSystemTray() const
@@ -332,18 +310,11 @@ void Controller::setActiveConnection(NeoChatConnection *connection)
         return;
     }
 
-    if (m_connection != nullptr) {
-        m_connection->disconnect(this);
-        m_connection->disconnect(&m_notificationsManager);
-    }
-
     m_connection = connection;
 
     if (m_connection != nullptr) {
         m_connection->refreshBadgeNotificationCount();
         updateBadgeNotificationCount(m_connection, m_connection->badgeNotificationCount());
-
-        connect(m_connection, &NeoChatConnection::errorOccured, this, &Controller::errorOccured);
     }
 
     Q_EMIT activeConnectionChanged(m_connection);
@@ -358,7 +329,7 @@ void Controller::listenForNotifications()
     connect(timer, &QTimer::timeout, qGuiApp, &QGuiApplication::quit);
 
     connect(connector, &KUnifiedPush::Connector::messageReceived, [timer](const QByteArray &data) {
-        instance().m_notificationsManager.postPushNotification(data);
+        NotificationsManager::instance().postPushNotification(data);
         timer->stop();
     });
 
@@ -370,11 +341,6 @@ void Controller::listenForNotifications()
 #endif
 }
 
-void Controller::clearInvitationNotification(const QString &roomId)
-{
-    m_notificationsManager.clearInvitationNotification(roomId);
-}
-
 void Controller::updateBadgeNotificationCount(NeoChatConnection *connection, int count)
 {
     if (connection == m_connection) {
@@ -427,6 +393,8 @@ QString Controller::loadFileContent(const QString &path) const
     return QString::fromLatin1(file.readAll());
 }
 
+#include "moc_controller.cpp"
+
 void Controller::setTestMode(bool test)
 {
     testMode = test;
@@ -442,30 +410,11 @@ void Controller::removeConnection(const QString &userId)
     }
 }
 
-bool Controller::csSupported() const
+bool Controller::ssssSupported() const
 {
-#if Quotient_VERSION_MINOR > 8
+#if __has_include("Quotient/e2ee/sssshandler.h")
     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,10 +5,15 @@
 
 #include <QObject>
 #include <QQmlEngine>
+#include <QQuickItem>
 
 #include "neochatconnection.h"
-#include "notificationsmanager.h"
 #include <Quotient/accountregistry.h>
+#include <Quotient/settings.h>
+
+#ifdef HAVE_KUNIFIEDPUSH
+#include <kunifiedpush/connector.h>
+#endif
 
 class TrayIcon;
 class QQuickTextDocument;
@@ -51,7 +56,7 @@ class Controller : public QObject
 
     Q_PROPERTY(QStringList accountsLoading MEMBER m_accountsLoading NOTIFY accountsLoadingChanged)
 
-    Q_PROPERTY(bool csSupported READ csSupported CONSTANT)
+    Q_PROPERTY(bool ssssSupported READ ssssSupported CONSTANT)
 
 public:
     static Controller &instance();
@@ -77,7 +82,7 @@ public:
     /**
      * @brief Save an access token to the keychain for the given account.
      */
-    void saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken);
+    bool saveAccessTokenToKeyChain(const Quotient::AccountSettings &account, const QByteArray &accessToken);
 
     [[nodiscard]] bool supportSystemTray() const;
 
@@ -89,13 +94,6 @@ public:
      */
     static void listenForNotifications();
 
-    /**
-     * @brief Clear an existing invite notification for the given room.
-     *
-     * Nothing happens if the given room doesn't have an invite notification.
-     */
-    Q_INVOKABLE void clearInvitationNotification(const QString &roomId);
-
     Q_INVOKABLE QString loadFileContent(const QString &path) const;
 
     Quotient::AccountRegistry &accounts();
@@ -104,18 +102,7 @@ public:
 
     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);
+    bool ssssSupported() const;
 
 private:
     explicit Controller(QObject *parent = nullptr);
@@ -123,15 +110,15 @@ private:
     QPointer<NeoChatConnection> m_connection;
     TrayIcon *m_trayIcon = nullptr;
 
-    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const QString &account);
+    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const Quotient::AccountSettings &account);
+
+    void loadSettings();
+    void saveSettings() const;
 
     Quotient::AccountRegistry m_accountRegistry;
     QStringList m_accountsLoading;
     QMap<QString, QPointer<NeoChatConnection>> m_connectionsLoading;
     QString m_endpoint;
-    QStringList m_shownImages;
-
-    NotificationsManager m_notificationsManager;
 
 private Q_SLOTS:
     void invokeLogin();
@@ -139,10 +126,7 @@ private Q_SLOTS:
     void updateBadgeNotificationCount(NeoChatConnection *connection, int count);
 
 Q_SIGNALS:
-    /**
-     * @brief Request a error message be shown to the user.
-     */
-    void errorOccured(const QString &error);
+    void errorOccured(const QString &error, const QString &detail);
     void connectionAdded(NeoChatConnection *connection);
     void connectionDropped(NeoChatConnection *connection);
     void activeConnectionChanged(NeoChatConnection *connection);

src/devtools/CMakeLists.txt

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 qt_add_library(devtools STATIC)
-ecm_add_qml_module(devtools GENERATE_PLUGIN_SOURCE
+qt_add_qml_module(devtools
     URI org.kde.neochat.devtools
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/devtools
     QML_FILES

src/devtools/DebugOptions.qml

@@ -17,25 +17,25 @@ FormCard.FormCardPage {
 
         FormCard.FormCheckDelegate {
             text: i18nc("@option:check", "Show hidden events in the timeline")
-            checked: NeoChatConfig.showAllEvents
+            checked: Config.showAllEvents
 
-            onToggled: NeoChatConfig.showAllEvents = checked
+            onToggled: Config.showAllEvents = checked
         }
         FormCard.FormCheckDelegate {
             id: roomAccountDataVisibleCheck
             text: i18nc("@option:check Enable the matrix 'threads' feature", "Always allow device verification")
             description: i18n("Allow the user to start a verification session with devices that were already verified")
-            checked: NeoChatConfig.alwaysVerifyDevice
+            checked: Config.alwaysVerifyDevice
 
-            onToggled: NeoChatConfig.alwaysVerifyDevice = checked
+            onToggled: Config.alwaysVerifyDevice = checked
         }
         FormCard.FormCheckDelegate {
             text: i18nc("@option:check", "Show focus in window header")
-            checked: NeoChatConfig.windowTitleFocus
+            checked: Config.windowTitleFocus
 
             onToggled: {
-                NeoChatConfig.windowTitleFocus = checked;
-                NeoChatConfig.save();
+                Config.windowTitleFocus = checked;
+                Config.save();
             }
         }
     }

src/devtools/DevtoolsPage.qml

@@ -31,12 +31,12 @@ FormCard.FormCardPage {
             implicitWidth: tabBar.tabWidth
         }
         QQC2.TabButton {
-            text: i18nc("@title:tab", "Room Data")
+            text: qsTr("Room Data")
 
             implicitWidth: tabBar.tabWidth
         }
         QQC2.TabButton {
-            text: i18nc("@title:tab", "Server Info")
+            text: qsTr("Server Info")
 
             implicitWidth: tabBar.tabWidth
         }

src/devtools/FeatureFlagPage.qml

@@ -18,24 +18,15 @@ FormCard.FormCardPage {
         FormCard.FormCheckDelegate {
             id: roomAccountDataVisibleCheck
             text: i18nc("@option:check Enable the matrix 'threads' feature", "Threads")
-            checked: NeoChatConfig.threads
+            checked: Config.threads
 
-            onToggled: NeoChatConfig.threads = checked
+            onToggled: Config.threads = checked
         }
         FormCard.FormCheckDelegate {
             text: i18nc("@option:check Enable the matrix 'secret backup' feature", "Secret Backup")
-            checked: NeoChatConfig.secretBackup
+            checked: Config.secretBackup
 
-            onToggled: NeoChatConfig.secretBackup = checked
-        }
-        FormCard.FormCheckDelegate {
-            text: i18nc("@option:check Enable the matrix feature to add a phone number as a third party ID", "Add phone numbers as 3PIDs")
-            checked: NeoChatConfig.phone3PId
-
-            onToggled: {
-                NeoChatConfig.phone3PId = checked
-                NeoChatConfig.save();
-            }
+            onToggled: Config.secretBackup = checked
         }
     }
 }

src/emojitones.cpp

@@ -5,5 +5,5 @@
 #include "models/emojimodel.h"
 
 QMultiHash<QString, QVariant> EmojiTones::_tones = {
-    // #include "emojitones_data.h"
+#include "emojitones_data.h"
 };

src/enums/delegatetype.h

@@ -38,8 +38,6 @@ public:
         ReadMarker, /**< The local user read marker. */
         Loading, /**< A delegate to tell the user more messages are being loaded. */
         TimelineEnd, /**< A delegate to inform that all messages are loaded. */
-        Predecessor, /**< A delegate to show a room predecessor. */
-        Successor, /**< A delegate to show a room successor. */
         Other, /**< Anything that cannot be classified as another type. */
     };
     Q_ENUM(Type);

src/enums/messagecomponenttype.h

@@ -33,7 +33,6 @@ public:
      *       a room message.
      */
     enum Type {
-        Author, /**< The message sender and time. */
         Text, /**< A text message. */
         Image, /**< A message that is an image. */
         Audio, /**< A message that is an audio recording. */
@@ -48,11 +47,11 @@ public:
         LiveLocation, /**< The initial event of a shared live location (i.e., the place where this is supposed to be shown in the timeline). */
         Encrypted, /**< An encrypted message that cannot be decrypted. */
         Reply, /**< A component to show a replied-to message. */
+        ReplyLoad, /**< A loading dialog for a reply. */
         LinkPreview, /**< A preview of a URL in the message. */
         LinkPreviewLoad, /**< A loading dialog for a link preview. */
-        ChatBar, /**< A text edit for editing a message. */
+        Edit, /**< A text edit for editing a message. */
         Verification, /**< A user verification session start message. */
-        Loading, /**< The component is loading. */
         Other, /**< Anything that cannot be classified as another type. */
     };
     Q_ENUM(Type);

src/enums/messagetype.h

@@ -1,31 +0,0 @@
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#pragma once
-
-#include <QObject>
-#include <QQmlEngine>
-
-/**
- * @class MessageType
- *
- * This class is designed to define the MessageType enumeration.
- */
-class MessageType : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-public:
-    /**
-     * @brief The types of messages that can be shown.
-     */
-    enum Type {
-        Information = 0, /**< Info message, typically highlight color. */
-        Positive, /**< Positive message, typically green. */
-        Warning, /**< Warning message, typically amber. */
-        Error, /**< Error message, typically red. */
-    };
-    Q_ENUM(Type);
-};

src/enums/powerlevel.cpp

@@ -1,109 +0,0 @@
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include "powerlevel.h"
-
-QString PowerLevel::nameForLevel(Level level)
-{
-    switch (level) {
-    case PowerLevel::Member:
-        return i18n("Member");
-    case PowerLevel::Moderator:
-        return i18n("Moderator");
-    case PowerLevel::Admin:
-        return i18n("Admin");
-    case PowerLevel::Mute:
-        return i18n("Mute");
-    case PowerLevel::Custom:
-        return i18n("Custom");
-    default:
-        return {};
-    }
-}
-
-int PowerLevel::valueForLevel(Level level)
-{
-    switch (level) {
-    case PowerLevel::Member:
-        return 0;
-    case PowerLevel::Moderator:
-        return 50;
-    case PowerLevel::Admin:
-        return 100;
-    case PowerLevel::Mute:
-        return -1;
-    default:
-        return {};
-    }
-}
-
-PowerLevel::Level PowerLevel::levelForValue(int value)
-{
-    switch (value) {
-    case 0:
-        return PowerLevel::Member;
-    case 50:
-        return PowerLevel::Moderator;
-    case 100:
-        return PowerLevel::Admin;
-    case -1:
-        return PowerLevel::Mute;
-    default:
-        return PowerLevel::Custom;
-    }
-}
-
-PowerLevelModel::PowerLevelModel(QObject *parent)
-    : QAbstractListModel(parent)
-{
-}
-
-bool PowerLevelModel::showMute() const
-{
-    return m_showMute;
-}
-
-void PowerLevelModel::setShowMute(bool showMute)
-{
-    if (showMute == m_showMute) {
-        return;
-    }
-    m_showMute = showMute;
-    Q_EMIT showMuteChanged();
-}
-
-QVariant PowerLevelModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid()) {
-        return {};
-    }
-    if (index.row() >= rowCount()) {
-        qDebug() << "PowerLevelModel, something's wrong: index.row() >= m_rules.count()";
-        return {};
-    }
-
-    const auto level = static_cast<PowerLevel::Level>(index.row());
-    if (role == NameRole) {
-        return i18nc("%1 is the name of the power level, e.g. admin and %2 is the value that represents.",
-                     "%1 (%2)",
-                     PowerLevel::nameForLevel(level),
-                     PowerLevel::valueForLevel(level));
-    }
-    if (role == ValueRole) {
-        return PowerLevel::valueForLevel(level);
-    }
-    return {};
-}
-
-int PowerLevelModel::rowCount(const QModelIndex &parent) const
-{
-    Q_UNUSED(parent)
-    return PowerLevel::NUMLevels - (m_showMute ? 0 : 1);
-}
-
-QHash<int, QByteArray> PowerLevelModel::roleNames() const
-{
-    return {{NameRole, "name"}, {ValueRole, "value"}};
-}
-
-#include "moc_powerlevel.cpp"

src/enums/powerlevel.h

@@ -1,110 +0,0 @@
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#pragma once
-
-#include <QAbstractListModel>
-#include <QObject>
-#include <QQmlEngine>
-
-#include <KLocalizedString>
-
-/**
- * @class PowerLevel
- *
- * This class is designed to define the PowerLevel enumeration.
- */
-class PowerLevel : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-public:
-    /**
-     * @brief The type of delegate that is needed for the event.
-     *
-     * @note While similar this is not the matrix event or message type. This is
-     *       to tell a QML ListView what delegate to show for each event. So while
-     *       similar to the spec it is not the same.
-     */
-    enum Level {
-        Member, /**< A basic member. */
-        Moderator, /**< A moderator with enhanced powers. */
-        Admin, /**< The highest power level in the room. */
-        Mute, /**< The level to remove posting privileges. */
-        NUMLevels,
-        Custom, /**< A non-standard value. Intentionally after NUMLevels so it doesn't appear in the model. */
-    };
-    Q_ENUM(Level);
-
-    /**
-     * @brief Return a string representation of the enum value.
-     */
-    static QString nameForLevel(Level level);
-
-    /**
-     * @brief Return the integer representation of the enum value.
-     */
-    static int valueForLevel(Level level);
-
-    /**
-     * @brief Return the enum value for the given integer power level.
-     */
-    static Level levelForValue(int value);
-};
-
-/**
- * @class PowerLevelModel
- *
- * A model visualize the allowed power levels.
- */
-class PowerLevelModel : public QAbstractListModel
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    Q_PROPERTY(bool showMute READ showMute WRITE setShowMute NOTIFY showMuteChanged)
-
-public:
-    /**
-     * @brief Defines the model roles.
-     */
-    enum Roles {
-        NameRole = Qt::DisplayRole, /**< The power level name. */
-        ValueRole, /**< The power level value. */
-    };
-    Q_ENUM(Roles)
-
-    explicit PowerLevelModel(QObject *parent = nullptr);
-
-    [[nodiscard]] bool showMute() const;
-    void setShowMute(bool showMute);
-
-    /**
-     * @brief Get the given role value at the given index.
-     *
-     * @sa QAbstractItemModel::data
-     */
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-
-    /**
-     * @brief Number of rows in the model.
-     *
-     * @sa  QAbstractItemModel::rowCount
-     */
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-
-    /**
-     * @brief Returns a mapping from Role enum values to role names.
-     *
-     * @sa Roles, QAbstractItemModel::roleNames()
-     */
-    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
-
-Q_SIGNALS:
-    void showMuteChanged();
-
-private:
-    bool m_showMute = true;
-};

src/eventhandler.h

@@ -3,22 +3,19 @@
 
 #pragma once
 
-#include <QDateTime>
-#include <QString>
-#include <Quotient/events/eventcontent.h>
+#include <QObject>
 
-namespace Quotient
-{
-namespace EventContent
-{
-class FileInfo;
-}
-class RoomEvent;
-class RoomMember;
-class RoomMessageEvent;
-}
+#include <KFormat>
 
+#include <Quotient/eventitem.h>
+#include <Quotient/events/roomevent.h>
+#include <Quotient/events/roommessageevent.h>
+
+#include "enums/messagecomponenttype.h"
+
+class LinkPreviewer;
 class NeoChatRoom;
+class ReactionModel;
 
 /**
  * @class EventHandler
@@ -36,19 +33,53 @@ class NeoChatRoom;
  */
 class EventHandler
 {
+    Q_GADGET
+
 public:
+    EventHandler(const NeoChatRoom *room, const Quotient::RoomEvent *event);
+
     /**
-     * @brief Return the ID of the event.
-     *
-     * Returns the transaction ID if the Matrix ID is empty, which may be the case
-     * for a pending event.
+     * @brief Return the Matrix ID of the event.
      */
-    static QString id(const Quotient::RoomEvent *event);
+    QString getId() const;
+
+    /**
+     * @brief The MessageComponentType to use to visualise the main event content.
+     */
+    MessageComponentType::Type messageComponentType() const;
+
+    /**
+     * @brief Get the author of the event in context of the room.
+     *
+     * 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. This function
+     * uses the room context and outputs the result as QVariantMap.
+     *
+     * An empty QVariantMap will be returned if the EventHandler hasn't had the room
+     * intialised. An empty user (i.e. a QVariantMap with all the correct keys
+     * but empty values) will be returned if the room has been set but not an event.
+     *
+     * @param isPending if the event is pending, i.e. has not been confirmed by
+     *                  the server.
+     *
+     * @return a QVariantMap for the user with 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 Quotient::User
+     */
+    QVariantMap getAuthor(bool isPending = false) const;
 
     /**
      * @brief Get the display name of the event author.
      *
-     * This method is special in that it will return
+     * This method is separate from getAuthor() and special in that it will return
      * the old display name of the author if the current event is one that caused it
      * to change. This allows for scenarios where the UI wishes to notify that a
      * user's display name has changed and what it changed from.
@@ -56,7 +87,7 @@ public:
      * @param isPending whether the event is pending as this cannot be derived from
      *                  just the event object.
      */
-    static QString authorDisplayName(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool isPending = false);
+    QString getAuthorDisplayName(bool isPending = false) const;
 
     /**
      * @brief Get the display name of the event author but with any newlines removed.
@@ -67,12 +98,12 @@ public:
      * @param isPending whether the event is pending as this cannot be derived from
      *                  just the event object.
      */
-    static QString singleLineAuthorDisplayname(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool isPending = false);
+    QString singleLineAuthorDisplayname(bool isPending = false) const;
 
     /**
      * @brief Return a QDateTime object for the event timestamp.
      */
-    static QDateTime time(const Quotient::RoomEvent *event, bool isPending = false, QDateTime lastUpdated = {});
+    QDateTime getTime(bool isPending = false, QDateTime lastUpdated = {}) const;
 
     /**
      * @brief Return a QString for the event timestamp.
@@ -88,32 +119,14 @@ public:
      * @param lastUpdated the time the event was last updated locally as this cannot be
      *                    obtained from the event.
      */
-    static QString timeString(const Quotient::RoomEvent *event,
-                              bool relative,
-                              QLocale::FormatType format = QLocale::ShortFormat,
-                              bool isPending = false,
-                              QDateTime lastUpdated = {});
-
-    /**
-     * @brief Return a QString for the event timestamp.
-     *
-     * This is intended to return a string that is read for display in the UI without
-     * any further manipulation required.
-     *
-     * @param format the format to use as a string.
-     * @param isPending whether the event is pending as this cannot be derived from
-     *                  just the event object.
-     * @param lastUpdated the time the event was last updated locally as this cannot be
-     *                    obtained from the event.
-     */
-    static QString timeString(const Quotient::RoomEvent *event, const QString &format, bool isPending = false, const QDateTime &lastUpdated = {});
+    QString getTimeString(bool relative, QLocale::FormatType format = QLocale::ShortFormat, bool isPending = false, QDateTime lastUpdated = {}) const;
 
     /**
      * @brief Whether the event should be highlighted in the timeline.
      *
      * @note Messages in direct chats are never highlighted.
      */
-    static bool isHighlighted(const NeoChatRoom *room, const Quotient::RoomEvent *event);
+    bool isHighlighted();
 
     /**
      * @brief Whether the event should be hidden in the timeline.
@@ -122,7 +135,7 @@ public:
      * user has hidden all state events or if the sender has been ignored by the local
      * user.
      */
-    static bool isHidden(const NeoChatRoom *room, const Quotient::RoomEvent *event);
+    bool isHidden();
 
     /**
      * @brief The input format of the body in the message.
@@ -154,7 +167,7 @@ public:
      *
      * @param stripNewlines whether the output should have new lines in it.
      */
-    static QString richBody(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool stripNewlines = false);
+    QString getRichBody(bool stripNewlines = false) const;
 
     /**
      * @brief Output a string for the message content ready for display in a plain text field.
@@ -170,14 +183,14 @@ public:
      *
      * @param stripNewlines whether the output should have new lines in it.
      */
-    static QString plainBody(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool stripNewlines = false);
+    QString getPlainBody(bool stripNewlines = false) const;
 
     /**
      * @brief Output the original body for the message content, useful for editing the original message.
      *
      * The event type must be a room message event.
      */
-    static QString markdownBody(const Quotient::RoomEvent *event);
+    QString getMarkdownBody() const;
 
     /**
      * @brief Output a generic string for the message content ready for display.
@@ -190,9 +203,9 @@ public:
      * E.g. For a message the text will be:
      *      "sent a message"
      *
-     * @sa richBody(), plainBody()
+     * @sa getRichBody(), getPlainBody()
      */
-    static QString genericBody(const NeoChatRoom *room, const Quotient::RoomEvent *event);
+    QString getGenericBody() const;
 
     /**
      * @brief Output a string for the event to be used as  a RoomList subtitle.
@@ -200,7 +213,7 @@ public:
      * The output includes the username followed by the plain message, all with no
      * line breaks.
      */
-    static QString subtitleText(const NeoChatRoom *room, const Quotient::RoomEvent *event);
+    QString subtitleText() const;
 
     /**
      * @brief Return the media info for the event.
@@ -218,50 +231,113 @@ public:
      *  - tempInfo - mediaInfo (with the same properties as this except no tempInfo) for a temporary image while the file downloads.
      *  - isSticker - Whether the image is a sticker or not
      */
-    static QVariantMap mediaInfo(const NeoChatRoom *room, const Quotient::RoomEvent *event);
+    QVariantMap getMediaInfo() const;
 
     /**
      * @brief Whether the event is a reply to another in the timeline.
-     *
-     * @param showFallbacks whether message that have is_falling_back set true should
-     *                      show the fallback reply. Leave true for non-threaded
-     *                      timelines.
      */
-    static bool hasReply(const Quotient::RoomEvent *event, bool showFallbacks = true);
+    bool hasReply() const;
 
     /**
      * @brief Return the Matrix ID of the event replied to.
      */
-    static QString replyId(const Quotient::RoomEvent *event);
+    QString getReplyId() const;
+
+    /**
+     * @brief The MessageComponentType to use to visualise the reply content.
+     */
+    MessageComponentType::Type replyMessageComponentType() const;
 
     /**
      * @brief Get the author of the event replied to in context of the room.
      *
-     * An empty Quotient::RoomMember will be returned if the EventHandler hasn't had
-     * the room or event initialised.
+     * 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. This function
+     * uses the room context and outputs the result as QVariantMap.
      *
-     * @param isPending if the event is pending, i.e. has not been confirmed by
-     *                  the server.
+     * An empty QVariantMap will be returned if the EventHandler hasn't had the room
+     * intialised. An empty user (i.e. a QVariantMap with all the correct keys
+     * but empty values) will be returned if the room has been set but not an event.
      *
-     * @return a Quotient::RoomMember object for the user.
+     * @return a QVariantMap for the user with 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 Quotient::RoomMember
+     * @sa Quotient::User
      */
-    static Quotient::RoomMember replyAuthor(const NeoChatRoom *room, const Quotient::RoomEvent *event);
+    QVariantMap getReplyAuthor() const;
+
+    /**
+     * @brief Output a string for the message content of the event replied to ready
+     * for display in a rich text field.
+     *
+     * The output string is dependant upon the event type and the desired output format.
+     *
+     * For most messages this is the body content of the message. For media messages
+     * this will be the caption and for state events it will be a string specific
+     * to that event with some dynamic details about the event added.
+     *
+     * E.g. For a room topic state event the text will be:
+     *      "set the topic to: <new topic text>"
+     *
+     * @param stripNewlines whether the output should have new lines in it.
+     */
+    QString getReplyRichBody(bool stripNewlines = false) const;
+
+    /**
+     * @brief Output a string for the message content of the event replied to ready
+     * for display in a plain text field.
+     *
+     * The output string is dependant upon the event type and the desired output format.
+     *
+     * For most messages this is the body content of the message. For media messages
+     * this will be the caption and for state events it will be a string specific
+     * to that event with some dynamic details about the event added.
+     *
+     * E.g. For a room topic state event the text will be:
+     *      "set the topic to: <new topic text>"
+     *
+     * @param stripNewlines whether the output should have new lines in it.
+     */
+    QString getReplyPlainBody(bool stripNewlines = false) const;
+
+    /**
+     * @brief Return the media info for the event replied to.
+     *
+     * An empty QVariantMap will be returned for any event that doesn't have any
+     * media info.
+     *
+     * @return This should consist of the following:
+     *  - source - The mxc URL for the media.
+     *  - mimeType - The MIME type of the media (should be image/xxx for this delegate).
+     *  - mimeIcon - The MIME icon name (should be image-xxx).
+     *  - size - The file size in bytes.
+     *  - width - The width in pixels of the audio media.
+     *  - height - The height in pixels of the audio media.
+     *  - tempInfo - mediaInfo (with the same properties as this except no tempInfo) for a temporary image while the file downloads.
+     *  - isSticker - Whether the image is a sticker or not
+     */
+    QVariantMap getReplyMediaInfo() const;
 
     /**
      * @brief Whether the message is part of a thread.
      *
      * i.e. There is a rel_type of m.thread.
      */
-    static bool isThreaded(const Quotient::RoomEvent *event);
+    bool isThreaded() const;
 
     /**
      * @brief Return the Matrix ID of the thread's root message.
      *
      * Empty if this not part of a thread.
      */
-    static QString threadRoot(const Quotient::RoomEvent *event);
+    QString threadRoot() const;
 
     /**
      * @brief Return the latitude for the event.
@@ -269,7 +345,7 @@ public:
      * Returns -100.0 if the event doesn't have a location (latitudes are in the
      * range -90deg to +90deg so -100 is out of range).
      */
-    static float latitude(const Quotient::RoomEvent *event);
+    float getLatitude() const;
 
     /**
      * @brief Return the longitude for the event.
@@ -277,26 +353,60 @@ public:
      * Returns -200.0 if the event doesn't have a location (latitudes are in the
      * range -180deg to +180deg so -200 is out of range).
      */
-    static float longitude(const Quotient::RoomEvent *event);
+    float getLongitude() const;
 
     /**
      * @brief Return the type of location marker for the event.
      */
-    static QString locationAssetType(const Quotient::RoomEvent *event);
+    QString getLocationAssetType() const;
+
+    /**
+     * @brief Whether the event has any read marker for other users.
+     */
+    bool hasReadMarkers() const;
+
+    /**
+     * @brief Returns a list of user read marker for the event.
+     *
+     * @param maxMarkers the maximum number of users to return. Usually the number
+     *                   of user read makers shown is limited to not clutter the UI.
+     *                   This needs to be the same as used in getNumberExcessReadMarkers
+     *                   so that the markers line up with the number displayed, i.e.
+     *                   the number of users shown plus the excess number will be
+     *                   the total number of other user read markers at an event.
+     */
+    QVariantList getReadMarkers(int maxMarkers = 5) const;
+
+    /**
+     * @brief Returns the number of excess user read markers for the event.
+     *
+     * This returns a string in the form "+ x" ready for use in the UI.
+     *
+     * @param maxMarkers the maximum number of markers shown in the UI. This needs to
+     *                   be the same as used in getReadMarkers so that the value lines
+     *                   up with the number displayed, i.e. the number of users shown
+     *                   plus the excess number will be the total number of other user
+     *                   read markers at an event.
+     */
+    QString getNumberExcessReadMarkers(int maxMarkers = 5) const;
+
+    /**
+     * @brief Returns a string with the names of the read markers at the event.
+     *
+     * This is in the form "x users: name 1, name 2, ...".
+     */
+    QString getReadMarkersString() const;
 
 private:
-    static QString getBody(const NeoChatRoom *room, const Quotient::RoomEvent *event, Qt::TextFormat format, bool stripNewlines);
-    static QString getMessageBody(const NeoChatRoom *room, const Quotient::RoomMessageEvent &event, Qt::TextFormat format, bool stripNewlines);
+    const NeoChatRoom *m_room = nullptr;
+    const Quotient::RoomEvent *m_event = nullptr;
 
-    static QVariantMap getMediaInfoForEvent(const NeoChatRoom *room, const Quotient::RoomEvent *event);
-    QVariantMap static getMediaInfoFromFileInfo(const NeoChatRoom *room,
-#if Quotient_VERSION_MINOR > 8
-                                                const Quotient::EventContent::FileContentBase *fileContent,
-#else
-                                                const Quotient::EventContent::TypedBase *fileContent,
-#endif
-                                                const QString &eventId,
-                                                bool isThumbnail = false,
-                                                bool isSticker = false);
-    static QVariantMap getMediaInfoFromTumbnail(const NeoChatRoom *room, const Quotient::EventContent::Thumbnail &thumbnail, const QString &eventId);
+    KFormat m_format;
+
+    QString getBody(const Quotient::RoomEvent *event, Qt::TextFormat format, bool stripNewlines) const;
+    QString getMessageBody(const Quotient::RoomMessageEvent &event, Qt::TextFormat format, bool stripNewlines) const;
+
+    QVariantMap getMediaInfoForEvent(const Quotient::RoomEvent *event) const;
+    QVariantMap
+    getMediaInfoFromFileInfo(const Quotient::EventContent::FileInfo *fileInfo, const QString &eventId, bool isThumbnail = false, bool isSticker = false) const;
 };

src/events/imagepackevent.cpp

@@ -3,7 +3,6 @@
 
 #include "imagepackevent.h"
 #include <QJsonObject>
-#include <Quotient/omittable.h>
 
 using namespace Quotient;
 
@@ -17,16 +16,16 @@ ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
             fromJson<Omittable<QString>>(json["pack"_ls].toObject()["attribution"_ls]),
         };
     } else {
-        pack = std::nullopt;
+        pack = none;
     }
 
     const auto &keys = json["images"_ls].toObject().keys();
     for (const auto &k : keys) {
-        std::optional<EventContent::ImageInfo> info;
+        Omittable<EventContent::ImageInfo> info;
         if (json["images"_ls][k].toObject().contains(QStringLiteral("info"))) {
             info = EventContent::ImageInfo(QUrl(json["images"_ls][k]["url"_ls].toString()), json["images"_ls][k]["info"_ls].toObject(), k);
         } else {
-            info = std::nullopt;
+            info = none;
         }
         images += ImagePackImage{
             k,

src/events/imagepackevent.h

@@ -26,10 +26,10 @@ public:
      * @brief Defines the properties of an image pack.
      */
     struct Pack {
-        std::optional<QString> displayName; /**< The display name of the pack. */
-        std::optional<QUrl> avatarUrl; /**< The source mxc URL for the pack avatar. */
-        std::optional<QStringList> usage; /**< An array of the usages for this pack. Possible usages are "emoticon" and "sticker". */
-        std::optional<QString> attribution; /**< The attribution for the pack author(s). */
+        Quotient::Omittable<QString> displayName; /**< The display name of the pack. */
+        Quotient::Omittable<QUrl> avatarUrl; /**< The source mxc URL for the pack avatar. */
+        Quotient::Omittable<QStringList> usage; /**< An array of the usages for this pack. Possible usages are "emoticon" and "sticker". */
+        Quotient::Omittable<QString> attribution; /**< The attribution for the pack author(s). */
     };
 
     /**
@@ -38,14 +38,14 @@ public:
     struct ImagePackImage {
         QString shortcode; /**< The shortcode for the image. */
         QUrl url; /**< The mxc URL for this image. */
-        std::optional<QString> body; /**< An optional text body for this image. */
-        std::optional<Quotient::EventContent::ImageInfo> info; /**< The ImageInfo object used for the info block of m.sticker events. */
+        Quotient::Omittable<QString> body; /**< An optional text body for this image. */
+        Quotient::Omittable<Quotient::EventContent::ImageInfo> info; /**< The ImageInfo object used for the info block of m.sticker events. */
         /**
          * @brief An array of the usages for this image.
          *
          * The possible values match those of the usage key of a pack object.
          */
-        std::optional<QStringList> usage;
+        Quotient::Omittable<QStringList> usage;
     };
 
     /**
@@ -53,7 +53,7 @@ public:
      *
      * @sa Pack
      */
-    std::optional<Pack> pack;
+    Quotient::Omittable<Pack> pack;
 
     /**
      * @brief Return a vector of images in the pack.

src/events/serveraclevent.h

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#pragma once
+
+#include <Quotient/events/simplestateevents.h>
+
+namespace Quotient
+{
+
+// Defined so we can directly switch on type.
+DEFINE_SIMPLE_STATE_EVENT(ServerAclEvent, "m.room.server_acl", bool, allow_ip_literals, "allow_ip_literals")
+
+} // namespace Quotient