Tobias' fix

These weren't removed in d165cd955d
because I forgot.

.craft.ini

@@ -2,5 +2,6 @@
 ; 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.6",
+    "runtime-version": "6.7",
     "sdk": "org.kde.Sdk",
     "command": "neochat",
     "tags": [
@@ -110,7 +110,7 @@
                 {
                     "type": "git",
                     "url": "https://github.com/quotient-im/libQuotient.git",
-                    "branch": "dev",
+                    "branch": "0.8.x",
                     "disable-submodules": true
                 }
             ],

.gitlab-ci.yml

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

.kde-ci.yml

@@ -40,4 +40,4 @@ Dependencies:
 
 Options:
   per-test-timeout: 90
-  require-passing-tests-on: [ '@all' ]
+  require-passing-tests-on: [ 'Linux', 'Android', 'FreeBSD' ]

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

README.md

@@ -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

appiumtests/createroomtest.py

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

appiumtests/data/sync_response_new_room.json

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

appiumtests/login-server.py

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

autotests/chatbarcachetest.cpp

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

autotests/data/test-eventhandler-sync.json

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

autotests/data/test-invalidmatrixtolink-event.json

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

autotests/data/test-invalidmxclink-event.json

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

autotests/data/test-invalidnospacelink-event.json

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

autotests/data/test-min-sync.json

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

autotests/data/test-reactionmodel-sync.json

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

autotests/data/test-texthandler-sync.json

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

autotests/data/test-validplainlink-event.json

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

autotests/data/test-validplainwwwlink-event.json

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

autotests/data/test-validrichlink-event.json

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

autotests/eventhandlertest.cpp

@@ -29,15 +29,11 @@ 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();
@@ -45,7 +41,6 @@ private Q_SLOTS:
     void time();
     void nullTime();
     void timeString();
-    void nullTimeString();
     void highlighted();
     void nullHighlighted();
     void hidden();
@@ -56,6 +51,7 @@ private Q_SLOTS:
     void genericBody();
     void nullGenericBody();
     void markdownBody();
+    void markdownBodyReply();
     void subtitle();
     void nullSubtitle();
     void mediaInfo();
@@ -66,16 +62,10 @@ 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()
@@ -86,183 +76,136 @@ void EventHandlerTest::initTestCase()
 
 void EventHandlerTest::eventId()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(0).get());
-    QCOMPARE(eventHandler.getId(), QStringLiteral("$153456789:example.org"));
+    QCOMPARE(EventHandler::id(room->messageEvents().at(0).get()), QStringLiteral("$153456789:example.org"));
 }
 
 void EventHandlerTest::nullEventId()
 {
-    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));
+    QTest::ignoreMessage(QtWarningMsg, "id called with event set to nullptr.");
+    QCOMPARE(EventHandler::id(nullptr), QString());
 }
 
 void EventHandlerTest::authorDisplayName()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(1).get());
-    QCOMPARE(eventHandler.getAuthorDisplayName(), QStringLiteral("before"));
+    QCOMPARE(EventHandler::authorDisplayName(room, room->messageEvents().at(1).get()), QStringLiteral("before"));
 }
 
 void EventHandlerTest::nullAuthorDisplayName()
 {
-    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getAuthorDisplayName(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "authorDisplayName called with room set to nullptr.");
+    QCOMPARE(EventHandler::authorDisplayName(nullptr, nullptr), QString());
 
-    EventHandler noEventHandler(room, nullptr);
-    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getAuthorDisplayName(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "authorDisplayName called with event set to nullptr.");
+    QCOMPARE(EventHandler::authorDisplayName(room, nullptr), QString());
 }
 
 void EventHandlerTest::singleLineSidplayName()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(11).get());
-    QCOMPARE(eventHandler.singleLineAuthorDisplayname(), QStringLiteral("Look at me I put newlines in my display name"));
+    QCOMPARE(EventHandler::singleLineAuthorDisplayname(room, room->messageEvents().at(11).get()),
+             QStringLiteral("Look at me I put newlines in my display name"));
 }
 
 void EventHandlerTest::nullSingleLineDisplayName()
 {
-    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.singleLineAuthorDisplayname(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "singleLineAuthorDisplayname called with room set to nullptr.");
+    QCOMPARE(EventHandler::singleLineAuthorDisplayname(nullptr, nullptr), QString());
 
-    EventHandler noEventHandler(room, nullptr);
-    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.singleLineAuthorDisplayname(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "singleLineAuthorDisplayname called with event set to nullptr.");
+    QCOMPARE(EventHandler::singleLineAuthorDisplayname(room, nullptr), QString());
 }
 
 void EventHandlerTest::time()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+    const auto event = room->messageEvents().at(0).get();
 
-    QCOMPARE(eventHandler.getTime(), QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC));
-    QCOMPARE(eventHandler.getTime(true, QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC)), QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC));
+    QCOMPARE(EventHandler::time(event), QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC));
+    QCOMPARE(EventHandler::time(event, true, QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC)), QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC));
 }
 
 void EventHandlerTest::nullTime()
 {
-    EventHandler noEventHandler(room, nullptr);
-    QTest::ignoreMessage(QtWarningMsg, "getTime called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getTime(), QDateTime());
+    QTest::ignoreMessage(QtWarningMsg, "time called with event set to nullptr.");
+    QCOMPARE(EventHandler::time(nullptr), QDateTime());
 
-    EventHandler eventHandler(room, room->messageEvents().at(0).get());
     QTest::ignoreMessage(QtWarningMsg, "a value must be provided for lastUpdated for a pending event.");
-    QCOMPARE(eventHandler.getTime(true), QDateTime());
+    QCOMPARE(EventHandler::time(room->messageEvents().at(0).get(), true), QDateTime());
 }
 
 void EventHandlerTest::timeString()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+    const auto event = room->messageEvents().at(0).get();
 
     KFormat format;
 
-    QCOMPARE(eventHandler.getTimeString(false),
+    QCOMPARE(EventHandler::timeString(event, false),
              QLocale().toString(QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toLocalTime().time(), QLocale::ShortFormat));
-    QCOMPARE(eventHandler.getTimeString(true),
+    QCOMPARE(EventHandler::timeString(event, true),
              format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(eventHandler.getTimeString(false, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+    QCOMPARE(EventHandler::timeString(event, false, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().time(), QLocale::ShortFormat));
-    QCOMPARE(eventHandler.getTimeString(true, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+    QCOMPARE(EventHandler::timeString(event, true, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(eventHandler.getTimeString(false, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+    QCOMPARE(EventHandler::timeString(event, false, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().time(), QLocale::LongFormat));
-    QCOMPARE(eventHandler.getTimeString(true, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+    QCOMPARE(EventHandler::timeString(event, true, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().date(), QLocale::LongFormat));
-}
-
-void EventHandlerTest::nullTimeString()
-{
-    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());
+    QCOMPARE(EventHandler::timeString(event, QStringLiteral("hh:mm")),
+             QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toString(QStringLiteral("hh:mm")));
 }
 
 void EventHandlerTest::highlighted()
 {
-    EventHandler eventHandlerHighlight(room, room->messageEvents().at(2).get());
-    QCOMPARE(eventHandlerHighlight.isHighlighted(), true);
-
-    EventHandler eventHandlerNoHighlight(room, room->messageEvents().at(0).get());
-    QCOMPARE(eventHandlerNoHighlight.isHighlighted(), false);
+    QCOMPARE(EventHandler::isHighlighted(room, room->messageEvents().at(2).get()), true);
+    QCOMPARE(EventHandler::isHighlighted(room, room->messageEvents().at(0).get()), false);
 }
 
 void EventHandlerTest::nullHighlighted()
 {
-    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.isHighlighted(), false);
+    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with room set to nullptr.");
+    QCOMPARE(EventHandler::isHighlighted(nullptr, nullptr), false);
 
-    EventHandler noEventHandler(room, nullptr);
-    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.isHighlighted(), false);
+    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with event set to nullptr.");
+    QCOMPARE(EventHandler::isHighlighted(room, nullptr), false);
 }
 
 void EventHandlerTest::hidden()
 {
-    EventHandler eventHandlerHidden(room, room->messageEvents().at(3).get());
-    QCOMPARE(eventHandlerHidden.isHidden(), true);
-
-    EventHandler eventHandlerNoHidden(room, room->messageEvents().at(0).get());
-    QCOMPARE(eventHandlerNoHidden.isHidden(), false);
+    QCOMPARE(EventHandler::isHidden(room, room->messageEvents().at(3).get()), true);
+    QCOMPARE(EventHandler::isHidden(room, room->messageEvents().at(0).get()), false);
 }
 
 void EventHandlerTest::nullHidden()
 {
-    QTest::ignoreMessage(QtWarningMsg, "isHidden called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.isHidden(), false);
+    QTest::ignoreMessage(QtWarningMsg, "isHidden called with room set to nullptr.");
+    QCOMPARE(EventHandler::isHidden(nullptr, nullptr), false);
 
-    EventHandler noEventHandler(room, nullptr);
-    QTest::ignoreMessage(QtWarningMsg, "isHidden called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.isHidden(), false);
+    QTest::ignoreMessage(QtWarningMsg, "isHidden called with event set to nullptr.");
+    QCOMPARE(EventHandler::isHidden(room, nullptr), false);
 }
 
 void EventHandlerTest::body()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+    const auto event = room->messageEvents().at(0).get();
 
-    QCOMPARE(eventHandler.getRichBody(), QStringLiteral("<b>This is an example<br>text message</b>"));
-    QCOMPARE(eventHandler.getRichBody(true), QStringLiteral("<b>This is an example text message</b>"));
-    QCOMPARE(eventHandler.getPlainBody(), QStringLiteral("This is an example\ntext message"));
-    QCOMPARE(eventHandler.getPlainBody(true), QStringLiteral("This is an example text message"));
+    QCOMPARE(EventHandler::richBody(room, event), QStringLiteral("<b>This is an example<br>text message</b>"));
+    QCOMPARE(EventHandler::richBody(room, event, true), QStringLiteral("<b>This is an example text message</b>"));
+    QCOMPARE(EventHandler::plainBody(room, event), QStringLiteral("This is an example\ntext message"));
+    QCOMPARE(EventHandler::plainBody(room, event, true), QStringLiteral("This is an example text message"));
 }
 
 void EventHandlerTest::nullBody()
 {
-    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "richBody called with room set to nullptr.");
+    QCOMPARE(EventHandler::richBody(nullptr, nullptr), QString());
 
-    QTest::ignoreMessage(QtWarningMsg, "getRichBody called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getRichBody(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "richBody called with event set to nullptr.");
+    QCOMPARE(EventHandler::richBody(room, nullptr), QString());
 
-    QTest::ignoreMessage(QtWarningMsg, "getPlainBody called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getPlainBody(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "plainBody called with room set to nullptr.");
+    QCOMPARE(EventHandler::plainBody(nullptr, nullptr), QString());
+
+    QTest::ignoreMessage(QtWarningMsg, "plainBody called with event set to nullptr.");
+    QCOMPARE(EventHandler::plainBody(room, nullptr), QString());
 }
 
 void EventHandlerTest::genericBody_data()
@@ -282,47 +225,45 @@ void EventHandlerTest::genericBody()
     QFETCH(int, eventNum);
     QFETCH(QString, output);
 
-    EventHandler eventHandler(room, room->messageEvents().at(eventNum).get());
-
-    QCOMPARE(eventHandler.getGenericBody(), output);
+    QCOMPARE(EventHandler::genericBody(room->messageEvents().at(eventNum).get()), output);
 }
 
 void EventHandlerTest::nullGenericBody()
 {
-    EventHandler noEventHandler(room, nullptr);
-    QTest::ignoreMessage(QtWarningMsg, "getGenericBody called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getGenericBody(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "genericBody called with event set to nullptr.");
+    QCOMPARE(EventHandler::genericBody(nullptr), QString());
 }
 
 void EventHandlerTest::markdownBody()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+    QCOMPARE(EventHandler::markdownBody(room->messageEvents().at(0).get()), QStringLiteral("This is an example\ntext message"));
+}
 
-    QCOMPARE(eventHandler.getMarkdownBody(), QStringLiteral("This is an example\ntext message"));
+void EventHandlerTest::markdownBodyReply()
+{
+    QCOMPARE(EventHandler::markdownBody(room->messageEvents().at(5).get()), QStringLiteral("reply"));
 }
 
 void EventHandlerTest::subtitle()
 {
-    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"));
+    QCOMPARE(EventHandler::subtitleText(room, room->messageEvents().at(0).get()), QStringLiteral("after: This is an example text message"));
+    QCOMPARE(EventHandler::subtitleText(room, room->messageEvents().at(2).get()),
+             QStringLiteral("after: This is a highlight @bob:kde.org and this is a link https://kde.org"));
 }
 
 void EventHandlerTest::nullSubtitle()
 {
-    EventHandler noEventHandler(room, nullptr);
-    QTest::ignoreMessage(QtWarningMsg, "subtitleText called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.subtitleText(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "subtitleText called with room set to nullptr.");
+    QCOMPARE(EventHandler::subtitleText(nullptr, nullptr), QString());
+
+    QTest::ignoreMessage(QtWarningMsg, "subtitleText called with event set to nullptr.");
+    QCOMPARE(EventHandler::subtitleText(room, nullptr), QString());
 }
 
 void EventHandlerTest::mediaInfo()
 {
     auto event = room->messageEvents().at(4).get();
-    EventHandler eventHandler(room, event);
-
-    auto mediaInfo = eventHandler.getMediaInfo();
+    auto mediaInfo = EventHandler::mediaInfo(room, event);
     auto thumbnailInfo = mediaInfo["tempInfo"_ls].toMap();
 
     QCOMPARE(mediaInfo["source"_ls], room->makeMediaUrl(event->id(), QUrl("mxc://kde.org/1234567"_ls)));
@@ -342,231 +283,102 @@ void EventHandlerTest::mediaInfo()
 
 void EventHandlerTest::nullMediaInfo()
 {
-    QTest::ignoreMessage(QtWarningMsg, "getMediaInfo called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getMediaInfo(), QVariantMap());
+    QTest::ignoreMessage(QtWarningMsg, "mediaInfo called with room set to nullptr.");
+    QCOMPARE(EventHandler::mediaInfo(nullptr, nullptr), QVariantMap());
 
-    EventHandler noEventHandler(room, nullptr);
-    QTest::ignoreMessage(QtWarningMsg, "getMediaInfo called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getMediaInfo(), QVariantMap());
+    QTest::ignoreMessage(QtWarningMsg, "mediaInfo called with event set to nullptr.");
+    QCOMPARE(EventHandler::mediaInfo(room, nullptr), QVariantMap());
 }
 
 void EventHandlerTest::hasReply()
 {
-    EventHandler eventHandlerReply(room, room->messageEvents().at(5).get());
-    QCOMPARE(eventHandlerReply.hasReply(), true);
-
-    EventHandler eventHandlerNoReply(room, room->messageEvents().at(0).get());
-    QCOMPARE(eventHandlerNoReply.hasReply(), false);
+    QCOMPARE(EventHandler::hasReply(room->messageEvents().at(5).get()), true);
+    QCOMPARE(EventHandler::hasReply(room->messageEvents().at(0).get()), false);
 }
 
 void EventHandlerTest::nullHasReply()
 {
-    EventHandler noEventHandler(room, nullptr);
-    QTest::ignoreMessage(QtWarningMsg, "hasReply called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.hasReply(), false);
+    QTest::ignoreMessage(QtWarningMsg, "hasReply called with event set to nullptr.");
+    QCOMPARE(EventHandler::hasReply(nullptr), false);
 }
 
 void EventHandlerTest::replyId()
 {
-    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(""));
+    QCOMPARE(EventHandler::replyId(room->messageEvents().at(5).get()), QStringLiteral("$153456789:example.org"));
+    QCOMPARE(EventHandler::replyId(room->messageEvents().at(0).get()), QStringLiteral(""));
 }
 
 void EventHandlerTest::nullReplyId()
 {
-    EventHandler noEventHandler(room, nullptr);
-    QTest::ignoreMessage(QtWarningMsg, "getReplyId called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReplyId(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "replyId called with event set to nullptr.");
+    QCOMPARE(EventHandler::replyId(nullptr), QString());
 }
 
 void EventHandlerTest::replyAuthor()
 {
     auto replyEvent = room->messageEvents().at(0).get();
-    auto replyAuthor = room->user(replyEvent->senderId());
-    EventHandler eventHandler(room, room->messageEvents().at(5).get());
+    auto replyAuthor = room->member(replyEvent->senderId());
+    auto eventHandlerReplyAuthor = EventHandler::replyAuthor(room, room->messageEvents().at(5).get());
 
-    auto eventHandlerReplyAuthor = eventHandler.getReplyAuthor();
+    QCOMPARE(eventHandlerReplyAuthor.isLocalMember(), replyAuthor.id() == room->localMember().id());
+    QCOMPARE(eventHandlerReplyAuthor.id(), replyAuthor.id());
+    QCOMPARE(eventHandlerReplyAuthor.displayName(), replyAuthor.displayName());
+    QCOMPARE(eventHandlerReplyAuthor.avatarUrl(), replyAuthor.avatarUrl());
+    QCOMPARE(eventHandlerReplyAuthor.avatarMediaId(), replyAuthor.avatarMediaId());
+    QCOMPARE(eventHandlerReplyAuthor.color(), replyAuthor.color());
 
-    QCOMPARE(eventHandlerReplyAuthor["isLocalUser"_ls], replyAuthor->id() == room->localUser()->id());
-    QCOMPARE(eventHandlerReplyAuthor["id"_ls], replyAuthor->id());
-    QCOMPARE(eventHandlerReplyAuthor["displayName"_ls], replyAuthor->displayname(room));
-    QCOMPARE(eventHandlerReplyAuthor["avatarSource"_ls], room->avatarForMember(replyAuthor));
-    QCOMPARE(eventHandlerReplyAuthor["avatarMediaId"_ls], replyAuthor->avatarMediaId(room));
-    QCOMPARE(eventHandlerReplyAuthor["color"_ls], Utils::getUserColor(replyAuthor->hueF()));
-    QCOMPARE(eventHandlerReplyAuthor["object"_ls], QVariant::fromValue(replyAuthor));
-
-    EventHandler eventHandlerNoAuthor(room, room->messageEvents().at(0).get());
-    QCOMPARE(eventHandlerNoAuthor.getReplyAuthor(), room->getUser(nullptr));
+    QCOMPARE(EventHandler::replyAuthor(room, room->messageEvents().at(0).get()), RoomMember());
 }
 
 void EventHandlerTest::nullReplyAuthor()
 {
-    QTest::ignoreMessage(QtWarningMsg, "getReplyAuthor called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReplyAuthor(), QVariantMap());
+    QTest::ignoreMessage(QtWarningMsg, "replyAuthor called with room set to nullptr.");
+    QCOMPARE(EventHandler::replyAuthor(nullptr, nullptr), RoomMember());
 
-    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());
+    QTest::ignoreMessage(QtWarningMsg, "replyAuthor called with event set to nullptr. Returning empty user.");
+    QCOMPARE(EventHandler::replyAuthor(room, nullptr), RoomMember());
 }
 
 void EventHandlerTest::thread()
 {
-    EventHandler eventHandlerNoThread(room, room->messageEvents().at(0).get());
-    QCOMPARE(eventHandlerNoThread.isThreaded(), false);
-    QCOMPARE(eventHandlerNoThread.threadRoot(), QString());
+    QCOMPARE(EventHandler::isThreaded(room->messageEvents().at(0).get()), false);
+    QCOMPARE(EventHandler::threadRoot(room->messageEvents().at(0).get()), QString());
 
-    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(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 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"));
+    QCOMPARE(EventHandler::isThreaded(room->messageEvents().at(10).get()), true);
+    QCOMPARE(EventHandler::threadRoot(room->messageEvents().at(10).get()), QStringLiteral("$threadroot:example.org"));
+    QCOMPARE(EventHandler::replyId(room->messageEvents().at(10).get()), QStringLiteral("$threadmessage1:example.org"));
 }
 
 void EventHandlerTest::nullThread()
 {
-    QTest::ignoreMessage(QtWarningMsg, "isThreaded called with m_event set to nullptr.");
-    QCOMPARE(emptyHandler.isThreaded(), false);
+    QTest::ignoreMessage(QtWarningMsg, "isThreaded called with event set to nullptr.");
+    QCOMPARE(EventHandler::isThreaded(nullptr), false);
 
-    EventHandler noEventHandler(room, nullptr);
-    QTest::ignoreMessage(QtWarningMsg, "threadRoot called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.threadRoot(), QString());
+    QTest::ignoreMessage(QtWarningMsg, "threadRoot called with event set to nullptr.");
+    QCOMPARE(EventHandler::threadRoot(nullptr), QString());
 }
 
 void EventHandlerTest::location()
 {
-    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"));
+    QCOMPARE(EventHandler::latitude(room->messageEvents().at(7).get()), QStringLiteral("51.7035").toFloat());
+    QCOMPARE(EventHandler::longitude(room->messageEvents().at(7).get()), QStringLiteral("-1.14394").toFloat());
+    QCOMPARE(EventHandler::locationAssetType(room->messageEvents().at(7).get()), QStringLiteral("m.pin"));
 }
 
 void EventHandlerTest::nullLocation()
 {
-    QTest::ignoreMessage(QtWarningMsg, "getLatitude called with m_event set to nullptr.");
-    QCOMPARE(emptyHandler.getLatitude(), -100.0);
+    QTest::ignoreMessage(QtWarningMsg, "latitude called with event set to nullptr.");
+    QCOMPARE(EventHandler::latitude(nullptr), -100.0);
 
-    QTest::ignoreMessage(QtWarningMsg, "getLongitude called with m_event set to nullptr.");
-    QCOMPARE(emptyHandler.getLongitude(), -200.0);
+    QTest::ignoreMessage(QtWarningMsg, "longitude called with event set to nullptr.");
+    QCOMPARE(EventHandler::longitude(nullptr), -200.0);
 
-    QTest::ignoreMessage(QtWarningMsg, "getLocationAssetType called with m_event set to nullptr.");
-    QCOMPARE(emptyHandler.getLocationAssetType(), QString());
-}
-
-void EventHandlerTest::readMarkers()
-{
-    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::ignoreMessage(QtWarningMsg, "locationAssetType called with event set to nullptr.");
+    QCOMPARE(EventHandler::locationAssetType(nullptr), QString());
 }
 
 QTEST_MAIN(EventHandlerTest)

autotests/linkpreviewertest.cpp

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

autotests/reactionmodeltest.cpp

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

autotests/texthandlertest.cpp

@@ -46,6 +46,7 @@ private Q_SLOTS:
     void sendCustomEmojiCode_data();
     void sendCustomEmojiCode();
 
+    void receiveSpacelessSelfClosingTag();
     void receiveStripReply();
     void receivePlainTextIn();
 
@@ -252,6 +253,19 @@ void TextHandlerTest::sendCustomEmojiCode()
     QCOMPARE(testTextHandler.handleSendText(), testOutputString);
 }
 
+void TextHandlerTest::receiveSpacelessSelfClosingTag()
+{
+    const QString testInputString = QStringLiteral("Test...<br/>...ing");
+    const QString testRichOutputString = QStringLiteral("Test...<br/>...ing");
+    const QString testPlainOutputString = QStringLiteral("Test...\n...ing");
+
+    TextHandler testTextHandler;
+    testTextHandler.setData(testInputString);
+
+    QCOMPARE(testTextHandler.handleRecieveRichText(), testRichOutputString);
+    QCOMPARE(testTextHandler.handleRecievePlainText(Qt::RichText), testPlainOutputString);
+}
+
 void TextHandlerTest::receiveStripReply()
 {
     const QString testInputString = QStringLiteral(
@@ -274,6 +288,7 @@ void TextHandlerTest::receiveRichInPlainOut_data()
     QTest::newRow("ampersand") << QStringLiteral("a &amp; b") << QStringLiteral("a & b");
     QTest::newRow("quote") << QStringLiteral("&quot;a and b&quot;") << QStringLiteral("\"a and b\"");
     QTest::newRow("new line") << QStringLiteral("new<br>line") << QStringLiteral("new\nline");
+    QTest::newRow("unescape") << QStringLiteral("can&#x27;t") << QStringLiteral("can't");
 }
 
 void TextHandlerTest::receiveRichInPlainOut()
@@ -448,6 +463,9 @@ void TextHandlerTest::receiveRichPlainUrl()
     QString testOutputStringMxId = QStringLiteral(
         "<b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> <b><a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a></b>");
 
+    QString testInputStringMxIdWithPrefix = QStringLiteral("a @user:kde.org b");
+    QString testOutputStringMxIdWithPrefix = QStringLiteral("a <b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> b");
+
     TextHandler testTextHandler;
     testTextHandler.setData(testInputStringLink1);
 
@@ -461,6 +479,9 @@ 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()
@@ -535,7 +556,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"), {}},
+               MessageComponent{MessageComponentType::Text, QStringLiteral("Ah, you mean something like<br/>"), {}},
                MessageComponent{
                    MessageComponentType::Code,
                    QStringLiteral(

autotests/windowcontrollertest.cpp

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

org.kde.neochat.appdata.xml

@@ -25,6 +25,7 @@
   <name xml:lang="fi">NeoChat</name>
   <name xml:lang="fr">NeoChat</name>
   <name xml:lang="gl">NeoChat</name>
+  <name xml:lang="he">NeoChat</name>
   <name xml:lang="hu">NeoChat</name>
   <name xml:lang="ia">Neochat</name>
   <name xml:lang="id">NeoChat</name>
@@ -54,12 +55,14 @@
   <summary xml:lang="ca">Xategeu amb els vostres amics a Matrix</summary>
   <summary xml:lang="ca-valencia">Xategeu amb els vostres amics a Matrix</summary>
   <summary xml:lang="cs">Mluvte se svými přáteli na Matrixu</summary>
+  <summary xml:lang="en-GB">Chat with your friends on matrix</summary>
   <summary xml:lang="eo">Babilu kun viaj amikoj sur matrix</summary>
   <summary xml:lang="es">Charle con sus amigos en matrix</summary>
   <summary xml:lang="eu">Berriketan jardun zure lagunekin «Matrix»en</summary>
   <summary xml:lang="fi">Keskustelu ystäviesi kanssa Matrixissa</summary>
   <summary xml:lang="fr">Discuter avec vos ami(e)s sur le réseau Matrix</summary>
   <summary xml:lang="gl">Charle coas súas amizades en Matrix.</summary>
+  <summary xml:lang="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>
@@ -79,20 +82,27 @@
   <summary xml:lang="zh-TW">在 Matrix 上與您的朋友聊天</summary>
   <description>
     <p>NeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.</p>
+    <p xml:lang="ar">نيوتشات هو تطبيق دردشة يتيح لك الاستفادة الكاملة من شبكة Matrix. فهو يوفر لك طريقة آمنة لإرسال الرسائل النصية ومقاطع الفيديو والملفات الصوتية إلى عائلتك وزملائك وأصدقائك.</p>
     <p xml:lang="ca">El NeoChat és una aplicació de xat que us permet aprofitar plenament la xarxa Matrix. Proporciona una manera segura d'enviar missatges de text, vídeos i arxius d'àudio a la vostra família, companys i amics.</p>
     <p xml:lang="ca-valencia">NeoChat és una aplicació de xat que us permet aprofitar plenament la xarxa Matrix. Proporciona una manera segura d'enviar missatges de text, vídeos i arxius d'àudio a la vostra família, companys i amics.</p>
+    <p xml:lang="en-GB">NeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.</p>
     <p xml:lang="eo">NeoChat estas babilej-apo, kiu ebligas al vi plene profiti de la Matrix-reto. Ĝi provizas al vi sekuran manieron sendi tekstmesaĝojn, filmetojn kaj sondosierojn al via familio, kolegoj kaj amikoj.</p>
     <p xml:lang="es">NeoChat es una aplicación de chat que le permite aprovechar al máximo la red Matrix. Le proporciona un modo seguro de enviar mensajes de texto, vídeos y archivos de sonido a su familia, colegas y amigos.</p>
     <p xml:lang="eu">NeoChat, Matrix sarearen abantaila guztiei probetsua ateratzeko aukera ematen dizun berriketa aplikaizo bat da. Zure familiari, kideei eta lagunei testu mezuak, bideoak eta audio fitxategiak era seguruan bidaltzeko aukera ematen dizu.</p>
-    <p xml:lang="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="fi">NeoChat on keskustelusovellus, jolla Matrix-verkosta saa täyden hyödyn. Se tarjoaa salatun kanavan lähettää perheelle, työkavereille ja ystäville tekstiviestejä sekä video- ja äänitiedostoja.</p>
+    <p xml:lang="fr">NeoChat est une application de discussions vous permettant de profiter pleinement du réseau Matrix. Elle vous offre un moyen sécurisé d'envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos ami(e)s.</p>
+    <p xml:lang="gl">NeoChat é unha aplicación de conversa que lle permite usar todas as funcionalidades da rede Matrix. Fornece unha forma segura de enviar mensaxes de texto e ficheiros de vídeo e son a familiares, amizades ou no traballo.</p>
+    <p xml:lang="he">NeoChat הוא יישום התכתבות שמאפשר לך לנצל את רשת Matrix במלואה. הוא מספק דרך מאובטחת לשליחת הודעות כתובות, סרטונים וקובצי שמע למשפחה, לעמיתים לעבודה ולחברים.</p>
     <p xml:lang="hu">A NeoChat egy olyan csevegőalkalmazás, amellyel teljes mértékben kihasználhatja a Matrix hálózatot. Biztonságos módot biztosít szöveges üzenetek, videók és hangfájlok küldéséhez családtagjainak, kollégáinak és barátainak.</p>
     <p xml:lang="ia">NeoChat es un app de conversation que te permitte prender avantage plen del rete Matrix. Il te forni un modo secur de inviar messages de texto, videos e files audio a tui familia, collegas e amicos.</p>
     <p xml:lang="it">NeoChat è un'applicazione di chat che ti consente di sfruttare appieno la rete Matrix. Ti fornisce un modo sicuro per inviare messaggi di testo, video e file audio a familiari, colleghi e amici.</p>
     <p xml:lang="ka">NeoChat ჩატის აპია, რომელიც საშუალება გაძლევთ, Matrix-ის ქსელის საშუალებები ბოლომდე გამოიყენოთ. ის გაძლევთ უსაფრთხო გზას, გააგზავნოთ ტექსტური შეტყობინებები, ვიდეოებ და აუდიოფაილები თქვენს ოჯახთან, კოლეგებთან და მეგობრებთან.</p>
     <p xml:lang="lv">„NeoChat“ ir tērzēšanas programma, kas ļauj pilnvērtīgi izmantot „Matrix“ tīklu. Tā sniedz drošu veidu teksta ziņu, video un audio sūtīšanai ģimenes locekļiem, kolēģiem un draugiem.</p>
     <p xml:lang="nl">NeoChat is een chat-toepassing die u het volledige voordeel van het Matrix-netwerk laat genieten. Het levert u op een veilige manier tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden te verzenden.</p>
+    <p xml:lang="nn">NeoChat er ein prateapp som lèt deg bruka all funksjonalitet i Matrix-nettverket. Du kan utveksla tekst, lyd og videoar med vennar, familie og kollegaar på ein trygg måte.</p>
     <p xml:lang="pl">NoeChat to aplikacja do rozmów, która umożliwia wykorzystanie wszystkich możliwości Matriksa. Umożliwia wysyłanie wiadomości tekstowych, filmów i dźwięków w bezpieczny sposób do twojej rodziny, kolegów i przyjaciół.</p>
     <p xml:lang="sl">NeoChat je aplikacija za klepet, ki vam omogoča, da v celoti izkoristite omrežje Matrix. Zagotavlja vam varen način za pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, sodelavcem in prijateljem.</p>
+    <p xml:lang="sv">NeoChat är ett chattprogram som låter dig dra full nytta av Matrix-nätverket. Det ger dig ett säkert sätt att skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner.</p>
     <p xml:lang="tr">NeoChat, Matrix ağının tüm özelliklerini kullanan bir sohbet uygulamasıdır. Ailenize, arkadaşlarınıza ve iş arkadaşlarınıza metin iletileri, ses ve video dosyaları göndermenin kolay bir yolunu sunar.</p>
     <p xml:lang="uk">NeoChat є програмою для спілкування, за допомогою якої ви можете скористатися усіма перевагами мережі Matrix. За її допомогою ви можете безпечно надсилати текстові повідомлення, відео та звукові файли вашим родичам, колегам та друзям.</p>
     <p xml:lang="x-test">xxNeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.xx</p>
@@ -108,8 +118,9 @@
     <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 plenemente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
+    <p xml:lang="ia">NeoChat aspira a esser un application plenmente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
     <p xml:lang="it">NeoChat mira ad essere un'applicazione completa per le specifiche Matrix. Pertanto, sono supportati tutti gli elementi dell'attuale specifica stabile con le notevoli eccezioni di VoIP, conversazioni e alcuni aspetti della cifratura end-to-end. Ci sono alcune altre piccole omissioni dovute al fatto che le specifiche Matrix sono in continua evoluzione, ma l'obiettivo rimane quello di fornire un eventuale supporto per l'intera specifica.</p>
     <p xml:lang="ka">NeoChat მიზნად ისახავს Matrix სპეციფიკაციის სრული განხორციელება ჰქონდეს. როგორც ასეთი, ყველაფერი მიმდინარე სპეციფიკაციიდან, VoIP-ის, ძაფებისა და გამჭოლი დაშიფვრის ზოგიერთი ასპექტის გარდა, მხარდაჭერილია. შეძლება ასევე იყოს მცირე ლაფსუსებიც იმის გამო, რომ Matrix-ის სპეციფიკაცია მუდმივად ვითარდება, მაგრამ ჩვენი მიზანი მისი სრული მხარდაჭერაა.</p>
     <p xml:lang="ko">NeoChat은 Matrix 표준을 따르는 프로그램을 목표로 합니다. 현재 안정 버전의 표준에서 제공하는 기능의 대부분을 지원하며, VoIP, 스레드, 일부 종단간 암호화와 같은 기능은 아직 지원하지 않습니다. Matrix 표준은 계속하여 진화 중이기 때문에 일부 기능이 빠져 있을 수도 있지만 장기적으로는 전체 표준을 지원하는 것이 목표입니다.</p>
@@ -118,6 +129,7 @@
     <p xml:lang="nn">NeoChat har som mål å støtta all funksjonalitet i Matrix-spesifikasjonen. Førebels er alt i den gjeldande stabile spesifikasjonen støtta, med unntak av VoIP, trådar og nokre delar av ende-til-kryptering. Det finst òg andre småting som ikkje er støtta, sidan Matrix-spesifikasjon er i stadig endring, men målet er altså støtte for alt.</p>
     <p xml:lang="pl">NeoChat w zamyśle ma być pełnowartościową aplikacją wg wytycznych Matriksa. Z tego powodu, wszystko, co jest obecnie w stabilnych wytycznych z pominięciem VoIP, wątków i niektórych części szyfrowania Użytkownik-do-Użytkownika są obecnie obsługiwane. Pominięto też kilka mniejszych rzeczy ze względu na ciągły rozwój wytycznych Matriksa, lecz celem nadal jest zapewnienie obsługi wszystkich wytycznych.</p>
     <p xml:lang="pt">O NeoChat pretende ser uma aplicação completa para a especificação do Matrix. Como tal, tudo o que existe na especificação estável actual, com as notáveis excepções do VoIP, tópicos e alguns aspectos da Encriptação Ponto-a-Ponto, são suportados. Existem mais algumas omissões, devido ao facto que a norma do Matrix está em constante evolução, mas o objectivo continua a ser oferecer o suporte eventual para a norma por inteiro.</p>
+    <p xml:lang="ru">Целью создания NeoChat является полноценная реализация программы для спецификации Matrix. Как следствие, реализовано всё в текущей стабильной спецификации (за исключением голосовой интернет-связи, потоков и некоторых аспектов сквозного шифрования). Есть также несколько других незначительных пробелов, обусловленных постоянными изменениями спецификации Matrix. Тем не менее, стоит задача в итоге предоставить полную поддержку спецификации.</p>
     <p xml:lang="sl">Neochat cilja, da bi bila popolna aplikacija po specifikaciji Matrixa. Kot takšna vsebuje vse v trenutni stabilni specifikaciji z pomembnimi izjemami pri VoIP, nitih in nekaterih vidikov šifriranja od konca do konca. Obstaja nekaj drugih manjših opustitev zaradi dejstva, da se specifikacija Matrix nenehno razvija, vendar cilj ostaja zagotoviti morebitno podporo celotni specifikaciji.</p>
     <p xml:lang="sv">NeoChat har som mål att vara ett fullständigt program enligt Matrix-specifikationen. Som sådant stöds allt i den nuvarande stabila specifikationen, med de nämnvärda undantagen VoIP, trådar och några aspekter av kryptering hela vägen. Det finns några ytterligare utelämnanden på grund av att Matrix-specifikationen hela tiden utvecklas, men målet förblir att till slut erbjuda stöd för hela specifikationen.</p>
     <p xml:lang="tr">NeoChat, Matrix belirtimi için tam özellikli bir uygulama olmayı hedefler. Bu nedenle; VoIP, ileti zincirleri ve Uçtan Uca Şifreleme’nin bazı yönleri gibi dikkate değer istisnalar dışında var olan kararlı belirtimdeki her şey desteklenir. Matrix belirtiminin sürekli gelişmesi nedeniyle birkaç küçük eksiklik daha var; ancak amaç tüm belirtim için nihai destek sağlamak olmayı sürdürüyor.</p>
@@ -135,6 +147,7 @@
     <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>
@@ -145,6 +158,7 @@
     <p xml:lang="nn">På grunn av måten Matrix-spesifikasjonen vert utvikla på, støttar NeoChat òg nokre uferdige funksjonar:</p>
     <p xml:lang="pl">Ze względu na sposób rozwoju Matriksa, NeoChat obsługuje także kilka niestabilnych możliwości. Obecnie są to:</p>
     <p xml:lang="pt">Devido à natureza do desenvolvimento da especificação do Matrix, o NeoChat também suporta diversas funcionalidades instáveis. De momento são:</p>
+    <p xml:lang="ru">В силу природы разработки спецификации Matrix в NeoChat тоже предусмотрена поддержка многочисленных нестабильных возможностей. В текущей версии это следующие возможности:</p>
     <p xml:lang="sl">Zaradi narave razvoja specifikacije Matrixa NeoChat podpira tudi številne nestabilne zmožnosti. Trenutno so to:</p>
     <p xml:lang="sv">På grund av sättet Matrix-specifikationens utvecklas, stöder NeoChat också ett stor antal instabila funktioner. För närvarande är de:</p>
     <p xml:lang="ta">மேட்ரிக்ஸு நெறிமுறை வரையறுக்கப்படும் வித‍த்தின் காரணமாக, பல நிலையற்ற அம்சங்களையும் நியோச்சாட் ஆதரிக்கிறது. தற்போது ஆதரிக்கப்படுபவை:</p>
@@ -164,6 +178,7 @@
       <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>
@@ -192,6 +207,7 @@
       <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>
@@ -202,10 +218,11 @@
       <li xml:lang="nn">Klistremerke-pakkar – MSC2545</li>
       <li xml:lang="pl">Paczki naklejek - MSC2545</li>
       <li xml:lang="pt">Pacotes de Autocolantes - MSC2545</li>
+      <li xml:lang="ru">Наборы стикеров — MSC2545</li>
       <li xml:lang="sl">Sticker Packs - MSC2545</li>
       <li xml:lang="sv">Sticker Packs - MSC2545</li>
       <li xml:lang="ta">ஒட்டி தொகுப்புகள் - MSC2545</li>
-      <li xml:lang="tr">Yapışkan Paketleri — MSC2545</li>
+      <li xml:lang="tr">Çıkartma Paketleri — MSC2545</li>
       <li xml:lang="uk">Пакунки наліпок - MSC2545</li>
       <li xml:lang="x-test">xxSticker Packs - MSC2545xx</li>
       <li xml:lang="zh-TW">貼圖包 - MSC2545</li>
@@ -220,6 +237,7 @@
       <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>
@@ -230,6 +248,7 @@
       <li xml:lang="nn">Posisjonshendingar – MSC3488</li>
       <li xml:lang="pl">Wydarzenia w miejscach - MSC3488</li>
       <li xml:lang="pt">Eventos com Localizações - MSC3488</li>
+      <li xml:lang="ru">События местоположения — MSC3488</li>
       <li xml:lang="sl">Location Events - MSC3488</li>
       <li xml:lang="sv">Location Events - MSC3488</li>
       <li xml:lang="ta">இட நிகழ்வுகள் - MSC3488</li>
@@ -275,12 +294,14 @@
       <caption xml:lang="ar">العرض الرئيسة مع قائمة الغرف والدردشات و معلومات الغرفة</caption>
       <caption xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</caption>
       <caption xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</caption>
+      <caption xml:lang="en-GB">Main view with room list, chat, and room information</caption>
       <caption xml:lang="eo">Ĉefa vido kun ĉambra listo, babilejo kaj ĉambra informo</caption>
       <caption xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</caption>
       <caption xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</caption>
       <caption xml:lang="fi">Päänäkymä, jossa huoneluettelo, keskustelu ja huoneen tiedot</caption>
       <caption xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</caption>
       <caption xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</caption>
+      <caption xml:lang="he">תצוגה ראשית עם רשימת חדרים, צ׳אט ופרטי חדר</caption>
       <caption xml:lang="hu">A fő nézet a szobalistával, csevegéssel és szobainformációkkal</caption>
       <caption xml:lang="ia">Vista principal con lista de sala, chat e information de sala</caption>
       <caption xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</caption>
@@ -291,6 +312,7 @@
       <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
       <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
       <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
       <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
       <caption xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</caption>
       <caption xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</caption>
@@ -302,20 +324,27 @@
     <screenshot type="default">
       <image>https://cdn.kde.org/screenshots/neochat/spaces.png</image>
       <caption>Discover new communities with Matrix Spaces</caption>
+      <caption xml:lang="ar">اكتشف مجتمعات جديدة مع فضاءات ماتركس</caption>
       <caption xml:lang="ca">Descobriu comunitats noves amb els espais de Matrix</caption>
       <caption xml:lang="ca-valencia">Descobriu comunitats noves amb els espais de Matrix</caption>
+      <caption xml:lang="en-GB">Discover new communities with Matrix Spaces</caption>
       <caption xml:lang="eo">Malkovru novajn komunumojn per Matrix Spaces</caption>
       <caption xml:lang="es">Descubra nuevas comunidades con los espacios de Matrix</caption>
       <caption xml:lang="eu">Ezagutu komunitate berriak Matrixeko Tokiak erabiliz</caption>
+      <caption xml:lang="fi">Löydä uusia yhteisöjä Matrix Spacesillä</caption>
       <caption xml:lang="fr">Découvrez de nouvelles communautés avec les espaces sous Matrix</caption>
+      <caption xml:lang="gl">Descubra novas comunidades dos espazos de Matrix.</caption>
+      <caption xml:lang="he">אפשר להיחשף לקהילות חדשות דרך Matrix Spaces</caption>
       <caption xml:lang="hu">Fedezzen fel új közösségeket a Matrix Terek segítségével</caption>
       <caption xml:lang="ia">Discoperi nove communitate con Matrix Spaces (Spatios de Matrix)</caption>
       <caption xml:lang="it">Scopri nuove comunità con Matrix Spaces</caption>
       <caption xml:lang="ka">აღმოაჩინეთ ახალი საზოგადოებები Matrix Spaces-თან ერთად</caption>
       <caption xml:lang="lv">Atklājiet jaunas kopienas ar „Matrix“ telpām</caption>
       <caption xml:lang="nl">Ontdek nieuwe gemeenschappen met Matrix-ruimten</caption>
+      <caption xml:lang="nn">Oppdag nye fellesskap med Matrix Spaces</caption>
       <caption xml:lang="pl">Odkrywaj nowe społeczności w Przestrzeniach Matriksa</caption>
       <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
+      <caption xml:lang="sv">Upptäck nya gemenskaper med Matrix Spaces</caption>
       <caption xml:lang="tr">Matrix Alanlar ile yeni topluluklar keşfedin</caption>
       <caption xml:lang="uk">Пошук нових спільнот за допомогою Matrix Spaces</caption>
       <caption xml:lang="x-test">xxDiscover new communities with Matrix Spacesxx</caption>
@@ -334,12 +363,14 @@
       <caption xml:lang="ar">العرض الرئيسة مع قائمة الغرف والدردشات و معلومات الغرفة</caption>
       <caption xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</caption>
       <caption xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</caption>
+      <caption xml:lang="en-GB">Main view with room list, chat, and room information</caption>
       <caption xml:lang="eo">Ĉefa vido kun ĉambra listo, babilejo kaj ĉambra informo</caption>
       <caption xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</caption>
       <caption xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</caption>
       <caption xml:lang="fi">Päänäkymä, jossa huoneluettelo, keskustelu ja huoneen tiedot</caption>
       <caption xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</caption>
       <caption xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</caption>
+      <caption xml:lang="he">תצוגה ראשית עם רשימת חדרים, צ׳אט ופרטי חדר</caption>
       <caption xml:lang="hu">A fő nézet a szobalistával, csevegéssel és szobainformációkkal</caption>
       <caption xml:lang="ia">Vista principal con lista de sala, chat e information de sala</caption>
       <caption xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</caption>
@@ -350,6 +381,7 @@
       <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
       <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
       <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
       <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
       <caption xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</caption>
       <caption xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</caption>
@@ -365,12 +397,14 @@
       <caption xml:lang="ca">Pantalla d'inici de sessió</caption>
       <caption xml:lang="ca-valencia">Pantalla d'inici de sessió</caption>
       <caption xml:lang="cs">Přihlašovací obrazovka</caption>
+      <caption xml:lang="en-GB">Login screen</caption>
       <caption xml:lang="eo">Ensaluta ekrano</caption>
       <caption xml:lang="es">Pantalla de inicio de sesión</caption>
       <caption xml:lang="eu">Saio-hasteko pantaila</caption>
       <caption xml:lang="fi">Kirjautumisnäkymä</caption>
       <caption xml:lang="fr">Écran de connexion</caption>
       <caption xml:lang="gl">Pantalla de identificación.</caption>
+      <caption xml:lang="he">מסך כניסה</caption>
       <caption xml:lang="hu">Bejelentkező képernyő</caption>
       <caption xml:lang="ia">Schermo de accesso</caption>
       <caption xml:lang="it">Schermata di accesso</caption>
@@ -381,6 +415,7 @@
       <caption xml:lang="nn">Innloggingsbilete</caption>
       <caption xml:lang="pl">Ekran logowania</caption>
       <caption xml:lang="pt">Ecrã de autenticação</caption>
+      <caption xml:lang="ru">Окно входа</caption>
       <caption xml:lang="sl">Prijavni zaslon</caption>
       <caption xml:lang="sv">Inloggningsfönster</caption>
       <caption xml:lang="ta">நுழைவுத் திரை</caption>
@@ -394,6 +429,11 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="24.08.1" date="2024-09-12"/>
+    <release version="24.08.0" date="2024-08-22"/>
+    <release version="24.05.2" date="2024-07-04"/>
+    <release version="24.05.1" date="2024-06-13"/>
+    <release version="24.05.0" date="2024-05-23"/>
     <release version="24.02.2" date="2024-04-11"/>
     <release version="24.02.1" date="2024-03-21"/>
     <release version="24.02.0" date="2024-02-28">

org.kde.neochat.desktop

@@ -18,6 +18,7 @@ Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[gl]=NeoChat
+Name[he]=NeoChat
 Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
@@ -59,6 +60,7 @@ GenericName[eu]=Matrix bezeroa
 GenericName[fi]=Matrix-asiakas
 GenericName[fr]=Client « Matrix »
 GenericName[gl]=Cliente de Matrix
+GenericName[he]=לקוח Matrix
 GenericName[hu]=Matrix kliens
 GenericName[ia]=Cliente de Matrice
 GenericName[id]=Klien Matrix
@@ -99,6 +101,7 @@ Comment[eu]=Matrix protokolorako bezeroa
 Comment[fi]=Asiakas Matrix-yhteyskäytännölle
 Comment[fr]=Client pour le protocole « Matrix »
 Comment[gl]=Cliente para o protocolo Matrix.
+Comment[he]=לקוח לפרוטוקול Matrix
 Comment[hu]=Kliens a Matrix protokollhoz
 Comment[ia]=Cliente per le protocollo de Matrix
 Comment[id]=Klien untuk protokol Matrix

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

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

src/CMakeLists.txt

@@ -20,8 +20,6 @@ add_library(neochat STATIC
     models/customemojimodel.h
     clipboard.cpp
     clipboard.h
-    matriximageprovider.cpp
-    matriximageprovider.h
     models/messageeventmodel.cpp
     models/messageeventmodel.h
     models/messagefiltermodel.cpp
@@ -136,6 +134,8 @@ add_library(neochat STATIC
     jobs/neochatdeletedevicejob.h
     jobs/neochatchangepasswordjob.cpp
     jobs/neochatchangepasswordjob.h
+    jobs/neochatgetcommonroomsjob.cpp
+    jobs/neochatgetcommonroomsjob.h
     mediasizehelper.cpp
     mediasizehelper.h
     eventhandler.cpp
@@ -158,7 +158,6 @@ 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
@@ -177,13 +176,31 @@ 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
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
     QT_QML_SINGLETON_TYPE TRUE
 )
 
-qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
+ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat
     QML_FILES
         qml/Main.qml
@@ -204,20 +221,13 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/InviteUserPage.qml
         qml/ImageEditorPage.qml
         qml/NeochatMaximizeComponent.qml
-        qml/FancyEffectsContainer.qml
         qml/TypingPane.qml
         qml/QuickSwitcher.qml
         qml/HoverActions.qml
-        qml/ChatBar.qml
         qml/AttachmentPane.qml
-        qml/ReplyPane.qml
-        qml/CompletionMenu.qml
-        qml/PieProgressBar.qml
         qml/QuickFormatBar.qml
-        qml/EmojiPicker.qml
         qml/UserDetailDialog.qml
         qml/CreateRoomDialog.qml
-        qml/EmojiDialog.qml
         qml/OpenFileDialog.qml
         qml/KeyVerificationDialog.qml
         qml/ConfirmLogoutDialog.qml
@@ -232,14 +242,9 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/EditMenu.qml
         qml/MessageDelegateContextMenu.qml
         qml/FileDelegateContextMenu.qml
+        qml/FileDelegateContextMenuMobile.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
@@ -263,7 +268,6 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/SelectParentDialog.qml
         qml/QrCodeMaximizeComponent.qml
         qml/SelectSpacesDialog.qml
-        qml/AttachDialog.qml
         qml/NotificationsView.qml
         qml/SearchPage.qml
         qml/ServerComboBox.qml
@@ -281,17 +285,29 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/ConfirmLeaveDialog.qml
         qml/CodeMaximizeComponent.qml
         qml/EditStateDialog.qml
-    RESOURCES
-        qml/confetti.png
-        qml/glowdot.png
+        qml/ConsentDialog.qml
+        qml/AskDirectChatConfirmation.qml
+        qml/HoverLinkIndicator.qml
+        qml/AvatarNotification.qml
+        qml/ReasonDialog.qml
+    DEPENDENCIES
+        QtCore
+        QtQuick
+    IMPORTS
+        org.kde.neochat.timeline
+        org.kde.neochat.settings
+        org.kde.neochat.devtools
+        org.kde.neochat.login
+        org.kde.neochat.chatbar
 )
 
 add_subdirectory(settings)
 add_subdirectory(timeline)
 add_subdirectory(devtools)
 add_subdirectory(login)
+add_subdirectory(chatbar)
 
-if(UNIX)
+if(NOT ANDROID AND NOT WIN32)
     qt_target_qml_sources(neochat QML_FILES qml/ShareAction.qml)
 else()
     set_source_files_properties(qml/ShareActionStub.qml PROPERTIES
@@ -372,16 +388,18 @@ endif()
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
-    target_compile_definitions(neochat PUBLIC -DHAVE_X11)
+    target_compile_definitions(neochat PUBLIC -DHAVE_X11=1)
     target_sources(neochat PRIVATE runner.cpp)
 
     if (TARGET KUnifiedPush)
         target_sources(neochat PRIVATE fakerunner.cpp)
     endif()
+else()
+    target_compile_definitions(neochat PUBLIC -DHAVE_X11=0)
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums)
-target_link_libraries(neochat PRIVATE settingsplugin timelineplugin devtoolsplugin loginplugin)
+target_link_libraries(neochat PRIVATE settingsplugin timelineplugin devtoolsplugin loginplugin chatbarplugin)
 target_link_libraries(neochat PUBLIC
     Qt::Core
     Qt::Quick
@@ -409,7 +427,7 @@ if (TARGET KF6::Crash)
     target_link_libraries(neochat PUBLIC KF6::Crash)
 endif()
 
-kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
+kconfig_target_kcfg_file(neochat FILE neochatconfig.kcfg CLASS_NAME NeoChatConfig MUTATORS GENERATE_PROPERTIES DEFAULT_VALUE_GETTERS PARENT_IN_CONSTRUCTOR SINGLETON GENERATE_MOC QML_REGISTRATION)
 
 if(NEOCHAT_FLATPAK)
     target_compile_definitions(neochat PUBLIC NEOCHAT_FLATPAK)

src/actionshandler.cpp

@@ -56,7 +56,7 @@ void ActionsHandler::handleMessageEvent(ChatBarCache *chatBarCache)
 
     QString handledText = chatBarCache->text();
     handledText = handleMentions(handledText, chatBarCache->mentions());
-    handleMessage(m_room->mainCache()->text(), handledText, chatBarCache);
+    handleMessage(chatBarCache->text(), handledText, chatBarCache);
 }
 
 QString ActionsHandler::handleMentions(QString handledText, QList<Mention> *mentions)
@@ -91,7 +91,7 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, Cha
 
             for (auto it = m_room->messageEvents().crbegin(); it != m_room->messageEvents().crend(); it++) {
                 if (const auto event = eventCast<const RoomMessageEvent>(&**it)) {
-                    if (event->senderId() == m_room->localUser()->id() && event->hasTextContent()) {
+                    if (event->senderId() == m_room->localMember().id() && event->hasTextContent()) {
                         QString originalString;
                         if (event->content()) {
                             originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content())->body;

src/chatbar/AttachDialog.qml

@@ -13,13 +13,15 @@ import org.kde.neochat
 QQC2.Popup {
     id: root
 
-    padding: 16
+    padding: Kirigami.Units.largeSpacing
 
     signal chosen(string path)
 
     contentItem: RowLayout {
+
+        spacing: Kirigami.Units.smallSpacing
+
         QQC2.ToolButton {
-            Layout.preferredWidth: 160
             Layout.fillHeight: true
 
             icon.name: 'mail-attachment'
@@ -28,7 +30,7 @@ QQC2.Popup {
 
             onClicked: {
                 root.close();
-                var fileDialog = openFileDialog.createObject(QQC2.ApplicationWindow.overlay);
+                var fileDialog = openFileDialog.createObject(QQC2.Overlay.overlay);
                 fileDialog.chosen.connect(path => root.chosen(path));
                 fileDialog.open();
             }
@@ -37,11 +39,8 @@ QQC2.Popup {
         Kirigami.Separator {}
 
         QQC2.ToolButton {
-            Layout.preferredWidth: 160
             Layout.fillHeight: true
 
-            padding: 16
-
             icon.name: 'insert-image'
             text: i18n("Clipboard image")
             onClicked: {

src/chatbar/CMakeLists.txt

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

src/chatbar/ChatBar.qml

@@ -115,7 +115,7 @@ QQC2.Control {
             displayHint: QQC2.AbstractButton.IconOnly
 
             onTriggered: {
-                locationChooser.createObject(QQC2.ApplicationWindow.overlay, {
+                locationChooser.createObject(QQC2.Overlay.overlay, {
                     room: root.currentRoom
                 }).open();
             }
@@ -219,7 +219,7 @@ QQC2.Control {
                     }
 
                     onTextChanged: {
-                        if (!repeatTimer.running && Config.typingNotifications) {
+                        if (!repeatTimer.running && NeoChatConfig.typingNotifications) {
                             var textExists = text.length > 0;
                             root.currentRoom.sendTypingNotification(textExists);
                             textExists ? repeatTimer.start() : repeatTimer.stop();
@@ -278,6 +278,8 @@ QQC2.Control {
                     Keys.onTabPressed: {
                         if (completionMenu.visible) {
                             completionMenu.complete();
+                        } else {
+                            contextDrawer.handle.children[0].forceActiveFocus()
                         }
                     }
                     Keys.onPressed: event => {
@@ -351,8 +353,8 @@ QQC2.Control {
         startBreakpoint: Kirigami.Units.gridUnit * 46
         endBreakpoint: Kirigami.Units.gridUnit * 66
         startPercentWidth: 100
-        endPercentWidth: Config.compactLayout ? 100 : 85
-        maxWidth: Config.compactLayout ? -1 : Kirigami.Units.gridUnit * 60
+        endPercentWidth: NeoChatConfig.compactLayout ? 100 : 85
+        maxWidth: NeoChatConfig.compactLayout ? -1 : Kirigami.Units.gridUnit * 60
 
         parentWidth: root.width
     }
@@ -362,7 +364,7 @@ QQC2.Control {
         ReplyPane {
             userName: _private.chatBarCache.relationUser.displayName
             userColor: _private.chatBarCache.relationUser.color
-            userAvatar: _private.chatBarCache.relationUser.avatarSource
+            userAvatar: _private.chatBarCache.relationUser.avatarUrl
             text: _private.chatBarCache.relationMessage
 
             onCancel: {
@@ -393,7 +395,7 @@ QQC2.Control {
             repeatTimer.stop();
             root.currentRoom.markAllMessagesAsRead();
             textField.clear();
-            _private.chatBarCache.replyId = "";
+            _private.chatBarCache.clearRelations();
             messageSent();
         }
 

src/chatbar/EmojiDelegate.qml

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

src/chatbar/EmojiDialog.qml

@@ -38,18 +38,22 @@ QQC2.Popup {
     }
 
     background: Kirigami.ShadowedRectangle {
-        Kirigami.Theme.colorSet: Kirigami.Theme.View
+        radius: Kirigami.Units.cornerRadius
         color: Kirigami.Theme.backgroundColor
-        radius: Kirigami.Units.mediumSpacing
-        shadow {
-            size: Kirigami.Units.largeSpacing
-            color: Qt.rgba(0.0, 0.0, 0.0, 0.3)
-            yOffset: 2
-        }
+
         border {
-            color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-            width: 2
+            width: 1
+            color: Kirigami.ColorUtils.linearInterpolation(Kirigami.Theme.backgroundColor, Kirigami.Theme.textColor, Kirigami.Theme.frameContrast)
         }
+
+        shadow {
+            size: Kirigami.Units.gridUnit
+            yOffset: 0
+            color: Qt.rgba(0, 0, 0, 0.2)
+        }
+
+        Kirigami.Theme.inherit: false
+        Kirigami.Theme.colorSet: Kirigami.Theme.View
     }
 
     modal: true

src/chatbar/EmojiTonesPicker.qml

@@ -30,7 +30,7 @@ QQC2.Popup {
     onOpened: x = Math.min(parent.mapFromGlobal(QQC2.Overlay.overlay.width - root.width, 0).x, -(width - parent.width) / 2)
     background: Kirigami.ShadowedRectangle {
         color: Kirigami.Theme.backgroundColor
-        radius: Kirigami.Units.mediumSpacing
+        radius: Kirigami.Units.cornerRadius
         shadow {
             size: Kirigami.Units.largeSpacing
             color: Qt.rgba(0.0, 0.0, 0.0, 0.3)

src/chatbarcache.cpp

@@ -3,6 +3,8 @@
 
 #include "chatbarcache.h"
 
+#include <Quotient/roommember.h>
+
 #include "chatdocumenthandler.h"
 #include "eventhandler.h"
 #include "neochatroom.h"
@@ -84,7 +86,7 @@ void ChatBarCache::setEditId(const QString &editId)
     Q_EMIT attachmentPathChanged();
 }
 
-QVariantMap ChatBarCache::relationUser() const
+Quotient::RoomMember ChatBarCache::relationUser() const
 {
     if (parent() == nullptr) {
         qWarning() << "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.";
@@ -96,9 +98,9 @@ QVariantMap ChatBarCache::relationUser() const
         return {};
     }
     if (m_relationId.isEmpty()) {
-        return room->getUser(nullptr);
+        return room->member(QString());
     }
-    return room->getUser(room->user((*room->findInTimeline(m_relationId))->senderId()));
+    return room->member((*room->findInTimeline(m_relationId))->senderId());
 }
 
 QString ChatBarCache::relationMessage() const
@@ -117,8 +119,7 @@ QString ChatBarCache::relationMessage() const
     }
 
     if (auto event = room->findInTimeline(m_relationId); event != room->historyEdge()) {
-        EventHandler eventhandler(room, &**event);
-        return eventhandler.getMarkdownBody();
+        return EventHandler::markdownBody(&**event);
     }
     return {};
 }
@@ -138,8 +139,8 @@ void ChatBarCache::setThreadId(const QString &threadId)
     if (m_threadId == threadId) {
         return;
     }
-    m_threadId = threadId;
-    Q_EMIT threadIdChanged();
+    const auto oldThreadId = std::exchange(m_threadId, threadId);
+    Q_EMIT threadIdChanged(oldThreadId, m_threadId);
 }
 
 QString ChatBarCache::attachmentPath() const
@@ -159,6 +160,16 @@ void ChatBarCache::setAttachmentPath(const QString &attachmentPath)
     Q_EMIT relationIdChanged(oldEventId, m_relationId);
 }
 
+void ChatBarCache::clearRelations()
+{
+    const auto oldEventId = std::exchange(m_relationId, QString());
+    const auto oldThreadId = std::exchange(m_threadId, QString());
+    m_attachmentPath = QString();
+    Q_EMIT relationIdChanged(oldEventId, m_relationId);
+    Q_EMIT threadIdChanged(oldThreadId, m_threadId);
+    Q_EMIT attachmentPathChanged();
+}
+
 QList<Mention> *ChatBarCache::mentions()
 {
     return &m_mentions;

src/chatbarcache.h

@@ -10,6 +10,12 @@
 
 class ChatDocumentHandler;
 
+namespace Quotient
+{
+class RoomMember;
+}
+
+
 /**
  * @brief Defines a user mention in the current chat or edit text.
  */
@@ -27,7 +33,7 @@ struct Mention {
  * A class to cache data from a chat bar.
  *
  * A chat bar can be anything that allows users to compose or edit message, it doesn't
- * necessarily have to use the ChatBar component, e.g. MessageEditComponent.
+ * necessarily have to use the ChatBar component, e.g. ChatBarComponent.
  *
  * This object is intended to allow the current contents of a chat bar to be cached
  * between different rooms, i.e. there is an expectation that each NeoChatRoom could
@@ -37,7 +43,7 @@ struct Mention {
  *       as it's parent. This is necessary for certain functions which need to get
  *       relevant room information.
  *
- * @sa ChatBar, MessageEditComponent, NeoChatRoom
+ * @sa ChatBar, ChatBarComponent, NeoChatRoom
  */
 class ChatBarCache : public QObject
 {
@@ -88,26 +94,13 @@ class ChatBarCache : public QObject
     Q_PROPERTY(QString editId READ editId WRITE setEditId NOTIFY relationIdChanged)
 
     /**
-     * @brief Get the user for the message being replied to.
+     * @brief Get the RoomMember object for the message being replied to.
      *
-     * This is different to getting a Quotient::User object
-     * as neither of those can provide details like the displayName or avatarMediaId
-     * without the room context as these can vary from room to room.
+     * Returns an empty RoomMember if not replying to a message.
      *
-     * Returns an empty user if not replying to a message.
-     *
-     * The user QVariantMap has the following properties:
-     *  - isLocalUser - Whether the user is the local user.
-     *  - id - The matrix ID of the user.
-     *  - displayName - Display name in the context of this room.
-     *  - avatarSource - The mxc URL for the user's avatar in the current room.
-     *  - avatarMediaId - Avatar id in the context of this room.
-     *  - color - Color for the user.
-     *  - object - The Quotient::User object for the user.
-     *
-     * @sa getUser, Quotient::User
+     * @sa Quotient::RoomMember
      */
-    Q_PROPERTY(QVariantMap relationUser READ relationUser NOTIFY relationIdChanged)
+    Q_PROPERTY(Quotient::RoomMember relationUser READ relationUser NOTIFY relationIdChanged)
 
     /**
      * @brief The content of the related message.
@@ -161,7 +154,7 @@ public:
     QString editId() const;
     void setEditId(const QString &editId);
 
-    QVariantMap relationUser() const;
+    Quotient::RoomMember relationUser() const;
 
     QString relationMessage() const;
 
@@ -172,6 +165,13 @@ 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.
      */
@@ -195,7 +195,7 @@ public:
 Q_SIGNALS:
     void textChanged();
     void relationIdChanged(const QString &oldEventId, const QString &newEventId);
-    void threadIdChanged();
+    void threadIdChanged(const QString &oldThreadId, const QString &newThreadId);
     void attachmentPathChanged();
 
 private:

src/colorschemer.cpp

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

src/colorschemer.h

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

src/controller.cpp

@@ -9,28 +9,18 @@
 #include <KLocalizedString>
 
 #include <QGuiApplication>
-#include <QNetworkProxy>
-#include <QQuickTextDocument>
-#include <QQuickWindow>
-#include <QStandardPaths>
-#include <QStringBuilder>
 #include <QTimer>
 
 #include <signal.h>
 
-#include <Quotient/accountregistry.h>
-#include <Quotient/connection.h>
-#include <Quotient/csapi/logout.h>
 #include <Quotient/csapi/notifications.h>
-#include <Quotient/eventstats.h>
 #include <Quotient/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"
@@ -46,6 +36,10 @@
 #endif
 #endif
 
+#ifdef HAVE_KUNIFIEDPUSH
+#include <kunifiedpush/connector.h>
+#endif
+
 bool testMode = false;
 
 using namespace Quotient;
@@ -68,7 +62,11 @@ Controller::Controller(QObject *parent)
         });
     } else {
         auto c = new NeoChatConnection(this);
+#if Quotient_VERSION_MINOR > 8
+        c->assumeIdentity(QStringLiteral("@user:localhost:1234"), QStringLiteral("device_1234"), QStringLiteral("token_1234"));
+#else
         c->assumeIdentity(QStringLiteral("@user:localhost:1234"), QStringLiteral("token_1234"));
+#endif
         connect(c, &Connection::connected, this, [c, this]() {
             m_accountRegistry.add(c);
             c->syncLoop();
@@ -107,14 +105,16 @@ Controller::Controller(QObject *parent)
     connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, [this]() {
         if (m_accountRegistry.size() > oldAccountCount) {
             auto connection = dynamic_cast<NeoChatConnection *>(m_accountRegistry.accounts()[m_accountRegistry.size() - 1]);
-            connect(connection, &NeoChatConnection::syncDone, this, [connection]() {
-                NotificationsManager::instance().handleNotifications(connection);
-            });
-            connectSingleShot(connection, &NeoChatConnection::syncDone, this, [this, connection] {
-                if (!m_endpoint.isEmpty()) {
-                    connection->setupPushNotifications(m_endpoint);
-                }
-            });
+            connect(
+                connection,
+                &NeoChatConnection::syncDone,
+                this,
+                [this, connection] {
+                    if (!m_endpoint.isEmpty()) {
+                        connection->setupPushNotifications(m_endpoint);
+                    }
+                },
+                Qt::SingleShotConnection);
         }
         oldAccountCount = m_accountRegistry.size();
     });
@@ -190,7 +190,7 @@ void Controller::invokeLogin()
         m_accountsLoading += accountId;
         Q_EMIT accountsLoadingChanged();
         if (!account.homeserver().isEmpty()) {
-            auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account);
+            auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account.userId());
             connect(accessTokenLoadingJob, &QKeychain::Job::finished, this, [accountId, this, accessTokenLoadingJob](QKeychain::Job *) {
                 AccountSettings account{accountId};
                 QString accessToken;
@@ -204,25 +204,43 @@ void Controller::invokeLogin()
                 m_connectionsLoading[accountId] = connection;
                 connect(connection, &NeoChatConnection::connected, this, [this, connection, accountId] {
                     connection->loadState();
-                    addConnection(connection);
-                    m_accountsLoading.removeAll(connection->userId());
-                    m_connectionsLoading.remove(accountId);
-                    Q_EMIT accountsLoadingChanged();
+                    if (connection->allRooms().size() == 0 || connection->allRooms()[0]->currentState().get<RoomCreateEvent>()) {
+                        addConnection(connection);
+                        m_accountsLoading.removeAll(connection->userId());
+                        m_connectionsLoading.remove(accountId);
+                        Q_EMIT accountsLoadingChanged();
+                    } else {
+                        connect(
+                            connection->allRooms()[0],
+                            &Room::baseStateLoaded,
+                            this,
+                            [this, connection, accountId]() {
+                                addConnection(connection);
+                                m_accountsLoading.removeAll(connection->userId());
+                                m_connectionsLoading.remove(accountId);
+                                Q_EMIT accountsLoadingChanged();
+                            },
+                            Qt::SingleShotConnection);
+                    }
                 });
                 connect(connection, &NeoChatConnection::networkError, this, [this](const QString &error, const QString &, int, int) {
                     Q_EMIT errorOccured(i18n("Network Error: %1", error), {});
                 });
+#if Quotient_VERSION_MINOR > 8
+                connection->assumeIdentity(account.userId(), account.deviceId(), accessToken);
+#else
                 connection->assumeIdentity(account.userId(), accessToken);
+#endif
             });
         }
     }
 }
 
-QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const AccountSettings &account)
+QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const QString &userId)
 {
-    qDebug() << "Reading access token from the keychain for" << account.userId();
+    qDebug() << "Reading access token from the keychain for" << userId;
     auto job = new QKeychain::ReadPasswordJob(qAppName(), this);
-    job->setKey(account.userId());
+    job->setKey(userId);
 
     // Handling of errors
     connect(job, &QKeychain::Job::finished, this, [this, job]() {
@@ -253,23 +271,19 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const Accoun
     return job;
 }
 
-bool Controller::saveAccessTokenToKeyChain(const AccountSettings &account, const QByteArray &accessToken)
+void Controller::saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken)
 {
-    qDebug() << "Save the access token to the keychain for " << account.userId();
-    QKeychain::WritePasswordJob job(qAppName());
-    job.setAutoDelete(false);
-    job.setKey(account.userId());
-    job.setBinaryData(accessToken);
-    QEventLoop loop;
-    QKeychain::WritePasswordJob::connect(&job, &QKeychain::Job::finished, &loop, &QEventLoop::quit);
-    job.start();
-    loop.exec();
-
-    if (job.error()) {
-        qWarning() << "Could not save access token to the keychain: " << qPrintable(job.errorString());
-        return false;
-    }
-    return true;
+    qDebug() << "Save the access token to the keychain for " << userId;
+    auto job = new QKeychain::WritePasswordJob(qAppName());
+    job->setAutoDelete(true);
+    job->setKey(userId);
+    job->setBinaryData(accessToken);
+    connect(job, &QKeychain::WritePasswordJob::finished, this, [job]() {
+        if (job->error()) {
+            qWarning() << "Could not save access token to the keychain: " << qPrintable(job->errorString());
+        }
+    });
+    job->start();
 }
 
 bool Controller::supportSystemTray() const
@@ -394,8 +408,6 @@ QString Controller::loadFileContent(const QString &path) const
     return QString::fromLatin1(file.readAll());
 }
 
-#include "moc_controller.cpp"
-
 void Controller::setTestMode(bool test)
 {
     testMode = test;
@@ -411,11 +423,30 @@ void Controller::removeConnection(const QString &userId)
     }
 }
 
-bool Controller::ssssSupported() const
+bool Controller::csSupported() const
 {
-#if __has_include("Quotient/e2ee/sssshandler.h")
+#if Quotient_VERSION_MINOR > 8
     return true;
 #else
     return false;
 #endif
 }
+
+void Controller::revertToDefaultConfig()
+{
+    const auto config = NeoChatConfig::self();
+    config->setDefaults();
+    config->save();
+}
+
+bool Controller::isImageShown(const QString &eventId)
+{
+    return m_shownImages.contains(eventId);
+}
+
+void Controller::markImageShown(const QString &eventId)
+{
+    m_shownImages.append(eventId);
+}
+
+#include "moc_controller.cpp"

src/controller.h

@@ -5,15 +5,9 @@
 
 #include <QObject>
 #include <QQmlEngine>
-#include <QQuickItem>
 
 #include "neochatconnection.h"
 #include <Quotient/accountregistry.h>
-#include <Quotient/settings.h>
-
-#ifdef HAVE_KUNIFIEDPUSH
-#include <kunifiedpush/connector.h>
-#endif
 
 class TrayIcon;
 class QQuickTextDocument;
@@ -56,9 +50,19 @@ class Controller : public QObject
 
     Q_PROPERTY(QStringList accountsLoading MEMBER m_accountsLoading NOTIFY accountsLoadingChanged)
 
-    Q_PROPERTY(bool ssssSupported READ ssssSupported CONSTANT)
+    Q_PROPERTY(bool csSupported READ csSupported CONSTANT)
 
 public:
+    /**
+     * @brief Define the types on inline messages that can be shown.
+     */
+    enum MessageType {
+        Positive, /**< Positive message, typically green. */
+        Info, /**< Info message, typically highlight color. */
+        Error, /**< Error message, typically red. */
+    };
+    Q_ENUM(MessageType)
+
     static Controller &instance();
     static Controller *create(QQmlEngine *engine, QJSEngine *)
     {
@@ -82,7 +86,7 @@ public:
     /**
      * @brief Save an access token to the keychain for the given account.
      */
-    bool saveAccessTokenToKeyChain(const Quotient::AccountSettings &account, const QByteArray &accessToken);
+    void saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken);
 
     [[nodiscard]] bool supportSystemTray() const;
 
@@ -102,7 +106,18 @@ public:
 
     Q_INVOKABLE void removeConnection(const QString &userId);
 
-    bool ssssSupported() const;
+    bool csSupported() const;
+
+    /**
+     * @brief Revert all configuration values to their default.
+     *
+     * The parameters along with their defaults are specified in the config file
+     * neochatconfig.kcfg.
+     */
+    Q_INVOKABLE void revertToDefaultConfig();
+
+    Q_INVOKABLE bool isImageShown(const QString &eventId);
+    Q_INVOKABLE void markImageShown(const QString &eventId);
 
 private:
     explicit Controller(QObject *parent = nullptr);
@@ -110,15 +125,13 @@ private:
     QPointer<NeoChatConnection> m_connection;
     TrayIcon *m_trayIcon = nullptr;
 
-    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const Quotient::AccountSettings &account);
-
-    void loadSettings();
-    void saveSettings() const;
+    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const QString &account);
 
     Quotient::AccountRegistry m_accountRegistry;
     QStringList m_accountsLoading;
-    QMap<QString, QPointer<Quotient::Connection>> m_connectionsLoading;
+    QMap<QString, QPointer<NeoChatConnection>> m_connectionsLoading;
     QString m_endpoint;
+    QStringList m_shownImages;
 
 private Q_SLOTS:
     void invokeLogin();
@@ -131,4 +144,5 @@ Q_SIGNALS:
     void connectionDropped(NeoChatConnection *connection);
     void activeConnectionChanged(NeoChatConnection *connection);
     void accountsLoadingChanged();
+    void showMessage(MessageType messageType, const QString &message);
 };

src/devtools/CMakeLists.txt

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

src/devtools/DebugOptions.qml

@@ -15,13 +15,28 @@ FormCard.FormCardPage {
     FormCard.FormCard {
         Layout.topMargin: Kirigami.Units.largeSpacing
 
+        FormCard.FormCheckDelegate {
+            text: i18nc("@option:check", "Show hidden events in the timeline")
+            checked: NeoChatConfig.showAllEvents
+
+            onToggled: NeoChatConfig.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: Config.alwaysVerifyDevice
+            checked: NeoChatConfig.alwaysVerifyDevice
 
-            onToggled: Config.alwaysVerifyDevice = checked
+            onToggled: NeoChatConfig.alwaysVerifyDevice = checked
+        }
+        FormCard.FormCheckDelegate {
+            text: i18nc("@option:check", "Show focus in window header")
+            checked: NeoChatConfig.windowTitleFocus
+
+            onToggled: {
+                NeoChatConfig.windowTitleFocus = checked;
+                NeoChatConfig.save();
+            }
         }
     }
 }

src/devtools/DevtoolsPage.qml

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

src/devtools/FeatureFlagPage.qml

@@ -18,15 +18,24 @@ FormCard.FormCardPage {
         FormCard.FormCheckDelegate {
             id: roomAccountDataVisibleCheck
             text: i18nc("@option:check Enable the matrix 'threads' feature", "Threads")
-            checked: Config.threads
+            checked: NeoChatConfig.threads
 
-            onToggled: Config.threads = checked
+            onToggled: NeoChatConfig.threads = checked
         }
         FormCard.FormCheckDelegate {
             text: i18nc("@option:check Enable the matrix 'secret backup' feature", "Secret Backup")
-            checked: Config.secretBackup
+            checked: NeoChatConfig.secretBackup
 
-            onToggled: Config.secretBackup = checked
+            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();
+            }
         }
     }
 }

src/devtools/RoomData.qml

@@ -25,9 +25,10 @@ ColumnLayout {
             text: i18n("Room")
             textRole: "escapedDisplayName"
             valueRole: "roomId"
-            displayText: RoomManager.roomListModel.data(RoomManager.roomListModel.index(currentIndex, 0), RoomListModel.DisplayNameRole)
+            displayText: RoomManager.roomListModel.data(RoomManager.roomListModel.index(currentIndex, 0), RoomListModel.EscapedDisplayNameRole)
             model: RoomManager.roomListModel
             currentIndex: 0
+            displayMode: FormCard.FormComboBoxDelegate.Page
             Component.onCompleted: currentIndex = RoomManager.roomListModel.rowForRoom(root.room)
             onCurrentValueChanged: root.room = RoomManager.roomListModel.roomByAliasOrId(roomComboBox.currentValue)
         }

src/enums/delegatetype.h

@@ -38,6 +38,8 @@ 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,6 +33,7 @@ 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. */
@@ -47,11 +48,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. */
-        Edit, /**< A text edit for editing a message. */
+        ChatBar, /**< 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/neochatroomtype.h

@@ -21,7 +21,6 @@ public:
      * @brief Defines the room list categories a room can be assigned.
      */
     enum Types {
-        Search = 0, /**< So we can show a search delegate if needed, e.g. collapsed mode. */
         Invited, /**< The user has been invited to the room. */
         Favorite, /**< The room is set as a favourite. */
         Direct, /**< The room is a direct chat. */
@@ -68,8 +67,6 @@ public:
             return i18n("Low priority");
         case NeoChatRoomType::Space:
             return i18n("Spaces");
-        case NeoChatRoomType::Search:
-            return i18n("Search");
         default:
             return {};
         }
@@ -89,8 +86,6 @@ public:
             return QStringLiteral("object-order-lower");
         case NeoChatRoomType::Space:
             return QStringLiteral("group");
-        case NeoChatRoomType::Search:
-            return QStringLiteral("search");
         default:
             return QStringLiteral("tools-report-bug");
         }

src/enums/powerlevel.cpp

@@ -0,0 +1,109 @@
+// 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

@@ -0,0 +1,110 @@
+// 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.cpp

@@ -5,29 +5,27 @@
 
 #include <QMovie>
 
+#include <KFormat>
 #include <KLocalizedString>
 
-#include <Quotient/eventitem.h>
 #include <Quotient/events/encryptionevent.h>
+#include <Quotient/events/event.h>
 #include <Quotient/events/reactionevent.h>
 #include <Quotient/events/redactionevent.h>
 #include <Quotient/events/roomavatarevent.h>
 #include <Quotient/events/roomcanonicalaliasevent.h>
+#include <Quotient/events/roomevent.h>
 #include <Quotient/events/roommemberevent.h>
-#include <Quotient/events/roommessageevent.h>
 #include <Quotient/events/roompowerlevelsevent.h>
 #include <Quotient/events/simplestateevents.h>
 #include <Quotient/events/stickerevent.h>
 #include <Quotient/quotient_common.h>
+#include <Quotient/roommember.h>
 
 #include "eventhandler_logging.h"
 #include "events/locationbeaconevent.h"
 #include "events/pollevent.h"
-#include "events/serveraclevent.h"
 #include "events/widgetevent.h"
-#include "linkpreviewer.h"
-#include "messagecomponenttype.h"
-#include "models/reactionmodel.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "texthandler.h"
@@ -35,85 +33,53 @@
 
 using namespace Quotient;
 
-EventHandler::EventHandler(const NeoChatRoom *room, const RoomEvent *event)
-    : m_room(room)
-    , m_event(event)
+QString EventHandler::id(const Quotient::RoomEvent *event)
 {
-}
-
-QString EventHandler::getId() const
-{
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getId called with m_event set to nullptr.";
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "id called with event set to nullptr.";
         return {};
     }
 
-    return !m_event->id().isEmpty() ? m_event->id() : m_event->transactionId();
+    return !event->id().isEmpty() ? event->id() : event->transactionId();
 }
 
-MessageComponentType::Type EventHandler::messageComponentType() const
+QString EventHandler::authorDisplayName(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool isPending)
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "messageComponentType called with m_event set to nullptr.";
-        return MessageComponentType::Other;
-    }
-
-    return MessageComponentType::typeForEvent(*m_event);
-}
-
-QVariantMap EventHandler::getAuthor(bool isPending) const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getAuthor called with m_room set to nullptr.";
+    if (room == nullptr) {
+        qCWarning(EventHandling) << "authorDisplayName called with room set to nullptr.";
         return {};
     }
-    // If we have a room we can return an empty user by handing nullptr to m_room->getUser.
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getAuthor called with m_event set to nullptr. Returning empty user.";
-        return m_room->getUser(nullptr);
-    }
-
-    const auto author = isPending ? m_room->localUser() : m_room->user(m_event->senderId());
-    return m_room->getUser(author);
-}
-
-QString EventHandler::getAuthorDisplayName(bool isPending) const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getAuthorDisplayName called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getAuthorDisplayName called with m_event set to nullptr.";
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "authorDisplayName called with event set to nullptr.";
         return {};
     }
 
-    if (is<RoomMemberEvent>(*m_event) && !m_event->unsignedJson()[QStringLiteral("prev_content")][QStringLiteral("displayname")].isNull()
-        && m_event->stateKey() == m_event->senderId()) {
-        auto previousDisplayName = m_event->unsignedJson()[QStringLiteral("prev_content")][QStringLiteral("displayname")].toString().toHtmlEscaped();
+    if (is<RoomMemberEvent>(*event) && !event->unsignedJson()[QStringLiteral("prev_content")][QStringLiteral("displayname")].isNull()
+        && event->stateKey() == event->senderId()) {
+        auto previousDisplayName = event->unsignedJson()[QStringLiteral("prev_content")][QStringLiteral("displayname")].toString().toHtmlEscaped();
         if (previousDisplayName.isEmpty()) {
-            previousDisplayName = m_event->senderId();
+            previousDisplayName = event->senderId();
         }
         return previousDisplayName;
     } else {
-        const auto author = isPending ? m_room->localUser() : m_room->user(m_event->senderId());
-        return m_room->htmlSafeMemberName(author->id());
+        const auto author = isPending ? room->localMember() : room->member(event->senderId());
+        return author.htmlSafeDisplayName();
     }
 }
 
-QString EventHandler::singleLineAuthorDisplayname(bool isPending) const
+QString EventHandler::singleLineAuthorDisplayname(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool isPending)
 {
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getAuthorDisplayName called with m_room set to nullptr.";
+    if (room == nullptr) {
+        qCWarning(EventHandling) << "singleLineAuthorDisplayname called with room set to nullptr.";
         return {};
     }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getAuthorDisplayName called with m_event set to nullptr.";
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "singleLineAuthorDisplayname called with event set to nullptr.";
         return {};
     }
 
-    const auto author = isPending ? m_room->localUser() : m_room->user(m_event->senderId());
-    auto displayName = m_room->safeMemberName(author->id());
+    const auto author = isPending ? room->localMember() : room->member(event->senderId());
+    auto displayName = author.displayName();
     displayName.replace(QStringLiteral("<br>\n"), QStringLiteral(" "));
     displayName.replace(QStringLiteral("<br>"), QStringLiteral(" "));
     displayName.replace(QStringLiteral("<br />\n"), QStringLiteral(" "));
@@ -123,10 +89,10 @@ QString EventHandler::singleLineAuthorDisplayname(bool isPending) const
     return displayName;
 }
 
-QDateTime EventHandler::getTime(bool isPending, QDateTime lastUpdated) const
+QDateTime EventHandler::time(const Quotient::RoomEvent *event, bool isPending, QDateTime lastUpdated)
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getTime called with m_event set to nullptr.";
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "time called with event set to nullptr.";
         return {};
     }
     if (isPending && lastUpdated == QDateTime()) {
@@ -134,24 +100,16 @@ QDateTime EventHandler::getTime(bool isPending, QDateTime lastUpdated) const
         return {};
     }
 
-    return isPending ? lastUpdated : m_event->originTimestamp();
+    return isPending ? lastUpdated : event->originTimestamp();
 }
 
-QString EventHandler::getTimeString(bool relative, QLocale::FormatType format, bool isPending, QDateTime lastUpdated) const
+QString EventHandler::timeString(const Quotient::RoomEvent *event, bool relative, QLocale::FormatType format, bool isPending, QDateTime lastUpdated)
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getTimeString called with m_event set to nullptr.";
-        return {};
-    }
-    if (isPending && lastUpdated == QDateTime()) {
-        qCWarning(EventHandling) << "a value must be provided for lastUpdated for a pending event.";
-        return {};
-    }
-
-    auto ts = getTime(isPending, lastUpdated);
+    auto ts = time(event, isPending, lastUpdated);
     if (ts.isValid()) {
         if (relative) {
-            return m_format.formatRelativeDate(ts.toLocalTime().date(), format);
+            KFormat formatter;
+            return formatter.formatRelativeDate(ts.toLocalTime().date(), format);
         } else {
             return QLocale().toString(ts.toLocalTime().time(), format);
         }
@@ -159,39 +117,45 @@ QString EventHandler::getTimeString(bool relative, QLocale::FormatType format, b
     return {};
 }
 
-bool EventHandler::isHighlighted()
+QString EventHandler::timeString(const Quotient::RoomEvent *event, const QString &format, bool isPending, const QDateTime &lastUpdated)
 {
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "isHighlighted called with m_room set to nullptr.";
-        return false;
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "isHighlighted called with m_event set to nullptr.";
-        return false;
-    }
-
-    return !m_room->isDirectChat() && m_room->isEventHighlighted(m_event);
+    return time(event, isPending, lastUpdated).toLocalTime().toString(format);
 }
 
-bool EventHandler::isHidden()
+bool EventHandler::isHighlighted(const NeoChatRoom *room, const Quotient::RoomEvent *event)
 {
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "isHidden called with m_room set to nullptr.";
+    if (room == nullptr) {
+        qCWarning(EventHandling) << "isHighlighted called with room set to nullptr.";
         return false;
     }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "isHidden called with m_event set to nullptr.";
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "isHighlighted called with event set to nullptr.";
         return false;
     }
 
-    if (m_event->isStateEvent() && !NeoChatConfig::self()->showStateEvent()) {
+    return !room->isDirectChat() && room->isEventHighlighted(event);
+}
+
+bool EventHandler::isHidden(const NeoChatRoom *room, const Quotient::RoomEvent *event)
+{
+    if (room == nullptr) {
+        qCWarning(EventHandling) << "isHidden called with room set to nullptr.";
+        return false;
+    }
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "isHidden called with event set to nullptr.";
+        return false;
+    }
+
+    if (event->isStateEvent() && !NeoChatConfig::self()->showStateEvent()) {
         return true;
     }
 
-    if (auto roomMemberEvent = eventCast<const RoomMemberEvent>(m_event)) {
+    if (auto roomMemberEvent = eventCast<const RoomMemberEvent>(event)) {
         if ((roomMemberEvent->isJoin() || roomMemberEvent->isLeave()) && !NeoChatConfig::self()->showLeaveJoinEvent()) {
             return true;
-        } else if (roomMemberEvent->isRename() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave() && !NeoChatConfig::self()->showRename()) {
+        } else if (roomMemberEvent->isRename() && roomMemberEvent->prevContent() && roomMemberEvent->prevContent()->membership == roomMemberEvent->membership()
+                   && !NeoChatConfig::self()->showRename()) {
             return true;
         } else if (roomMemberEvent->isAvatarUpdate() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave()
                    && !NeoChatConfig::self()->showAvatarUpdate()) {
@@ -199,33 +163,33 @@ bool EventHandler::isHidden()
         }
     }
 
-    if (m_event->isStateEvent() && eventCast<const StateEvent>(m_event)->repeatsState()) {
+    if (event->isStateEvent() && eventCast<const StateEvent>(event)->repeatsState()) {
         return true;
     }
 
     // isReplacement?
-    if (auto e = eventCast<const RoomMessageEvent>(m_event)) {
+    if (auto e = eventCast<const RoomMessageEvent>(event)) {
         if (!e->replacedEvent().isEmpty()) {
             return true;
         }
     }
 
-    if (is<RedactionEvent>(*m_event) || is<ReactionEvent>(*m_event)) {
+    if (is<RedactionEvent>(*event) || is<ReactionEvent>(*event)) {
         return true;
     }
 
-    if (auto e = eventCast<const RoomMessageEvent>(m_event)) {
+    if (auto e = eventCast<const RoomMessageEvent>(event)) {
         if (!e->replacedEvent().isEmpty() && e->replacedEvent() != e->id()) {
             return true;
         }
     }
 
-    if (m_room->connection()->isIgnored(m_room->user(m_event->senderId()))) {
+    if (room->connection()->isIgnored(event->senderId())) {
         return true;
     }
 
     // hide ending live location beacons
-    if (m_event->isStateEvent() && m_event->matrixType() == "org.matrix.msc3672.beacon_info"_ls && !m_event->contentJson()["live"_ls].toBool()) {
+    if (event->isStateEvent() && event->matrixType() == "org.matrix.msc3672.beacon_info"_ls && !event->contentJson()["live"_ls].toBool()) {
         return true;
     }
 
@@ -243,60 +207,73 @@ Qt::TextFormat EventHandler::messageBodyInputFormat(const Quotient::RoomMessageE
 
 QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
 {
+    QString body;
+
     if (event.hasFileContent()) {
-        auto fileCaption = event.content()->fileInfo()->originalName;
-        if (fileCaption.isEmpty()) {
-            fileCaption = event.plainBody();
-        } else if (event.content()->fileInfo()->originalName != event.plainBody()) {
-            fileCaption = event.plainBody() + " | "_ls + fileCaption;
+        // if filename is given or body is equal to filename,
+        // then body is a caption
+        QString filename = event.content()->fileInfo()->originalName;
+        QString body = event.plainBody();
+        if (filename.isEmpty() || filename == body) {
+            return QString();
         }
-        return fileCaption;
+        return body;
     }
 
-    QString body;
     if (event.hasTextContent() && event.content()) {
-        body = static_cast<const MessageEventContent::TextContent *>(event.content())->body;
+        body = static_cast<const EventContent::TextContent *>(event.content())->body;
     } else {
         body = event.plainBody();
     }
     return body;
 }
 
-QString EventHandler::getRichBody(bool stripNewlines) const
+QString EventHandler::richBody(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool stripNewlines)
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getRichBody called with m_event set to nullptr.";
+    if (room == nullptr) {
+        qCWarning(EventHandling) << "richBody called with room set to nullptr.";
         return {};
     }
-    return getBody(m_event, Qt::RichText, stripNewlines);
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "richBody called with event set to nullptr.";
+        return {};
+    }
+    return getBody(room, event, Qt::RichText, stripNewlines);
 }
 
-QString EventHandler::getPlainBody(bool stripNewlines) const
+QString EventHandler::plainBody(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool stripNewlines)
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getPlainBody called with m_event set to nullptr.";
+    if (room == nullptr) {
+        qCWarning(EventHandling) << "plainBody called with room set to nullptr.";
         return {};
     }
-    return getBody(m_event, Qt::PlainText, stripNewlines);
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "plainBody called with event set to nullptr.";
+        return {};
+    }
+    return getBody(room, event, Qt::PlainText, stripNewlines);
 }
 
-QString EventHandler::getMarkdownBody() const
+QString EventHandler::markdownBody(const Quotient::RoomEvent *event)
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getMarkdownBody called with m_event set to nullptr.";
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "markdownBody called with event set to nullptr.";
         return {};
     }
 
-    if (!m_event->is<RoomMessageEvent>()) {
-        qCWarning(EventHandling) << "getMarkdownBody called when m_event isn't a RoomMessageEvent.";
+    if (!event->is<RoomMessageEvent>()) {
+        qCWarning(EventHandling) << "markdownBody called when event isn't a RoomMessageEvent.";
         return {};
     }
 
-    const auto roomMessageEvent = eventCast<const RoomMessageEvent>(m_event);
-    return roomMessageEvent->plainBody();
+    const auto roomMessageEvent = eventCast<const RoomMessageEvent>(event);
+
+    QString plainBody = roomMessageEvent->plainBody();
+    plainBody.remove(TextRegex::removeReply);
+    return plainBody;
 }
 
-QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat format, bool stripNewlines) const
+QString EventHandler::getBody(const NeoChatRoom *room, const Quotient::RoomEvent *event, Qt::TextFormat format, bool stripNewlines)
 {
     if (event->isRedacted()) {
         auto reason = event->redactedBecause()->reason();
@@ -307,23 +284,27 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
 
     return switchOnType(
         *event,
-        [this, format, stripNewlines](const RoomMessageEvent &event) {
-            return getMessageBody(event, format, stripNewlines);
+        [room, format, stripNewlines](const RoomMessageEvent &event) {
+            return getMessageBody(room, event, format, stripNewlines);
         },
         [](const StickerEvent &e) {
             return e.body();
         },
-        [this, prettyPrint](const RoomMemberEvent &e) {
+        [room, prettyPrint](const RoomMemberEvent &e) {
             // FIXME: Rewind to the name that was at the time of this event
-            auto subjectName = m_room->htmlSafeMemberName(e.userId());
+            auto subjectName = room->member(e.userId()).htmlSafeDisplayName();
             if (e.membership() == Membership::Leave) {
                 if (e.prevContent() && e.prevContent()->displayName) {
-                    subjectName = sanitized(*e.prevContent()->displayName).toHtmlEscaped();
+                    subjectName = sanitized(*e.prevContent()->displayName);
+                    if (prettyPrint) {
+                        subjectName = subjectName.toHtmlEscaped();
+                    }
                 }
             }
 
             if (prettyPrint) {
-                subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\">%2</a>").arg(e.userId(), subjectName);
+                subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a>")
+                                  .arg(e.userId(), room->member(e.userId()).color().name(), subjectName);
             }
 
             // The below code assumes senderName output in AuthorRole
@@ -386,9 +367,13 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
                 if (e.prevContent() && e.prevContent()->membership == Membership::Ban) {
                     return (e.senderId() != e.userId()) ? i18n("unbanned %1", subjectName) : i18n("self-unbanned");
                 }
-                return (e.senderId() != e.userId())
-                    ? i18n("has put %1 out of the room: %2", subjectName, e.contentJson()["reason"_ls].toString().toHtmlEscaped())
-                    : i18n("left the room");
+                if (e.senderId() == e.userId()) {
+                    return i18n("left the room");
+                }
+                if (const auto &reason = e.contentJson()["reason"_ls].toString().toHtmlEscaped(); !reason.isEmpty()) {
+                    return i18n("has put %1 out of the room: %2", subjectName, reason);
+                }
+                return i18n("has put %1 out of the room", subjectName);
             case Membership::Ban:
                 if (e.senderId() != e.userId()) {
                     if (e.reason().isEmpty()) {
@@ -437,7 +422,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
         [](const LocationBeaconEvent &e) {
             return e.contentJson()["description"_ls].toString();
         },
-        [](const ServerAclEvent &) {
+        [](const RoomServerAclEvent &) {
             return i18n("changed the server access control lists for this room");
         },
         [](const WidgetEvent &e) {
@@ -459,7 +444,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
         i18n("Unknown event"));
 }
 
-QString EventHandler::getMessageBody(const RoomMessageEvent &event, Qt::TextFormat format, bool stripNewlines) const
+QString EventHandler::getMessageBody(const NeoChatRoom *room, const RoomMessageEvent &event, Qt::TextFormat format, bool stripNewlines)
 {
     TextHandler textHandler;
 
@@ -476,7 +461,7 @@ QString EventHandler::getMessageBody(const RoomMessageEvent &event, Qt::TextForm
 
     QString body;
     if (event.hasTextContent() && event.content()) {
-        body = static_cast<const MessageEventContent::TextContent *>(event.content())->body;
+        body = static_cast<const EventContent::TextContent *>(event.content())->body;
     } else {
         body = event.plainBody();
     }
@@ -491,24 +476,24 @@ QString EventHandler::getMessageBody(const RoomMessageEvent &event, Qt::TextForm
     }
 
     if (format == Qt::RichText) {
-        return textHandler.handleRecieveRichText(inputFormat, m_room, &event, stripNewlines, event.isReplaced());
+        return textHandler.handleRecieveRichText(inputFormat, room, &event, stripNewlines, event.isReplaced());
     } else {
         return textHandler.handleRecievePlainText(inputFormat, stripNewlines);
     }
 }
 
-QString EventHandler::getGenericBody() const
+QString EventHandler::genericBody(const Quotient::RoomEvent *event)
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getGenericBody called with m_event set to nullptr.";
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "genericBody called with event set to nullptr.";
         return {};
     }
-    if (m_event->isRedacted()) {
+    if (event->isRedacted()) {
         return i18n("<i>[This message was deleted]</i>");
     }
 
     return switchOnType(
-        *m_event,
+        *event,
         [](const RoomMessageEvent &e) {
             Q_UNUSED(e)
             return i18n("sent a message");
@@ -606,7 +591,7 @@ QString EventHandler::getGenericBody() const
         [](const LocationBeaconEvent &) {
             return i18n("sent a live location beacon");
         },
-        [](const ServerAclEvent &) {
+        [](const RoomServerAclEvent &) {
             return i18n("changed the server access control lists for this room");
         },
         [](const WidgetEvent &e) {
@@ -628,53 +613,68 @@ QString EventHandler::getGenericBody() const
         i18n("Unknown event"));
 }
 
-QString EventHandler::subtitleText() const
+QString EventHandler::subtitleText(const NeoChatRoom *room, const Quotient::RoomEvent *event)
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "subtitleText called with m_event set to nullptr.";
+    if (room == nullptr) {
+        qCWarning(EventHandling) << "subtitleText called with room set to nullptr.";
         return {};
     }
-    return singleLineAuthorDisplayname() + (m_event->isStateEvent() ? QLatin1String(" ") : QLatin1String(": ")) + getPlainBody(true);
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "subtitleText called with event set to nullptr.";
+        return {};
+    }
+    return singleLineAuthorDisplayname(room, event) + (event->isStateEvent() ? QLatin1String(" ") : QLatin1String(": ")) + plainBody(room, event, true);
 }
 
-QVariantMap EventHandler::getMediaInfo() const
+QVariantMap EventHandler::mediaInfo(const NeoChatRoom *room, const Quotient::RoomEvent *event)
 {
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getMediaInfo called with m_room set to nullptr.";
+    if (room == nullptr) {
+        qCWarning(EventHandling) << "mediaInfo called with room set to nullptr.";
         return {};
     }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getMediaInfo called with m_event set to nullptr.";
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "mediaInfo called with event set to nullptr.";
         return {};
     }
-    return getMediaInfoForEvent(m_event);
+    return getMediaInfoForEvent(room, event);
 }
 
-QVariantMap EventHandler::getMediaInfoForEvent(const Quotient::RoomEvent *event) const
+QVariantMap EventHandler::getMediaInfoForEvent(const NeoChatRoom *room, const Quotient::RoomEvent *event)
 {
     QString eventId = event->id();
 
     // Get the file info for the event.
-    const EventContent::FileInfo *fileInfo;
-    bool isSticker = false;
     if (event->is<RoomMessageEvent>()) {
         auto roomMessageEvent = eventCast<const RoomMessageEvent>(event);
         if (!roomMessageEvent->hasFileContent()) {
             return {};
         }
+
+        const EventContent::FileInfo *fileInfo;
         fileInfo = roomMessageEvent->content()->fileInfo();
+        QVariantMap mediaInfo = getMediaInfoFromFileInfo(room, fileInfo, eventId, false, false);
+        // if filename isn't specifically given, it is in body
+        // https://spec.matrix.org/latest/client-server-api/#mfile
+        mediaInfo["filename"_ls] = (fileInfo->originalName.isEmpty()) ? roomMessageEvent->plainBody() : fileInfo->originalName;
+
+        return mediaInfo;
     } else if (event->is<StickerEvent>()) {
+        const EventContent::FileInfo *fileInfo;
+
         auto stickerEvent = eventCast<const StickerEvent>(event);
         fileInfo = &stickerEvent->image();
-        isSticker = true;
+
+        return getMediaInfoFromFileInfo(room, fileInfo, eventId, false, true);
     } else {
         return {};
     }
-
-    return getMediaInfoFromFileInfo(fileInfo, eventId, false, isSticker);
 }
 
-QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo *fileInfo, const QString &eventId, bool isThumbnail, bool isSticker) const
+QVariantMap EventHandler::getMediaInfoFromFileInfo(const NeoChatRoom *room,
+                                                   const EventContent::FileInfo *fileInfo,
+                                                   const QString &eventId,
+                                                   bool isThumbnail,
+                                                   bool isSticker)
 {
     QVariantMap mediaInfo;
 
@@ -682,7 +682,7 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo
     if (!fileInfo->url().isValid() || fileInfo->url().scheme() != QStringLiteral("mxc") || eventId.isEmpty()) {
         mediaInfo["source"_ls] = QUrl();
     } else {
-        QUrl source = m_room->makeMediaUrl(eventId, fileInfo->url());
+        QUrl source = room->makeMediaUrl(eventId, fileInfo->url());
 
         if (source.isValid()) {
             mediaInfo["source"_ls] = source;
@@ -714,7 +714,7 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo
 
             if (!isThumbnail) {
                 QVariantMap tempInfo;
-                auto thumbnailInfo = getMediaInfoFromFileInfo(castInfo->thumbnailInfo(), eventId, true);
+                auto thumbnailInfo = getMediaInfoFromFileInfo(room, castInfo->thumbnailInfo(), eventId, true);
                 if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
                     tempInfo = thumbnailInfo;
                 } else {
@@ -737,7 +737,7 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo
 
             if (!isThumbnail) {
                 QVariantMap tempInfo;
-                auto thumbnailInfo = getMediaInfoFromFileInfo(castInfo->thumbnailInfo(), eventId, true);
+                auto thumbnailInfo = getMediaInfoFromFileInfo(room, castInfo->thumbnailInfo(), eventId, true);
                 if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
                     tempInfo = thumbnailInfo;
                 } else {
@@ -761,160 +761,89 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo
     return mediaInfo;
 }
 
-bool EventHandler::hasReply() const
+bool EventHandler::hasReply(const Quotient::RoomEvent *event, bool showFallbacks)
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "hasReply called with m_event set to nullptr.";
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "hasReply called with event set to nullptr.";
         return false;
     }
-    return !m_event->contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString().isEmpty();
+
+    const auto relations = event->contentPart<QJsonObject>("m.relates_to"_ls);
+    if (!relations.isEmpty()) {
+        const bool hasReplyRelation = relations.contains("m.in_reply_to"_ls);
+        bool isFallingBack = relations["is_falling_back"_ls].toBool();
+        return hasReplyRelation && (showFallbacks ? true : !isFallingBack);
+    }
+    return false;
 }
 
-QString EventHandler::getReplyId() const
+QString EventHandler::replyId(const Quotient::RoomEvent *event)
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReplyId called with m_event set to nullptr.";
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "replyId called with event set to nullptr.";
         return {};
     }
-    return m_event->contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString();
+    return event->contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString();
 }
 
-MessageComponentType::Type EventHandler::replyMessageComponentType() const
+Quotient::RoomMember EventHandler::replyAuthor(const NeoChatRoom *room, const Quotient::RoomEvent *event)
 {
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "replyMessageComponentType called with m_room set to nullptr.";
-        return MessageComponentType::Other;
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "replyMessageComponentType called with m_event set to nullptr.";
-        return MessageComponentType::Other;
-    }
-
-    auto replyEvent = m_room->getReplyForEvent(*m_event);
-    if (replyEvent == nullptr) {
-        return MessageComponentType::Other;
-    }
-    return MessageComponentType::typeForEvent(*replyEvent);
-}
-
-QVariantMap EventHandler::getReplyAuthor() const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReplyAuthor called with m_room set to nullptr.";
+    if (room == nullptr) {
+        qCWarning(EventHandling) << "replyAuthor called with room set to nullptr.";
         return {};
     }
-    // If we have a room we can return an empty user by handing nullptr to m_room->getUser.
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReplyAuthor called with m_event set to nullptr. Returning empty user.";
-        return m_room->getUser(nullptr);
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "replyAuthor called with event set to nullptr. Returning empty user.";
+        return {};
     }
 
-    auto replyPtr = m_room->getReplyForEvent(*m_event);
-
-    if (replyPtr) {
-        auto replyUser = m_room->user(replyPtr->senderId());
-        return m_room->getUser(replyUser);
+    if (auto replyPtr = room->getReplyForEvent(*event)) {
+        return room->member(replyPtr->senderId());
     } else {
-        return m_room->getUser(nullptr);
+        return room->member(QString());
     }
 }
 
-QString EventHandler::getReplyRichBody(bool stripNewlines) const
+bool EventHandler::isThreaded(const Quotient::RoomEvent *event)
 {
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReplyRichBody called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReplyRichBody called with m_event set to nullptr.";
-        return {};
-    }
-
-    auto replyEvent = m_room->getReplyForEvent(*m_event);
-    if (replyEvent == nullptr) {
-        return {};
-    }
-
-    return getBody(replyEvent, Qt::RichText, stripNewlines);
-}
-
-QString EventHandler::getReplyPlainBody(bool stripNewlines) const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReplyPlainBody called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReplyPlainBody called with m_event set to nullptr.";
-        return {};
-    }
-
-    auto replyEvent = m_room->getReplyForEvent(*m_event);
-    if (replyEvent == nullptr) {
-        return {};
-    }
-
-    return getBody(replyEvent, Qt::PlainText, stripNewlines);
-}
-
-QVariantMap EventHandler::getReplyMediaInfo() const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReplyMediaInfo called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReplyMediaInfo called with m_event set to nullptr.";
-        return {};
-    }
-
-    auto replyPtr = m_room->getReplyForEvent(*m_event);
-    if (!replyPtr) {
-        return {};
-    }
-    return getMediaInfoForEvent(replyPtr);
-}
-
-bool EventHandler::isThreaded() const
-{
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "isThreaded called with m_event set to nullptr.";
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "isThreaded called with event set to nullptr.";
         return false;
     }
 
-    return (m_event->contentPart<QJsonObject>("m.relates_to"_ls).contains("rel_type"_ls)
-            && m_event->contentPart<QJsonObject>("m.relates_to"_ls)["rel_type"_ls].toString() == "m.thread"_ls)
-        || (!m_event->unsignedPart<QJsonObject>("m.relations"_ls).isEmpty() && m_event->unsignedPart<QJsonObject>("m.relations"_ls).contains("m.thread"_ls));
+    return (event->contentPart<QJsonObject>("m.relates_to"_ls).contains("rel_type"_ls)
+            && event->contentPart<QJsonObject>("m.relates_to"_ls)["rel_type"_ls].toString() == "m.thread"_ls)
+        || (!event->unsignedPart<QJsonObject>("m.relations"_ls).isEmpty() && event->unsignedPart<QJsonObject>("m.relations"_ls).contains("m.thread"_ls));
 }
 
-QString EventHandler::threadRoot() const
+QString EventHandler::threadRoot(const Quotient::RoomEvent *event)
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "threadRoot called with m_event set to nullptr.";
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "threadRoot called with event set to nullptr.";
         return {};
     }
 
     // Get the thread root ID from m.relates_to if it exists.
-    if (m_event->contentPart<QJsonObject>("m.relates_to"_ls).contains("rel_type"_ls)
-        && m_event->contentPart<QJsonObject>("m.relates_to"_ls)["rel_type"_ls].toString() == "m.thread"_ls) {
-        return m_event->contentPart<QJsonObject>("m.relates_to"_ls)["event_id"_ls].toString();
+    if (event->contentPart<QJsonObject>("m.relates_to"_ls).contains("rel_type"_ls)
+        && event->contentPart<QJsonObject>("m.relates_to"_ls)["rel_type"_ls].toString() == "m.thread"_ls) {
+        return event->contentPart<QJsonObject>("m.relates_to"_ls)["event_id"_ls].toString();
     }
     // For thread root events they have an m.relations in the unsigned part with a m.thread object.
     // If so return the event ID as it is the root.
-    if (!m_event->unsignedPart<QJsonObject>("m.relations"_ls).isEmpty() && m_event->unsignedPart<QJsonObject>("m.relations"_ls).contains("m.thread"_ls)) {
-        return getId();
+    if (!event->unsignedPart<QJsonObject>("m.relations"_ls).isEmpty() && event->unsignedPart<QJsonObject>("m.relations"_ls).contains("m.thread"_ls)) {
+        return id(event);
     }
     return {};
 }
 
-float EventHandler::getLatitude() const
+float EventHandler::latitude(const Quotient::RoomEvent *event)
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getLatitude called with m_event set to nullptr.";
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "latitude called with event set to nullptr.";
         return -100.0;
     }
 
-    const auto geoUri = m_event->contentJson()["geo_uri"_ls].toString();
+    const auto geoUri = event->contentJson()["geo_uri"_ls].toString();
     if (geoUri.isEmpty()) {
         return -100.0; // latitude runs from -90deg to +90deg so -100 is out of range.
     }
@@ -922,14 +851,14 @@ float EventHandler::getLatitude() const
     return latitude.toFloat();
 }
 
-float EventHandler::getLongitude() const
+float EventHandler::longitude(const Quotient::RoomEvent *event)
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getLongitude called with m_event set to nullptr.";
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "longitude called with event set to nullptr.";
         return -200.0;
     }
 
-    const auto geoUri = m_event->contentJson()["geo_uri"_ls].toString();
+    const auto geoUri = event->contentJson()["geo_uri"_ls].toString();
     if (geoUri.isEmpty()) {
         return -200.0; // longitude runs from -180deg to +180deg so -200 is out of range.
     }
@@ -937,111 +866,18 @@ float EventHandler::getLongitude() const
     return latitude.toFloat();
 }
 
-QString EventHandler::getLocationAssetType() const
+QString EventHandler::locationAssetType(const Quotient::RoomEvent *event)
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getLocationAssetType called with m_event set to nullptr.";
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "locationAssetType called with event set to nullptr.";
         return {};
     }
 
-    const auto assetType = m_event->contentJson()["org.matrix.msc3488.asset"_ls].toObject()["type"_ls].toString();
+    const auto assetType = event->contentJson()["org.matrix.msc3488.asset"_ls].toObject()["type"_ls].toString();
     if (assetType.isEmpty()) {
         return {};
     }
     return assetType;
 }
 
-bool EventHandler::hasReadMarkers() const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "hasReadMarkers called with m_room set to nullptr.";
-        return false;
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "hasReadMarkers called with m_event set to nullptr.";
-        return false;
-    }
-
-    auto userIds = m_room->userIdsAtEvent(m_event->id());
-    userIds.remove(m_room->localUser()->id());
-    return userIds.size() > 0;
-}
-
-QVariantList EventHandler::getReadMarkers(int maxMarkers) const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReadMarkers called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReadMarkers called with m_event set to nullptr.";
-        return {};
-    }
-
-    auto userIds_temp = m_room->userIdsAtEvent(m_event->id());
-    userIds_temp.remove(m_room->localUser()->id());
-
-    auto userIds = userIds_temp.values();
-    if (userIds.count() > maxMarkers) {
-        userIds = userIds.mid(0, maxMarkers);
-    }
-
-    QVariantList users;
-    users.reserve(userIds.size());
-    for (const auto &userId : userIds) {
-        auto user = m_room->user(userId);
-        users += m_room->getUser(user);
-    }
-
-    return users;
-}
-
-QString EventHandler::getNumberExcessReadMarkers(int maxMarkers) const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getNumberExcessReadMarkers called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getNumberExcessReadMarkers called with m_event set to nullptr.";
-        return {};
-    }
-
-    auto userIds = m_room->userIdsAtEvent(m_event->id());
-    userIds.remove(m_room->localUser()->id());
-
-    if (userIds.count() > maxMarkers) {
-        return QStringLiteral("+ ") + QString::number(userIds.count() - maxMarkers);
-    } else {
-        return QString();
-    }
-}
-
-QString EventHandler::getReadMarkersString() const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReadMarkersString called with m_room set to nullptr.";
-        return {};
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReadMarkersString called with m_event set to nullptr.";
-        return {};
-    }
-
-    auto userIds = m_room->userIdsAtEvent(m_event->id());
-    userIds.remove(m_room->localUser()->id());
-
-    /**
-     * The string ends up in the form
-     * "x users: user1DisplayName, user2DisplayName, etc."
-     */
-    QString readMarkersString = i18np("1 user: ", "%1 users: ", userIds.size());
-    for (const auto &userId : userIds) {
-        auto user = m_room->user(userId);
-        readMarkersString += user->displayname(m_room) + i18nc("list separator", ", ");
-    }
-    readMarkersString.chop(2);
-    return readMarkersString;
-}
-
 #include "moc_eventhandler.cpp"